vlc | branch: master | Steve Lhomme <[email protected]> | Thu Dec 7 15:37:34 2017 +0100| [35b0a076bdb8c86d8d1180a30862300d5a21a5e4] | committer: Steve Lhomme
core: add VLC_CODEC_D3D11_OPAQUE_RGBA to differenciate from NV12 or P010 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=35b0a076bdb8c86d8d1180a30862300d5a21a5e4 --- include/vlc_fourcc.h | 1 + src/misc/fourcc.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index bd38e0a25f..bf4e20d871 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -373,6 +373,7 @@ /* D3D11VA opaque video surface for use with D3D11 */ #define VLC_CODEC_D3D11_OPAQUE VLC_FOURCC('D','X','1','1') /* 4:2:0 8 bpc */ #define VLC_CODEC_D3D11_OPAQUE_10B VLC_FOURCC('D','X','1','0') /* 4:2:0 10 bpc */ +#define VLC_CODEC_D3D11_OPAQUE_RGBA VLC_FOURCC('D','X','R','G') /* CVPixelBuffer opaque buffer type */ #define VLC_CODEC_CVPX_NV12 VLC_FOURCC('C','V','P','N') diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c index a43c68aa4d..6f384e760c 100644 --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -412,6 +412,10 @@ static const vlc_fourcc_t p_D3D11_OPAQUE_10B_fallback[] = { VLC_CODEC_D3D11_OPAQUE_10B, VLC_CODEC_P010, 0, }; +static const vlc_fourcc_t p_D3D11_OPAQUE_RGBA_fallback[] = { + VLC_CODEC_D3D11_OPAQUE, VLC_CODEC_RGBA, 0, +}; + static const vlc_fourcc_t p_I440_fallback[] = { VLC_CODEC_I440, VLC_CODEC_YUV_PLANAR_420, @@ -582,6 +586,7 @@ static const vlc_fourcc_t *pp_RGB_fallback[] = { p_RGB15_fallback, p_RGB8_fallback, p_CVPX_VIDEO_BGRA_fallback, + p_D3D11_OPAQUE_RGBA_fallback, NULL, }; @@ -743,7 +748,8 @@ static const struct { { VLC_CODEC_ANDROID_OPAQUE, VLC_CODEC_MMAL_OPAQUE, VLC_CODEC_D3D9_OPAQUE, VLC_CODEC_D3D11_OPAQUE }, FAKE_FMT() }, - { { VLC_CODEC_D3D11_OPAQUE_10B, VLC_CODEC_D3D9_OPAQUE_10B }, + { { VLC_CODEC_D3D11_OPAQUE_10B, VLC_CODEC_D3D9_OPAQUE_10B, + VLC_CODEC_D3D11_OPAQUE_RGBA }, FAKE_FMT() }, { { VLC_CODEC_CVPX_NV12, VLC_CODEC_CVPX_UYVY, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
