RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-21 14:26:59 +00:00
Code Issues Projects Releases Wiki Activity

nvenc: fix encoding with B-frames

Browse Source 
When B-frames are enabled and the encoder returns success, all currently
pending buffers immediately become valid and can be returned to the
caller. We can only return one packet at a time, so all the other
pending buffers should be transferred to a new 'ready' fifo, from where
they can be returned in subsequent calls (in which the encoder does not
produce any new output). This bug was hidden by the incorrect testing of
the encoder return value (the return value was overwritten before it was
tested).
This commit is contained in:
Anton Khirnov 2016-01-08 15:59:41 +01:00
parent aac7d6b284
commit 9d36cab4c0
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/nvenc.c
View File

@ -1067,7 +1067,7 @@ static int nvenc_get_frame(AVCodecContext *avctx, AVPacket *pkt)
NVENCOutputSurface *out = NULL;
int ret;
ret = nvenc_dequeue_surface(ctx->pending, &out);
ret = nvenc_dequeue_surface(ctx->ready, &out);
if (ret)
return ret;
@ -1127,7 +1127,7 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
NV_ENC_PIC_PARAMS params = { 0 };
NVENCInputSurface *in = NULL;
NVENCOutputSurface *out = NULL;
int ret;
int enc_ret, ret;
params.version = NV_ENC_PIC_PARAMS_VER;
@ -1166,10 +1166,10 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
params.encodePicFlags = NV_ENC_PIC_FLAG_EOS;
}
ret = nv->nvEncEncodePicture(ctx->nvenc_ctx, &params);
if (ret != NV_ENC_SUCCESS &&
ret != NV_ENC_ERR_NEED_MORE_INPUT)
return nvenc_print_error(avctx, ret, "Error encoding the frame");
enc_ret = nv->nvEncEncodePicture(ctx->nvenc_ctx, &params);
if (enc_ret != NV_ENC_SUCCESS &&
enc_ret != NV_ENC_ERR_NEED_MORE_INPUT)
return nvenc_print_error(avctx, enc_ret, "Error encoding the frame");
if (out) {
ret = nvenc_enqueue_surface(ctx->pending, out);
@ -1177,8 +1177,15 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return ret;
}
if (ret != NV_ENC_ERR_NEED_MORE_INPUT &&
av_fifo_size(ctx->pending)) {
/* all the pending buffers are now ready for output */
if (enc_ret == NV_ENC_SUCCESS) {
while (av_fifo_size(ctx->pending) > 0) {
av_fifo_generic_read(ctx->pending, &out, sizeof(out), NULL);
av_fifo_generic_write(ctx->ready, &out, sizeof(out), NULL);
}
}
if (av_fifo_size(ctx->ready) > 0) {
ret = nvenc_get_frame(avctx, pkt);
if (ret < 0)
return ret;