gst/mpegtsmux/mpegtsmux.c: Add support for muxing MPEG4 video.

Original commit message from CVS:
* gst/mpegtsmux/mpegtsmux.c: (mpegtsmux_create_stream):
Add support for muxing MPEG4 video.
This commit is contained in:
Sebastian Dröge 2008-09-01 17:47:03 +00:00
parent b76d9f5bcd
commit b24d38315f
2 changed files with 13 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2008-09-01 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/mpegtsmux/mpegtsmux.c: (mpegtsmux_create_stream):
Add support for muxing MPEG4 video.
2008-09-01 Edward Hervey <edward.hervey@collabora.co.uk>
* gst/mpegtsmux/tsmux/tsmux.h:

View file

@ -103,7 +103,7 @@ static GstStaticPadTemplate mpegtsmux_sink_factory =
GST_STATIC_PAD_TEMPLATE ("sink_%d",
GST_PAD_SINK,
GST_PAD_REQUEST,
GST_STATIC_CAPS ("video/mpeg, mpegversion=(int) { 1, 2 }, "
GST_STATIC_CAPS ("video/mpeg, mpegversion=(int) { 1, 2, 4 }, "
"systemstream = (boolean) false; "
"video/x-dirac;"
"video/x-h264;" "audio/mpeg, mpegversion = (int) { 1, 2, 4 }")
@ -361,12 +361,18 @@ mpegtsmux_create_stream (MpegTsMux * mux, MpegTsPadData * ts_data, GstPad * pad)
ts_data->pid);
ts_data->stream = tsmux_create_stream (mux->tsmux, TSMUX_ST_VIDEO_MPEG1,
ts_data->pid);
} else {
} else if (mpegversion == 2) {
GST_DEBUG_OBJECT (pad,
"Creating MPEG Video, version 2 stream with PID 0x%04x",
ts_data->pid);
ts_data->stream = tsmux_create_stream (mux->tsmux, TSMUX_ST_VIDEO_MPEG2,
ts_data->pid);
} else {
GST_DEBUG_OBJECT (pad,
"Creating MPEG Video, version 4 stream with PID 0x%04x",
ts_data->pid);
ts_data->stream = tsmux_create_stream (mux->tsmux, TSMUX_ST_VIDEO_MPEG4,
ts_data->pid);
}
}