mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-08 23:42:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsdemux: First push EOS, then destroy all programs

Browse source 
And also properly remove the program from the subclass
This commit is contained in:
Sebastian Dröge 2012-10-12 15:26:20 +02:00
parent 80a3a014f5
commit e5eceaaa73
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/mpegtsdemux/mpegtsbase.c
View file

@ -1346,8 +1346,8 @@ mpegts_base_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
gst_event_unref (event); gst_event_unref (event);
break; break;
case GST_EVENT_EOS: case GST_EVENT_EOS:
res = gst_mpegts_base_handle_eos (base);
res = GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, event); res = GST_MPEGTS_BASE_GET_CLASS (base)->push_event (base, event);
res = gst_mpegts_base_handle_eos (base);
break; break;
case GST_EVENT_CAPS: case GST_EVENT_CAPS:
/* FIXME, do something */ /* FIXME, do something */

12
gst/mpegtsdemux/tsdemux.c
View file

@ -226,6 +226,8 @@ enum
/* mpegtsbase methods */ /* mpegtsbase methods */
static void static void
gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program); gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program);
static void
gst_ts_demux_program_stopped (MpegTSBase * base, MpegTSBaseProgram * program);
static void gst_ts_demux_reset (MpegTSBase * base); static void gst_ts_demux_reset (MpegTSBase * base);
static GstFlowReturn static GstFlowReturn
gst_ts_demux_push (MpegTSBase * base, MpegTSPacketizerPacket * packet, gst_ts_demux_push (MpegTSBase * base, MpegTSPacketizerPacket * packet,
@ -307,6 +309,7 @@ gst_ts_demux_class_init (GstTSDemuxClass * klass)
ts_class->push = GST_DEBUG_FUNCPTR (gst_ts_demux_push); ts_class->push = GST_DEBUG_FUNCPTR (gst_ts_demux_push);
ts_class->push_event = GST_DEBUG_FUNCPTR (push_event); ts_class->push_event = GST_DEBUG_FUNCPTR (push_event);
ts_class->program_started = GST_DEBUG_FUNCPTR (gst_ts_demux_program_started); ts_class->program_started = GST_DEBUG_FUNCPTR (gst_ts_demux_program_started);
ts_class->program_stopped = GST_DEBUG_FUNCPTR (gst_ts_demux_program_stopped);
ts_class->stream_added = gst_ts_demux_stream_added; ts_class->stream_added = gst_ts_demux_stream_added;
ts_class->stream_removed = gst_ts_demux_stream_removed; ts_class->stream_removed = gst_ts_demux_stream_removed;
ts_class->seek = GST_DEBUG_FUNCPTR (gst_ts_demux_do_seek); ts_class->seek = GST_DEBUG_FUNCPTR (gst_ts_demux_do_seek);
@ -1130,7 +1133,16 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
} }
} }
static void
gst_ts_demux_program_stopped (MpegTSBase * base, MpegTSBaseProgram * program)
{
GstTSDemux *demux = GST_TS_DEMUX (base);
if (demux->program == program) {
demux->program = NULL;
demux->program_number = -1;
}
}
static inline void static inline void