mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpmux: Don't set PROXY_CAPS flag on the src pad

Browse source 
rtpmux behaves like a funnel in that it forwards whatever upstream is
sending buffers. So setting proxy caps doesn't make sense as the
upstream don't have to have compatible caps, thus resulting in an empty
caps set as a result of a caps query. Instead set fixed caps just
as funnel does.

https://bugzilla.gnome.org/show_bug.cgi?id=738722
This commit is contained in:
Sjoerd Simons 2014-10-17 22:23:27 +02:00 committed by Sebastian Dröge
parent 1131db8c1f
commit 0ee384b251
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/rtpmanager/gstrtpmux.c
View file

@ -245,7 +245,7 @@ gst_rtp_mux_init (GstRTPMux * rtp_mux)
"src"), "src"); "src"), "src");
gst_pad_set_event_function (rtp_mux->srcpad, gst_pad_set_event_function (rtp_mux->srcpad,
GST_DEBUG_FUNCPTR (gst_rtp_mux_src_event)); GST_DEBUG_FUNCPTR (gst_rtp_mux_src_event));
GST_PAD_SET_PROXY_CAPS (rtp_mux->srcpad); gst_pad_use_fixed_caps (rtp_mux->srcpad);
gst_element_add_pad (GST_ELEMENT (rtp_mux), rtp_mux->srcpad); gst_element_add_pad (GST_ELEMENT (rtp_mux), rtp_mux->srcpad);
rtp_mux->ssrc = DEFAULT_SSRC; rtp_mux->ssrc = DEFAULT_SSRC;

4
tests/check/elements/rtpmux.c
View file

@ -161,6 +161,10 @@ test_basic (const gchar * elem_name, const gchar * sink2, int count,
"seqnum-offset", G_TYPE_UINT, 56, "timestamp-offset", G_TYPE_UINT, 57, "seqnum-offset", G_TYPE_UINT, 56, "timestamp-offset", G_TYPE_UINT, 57,
"ssrc", G_TYPE_UINT, 66, NULL); "ssrc", G_TYPE_UINT, 66, NULL);
fail_unless (gst_pad_set_caps (src1, caps)); fail_unless (gst_pad_set_caps (src1, caps));
gst_caps_unref (caps);
caps = gst_pad_peer_query_caps (sink, NULL);
fail_if (gst_caps_is_empty (caps));
gst_segment_init (&segment, GST_FORMAT_TIME); gst_segment_init (&segment, GST_FORMAT_TIME);
segment.start = 100000; segment.start = 100000;