for (compno = CSpoc; compno < CEpoc; compno++) {
Jpeg2000Component *comp = tile->comp + compno;
Jpeg2000CodingStyle *codsty = tile->codsty + compno;
- Jpeg2000QuantStyle *qntsty = tile->qntsty + compno;
for (reslevelno = RSpoc; reslevelno < FFMIN(codsty->nreslevels, REpoc); reslevelno++) {
uint8_t reducedresno = codsty->nreslevels - 1 -reslevelno; // ==> N_L - r
Jpeg2000T1Context *t1, Jpeg2000Cblk *cblk,
int width, int height, int bandpos)
{
- int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y;
+ int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1;
int pass_cnt = 0;
int vert_causal_ctx_csty_symbol = codsty->cblk_style & JPEG2000_CBLK_VSC;
int term_cnt = 0;
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;
}
}
}
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;
}
}
plane = s->cdef[compno] ? s->cdef[compno]-1 : (s->ncomponents-1);
- y = tile->comp[compno].coord[1][0] - s->image_offset_y;
- line = picture->data[plane] + y / s->cdy[compno] * picture->linesize[plane];
+ y = tile->comp[compno].coord[1][0] - s->image_offset_y / s->cdy[compno];
+ line = picture->data[plane] + y * picture->linesize[plane];
for (; y < tile->comp[compno].coord[1][1] - s->image_offset_y; y ++) {
uint8_t *dst;
- x = tile->comp[compno].coord[0][0] - s->image_offset_x;
- dst = line + x / s->cdx[compno] * pixelsize + compno*!planar;
+ x = tile->comp[compno].coord[0][0] - s->image_offset_x / s->cdx[compno];
+ dst = line + x * pixelsize + compno*!planar;
if (codsty->transform == FF_DWT97) {
for (; x < w; x ++) {
if (planar)
plane = s->cdef[compno] ? s->cdef[compno]-1 : (s->ncomponents-1);
- y = tile->comp[compno].coord[1][0] - s->image_offset_y;
- linel = (uint16_t *)picture->data[plane] + y / s->cdy[compno] * (picture->linesize[plane] >> 1);
+ y = tile->comp[compno].coord[1][0] - s->image_offset_y / s->cdy[compno];
+ linel = (uint16_t *)picture->data[plane] + y * (picture->linesize[plane] >> 1);
for (; y < tile->comp[compno].coord[1][1] - s->image_offset_y; y ++) {
uint16_t *dst;
- x = tile->comp[compno].coord[0][0] - s->image_offset_x;
- dst = linel + (x / s->cdx[compno] * pixelsize + compno*!planar);
+ x = tile->comp[compno].coord[0][0] - s->image_offset_x / s->cdx[compno];
+ dst = linel + (x * pixelsize + compno*!planar);
if (codsty->transform == FF_DWT97) {
for (; x < w; x ++) {
int val = lrintf(*datap) + (1 << (cbps - 1));
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_JPEG2000,
- .capabilities = CODEC_CAP_FRAME_THREADS,
+ .capabilities = CODEC_CAP_FRAME_THREADS | CODEC_CAP_DR1,
.priv_data_size = sizeof(Jpeg2000DecoderContext),
.init_static_data = jpeg2000_init_static_data,
.init = jpeg2000_decode_init,