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

jpegdec: Fix regression on markers parsing

Browse source 
Fixes a regression introduced when fixing bug #583047 in
commit a391bf52cc

Skip the data when libjpeg asks it to be skipped on
one of its callbacks.
This commit is contained in:
Thiago Santos 2010-07-19 14:47:32 -03:00
parent fd959ca77f
commit da1c816358
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ext/jpeg/gstjpegdec.c
View file

@ -234,11 +234,29 @@ gst_jpeg_dec_init_source (j_decompress_ptr cinfo)
static void static void
gst_jpeg_dec_skip_input_data (j_decompress_ptr cinfo, glong num_bytes) gst_jpeg_dec_skip_input_data (j_decompress_ptr cinfo, glong num_bytes)
{ {
GST_DEBUG_OBJECT (CINFO_GET_JPEGDEC (cinfo), "skip %ld bytes", num_bytes); GstJpegDec *dec = CINFO_GET_JPEGDEC (cinfo);
GST_DEBUG_OBJECT (dec, "skip %ld bytes", num_bytes);
if (num_bytes > 0 && cinfo->src->bytes_in_buffer >= num_bytes) { if (num_bytes > 0 && cinfo->src->bytes_in_buffer >= num_bytes) {
cinfo->src->next_input_byte += (size_t) num_bytes; cinfo->src->next_input_byte += (size_t) num_bytes;
cinfo->src->bytes_in_buffer -= (size_t) num_bytes; cinfo->src->bytes_in_buffer -= (size_t) num_bytes;
} else if (num_bytes > 0) {
gint available;
num_bytes -= cinfo->src->bytes_in_buffer;
cinfo->src->next_input_byte += (size_t) cinfo->src->bytes_in_buffer;
cinfo->src->bytes_in_buffer = 0;
available = gst_adapter_available (dec->adapter);
if (available < num_bytes || available < dec->rem_img_len) {
GST_WARNING_OBJECT (dec, "Less bytes to skip than available in the "
"adapter or the remaining image length %ld < %d or %u",
num_bytes, available, dec->rem_img_len);
}
num_bytes = MIN (MIN (num_bytes, available), dec->rem_img_len);
gst_adapter_flush (dec->adapter, num_bytes);
dec->rem_img_len -= num_bytes;
} }
} }