mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 21:35:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

update for activation changes

Browse source
This commit is contained in:
Wim Taymans 2011-11-21 13:36:34 +01:00
parent 944a76904d
commit 1e147bf88e
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ext/ffmpeg/gstffmpegdemux.c
View file

@ -128,10 +128,8 @@ static GstFlowReturn gst_ffmpegdemux_chain (GstPad * sinkpad,
static void gst_ffmpegdemux_loop (GstFFMpegDemux * demux); static void gst_ffmpegdemux_loop (GstFFMpegDemux * demux);
static gboolean gst_ffmpegdemux_sink_activate (GstPad * sinkpad, static gboolean gst_ffmpegdemux_sink_activate (GstPad * sinkpad,
GstObject * parent); GstObject * parent);
static gboolean gst_ffmpegdemux_sink_activate_pull (GstPad * sinkpad, static gboolean gst_ffmpegdemux_sink_activate_mode (GstPad * sinkpad,
GstObject * parent, gboolean active); GstObject * parent, GstPadMode mode, gboolean active);
static gboolean gst_ffmpegdemux_sink_activate_push (GstPad * sinkpad,
GstObject * parent, gboolean active);
#if 0 #if 0
static gboolean static gboolean
@ -258,10 +256,8 @@ gst_ffmpegdemux_init (GstFFMpegDemux * demux)
demux->sinkpad = gst_pad_new_from_template (oclass->sinktempl, "sink"); demux->sinkpad = gst_pad_new_from_template (oclass->sinktempl, "sink");
gst_pad_set_activate_function (demux->sinkpad, gst_pad_set_activate_function (demux->sinkpad,
GST_DEBUG_FUNCPTR (gst_ffmpegdemux_sink_activate)); GST_DEBUG_FUNCPTR (gst_ffmpegdemux_sink_activate));
gst_pad_set_activatepull_function (demux->sinkpad, gst_pad_set_activatemode_function (demux->sinkpad,
GST_DEBUG_FUNCPTR (gst_ffmpegdemux_sink_activate_pull)); GST_DEBUG_FUNCPTR (gst_ffmpegdemux_sink_activate_mode));
gst_pad_set_activatepush_function (demux->sinkpad,
GST_DEBUG_FUNCPTR (gst_ffmpegdemux_sink_activate_push));
gst_element_add_pad (GST_ELEMENT (demux), demux->sinkpad); gst_element_add_pad (GST_ELEMENT (demux), demux->sinkpad);
/* push based setup */ /* push based setup */
@ -1710,12 +1706,12 @@ gst_ffmpegdemux_sink_activate (GstPad * sinkpad, GstObject * parent)
goto activate_push; goto activate_push;
GST_DEBUG_OBJECT (sinkpad, "activating pull"); GST_DEBUG_OBJECT (sinkpad, "activating pull");
return gst_pad_activate_pull (sinkpad, TRUE); return gst_pad_activate_mode (sinkpad, GST_PAD_MODE_PULL, TRUE);
activate_push: activate_push:
{ {
GST_DEBUG_OBJECT (sinkpad, "activating push"); GST_DEBUG_OBJECT (sinkpad, "activating push");
return gst_pad_activate_push (sinkpad, TRUE); return gst_pad_activate_mode (sinkpad, GST_PAD_MODE_PUSH, TRUE);
} }
} }
@ -1792,6 +1788,26 @@ gst_ffmpegdemux_sink_activate_pull (GstPad * sinkpad, GstObject * parent,
return res; return res;
} }
static gboolean
gst_ffmpegdemux_sink_activate_mode (GstPad * sinkpad, GstObject * parent,
GstPadMode mode, gboolean active)
{
gboolean res;
switch (mode) {
case GST_PAD_MODE_PUSH:
res = gst_ffmpegdemux_sink_activate_push (sinkpad, parent, active);
break;
case GST_PAD_MODE_PULL:
res = gst_ffmpegdemux_sink_activate_pull (sinkpad, parent, active);
break;
default:
res = FALSE;
break;
}
return res;
}
static GstStateChangeReturn static GstStateChangeReturn
gst_ffmpegdemux_change_state (GstElement * element, GstStateChange transition) gst_ffmpegdemux_change_state (GstElement * element, GstStateChange transition)
{ {