[FFmpeg-devel] [PATCH 3/3] avcodec/brenderpix: use BR_PMT_* defines for pixelmap types
Zane van Iperen
zane at zanevaniperen.com
Sun Apr 9 15:25:43 EEST 2023
Taken from the BRender source tree at [1].
[1]: https://github.com/crocguy0688/CrocDE-BRender/blob/master/brender/inc/pixelmap.h#L19
---
libavcodec/brenderpix.c | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/libavcodec/brenderpix.c b/libavcodec/brenderpix.c
index 52765f0c00..baadc08c7f 100644
--- a/libavcodec/brenderpix.c
+++ b/libavcodec/brenderpix.c
@@ -32,6 +32,20 @@
#define HEADER2_CHUNK 0x3D
#define IMAGE_DATA_CHUNK 0x21
+/*
+ * BRender pixelmap constants taken from inc/pixelmap.h
+ * https://github.com/crocguy0688/CrocDE-BRender/blob/e605abee4e96e4492f2f8c7ea5e5e5bd31bcd1e3/brender/inc/pixelmap.h
+ */
+enum {
+ BR_PMT_INDEX_8 = 3,
+ BR_PMT_RGB_555 = 4,
+ BR_PMT_RGB_565 = 5,
+ BR_PMT_RGB_888 = 6,
+ BR_PMT_RGBX_888 = 7,
+ BR_PMT_RGBA_8888 = 8,
+ BR_PMT_BGR_555 = 17,
+};
+
/* In 8-bit colour mode, 256 colours are available at any time. Which 256
* colours are available is determined by the contents of the hardware palette
* (or CLUT). In this case, the palette supplied with BRender (std.pal) has
@@ -171,31 +185,31 @@ static int pix_decode_frame(AVCodecContext *avctx, AVFrame *frame,
return ret;
}
switch (hdr.format) {
- case 3:
+ case BR_PMT_INDEX_8:
avctx->pix_fmt = AV_PIX_FMT_PAL8;
bytes_pp = 1;
break;
- case 4:
+ case BR_PMT_RGB_555:
avctx->pix_fmt = AV_PIX_FMT_RGB555BE;
bytes_pp = 2;
break;
- case 5:
+ case BR_PMT_RGB_565:
avctx->pix_fmt = AV_PIX_FMT_RGB565BE;
bytes_pp = 2;
break;
- case 6:
+ case BR_PMT_RGB_888:
avctx->pix_fmt = AV_PIX_FMT_RGB24;
bytes_pp = 3;
break;
- case 7:
+ case BR_PMT_RGBX_888:
avctx->pix_fmt = AV_PIX_FMT_0RGB;
bytes_pp = 4;
break;
- case 8: // ARGB
+ case BR_PMT_RGBA_8888: /* It says RGBA, but it's actually ARGB. */
avctx->pix_fmt = AV_PIX_FMT_ARGB;
bytes_pp = 4;
break;
- case 17:
+ case BR_PMT_BGR_555:
avctx->pix_fmt = AV_PIX_FMT_BGR555BE;
bytes_pp = 2;
break;
--
2.39.2
More information about the ffmpeg-devel
mailing list