ffmpeg | branch: master | Zhao Zhili <quinkblack@foxmail.com> | Thu Mar 10 12:37:53 2022 +0800| [c3f00daa995e7438f57aba7ec2367f02345bc223] | committer: Zhao Zhili avutil/hwcontext_videotoolbox: create real buffer pool vt_get_buffer shouldn't do buffer pool's job. Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3f00daa995e7438f5...

libavutil/hwcontext_videotoolbox.c | 71 ++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index 026127d412..e442a95007 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -210,9 +210,36 @@ static int vt_pool_alloc(AVHWFramesContext *ctx) return AVERROR_EXTERNAL; } -static AVBufferRef *vt_dummy_pool_alloc(void *opaque, size_t size) +static void videotoolbox_buffer_release(void *opaque, uint8_t *data) +{ + CVPixelBufferRelease((CVPixelBufferRef)data); +} + +static AVBufferRef *vt_pool_alloc_buffer(void *opaque, size_t size) { - return NULL; + CVPixelBufferRef pixbuf; + AVBufferRef *buf; + CVReturn err; + AVHWFramesContext *ctx = opaque; + VTFramesContext *fctx = ctx->internal->priv; + + err = CVPixelBufferPoolCreatePixelBuffer( + NULL, + fctx->pool, + &pixbuf + ); + if (err != kCVReturnSuccess) { + av_log(ctx, AV_LOG_ERROR, "Failed to create pixel buffer from pool: %d\n", err); + return NULL; + } + + buf = av_buffer_create((uint8_t *)pixbuf, size, + videotoolbox_buffer_release, NULL, 0); + if (!buf) { + CVPixelBufferRelease(pixbuf); + return NULL; + } + return buf; } static void vt_frames_uninit(AVHWFramesContext *ctx) @@ -238,9 +265,9 @@ static int vt_frames_init(AVHWFramesContext *ctx) return AVERROR(ENOSYS); } - // create a dummy pool so av_hwframe_get_buffer doesn't EINVAL if (!ctx->pool) { - ctx->internal->pool_internal = av_buffer_pool_init2(0, ctx, vt_dummy_pool_alloc, NULL); + ctx->internal->pool_internal = av_buffer_pool_init2( + sizeof(CVPixelBufferRef), ctx, vt_pool_alloc_buffer, NULL); if (!ctx->internal->pool_internal) return AVERROR(ENOMEM); } @@ -252,41 +279,11 @@ static int vt_frames_init(AVHWFramesContext *ctx) return 0; } -static void videotoolbox_buffer_release(void *opaque, uint8_t *data) -{ - CVPixelBufferRelease((CVPixelBufferRef)data); -} - static int vt_get_buffer(AVHWFramesContext *ctx, AVFrame *frame) { - VTFramesContext *fctx = ctx->internal->priv; - - if (ctx->pool && ctx->pool->size != 0) { - frame->buf[0] = av_buffer_pool_get(ctx->pool); - if (!frame->buf[0]) - return AVERROR(ENOMEM); - } else { - CVPixelBufferRef pixbuf; - AVBufferRef *buf = NULL; - CVReturn err; - - err = CVPixelBufferPoolCreatePixelBuffer( - NULL, - fctx->pool, - &pixbuf - ); - if (err != kCVReturnSuccess) { - av_log(ctx, AV_LOG_ERROR, "Failed to create pixel buffer from pool: %d\n", err); - return AVERROR_EXTERNAL; - } - - buf = av_buffer_create((uint8_t *)pixbuf, 1, videotoolbox_buffer_release, NULL, 0); - if (!buf) { - CVPixelBufferRelease(pixbuf); - return AVERROR(ENOMEM); - } - frame->buf[0] = buf; - } + frame->buf[0] = av_buffer_pool_get(ctx->pool); + if (!frame->buf[0]) + return AVERROR(ENOMEM); frame->data[3] = frame->buf[0]->data; frame->format = AV_PIX_FMT_VIDEOTOOLBOX;