Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/jpeg2000: Move H band scaling from wavelet into quantization code

Browse Source 
This reduces the number of operations done and is equivalent except for
rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/138/head
Michael Niedermayer 10 years ago
parent 69f7ccef8e
commit 6c7b1597c7
8 changed files with 57 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      libavcodec/jpeg2000.c
  2. 16
      libavcodec/jpeg2000dwt.c
  3. 40
      tests/ref/fate/j2k-dwt
  4. 4
      tests/ref/fate/jpeg2000-dcinema
  5. 8
      tests/ref/vsynth/vsynth1-jpeg2000-97
  6. 8
      tests/ref/vsynth/vsynth2-jpeg2000-97
  7. 8
      tests/ref/vsynth/vsynth3-jpeg2000-97
  8. 8
      tests/ref/vsynth/vsynth_lena-jpeg2000-97

13
libavcodec/jpeg2000.c
Unescape View File

@ -314,8 +314,17 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
av_log(avctx, AV_LOG_ERROR, "Unknown quantization format\n");
break;
}
band->f_stepsize *= 1<<lut_gain[codsty->transform != FF_DWT53][bandno + (reslevelno > 0)];
if (codsty->transform != FF_DWT53) {
switch (bandno + (reslevelno > 0)) {
case 1:
case 2:
band->f_stepsize *= F_LFTG_X * 2;
break;
case 3:
band->f_stepsize *= F_LFTG_X * F_LFTG_X * 4;
break;
}
}
/* FIXME: In openjepg code stespize = stepsize * 0.5. Why?
* If not set output of entropic decoder is not correct. */
if (!av_codec_is_encoder(avctx->codec))

16
libavcodec/jpeg2000dwt.c
Unescape View File

@ -197,7 +197,7 @@ static void dwt_encode97_float(DWTContext *s, float *t)
for (i = mh; i < lh; i+=2, j++)
t[w*lp + j] = F_LFTG_X * l[i];
for (i = 1-mh; i < lh; i+=2, j++)
t[w*lp + j] = F_LFTG_K * l[i];
t[w*lp + j] = l[i];
}
// VER_SD
@ -214,7 +214,7 @@ static void dwt_encode97_float(DWTContext *s, float *t)
for (i = mv; i < lv; i+=2, j++)
t[w*j + lp] = F_LFTG_X * l[i];
for (i = 1-mv; i < lv; i+=2, j++)
t[w*j + lp] = F_LFTG_K * l[i];
t[w*j + lp] = l[i];
}
}
}
@ -273,7 +273,7 @@ static void dwt_encode97_int(DWTContext *s, int *t)
for (i = mv; i < lv; i+=2, j++)
t[w*j + lp] = ((l[i] * I_LFTG_X) + (1 << 15)) >> 16;
for (i = 1-mv; i < lv; i+=2, j++)
t[w*j + lp] = ((l[i] * I_LFTG_K) + (1 << 15)) >> 16;
t[w*j + lp] = l[i];
}
// HOR_SD
@ -290,7 +290,7 @@ static void dwt_encode97_int(DWTContext *s, int *t)
for (i = mh; i < lh; i+=2, j++)
t[w*lp + j] = ((l[i] * I_LFTG_X) + (1 << 15)) >> 16;
for (i = 1-mh; i < lh; i+=2, j++)
t[w*lp + j] = ((l[i] * I_LFTG_K) + (1 << 15)) >> 16;
t[w*lp + j] = l[i];
}
}
@ -414,7 +414,7 @@ static void dwt_decode97_float(DWTContext *s, float *t)
for (i = mh; i < lh; i += 2, j++)
l[i] = data[w * lp + j] * F_LFTG_K;
for (i = 1 - mh; i < lh; i += 2, j++)
l[i] = data[w * lp + j] * F_LFTG_X;
l[i] = data[w * lp + j];
sr_1d97_float(line, mh, mh + lh);
@ -430,7 +430,7 @@ static void dwt_decode97_float(DWTContext *s, float *t)
for (i = mv; i < lv; i += 2, j++)
l[i] = data[w * j + lp] * F_LFTG_K;
for (i = 1 - mv; i < lv; i += 2, j++)
l[i] = data[w * j + lp] * F_LFTG_X;
l[i] = data[w * j + lp];
sr_1d97_float(line, mv, mv + lv);
@ -491,7 +491,7 @@ static void dwt_decode97_int(DWTContext *s, int32_t *t)
for (i = mh; i < lh; i += 2, j++)
l[i] = ((data[w * lp + j] * I_LFTG_K) + (1 << 15)) >> 16;
for (i = 1 - mh; i < lh; i += 2, j++)
l[i] = ((data[w * lp + j] * I_LFTG_X) + (1 << 15)) >> 16;
l[i] = data[w * lp + j];
sr_1d97_int(line, mh, mh + lh);
@ -507,7 +507,7 @@ static void dwt_decode97_int(DWTContext *s, int32_t *t)
for (i = mv; i < lv; i += 2, j++)
l[i] = ((data[w * j + lp] * I_LFTG_K) + (1 << 15)) >> 16;
for (i = 1 - mv; i < lv; i += 2, j++)
l[i] = ((data[w * j + lp] * I_LFTG_X) + (1 << 15)) >> 16;
l[i] = data[w * j + lp];
sr_1d97_int(line, mv, mv + lv);

40
tests/ref/fate/j2k-dwt
Unescape View File

@ -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: 5407
9/7i, decomp:15 border 151 170 140 183 milli-err2: 5188
9/7f, decomp:15 border 151 170 140 183 err2: 0.0001
5/3i, decomp:21 border 173 201 81 189 milli-err2: 0
9/7i, decomp:21 border 173 201 81 189 milli-err2: 8289
9/7i, decomp:21 border 173 201 81 189 milli-err2: 6478
9/7f, decomp:21 border 173 201 81 189 err2: 0.0001
5/3i, decomp:22 border 213 227 76 245 milli-err2: 0
9/7i, decomp:22 border 213 227 76 245 milli-err2: 7210
9/7i, decomp:22 border 213 227 76 245 milli-err2: 6539
9/7f, decomp:22 border 213 227 76 245 err2: 0.0001
5/3i, decomp:13 border 134 157 184 203 milli-err2: 0
9/7i, decomp:13 border 134 157 184 203 milli-err2: 17748
9/7i, decomp:13 border 134 157 184 203 milli-err2: 19203
9/7f, decomp:13 border 134 157 184 203 err2: 0.0001
5/3i, decomp: 1 border 204 237 6 106 milli-err2: 0
9/7i, decomp: 1 border 204 237 6 106 milli-err2: 824
9/7i, decomp: 1 border 204 237 6 106 milli-err2: 924
9/7f, decomp: 1 border 204 237 6 106 err2: 0.0000
5/3i, decomp:28 border 76 211 13 210 milli-err2: 0
9/7i, decomp:28 border 76 211 13 210 milli-err2: 11710
9/7i, decomp:28 border 76 211 13 210 milli-err2: 17297
9/7f, decomp:28 border 76 211 13 210 err2: 0.0002
5/3i, decomp:21 border 76 99 43 123 milli-err2: 0
9/7i, decomp:21 border 76 99 43 123 milli-err2: 8555
9/7i, decomp:21 border 76 99 43 123 milli-err2: 9039
9/7f, decomp:21 border 76 99 43 123 err2: 0.0001
5/3i, decomp:15 border 192 243 174 204 milli-err2: 0
9/7i, decomp:15 border 192 243 174 204 milli-err2: 7769
9/7i, decomp:15 border 192 243 174 204 milli-err2: 7693
9/7f, decomp:15 border 192 243 174 204 err2: 0.0001
5/3i, decomp:21 border 17 68 93 204 milli-err2: 0
9/7i, decomp:21 border 17 68 93 204 milli-err2: 7727
9/7i, decomp:21 border 17 68 93 204 milli-err2: 7810
9/7f, decomp:21 border 17 68 93 204 err2: 0.0001
5/3i, decomp:11 border 142 168 82 174 milli-err2: 0
9/7i, decomp:11 border 142 168 82 174 milli-err2: 12277
9/7i, decomp:11 border 142 168 82 174 milli-err2: 18168
9/7f, decomp:11 border 142 168 82 174 err2: 0.0001
5/3i, decomp:23 border 142 209 171 235 milli-err2: 0
9/7i, decomp:23 border 142 209 171 235 milli-err2: 6570
9/7i, decomp:23 border 142 209 171 235 milli-err2: 7313
9/7f, decomp:23 border 142 209 171 235 err2: 0.0001
5/3i, decomp:30 border 37 185 79 245 milli-err2: 0
9/7i, decomp:30 border 37 185 79 245 milli-err2: 12266
9/7i, decomp:30 border 37 185 79 245 milli-err2: 13498
9/7f, decomp:30 border 37 185 79 245 err2: 0.0002
5/3i, decomp: 5 border 129 236 30 243 milli-err2: 0
9/7i, decomp: 5 border 129 236 30 243 milli-err2: 8686
9/7i, decomp: 5 border 129 236 30 243 milli-err2: 8775
9/7f, decomp: 5 border 129 236 30 243 err2: 0.0001
5/3i, decomp:10 border 5 160 146 247 milli-err2: 0
9/7i, decomp:10 border 5 160 146 247 milli-err2: 12231
9/7i, decomp:10 border 5 160 146 247 milli-err2: 13478
9/7f, decomp:10 border 5 160 146 247 err2: 0.0002
5/3i, decomp: 5 border 104 162 6 47 milli-err2: 0
9/7i, decomp: 5 border 104 162 6 47 milli-err2: 7794
9/7i, decomp: 5 border 104 162 6 47 milli-err2: 7808
9/7f, decomp: 5 border 104 162 6 47 err2: 0.0001
5/3i, decomp:24 border 78 250 102 218 milli-err2: 0
9/7i, decomp:24 border 78 250 102 218 milli-err2: 11632
9/7i, decomp:24 border 78 250 102 218 milli-err2: 12570
9/7f, decomp:24 border 78 250 102 218 err2: 0.0002
5/3i, decomp:28 border 86 98 56 79 milli-err2: 0
9/7i, decomp:28 border 86 98 56 79 milli-err2: 11105
9/7i, decomp:28 border 86 98 56 79 milli-err2: 4148
9/7f, decomp:28 border 86 98 56 79 err2: 0.0001
5/3i, decomp: 6 border 95 238 197 214 milli-err2: 0
9/7i, decomp: 6 border 95 238 197 214 milli-err2: 8308
9/7i, decomp: 6 border 95 238 197 214 milli-err2: 7686
9/7f, decomp: 6 border 95 238 197 214 err2: 0.0001
5/3i, decomp:17 border 77 169 93 165 milli-err2: 0
9/7i, decomp:17 border 77 169 93 165 milli-err2: 8820
9/7i, decomp:17 border 77 169 93 165 milli-err2: 12026
9/7f, decomp:17 border 77 169 93 165 err2: 0.0001
5/3i, decomp:22 border 178 187 7 119 milli-err2: 0
9/7i, decomp:22 border 178 187 7 119 milli-err2: 5554
9/7i, decomp:22 border 178 187 7 119 milli-err2: 4971
9/7f, decomp:22 border 178 187 7 119 err2: 0.0000

4
tests/ref/fate/jpeg2000-dcinema
Unescape View File

@ -1,3 +1,3 @@
#tb 0: 1/24
0, 0, 0, 1, 12441600, 0x330aac66
0, 1, 1, 1, 12441600, 0x112db395
0, 0, 0, 1, 12441600, 0xbf142791
0, 1, 1, 1, 12441600, 0x6b7a2ab5

8
tests/ref/vsynth/vsynth1-jpeg2000-97
Unescape View File

@ -1,4 +1,4 @@
0c704936bf54fad2b072dc0c8c289bb7 *tests/data/fate/vsynth1-jpeg2000-97.avi
4336566 tests/data/fate/vsynth1-jpeg2000-97.avi
1207ed65ca04d2c91936c4bc73c3a562 *tests/data/fate/vsynth1-jpeg2000-97.out.rawvideo
stddev: 4.36 PSNR: 35.34 MAXDIFF: 51 bytes: 7603200/ 7603200
4c7dbe2451f56a49c29b0b5d7808d74d *tests/data/fate/vsynth1-jpeg2000-97.avi
3661616 tests/data/fate/vsynth1-jpeg2000-97.avi
d079e946a2fb75ad5ce6cb2760d1cc62 *tests/data/fate/vsynth1-jpeg2000-97.out.rawvideo
stddev: 4.63 PSNR: 34.81 MAXDIFF: 54 bytes: 7603200/ 7603200

8
tests/ref/vsynth/vsynth2-jpeg2000-97
Unescape View File

@ -1,4 +1,4 @@
7bb7ccf4e9743888a5bda48f431630cf *tests/data/fate/vsynth2-jpeg2000-97.avi
3124708 tests/data/fate/vsynth2-jpeg2000-97.avi
fe0f3a97aa8c0b2f02dd11ccd1b77ca6 *tests/data/fate/vsynth2-jpeg2000-97.out.rawvideo
stddev: 3.26 PSNR: 37.86 MAXDIFF: 26 bytes: 7603200/ 7603200
c3582d23a1fca31a6218346b82167f88 *tests/data/fate/vsynth2-jpeg2000-97.avi
2451092 tests/data/fate/vsynth2-jpeg2000-97.avi
d1329b49bcfcf74279eb07f7e20ddcec *tests/data/fate/vsynth2-jpeg2000-97.out.rawvideo
stddev: 3.73 PSNR: 36.69 MAXDIFF: 30 bytes: 7603200/ 7603200

8
tests/ref/vsynth/vsynth3-jpeg2000-97
Unescape View File

@ -1,4 +1,4 @@
d551b1b1bfc691356e6f45f4386aff1d *tests/data/fate/vsynth3-jpeg2000-97.avi
92144 tests/data/fate/vsynth3-jpeg2000-97.avi
533535dad2ccc7aef3eb0e7ccb239bf2 *tests/data/fate/vsynth3-jpeg2000-97.out.rawvideo
stddev: 4.60 PSNR: 34.87 MAXDIFF: 46 bytes: 86700/ 86700
2f8a9b514fbf1cb034076459463a7b76 *tests/data/fate/vsynth3-jpeg2000-97.avi
83866 tests/data/fate/vsynth3-jpeg2000-97.avi
febc7ef2ae9ec3f34b74d456922ae858 *tests/data/fate/vsynth3-jpeg2000-97.out.rawvideo
stddev: 4.87 PSNR: 34.37 MAXDIFF: 51 bytes: 86700/ 86700

8
tests/ref/vsynth/vsynth_lena-jpeg2000-97
Unescape View File

@ -1,4 +1,4 @@
6600b19f6c2e84c599f37d33a295ee35 *tests/data/fate/vsynth_lena-jpeg2000-97.avi
2459730 tests/data/fate/vsynth_lena-jpeg2000-97.avi
9d9c07b0d1936810032820a08d0b0b5d *tests/data/fate/vsynth_lena-jpeg2000-97.out.rawvideo
stddev: 3.01 PSNR: 38.55 MAXDIFF: 27 bytes: 7603200/ 7603200
60808e880f1fd410b010feeca9105f4e *tests/data/fate/vsynth_lena-jpeg2000-97.avi
1931500 tests/data/fate/vsynth_lena-jpeg2000-97.avi
6d775a823d4b96cc6c121665bc7eb359 *tests/data/fate/vsynth_lena-jpeg2000-97.out.rawvideo
stddev: 3.38 PSNR: 37.53 MAXDIFF: 28 bytes: 7603200/ 7603200

Write Preview
Loading…
Cancel
Save