mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 10:42:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

jpegdec: Remember if we saw SOI and handle stray data on EOS

Browse source
This commit is contained in:
Edward Hervey 2012-05-17 09:31:41 +02:00 committed by Sebastian Dröge
parent 7703a11073
commit c6c4906770
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/jpeg/gstjpegdec.c
View file

@ -443,6 +443,10 @@ gst_jpeg_dec_parse (GstVideoDecoder * bdec, GstVideoCodecFrame * frame,
if (at_eos) {
GST_DEBUG ("Flushing all data out");
toadd = size;
/* If we have leftover data, throw it away */
if (!dec->saw_header)
goto drop_frame;
goto have_full_frame;
}
@ -460,6 +464,7 @@ gst_jpeg_dec_parse (GstVideoDecoder * bdec, GstVideoCodecFrame * frame,
if (ret) {
gst_adapter_flush (adapter, ret);
size -= ret;
dec->saw_header = TRUE;
}
while (1) {
@ -497,6 +502,7 @@ gst_jpeg_dec_parse (GstVideoDecoder * bdec, GstVideoCodecFrame * frame,
if (value == 0xd9) {
GST_DEBUG ("0x%08x: EOI marker", offset + 2);
/* clear parse state */
dec->saw_header = FALSE;
dec->parse_resync = FALSE;
dec->parse_offset = 0;
toadd = offset + 4;
@ -589,6 +595,9 @@ have_full_frame:
if (toadd)
gst_video_decoder_add_to_frame (bdec, toadd);
return gst_video_decoder_have_frame (bdec);
drop_frame:
return GST_VIDEO_DECODER_FLOW_DROPPED;
}
@ -1407,6 +1416,7 @@ gst_jpeg_dec_reset (GstVideoDecoder * bdec, gboolean hard)
dec->parse_offset = 0;
dec->parse_entropy_len = 0;
dec->parse_resync = FALSE;
dec->saw_header = FALSE;
return TRUE;
}