mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsmux: fix reserve bits so they are 1's

Browse source 
The MPEG standard (ISO-13880-1) says the reserve bits need to be set
to one (2.1.64). This is causing transport streams to fail validation
on some systems.

https://bugzilla.gnome.org/show_bug.cgi?id=760127
This commit is contained in:
Bob Holcomb 2016-01-05 14:35:11 -05:00 committed by Tim-Philipp Müller
parent 8c7ea6fb87
commit cb520dce26
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/mpegtsmux/tsmux/tsmux.c
View file

@ -692,7 +692,7 @@ tsmux_write_adaptation_field (guint8 * buf,
buf[pos++] = (pcr_base >> 17) & 0xff; buf[pos++] = (pcr_base >> 17) & 0xff;
buf[pos++] = (pcr_base >> 9) & 0xff; buf[pos++] = (pcr_base >> 9) & 0xff;
buf[pos++] = (pcr_base >> 1) & 0xff; buf[pos++] = (pcr_base >> 1) & 0xff;
buf[pos++] = ((pcr_base << 7) & 0x80) | ((pcr_ext >> 8) & 0x01); buf[pos++] = ((pcr_base << 7) & 0x80) | 0x7e | ((pcr_ext >> 8) & 0x01); /* set 6 reserve bits to 1 */
buf[pos++] = (pcr_ext) & 0xff; buf[pos++] = (pcr_ext) & 0xff;
} }
if (pi->flags & TSMUX_PACKET_FLAG_WRITE_OPCR) { if (pi->flags & TSMUX_PACKET_FLAG_WRITE_OPCR) {
@ -708,7 +708,7 @@ tsmux_write_adaptation_field (guint8 * buf,
buf[pos++] = (opcr_base >> 17) & 0xff; buf[pos++] = (opcr_base >> 17) & 0xff;
buf[pos++] = (opcr_base >> 9) & 0xff; buf[pos++] = (opcr_base >> 9) & 0xff;
buf[pos++] = (opcr_base >> 1) & 0xff; buf[pos++] = (opcr_base >> 1) & 0xff;
buf[pos++] = ((opcr_base << 7) & 0x80) | ((opcr_ext >> 8) & 0x01); buf[pos++] = ((opcr_base << 7) & 0x80) | 0x7e | ((opcr_ext >> 8) & 0x01); /* set 6 reserve bits to 1 */
buf[pos++] = (opcr_ext) & 0xff; buf[pos++] = (opcr_ext) & 0xff;
} }
if (pi->flags & TSMUX_PACKET_FLAG_WRITE_SPLICE) { if (pi->flags & TSMUX_PACKET_FLAG_WRITE_SPLICE) {
@ -730,7 +730,7 @@ tsmux_write_adaptation_field (guint8 * buf,
TS_DEBUG ("FIXME: write Adaptation extension"); TS_DEBUG ("FIXME: write Adaptation extension");
/* Write an empty extension for now */ /* Write an empty extension for now */
buf[pos++] = 1; buf[pos++] = 1;
buf[pos++] = 0; buf[pos++] = 0x1f; /* lower 5 bits are reserved, and should be all 1 */
} }
} }
/* Write the flags at the start */ /* Write the flags at the start */