Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

vf_d3d11vpp: alloc output frames through AVHWFramesContext

Browse Source 
This fixes d3d11 frame download further in filtering chain.

Fixes: #14732
This commit is contained in:
Kacper Michajłow
2024-08-26 00:30:09 +02:00
parent 421df7564a
commit a341b128de
1 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
video/filter/vf_d3d11vpp.c
View File

@@ -101,51 +101,12 @@ struct priv {
struct mp_image_params params, out_params;
int c_w, c_h;
struct mp_image_pool *pool;
AVBufferRef *av_device_ref;
AVBufferRef *hw_pool;
struct mp_refqueue *queue;
};
static void release_tex(void *arg)
{
ID3D11Texture2D *texture = arg;
ID3D11Texture2D_Release(texture);
}
static struct mp_image *alloc_pool(void *pctx, int fmt, int w, int h)
{
struct mp_filter *vf = pctx;
struct priv *p = vf->priv;
HRESULT hr;
ID3D11Texture2D *texture = NULL;
D3D11_TEXTURE2D_DESC texdesc = {
.Width = w,
.Height = h,
.Format = p->out_format,
.MipLevels = 1,
.ArraySize = 1,
.SampleDesc = { .Count = 1 },
.Usage = D3D11_USAGE_DEFAULT,
.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE,
};
hr = ID3D11Device_CreateTexture2D(p->vo_dev, &texdesc, NULL, &texture);
if (FAILED(hr))
return NULL;
struct mp_image *mpi = mp_image_new_custom_ref(NULL, texture, release_tex);
MP_HANDLE_OOM(mpi);
mp_image_setfmt(mpi, IMGFMT_D3D11);
mp_image_set_size(mpi, w, h);
mpi->params.hw_subfmt = p->out_params.hw_subfmt;
mpi->planes[0] = (void *)texture;
mpi->planes[1] = (void *)(intptr_t)0;
return mpi;
}
static void flush_frames(struct mp_filter *vf)
{
@@ -336,6 +297,40 @@ fail:
return -1;
}
static struct mp_image *alloc_out(struct mp_filter *vf)
{
struct priv *p = vf->priv;
if (!mp_update_av_hw_frames_pool(&p->hw_pool, p->av_device_ref,
IMGFMT_D3D11, p->out_params.hw_subfmt,
p->out_params.w, p->out_params.h, false))
{
MP_ERR(vf, "Failed to create hw pool\n");
return NULL;
}
AVHWFramesContext *hw_frame_ctx = (void *)p->hw_pool->data;
AVD3D11VAFramesContext *d3d11va_frames_ctx = hw_frame_ctx->hwctx;
d3d11va_frames_ctx->BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
AVFrame *av_frame = av_frame_alloc();
MP_HANDLE_OOM(av_frame);
if (av_hwframe_get_buffer(p->hw_pool, av_frame, 0) < 0) {
MP_ERR(vf, "Failed to allocate frame from hw pool\n");
av_frame_free(&av_frame);
return NULL;
}
struct mp_image *img = mp_image_from_av_frame(av_frame);
av_frame_free(&av_frame);
if (!img) {
MP_ERR(vf, "Internal error when converting AVFrame\n");
return NULL;
}
return img;
}
static struct mp_image *render(struct mp_filter *vf)
{
struct priv *p = vf->priv;
@@ -344,7 +339,7 @@ static struct mp_image *render(struct mp_filter *vf)
ID3D11VideoProcessorInputView *in_view = NULL;
ID3D11VideoProcessorOutputView *out_view = NULL;
struct mp_image *in = NULL, *out = NULL;
out = mp_image_pool_get(p->pool, IMGFMT_D3D11, p->out_params.w, p->out_params.h);
out = alloc_out(vf);
if (!out) {
MP_WARN(vf, "failed to allocate frame\n");
goto cleanup;
@@ -455,7 +450,7 @@ static void vf_d3d11vpp_process(struct mp_filter *vf)
struct mp_image *in_fmt = mp_refqueue_execute_reinit(p->queue);
if (in_fmt) {
mp_image_pool_clear(p->pool);
av_buffer_unref(&p->hw_pool);
destroy_video_proc(vf);
@@ -502,7 +497,8 @@ static void uninit(struct mp_filter *vf)
flush_frames(vf);
talloc_free(p->queue);
talloc_free(p->pool);
av_buffer_unref(&p->hw_pool);
av_buffer_unref(&p->av_device_ref);
if (p->video_ctx)
ID3D11VideoContext_Release(p->video_ctx);
@@ -564,7 +560,8 @@ static struct mp_filter *vf_d3d11vpp_create(struct mp_filter *parent,
AV_HWDEVICE_TYPE_D3D11VA);
if (!hwctx || !hwctx->av_device_ref)
goto fail;
AVHWDeviceContext *avhwctx = (void *)hwctx->av_device_ref->data;
p->av_device_ref = av_buffer_ref(hwctx->av_device_ref);
AVHWDeviceContext *avhwctx = (void *)p->av_device_ref->data;
AVD3D11VADeviceContext *d3dctx = avhwctx->hwctx;
p->vo_dev = d3dctx->device;
@@ -585,10 +582,6 @@ static struct mp_filter *vf_d3d11vpp_create(struct mp_filter *parent,
if (FAILED(hr))
goto fail;
p->pool = mp_image_pool_new(f);
mp_image_pool_set_allocator(p->pool, alloc_pool, f);
mp_image_pool_set_lru(p->pool);
mp_refqueue_add_in_format(p->queue, IMGFMT_D3D11, 0);
mp_refqueue_set_refs(p->queue, 0, 0);