Skip to content

Commit 66fe0eb

Browse files
palemieuxpalemieux
committed
fate/jpeg2000dec: add missing ISO/IEC 15444-4 conformance tests
1 parent 43b0e85 commit 66fe0eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+361
-1
lines changed

‎tests/fate/jpeg2000.mak‎

Lines changed: 129 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,136 @@ fate-jpeg2000dec-p0_15: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpe
6060
FATE_JPEG2000DEC += fate-jpeg2000dec-p0_16
6161
fate-jpeg2000dec-p0_16: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile0/p0_16.j2k
6262

63+
FATE_JPEG2000DEC += fate-jpeg2000dec-p1_01
64+
fate-jpeg2000dec-p1_01: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile1/p1_01.j2k
65+
66+
FATE_JPEG2000DEC += fate-jpeg2000dec-p1_02
67+
fate-jpeg2000dec-p1_02: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile1/p1_02.j2k
68+
69+
FATE_JPEG2000DEC += fate-jpeg2000dec-p1_03
70+
fate-jpeg2000dec-p1_03: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile1/p1_03.j2k
71+
72+
# The MSE and Peak Error values are 16x those found in ISO/IEC 15444-4: the latter assume 12-bit samples while FFMPEG decodes
73+
# to 16-bit samples
74+
FATE_JPEG2000DEC += fate-jpeg2000dec-p1_04
75+
fate-jpeg2000dec-p1_04: CMD = mse_peak_error $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile1/p1_04.j2k \
76+
$(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile1/c1p1_04-0.j2c \
77+
49280 9984
78+
79+
FATE_JPEG2000DEC += fate-jpeg2000dec-p1_05
80+
fate-jpeg2000dec-p1_05: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile1/p1_05.j2k
81+
82+
FATE_JPEG2000DEC += fate-jpeg2000dec-p1_06
83+
fate-jpeg2000dec-p1_06: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile1/p1_06.j2k
84+
85+
FATE_JPEG2000DEC += fate-jpeg2000dec-hifi_ht1_02
86+
fate-jpeg2000dec-hifi_ht1_02: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile1/hifi_ht1_02.j2k
87+
88+
FATE_JPEG2000DEC += fate-jpeg2000dec-hifi_p1_02
89+
fate-jpeg2000dec-hifi_p1_02: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile1/hifi_p1_02.j2k
90+
6391
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_01_b11
64-
fate-jpeg2000dec-ds0_ht_01_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/ds0_ht_01_b11.j2k
92+
fate-jpeg2000dec-ds0_ht_01_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_01_bset/ds0_ht_01_b11.j2k
93+
94+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_02_b11
95+
fate-jpeg2000dec-ds0_ht_02_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_02_bset/ds0_ht_02_b11.j2k
96+
97+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_02_b12
98+
fate-jpeg2000dec-ds0_ht_02_b12: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_02_bset/ds0_ht_02_b12.j2k
99+
100+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_03_b11
101+
fate-jpeg2000dec-ds0_ht_03_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_03_bset/ds0_ht_03_b11.j2k
102+
103+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_03_b14
104+
fate-jpeg2000dec-ds0_ht_03_b14: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_03_bset/ds0_ht_03_b14.j2k
105+
106+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_04_b11
107+
fate-jpeg2000dec-ds0_ht_04_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_04_bset/ds0_ht_04_b11.j2k
108+
109+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_04_b12
110+
fate-jpeg2000dec-ds0_ht_04_b12: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_04_bset/ds0_ht_04_b12.j2k
111+
112+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_05_b11
113+
fate-jpeg2000dec-ds0_ht_05_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_05_bset/ds0_ht_05_b11.j2k
114+
115+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_05_b12
116+
fate-jpeg2000dec-ds0_ht_05_b12: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_05_bset/ds0_ht_05_b12.j2k
117+
118+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_07_b11
119+
fate-jpeg2000dec-ds0_ht_07_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_07_bset/ds0_ht_07_b11.j2k
120+
121+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_07_b15
122+
fate-jpeg2000dec-ds0_ht_07_b15: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_07_bset/ds0_ht_07_b15.j2k
123+
124+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_07_b16
125+
fate-jpeg2000dec-ds0_ht_07_b16: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_07_bset/ds0_ht_07_b16.j2k
126+
127+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_08_b11
128+
fate-jpeg2000dec-ds0_ht_08_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_08_bset/ds0_ht_08_b11.j2k
129+
130+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_08_b15
131+
fate-jpeg2000dec-ds0_ht_08_b15: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_08_bset/ds0_ht_08_b15.j2k
132+
133+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_08_b16
134+
fate-jpeg2000dec-ds0_ht_08_b16: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_08_bset/ds0_ht_08_b16.j2k
135+
136+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_09_b11
137+
fate-jpeg2000dec-ds0_ht_09_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_09_bset/ds0_ht_09_b11.j2k
138+
139+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_10_b11
140+
fate-jpeg2000dec-ds0_ht_10_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_10_bset/ds0_ht_10_b11.j2k
141+
142+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_11_b10
143+
fate-jpeg2000dec-ds0_ht_11_b10: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_11_bset/ds0_ht_11_b10.j2k
144+
145+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_12_b11
146+
fate-jpeg2000dec-ds0_ht_12_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_12_bset/ds0_ht_12_b11.j2k
147+
148+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_14_b11
149+
fate-jpeg2000dec-ds0_ht_14_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_14_bset/ds0_ht_14_b11.j2k
150+
151+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_hm_15_b8
152+
fate-jpeg2000dec-ds0_hm_15_b8: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_15_bset/ds0_hm_15_b8.j2k
153+
154+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_15_b11
155+
fate-jpeg2000dec-ds0_ht_15_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_15_bset/ds0_ht_15_b11.j2k
156+
157+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_15_b14
158+
fate-jpeg2000dec-ds0_ht_15_b14: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_15_bset/ds0_ht_15_b14.j2k
159+
160+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds0_ht_16_b11
161+
fate-jpeg2000dec-ds0_ht_16_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile0/p0_16_bset/ds0_ht_16_b11.j2k
162+
163+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds1_ht_01_b11
164+
fate-jpeg2000dec-ds1_ht_01_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile1/p1_01_bset/ds1_ht_01_b11.j2k
165+
166+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds1_ht_01_b12
167+
fate-jpeg2000dec-ds1_ht_01_b12: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile1/p1_01_bset/ds1_ht_01_b12.j2k
168+
169+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds1_ht_02_b11
170+
fate-jpeg2000dec-ds1_ht_02_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile1/p1_02_bset/ds1_ht_02_b11.j2k
171+
172+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds1_ht_02_b12
173+
fate-jpeg2000dec-ds1_ht_02_b12: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile1/p1_02_bset/ds1_ht_02_b12.j2k
174+
175+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds1_ht_03_b11
176+
fate-jpeg2000dec-ds1_ht_03_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile1/p1_03_bset/ds1_ht_03_b11.j2k
177+
178+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds1_ht_03_b12
179+
fate-jpeg2000dec-ds1_ht_03_b12: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile1/p1_03_bset/ds1_ht_03_b12.j2k
180+
181+
# The MSE and Peak Error values are 16x those found in ISO/IEC 15444-4: the latter assume 12-bit samples while FFMPEG decodes
182+
# to 16-bit samples
183+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds1_ht_04_b9
184+
fate-jpeg2000dec-ds1_ht_04_b9: CMD = mse_peak_error $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile1/p1_04_bset/ds1_ht_04_b9.j2k \
185+
$(TARGET_SAMPLES)/jpeg2000/itu-iso/codestreams_profile1/c1p1_04-0.j2c \
186+
49280 9984
187+
188+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds1_ht_05_b11
189+
fate-jpeg2000dec-ds1_ht_05_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile1/p1_05_bset/ds1_ht_05_b11.j2k
190+
191+
FATE_JPEG2000DEC += fate-jpeg2000dec-ds1_ht_06_b11
192+
fate-jpeg2000dec-ds1_ht_06_b11: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/itu-iso/htj2k_bsets_profile1/p1_06_bset/ds1_ht_06_b11.j2k
65193

66194
FATE_JPEG2000DEC += $(FATE_JPEG2000DEC-yes)
67195

‎tests/ref/fate/jpeg2000dec-ds0_hm_15_b8‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#tb 0: 1/25
2+
#media_type 0: video
3+
#codec_id 0: rawvideo
4+
#dimensions 0: 256x256
5+
#sar 0: 0/1
6+
0, 0, 0, 1, 65536, 0x252408c0

‎tests/ref/fate/jpeg2000dec-ds0_ht_02_b11‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#tb 0: 1/25
2+
#media_type 0: video
3+
#codec_id 0: rawvideo
4+
#dimensions 0: 64x126
5+
#sar 0: 0/1
6+
0, 0, 0, 1, 8064, 0x32fbc710

‎tests/ref/fate/jpeg2000dec-ds0_ht_02_b12‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#tb 0: 1/25
2+
#media_type 0: video
3+
#codec_id 0: rawvideo
4+
#dimensions 0: 64x126
5+
#sar 0: 0/1
6+
0, 0, 0, 1, 8064, 0xd634c70c

‎tests/ref/fate/jpeg2000dec-ds0_ht_03_b11‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#tb 0: 1/25
2+
#media_type 0: video
3+
#codec_id 0: rawvideo
4+
#dimensions 0: 256x256
5+
#sar 0: 0/1
6+
0, 0, 0, 1, 65536, 0x33783820

‎tests/ref/fate/jpeg2000dec-ds0_ht_03_b14‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#tb 0: 1/25
2+
#media_type 0: video
3+
#codec_id 0: rawvideo
4+
#dimensions 0: 256x256
5+
#sar 0: 0/1
6+
0, 0, 0, 1, 65536, 0x252408c0

‎tests/ref/fate/jpeg2000dec-ds0_ht_04_b11‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#tb 0: 1/25
2+
#media_type 0: video
3+
#codec_id 0: rawvideo
4+
#dimensions 0: 640x480
5+
#sar 0: 0/1
6+
0, 0, 0, 1, 921600, 0xfd6c1b89

‎tests/ref/fate/jpeg2000dec-ds0_ht_04_b12‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#tb 0: 1/25
2+
#media_type 0: video
3+
#codec_id 0: rawvideo
4+
#dimensions 0: 640x480
5+
#sar 0: 0/1
6+
0, 0, 0, 1, 921600, 0x38311bba

‎tests/ref/fate/jpeg2000dec-ds0_ht_05_b11‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#tb 0: 1/25
2+
#media_type 0: video
3+
#codec_id 0: rawvideo
4+
#dimensions 0: 1024x1024
5+
#sar 0: 0/1
6+
0, 0, 0, 1, 2621440, 0xe5b6ada4

‎tests/ref/fate/jpeg2000dec-ds0_ht_05_b12‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#tb 0: 1/25
2+
#media_type 0: video
3+
#codec_id 0: rawvideo
4+
#dimensions 0: 1024x1024
5+
#sar 0: 0/1
6+
0, 0, 0, 1, 2621440, 0x9608ad8b

0 commit comments

Comments
 (0)