[FFmpeg-devel] [PATCH 1/3] avcodec/brenderpix: remove support for type 18 pixelmaps

[FFmpeg-devel] [PATCH 1/3] avcodec/brenderpix: remove support for type 18 pixelmaps

[Zane van Iperen]

In BRender version 1.1.2, type 18 was a vendor extension, and is not
YA8. In 1.3.2, type 18 is BR_PMT_RGBA_4444, for which there's no
AV_PIXFMT_* equivalent.

Remove it for now, rather than continuing to decode incorrectly.
---
 libavcodec/brenderpix.c | 4 ----
 tests/fate/image.mak    | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/libavcodec/brenderpix.c b/libavcodec/brenderpix.c
index e95ab3d4af..67b89689e7 100644
--- a/libavcodec/brenderpix.c
+++ b/libavcodec/brenderpix.c
@@ -195,10 +195,6 @@ static int pix_decode_frame(AVCodecContext *avctx, AVFrame *frame,
         avctx->pix_fmt = AV_PIX_FMT_ARGB;
         bytes_pp = 4;
         break;
-    case 18:
-        avctx->pix_fmt = AV_PIX_FMT_YA8;
-        bytes_pp = 2;
-        break;
     default:
         avpriv_request_sample(avctx, "Format %d", hdr.format);
         return AVERROR_PATCHWELCOME;
diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 42dd90feaa..564a326076 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -22,9 +22,6 @@ fate-brenderpix-defpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/bre
 FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX, SCALE_FILTER) += fate-brenderpix-intpal
 fate-brenderpix-intpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/testtex.pix -pix_fmt rgb24 -vf scale
 
-FATE_BRENDERPIX += fate-brenderpix-y400a
-fate-brenderpix-y400a: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/gears.pix
-
 FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX) += $(FATE_BRENDERPIX)
 FATE_IMAGE_FRAMECRC += $(FATE_BRENDERPIX-yes)
 fate-brenderpix: $(FATE_BRENDERPIX-yes)
-- 
Consider this part optional, it's not required for the rest of the patchset.

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/3] avcodec/brenderpix: support BGR555BE (type 17)

[Zane van Iperen]

---
 libavcodec/brenderpix.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/brenderpix.c b/libavcodec/brenderpix.c
index 67b89689e7..52765f0c00 100644
--- a/libavcodec/brenderpix.c
+++ b/libavcodec/brenderpix.c
@@ -195,6 +195,10 @@ static int pix_decode_frame(AVCodecContext *avctx, AVFrame *frame,
         avctx->pix_fmt = AV_PIX_FMT_ARGB;
         bytes_pp = 4;
         break;
+    case 17:
+        avctx->pix_fmt = AV_PIX_FMT_BGR555BE;
+        bytes_pp = 2;
+        break;
     default:
         avpriv_request_sample(avctx, "Format %d", hdr.format);
         return AVERROR_PATCHWELCOME;
-- 
2.39.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/3] avcodec/brenderpix: use BR_PMT_* defines for pixelmap types

[Zane van Iperen]

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

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".