Fixes:
$ 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" -f null -
Signed-off-by: Tong Wu <tong1...@intel.com>
---
libavutil/hwcontext_qsv.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
index 66c0e38955..d9d05e936a 100644
--- a/libavutil/hwcontext_qsv.c
+++ b/libavutil/hwcontext_qsv.c
@@ -808,12 +808,23 @@ static int qsv_frames_derive_from(AVHWFramesContext
*dst_ctx,
#if CONFIG_D3D11VA
case AV_HWDEVICE_TYPE_D3D11VA:
{
+ dst_ctx->initial_pool_size = src_ctx->initial_pool_size;
AVD3D11VAFramesContext *dst_hwctx = dst_ctx->hwctx;
- mfxHDLPair *pair = (mfxHDLPair*)src_hwctx->surfaces[i].Data.MemId;
- dst_hwctx->texture = (ID3D11Texture2D*)pair->first;
+ dst_hwctx->texture_infos = av_calloc(src_hwctx->nb_surfaces,
+
sizeof(*dst_hwctx->texture_infos));
if (src_hwctx->frame_type & MFX_MEMTYPE_SHARED_RESOURCE)
dst_hwctx->MiscFlags = D3D11_RESOURCE_MISC_SHARED;
dst_hwctx->BindFlags =
qsv_get_d3d11va_bind_flags(src_hwctx->frame_type);
+ for (i = 0; i < src_hwctx->nb_surfaces; i++) {
+ mfxHDLPair* pair =
(mfxHDLPair*)src_hwctx->surfaces[i].Data.MemId;
+ dst_hwctx->texture_infos[i].texture =
(ID3D11Texture2D*)pair->first;
+ if (dst_hwctx->BindFlags & D3D11_BIND_RENDER_TARGET) {
+ dst_hwctx->texture_infos[i].index = 0;
+ }
+ else {
+ dst_hwctx->texture_infos[i].index = (intptr_t)pair->second;
+ }
+ }
}
break;
#endif
--
2.35.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
