[vlc-commits] [Git][videolan/vlc][master] 2 commits: fourcc: remove VLC_CODEC_RGB12
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon Sep 11 11:28:39 UTC 2023
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
fcd8b0e4 by Steve Lhomme at 2023-09-11T11:12:48+00:00
fourcc: remove VLC_CODEC_RGB12
The only source is Linux DRM and it's supposedly handled by libplacebo
except it never uses the mask.
There is no support in libavutil/swscale or any other converter.
- - - - -
50b7de7d by Steve Lhomme at 2023-09-11T11:12:48+00:00
access/v42l: remove commented V4L2_PIX_FMT_BGR666
We don't have a corresponding RGB chroma.
- - - - -
7 changed files:
- include/vlc_fourcc.h
- modules/access/v4l2/video.c
- modules/video_output/drm/fourcc.c
- modules/video_output/libplacebo/display.c
- modules/video_output/libplacebo/utils.c
- src/misc/fourcc.c
- src/misc/fourcc_list.h
Changes:
=====================================
include/vlc_fourcc.h
=====================================
@@ -345,8 +345,6 @@
#define VLC_CODEC_RGBP VLC_FOURCC('R','G','B','P')
/* 8-bit RGB (using explicit masks) */
#define VLC_CODEC_RGB8 VLC_FOURCC('R','G','B','8')
-/* 12-bit RGB padded to 16 bits (using explicit masks) */
-#define VLC_CODEC_RGB12 VLC_FOURCC('R','V','1','2')
/* 15-bit RGB padded to 16 bits (using explicit masks) */
#define VLC_CODEC_RGB15 VLC_FOURCC('R','V','1','5')
/* 16-bit RGB (using explicit masks) */
=====================================
modules/access/v4l2/video.c
=====================================
@@ -612,23 +612,19 @@ static const vlc_v4l2_fmt_t v4l2_fmts[] =
{ V4L2_PIX_FMT_BGR32, VLC_CODEC_RGB32, 4, 0xFF000000, 0xFF0000, 0xFF00 },
{ 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_BGR666, },
// { 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 },
-// { V4L2_PIX_FMT_RGB444, VLC_CODEC_RGB12, 2, 0x000F, 0xF000, 0x0F00 },
#else
{ V4L2_PIX_FMT_RGB32, VLC_CODEC_RGB32, 4, 0x0000FF, 0x00FF00, 0xFF0000 },
{ V4L2_PIX_FMT_BGR32, VLC_CODEC_RGB32, 4, 0xFF0000, 0x00FF00, 0x0000FF },
{ 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_BGR666, },
{ 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 },
// { V4L2_PIX_FMT_RGB555X, },
-// { V4L2_PIX_FMT_RGB444, VLC_CODEC_RGB12, 2, 0x0F00, 0x00F0, 0x000F },
#endif
// { V4L2_PIX_FMT_RGB332, VLC_CODEC_RGB8, 1, 0xC0, 0x38, 0x07 },
=====================================
modules/video_output/drm/fourcc.c
=====================================
@@ -122,11 +122,6 @@ static const struct {
{ DRM_FORMAT_RGB332, VLC_CODEC_RGB8, 0xD0, 0x16, 0x03 },
{ DRM_FORMAT_BGR233, VLC_CODEC_RGB8, 0x07, 0x28, 0xC0 },
#ifdef WORDS_BIGENDIAN
- /* 16-bit-padded 12-bit RGB */
- { DRM_FORMAT_XRGB4444, VLC_CODEC_RGB12, 0x000F, 0xF000, 0x0F00 },
- { DRM_FORMAT_XBGR4444, VLC_CODEC_RGB12, 0x0F00, 0xF000, 0x000F },
- { DRM_FORMAT_RGBX4444, VLC_CODEC_RGB12, 0x00F0, 0x000F, 0xF000 },
- { DRM_FORMAT_BGRX4444, VLC_CODEC_RGB12, 0xF000, 0x000F, 0x00F0 },
/* 24-bit RGB */
{ DRM_FORMAT_RGB888, VLC_CODEC_RGB24, 0x0000FF, 0x00FF00, 0xFF0000 },
{ DRM_FORMAT_BGR888, VLC_CODEC_RGB24, 0xFF0000, 0x00FF00, 0x0000FF },
@@ -140,11 +135,6 @@ static const struct {
{ DRM_FORMAT_BGRX8888, VLC_CODEC_RGB32,
0x00FF0000, 0x0000FF00, 0x000000FF },
#else
- /* 16-bit-padded 12-bit RGB */
- { DRM_FORMAT_XRGB4444, VLC_CODEC_RGB12, 0x0F00, 0x00F0, 0x000F },
- { DRM_FORMAT_XBGR4444, VLC_CODEC_RGB12, 0x000F, 0x00F0, 0x0F00 },
- { DRM_FORMAT_RGBX4444, VLC_CODEC_RGB12, 0xF000, 0x0F00, 0x00F0 },
- { DRM_FORMAT_BGRX4444, VLC_CODEC_RGB12, 0x00F0, 0x0F00, 0xF000 },
/* 16-bit-padded 15-bit RGB */
{ DRM_FORMAT_XRGB1555, VLC_CODEC_RGB15, 0x7C00, 0x03E0, 0x001F },
{ DRM_FORMAT_XBGR1555, VLC_CODEC_RGB15, 0x001F, 0x03E0, 0x7C00 },
=====================================
modules/video_output/libplacebo/display.c
=====================================
@@ -158,7 +158,6 @@ static int Open(vout_display_t *vd,
VLC_CODEC_RGBA,
VLC_CODEC_BGRA,
VLC_CODEC_RGB8,
- VLC_CODEC_RGB12,
VLC_CODEC_RGB15,
VLC_CODEC_RGB16,
VLC_CODEC_RGB24,
=====================================
modules/video_output/libplacebo/utils.c
=====================================
@@ -192,7 +192,6 @@ static const struct { vlc_fourcc_t fcc; struct fmt_desc desc; } formats[] = {
{ VLC_CODEC_NV42, {SEMIPLANAR(2, 8, _444)} },
{ VLC_CODEC_RGB8, {PACKED(3, 2, 2)} },
- { VLC_CODEC_RGB12, {PACKED(3, 4, 4)} },
{ VLC_CODEC_RGB15, {PACKED(3, 5, 1)} },
{ VLC_CODEC_RGB16, {PACKED(3, 5, 1)} },
{ VLC_CODEC_RGB24, {PACKED(3, 8, 0)} },
=====================================
src/misc/fourcc.c
=====================================
@@ -801,7 +801,6 @@ static const struct
VLC_CODEC_GREY_16B }, PACKED_FMT(2, 16) },
{ { VLC_CODEC_RGB15, 0 }, PACKED_FMT(2, 15) },
- { { VLC_CODEC_RGB12, 0 }, PACKED_FMT(2, 12) },
{ { VLC_CODEC_RGB16, 0 }, PACKED_FMT(2, 16) },
{ { VLC_CODEC_RGB24, 0 }, PACKED_FMT(3, 24) },
{ { VLC_CODEC_RGB32, 0 }, PACKED_FMT(4, 24) },
=====================================
src/misc/fourcc_list.h
=====================================
@@ -807,8 +807,6 @@ static const staticentry_t p_list_video[] = {
B(VLC_CODEC_RGB8, "8 bits RGB"),
A("RGB2"),
- B(VLC_CODEC_RGB12, "12 bits RGB"),
- A("RV12"),
B(VLC_CODEC_RGB15, "15 bits RGB"),
A("RV15"),
B(VLC_CODEC_RGB16, "16 bits RGB"),
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/37a5122d178db2c6e3f38acbc060d36de6478c52...50b7de7dea60f0789be1c44b3621f084de2adeef
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/37a5122d178db2c6e3f38acbc060d36de6478c52...50b7de7dea60f0789be1c44b3621f084de2adeef
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list