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

vlc_fourcc: rename VLC_CODEC_RGB24 to VLC_CODEC_RGB24M 

To signify it uses a mask, and to leave room for a real VLC_CODEC_RGB24 without
a mask.
This commit is contained in:
Steve Lhomme 2023-09-15 07:55:09 +02:00
parent d7ef2f9447
commit 0127ad54f9
45 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/vlc_fourcc.h
View File

@ -348,7 +348,7 @@
/* 16-bit RGB (using explicit masks) */
#define VLC_CODEC_RGB16 VLC_FOURCC('R','V','1','6')
/* 24-bit RGB (using explicit masks) */
#define VLC_CODEC_RGB24 VLC_FOURCC('R','V','2','4')
#define VLC_CODEC_RGB24M VLC_FOURCC('R','V','2','4')
/* 24-bit RGB padded to 32 bits (using explicit masks) */
#define VLC_CODEC_RGB32 VLC_FOURCC('R','V','3','2')

4
modules/access/dshow/dshow.cpp
View File

@ -626,7 +626,7 @@ static void SetRGBMasks( vlc_fourcc_t i_fourcc, video_format_t *fmt )
{
switch( i_fourcc )
{
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
/* This is in BGR format */
fmt->i_bmask = 0x00ff0000;
fmt->i_gmask = 0x0000ff00;
@ -940,7 +940,7 @@ static int GetFourCCPriority( vlc_fourcc_t i_fourcc )
case VLC_CODEC_YV12:
case VLC_FOURCC('a','r','a','w'):
return 8;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
return 7;
case VLC_CODEC_YUYV:
case VLC_CODEC_BGRX:

2
modules/access/dshow/filter.cpp
View File

@ -116,7 +116,7 @@ vlc_fourcc_t GetFourCCFromMediaType( const AM_MEDIA_TYPE &media_type )
else if( media_type.subtype == MEDIASUBTYPE_RGB565 )
i_fourcc = VLC_CODEC_RGB16;
else if( media_type.subtype == MEDIASUBTYPE_RGB24 )
i_fourcc = VLC_CODEC_RGB24;
i_fourcc = VLC_CODEC_RGB24M;
else if( media_type.subtype == MEDIASUBTYPE_RGB32 )
i_fourcc = VLC_CODEC_BGRX;
else if( media_type.subtype == MEDIASUBTYPE_ARGB32 )

2
modules/access/rdp.c
View File

@ -151,7 +151,7 @@ static BOOL desktopResizeHandler( rdpContext *p_context )
i_chroma = VLC_CODEC_RGB16;
break;
case 24:
i_chroma = VLC_CODEC_RGB24;
i_chroma = VLC_CODEC_RGB24M;
break;
case 32:
i_chroma = VLC_CODEC_ARGB;

2
modules/access/screen/win32.c
View File

@ -132,7 +132,7 @@ int screen_InitCaptureGDI( demux_t *p_demux )
case 16: /* Yes it is really 15 bits (when using BI_RGB) */
i_chroma = VLC_CODEC_RGB15; break;
case 24:
i_chroma = VLC_CODEC_RGB24; break;
i_chroma = VLC_CODEC_RGB24M; break;
case 32:
i_chroma = VLC_CODEC_BGRX; break;
default:

2
modules/access/screen/xcb.c
View File

@ -537,7 +537,7 @@ static es_out_id_t *InitES (demux_t *demux, uint_fast16_t width,
if (fmt->bits_per_pixel == 32)
chroma = VLC_CODEC_XRGB;
else if (fmt->bits_per_pixel == 24)
chroma = VLC_CODEC_RGB24;
chroma = VLC_CODEC_RGB24M;
break;
case 16:
if (fmt->bits_per_pixel == 16)

2
modules/access/shm.c
View File

@ -155,7 +155,7 @@ static int Open (vlc_object_t *obj)
chroma = VLC_CODEC_XRGB; bpp = 32;
break;
case 24:
chroma = VLC_CODEC_RGB24; bpp = 24;
chroma = VLC_CODEC_RGB24M; bpp = 24;
break;
case 16:
chroma = VLC_CODEC_RGB16; bpp = 16;

8
modules/access/v4l2/video.c
View File

@ -614,15 +614,15 @@ static const vlc_v4l2_fmt_t v4l2_fmts[] =
{ V4L2_PIX_FMT_XRGB32, VLC_CODEC_XRGB, 4, 0, 0, 0 },
#ifdef WORDS_BIGENDIAN
{ V4L2_PIX_FMT_RGB24, VLC_CODEC_RGB24, 3, 0xFF0000, 0x00FF00, 0x0000FF },
{ V4L2_PIX_FMT_BGR24, VLC_CODEC_RGB24, 3, 0x0000FF, 0x00FF00, 0xFF0000 },
{ V4L2_PIX_FMT_RGB24, VLC_CODEC_RGB24M, 3, 0xFF0000, 0x00FF00, 0x0000FF },
{ V4L2_PIX_FMT_BGR24, VLC_CODEC_RGB24M, 3, 0x0000FF, 0x00FF00, 0xFF0000 },
// { V4L2_PIX_FMT_RGB565, },
{ V4L2_PIX_FMT_RGB565X, VLC_CODEC_RGB16, 2, 0x001F, 0x07E0, 0xF800 },
// { V4L2_PIX_FMT_RGB555, },
{ V4L2_PIX_FMT_RGB555X, VLC_CODEC_RGB15, 2, 0x001F, 0x03E0, 0x7C00 },
#else
{ V4L2_PIX_FMT_RGB24, VLC_CODEC_RGB24, 3, 0x0000FF, 0x00FF00, 0xFF0000 },
{ V4L2_PIX_FMT_BGR24, VLC_CODEC_RGB24, 3, 0xFF0000, 0x00FF00, 0x0000FF },
{ V4L2_PIX_FMT_RGB24, VLC_CODEC_RGB24M, 3, 0x0000FF, 0x00FF00, 0xFF0000 },
{ V4L2_PIX_FMT_BGR24, VLC_CODEC_RGB24M, 3, 0xFF0000, 0x00FF00, 0x0000FF },
{ V4L2_PIX_FMT_RGB565, VLC_CODEC_RGB16, 2, 0x001F, 0x07E0, 0xF800 },
// { V4L2_PIX_FMT_RGB565X, },
{ V4L2_PIX_FMT_RGB555, VLC_CODEC_RGB15, 2, 0x001F, 0x03E0, 0x7C00 },

4
modules/access/vnc.c
View File

@ -165,7 +165,7 @@ static rfbBool mallocFrameBufferHandler( rfbClient* p_client )
i_chroma = VLC_CODEC_RGB16;
break;
case 24:
i_chroma = VLC_CODEC_RGB24;
i_chroma = VLC_CODEC_RGB24M;
break;
case 32:
i_chroma = VLC_CODEC_XRGB;
@ -182,7 +182,7 @@ static rfbBool mallocFrameBufferHandler( rfbClient* p_client )
p_client->format.greenMax = 0x3f;
p_client->format.blueMax = 0x1f;
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
case VLC_CODEC_XRGB:
p_client->format.redShift = 16;
p_client->format.greenShift = 8;

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

@ -145,7 +145,7 @@ static const struct
VLC_RGB( VLC_CODEC_RGB15, AV_PIX_FMT_RGB555, AV_PIX_FMT_BGR555, 0x7c00, 0x03e0, 0x001f )
VLC_RGB( VLC_CODEC_RGB16, AV_PIX_FMT_RGB565, AV_PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f )
VLC_RGB( VLC_CODEC_RGB24, AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, 0xff0000, 0x00ff00, 0x0000ff )
VLC_RGB( VLC_CODEC_RGB24M, AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, 0xff0000, 0x00ff00, 0x0000ff )
{VLC_CODEC_RGBX, AV_PIX_FMT_RGB0, 0, 0, 0 },
{VLC_CODEC_XRGB, AV_PIX_FMT_0RGB, 0, 0, 0 },

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

@ -569,7 +569,7 @@ int InitVideoEnc( vlc_object_t *p_this )
if( p_enc->fmt_out.i_codec == VLC_CODEC_TIFF )
{
p_enc->fmt_in.i_codec =
p_enc->fmt_in.video.i_chroma = VLC_CODEC_RGB24;
p_enc->fmt_in.video.i_chroma = VLC_CODEC_RGB24M;
}
p_context->pix_fmt = GetFfmpegChroma( &p_enc->fmt_in.video );

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

@ -62,7 +62,7 @@ static const struct vlc_avcodec_fourcc video_codecs[] =
{ VLC_CODEC_JPEGLS, AV_CODEC_ID_JPEGLS },
{ VLC_CODEC_MP4V, AV_CODEC_ID_MPEG4 },
{ VLC_CODEC_RGB32, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_RGB24, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_RGB24M, 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 },

2
modules/codec/bpg.c
View File

@ -120,7 +120,7 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
/* Set output properties */
p_dec->fmt_out.video.i_chroma =
p_dec->fmt_out.i_codec = VLC_CODEC_RGB24;
p_dec->fmt_out.i_codec = VLC_CODEC_RGB24M;
video_format_FixRgb(&p_dec->fmt_out.video);
p_dec->fmt_out.video.i_visible_width = p_dec->fmt_out.video.i_width = img_info.width;
p_dec->fmt_out.video.i_visible_height = p_dec->fmt_out.video.i_height = img_info.height;

6
modules/codec/dmo/dmo.c
View File

@ -459,7 +459,7 @@ static int DecOpen( decoder_t *p_dec )
p_dec->fmt_in->i_codec == VLC_CODEC_MSS2 ) &&
IsEqualGUID( &mt.subtype, &MEDIASUBTYPE_RGB24 ) )
{
i_chroma = VLC_CODEC_RGB24;
i_chroma = VLC_CODEC_RGB24M;
}
DMOFreeMediaType( &mt );
@ -483,7 +483,7 @@ static int DecOpen( decoder_t *p_dec )
}
p_bih = &p_vih->bmiHeader;
p_bih->biCompression = i_chroma == VLC_CODEC_RGB24 ? BI_RGB : i_chroma;
p_bih->biCompression = i_chroma == VLC_CODEC_RGB24M ? BI_RGB : i_chroma;
p_bih->biHeight *= -1;
p_bih->biBitCount = vlc_fourcc_GetChromaBPP(i_chroma);
p_bih->biSizeImage = p_dec->fmt_in->video.i_width *
@ -495,7 +495,7 @@ static int DecOpen( decoder_t *p_dec )
dmo_output_type.majortype = MEDIATYPE_Video;
dmo_output_type.formattype = FORMAT_VideoInfo;
if( i_chroma == VLC_CODEC_RGB24 )
if( i_chroma == VLC_CODEC_RGB24M )
{
dmo_output_type.subtype = MEDIASUBTYPE_RGB24;
}

2
modules/codec/jpeg.c
View File

@ -187,7 +187,7 @@ static int OpenDecoder(vlc_object_t *p_this)
p_dec->pf_decode = DecodeBlock;
p_dec->fmt_out.i_codec =
p_dec->fmt_out.video.i_chroma = VLC_CODEC_RGB24;
p_dec->fmt_out.video.i_chroma = VLC_CODEC_RGB24M;
p_dec->fmt_out.video.i_rmask = 0;
p_dec->fmt_out.video.i_gmask = 0;
p_dec->fmt_out.video.i_bmask = 0;

2
modules/codec/mft.cpp
View File

@ -293,7 +293,7 @@ static const pair_format_guid video_format_table[] =
*/
static const pair_format_guid d3d_format_table[] = {
{ VLC_CODEC_BGRX, MFVideoFormat_RGB32 },
{ VLC_CODEC_RGB24, MFVideoFormat_RGB24 },
{ VLC_CODEC_RGB24M, MFVideoFormat_RGB24 },
{ VLC_CODEC_BGRA, MFVideoFormat_ARGB32 },
{ VLC_CODEC_GREY, MFVideoFormat_L8 },
{ 0, GUID_NULL }

4
modules/codec/png.c
View File

@ -345,7 +345,7 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
}
else if( !(i_color_type & PNG_COLOR_MASK_ALPHA) )
{
p_dec->fmt_out.i_codec = VLC_CODEC_RGB24;
p_dec->fmt_out.i_codec = VLC_CODEC_RGB24M;
}
/* Get a new picture */
@ -429,7 +429,7 @@ static int OpenEncoder(vlc_object_t *p_this)
p_enc->fmt_in.video.i_visible_height;
p_enc->fmt_in.i_codec =
p_enc->fmt_in.video.i_chroma = VLC_CODEC_RGB24;
p_enc->fmt_in.video.i_chroma = VLC_CODEC_RGB24M;
p_enc->fmt_in.video.i_rmask = 0;
p_enc->fmt_in.video.i_gmask = 0;
p_enc->fmt_in.video.i_bmask = 0;

2
modules/codec/xwd.c
View File

@ -78,7 +78,7 @@ static int Decode (decoder_t *dec, block_t *block)
switch (ntohl(hdr->bits_per_pixel))
{
case 32: chroma = VLC_CODEC_XRGB; break;
case 24: chroma = VLC_CODEC_RGB24; break;
case 24: chroma = VLC_CODEC_RGB24M; break;
}
break;
case 32:

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

@ -50,7 +50,7 @@ static const struct
{ VLC_CODEC_RGB16, 0xf800, /* FIXME it should be B5G6R5LE */
0x07e0,
0x001f, },
{ VLC_CODEC_RGB24, 0x000000ff, /* BGR (see biBitCount) */
{ VLC_CODEC_RGB24M, 0x000000ff, /* BGR (see biBitCount) */
0x0000ff00,
0x00ff0000, },
{ VLC_CODEC_RGB32, 0x00ff0000, /* This is in XRGB format */
@ -117,7 +117,7 @@ static inline int ParseBitmapInfoHeader( const VLC_BITMAPINFOHEADER *p_bih, size
fmt->video.i_chroma = fmt->i_codec = VLC_CODEC_RGB32;
break;
case 24:
fmt->video.i_chroma = fmt->i_codec = VLC_CODEC_RGB24; /* BGR (see biBitCount) */
fmt->video.i_chroma = fmt->i_codec = VLC_CODEC_RGB24M; /* BGR (see biBitCount) */
break;
case 16:
fmt->video.i_chroma = fmt->i_codec = VLC_CODEC_RGB16; /* RGB (5,6,5 bits) */
@ -292,7 +292,7 @@ static inline int CreateBitmapInfoHeader( const es_format_t *fmt,
biCompression = BI_BITFIELDS;
b_has_alpha = true;
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
biBitCount = 24;
break;
case VLC_CODEC_RGB16:

4
modules/demux/mp4/essetup.c
View File

@ -431,7 +431,7 @@ int SetupVideoES( demux_t *p_demux, const mp4_track_t *p_track, const MP4_Box_t
p_fmt->video.i_bmask = 0;
break;
case VLC_FOURCC('2','4','B','G'):
p_fmt->i_codec = VLC_CODEC_RGB24;
p_fmt->i_codec = VLC_CODEC_RGB24M;
p_fmt->video.i_rmask = 0x0000FF;
p_fmt->video.i_gmask = 0x00FF00;
p_fmt->video.i_bmask = 0xFF0000;
@ -442,7 +442,7 @@ int SetupVideoES( demux_t *p_demux, const mp4_track_t *p_track, const MP4_Box_t
p_fmt->i_codec = VLC_CODEC_RGB15;
break;
case 24:
p_fmt->i_codec = VLC_CODEC_RGB24;
p_fmt->i_codec = VLC_CODEC_RGB24M;
break;
case 32:
p_fmt->i_codec = VLC_CODEC_ARGB;

2
modules/gui/qt/style/systempalette.cpp
View File

@ -248,7 +248,7 @@ QImage ExternalPaletteImpl::getCSDImage(vlc_qt_theme_csd_button_type type, vlc_q
case VLC_CODEC_RGBA:
format = QImage::Format_RGBA8888_Premultiplied;
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
format = QImage::Format_RGB888;
break;
default:

8
modules/stream_out/rtpfmt.c
View File

@ -659,7 +659,7 @@ int rtp_get_fmt( vlc_object_t *obj, const es_format_t *p_fmt, const char *mux,
return VLC_ENOMEM;
}
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
rtp_fmt->ptname = "raw";
rtp_fmt->pf_packetize = rtp_packetize_rgb24;
if( asprintf( &rtp_fmt->fmtp,
@ -1733,7 +1733,7 @@ static int rtp_packetize_rawvideo( sout_stream_id_sys_t *id, block_t *in, vlc_fo
int i_xdec, i_ydec; /* sub-sampling factor in x and y */
switch( i_format )
{
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
i_pgroup = 3;
i_xdec = i_ydec = 1;
break;
@ -1832,7 +1832,7 @@ static int rtp_packetize_rawvideo( sout_stream_id_sys_t *id, block_t *in, vlc_fo
uint16_t i_offs = GetWBE( p_headers + 4 ) & 0x7fff;
i_cont = p_headers[4] & 0x80;
if( i_format == VLC_CODEC_RGB24 )
if( i_format == VLC_CODEC_RGB24M )
{
const int i_ystride = i_width * i_pgroup;
i_offs /= i_xdec;
@ -1869,7 +1869,7 @@ static int rtp_packetize_r420( sout_stream_id_sys_t *id, block_t *in )
static int rtp_packetize_rgb24( sout_stream_id_sys_t *id, block_t *in )
{
return rtp_packetize_rawvideo( id, in, VLC_CODEC_RGB24 );
return rtp_packetize_rawvideo( id, in, VLC_CODEC_RGB24M );
}
static int rtp_packetize_jpeg( sout_stream_id_sys_t *id, block_t *in )

4
modules/video_chroma/chain.c
View File

@ -78,7 +78,7 @@ static const vlc_fourcc_t pi_allowed_chromas_yuv[] = {
VLC_CODEC_XRGB,
VLC_CODEC_BGRX,
VLC_CODEC_RGB32,
VLC_CODEC_RGB24,
VLC_CODEC_RGB24M,
VLC_CODEC_BGRA,
0
};
@ -90,7 +90,7 @@ static const vlc_fourcc_t pi_allowed_chromas_yuv10[] = {
VLC_CODEC_XRGB,
VLC_CODEC_BGRX,
VLC_CODEC_RGB32,
VLC_CODEC_RGB24,
VLC_CODEC_RGB24M,
VLC_CODEC_BGRA,
0
};

4
modules/video_chroma/i420_rgb.c
View File

@ -241,7 +241,7 @@ static int Activate( filter_t *p_filter )
case VLC_CODEC_XBGR:
case VLC_CODEC_RGBX:
case VLC_CODEC_BGRX:
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
case VLC_CODEC_RGB32:
p_sys->i_bytespp = 4;
break;
@ -387,7 +387,7 @@ static void SetYUV( filter_t *p_filter, const video_format_t *vfmt )
case VLC_CODEC_XBGR:
case VLC_CODEC_RGBX:
case VLC_CODEC_BGRX:
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
case VLC_CODEC_RGB32:
p_sys->p_rgb32 = (uint32_t *)p_sys->p_base;
for( unsigned i_index = 0; i_index < RED_MARGIN; i_index++ )

2
modules/video_chroma/rv32.c
View File

@ -56,7 +56,7 @@ static const struct vlc_filter_operations filter_ops = {
static int OpenFilter( filter_t *p_filter )
{
/* XXX Only support RV24 -> RV32 conversion */
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_RGB24 ||
if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_RGB24M ||
(p_filter->fmt_out.video.i_chroma != VLC_CODEC_RGB32 &&
p_filter->fmt_out.video.i_chroma != VLC_CODEC_RGBA) )
{

6
modules/video_filter/ball.c
View File

@ -242,7 +242,7 @@ static int Create( filter_t *p_filter )
&p_sys->i_u_offset,
&p_sys->i_v_offset );
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
p_sys->drawingPixelFunction = drawPixelRGB24;
COLORS_RGB
break;
@ -532,7 +532,7 @@ static void FilterBall( filter_t *p_filter, picture_t *p_inpic,
switch( p_filter->fmt_in.video.i_chroma )
{
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
CASE_PACKED_YUV_422
video_format_Init( &fmt_comp, VLC_CODEC_GREY );
fmt_comp.i_width = p_filter->fmt_in.video.i_width;
@ -771,7 +771,7 @@ static void FilterBall( filter_t *p_filter, picture_t *p_inpic,
switch( p_filter->fmt_in.video.i_chroma )
{
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
CASE_PACKED_YUV_422
picture_Release( p_converted );
default:

2
modules/video_filter/blend.cpp
View File

@ -576,7 +576,7 @@ static const struct {
RGB(VLC_CODEC_RGB15, CPictureRGB16, convertRgbToRgbSmall),
RGB(VLC_CODEC_RGB16, CPictureRGB16, convertRgbToRgbSmall),
RGB(VLC_CODEC_RGB24, CPictureRGB24, convertNone),
RGB(VLC_CODEC_RGB24M, CPictureRGB24, convertNone),
RGB(VLC_CODEC_RGB32, CPictureRGB32, convertNone),
RGB(VLC_CODEC_RGBA, CPictureRGBA, convertNone),
RGB(VLC_CODEC_ARGB, CPictureRGBA, convertNone),

4
modules/video_filter/filter_picture.h
View File

@ -144,10 +144,10 @@ static inline int GetPackedRgbIndexes( const video_format_t *p_fmt, int *i_r_ind
*i_r_index = 3;
break;
case VLC_CODEC_RGB32:
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
#ifdef WORDS_BIGENDIAN
{
const int i_mask_bits = p_fmt->i_chroma == VLC_CODEC_RGB24 ? 16 : 24;
const int i_mask_bits = p_fmt->i_chroma == VLC_CODEC_RGB24M ? 16 : 24;
*i_r_index = (i_mask_bits - vlc_ctz(p_fmt->i_rmask)) / 8;
*i_g_index = (i_mask_bits - vlc_ctz(p_fmt->i_gmask)) / 8;
*i_b_index = (i_mask_bits - vlc_ctz(p_fmt->i_bmask)) / 8;

4
modules/video_filter/mirror.c
View File

@ -120,7 +120,7 @@ static int Create( filter_t *p_filter )
break;
CASE_PACKED_YUV_422
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
case VLC_CODEC_RGB32:
case VLC_CODEC_RGBA:
case VLC_CODEC_ARGB:
@ -225,7 +225,7 @@ static void VerticalMirror( picture_t *p_pic, picture_t *p_outpic, int i_plane,
break;
case VLC_CODEC_UYVY:
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
RV24VerticalMirror( p_pic, p_outpic, i_plane, b_left_to_right );
break;
case VLC_CODEC_RGB32:

2
modules/video_filter/opencv_wrapper.c
View File

@ -332,7 +332,7 @@ static void VlcPictureToIplImage( filter_t* p_filter, picture_t* p_in )
//rgb2 gives 3 separate planes, this gives 1 interleaved plane
//rv24 gives is about 20% faster but gives r&b the wrong way round
//and I can't think of an easy way to fix this
fmt_out.i_chroma = VLC_CODEC_RGB24;
fmt_out.i_chroma = VLC_CODEC_RGB24M;
}
else if (p_sys->i_internal_chroma == GREY)
{

4
modules/video_filter/posterize.c
View File

@ -102,7 +102,7 @@ static int Create( filter_t *p_filter )
break;
CASE_PACKED_YUV_422
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
break;
case VLC_CODEC_RGB32:
case VLC_CODEC_RGBA:
@ -171,7 +171,7 @@ static void Filter( filter_t *p_filter, picture_t *p_pic, picture_t *p_outpic )
switch( p_pic->format.i_chroma )
{
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
RVPosterize( p_pic, p_outpic, false, level );
break;
case VLC_CODEC_RGB32:

2
modules/video_filter/sepia.c
View File

@ -84,7 +84,7 @@ static const struct
SepiaFunction pf_sepia;
} p_sepia_cfg[] = {
{ VLC_CODEC_I420, PlanarI420Sepia },
{ VLC_CODEC_RGB24, RVSepia },
{ VLC_CODEC_RGB24M, RVSepia },
{ VLC_CODEC_RGB32, RVSepia },
{ VLC_CODEC_BGRA, RVSepia },
{ VLC_CODEC_RGBA, RVSepia },

8
modules/video_output/drm/fourcc.c
View File

@ -120,8 +120,8 @@ static const struct {
} rgb_fourcc_list[] = {
#ifdef WORDS_BIGENDIAN
/* 24-bit RGB */
{ DRM_FORMAT_RGB888, VLC_CODEC_RGB24, 0x0000FF, 0x00FF00, 0xFF0000 },
{ DRM_FORMAT_BGR888, VLC_CODEC_RGB24, 0xFF0000, 0x00FF00, 0x0000FF },
{ DRM_FORMAT_RGB888, VLC_CODEC_RGB24M, 0x0000FF, 0x00FF00, 0xFF0000 },
{ DRM_FORMAT_BGR888, VLC_CODEC_RGB24M, 0xFF0000, 0x00FF00, 0x0000FF },
/* 32-bit-padded 24-bit RGB */
{ DRM_FORMAT_XRGB8888, VLC_CODEC_RGB32,
0x0000FF00, 0x00FF0000, 0xFF000000 },
@ -141,8 +141,8 @@ static const struct {
{ DRM_FORMAT_RGB565, VLC_CODEC_RGB16, 0xF800, 0x07E0, 0x001F },
{ DRM_FORMAT_BGR565, VLC_CODEC_RGB16, 0x001F, 0x07E0, 0xF800 },
/* 24-bit RGB */
{ DRM_FORMAT_RGB888, VLC_CODEC_RGB24, 0xFF0000, 0x00FF00, 0x0000FF },
{ DRM_FORMAT_BGR888, VLC_CODEC_RGB24, 0x0000FF, 0x00FF00, 0xFF0000 },
{ DRM_FORMAT_RGB888, VLC_CODEC_RGB24M, 0xFF0000, 0x00FF00, 0x0000FF },
{ DRM_FORMAT_BGR888, VLC_CODEC_RGB24M, 0x0000FF, 0x00FF00, 0xFF0000 },
/* 32-bit-padded 24-bit RGB */
{ DRM_FORMAT_XRGB8888, VLC_CODEC_RGB32,
0x00FF0000, 0x0000FF00, 0x000000FF },

2
modules/video_output/flaschen.c
View File

@ -115,7 +115,7 @@ static int Open(vout_display_t *vd,
/* */
video_format_t fmt = *fmtp;
fmt.i_chroma = VLC_CODEC_RGB24;
fmt.i_chroma = VLC_CODEC_RGB24M;
/* TODO: check if this works on big-endian systems */
fmt.i_rmask = 0xff0000;
fmt.i_gmask = 0x00ff00;

2
modules/video_output/kva.c
View File

@ -489,7 +489,7 @@ static int OpenDisplay( vout_display_t *vd, video_format_t *fmt )
i_chroma_shift = 0;
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
b_hw_accel = sys->kvac.ulInputFormatFlags & KVAF_BGR24;
i_kva_fourcc = FOURCC_BGR3;
i_chroma_shift = 0;

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

@ -159,7 +159,7 @@ static int Open(vout_display_t *vd,
VLC_CODEC_BGRA,
VLC_CODEC_RGB15,
VLC_CODEC_RGB16,
VLC_CODEC_RGB24,
VLC_CODEC_RGB24M,
VLC_CODEC_XRGB,
VLC_CODEC_RGB233,
VLC_CODEC_GREY,

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

@ -196,7 +196,7 @@ static const struct { vlc_fourcc_t fcc; struct fmt_desc desc; } formats[] = {
{ VLC_CODEC_RGB332, {PACKED(3, 2, 2)} },
{ VLC_CODEC_RGB15, {PACKED(3, 5, 1)} },
{ VLC_CODEC_RGB16, {PACKED(3, 5, 1)} },
{ VLC_CODEC_RGB24, {PACKED(3, 8, 0)} },
{ VLC_CODEC_RGB24M, {PACKED(3, 8, 0)} },
{ VLC_CODEC_RGB32, {PACKED(3, 8, 8)} },
{ VLC_CODEC_RGBA, {PACKED(4, 8, 0)} },
{ VLC_CODEC_BGRX, {PACKED(3, 8, 8)} },

4
modules/video_output/opengl/interop_sw.c
View File

@ -606,7 +606,7 @@ interop_rgb_base_init(struct vlc_gl_interop *interop, GLenum tex_target,
{
switch (chroma)
{
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
if(!interop->fmt_in.i_rmask && !fallback_masks)
return VLC_EGENERIC;
interop->texs[0] = (struct vlc_gl_tex_cfg) {
@ -809,7 +809,7 @@ interop_init:
interop->fmt_in.i_bmask = 0x0000ff00;
}
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
/* Ensure we only request and forward RGB or BGR in memory order */
if(interop->fmt_in.i_rmask != 0xff0000
#ifdef GL_BGR

2
modules/video_output/vmem.c
View File

@ -202,7 +202,7 @@ static int Open(vout_display_t *vd,
fmt.i_gmask = 0x07e0;
fmt.i_bmask = 0xf800;
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
fmt.i_rmask = 0xff0000;
fmt.i_gmask = 0x00ff00;
fmt.i_bmask = 0x0000ff;

2
modules/video_output/win32/direct3d9.c
View File

@ -1343,7 +1343,7 @@ static const d3d9_format_t d3d_formats[] = {
{ "YUY2", D3DFMT_YUY2, VLC_CODEC_YUYV, 0,0,0 },
{ "X8R8G8B8", D3DFMT_X8R8G8B8,VLC_CODEC_BGRX, 0,0,0 },
{ "A8R8G8B8", D3DFMT_A8R8G8B8,VLC_CODEC_BGRA, 0,0,0 },
{ "8G8B8", D3DFMT_R8G8B8, VLC_CODEC_RGB24, 0xff0000, 0x00ff00, 0x0000ff },
{ "8G8B8", D3DFMT_R8G8B8, VLC_CODEC_RGB24M, 0xff0000, 0x00ff00, 0x0000ff },
{ "R5G6B5", D3DFMT_R5G6B5, VLC_CODEC_RGB16, 0x1f<<11, 0x3f<<5, 0x1f<<0 },
{ "X1R5G5B5", D3DFMT_X1R5G5B5,VLC_CODEC_RGB15, 0x1f<<10, 0x1f<<5, 0x1f<<0 },

2
modules/video_output/win32/wingdi.c
View File

@ -267,7 +267,7 @@ static int Init(vout_display_t *vd, video_format_t *fmt)
fmt->i_bmask = 0x1f << 0;
break;
case 24:
fmt->i_chroma = VLC_CODEC_RGB24;
fmt->i_chroma = VLC_CODEC_RGB24M;
fmt->i_rmask = 0xff << 16;
fmt->i_gmask = 0xff << 8;
fmt->i_bmask = 0x1f << 0;

2
modules/video_output/xcb/pictures.c
View File

@ -113,7 +113,7 @@ bool vlc_xcb_VisualToFormat(const xcb_setup_t *setup, uint_fast8_t depth,
if (fmt->bits_per_pixel == 32)
f->i_chroma = VLC_CODEC_RGB32;
else if (fmt->bits_per_pixel == 24)
f->i_chroma = VLC_CODEC_RGB24;
f->i_chroma = VLC_CODEC_RGB24M;
else
return false;
break;

4
src/misc/es_format.c
View File

@ -53,7 +53,7 @@ void video_format_FixRgb( video_format_t *p_fmt )
p_fmt->i_bmask = 0x001f;
break;
case VLC_CODEC_RGB24:
case VLC_CODEC_RGB24M:
p_fmt->i_rmask = 0xff0000;
p_fmt->i_gmask = 0x00ff00;
p_fmt->i_bmask = 0x0000ff;
@ -300,7 +300,7 @@ bool video_format_IsSameChroma( const video_format_t *f1,
if( f1->i_chroma == VLC_CODEC_RGB15 ||
f1->i_chroma == VLC_CODEC_RGB16 ||
f1->i_chroma == VLC_CODEC_RGB24 ||
f1->i_chroma == VLC_CODEC_RGB24M ||
f1->i_chroma == VLC_CODEC_RGB32 )
{
video_format_t v1 = *f1;

12
src/misc/fourcc.c
View File

@ -572,7 +572,7 @@ static const vlc_fourcc_t p_RGB32_fallback[] = {
VLC_CODEC_XRGB,
VLC_CODEC_BGRX,
VLC_CODEC_RGB32,
VLC_CODEC_RGB24,
VLC_CODEC_RGB24M,
VLC_CODEC_RGB16,
VLC_CODEC_RGB15,
VLC_CODEC_RGB233,
@ -581,7 +581,7 @@ static const vlc_fourcc_t p_RGB32_fallback[] = {
0,
};
static const vlc_fourcc_t p_RGB24_fallback[] = {
VLC_CODEC_RGB24,
VLC_CODEC_RGB24M,
VLC_CODEC_XRGB,
VLC_CODEC_BGRX,
VLC_CODEC_RGB32,
@ -594,7 +594,7 @@ static const vlc_fourcc_t p_RGB24_fallback[] = {
};
static const vlc_fourcc_t p_RGB16_fallback[] = {
VLC_CODEC_RGB16,
VLC_CODEC_RGB24,
VLC_CODEC_RGB24M,
VLC_CODEC_XRGB,
VLC_CODEC_BGRX,
VLC_CODEC_RGB32,
@ -607,7 +607,7 @@ static const vlc_fourcc_t p_RGB16_fallback[] = {
static const vlc_fourcc_t p_RGB15_fallback[] = {
VLC_CODEC_RGB15,
VLC_CODEC_RGB16,
VLC_CODEC_RGB24,
VLC_CODEC_RGB24M,
VLC_CODEC_XRGB,
VLC_CODEC_BGRX,
VLC_CODEC_RGB32,
@ -622,7 +622,7 @@ static const vlc_fourcc_t p_RGB8_fallback[] = {
VLC_CODEC_RGB332,
VLC_CODEC_RGB15,
VLC_CODEC_RGB16,
VLC_CODEC_RGB24,
VLC_CODEC_RGB24M,
VLC_CODEC_XRGB,
VLC_CODEC_BGRX,
VLC_CODEC_RGB32,
@ -824,7 +824,7 @@ static const struct
{ { VLC_CODEC_RGB15, 0 }, PACKED_FMT(2, 15) },
{ { VLC_CODEC_RGB16, 0 }, PACKED_FMT(2, 16) },
{ { VLC_CODEC_RGB24, 0 }, PACKED_FMT(3, 24) },
{ { VLC_CODEC_RGB24M, 0 }, PACKED_FMT(3, 24) },
{ { VLC_CODEC_RGB32, 0 }, PACKED_FMT(4, 24) },
{ { VLC_CODEC_RGBX, VLC_CODEC_XRGB,
VLC_CODEC_BGRX, VLC_CODEC_XBGR }, PACKED_FMT(4, 24) },

2
src/misc/fourcc_list.h
View File

@ -815,7 +815,7 @@ static const staticentry_t p_list_video[] = {
A("RV15"),
B(VLC_CODEC_RGB16, "16 bits RGB"),
A("RV16"),
B(VLC_CODEC_RGB24, "24 bits RGB"),
B(VLC_CODEC_RGB24M, "24 bits RGB"),
A("RV24"),
B(VLC_CODEC_RGB32, "32 bits RGB"),
A("RV32"),