[FFmpeg-cvslog] avcodec/jpeg2000dwt: Print 1 digit less in the 9/7f DWT test
Michael Niedermayer
git at videolan.org
Mon Jun 22 23:20:40 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 22 23:07:56 2015 +0200| [8428e2c5f37ef873652122be1370b652915f9e4c] | committer: Michael Niedermayer
avcodec/jpeg2000dwt: Print 1 digit less in the 9/7f DWT test
This avoids test failure due to differing rounding between 32 and 64bit x86
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8428e2c5f37ef873652122be1370b652915f9e4c
---
libavcodec/jpeg2000dwt.c | 2 +-
tests/ref/fate/j2k-dwt | 40 ++++++++++++++++++++--------------------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c
index 713678c..dde93fe 100644
--- a/libavcodec/jpeg2000dwt.c
+++ b/libavcodec/jpeg2000dwt.c
@@ -693,7 +693,7 @@ static int test_dwtf(float *array, float *ref, uint16_t border[2][2], int decomp
}
ff_dwt_destroy(s);
- printf("9/7f, decomp:%2d border %3d %3d %3d %3d err2:%20.4f\n",
+ printf("9/7f, decomp:%2d border %3d %3d %3d %3d err2:%20.3f\n",
decomp_levels, border[0][0], border[0][1], border[1][0], border[1][1],
err2 / ((border[0][1] - border[0][0])*(border[1][1] - border[1][0])));
diff --git a/tests/ref/fate/j2k-dwt b/tests/ref/fate/j2k-dwt
index c130faf..42415f0 100644
--- a/tests/ref/fate/j2k-dwt
+++ b/tests/ref/fate/j2k-dwt
@@ -1,60 +1,60 @@
5/3i, decomp:15 border 151 170 140 183 milli-err2: 0
9/7i, decomp:15 border 151 170 140 183 milli-err2: 544
-9/7f, decomp:15 border 151 170 140 183 err2: 0.0001
+9/7f, decomp:15 border 151 170 140 183 err2: 0.000
5/3i, decomp:21 border 173 201 81 189 milli-err2: 0
9/7i, decomp:21 border 173 201 81 189 milli-err2: 592
-9/7f, decomp:21 border 173 201 81 189 err2: 0.0001
+9/7f, decomp:21 border 173 201 81 189 err2: 0.000
5/3i, decomp:22 border 213 227 76 245 milli-err2: 0
9/7i, decomp:22 border 213 227 76 245 milli-err2: 533
-9/7f, decomp:22 border 213 227 76 245 err2: 0.0001
+9/7f, decomp:22 border 213 227 76 245 err2: 0.000
5/3i, decomp:13 border 134 157 184 203 milli-err2: 0
9/7i, decomp:13 border 134 157 184 203 milli-err2: 535
-9/7f, decomp:13 border 134 157 184 203 err2: 0.0001
+9/7f, decomp:13 border 134 157 184 203 err2: 0.000
5/3i, decomp: 1 border 204 237 6 106 milli-err2: 0
9/7i, decomp: 1 border 204 237 6 106 milli-err2: 219
-9/7f, decomp: 1 border 204 237 6 106 err2: 0.0000
+9/7f, decomp: 1 border 204 237 6 106 err2: 0.000
5/3i, decomp:28 border 76 211 13 210 milli-err2: 0
9/7i, decomp:28 border 76 211 13 210 milli-err2: 791
-9/7f, decomp:28 border 76 211 13 210 err2: 0.0002
+9/7f, decomp:28 border 76 211 13 210 err2: 0.000
5/3i, decomp:21 border 76 99 43 123 milli-err2: 0
9/7i, decomp:21 border 76 99 43 123 milli-err2: 686
-9/7f, decomp:21 border 76 99 43 123 err2: 0.0001
+9/7f, decomp:21 border 76 99 43 123 err2: 0.000
5/3i, decomp:15 border 192 243 174 204 milli-err2: 0
9/7i, decomp:15 border 192 243 174 204 milli-err2: 476
-9/7f, decomp:15 border 192 243 174 204 err2: 0.0001
+9/7f, decomp:15 border 192 243 174 204 err2: 0.000
5/3i, decomp:21 border 17 68 93 204 milli-err2: 0
9/7i, decomp:21 border 17 68 93 204 milli-err2: 633
-9/7f, decomp:21 border 17 68 93 204 err2: 0.0001
+9/7f, decomp:21 border 17 68 93 204 err2: 0.000
5/3i, decomp:11 border 142 168 82 174 milli-err2: 0
9/7i, decomp:11 border 142 168 82 174 milli-err2: 696
-9/7f, decomp:11 border 142 168 82 174 err2: 0.0001
+9/7f, decomp:11 border 142 168 82 174 err2: 0.000
5/3i, decomp:23 border 142 209 171 235 milli-err2: 0
9/7i, decomp:23 border 142 209 171 235 milli-err2: 626
-9/7f, decomp:23 border 142 209 171 235 err2: 0.0001
+9/7f, decomp:23 border 142 209 171 235 err2: 0.000
5/3i, decomp:30 border 37 185 79 245 milli-err2: 0
9/7i, decomp:30 border 37 185 79 245 milli-err2: 953
-9/7f, decomp:30 border 37 185 79 245 err2: 0.0002
+9/7f, decomp:30 border 37 185 79 245 err2: 0.000
5/3i, decomp: 5 border 129 236 30 243 milli-err2: 0
9/7i, decomp: 5 border 129 236 30 243 milli-err2: 620
-9/7f, decomp: 5 border 129 236 30 243 err2: 0.0001
+9/7f, decomp: 5 border 129 236 30 243 err2: 0.000
5/3i, decomp:10 border 5 160 146 247 milli-err2: 0
9/7i, decomp:10 border 5 160 146 247 milli-err2: 797
-9/7f, decomp:10 border 5 160 146 247 err2: 0.0002
+9/7f, decomp:10 border 5 160 146 247 err2: 0.000
5/3i, decomp: 5 border 104 162 6 47 milli-err2: 0
9/7i, decomp: 5 border 104 162 6 47 milli-err2: 603
-9/7f, decomp: 5 border 104 162 6 47 err2: 0.0001
+9/7f, decomp: 5 border 104 162 6 47 err2: 0.000
5/3i, decomp:24 border 78 250 102 218 milli-err2: 0
9/7i, decomp:24 border 78 250 102 218 milli-err2: 836
-9/7f, decomp:24 border 78 250 102 218 err2: 0.0002
+9/7f, decomp:24 border 78 250 102 218 err2: 0.000
5/3i, decomp:28 border 86 98 56 79 milli-err2: 0
9/7i, decomp:28 border 86 98 56 79 milli-err2: 597
-9/7f, decomp:28 border 86 98 56 79 err2: 0.0001
+9/7f, decomp:28 border 86 98 56 79 err2: 0.000
5/3i, decomp: 6 border 95 238 197 214 milli-err2: 0
9/7i, decomp: 6 border 95 238 197 214 milli-err2: 478
-9/7f, decomp: 6 border 95 238 197 214 err2: 0.0001
+9/7f, decomp: 6 border 95 238 197 214 err2: 0.000
5/3i, decomp:17 border 77 169 93 165 milli-err2: 0
9/7i, decomp:17 border 77 169 93 165 milli-err2: 616
-9/7f, decomp:17 border 77 169 93 165 err2: 0.0001
+9/7f, decomp:17 border 77 169 93 165 err2: 0.000
5/3i, decomp:22 border 178 187 7 119 milli-err2: 0
9/7i, decomp:22 border 178 187 7 119 milli-err2: 392
-9/7f, decomp:22 border 178 187 7 119 err2: 0.0000
+9/7f, decomp:22 border 178 187 7 119 err2: 0.000
More information about the ffmpeg-cvslog
mailing list