highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/hwcontext_videotoolbox: create real buffer pool

Browse Source 
vt_get_buffer shouldn't do buffer pool's job.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili 2022-03-10 12:37:53 +08:00 committed by Zhao Zhili
parent 301141b576
commit c3f00daa99
1 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
libavutil/hwcontext_videotoolbox.c
View File

@ -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)
{
return NULL;
CVPixelBufferRelease((CVPixelBufferRef)data);
}
static AVBufferRef *vt_pool_alloc_buffer(void *opaque, size_t size)
{
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;