avcodec/jpeg2000dwt: More special cases to handle singularities in 9/7 decode

Fixes Ticket4634

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c
index 225b08f3ef531c6c23ee958bd8b372d6a8257522..511f2237183b819892a9142d3dec4d1b77415723 100644 (file)
--- a/libavcodec/jpeg2000dwt.c
+++ b/libavcodec/jpeg2000dwt.c
@@ -365,6 +365,8 @@ static void sr_1d97_float(float *p, int i0, int i1)
     if (i1 <= i0 + 1) {
         if (i0 == 1)
             p[1] *= F_LFTG_K/2;
+        else
+            p[0] *= F_LFTG_X/2;
         return;
     }
 
@@ -440,6 +442,8 @@ static void sr_1d97_int(int32_t *p, int i0, int i1)
     if (i1 <= i0 + 1) {
         if (i0 == 1)
             p[1] = (p[1] * I_LFTG_K + (1<<16)) >> 17;
+        else
+            p[0] = (p[0] * I_LFTG_X + (1<<16)) >> 17;
         return;
     }
 

diff --git a/tests/ref/vsynth/vsynth1-jpeg2000-97 b/tests/ref/vsynth/vsynth1-jpeg2000-97
index a8e9bf8d93a3ebf874c3ccf115c627312e693b32..2d3e16c55d95b23d5c0cfb53e9b0c159083cffd9 100644 (file)
--- a/tests/ref/vsynth/vsynth1-jpeg2000-97
+++ b/tests/ref/vsynth/vsynth1-jpeg2000-97
@@ -1,4 +1,4 @@
 dfb35e733795195c6519ecc37e953931 *tests/data/fate/vsynth1-jpeg2000-97.avi
 2243136 tests/data/fate/vsynth1-jpeg2000-97.avi
-e1a095b40d7f6440f6c46f2995c4759c *tests/data/fate/vsynth1-jpeg2000-97.out.rawvideo
-stddev:    6.23 PSNR: 32.23 MAXDIFF:   75 bytes:  7603200/  7603200
+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-jpeg2000-97 b/tests/ref/vsynth/vsynth2-jpeg2000-97
index 21ab8ad5d01e4d19c5df44ead1a13ba13388812f..e59811d839180b3ba25219e834640752ca5ff199 100644 (file)
--- a/tests/ref/vsynth/vsynth2-jpeg2000-97
+++ b/tests/ref/vsynth/vsynth2-jpeg2000-97
@@ -1,4 +1,4 @@
 f8880f48a46ad43623d00de15ecba2cd *tests/data/fate/vsynth2-jpeg2000-97.avi
 1467472 tests/data/fate/vsynth2-jpeg2000-97.avi
-e523db4385f586d73aa0ee2688a75d2e *tests/data/fate/vsynth2-jpeg2000-97.out.rawvideo
-stddev:    5.44 PSNR: 33.41 MAXDIFF:   57 bytes:  7603200/  7603200
+9ec4f90641d5d0e6424184b654923676 *tests/data/fate/vsynth2-jpeg2000-97.out.rawvideo
+stddev:    6.32 PSNR: 32.11 MAXDIFF:   57 bytes:  7603200/  7603200

diff --git a/tests/ref/vsynth/vsynth_lena-jpeg2000-97 b/tests/ref/vsynth/vsynth_lena-jpeg2000-97
index 5945ac7dce9cd378bb470b0e353dee97d070b44a..cb839c3f263f855f4f6fe19214e9a6eb8548a9c2 100644 (file)
--- a/tests/ref/vsynth/vsynth_lena-jpeg2000-97
+++ b/tests/ref/vsynth/vsynth_lena-jpeg2000-97
@@ -1,4 +1,4 @@
 ba27504dcabe43d6608798c9cadc5cca *tests/data/fate/vsynth_lena-jpeg2000-97.avi
 1118956 tests/data/fate/vsynth_lena-jpeg2000-97.avi
-8ac8b9ee81fa73c873668e9f6b78764d *tests/data/fate/vsynth_lena-jpeg2000-97.out.rawvideo
-stddev:    4.95 PSNR: 34.23 MAXDIFF:   60 bytes:  7603200/  7603200
+9d69ac6d46152ed2d6dd6a90d5793c80 *tests/data/fate/vsynth_lena-jpeg2000-97.out.rawvideo
+stddev:    5.32 PSNR: 33.61 MAXDIFF:   60 bytes:  7603200/  7603200