Commit 41672aab authored by Thomas Guillem's avatar Thomas Guillem

fourcc: rename VLC_CODEC_CVPX_OPAQUE to VLC_CODEC_CVPX_NV12

Since it's always mapped/converted as a NV12 buffer.
parent 6694366f
......@@ -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',' ')
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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() }
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment