diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 14:43:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-28 15:26:31 +0200 |
| commit | 96e73fa6494194d8c918e75e23df293327d5228a (patch) | |
| tree | d13e0294a3f5a6e1944a8593b9cb5c4c9f19a77c /libavcodec/jpeg2000dec.c | |
| parent | 9a345802edf7f430b3335f486aecdd8552f8367b (diff) | |
| download | ffmpeg-96e73fa6494194d8c918e75e23df293327d5228a.tar.gz | |
avcodec/jpeg2000dec: Merge i_stepsize/2 decoder special case into dequant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 7445942f9a..def8d4c277 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1559,13 +1559,13 @@ static void dequantization_int(int x, int y, Jpeg2000Cblk *cblk, for (j = 0; j < (cblk->coord[1][1] - cblk->coord[1][0]); ++j) { int32_t *datap = &comp->i_data[(comp->coord[0][1] - comp->coord[0][0]) * (y + j) + x]; int *src = t1->data + j*t1->stride; - if (band->i_stepsize == 16384) { + if (band->i_stepsize == 32768) { for (i = 0; i < w; ++i) datap[i] = src[i] / 2; } else { // This should be VERY uncommon for (i = 0; i < w; ++i) - datap[i] = (src[i] * (int64_t)band->i_stepsize) / 32768; + datap[i] = (src[i] * (int64_t)band->i_stepsize) / 65536; } } } @@ -1580,7 +1580,7 @@ static void dequantization_int_97(int x, int y, Jpeg2000Cblk *cblk, int32_t *datap = &comp->i_data[(comp->coord[0][1] - comp->coord[0][0]) * (y + j) + x]; int *src = t1->data + j*t1->stride; for (i = 0; i < w; ++i) - datap[i] = (src[i] * (int64_t)band->i_stepsize + (1<<14)) >> 15; + datap[i] = (src[i] * (int64_t)band->i_stepsize + (1<<15)) >> 16; } } |