[vlc-commits] fourcc: rename VLC_CODEC_CVPX_OPAQUE to VLC_CODEC_CVPX_NV12

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Feb  1 15:56:00 2017 +0100| [41672aab92782cc7b261027d3e8da0690d23c77e] | committer: Thomas Guillem

fourcc: rename VLC_CODEC_CVPX_OPAQUE to VLC_CODEC_CVPX_NV12

Since it's always mapped/converted as a NV12 buffer.

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

 include/vlc_fourcc.h             | 2 +-
 modules/codec/videotoolbox.m     | 2 +-
 modules/video_chroma/cvpx_i420.c | 2 +-
 modules/video_output/ios2.m      | 2 +-
 src/misc/fourcc.c                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 50261c6..a0f07b2 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -362,7 +362,7 @@
 #define VLC_CODEC_D3D11_OPAQUE_10B      VLC_FOURCC('D','X','1','0') /* 4:2:0 10 bpc */
 
 /* CVPixelBuffer opaque buffer type */
-#define VLC_CODEC_CVPX_OPAQUE     VLC_FOURCC('C','V','P','X')
+#define VLC_CODEC_CVPX_NV12       VLC_FOURCC('C','V','P','N')
 
 /* Image codec (video) */
 #define VLC_CODEC_PNG             VLC_FOURCC('p','n','g',' ')
diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
index 84a6e3d7..b4e9ce1 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -749,7 +749,7 @@ static int OpenDecoder(vlc_object_t *p_this)
     p_dec->fmt_out.audio = p_dec->fmt_in.audio;
     if (p_sys->b_zero_copy) {
         msg_Dbg(p_dec, "zero-copy rendering pipeline enabled");
-        p_dec->fmt_out.i_codec = VLC_CODEC_CVPX_OPAQUE;
+        p_dec->fmt_out.i_codec = VLC_CODEC_CVPX_NV12;
     } else {
         msg_Dbg(p_dec, "copy rendering pipeline enabled");
         p_dec->fmt_out.i_codec = VLC_CODEC_I420;
diff --git a/modules/video_chroma/cvpx_i420.c b/modules/video_chroma/cvpx_i420.c
index 26e8c2e..e5f08cb 100644
--- a/modules/video_chroma/cvpx_i420.c
+++ b/modules/video_chroma/cvpx_i420.c
@@ -51,7 +51,7 @@ vlc_module_end ()
 static int Activate(vlc_object_t *obj)
 {
     filter_t *p_filter = (filter_t *)obj;
-    if (p_filter->fmt_in.video.i_chroma != VLC_CODEC_CVPX_OPAQUE)
+    if (p_filter->fmt_in.video.i_chroma != VLC_CODEC_CVPX_NV12)
         return VLC_EGENERIC;
 
     if (p_filter->fmt_in.video.i_height != p_filter->fmt_out.video.i_height
diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index 14463c7..130ae7b 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -232,7 +232,7 @@ static int Open(vlc_object_t *this)
     sys->gl = NULL;
 
     @autoreleasepool {
-        if (vd->fmt.i_chroma == VLC_CODEC_CVPX_OPAQUE) {
+        if (vd->fmt.i_chroma == VLC_CODEC_CVPX_NV12) {
             msg_Dbg(vd, "will use zero-copy rendering");
             sys->zero_copy = true;
         }
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 20269b6..99f3894 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -676,7 +676,7 @@ static const struct
                                                FAKE_FMT() },
     { { VLC_CODEC_D3D11_OPAQUE_10B, VLC_CODEC_D3D9_OPAQUE_10B },
                                                FAKE_FMT() },
-    { { VLC_CODEC_CVPX_OPAQUE },               FAKE_FMT() },
+    { { VLC_CODEC_CVPX_NV12 },                 FAKE_FMT() },
 
     { { 0 },                                   FAKE_FMT() }
 };