videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

vlc_fourcc: remove read-only VLC_CODEC_RGB16 

It's never used as such. Only 3 masks existed and they have been replaced with
VLC_CODEC_RGB565BE, VLC_CODEC_RGB565LE and VLC_CODEC_BGR565LE.
This commit is contained in:
Steve Lhomme 2023-09-04 13:37:31 +02:00 committed by Jean-Baptiste Kempf
parent aaaf525b3a
commit a8893dd50d
13 changed files with 1 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/vlc_fourcc.h
View File

@ -343,8 +343,6 @@
/* Palettized RGB with palette element R:G:B */
#define VLC_CODEC_RGBP VLC_FOURCC('R','G','B','P')
/* 16-bit RGB (using explicit masks) */
#define VLC_CODEC_RGB16 VLC_FOURCC('R','_','1','6')
/* 32-bit RGB, in memory address order: "XRGB" ignoring the x component */
#define VLC_CODEC_XRGB VLC_FOURCC('R','V','3','2')

2
modules/codec/avcodec/chroma.c
View File

@ -153,8 +153,6 @@ static const struct
{VLC_CODEC_BGR555BE, AV_PIX_FMT_BGR555BE, 0, 0, 0 },
{VLC_CODEC_BGR555LE, AV_PIX_FMT_BGR555LE, 0, 0, 0 },
VLC_RGB( VLC_CODEC_RGB16, AV_PIX_FMT_RGB565, AV_PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f )
{VLC_CODEC_RGB24, AV_PIX_FMT_RGB24, 0, 0, 0 },
{VLC_CODEC_BGR24, AV_PIX_FMT_BGR24, 0, 0, 0 },

1
modules/codec/avcodec/fourcc.c
View File

@ -63,7 +63,6 @@ static const struct vlc_avcodec_fourcc video_codecs[] =
{ VLC_CODEC_MP4V, AV_CODEC_ID_MPEG4 },
{ VLC_CODEC_RGB24, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_BGR24, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_RGB16, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_RGB332, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_RGB233, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_BGR233, AV_CODEC_ID_RAWVIDEO },

7
modules/demux/avi/bitmapinfoheader.h
View File

@ -45,9 +45,6 @@ static const struct
uint32_t i_rmask, i_gmask, i_bmask, i_amask;
uint8_t depth;
} bitmap_rgb_masks[] = {
{ VLC_CODEC_RGB16, 0xf800, /* FIXME it should be B5G6R5LE */
0x07e0,
0x001f, 0x0000, 16 },
{ VLC_CODEC_XRGB, 0x00ff0000,
0x0000ff00,
0x000000ff,
@ -324,10 +321,6 @@ static inline int CreateBitmapInfoHeader( const es_format_t *fmt,
case VLC_CODEC_BGR555LE:
biBitCount = 16;
break;
case VLC_CODEC_RGB16:
biBitCount = 16;
biCompression = BI_BITFIELDS;
break;
case VLC_CODEC_RGBP:
case VLC_CODEC_GREY:
biBitCount = 8;

10
modules/hw/mmal/mmal_picture.c
View File

@ -86,16 +86,6 @@ MMAL_FOURCC_T vlc_to_mmal_video_fourcc(const video_frame_format_t * const vf_vlc
return MMAL_ENCODING_ARGB;
case VLC_CODEC_RGB565BE:
return MMAL_ENCODING_RGB16;
case VLC_CODEC_RGB16:
{
// VLC RGB16 aka RV16 means we have to look at the mask values
const uint32_t r = vf_vlc->i_rmask;
const uint32_t g = vf_vlc->i_gmask;
const uint32_t b = vf_vlc->i_bmask;
if (r == 0xf800 && g == 0x7e0 && b == 0x1f)
return MMAL_ENCODING_RGB16;
break;
}
case VLC_CODEC_I420:
return MMAL_ENCODING_I420;
case VLC_CODEC_RGBA:

1
modules/isa/arm/neon/yuv_rgb.c
View File

@ -144,7 +144,6 @@ static int Open (filter_t *filter)
switch (filter->fmt_out.video.i_chroma)
{
case VLC_CODEC_RGB565LE:
case VLC_CODEC_RGB16:
switch (filter->fmt_in.video.i_chroma)
{
case VLC_CODEC_I420:

32
modules/video_chroma/i420_rgb.c
View File

@ -121,27 +121,6 @@ static int Activate( filter_t *p_filter )
msg_Dbg(p_filter, "RGB pixel format is R5G5B5");
p_filter->ops = &I420_R5G5B5_ops;
break;
case VLC_CODEC_RGB16:
/* If we don't have support for the bitmasks, bail out */
if( ( p_filter->fmt_out.video.i_rmask == 0x7c00
&& p_filter->fmt_out.video.i_gmask == 0x03e0
&& p_filter->fmt_out.video.i_bmask == 0x001f ) )
{
/* R5G5B6 pixel format */
msg_Dbg(p_filter, "RGB pixel format is R5G5B5");
p_filter->ops = &I420_R5G5B5_ops;
}
else if( ( p_filter->fmt_out.video.i_rmask == 0xf800
&& p_filter->fmt_out.video.i_gmask == 0x07e0
&& p_filter->fmt_out.video.i_bmask == 0x001f ) )
{
/* R5G6B5 pixel format */
msg_Dbg(p_filter, "RGB pixel format is R5G6B5");
p_filter->ops = &I420_R5G6B5_ops;
}
else
return VLC_EGENERIC;
break;
case VLC_CODEC_XRGB:
/* A8R8G8B8 pixel format */
msg_Dbg(p_filter, "RGB pixel format is XBGR");
@ -168,7 +147,6 @@ static int Activate( filter_t *p_filter )
case VLC_CODEC_BGR233:
p_filter->ops = &I420_RGB8_ops;
break;
case VLC_CODEC_RGB16:
case VLC_CODEC_RGB565:
case VLC_CODEC_BGR565:
case VLC_CODEC_RGB555:
@ -207,7 +185,6 @@ static int Activate( filter_t *p_filter )
p_sys->i_bytespp = 1;
break;
#endif
case VLC_CODEC_RGB16:
case VLC_CODEC_RGB565BE:
case VLC_CODEC_BGR565BE:
case VLC_CODEC_RGB565LE:
@ -377,13 +354,7 @@ static void SetYUV( filter_t *p_filter, const video_format_t *vfmt )
i_rbshift = 6;
break;
default:
i_lrshift = ctz(vfmt->i_rmask);
i_lgshift = ctz(vfmt->i_gmask);
i_lbshift = ctz(vfmt->i_bmask);
i_rrshift = 8 - vlc_popcount(vfmt->i_rmask);
i_rgshift = 8 - vlc_popcount(vfmt->i_gmask);
i_rbshift = 8 - vlc_popcount(vfmt->i_bmask);
break;
vlc_assert_unreachable();
}
/*
@ -400,7 +371,6 @@ static void SetYUV( filter_t *p_filter, const video_format_t *vfmt )
Set8bppPalette( p_filter, p_sys->p_rgb8 );
break;
case VLC_CODEC_RGB16:
case VLC_CODEC_RGB565BE:
case VLC_CODEC_BGR565BE:
case VLC_CODEC_RGB565LE:

11
modules/video_filter/blend.cpp
View File

@ -359,11 +359,6 @@ public:
gmask = 0x03e0;
rmask = 0x001f;
break;
case VLC_CODEC_RGB16:
rmask = fmt->i_rmask;
gmask = fmt->i_gmask;
bmask = fmt->i_bmask;
break;
default:
vlc_assert_unreachable();
}
@ -513,11 +508,6 @@ struct convertRgbToRgbSmall {
gmask = 0x03e0;
rmask = 0x001f;
break;
case VLC_CODEC_RGB16:
rmask = dst->i_rmask;
gmask = dst->i_gmask;
bmask = dst->i_bmask;
break;
default:
vlc_assert_unreachable();
}
@ -638,7 +628,6 @@ static const struct {
RGB(VLC_CODEC_RGB555, CPictureRGB16, convertRgbToRgbSmall),
RGB(VLC_CODEC_BGR555, CPictureRGB16, convertRgbToRgbSmall),
RGB(VLC_CODEC_RGB16, CPictureRGB16, convertRgbToRgbSmall),
RGB(VLC_CODEC_RGB565, CPictureRGB16, convertRgbToRgbSmall),
RGB(VLC_CODEC_BGR565, CPictureRGB16, convertRgbToRgbSmall),
RGB(VLC_CODEC_RGB24, CPictureRGB24, convertNone),

2
modules/video_output/libplacebo/utils.c
View File

@ -196,7 +196,6 @@ static const struct { vlc_fourcc_t fcc; struct fmt_desc desc; } formats[] = {
{ VLC_CODEC_RGB332, {PACKED(3, 2, 2)} },
{ VLC_CODEC_RGB565LE, {PACKED(3, 5, 1)} },
{ VLC_CODEC_RGB555LE, {PACKED(3, 5, 1)} },
{ VLC_CODEC_RGB16, {PACKED(3, 5, 1)} },
{ VLC_CODEC_RGB24, {PACKED(3, 8, 0)} },
{ VLC_CODEC_BGR24, {PACKED(3, 8, 0)} },
{ VLC_CODEC_RGBA, {PACKED(4, 8, 0)} },
@ -291,7 +290,6 @@ static void FillDesc(vlc_fourcc_t fcc, const struct fmt_desc *desc,
break;
case VLC_CODEC_RGB565LE:
case VLC_CODEC_RGB16:
// 5:6:5 instead of 5:5:5
data[0].component_size[1] += 1;
break;

3
modules/video_output/vmem.c
View File

@ -192,9 +192,6 @@ static int Open(vout_display_t *vd,
/* Define the bitmasks */
switch (fmt.i_chroma)
{
case VLC_CODEC_RGB16:
fmt.i_chroma = VLC_CODEC_BGR565;
break;
default:
break;
}

19
src/misc/es_format.c
View File

@ -41,12 +41,6 @@ void video_format_FixRgb( video_format_t *p_fmt )
{
switch( p_fmt->i_chroma )
{
case VLC_CODEC_RGB16:
p_fmt->i_rmask = 0xf800;
p_fmt->i_gmask = 0x07e0;
p_fmt->i_bmask = 0x001f;
break;
default:
// assert(!"a bogus mask was set on a chroma");
p_fmt->i_rmask = 0;
@ -237,19 +231,6 @@ bool video_format_IsSameChroma( const video_format_t *f1,
if( f1->i_chroma != f2->i_chroma )
return false;
if( f1->i_chroma == VLC_CODEC_RGB16 )
{
video_format_t v1 = *f1;
video_format_t v2 = *f2;
video_format_FixRgb( &v1 );
video_format_FixRgb( &v2 );
if( v1.i_rmask != v2.i_rmask ||
v1.i_gmask != v2.i_gmask ||
v1.i_bmask != v2.i_bmask )
return false;
}
return true;
}

6
src/misc/fourcc.c
View File

@ -574,7 +574,6 @@ static const vlc_fourcc_t p_RGB32_fallback[] = {
VLC_CODEC_RGB24,
VLC_CODEC_BGR24,
VLC_CODEC_RGB565LE,
VLC_CODEC_RGB16,
VLC_CODEC_RGB555LE,
VLC_CODEC_RGB233,
VLC_CODEC_BGR233,
@ -587,7 +586,6 @@ static const vlc_fourcc_t p_RGB24_fallback[] = {
VLC_CODEC_XRGB,
VLC_CODEC_BGRX,
VLC_CODEC_RGB565LE,
VLC_CODEC_RGB16,
VLC_CODEC_RGB555LE,
VLC_CODEC_RGB233,
VLC_CODEC_BGR233,
@ -596,7 +594,6 @@ static const vlc_fourcc_t p_RGB24_fallback[] = {
};
static const vlc_fourcc_t p_RGB16_fallback[] = {
VLC_CODEC_RGB565LE,
VLC_CODEC_RGB16,
VLC_CODEC_RGB24,
VLC_CODEC_BGR24,
VLC_CODEC_XRGB,
@ -610,7 +607,6 @@ static const vlc_fourcc_t p_RGB16_fallback[] = {
static const vlc_fourcc_t p_RGB15_fallback[] = {
VLC_CODEC_RGB555LE,
VLC_CODEC_RGB565LE,
VLC_CODEC_RGB16,
VLC_CODEC_RGB24,
VLC_CODEC_BGR24,
VLC_CODEC_XRGB,
@ -626,7 +622,6 @@ static const vlc_fourcc_t p_RGB8_fallback[] = {
VLC_CODEC_RGB332,
VLC_CODEC_RGB555LE,
VLC_CODEC_RGB565LE,
VLC_CODEC_RGB16,
VLC_CODEC_RGB24,
VLC_CODEC_BGR24,
VLC_CODEC_XRGB,
@ -829,7 +824,6 @@ static const struct
{ { VLC_CODEC_RGB555BE, VLC_CODEC_RGB555LE,
VLC_CODEC_BGR555LE, VLC_CODEC_BGR555BE }, PACKED_FMT(2, 15) },
{ { VLC_CODEC_RGB16, 0 }, PACKED_FMT(2, 16) },
{ { VLC_CODEC_RGB565LE, VLC_CODEC_RGB565BE,
VLC_CODEC_BGR565LE, VLC_CODEC_BGR565BE }, PACKED_FMT(2, 16) },
{ { VLC_CODEC_RGB24, VLC_CODEC_BGR24,

2
src/misc/fourcc_list.h
View File

@ -811,8 +811,6 @@ static const staticentry_t p_list_video[] = {
A("R332"),
B(VLC_CODEC_BGR233, "8 bits BGR 2:3:3"),
A("B233"),
B(VLC_CODEC_RGB16, "16 bits RGB"),
A("R_16"),
B(VLC_CODEC_RGBA, "32 bits RGBA"),
A("RGBA"),
B(VLC_CODEC_ARGB, "32 bits ARGB"),