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

codecparsers: jpeg: fix calculation of segment size.

Browse source 
The size of a marker segment is defined to be exclusive of any initial
marker code. So, fix the size for SOI, EOI and APPn segments but also
the size of any possible segment that is usually "reserved" or not
explicitly defined.

https://bugzilla.gnome.org/show_bug.cgi?id=707447
This commit is contained in:
Gwenole Beauchesne 2013-09-18 15:56:52 +02:00 committed by Tim-Philipp Müller
parent c83e413656
commit 41ed5c0266
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst-libs/gst/codecparsers/gstjpegparser.c
View file

@ -222,7 +222,7 @@ jpeg_parse_to_next_marker (GstByteReader * br, guint8 * marker)
if (marker) if (marker)
*marker = br->data[ofs + 1]; *marker = br->data[ofs + 1];
gst_byte_reader_skip (br, ofs - br->byte + 2); gst_byte_reader_skip_unchecked (br, ofs - br->byte);
return TRUE; return TRUE;
} }
@ -558,6 +558,7 @@ gst_jpeg_parse (GstJpegMarkerSegment * seg,
return FALSE; return FALSE;
} }
gst_byte_reader_skip_unchecked (&br, 2);
seg->offset = offset + gst_byte_reader_get_pos (&br); seg->offset = offset + gst_byte_reader_get_pos (&br);
seg->size = -1; seg->size = -1;
@ -566,7 +567,7 @@ gst_jpeg_parse (GstJpegMarkerSegment * seg,
case GST_JPEG_MARKER_SOI: case GST_JPEG_MARKER_SOI:
case GST_JPEG_MARKER_EOI: case GST_JPEG_MARKER_EOI:
fixed_size_segment: fixed_size_segment:
seg->size = 2; seg->size = 0;
break; break;
case (GST_JPEG_MARKER_SOF_MIN + 0): /* Lf */ case (GST_JPEG_MARKER_SOF_MIN + 0): /* Lf */