mpegtsmux: Use complete caps for setting up the streams in the test

This commit is contained in:
Sebastian Dröge 2014-05-03 12:02:27 +02:00
parent d60ac0bf0f
commit 24224f86bc

View file

@ -51,13 +51,13 @@ static GstPad *mysrcpad, *mysinkpad;
"parsed = (boolean) true " "parsed = (boolean) true "
#define VIDEO_CAPS_STRING "video/x-h264, " \ #define VIDEO_CAPS_STRING "video/x-h264, " \
"stream-format = (string) byte-stream, " \ "stream-format = (string) byte-stream, " \
"alignment = (string) nal, " \
"parsed = (boolean) true " "parsed = (boolean) true "
/* setup and teardown needs some special handling for muxer */ /* setup and teardown needs some special handling for muxer */
static GstPad * static GstPad *
setup_src_pad (GstElement * element, setup_src_pad (GstElement * element,
GstStaticPadTemplate * template, const gchar * sinkname, GstStaticPadTemplate * template, const gchar * sinkname, gchar ** padname)
gchar ** padname)
{ {
GstPad *srcpad, *sinkpad; GstPad *srcpad, *sinkpad;
@ -427,7 +427,8 @@ setup_caps (GstElement * mpegtsmux, GstPad * src1, GstPad * src2, GstPad * src3)
gst_segment_init (&segment, GST_FORMAT_TIME); gst_segment_init (&segment, GST_FORMAT_TIME);
caps = gst_caps_new_simple ("video/x-h264", caps = gst_caps_new_simple ("video/x-h264",
"stream-format", G_TYPE_STRING, "byte-stream", NULL); "stream-format", G_TYPE_STRING, "byte-stream",
"alignment", G_TYPE_STRING, "nal", NULL);
gst_pad_push_event (src1, gst_event_new_stream_start ("1")); gst_pad_push_event (src1, gst_event_new_stream_start ("1"));
gst_pad_push_event (src1, gst_event_new_caps (caps)); gst_pad_push_event (src1, gst_event_new_caps (caps));
gst_pad_push_event (src1, gst_event_new_segment (&segment)); gst_pad_push_event (src1, gst_event_new_segment (&segment));
@ -436,7 +437,8 @@ setup_caps (GstElement * mpegtsmux, GstPad * src1, GstPad * src2, GstPad * src3)
gst_pad_push_event (src2, gst_event_new_segment (&segment)); gst_pad_push_event (src2, gst_event_new_segment (&segment));
gst_caps_unref (caps); gst_caps_unref (caps);
caps = gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 4, caps = gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 4,
"stream-format", G_TYPE_STRING, "raw", NULL); "stream-format", G_TYPE_STRING, "raw", "framed", G_TYPE_BOOLEAN, TRUE,
NULL);
gst_pad_push_event (src3, gst_event_new_stream_start ("3")); gst_pad_push_event (src3, gst_event_new_stream_start ("3"));
gst_pad_push_event (src3, gst_event_new_caps (caps)); gst_pad_push_event (src3, gst_event_new_caps (caps));
gst_pad_push_event (src3, gst_event_new_segment (&segment)); gst_pad_push_event (src3, gst_event_new_segment (&segment));