diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2020-12-22 18:19:40 -0500 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-09-20 15:11:02 +0000 |
| commit | 9e2e2f01ec923bddbd33a76518e4bf86210e44ee (patch) | |
| tree | 106ff866f88c7dc4f61d2b433fc18a0fccb94df0 | |
| parent | b2f7cb3372e2d7f3cbc5bbda84fa0d54feefcce5 (diff) | |
| download | gstreamer-plugins-bad-9e2e2f01ec923bddbd33a76518e4bf86210e44ee.tar.gz | |
mpegtsmux: Require frame alignment for JPEG 2000
We have yet to implement stripe alignment with the required descriptor.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/979>
| -rw-r--r-- | docs/plugins/gst_plugins_cache.json | 2 | ||||
| -rw-r--r-- | gst/mpegtsmux/gstmpegtsmux.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json index 5aa2ebf7c..37925b325 100644 --- a/docs/plugins/gst_plugins_cache.json +++ b/docs/plugins/gst_plugins_cache.json @@ -211019,7 +211019,7 @@ "long-name": "MPEG Transport Stream Muxer", "pad-templates": { "sink_%%d": { - "caps": "video/mpeg:\n parsed: true\n mpegversion: { (int)1, (int)2, (int)4 }\n systemstream: false\nvideo/x-dirac:\nimage/x-jpc:\nvideo/x-h264:\n stream-format: byte-stream\n alignment: { (string)au, (string)nal }\nvideo/x-h265:\n stream-format: byte-stream\n alignment: { (string)au, (string)nal }\naudio/mpeg:\n parsed: true\n mpegversion: 1\naudio/mpeg:\n framed: true\n mpegversion: { (int)2, (int)4 }\n stream-format: { (string)adts, (string)raw }\naudio/x-lpcm:\n width: { (int)16, (int)20, (int)24 }\n rate: { (int)48000, (int)96000 }\n channels: [ 1, 8 ]\n dynamic_range: [ 0, 255 ]\n emphasis: { (boolean)false, (boolean)true }\n mute: { (boolean)false, (boolean)true }\naudio/x-ac3:\n framed: true\naudio/x-dts:\n framed: true\naudio/x-opus:\n channels: [ 1, 8 ]\nchannel-mapping-family: { (int)0, (int)1 }\nsubpicture/x-dvb:\napplication/x-teletext:\nmeta/x-klv:\n parsed: true\nimage/x-jpc:\n profile: [ 0, 49151 ]\n", + "caps": "video/mpeg:\n parsed: true\n mpegversion: { (int)1, (int)2, (int)4 }\n systemstream: false\nvideo/x-dirac:\nimage/x-jpc:\n alignment: frame\nvideo/x-h264:\n stream-format: byte-stream\n alignment: { (string)au, (string)nal }\nvideo/x-h265:\n stream-format: byte-stream\n alignment: { (string)au, (string)nal }\naudio/mpeg:\n parsed: true\n mpegversion: 1\naudio/mpeg:\n framed: true\n mpegversion: { (int)2, (int)4 }\n stream-format: { (string)adts, (string)raw }\naudio/x-lpcm:\n width: { (int)16, (int)20, (int)24 }\n rate: { (int)48000, (int)96000 }\n channels: [ 1, 8 ]\n dynamic_range: [ 0, 255 ]\n emphasis: { (boolean)false, (boolean)true }\n mute: { (boolean)false, (boolean)true }\naudio/x-ac3:\n framed: true\naudio/x-dts:\n framed: true\naudio/x-opus:\n channels: [ 1, 8 ]\nchannel-mapping-family: { (int)0, (int)1 }\nsubpicture/x-dvb:\napplication/x-teletext:\nmeta/x-klv:\n parsed: true\nimage/x-jpc:\n alignment: frame\n profile: [ 0, 49151 ]\n", "direction": "sink", "presence": "request", "type": "GstBaseTsMuxPad" diff --git a/gst/mpegtsmux/gstmpegtsmux.c b/gst/mpegtsmux/gstmpegtsmux.c index 1c26f398a..a5fce84ad 100644 --- a/gst/mpegtsmux/gstmpegtsmux.c +++ b/gst/mpegtsmux/gstmpegtsmux.c @@ -115,7 +115,7 @@ static GstStaticPadTemplate gst_mpeg_ts_mux_sink_factory = "mpegversion = (int) { 1, 2, 4 }, " "systemstream = (boolean) false; " "video/x-dirac;" - "image/x-jpc;" + "image/x-jpc, alignment = (string) frame;" "video/x-h264,stream-format=(string)byte-stream," "alignment=(string){au, nal}; " "video/x-h265,stream-format=(string)byte-stream," @@ -139,7 +139,7 @@ static GstStaticPadTemplate gst_mpeg_ts_mux_sink_factory = "channels = (int) [1, 8], " "channel-mapping-family = (int) {0, 1};" "subpicture/x-dvb; application/x-teletext; meta/x-klv, parsed=true;" - "image/x-jpc, profile = (int)[0, 49151];")); + "image/x-jpc, alignment = (string) frame, profile = (int)[0, 49151];")); static GstStaticPadTemplate gst_mpeg_ts_mux_src_factory = GST_STATIC_PAD_TEMPLATE ("src", |