FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

tsdemux: disentangle requested program number from active program number

Browse Source 
The program_number attribute was overloaded, trying to indicate both
the currently playing program, and the program requested via the
"program-number" property.  The end result was that setting the
property didn't work (see #690934).

I added a new requested_program_number field rather than reviving the
current_program_number field because it seemed this would result in
fewer changes overall and be less confusing.  It breaks symmetry with
the "program-number" property, but it retains parallels with the likes
of program->program_number.

Because gst_ts_demux_reset is called after the properties have been
parsed, requested_program_number is initialised in gst_ts_demux_init.
Whether this is exactly the right place, I don't know.
This commit is contained in:
Douglas Bagnall 2013-03-10 12:07:40 +13:00 committed by Edward Hervey
parent 8e4f966018
commit dfb101e0ed
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gst/mpegtsdemux/tsdemux.c
View File

@ -341,6 +341,7 @@ gst_ts_demux_init (GstTSDemux * demux)
/* We are not interested in sections (all handled by mpegtsbase) */ /* We are not interested in sections (all handled by mpegtsbase) */
base->push_section = FALSE; base->push_section = FALSE;
demux->requested_program_number = -1;
demux->program_number = -1; demux->program_number = -1;
gst_ts_demux_reset (base); gst_ts_demux_reset (base);
} }
@ -356,7 +357,7 @@ gst_ts_demux_set_property (GObject * object, guint prop_id,
case PROP_PROGRAM_NUMBER: case PROP_PROGRAM_NUMBER:
/* FIXME: do something if program is switched as opposed to set at /* FIXME: do something if program is switched as opposed to set at
* beginning */ * beginning */
demux->program_number = g_value_get_int (value); demux->requested_program_number = g_value_get_int (value);
break; break;
case PROP_EMIT_STATS: case PROP_EMIT_STATS:
demux->emit_statistics = g_value_get_boolean (value); demux->emit_statistics = g_value_get_boolean (value);
@ -374,7 +375,7 @@ gst_ts_demux_get_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_PROGRAM_NUMBER: case PROP_PROGRAM_NUMBER:
g_value_set_int (value, demux->program_number); g_value_set_int (value, demux->requested_program_number);
break; break;
case PROP_EMIT_STATS: case PROP_EMIT_STATS:
g_value_set_boolean (value, demux->emit_statistics); g_value_set_boolean (value, demux->emit_statistics);
@ -1099,11 +1100,12 @@ gst_ts_demux_program_started (MpegTSBase * base, MpegTSBaseProgram * program)
{ {
GstTSDemux *demux = GST_TS_DEMUX (base); GstTSDemux *demux = GST_TS_DEMUX (base);
GST_DEBUG ("Current program %d, new program %d", GST_DEBUG ("Current program %d, new program %d requested program %d",
demux->program_number, program->program_number); (gint) demux->program_number, program->program_number,
demux->requested_program_number);
if (demux->program_number == -1 || if (demux->requested_program_number == program->program_number ||
demux->program_number == program->program_number) { (demux->requested_program_number == -1 && demux->program_number == -1)) {
GST_LOG ("program %d started", program->program_number); GST_LOG ("program %d started", program->program_number);
demux->program_number = program->program_number; demux->program_number = program->program_number;

3
gst/mpegtsdemux/tsdemux.h
View File

@ -55,7 +55,8 @@ struct _GstTSDemux
/* the following vars must be protected with the OBJECT_LOCK as they can be /* the following vars must be protected with the OBJECT_LOCK as they can be
* accessed from the application thread and the streaming thread */ * accessed from the application thread and the streaming thread */
guint program_number; /* Required program number (ignore:-1) */ gint requested_program_number; /* Required program number (ignore:-1) */
guint program_number;
gboolean emit_statistics; gboolean emit_statistics;
/*< private >*/ /*< private >*/