RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 01:42:20 +00:00
Code Issues Projects Releases Wiki Activity

lavc/mjpegdec: honor skip_frame option

Browse Source
This commit is contained in:
Matthieu Bouron 2015-10-09 15:15:15 +02:00
parent cbe2dfa4e5
commit ff0dfb5c36
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/mjpegdec.c
View File

@ -2038,6 +2038,22 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
if (avctx->skip_frame == AVDISCARD_ALL) {
switch(start_code) {
case SOF0:
case SOF1:
case SOF2:
case SOF3:
case SOF48:
case SOI:
case SOS:
case EOI:
break;
default:
goto skip;
}
}
switch (start_code) { switch (start_code) {
case SOI: case SOI:
s->restart_interval = 0; s->restart_interval = 0;
@ -2103,6 +2119,10 @@ eoi_parser:
if (s->bottom_field == !s->interlace_polarity) if (s->bottom_field == !s->interlace_polarity)
break; break;
} }
if (avctx->skip_frame == AVDISCARD_ALL) {
s->got_picture = 0;
goto the_end_no_picture;
}
if ((ret = av_frame_ref(frame, s->picture_ptr)) < 0) if ((ret = av_frame_ref(frame, s->picture_ptr)) < 0)
return ret; return ret;
*got_frame = 1; *got_frame = 1;
@ -2126,6 +2146,9 @@ eoi_parser:
goto the_end; goto the_end;
case SOS: case SOS:
s->cur_scan++; s->cur_scan++;
if (avctx->skip_frame == AVDISCARD_ALL)
break;
if ((ret = ff_mjpeg_decode_sos(s, NULL, 0, NULL)) < 0 && if ((ret = ff_mjpeg_decode_sos(s, NULL, 0, NULL)) < 0 &&
(avctx->err_recognition & AV_EF_EXPLODE)) (avctx->err_recognition & AV_EF_EXPLODE))
goto fail; goto fail;
@ -2148,6 +2171,7 @@ eoi_parser:
break; break;
} }
skip:
/* eof process start code */ /* eof process start code */
buf_ptr += (get_bits_count(&s->gb) + 7) / 8; buf_ptr += (get_bits_count(&s->gb) + 7) / 8;
av_log(avctx, AV_LOG_DEBUG, av_log(avctx, AV_LOG_DEBUG,
@ -2344,6 +2368,7 @@ the_end:
av_dict_copy(avpriv_frame_get_metadatap(data), s->exif_metadata, 0); av_dict_copy(avpriv_frame_get_metadatap(data), s->exif_metadata, 0);
av_dict_free(&s->exif_metadata); av_dict_free(&s->exif_metadata);
the_end_no_picture:
av_log(avctx, AV_LOG_DEBUG, "decode frame unused %"PTRDIFF_SPECIFIER" bytes\n", av_log(avctx, AV_LOG_DEBUG, "decode frame unused %"PTRDIFF_SPECIFIER" bytes\n",
buf_end - buf_ptr); buf_end - buf_ptr);
// return buf_end - buf_ptr; // return buf_end - buf_ptr;