[vlc-devel] [PATCH 03/17] directx_va: do the d3ddec release in pf_destroy_video_service()
Steve Lhomme
robux4 at videolabs.io
Tue Jun 20 17:45:35 CEST 2017
And make the release strongly typed
---
modules/codec/avcodec/d3d11va.c | 4 +++-
modules/codec/avcodec/directx_va.c | 2 --
modules/codec/avcodec/dxva2.c | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index 0663a1c85a..7b63890a98 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -609,7 +609,9 @@ static int DxCreateVideoService(vlc_va_t *va)
*/
static void DxDestroyVideoService(vlc_va_t *va)
{
- VLC_UNUSED(va);
+ directx_sys_t *dx_sys = &va->sys->dx_sys;
+ if (dx_sys->d3ddec)
+ ID3D11VideoDevice_Release(dx_sys->d3ddec);
}
static void ReleaseInputList(input_list_t *p_list)
diff --git a/modules/codec/avcodec/directx_va.c b/modules/codec/avcodec/directx_va.c
index 5fe739117e..ac4d11a0f3 100644
--- a/modules/codec/avcodec/directx_va.c
+++ b/modules/codec/avcodec/directx_va.c
@@ -431,8 +431,6 @@ void directx_va_Close(vlc_va_t *va, directx_sys_t *dx_sys)
{
DestroyVideoDecoder(va, dx_sys);
dx_sys->pf_destroy_video_service(va);
- if (dx_sys->d3ddec)
- IUnknown_Release(dx_sys->d3ddec);
if (dx_sys->pf_destroy_device_manager)
dx_sys->pf_destroy_device_manager(va);
dx_sys->pf_destroy_device(va);
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 2876caae24..85acfb1747 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -562,8 +562,11 @@ static int DxCreateVideoService(vlc_va_t *va)
*/
static void DxDestroyVideoService(vlc_va_t *va)
{
+ directx_sys_t *dx_sys = &va->sys->dx_sys;
if (va->sys->device)
IDirect3DDeviceManager9_CloseDeviceHandle(va->sys->devmng, va->sys->device);
+ if (dx_sys->d3ddec)
+ IDirectXVideoDecoderService_Release(dx_sys->d3ddec);
}
static void ReleaseInputList(input_list_t *p_list)
--
2.12.1
More information about the vlc-devel
mailing list