Commit 9713c02a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Reserve RGBT codec (RGBA 5-5-5-1)

parent dfae18e3
...@@ -150,19 +150,21 @@ ...@@ -150,19 +150,21 @@
#define VLC_CODEC_RGBP VLC_FOURCC('R','G','B','P') #define VLC_CODEC_RGBP VLC_FOURCC('R','G','B','P')
/* 8 bits RGB */ /* 8 bits RGB */
#define VLC_CODEC_RGB8 VLC_FOURCC('R','G','B','8') #define VLC_CODEC_RGB8 VLC_FOURCC('R','G','B','8')
/* 12 bits RGB stored on 16 bits */ /* 12 bits RGB padded to 16 bits */
#define VLC_CODEC_RGB12 VLC_FOURCC('R','V','1','2') #define VLC_CODEC_RGB12 VLC_FOURCC('R','V','1','2')
/* 16 bits VLC RGBA */ /* 16 bits RGBA (12 bits RGB + 4 bits alpha) */
#define VLC_CODEC_RGBA16 VLC_FOURCC('A','V','1','6') #define VLC_CODEC_RGBA16 VLC_FOURCC('A','V','1','6')
/* 15 bits RGB stored on 16 bits */ /* 15 bits RGB padded to 16 bits */
#define VLC_CODEC_RGB15 VLC_FOURCC('R','V','1','5') #define VLC_CODEC_RGB15 VLC_FOURCC('R','V','1','5')
/* 16 bits RGB store on a 16 bits */ /* 16 bits RGBA (15 bits RGB + 1 bit alpha) */
#define VLC_CODEC_RGBT VLC_FOURCC('R','G','B','T')
/* 16 bits RGB */
#define VLC_CODEC_RGB16 VLC_FOURCC('R','V','1','6') #define VLC_CODEC_RGB16 VLC_FOURCC('R','V','1','6')
/* 24 bits RGB */ /* 24 bits RGB */
#define VLC_CODEC_RGB24 VLC_FOURCC('R','V','2','4') #define VLC_CODEC_RGB24 VLC_FOURCC('R','V','2','4')
/* 32 bits RGB */ /* 24 bits RGB padded to 32 bits */
#define VLC_CODEC_RGB32 VLC_FOURCC('R','V','3','2') #define VLC_CODEC_RGB32 VLC_FOURCC('R','V','3','2')
/* 32 bits VLC RGBA */ /* 32 bits RGBA */
#define VLC_CODEC_RGBA VLC_FOURCC('R','G','B','A') #define VLC_CODEC_RGBA VLC_FOURCC('R','G','B','A')
/* 8 bits grey */ /* 8 bits grey */
#define VLC_CODEC_GREY VLC_FOURCC('G','R','E','Y') #define VLC_CODEC_GREY VLC_FOURCC('G','R','E','Y')
......
...@@ -674,6 +674,8 @@ static const entry_t p_list_video[] = { ...@@ -674,6 +674,8 @@ static const entry_t p_list_video[] = {
A("AV16"), A("AV16"),
B(VLC_CODEC_RGB15, "15 bits RGB"), B(VLC_CODEC_RGB15, "15 bits RGB"),
A("RV15"), A("RV15"),
B(VLC_CODEC_RGBT, "16 bits RGBT"),
A("RGBT"),
B(VLC_CODEC_RGB16, "16 bits RGB"), B(VLC_CODEC_RGB16, "16 bits RGB"),
A("RV16"), A("RV16"),
B(VLC_CODEC_RGB24, "24 bits RGB"), B(VLC_CODEC_RGB24, "24 bits RGB"),
...@@ -1619,7 +1621,7 @@ bool vlc_fourcc_IsYUV(vlc_fourcc_t fcc) ...@@ -1619,7 +1621,7 @@ bool vlc_fourcc_IsYUV(vlc_fourcc_t fcc)
static const struct static const struct
{ {
vlc_fourcc_t p_fourcc[5]; vlc_fourcc_t p_fourcc[6];
vlc_chroma_description_t description; vlc_chroma_description_t description;
} p_list_chroma_description[] = { } p_list_chroma_description[] = {
{ { VLC_CODEC_I411, 0 }, PLANAR(3, 4, 1) }, { { VLC_CODEC_I411, 0 }, PLANAR(3, 4, 1) },
...@@ -1633,7 +1635,7 @@ static const struct ...@@ -1633,7 +1635,7 @@ static const struct
{ { VLC_CODEC_YUV_PACKED, 0 }, PACKED_FMT(2) }, { { VLC_CODEC_YUV_PACKED, 0 }, PACKED_FMT(2) },
{ { VLC_CODEC_RGB8, VLC_CODEC_GREY, { { VLC_CODEC_RGB8, VLC_CODEC_GREY,
VLC_CODEC_YUVP, VLC_CODEC_RGBP, 0 }, PACKED_FMT(1) }, VLC_CODEC_YUVP, VLC_CODEC_RGBP, 0 }, PACKED_FMT(1) },
{ { VLC_CODEC_RGB16, VLC_CODEC_RGB15, { { VLC_CODEC_RGB16, VLC_CODEC_RGB15, VLC_CODEC_RGBT,
VLC_CODEC_RGB12, VLC_CODEC_RGBA16, 0 },PACKED_FMT(2) }, VLC_CODEC_RGB12, VLC_CODEC_RGBA16, 0 },PACKED_FMT(2) },
{ { VLC_CODEC_RGB24, 0 }, PACKED_FMT(3) }, { { VLC_CODEC_RGB24, 0 }, PACKED_FMT(3) },
{ { VLC_CODEC_RGB32, VLC_CODEC_RGBA, 0 }, PACKED_FMT(4) }, { { VLC_CODEC_RGB32, VLC_CODEC_RGBA, 0 }, PACKED_FMT(4) },
......
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