mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsdemux: Fix wrong usage of '<<' operator

Browse source 
Detected by GCC 7.

Add comments for clarity

https://bugzilla.gnome.org/show_bug.cgi?id=779333
This commit is contained in:
Edward Hervey 2017-02-28 09:26:25 +01:00 committed by Edward Hervey
parent 266324b97a
commit fcf87ef2bf
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/mpegtsdemux/pesparse.c
View file

@ -314,14 +314,23 @@ mpegts_parse_pes_header (const guint8 * data, gsize length, PESHeader * res)
} }
if (flags & 0x10) { if (flags & 0x10) {
/* P-STD */ /* P-STD
* '01' : 2 bits
* P-STD_buffer_scale : 1 bit
* P-STD_buffer_size : 13 bits
* */
if (G_UNLIKELY (length < 2)) if (G_UNLIKELY (length < 2))
goto need_more_data; goto need_more_data;
val8 = *data; val8 = *data;
if (G_UNLIKELY ((val8 & 0xc0) != 0x40)) if (G_UNLIKELY ((val8 & 0xc0) != 0x40))
goto bad_P_STD_marker; goto bad_P_STD_marker;
/* If P-STD_buffer_scale is 0
* multiply by 128 (i.e. << 7),
* else
* multiply by 1024 (i.e. << 10)
*/
res->P_STD_buffer_size = res->P_STD_buffer_size =
(GST_READ_UINT16_BE (data) & 0x1fff) << (val8 & 0x20) ? 10 : 7; (GST_READ_UINT16_BE (data) & 0x1fff) << ((val8 & 0x20) ? 10 : 7);
GST_LOG ("P_STD_buffer_size : %d", res->P_STD_buffer_size); GST_LOG ("P_STD_buffer_size : %d", res->P_STD_buffer_size);
data += 2; data += 2;
length -= 2; length -= 2;