tests: Add more j2k tests to cover a wider range of cases

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

9 files changed, 35 insertions, 1 deletions

diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index 1a47fc8bf6..9c3e796547 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -219,9 +219,11 @@ FATE_VCODEC_SCALE-$(call ENCDEC, JPEGLS, AVI) += jpegls
 fate-vsynth%-jpegls:             ENCOPTS = -sws_flags neighbor+full_chroma_int
 fate-vsynth%-jpegls:             DECOPTS = -sws_flags area
 
-FATE_VCODEC_SCALE-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97
+FATE_VCODEC_SCALE-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97 jpeg2000-gbrp12 jpeg2000-yuva444p16
 fate-vsynth%-jpeg2000:                ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24
 fate-vsynth%-jpeg2000-97:             ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
+fate-vsynth%-jpeg2000-gbrp12:         ENCOPTS = -qscale 5 -strict experimental -pred 1 -pix_fmt gbrp12
+fate-vsynth%-jpeg2000-yuva444p16:     ENCOPTS = -qscale 8 -strict experimental -pred 1 -pix_fmt yuva444p16
 
 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
 fate-vsynth%-ljpeg:              ENCOPTS = -strict -1
diff --git a/tests/ref/vsynth/vsynth1-jpeg2000-gbrp12 b/tests/ref/vsynth/vsynth1-jpeg2000-gbrp12
new file mode 100644
index 0000000000..0c6d47778f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-jpeg2000-gbrp12
@@ -0,0 +1,4 @@
+78b35a445001d2879386fdad16a2f0be *tests/data/fate/vsynth1-jpeg2000-gbrp12.avi
+8163968 tests/data/fate/vsynth1-jpeg2000-gbrp12.avi
+e934632ff63a00b4f2c9b3061f9c410e *tests/data/fate/vsynth1-jpeg2000-gbrp12.out.rawvideo
+stddev:    3.51 PSNR: 37.21 MAXDIFF:   43 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-jpeg2000-yuva444p16 b/tests/ref/vsynth/vsynth1-jpeg2000-yuva444p16
new file mode 100644
index 0000000000..363ddc4ffa
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-jpeg2000-yuva444p16
@@ -0,0 +1,4 @@
+9261706cfd4dfd8db38fc9bdafe6bef7 *tests/data/fate/vsynth1-jpeg2000-yuva444p16.avi
+12433462 tests/data/fate/vsynth1-jpeg2000-yuva444p16.avi
+6bc7131cd19dbb59339bb13a6d53b94d *tests/data/fate/vsynth1-jpeg2000-yuva444p16.out.rawvideo
+stddev:   12.97 PSNR: 25.87 MAXDIFF:  169 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-jpeg2000-gbrp12 b/tests/ref/vsynth/vsynth2-jpeg2000-gbrp12
new file mode 100644
index 0000000000..fad6af5741
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-jpeg2000-gbrp12
@@ -0,0 +1,4 @@
+3b20090f3d1f8804789c0dfdc68049fb *tests/data/fate/vsynth2-jpeg2000-gbrp12.avi
+8484786 tests/data/fate/vsynth2-jpeg2000-gbrp12.avi
+44c4232da8e05ce034558ee1c5899e0a *tests/data/fate/vsynth2-jpeg2000-gbrp12.out.rawvideo
+stddev:    1.23 PSNR: 46.30 MAXDIFF:   14 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-jpeg2000-yuva444p16 b/tests/ref/vsynth/vsynth2-jpeg2000-yuva444p16
new file mode 100644
index 0000000000..bec08da307
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-jpeg2000-yuva444p16
@@ -0,0 +1,4 @@
+54063ab98e48b2a079b63643fe26e082 *tests/data/fate/vsynth2-jpeg2000-yuva444p16.avi
+11489842 tests/data/fate/vsynth2-jpeg2000-yuva444p16.avi
+a4232b2959472f88b5310572456fa900 *tests/data/fate/vsynth2-jpeg2000-yuva444p16.out.rawvideo
+stddev:   11.69 PSNR: 26.77 MAXDIFF:  188 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth3-jpeg2000-gbrp12 b/tests/ref/vsynth/vsynth3-jpeg2000-gbrp12
new file mode 100644
index 0000000000..0010dbed58
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-jpeg2000-gbrp12
@@ -0,0 +1,4 @@
+1ca41231325bbacd1dc3b60785ba7fcc *tests/data/fate/vsynth3-jpeg2000-gbrp12.avi
+143116 tests/data/fate/vsynth3-jpeg2000-gbrp12.avi
+3a84f9e8db1b0f1f5dbf14062eb7975d *tests/data/fate/vsynth3-jpeg2000-gbrp12.out.rawvideo
+stddev:    3.83 PSNR: 36.45 MAXDIFF:   42 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-jpeg2000-yuva444p16 b/tests/ref/vsynth/vsynth3-jpeg2000-yuva444p16
new file mode 100644
index 0000000000..dae44f40bd
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-jpeg2000-yuva444p16
@@ -0,0 +1,4 @@
+afdff47e9c71d912153e59a56afdf2a9 *tests/data/fate/vsynth3-jpeg2000-yuva444p16.avi
+194250 tests/data/fate/vsynth3-jpeg2000-yuva444p16.avi
+9e0ef11f8c85206a950a919cb679f129 *tests/data/fate/vsynth3-jpeg2000-yuva444p16.out.rawvideo
+stddev:   10.72 PSNR: 27.53 MAXDIFF:   82 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth_lena-jpeg2000-gbrp12 b/tests/ref/vsynth/vsynth_lena-jpeg2000-gbrp12
new file mode 100644
index 0000000000..d008d84753
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-jpeg2000-gbrp12
@@ -0,0 +1,4 @@
+04c3662db7b6e91640c94877a631a277 *tests/data/fate/vsynth_lena-jpeg2000-gbrp12.avi
+8023408 tests/data/fate/vsynth_lena-jpeg2000-gbrp12.avi
+c7e9b9e26292975e04046984aa3646cd *tests/data/fate/vsynth_lena-jpeg2000-gbrp12.out.rawvideo
+stddev:    0.81 PSNR: 49.93 MAXDIFF:   12 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-jpeg2000-yuva444p16 b/tests/ref/vsynth/vsynth_lena-jpeg2000-yuva444p16
new file mode 100644
index 0000000000..d9e856735b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-jpeg2000-yuva444p16
@@ -0,0 +1,4 @@
+e9c56e128cf980db7c8e965d2afc0ea6 *tests/data/fate/vsynth_lena-jpeg2000-yuva444p16.avi
+11109882 tests/data/fate/vsynth_lena-jpeg2000-yuva444p16.avi
+3e1a4f9ca46c2dd3fd997c01a0dfb130 *tests/data/fate/vsynth_lena-jpeg2000-yuva444p16.out.rawvideo
+stddev:   11.67 PSNR: 26.79 MAXDIFF:  150 bytes:  7603200/  7603200