mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/flv/gstflvdemux.c: Instead of using gst_pad_event_default() use a small gst_pad_push_event() wrapper that only do...

Browse source 
Original commit message from CVS:
* gst/flv/gstflvdemux.c: (gst_flv_demux_push_src_event),
(gst_flv_demux_loop), (gst_flv_demux_handle_seek_pull),
(gst_flv_demux_sink_event):
Instead of using gst_pad_event_default() use a small
gst_pad_push_event() wrapper that only does what we want and is much
more simple.
This commit is contained in:
Sebastian Dröge 2008-10-27 09:20:01 +00:00
parent 8877f3590d
commit 04795346c5
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-10-27 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/flv/gstflvdemux.c: (gst_flv_demux_push_src_event),
(gst_flv_demux_loop), (gst_flv_demux_handle_seek_pull),
(gst_flv_demux_sink_event):
Instead of using gst_pad_event_default() use a small
gst_pad_push_event() wrapper that only does what we want and is much
more simple.
2008-10-27 Sebastian Dröge <sebastian.droege@collabora.co.uk> 2008-10-27 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/flv/gstflvdemux.c: (gst_flv_demux_change_state), * gst/flv/gstflvdemux.c: (gst_flv_demux_change_state),

34
gst/flv/gstflvdemux.c
View file

@ -432,6 +432,22 @@ gst_flv_demux_seek_to_prev_keyframe (GstFLVDemux * demux)
return GST_FLOW_OK; return GST_FLOW_OK;
} }
static gboolean
gst_flv_demux_push_src_event (GstFLVDemux * demux, GstEvent * event)
{
gboolean ret = TRUE;
if (demux->audio_pad)
ret |= gst_pad_push_event (demux->audio_pad, gst_event_ref (event));
if (demux->video_pad)
ret |= gst_pad_push_event (demux->video_pad, gst_event_ref (event));
gst_event_unref (event);
return ret;
}
static void static void
gst_flv_demux_loop (GstPad * pad) gst_flv_demux_loop (GstPad * pad)
{ {
@ -563,7 +579,7 @@ pause:
/* normal playback, send EOS to all linked pads */ /* normal playback, send EOS to all linked pads */
gst_element_no_more_pads (GST_ELEMENT (demux)); gst_element_no_more_pads (GST_ELEMENT (demux));
GST_LOG_OBJECT (demux, "Sending EOS, at end of stream"); GST_LOG_OBJECT (demux, "Sending EOS, at end of stream");
if (!gst_pad_event_default (demux->sinkpad, gst_event_new_eos ())) { if (!gst_flv_demux_push_src_event (demux, gst_event_new_eos ())) {
GST_WARNING_OBJECT (demux, "failed pushing EOS on streams"); GST_WARNING_OBJECT (demux, "failed pushing EOS on streams");
GST_ELEMENT_ERROR (demux, STREAM, FAILED, GST_ELEMENT_ERROR (demux, STREAM, FAILED,
("Internal data stream error."), ("Internal data stream error."),
@ -575,7 +591,7 @@ pause:
GST_ELEMENT_ERROR (demux, STREAM, FAILED, GST_ELEMENT_ERROR (demux, STREAM, FAILED,
("Internal data stream error."), ("Internal data stream error."),
("stream stopped, reason %s", reason)); ("stream stopped, reason %s", reason));
gst_pad_event_default (demux->sinkpad, gst_event_new_eos ()); gst_flv_demux_push_src_event (demux, gst_event_new_eos ());
} }
} }
gst_object_unref (demux); gst_object_unref (demux);
@ -732,7 +748,7 @@ gst_flv_demux_handle_seek_pull (GstFLVDemux * demux, GstEvent * event)
if (flush) { if (flush) {
/* Flush start up and downstream to make sure data flow and loops are /* Flush start up and downstream to make sure data flow and loops are
idle */ idle */
gst_pad_event_default (demux->sinkpad, gst_event_new_flush_start ()); gst_flv_demux_push_src_event (demux, gst_event_new_flush_start ());
gst_pad_push_event (demux->sinkpad, gst_event_new_flush_start ()); gst_pad_push_event (demux->sinkpad, gst_event_new_flush_start ());
} else { } else {
/* Pause the pulling task */ /* Pause the pulling task */
@ -777,7 +793,7 @@ gst_flv_demux_handle_seek_pull (GstFLVDemux * demux, GstEvent * event)
if (flush) { if (flush) {
/* Stop flushing, the sinks are at time 0 now */ /* Stop flushing, the sinks are at time 0 now */
gst_pad_event_default (demux->sinkpad, gst_event_new_flush_stop ()); gst_flv_demux_push_src_event (demux, gst_event_new_flush_stop ());
} else { } else {
GST_DEBUG_OBJECT (demux, "closing running segment %" GST_SEGMENT_FORMAT, GST_DEBUG_OBJECT (demux, "closing running segment %" GST_SEGMENT_FORMAT,
demux->segment); demux->segment);
@ -909,12 +925,12 @@ gst_flv_demux_sink_event (GstPad * pad, GstEvent * event)
case GST_EVENT_FLUSH_START: case GST_EVENT_FLUSH_START:
GST_DEBUG_OBJECT (demux, "trying to force chain function to exit"); GST_DEBUG_OBJECT (demux, "trying to force chain function to exit");
demux->flushing = TRUE; demux->flushing = TRUE;
ret = gst_pad_event_default (demux->sinkpad, event); ret = gst_flv_demux_push_src_event (demux, event);
break; break;
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
GST_DEBUG_OBJECT (demux, "flushing FLV demuxer"); GST_DEBUG_OBJECT (demux, "flushing FLV demuxer");
gst_flv_demux_flush (demux, TRUE); gst_flv_demux_flush (demux, TRUE);
ret = gst_pad_event_default (demux->sinkpad, event); ret = gst_flv_demux_push_src_event (demux, event);
break; break;
case GST_EVENT_EOS: case GST_EVENT_EOS:
GST_DEBUG_OBJECT (demux, "received EOS"); GST_DEBUG_OBJECT (demux, "received EOS");
@ -923,7 +939,7 @@ gst_flv_demux_sink_event (GstPad * pad, GstEvent * event)
gst_index_commit (demux->index, demux->index_id); gst_index_commit (demux->index, demux->index_id);
} }
gst_element_no_more_pads (GST_ELEMENT (demux)); gst_element_no_more_pads (GST_ELEMENT (demux));
if (!gst_pad_event_default (demux->sinkpad, event)) { if (!gst_flv_demux_push_src_event (demux, event)) {
GST_WARNING_OBJECT (demux, "failed pushing EOS on streams"); GST_WARNING_OBJECT (demux, "failed pushing EOS on streams");
GST_ELEMENT_ERROR (demux, STREAM, FAILED, GST_ELEMENT_ERROR (demux, STREAM, FAILED,
("Internal data stream error."), ("Internal data stream error."),
@ -953,7 +969,7 @@ gst_flv_demux_sink_event (GstPad * pad, GstEvent * event)
demux->segment); demux->segment);
/* and forward */ /* and forward */
ret = gst_pad_event_default (demux->sinkpad, event); ret = gst_flv_demux_push_src_event (demux, event);
} else { } else {
/* non-time format */ /* non-time format */
demux->audio_need_segment = TRUE; demux->audio_need_segment = TRUE;
@ -964,7 +980,7 @@ gst_flv_demux_sink_event (GstPad * pad, GstEvent * event)
break; break;
} }
default: default:
ret = gst_pad_event_default (demux->sinkpad, event); ret = gst_flv_demux_push_src_event (demux, event);
break; break;
} }