On Fri, 2022-05-20 at 00:41 +0000, Xiang, Haihao wrote: > On Sat, 2022-05-07 at 06:24 +0000, Tong Wu wrote: > > 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 | 16 +++++++++++++--- > > 1 file changed, 13 insertions(+), 3 deletions(-) > > > > diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c > > index b28dcffe2a..ca21543075 100644 > > --- a/libavutil/hwcontext_qsv.c > > +++ b/libavutil/hwcontext_qsv.c > > @@ -1281,12 +1281,22 @@ static int qsv_frames_derive_from(AVHWFramesContext > > *dst_ctx, > > #if CONFIG_D3D11VA > > case AV_HWDEVICE_TYPE_D3D11VA: > > { > > + D3D11_TEXTURE2D_DESC texDesc; > > + 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 (!dst_hwctx->texture_infos) > > + return AVERROR(ENOMEM); > > 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; > > > > + dst_hwctx->texture_infos[i].index = pair->second == > > (mfxMemId)MFX_INFINITE ? (intptr_t)0 : (intptr_t)pair->second; > > + } > > + ID3D11Texture2D_GetDesc(dst_hwctx->texture_infos[0].texture, > > &texDesc); > > + dst_hwctx->BindFlags = texDesc.BindFlags; > > } > > break; > > #endif > > The new patchset LGTM, is there any more comment ? >
Applied, thx _______________________________________________ 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".