avcodec/jpeg2000dwt: Also test 9/7 integer DWT
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 11:02:34 +0000 (13:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jun 2015 11:43:02 +0000 (13:43 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000dwt.c

index c0483c3..314a274 100644 (file)
@@ -265,8 +265,6 @@ static void dwt_encode97_int(DWTContext *s, int *t)
             lp;
         int *l;
 
-        av_assert1(!mh && !mv);
-
         // VER_SD
         l = line + mv;
         for (lp = 0; lp < lh; lp++) {
@@ -669,6 +667,9 @@ int main(void) {
         ret = test_dwt(array, ref, border, decomp_levels, FF_DWT53, 0);
         if (ret)
             return ret;
+        ret = test_dwt(array, ref, border, decomp_levels, FF_DWT97_INT, FFMIN(7+5*decomp_levels, 15+3*decomp_levels));
+        if (ret)
+            return ret;
     }
 
     return 0;