]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/nvenc: unregister input resource when unmapping
authorTimo Rothenpieler <timo@rothenpieler.org>
Sun, 28 Jan 2018 11:39:03 +0000 (12:39 +0100)
committerTimo Rothenpieler <timo@rothenpieler.org>
Sun, 28 Jan 2018 11:39:06 +0000 (12:39 +0100)
Currently the resource is only ever unregistered when the
registered_frames array is fully in use and an unmapped entry is re-used
and cleaned up.
I'm pretty sure the frame will have been cleaned up before that happens,
so I'm kinda surprised this never blew up.

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
libavcodec/nvenc.c

index 0ecaa151624699ed2d227f5f12ffbba5cdb815e7..a8194231ae68723d39093cde71dfbfff330f841c 100644 (file)
@@ -1797,6 +1797,8 @@ static int process_output_surface(AVCodecContext *avctx, AVPacket *pkt, NvencSur
         ctx->registered_frames[tmpoutsurf->reg_idx].mapped -= 1;
         if (ctx->registered_frames[tmpoutsurf->reg_idx].mapped == 0) {
             p_nvenc->nvEncUnmapInputResource(ctx->nvencoder, ctx->registered_frames[tmpoutsurf->reg_idx].in_map.mappedResource);
+            p_nvenc->nvEncUnregisterResource(ctx->nvencoder, ctx->registered_frames[tmpoutsurf->reg_idx].regptr);
+            ctx->registered_frames[tmpoutsurf->reg_idx].regptr = NULL;
         } else if (ctx->registered_frames[tmpoutsurf->reg_idx].mapped < 0) {
             res = AVERROR_BUG;
             goto error;