[FFmpeg-devel] [PATCH] lavc: Fix ticket 6024, truncated mode decoding

[wm4]

On Thu, 15 Dec 2016 10:19:23 -0700
pkoshevoy at gmail.com wrote:

> From: Pavel Koshevoy <pkoshevoy at gmail.com>
> 
> The assumption that avcodec_send_packet makes regarding decoders
> consuming the entire packet is not true if the codec supports
> truncated decoding mode and the truncated flag is turned on.
> 
> Steps to reproduce:
> ./ffmpeg_g -flags truncated \
> -i "http://samples.ffmpeg.org/MPEG2/test-ebu-422.40000.pakets.ts" \
> -c:v ffv1 -c:a copy -y /tmp/truncated.nut
> ---
>  libavcodec/utils.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/utils.c b/libavcodec/utils.c
> index 44ecc09..be50459 100644
> --- a/libavcodec/utils.c
> +++ b/libavcodec/utils.c
> @@ -2788,7 +2788,7 @@ static int do_decode(AVCodecContext *avctx, AVPacket *pkt)
>      if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
>          ret = avcodec_decode_video2(avctx, avctx->internal->buffer_frame,
>                                      &got_frame, pkt);
> -        if (ret >= 0)
> +        if (ret >= 0 && !(avctx->flags & AV_CODEC_FLAG_TRUNCATED))
>              ret = pkt->size;
>      } else if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
>          ret = avcodec_decode_audio4(avctx, avctx->internal->buffer_frame,

Yep, that's much better, thanks.