[vlc-commits] direct3d9: rename AcquirePictureSys / ReleasePictureSys
Steve Lhomme
git at videolan.org
Thu Jun 6 12:09:22 CEST 2019
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jun 6 11:06:04 2019 +0200| [16ea72fc27f0cf44214df55eec7eb7ebe6955f29] | committer: Steve Lhomme
direct3d9: rename AcquirePictureSys / ReleasePictureSys
So they are not fixed with D3D11 calls.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=16ea72fc27f0cf44214df55eec7eb7ebe6955f29
---
modules/codec/avcodec/dxva2.c | 6 +++---
modules/hw/d3d9/dxa9.c | 8 ++++----
modules/hw/d3d9/dxva2_deinterlace.c | 6 +++---
modules/video_chroma/d3d9_fmt.h | 4 ++--
modules/video_output/win32/direct3d9.c | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 6643ddfa88..d925a78171 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -171,7 +171,7 @@ static void d3d9_pic_context_destroy(struct picture_context_t *opaque)
struct va_pic_context *pic_ctx = (struct va_pic_context*)opaque;
if (pic_ctx->va_surface)
{
- ReleasePictureSys(&pic_ctx->picsys);
+ ReleaseD3D9PictureSys(&pic_ctx->picsys);
va_surface_Release(pic_ctx->va_surface);
free(pic_ctx);
}
@@ -199,7 +199,7 @@ static struct va_pic_context *CreatePicContext(IDirect3DSurface9 *surface, IDire
pic_ctx->s.copy = d3d9_pic_context_copy;
pic_ctx->picsys.surface = surface;
pic_ctx->picsys.decoder = decoder;
- AcquirePictureSys(&pic_ctx->picsys);
+ AcquireD3D9PictureSys(&pic_ctx->picsys);
return pic_ctx;
}
@@ -212,7 +212,7 @@ static struct va_pic_context* NewSurfacePicContext(vlc_va_t *va, int surface_ind
/* all the resources are acquired during surfaces init, and a second time in
* CreatePicContext(), undo one of them otherwise we need an extra release
* when the pool is emptied */
- ReleasePictureSys(&pic_ctx->picsys);
+ ReleaseD3D9PictureSys(&pic_ctx->picsys);
return pic_ctx;
}
diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c
index ada2e3d161..c954c65835 100644
--- a/modules/hw/d3d9/dxa9.c
+++ b/modules/hw/d3d9/dxa9.c
@@ -174,7 +174,7 @@ static void DXA9_NV12(filter_t *p_filter, picture_t *src, picture_t *dst)
static void DestroyPicture(picture_t *picture)
{
picture_sys_t *p_sys = picture->p_sys;
- ReleasePictureSys( p_sys );
+ ReleaseD3D9PictureSys( p_sys );
free(p_sys);
}
@@ -233,7 +233,7 @@ struct d3d_pic_context
static void d3d9_pic_context_destroy(struct picture_context_t *ctx)
{
struct va_pic_context *pic_ctx = (struct va_pic_context*)ctx;
- ReleasePictureSys(&pic_ctx->picsys);
+ ReleaseD3D9PictureSys(&pic_ctx->picsys);
free(pic_ctx);
}
@@ -246,7 +246,7 @@ static struct picture_context_t *d3d9_pic_context_copy(struct picture_context_t
pic_ctx->s.destroy = d3d9_pic_context_destroy;
pic_ctx->s.copy = d3d9_pic_context_copy;
pic_ctx->picsys = src_ctx->picsys;
- AcquirePictureSys(&pic_ctx->picsys);
+ AcquireD3D9PictureSys(&pic_ctx->picsys);
return &pic_ctx->s;
}
@@ -288,7 +288,7 @@ static void YV12_D3D9(filter_t *p_filter, picture_t *src, picture_t *dst)
pic_ctx->s.destroy = d3d9_pic_context_destroy;
pic_ctx->s.copy = d3d9_pic_context_copy;
pic_ctx->picsys = *p_sys;
- AcquirePictureSys(&pic_ctx->picsys);
+ AcquireD3D9PictureSys(&pic_ctx->picsys);
dst->context = &pic_ctx->s;
}
}
diff --git a/modules/hw/d3d9/dxva2_deinterlace.c b/modules/hw/d3d9/dxva2_deinterlace.c
index 95e6bbf97a..bba0313a52 100644
--- a/modules/hw/d3d9/dxva2_deinterlace.c
+++ b/modules/hw/d3d9/dxva2_deinterlace.c
@@ -288,7 +288,7 @@ static const struct filter_mode_t *GetFilterMode(const char *mode)
static void d3d9_pic_context_destroy(struct picture_context_t *ctx)
{
struct va_pic_context *pic_ctx = (struct va_pic_context*)ctx;
- ReleasePictureSys(&pic_ctx->picsys);
+ ReleaseD3D9PictureSys(&pic_ctx->picsys);
free(pic_ctx);
}
@@ -301,7 +301,7 @@ static struct picture_context_t *d3d9_pic_context_copy(struct picture_context_t
pic_ctx->s.destroy = d3d9_pic_context_destroy;
pic_ctx->s.copy = d3d9_pic_context_copy;
pic_ctx->picsys = src_ctx->picsys;
- AcquirePictureSys(&pic_ctx->picsys);
+ AcquireD3D9PictureSys(&pic_ctx->picsys);
return &pic_ctx->s;
}
@@ -349,7 +349,7 @@ picture_t *AllocPicture( filter_t *p_filter )
pic_ctx->s.destroy = d3d9_pic_context_destroy;
pic_ctx->s.copy = d3d9_pic_context_copy;
pic_ctx->picsys = *pic_sys;
- AcquirePictureSys( &pic_ctx->picsys );
+ AcquireD3D9PictureSys( &pic_ctx->picsys );
pic->context = &pic_ctx->s;
}
if (b_local_texture)
diff --git a/modules/video_chroma/d3d9_fmt.h b/modules/video_chroma/d3d9_fmt.h
index 4e2429349e..7d48df35c0 100644
--- a/modules/video_chroma/d3d9_fmt.h
+++ b/modules/video_chroma/d3d9_fmt.h
@@ -67,7 +67,7 @@ typedef struct
D3DCAPS9 caps;
} d3d9_device_t;
-static inline void AcquirePictureSys(picture_sys_t *p_sys)
+static inline void AcquireD3D9PictureSys(picture_sys_t *p_sys)
{
IDirect3DSurface9_AddRef(p_sys->surface);
if (p_sys->decoder)
@@ -75,7 +75,7 @@ static inline void AcquirePictureSys(picture_sys_t *p_sys)
p_sys->dxva2_dll = LoadLibrary(TEXT("DXVA2.DLL"));
}
-static inline void ReleasePictureSys(picture_sys_t *p_sys)
+static inline void ReleaseD3D9PictureSys(picture_sys_t *p_sys)
{
IDirect3DSurface9_Release(p_sys->surface);
if (p_sys->decoder)
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index c71476223a..f5627b1058 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -225,7 +225,7 @@ static HINSTANCE Direct3D9LoadShaderLibrary(void)
static void DestroyPicture(picture_t *picture)
{
- ReleasePictureSys(picture->p_sys);
+ ReleaseD3D9PictureSys(picture->p_sys);
free(picture->p_sys);
}
More information about the vlc-commits
mailing list