mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

jpegdec: support additional 0xff before end marker.

Browse source 
JPEG markers may be preceded by additional 0xff.  jpegdec should
skip over these, even before the end marker.
See #579808
This commit is contained in:
Arnout Vandecappelle 2009-05-06 13:11:53 +02:00 committed by Wim Taymans
parent b7c5847dbd
commit 788986e269
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/jpeg/gstjpegdec.c
View file

@ -446,17 +446,6 @@ gst_jpeg_dec_parse_image_data (GstJpegDec * dec)
while (1) { while (1) {
guint frame_len; guint frame_len;
/* enough bytes left for EOI marker? (we need 0xff 0xNN, thus end-1) */
if (data >= end - 1) {
GST_DEBUG ("at end of input and no EOI marker found, need more data");
return 0;
}
if (is_jpeg_end_marker (data)) {
GST_DEBUG ("0x%08x: end marker", data - start);
goto found_eoi;
}
/* do we need to resync? */ /* do we need to resync? */
if (*data != 0xff) { if (*data != 0xff) {
GST_DEBUG ("Lost sync at 0x%08x, resyncing", data - start); GST_DEBUG ("Lost sync at 0x%08x, resyncing", data - start);
@ -485,8 +474,21 @@ gst_jpeg_dec_parse_image_data (GstJpegDec * dec)
} }
GST_DEBUG ("found sync at %p", data - size); GST_DEBUG ("found sync at %p", data - size);
} }
while (*data == 0xff)
while (*data == 0xff && data < end)
++data; ++data;
/* enough bytes left for EOI marker? (we need 0xNN after the 0xff) */
if (data >= end) {
GST_DEBUG ("at end of input and no EOI marker found, need more data");
return 0;
}
if (is_jpeg_end_marker (data - 1)) {
data--;
GST_DEBUG ("0x%08x: end marker", data - start);
goto found_eoi;
}
if (data + 2 >= end) if (data + 2 >= end)
return 0; return 0;
if (*data >= 0xd0 && *data <= 0xd7) if (*data >= 0xd0 && *data <= 0xd7)