[vlc-commits] va_surface: make the picture_sys type a define

Steve Lhomme git at videolan.org
Thu Jun 6 12:09:23 CEST 2019 

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jun  6 11:12:42 2019 +0200| [a35d855f4e59b310b5ba45ff7db8576ff2ee9df8] | committer: Steve Lhomme

va_surface: make the picture_sys type a define

So it can be renamed

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a35d855f4e59b310b5ba45ff7db8576ff2ee9df8
---

 modules/codec/avcodec/d3d11va.c         | 1 +
 modules/codec/avcodec/dxva2.c           | 1 +
 modules/codec/avcodec/va_surface.c      | 1 +
 modules/codec/avcodec/va_surface.h      | 4 ++--
 modules/hw/d3d11/d3d11_deinterlace.c    | 1 +
 modules/hw/d3d11/d3d11_filters.c        | 1 +
 modules/hw/d3d11/d3d11_instance.c       | 1 +
 modules/hw/d3d11/d3d11_surface.c        | 1 +
 modules/hw/d3d9/d3d9_filters.c          | 1 +
 modules/hw/d3d9/d3d9_instance.c         | 1 +
 modules/hw/d3d9/dxa9.c                  | 1 +
 modules/hw/d3d9/dxva2_deinterlace.c     | 1 +
 modules/video_chroma/d3d11_fmt.c        | 1 +
 modules/video_chroma/d3d9_fmt.c         | 1 +
 modules/video_output/win32/direct3d11.c | 1 +
 modules/video_output/win32/direct3d9.c  | 1 +
 16 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index 445cb3b10c..b4e8a4b39e 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -50,6 +50,7 @@
 
 #include "../../video_chroma/d3d11_fmt.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "va_surface.h"
 
 #define D3D_DecoderType     ID3D11VideoDecoder
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index d925a78171..51c75b6faa 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -37,6 +37,7 @@
 #include <libavcodec/dxva2.h>
 #include "../../video_chroma/d3d9_fmt.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "va_surface.h"
 
 #define D3D_DecoderType     IDirectXVideoDecoder
diff --git a/modules/codec/avcodec/va_surface.c b/modules/codec/avcodec/va_surface.c
index 008828d04a..d0d2528773 100644
--- a/modules/codec/avcodec/va_surface.c
+++ b/modules/codec/avcodec/va_surface.c
@@ -39,6 +39,7 @@ typedef struct
     void *dummy;
 } picture_sys_t;
 #include "va_surface_internal.h"
+typedef int VA_PICSYS;
 #include "va_surface.h"
 
 #include "avcodec.h"
diff --git a/modules/codec/avcodec/va_surface.h b/modules/codec/avcodec/va_surface.h
index 23fcc367c0..8d15efdbb5 100644
--- a/modules/codec/avcodec/va_surface.h
+++ b/modules/codec/avcodec/va_surface.h
@@ -33,10 +33,10 @@ struct va_pic_context
 {
     picture_context_t         s;
     struct vlc_va_surface_t *va_surface;
-    picture_sys_t             picsys;
+    VA_PICSYS                 picsys;
 };
 
-static inline picture_sys_t *ActivePictureSys(picture_t *p_pic)
+static inline VA_PICSYS *ActivePictureSys(picture_t *p_pic)
 {
     struct va_pic_context *pic_ctx = (struct va_pic_context*)p_pic->context;
     return pic_ctx ? &pic_ctx->picsys : p_pic->p_sys;
diff --git a/modules/hw/d3d11/d3d11_deinterlace.c b/modules/hw/d3d11/d3d11_deinterlace.c
index 7d4b2b90e1..4e7eb14a4e 100644
--- a/modules/hw/d3d11/d3d11_deinterlace.c
+++ b/modules/hw/d3d11/d3d11_deinterlace.c
@@ -39,6 +39,7 @@
 #include "../../video_chroma/d3d11_fmt.h"
 #include "../../video_filter/deinterlace/common.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "../../codec/avcodec/va_surface.h"
 
 typedef struct
diff --git a/modules/hw/d3d11/d3d11_filters.c b/modules/hw/d3d11/d3d11_filters.c
index 57c349144b..e35cf7cfb0 100644
--- a/modules/hw/d3d11/d3d11_filters.c
+++ b/modules/hw/d3d11/d3d11_filters.c
@@ -41,6 +41,7 @@
 #include "d3d11_processor.h"
 #include "../../video_chroma/d3d11_fmt.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "../../codec/avcodec/va_surface.h"
 
 #ifdef __MINGW32__
diff --git a/modules/hw/d3d11/d3d11_instance.c b/modules/hw/d3d11/d3d11_instance.c
index 9612062249..684943f928 100644
--- a/modules/hw/d3d11/d3d11_instance.c
+++ b/modules/hw/d3d11/d3d11_instance.c
@@ -33,6 +33,7 @@
 #include <d3d11.h>
 
 #include "d3d11_filters.h"
+typedef picture_sys_t VA_PICSYS;
 #include "../../codec/avcodec/va_surface.h"
 
 static vlc_mutex_t inst_lock = VLC_STATIC_MUTEX;
diff --git a/modules/hw/d3d11/d3d11_surface.c b/modules/hw/d3d11/d3d11_surface.c
index 730bf09154..4befbb4660 100644
--- a/modules/hw/d3d11/d3d11_surface.c
+++ b/modules/hw/d3d11/d3d11_surface.c
@@ -45,6 +45,7 @@
 #include "d3d11_processor.h"
 #include "../../video_chroma/d3d11_fmt.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "../../codec/avcodec/va_surface.h"
 
 #ifdef ID3D11VideoContext_VideoProcessorBlt
diff --git a/modules/hw/d3d9/d3d9_filters.c b/modules/hw/d3d9/d3d9_filters.c
index 5152e53810..f8cf8b7108 100644
--- a/modules/hw/d3d9/d3d9_filters.c
+++ b/modules/hw/d3d9/d3d9_filters.c
@@ -39,6 +39,7 @@
 #include <dxva2api.h>
 #include "../../video_chroma/d3d9_fmt.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "../../codec/avcodec/va_surface.h"
 
 #include "d3d9_filters.h"
diff --git a/modules/hw/d3d9/d3d9_instance.c b/modules/hw/d3d9/d3d9_instance.c
index 3b63238f9d..7165d6449c 100644
--- a/modules/hw/d3d9/d3d9_instance.c
+++ b/modules/hw/d3d9/d3d9_instance.c
@@ -34,6 +34,7 @@
 
 #include "d3d9_filters.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "../../codec/avcodec/va_surface.h"
 
 static vlc_mutex_t inst_lock = VLC_STATIC_MUTEX;
diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c
index c954c65835..361f55bb22 100644
--- a/modules/hw/d3d9/dxa9.c
+++ b/modules/hw/d3d9/dxa9.c
@@ -41,6 +41,7 @@
 #include <d3d9.h>
 #include "../../video_chroma/d3d9_fmt.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "../../codec/avcodec/va_surface.h"
 
 typedef struct
diff --git a/modules/hw/d3d9/dxva2_deinterlace.c b/modules/hw/d3d9/dxva2_deinterlace.c
index bba0313a52..c45b341609 100644
--- a/modules/hw/d3d9/dxva2_deinterlace.c
+++ b/modules/hw/d3d9/dxva2_deinterlace.c
@@ -40,6 +40,7 @@
 
 #include "d3d9_filters.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "../../codec/avcodec/va_surface.h"
 
 typedef struct
diff --git a/modules/video_chroma/d3d11_fmt.c b/modules/video_chroma/d3d11_fmt.c
index e1f60cd49e..cba6a400ab 100644
--- a/modules/video_chroma/d3d11_fmt.c
+++ b/modules/video_chroma/d3d11_fmt.c
@@ -38,6 +38,7 @@
 
 #include "d3d11_fmt.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "../codec/avcodec/va_surface.h"
 
 void AcquireD3D11PictureSys(picture_sys_t *p_sys)
diff --git a/modules/video_chroma/d3d9_fmt.c b/modules/video_chroma/d3d9_fmt.c
index a3f5e47836..8cdbaecbfa 100644
--- a/modules/video_chroma/d3d9_fmt.c
+++ b/modules/video_chroma/d3d9_fmt.c
@@ -27,6 +27,7 @@
 
 #include "d3d9_fmt.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "../codec/avcodec/va_surface.h"
 
 #undef D3D9_CreateDevice
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index f60c65f9e3..4eabe17698 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -51,6 +51,7 @@
 # include <windows.ui.xaml.media.dxinterop.h> */
 
 #include "../../video_chroma/d3d11_fmt.h"
+typedef picture_sys_t VA_PICSYS;
 #include "../../codec/avcodec/va_surface.h"
 
 #include "d3d11_quad.h"
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index f5627b1058..c8f002d118 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -56,6 +56,7 @@
 #endif
 #include "../../video_chroma/d3d9_fmt.h"
 
+typedef picture_sys_t VA_PICSYS;
 #include "../../codec/avcodec/va_surface.h"
 
 #include "common.h"

More information about the vlc-commits mailing list