har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/jpeg2000dwt: Also test 9/7 integer DWT

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-21 13:02:34 +02:00
parent 3bd46914fb
commit d23b3f3940
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/jpeg2000dwt.c
View File

@ -265,8 +265,6 @@ static void dwt_encode97_int(DWTContext *s, int *t)
lp; lp;
int *l; int *l;
av_assert1(!mh && !mv);
// VER_SD // VER_SD
l = line + mv; l = line + mv;
for (lp = 0; lp < lh; lp++) { for (lp = 0; lp < lh; lp++) {
@ -669,6 +667,9 @@ int main(void) {
ret = test_dwt(array, ref, border, decomp_levels, FF_DWT53, 0); ret = test_dwt(array, ref, border, decomp_levels, FF_DWT53, 0);
if (ret) if (ret)
return 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; return 0;