Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavu/hwcontext_qsv: fix memory leak for d3d9 impl

Browse source 
Signed-off-by: Tong Wu <tong1.wu@intel.com>
This commit is contained in:
Tong Wu 2023-06-19 14:15:09 +08:00 • committed by Haihao Xiang
parent 8ea31f694a
commit d51b0580e4
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libavutil/hwcontext_qsv.c
View file

@ -756,25 +756,28 @@ static int qsv_d3d9_update_config(void *ctx, mfxHDL handle, mfxConfig cfg)
hr = IDirect3DDeviceManager9_LockDevice(devmgr, device_handle, &device, TRUE); hr = IDirect3DDeviceManager9_LockDevice(devmgr, device_handle, &device, TRUE);
if (FAILED(hr)) { if (FAILED(hr)) {
av_log(ctx, AV_LOG_ERROR, "Error LockDevice %d\n", hr); av_log(ctx, AV_LOG_ERROR, "Error LockDevice %d\n", hr);
IDirect3DDeviceManager9_CloseDeviceHandle(devmgr, device_handle);
goto fail; goto fail;
} }
hr = IDirect3DDevice9Ex_GetCreationParameters(device, &params); hr = IDirect3DDevice9Ex_GetCreationParameters(device, &params);
if (FAILED(hr)) { if (FAILED(hr)) {
av_log(ctx, AV_LOG_ERROR, "Error IDirect3DDevice9_GetCreationParameters %d\n", hr); av_log(ctx, AV_LOG_ERROR, "Error IDirect3DDevice9_GetCreationParameters %d\n", hr);
IDirect3DDevice9Ex_Release(device);
goto unlock; goto unlock;
} }
hr = IDirect3DDevice9Ex_GetDirect3D(device, &d3d9ex); hr = IDirect3DDevice9Ex_GetDirect3D(device, &d3d9ex);
if (FAILED(hr)) { if (FAILED(hr)) {
av_log(ctx, AV_LOG_ERROR, "Error IDirect3DDevice9Ex_GetAdapterLUID %d\n", hr); av_log(ctx, AV_LOG_ERROR, "Error IDirect3DDevice9Ex_GetAdapterLUID %d\n", hr);
IDirect3DDevice9Ex_Release(device);
goto unlock; goto unlock;
} }
hr = IDirect3D9Ex_GetAdapterLUID(d3d9ex, params.AdapterOrdinal, &luid); hr = IDirect3D9Ex_GetAdapterLUID(d3d9ex, params.AdapterOrdinal, &luid);
if (FAILED(hr)) { if (FAILED(hr)) {
av_log(ctx, AV_LOG_ERROR, "Error IDirect3DDevice9Ex_GetAdapterLUID %d\n", hr); av_log(ctx, AV_LOG_ERROR, "Error IDirect3DDevice9Ex_GetAdapterLUID %d\n", hr);
goto unlock; goto release;
} }
impl_value.Type = MFX_VARIANT_TYPE_PTR; impl_value.Type = MFX_VARIANT_TYPE_PTR;
@ -784,13 +787,18 @@ static int qsv_d3d9_update_config(void *ctx, mfxHDL handle, mfxConfig cfg)
if (sts != MFX_ERR_NONE) { if (sts != MFX_ERR_NONE) {
av_log(ctx, AV_LOG_ERROR, "Error adding a MFX configuration" av_log(ctx, AV_LOG_ERROR, "Error adding a MFX configuration"
"DeviceLUID property: %d.\n", sts); "DeviceLUID property: %d.\n", sts);
goto unlock; goto release;
} }
ret = 0; ret = 0;
release:
IDirect3D9Ex_Release(d3d9ex);
IDirect3DDevice9Ex_Release(device);
unlock: unlock:
IDirect3DDeviceManager9_UnlockDevice(devmgr, device_handle, FALSE); IDirect3DDeviceManager9_UnlockDevice(devmgr, device_handle, FALSE);
IDirect3DDeviceManager9_CloseDeviceHandle(devmgr, device_handle);
fail: fail:
#endif #endif
return ret; return ret;