vlc | branch: master | Steve Lhomme <[email protected]> | Thu Jun 6 11:17:26 2019 +0200| [370d928ead1ddae8fe6e05626b51c1adf97b06a4] | committer: Steve Lhomme
direct3d9: rename picture_sys_t to picture_sys_d3d11_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=370d928ead1ddae8fe6e05626b51c1adf97b06a4 --- modules/codec/avcodec/dxva2.c | 6 +++--- modules/hw/d3d9/d3d9_filters.c | 8 ++++---- modules/hw/d3d9/d3d9_instance.c | 4 ++-- modules/hw/d3d9/dxa9.c | 14 +++++++------- modules/hw/d3d9/dxva2_deinterlace.c | 10 +++++----- modules/video_chroma/d3d9_fmt.c | 2 +- modules/video_chroma/d3d9_fmt.h | 6 +++--- modules/video_output/win32/direct3d9.c | 8 ++++---- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c index 51c75b6faa..4e1e4c443a 100644 --- a/modules/codec/avcodec/dxva2.c +++ b/modules/codec/avcodec/dxva2.c @@ -37,7 +37,7 @@ #include <libavcodec/dxva2.h> #include "../../video_chroma/d3d9_fmt.h" -typedef picture_sys_t VA_PICSYS; +typedef picture_sys_d3d9_t VA_PICSYS; #include "va_surface.h" #define D3D_DecoderType IDirectXVideoDecoder @@ -46,7 +46,7 @@ typedef picture_sys_t VA_PICSYS; #include "directx_va.h" static int Open(vlc_va_t *, AVCodecContext *, enum PixelFormat, - const es_format_t *, picture_sys_t *p_sys); + const es_format_t *, picture_sys_d3d9_t *p_sys); static void Close(vlc_va_t *, void **); vlc_module_begin() @@ -254,7 +254,7 @@ static void Close(vlc_va_t *va, void **ctx) } static int Open(vlc_va_t *va, AVCodecContext *ctx, enum PixelFormat pix_fmt, - const es_format_t *fmt, picture_sys_t *p_sys) + const es_format_t *fmt, picture_sys_d3d9_t *p_sys) { int err = VLC_EGENERIC; directx_sys_t *dx_sys; diff --git a/modules/hw/d3d9/d3d9_filters.c b/modules/hw/d3d9/d3d9_filters.c index f8cf8b7108..a995c61d14 100644 --- a/modules/hw/d3d9/d3d9_filters.c +++ b/modules/hw/d3d9/d3d9_filters.c @@ -39,7 +39,7 @@ #include <dxva2api.h> #include "../../video_chroma/d3d9_fmt.h" -typedef picture_sys_t VA_PICSYS; +typedef picture_sys_d3d9_t VA_PICSYS; #include "../../codec/avcodec/va_surface.h" #include "d3d9_filters.h" @@ -92,7 +92,7 @@ static void FillSample( DXVA2_VideoSample *p_sample, picture_t *p_pic, const RECT *p_area ) { - picture_sys_t *p_sys_src = ActivePictureSys(p_pic); + picture_sys_d3d9_t *p_sys_src = ActivePictureSys(p_pic); p_sample->SrcSurface = p_sys_src->surface; p_sample->SampleFormat.SampleFormat = DXVA2_SampleProgressiveFrame; @@ -107,13 +107,13 @@ static picture_t *Filter(filter_t *p_filter, picture_t *p_pic) { filter_sys_t *p_sys = p_filter->p_sys; - picture_sys_t *p_src_sys = ActivePictureSys(p_pic); + picture_sys_d3d9_t *p_src_sys = ActivePictureSys(p_pic); picture_t *p_outpic = filter_NewPicture( p_filter ); if( !p_outpic ) goto failed; - picture_sys_t *p_out_sys = p_outpic->p_sys; + picture_sys_d3d9_t *p_out_sys = p_outpic->p_sys; if( !p_out_sys || !p_out_sys->surface ) goto failed; diff --git a/modules/hw/d3d9/d3d9_instance.c b/modules/hw/d3d9/d3d9_instance.c index 7165d6449c..1a83637ffb 100644 --- a/modules/hw/d3d9/d3d9_instance.c +++ b/modules/hw/d3d9/d3d9_instance.c @@ -34,7 +34,7 @@ #include "d3d9_filters.h" -typedef picture_sys_t VA_PICSYS; +typedef picture_sys_d3d9_t VA_PICSYS; #include "../../codec/avcodec/va_surface.h" static vlc_mutex_t inst_lock = VLC_STATIC_MUTEX; @@ -49,7 +49,7 @@ void D3D9_FilterHoldInstance(filter_t *filter, d3d9_device_t *out, D3DSURFACE_DE if (!pic) return; - picture_sys_t *p_sys = ActivePictureSys(pic); + picture_sys_d3d9_t *p_sys = ActivePictureSys(pic); vlc_mutex_lock(&inst_lock); if (p_sys) diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c index 361f55bb22..3b571d779d 100644 --- a/modules/hw/d3d9/dxa9.c +++ b/modules/hw/d3d9/dxa9.c @@ -41,7 +41,7 @@ #include <d3d9.h> #include "../../video_chroma/d3d9_fmt.h" -typedef picture_sys_t VA_PICSYS; +typedef picture_sys_d3d9_t VA_PICSYS; #include "../../codec/avcodec/va_surface.h" typedef struct @@ -74,7 +74,7 @@ static bool GetLock(filter_t *p_filter, IDirect3DSurface9 *d3d, static void DXA9_YV12(filter_t *p_filter, picture_t *src, picture_t *dst) { copy_cache_t *p_copy_cache = (copy_cache_t*) p_filter->p_sys; - picture_sys_t *p_sys = &((struct va_pic_context *)src->context)->picsys; + picture_sys_d3d9_t *p_sys = &((struct va_pic_context *)src->context)->picsys; D3DSURFACE_DESC desc; D3DLOCKED_RECT lock; @@ -144,7 +144,7 @@ static void DXA9_YV12(filter_t *p_filter, picture_t *src, picture_t *dst) static void DXA9_NV12(filter_t *p_filter, picture_t *src, picture_t *dst) { copy_cache_t *p_copy_cache = (copy_cache_t*) p_filter->p_sys; - picture_sys_t *p_sys = &((struct va_pic_context *)src->context)->picsys; + picture_sys_d3d9_t *p_sys = &((struct va_pic_context *)src->context)->picsys; D3DSURFACE_DESC desc; D3DLOCKED_RECT lock; @@ -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; + picture_sys_d3d9_t *p_sys = picture->p_sys; ReleaseD3D9PictureSys( p_sys ); free(p_sys); } @@ -254,8 +254,8 @@ static struct picture_context_t *d3d9_pic_context_copy(struct picture_context_t static void YV12_D3D9(filter_t *p_filter, picture_t *src, picture_t *dst) { filter_sys_t *sys = p_filter->p_sys; - picture_sys_t *p_sys = dst->p_sys; - picture_sys_t *p_staging_sys = sys->staging->p_sys; + picture_sys_d3d9_t *p_sys = dst->p_sys; + picture_sys_d3d9_t *p_staging_sys = sys->staging->p_sys; D3DSURFACE_DESC texDesc; IDirect3DSurface9_GetDesc( p_sys->surface, &texDesc); @@ -414,7 +414,7 @@ int D3D9OpenCPUConverter( vlc_object_t *obj ) { picture_resource_t res; res.pf_destroy = DestroyPicture; - picture_sys_t *res_sys = calloc(1, sizeof(picture_sys_t)); + picture_sys_d3d9_t *res_sys = calloc(1, sizeof(picture_sys_d3d9_t)); if (res_sys == NULL) { err = VLC_ENOMEM; goto done; diff --git a/modules/hw/d3d9/dxva2_deinterlace.c b/modules/hw/d3d9/dxva2_deinterlace.c index c45b341609..ac8e3822d7 100644 --- a/modules/hw/d3d9/dxva2_deinterlace.c +++ b/modules/hw/d3d9/dxva2_deinterlace.c @@ -40,7 +40,7 @@ #include "d3d9_filters.h" -typedef picture_sys_t VA_PICSYS; +typedef picture_sys_d3d9_t VA_PICSYS; #include "../../codec/avcodec/va_surface.h" typedef struct @@ -145,7 +145,7 @@ static void FillSample( DXVA2_VideoSample *p_sample, const RECT *p_area, int i_field ) { - picture_sys_t *p_sys_src = ActivePictureSys(p_pic); + picture_sys_d3d9_t *p_sys_src = ActivePictureSys(p_pic); p_sample->SrcSurface = p_sys_src->surface; p_sample->SampleFormat.SampleFormat = p_pic->b_top_field_first ? @@ -189,7 +189,7 @@ static int RenderPic( filter_t *filter, picture_t *p_outpic, picture_t *src, int order, int i_field ) { filter_sys_t *sys = filter->p_sys; - picture_sys_t *p_out_sys = p_outpic->p_sys; + picture_sys_d3d9_t *p_out_sys = p_outpic->p_sys; const int i_samples = sys->decoder_caps.NumBackwardRefSamples + 1 + sys->decoder_caps.NumForwardRefSamples; HRESULT hr; @@ -203,7 +203,7 @@ static int RenderPic( filter_t *filter, picture_t *p_outpic, picture_t *src, picture_t *p_cur = sys->context.pp_history[1]; picture_t *p_next = sys->context.pp_history[2]; - picture_sys_t *p_sys_src = ActivePictureSys(src); + picture_sys_d3d9_t *p_sys_src = ActivePictureSys(src); hr = IDirect3DSurface9_GetDesc( p_sys_src->surface, &srcDesc ); if (unlikely(FAILED(hr))) @@ -310,7 +310,7 @@ picture_t *AllocPicture( filter_t *p_filter ) { filter_sys_t *p_sys = p_filter->p_sys; picture_t *pic = filter_NewPicture( p_filter ); - picture_sys_t *pic_sys = pic->p_sys; + picture_sys_d3d9_t *pic_sys = pic->p_sys; if ( !pic->context ) { bool b_local_texture = false; diff --git a/modules/video_chroma/d3d9_fmt.c b/modules/video_chroma/d3d9_fmt.c index 8cdbaecbfa..c5afc91ac6 100644 --- a/modules/video_chroma/d3d9_fmt.c +++ b/modules/video_chroma/d3d9_fmt.c @@ -27,7 +27,7 @@ #include "d3d9_fmt.h" -typedef picture_sys_t VA_PICSYS; +typedef picture_sys_d3d9_t VA_PICSYS; #include "../codec/avcodec/va_surface.h" #undef D3D9_CreateDevice diff --git a/modules/video_chroma/d3d9_fmt.h b/modules/video_chroma/d3d9_fmt.h index 7d48df35c0..739ff0b9e7 100644 --- a/modules/video_chroma/d3d9_fmt.h +++ b/modules/video_chroma/d3d9_fmt.h @@ -38,7 +38,7 @@ typedef struct /* decoder only */ IDirectXVideoDecoder *decoder; /* keep a reference while the surface exist */ HINSTANCE dxva2_dll; -} picture_sys_t; +} picture_sys_d3d9_t; typedef struct { @@ -67,7 +67,7 @@ typedef struct D3DCAPS9 caps; } d3d9_device_t; -static inline void AcquireD3D9PictureSys(picture_sys_t *p_sys) +static inline void AcquireD3D9PictureSys(picture_sys_d3d9_t *p_sys) { IDirect3DSurface9_AddRef(p_sys->surface); if (p_sys->decoder) @@ -75,7 +75,7 @@ static inline void AcquireD3D9PictureSys(picture_sys_t *p_sys) p_sys->dxva2_dll = LoadLibrary(TEXT("DXVA2.DLL")); } -static inline void ReleaseD3D9PictureSys(picture_sys_t *p_sys) +static inline void ReleaseD3D9PictureSys(picture_sys_d3d9_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 c8f002d118..c26aeffba5 100644 --- a/modules/video_output/win32/direct3d9.c +++ b/modules/video_output/win32/direct3d9.c @@ -56,7 +56,7 @@ #endif #include "../../video_chroma/d3d9_fmt.h" -typedef picture_sys_t VA_PICSYS; +typedef picture_sys_d3d9_t VA_PICSYS; #include "../../codec/avcodec/va_surface.h" #include "common.h" @@ -257,7 +257,7 @@ static picture_pool_t *Direct3D9CreatePicturePool(vlc_object_t *o, for (picture_count = 0; picture_count < count; ++picture_count) { - picture_sys_t *picsys = calloc(1, sizeof(*picsys)); + picture_sys_d3d9_t *picsys = calloc(1, sizeof(*picsys)); if (unlikely(picsys == NULL)) goto error; @@ -1276,7 +1276,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture, sys->area.place_changed = false; } - picture_sys_t *p_sys = picture->p_sys; + picture_sys_d3d9_t *p_sys = picture->p_sys; IDirect3DSurface9 *surface = p_sys->surface; d3d9_device_t *p_d3d9_dev = &sys->d3d_dev; @@ -1852,7 +1852,7 @@ GLConvUpdate(const opengl_tex_converter_t *tc, GLuint *textures, struct glpriv *priv = tc->priv; HRESULT hr; - picture_sys_t *picsys = ActivePictureSys(pic); + picture_sys_d3d9_t *picsys = ActivePictureSys(pic); if (unlikely(!picsys || !priv->gl_render)) return VLC_EGENERIC; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
