From 9d56ccf5af52cb6d937c85c6c205cd38fa9d54ba Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 31 May 2013 02:12:22 +0200 Subject: j2k/jpeg2000dec: merge Signed-off-by: Michael Niedermayer --- tests/fate/vcodec.mak | 10 +++++----- tests/ref/vsynth/vsynth1-j2k | 4 ---- tests/ref/vsynth/vsynth1-j2k-97 | 4 ---- tests/ref/vsynth/vsynth1-jpeg2000 | 4 ++++ tests/ref/vsynth/vsynth1-jpeg2000-97 | 4 ++++ tests/ref/vsynth/vsynth2-j2k | 4 ---- tests/ref/vsynth/vsynth2-j2k-97 | 4 ---- tests/ref/vsynth/vsynth2-jpeg2000 | 4 ++++ tests/ref/vsynth/vsynth2-jpeg2000-97 | 4 ++++ 9 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 tests/ref/vsynth/vsynth1-j2k delete mode 100644 tests/ref/vsynth/vsynth1-j2k-97 create mode 100644 tests/ref/vsynth/vsynth1-jpeg2000 create mode 100644 tests/ref/vsynth/vsynth1-jpeg2000-97 delete mode 100644 tests/ref/vsynth/vsynth2-j2k delete mode 100644 tests/ref/vsynth/vsynth2-j2k-97 create mode 100644 tests/ref/vsynth/vsynth2-jpeg2000 create mode 100644 tests/ref/vsynth/vsynth2-jpeg2000-97 (limited to 'tests') diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 167d97ce24..7aed08961b 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -89,11 +89,11 @@ FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls fate-vsynth%-jpegls: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-jpegls: DECOPTS = -sws_flags area -FATE_VCODEC-$(call ENCDEC, J2K, AVI) += j2k j2k-97 -fate-vsynth%-j2k: ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24 -fate-vsynth%-j2k: DECINOPTS = -vcodec j2k -strict experimental -fate-vsynth%-j2k-97: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 -fate-vsynth%-j2k-97: DECINOPTS = -vcodec j2k -strict experimental +FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97 +fate-vsynth%-jpeg2000: ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24 +fate-vsynth%-jpeg2000: DECINOPTS = -vcodec jpeg2000 +fate-vsynth%-jpeg2000-97: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 +fate-vsynth%-jpeg2000-97: DECINOPTS = -vcodec jpeg2000 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg fate-vsynth%-ljpeg: ENCOPTS = -strict -1 diff --git a/tests/ref/vsynth/vsynth1-j2k b/tests/ref/vsynth/vsynth1-j2k deleted file mode 100644 index 726d452568..0000000000 --- a/tests/ref/vsynth/vsynth1-j2k +++ /dev/null @@ -1,4 +0,0 @@ -e6e3d338eeb394d6fadc7bbb55fa9e6e *tests/data/fate/vsynth1-j2k.avi -2306902 tests/data/fate/vsynth1-j2k.avi -1774b621bd92a53a24712cb77e9f0b28 *tests/data/fate/vsynth1-j2k.out.rawvideo -stddev: 5.37 PSNR: 33.52 MAXDIFF: 63 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-j2k-97 b/tests/ref/vsynth/vsynth1-j2k-97 deleted file mode 100644 index 1cc197a6f0..0000000000 --- a/tests/ref/vsynth/vsynth1-j2k-97 +++ /dev/null @@ -1,4 +0,0 @@ -c135eb14e9f219242180270c2a242634 *tests/data/fate/vsynth1-j2k-97.avi -2243132 tests/data/fate/vsynth1-j2k-97.avi -30a9c13e18fe4acaf28062b5003bb671 *tests/data/fate/vsynth1-j2k-97.out.rawvideo -stddev: 6.41 PSNR: 31.99 MAXDIFF: 75 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-jpeg2000 b/tests/ref/vsynth/vsynth1-jpeg2000 new file mode 100644 index 0000000000..cf53feb2ef --- /dev/null +++ b/tests/ref/vsynth/vsynth1-jpeg2000 @@ -0,0 +1,4 @@ +e6e3d338eeb394d6fadc7bbb55fa9e6e *tests/data/fate/vsynth1-jpeg2000.avi +2306902 tests/data/fate/vsynth1-jpeg2000.avi +1774b621bd92a53a24712cb77e9f0b28 *tests/data/fate/vsynth1-jpeg2000.out.rawvideo +stddev: 5.37 PSNR: 33.52 MAXDIFF: 63 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-jpeg2000-97 b/tests/ref/vsynth/vsynth1-jpeg2000-97 new file mode 100644 index 0000000000..f219406201 --- /dev/null +++ b/tests/ref/vsynth/vsynth1-jpeg2000-97 @@ -0,0 +1,4 @@ +c135eb14e9f219242180270c2a242634 *tests/data/fate/vsynth1-jpeg2000-97.avi +2243132 tests/data/fate/vsynth1-jpeg2000-97.avi +30a9c13e18fe4acaf28062b5003bb671 *tests/data/fate/vsynth1-jpeg2000-97.out.rawvideo +stddev: 6.41 PSNR: 31.99 MAXDIFF: 75 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-j2k b/tests/ref/vsynth/vsynth2-j2k deleted file mode 100644 index 1120b902d3..0000000000 --- a/tests/ref/vsynth/vsynth2-j2k +++ /dev/null @@ -1,4 +0,0 @@ -fc49816ba28731689872f5c87ca91c10 *tests/data/fate/vsynth2-j2k.avi -1151144 tests/data/fate/vsynth2-j2k.avi -e7d79c9e11d0fe97f03e38be66c34e4f *tests/data/fate/vsynth2-j2k.out.rawvideo -stddev: 4.41 PSNR: 35.23 MAXDIFF: 63 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-j2k-97 b/tests/ref/vsynth/vsynth2-j2k-97 deleted file mode 100644 index 5232802f7f..0000000000 --- a/tests/ref/vsynth/vsynth2-j2k-97 +++ /dev/null @@ -1,4 +0,0 @@ -3ac3e49a89136bddde9e44bac3e5b4ed *tests/data/fate/vsynth2-j2k-97.avi -1118952 tests/data/fate/vsynth2-j2k-97.avi -9d69ac6d46152ed2d6dd6a90d5793c80 *tests/data/fate/vsynth2-j2k-97.out.rawvideo -stddev: 5.32 PSNR: 33.61 MAXDIFF: 60 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-jpeg2000 b/tests/ref/vsynth/vsynth2-jpeg2000 new file mode 100644 index 0000000000..cacd467fb5 --- /dev/null +++ b/tests/ref/vsynth/vsynth2-jpeg2000 @@ -0,0 +1,4 @@ +fc49816ba28731689872f5c87ca91c10 *tests/data/fate/vsynth2-jpeg2000.avi +1151144 tests/data/fate/vsynth2-jpeg2000.avi +e7d79c9e11d0fe97f03e38be66c34e4f *tests/data/fate/vsynth2-jpeg2000.out.rawvideo +stddev: 4.41 PSNR: 35.23 MAXDIFF: 63 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-jpeg2000-97 b/tests/ref/vsynth/vsynth2-jpeg2000-97 new file mode 100644 index 0000000000..001e840561 --- /dev/null +++ b/tests/ref/vsynth/vsynth2-jpeg2000-97 @@ -0,0 +1,4 @@ +3ac3e49a89136bddde9e44bac3e5b4ed *tests/data/fate/vsynth2-jpeg2000-97.avi +1118952 tests/data/fate/vsynth2-jpeg2000-97.avi +9d69ac6d46152ed2d6dd6a90d5793c80 *tests/data/fate/vsynth2-jpeg2000-97.out.rawvideo +stddev: 5.32 PSNR: 33.61 MAXDIFF: 60 bytes: 7603200/ 7603200 -- cgit v1.2.3