ffmpeg | branch: master | Zhong Li <zhong...@intel.com> | Thu Jun 28 17:01:46 2018 +0800| [d91370e0f12a3fedd477616011566d9f2fb5e3e5] | committer: Zhong Li
lavc/encode: fix frame_number double-counted Encoder frame_number may be double-counted if some frames are cached and then flushed. Take qsv encoder (some frames are cached firsty for asynchronism) as example, ./ffmpeg -loglevel verbose -hwaccel qsv -c:v h264_qsv -i in.mp4 -vframes 100 -c:v h264_qsv out.mp4 frame_number passed to encoder is double-counted and larger than the accurate value. Libx264 encoding with B frames can also reproduce it. Signed-off-by: Zhong Li <zhong...@intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d91370e0f12a3fedd477616011566d9f2fb5e3e5 --- libavcodec/encode.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 0ebd8dd6a5..d12c42526b 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -234,8 +234,8 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, if (ret >= 0) avpkt->data = avpkt->buf->data; } - - avctx->frame_number++; + if (frame) + avctx->frame_number++; } if (ret < 0 || !*got_packet_ptr) { @@ -329,7 +329,8 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, avpkt->data = avpkt->buf->data; } - avctx->frame_number++; + if (frame) + avctx->frame_number++; } if (ret < 0 || !*got_packet_ptr) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog