mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-01 17:31:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsdemux: fix scanning stopping too early

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=648245
This commit is contained in:
Vincent Penquerc'h 2011-09-30 18:54:04 +01:00 committed by Sebastian Dröge
parent fa3d661083
commit e4856a2965
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/mpegdemux/gstmpegtsdemux.c
View file

@ -2987,10 +2987,10 @@ gst_mpegts_demux_sync_scan (GstMpegTSDemux * demux, const guint8 * in_data,
guint size, guint * flush) guint size, guint * flush)
{ {
guint sync_count = 0; guint sync_count = 0;
const guint8 *end_scan = in_data + size - demux->packetsize;
guint8 *ptr_data = (guint8 *) in_data; guint8 *ptr_data = (guint8 *) in_data;
guint packetsize = guint packetsize =
(demux->packetsize ? demux->packetsize : MPEGTS_NORMAL_TS_PACKETSIZE); (demux->packetsize ? demux->packetsize : MPEGTS_NORMAL_TS_PACKETSIZE);
const guint8 *end_scan = in_data + size - packetsize;
/* Check if the LUT table is big enough */ /* Check if the LUT table is big enough */
if (G_UNLIKELY (demux->sync_lut_len < (size / packetsize))) { if (G_UNLIKELY (demux->sync_lut_len < (size / packetsize))) {
@ -3007,18 +3007,14 @@ gst_mpegts_demux_sync_scan (GstMpegTSDemux * demux, const guint8 * in_data,
guint chance = is_mpegts_sync (ptr_data, end_scan, packetsize); guint chance = is_mpegts_sync (ptr_data, end_scan, packetsize);
if (G_LIKELY (chance > 50)) { if (G_LIKELY (chance > 50)) {
/* skip paketsize bytes and try find next */ /* skip paketsize bytes and try find next */
guint8 *next_sync = ptr_data + packetsize;
if (next_sync < end_scan) {
demux->sync_lut[sync_count] = ptr_data; demux->sync_lut[sync_count] = ptr_data;
sync_count++; sync_count++;
ptr_data += packetsize; ptr_data += packetsize;
} else
goto done;
} else { } else {
ptr_data++; ptr_data++;
} }
} }
done:
if (G_UNLIKELY (!demux->packetsize)) if (G_UNLIKELY (!demux->packetsize))
gst_mpegts_demux_detect_packet_size (demux, sync_count); gst_mpegts_demux_detect_packet_size (demux, sync_count);