diff options
| author | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2008-04-29 09:02:35 +0000 |
|---|---|---|
| committer | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2008-04-29 09:02:35 +0000 |
| commit | 63fae1c4bb8b0f2d317bd39c71cc77a319224c7a (patch) | |
| tree | 79ae1a2a504cc5d65253a2e2927f6abe8aae572c /gst/mpegtsparse/mpegtspacketizer.c | |
| parent | 625a222f06d943aba5bbb14456bce9d2944ea827 (diff) | |
| download | gst-plugins-bad-63fae1c4bb8b0f2d317bd39c71cc77a319224c7a.tar.gz gst-plugins-bad-63fae1c4bb8b0f2d317bd39c71cc77a319224c7a.tar.bz2 gst-plugins-bad-63fae1c4bb8b0f2d317bd39c71cc77a319224c7a.zip | |
gst/mpegtsparse/: Detect SI pids (NIT, SDT, EIT etc.) based on table id and not by pid number. This allows for exampl...
Original commit message from CVS:
* gst/mpegtsparse/mpegtspacketizer.c:
* gst/mpegtsparse/mpegtspacketizer.h:
* gst/mpegtsparse/mpegtsparse.c:
Detect SI pids (NIT, SDT, EIT etc.) based on table id and not
by pid number. This allows for example the EPG data from UK's
freesat to be picked up.
Diffstat (limited to 'gst/mpegtsparse/mpegtspacketizer.c')
| -rw-r--r-- | gst/mpegtsparse/mpegtspacketizer.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/gst/mpegtsparse/mpegtspacketizer.c b/gst/mpegtsparse/mpegtspacketizer.c index 526a25df..57dd8452 100644 --- a/gst/mpegtsparse/mpegtspacketizer.c +++ b/gst/mpegtsparse/mpegtspacketizer.c @@ -34,25 +34,8 @@ static void mpegts_packetizer_finalize (GObject * object); #define CONTINUITY_UNSET 255 #define MAX_CONTINUITY 15 -#define VERSION_NUMBER_NOTSET 255 - -typedef struct -{ - guint8 table_id; - /* the spec says sub_table_extension is the fourth and fifth byte of a - * section when the section_syntax_indicator is set to a value of "1". If - * section_syntax_indicator is 0, sub_table_extension will be set to 0 */ - guint16 subtable_extension; - guint8 version_number; -} MpegTSPacketizerStreamSubtable; - -typedef struct -{ - guint continuity_counter; - GstAdapter *section_adapter; - guint section_length; - GSList *subtables; -} MpegTSPacketizerStream; +#define VERSION_NUMBER_UNSET 255 +#define TABLE_ID_UNSET 0xFF static gint mpegts_packetizer_stream_subtable_compare (gconstpointer a, gconstpointer b) @@ -75,7 +58,7 @@ mpegts_packetizer_stream_subtable_new (guint8 table_id, MpegTSPacketizerStreamSubtable *subtable; subtable = g_new0 (MpegTSPacketizerStreamSubtable, 1); - subtable->version_number = VERSION_NUMBER_NOTSET; + subtable->version_number = VERSION_NUMBER_UNSET; subtable->table_id = table_id; subtable->subtable_extension = subtable_extension; return subtable; @@ -90,6 +73,7 @@ mpegts_packetizer_stream_new () stream->section_adapter = gst_adapter_new (); stream->continuity_counter = CONTINUITY_UNSET; stream->subtables = NULL; + stream->section_table_id = TABLE_ID_UNSET; return stream; } @@ -110,6 +94,7 @@ mpegts_packetizer_clear_section (MpegTSPacketizer * packetizer, gst_adapter_clear (stream->section_adapter); stream->continuity_counter = CONTINUITY_UNSET; stream->section_length = 0; + stream->section_table_id = TABLE_ID_UNSET; } static void @@ -282,6 +267,7 @@ mpegts_packetizer_parse_section_header (MpegTSPacketizer * packetizer, if (section->version_number == subtable->version_number) goto not_applicable; subtable->version_number = section->version_number; + stream->section_table_id = section->table_id; return TRUE; @@ -1887,6 +1873,7 @@ mpegts_packetizer_push_section (MpegTSPacketizer * packetizer, } stream->continuity_counter = packet->continuity_counter; stream->section_length = section_length; + stream->section_table_id = table_id; gst_adapter_push (stream->section_adapter, sub_buf); res = TRUE; |