[FFmpeg-devel] [PATCH v2 0/2] RGB mjpeg fixes (with FATE tests)

[FFmpeg-devel] [PATCH v2 0/2] RGB mjpeg fixes (with FATE tests)

[Leo Izen]

This is the same patch sent earlier to fix the other regression
in RGB mjpegs, but now there's a fate test to prevent this sort
of thing in the future.

Leo Izen (2):
  avcodec/mjpegdec: fix non-subsampled RGB JPEGs
  fate: add tests for RGB jpegs

 libavcodec/mjpegdec.c              | 3 ++-
 tests/fate/image.mak               | 9 +++++++++
 tests/ref/fate/jpg-rgb-221         | 6 ++++++
 tests/ref/fate/jpg-rgb-baseline    | 6 ++++++
 tests/ref/fate/jpg-rgb-progressive | 6 ++++++
 5 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 tests/ref/fate/jpg-rgb-221
 create mode 100644 tests/ref/fate/jpg-rgb-baseline
 create mode 100644 tests/ref/fate/jpg-rgb-progressive

-- 
2.40.0

_______________________________________________
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 v2 1/2] avcodec/mjpegdec: fix non-subsampled RGB JPEGs

[Leo Izen]

The change introduced in b18a9c29713abc3a1b081de3f320ab53a47120c6
created a regression for non-subsampled progressive RGB jpegs. This
should fix that.
---
 libavcodec/mjpegdec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 01537d4774..1e3ddb72fb 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1698,7 +1698,8 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask,
         s->h_scount[i]  = s->h_count[index];
         s->v_scount[i]  = s->v_count[index];
 
-        if(nb_components == 3 && s->nb_components == 3 && s->avctx->pix_fmt == AV_PIX_FMT_GBRP)
+        if((nb_components == 3 || nb_components == 1) && s->nb_components == 3
+                && s->avctx->pix_fmt == AV_PIX_FMT_GBRP && !s->progressive)
             index = (index+2)%3;
 
         s->comp_index[i] = index;
-- 
2.40.0

_______________________________________________
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 v2 2/2] fate: add tests for RGB jpegs

[Leo Izen]

Added framecrc tests for RGB JPEGs to verify future changes to the
decoder.
---
 tests/fate/image.mak               | 9 +++++++++
 tests/ref/fate/jpg-rgb-221         | 6 ++++++
 tests/ref/fate/jpg-rgb-baseline    | 6 ++++++
 tests/ref/fate/jpg-rgb-progressive | 6 ++++++
 4 files changed, 27 insertions(+)
 create mode 100644 tests/ref/fate/jpg-rgb-221
 create mode 100644 tests/ref/fate/jpg-rgb-baseline
 create mode 100644 tests/ref/fate/jpg-rgb-progressive

diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 42dd90feaa..93bc715ca3 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -337,6 +337,15 @@ fate-jpg-12bpp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/12bpp.jpg -
 FATE_JPG += fate-jpg-jfif
 fate-jpg-jfif: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/20242.jpg
 
+FATE_JPG += fate-jpg-rgb-baseline
+fate-jpg-rgb-baseline: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/george-insect-rgb-baseline.jpg
+
+FATE_JPG += fate-jpg-rgb-progressive
+fate-jpg-rgb-progressive: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/george-insect-rgb-progressive.jpg
+
+FATE_JPG += fate-jpg-rgb-221
+fate-jpg-rgb-221: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/george-insect-rgb-xyb.jpg
+
 FATE_JPG_TRANSCODE-$(call TRANSCODE, MJPEG, MJPEG IMAGE_JPEG_PIPE, IMAGE_PNG_PIPE_DEMUXER PNG_DECODER SCALE_FILTER) += fate-jpg-icc
 fate-jpg-icc: CMD = transcode png_pipe $(TARGET_SAMPLES)/png1/lena-int_rgb24.png mjpeg "-vf scale" "" "-show_frames"
 
diff --git a/tests/ref/fate/jpg-rgb-221 b/tests/ref/fate/jpg-rgb-221
new file mode 100644
index 0000000000..32250db493
--- /dev/null
+++ b/tests/ref/fate/jpg-rgb-221
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x43
+#sar 0: 0/1
+0,          0,          0,        1,     8256, 0x81617757
diff --git a/tests/ref/fate/jpg-rgb-baseline b/tests/ref/fate/jpg-rgb-baseline
new file mode 100644
index 0000000000..f7ff29e9a2
--- /dev/null
+++ b/tests/ref/fate/jpg-rgb-baseline
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x43
+#sar 0: 0/1
+0,          0,          0,        1,     8256, 0x98ad8863
diff --git a/tests/ref/fate/jpg-rgb-progressive b/tests/ref/fate/jpg-rgb-progressive
new file mode 100644
index 0000000000..b0d118d21a
--- /dev/null
+++ b/tests/ref/fate/jpg-rgb-progressive
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x43
+#sar 0: 0/1
+0,          0,          0,        1,     8256, 0xbb6e8830
-- 
2.40.0

_______________________________________________
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".