mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-02 02:03:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtbase: Refactor PSI detection

Browse source
This commit is contained in:
Edward Hervey 2012-06-02 08:06:24 +02:00
parent 8b9a58f9d5
commit 9924c178c8
1 changed files with 41 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
gst/mpegtsdemux/mpegtsbase.c
View file

@ -767,7 +767,7 @@ static inline gboolean
mpegts_base_is_psi (MpegTSBase * base, MpegTSPacketizerPacket * packet) mpegts_base_is_psi (MpegTSBase * base, MpegTSPacketizerPacket * packet)
{ {
gboolean retval = FALSE; gboolean retval = FALSE;
guint8 *data, table_id, pointer; guint8 *data, table_id = TABLE_ID_UNSET, pointer;
int i; int i;
static const guint8 si_tables[] = static const guint8 si_tables[] =
@ -778,58 +778,55 @@ mpegts_base_is_psi (MpegTSBase * base, MpegTSPacketizerPacket * packet)
0x72, 0x73, 0x7E, 0x7F, TABLE_ID_UNSET 0x72, 0x73, 0x7E, 0x7F, TABLE_ID_UNSET
}; };
if (MPEGTS_BIT_IS_SET (base->known_psi, packet->pid))
retval = TRUE;
/* check if it is a pes pid */ /* check if it is a pes pid */
if (MPEGTS_BIT_IS_SET (base->is_pes, packet->pid)) if (MPEGTS_BIT_IS_SET (base->is_pes, packet->pid))
return FALSE; goto invalid_pid;
if (!retval) { /* check if it part of the PIDs we know contain PSI */
if (packet->payload_unit_start_indicator) { if (!MPEGTS_BIT_IS_SET (base->known_psi, packet->pid))
data = packet->data; goto invalid_pid;
pointer = *data++;
data += pointer;
/* 'pointer' value may be invalid on malformed packet
* so we need to avoid out of range
*/
if (!(data < packet->data_end)) {
GST_WARNING_OBJECT (base,
"Wrong offset when retrieving table id: 0x%x", pointer);
return FALSE;
}
table_id = *(packet->data); if (packet->payload_unit_start_indicator) {
i = 0; data = packet->data;
while (si_tables[i] != TABLE_ID_UNSET) { pointer = *data++;
if (G_UNLIKELY (si_tables[i] == table_id)) { data += pointer;
GST_DEBUG_OBJECT (base, "Packet has table id 0x%x", table_id);
retval = TRUE;
break;
}
i++;
}
} else {
MpegTSPacketizerStream *stream = (MpegTSPacketizerStream *)
base->packetizer->streams[packet->pid];
if (stream) { /* 'pointer' value may be invalid on malformed packet
i = 0; * so we need to avoid out of range */
GST_DEBUG_OBJECT (base, "section table id: 0x%x", if (!(data < packet->data_end)) {
stream->section_table_id); GST_WARNING_OBJECT (base,
while (si_tables[i] != TABLE_ID_UNSET) { "Section pointer value exceeds packet size: 0x%x", pointer);
if (G_UNLIKELY (si_tables[i] == stream->section_table_id)) { return FALSE;
retval = TRUE; }
break;
} table_id = *(packet->data);
i++; } else {
} MpegTSPacketizerStream *stream = (MpegTSPacketizerStream *)
} base->packetizer->streams[packet->pid];
if (stream)
table_id = stream->section_table_id;
}
if (G_UNLIKELY (table_id == TABLE_ID_UNSET))
goto beach;
for (i = 0; si_tables[i] != TABLE_ID_UNSET; i++) {
if (G_UNLIKELY (si_tables[i] == table_id)) {
retval = TRUE;
break;
} }
} }
GST_LOG_OBJECT (base, "Packet of pid 0x%x is psi: %d", packet->pid, retval); beach:
GST_DEBUG_OBJECT (base, "Packet of pid 0x%04x (table_id 0x%02x) is psi: %d",
packet->pid, table_id, retval);
return retval; return retval;
invalid_pid:
GST_LOG_OBJECT (base, "Packet of pid 0x%04x doesn't belong to a SI stream",
packet->pid);
return FALSE;
} }
static void static void