virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avutil/hwcontext_d3d11va: pass the format value from outside for staging texture

Browse Source 
In d3d11va_create_staging_texture(), during the hwmap process, the
ctx->internal->priv is not initialized, resulting in the
texDesc.Format not initialized. Now pass the format value from
d3d11va_transfer_data() to fix it.

$ ffmpeg.exe -y -hwaccel qsv -init_hw_device d3d11va=d3d11 \
-init_hw_device qsv=qsv@d3d11 -c:v h264_qsv \
-i input.h264 -vf "hwmap=derive_device=d3d11va,format=d3d11,hwdownload,format=nv12" \
-f null -

Reviewed-by: Soft Works <softworkz@hotmail.com>
Signed-off-by: Tong Wu <tong1.wu@intel.com>
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
This commit is contained in:
Tong Wu 2022-05-07 06:24:40 +00:00 committed by Haihao Xiang
parent 632db3c36d
commit 20807a9d61
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavutil/hwcontext_d3d11va.c
View File

@ -339,7 +339,7 @@ static int d3d11va_transfer_get_formats(AVHWFramesContext *ctx,
return 0; return 0;
} }
static int d3d11va_create_staging_texture(AVHWFramesContext *ctx) static int d3d11va_create_staging_texture(AVHWFramesContext *ctx, DXGI_FORMAT format)
{ {
AVD3D11VADeviceContext *device_hwctx = ctx->device_ctx->hwctx; AVD3D11VADeviceContext *device_hwctx = ctx->device_ctx->hwctx;
D3D11VAFramesContext *s = ctx->internal->priv; D3D11VAFramesContext *s = ctx->internal->priv;
@ -348,7 +348,7 @@ static int d3d11va_create_staging_texture(AVHWFramesContext *ctx)
.Width = ctx->width, .Width = ctx->width,
.Height = ctx->height, .Height = ctx->height,
.MipLevels = 1, .MipLevels = 1,
.Format = s->format, .Format = format,
.SampleDesc = { .Count = 1 }, .SampleDesc = { .Count = 1 },
.ArraySize = 1, .ArraySize = 1,
.Usage = D3D11_USAGE_STAGING, .Usage = D3D11_USAGE_STAGING,
@ -404,7 +404,8 @@ static int d3d11va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst,
device_hwctx->lock(device_hwctx->lock_ctx); device_hwctx->lock(device_hwctx->lock_ctx);
if (!s->staging_texture) { if (!s->staging_texture) {
int res = d3d11va_create_staging_texture(ctx); ID3D11Texture2D_GetDesc((ID3D11Texture2D *)texture, &desc);
int res = d3d11va_create_staging_texture(ctx, desc.Format);
if (res < 0) if (res < 0)
return res; return res;
} }