mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 20:46:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

ptdemux: set caps after activating the pad

Browse source 
Set the caps after we activated the pad or else it will just fail.
This commit is contained in:
Wim Taymans 2012-03-07 14:55:08 +01:00
parent cdf927ab52
commit 5cce960baa
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/rtpmanager/gstrtpptdemux.c
View file

@ -383,11 +383,6 @@ gst_rtp_pt_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
g_free (padname); g_free (padname);
gst_pad_set_event_function (srcpad, gst_rtp_pt_demux_src_event); gst_pad_set_event_function (srcpad, gst_rtp_pt_demux_src_event);
caps = gst_caps_make_writable (caps);
gst_caps_set_simple (caps, "payload", G_TYPE_INT, pt, NULL);
gst_pad_set_caps (srcpad, caps);
gst_caps_unref (caps);
GST_DEBUG ("Adding pt=%d to the list.", pt); GST_DEBUG ("Adding pt=%d to the list.", pt);
rtpdemuxpad = g_slice_new0 (GstRtpPtDemuxPad); rtpdemuxpad = g_slice_new0 (GstRtpPtDemuxPad);
rtpdemuxpad->pt = pt; rtpdemuxpad->pt = pt;
@ -399,6 +394,12 @@ gst_rtp_pt_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
GST_OBJECT_UNLOCK (rtpdemux); GST_OBJECT_UNLOCK (rtpdemux);
gst_pad_set_active (srcpad, TRUE); gst_pad_set_active (srcpad, TRUE);
caps = gst_caps_make_writable (caps);
gst_caps_set_simple (caps, "payload", G_TYPE_INT, pt, NULL);
gst_pad_set_caps (srcpad, caps);
gst_caps_unref (caps);
gst_pad_sticky_events_foreach (rtpdemux->sink, forward_sticky_events, gst_pad_sticky_events_foreach (rtpdemux->sink, forward_sticky_events,
srcpad); srcpad);
gst_element_add_pad (GST_ELEMENT_CAST (rtpdemux), srcpad); gst_element_add_pad (GST_ELEMENT_CAST (rtpdemux), srcpad);
@ -491,6 +492,8 @@ gst_rtp_pt_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
case GST_EVENT_CAPS: case GST_EVENT_CAPS:
{ {
gst_rtp_pt_demux_clear_pt_map (rtpdemux); gst_rtp_pt_demux_clear_pt_map (rtpdemux);
/* don't forward the event, we cleared the ptmap and on the next buffer we
* will add the pt to the caps and push a new caps event */
gst_event_unref (event); gst_event_unref (event);
res = TRUE; res = TRUE;
break; break;