mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsbase: Search SCTE-35 DRF_ID_CUEI in multiple registration descriptors

Browse source 
There are streams in the wild that have to add a SCTE-35 trigger in
another e.g. GA94 stream. Most encoders would replace the GA94
descriptor ID with the CUEI one temporarily, but there are some that
will add two registration ID descriptors, one with GA94 and one with
CUEI.

Failing to parse the CUEI registration ID in that case would return
FALSE in _stream_is_private_section , therefore setting it as known PES
and pushing packets downstream instead of calling handle_psi.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/979>
This commit is contained in:
Vivia Nikolaidou 2021-08-31 16:35:06 +03:00 committed by GStreamer Marge Bot
parent 156f2543ca
commit 273e2a1db6
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
subprojects/gst-plugins-bad/gst/mpegtsdemux/mpegtsbase.c
View file

@ -575,6 +575,28 @@ get_registration_from_descriptors (GPtrArray * descriptors)
return 0;
}
static gboolean
find_registration_in_descriptors (GPtrArray * descriptors,
guint32 registration_id)
{
guint i, nb_desc;
if (!descriptors)
return FALSE;
nb_desc = descriptors->len;
for (i = 0; i < nb_desc; i++) {
GstMpegtsDescriptor *desc = g_ptr_array_index (descriptors, i);
if (desc->tag == GST_MTS_DESC_REGISTRATION) {
guint32 reg_desc = GST_READ_UINT32_BE (desc->data + 2);
if (reg_desc == registration_id)
return TRUE;
}
}
return FALSE;
}
static MpegTSBaseStream *
mpegts_base_program_add_stream (MpegTSBase * base,
MpegTSBaseProgram * program, guint16 pid, guint8 stream_type,
@ -763,10 +785,8 @@ _stream_is_private_section (const GstMpegtsPMT * pmt,
return TRUE;
case GST_MPEGTS_STREAM_TYPE_SCTE_SIT:
{
guint32 registration_id =
get_registration_from_descriptors (pmt->descriptors);
/* Not a private section stream */
if (registration_id != DRF_ID_CUEI)
if (!find_registration_in_descriptors (pmt->descriptors, DRF_ID_CUEI))
return FALSE;
return TRUE;
}