|
|
|
@ -373,16 +373,14 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, |
|
|
|
|
for (j = 0; j < 2; j++) |
|
|
|
|
band->coord[1][j] = ff_jpeg2000_ceildiv(band->coord[1][j], dy); |
|
|
|
|
|
|
|
|
|
band->prec = av_mallocz_array(reslevel->num_precincts_x * |
|
|
|
|
reslevel->num_precincts_y, |
|
|
|
|
sizeof(*band->prec)); |
|
|
|
|
nb_precincts = reslevel->num_precincts_x * reslevel->num_precincts_y; |
|
|
|
|
band->prec = av_mallocz_array(nb_precincts, sizeof(*band->prec)); |
|
|
|
|
if (!band->prec) |
|
|
|
|
return AVERROR(ENOMEM); |
|
|
|
|
|
|
|
|
|
nb_precincts = reslevel->num_precincts_x * reslevel->num_precincts_y; |
|
|
|
|
|
|
|
|
|
for (precno = 0; precno < nb_precincts; precno++) { |
|
|
|
|
Jpeg2000Prec *prec = band->prec + precno; |
|
|
|
|
int nb_codeblocks; |
|
|
|
|
|
|
|
|
|
/* TODO: Explain formula for JPEG200 DCINEMA. */ |
|
|
|
|
/* TODO: Verify with previous count of codeblocks per band */ |
|
|
|
@ -429,12 +427,11 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, |
|
|
|
|
if (!prec->zerobits) |
|
|
|
|
return AVERROR(ENOMEM); |
|
|
|
|
|
|
|
|
|
prec->cblk = av_mallocz_array(prec->nb_codeblocks_width * |
|
|
|
|
prec->nb_codeblocks_height, |
|
|
|
|
sizeof(*prec->cblk)); |
|
|
|
|
nb_codeblocks = prec->nb_codeblocks_width * prec->nb_codeblocks_height; |
|
|
|
|
prec->cblk = av_mallocz_array(nb_codeblocks, sizeof(*prec->cblk)); |
|
|
|
|
if (!prec->cblk) |
|
|
|
|
return AVERROR(ENOMEM); |
|
|
|
|
for (cblkno = 0; cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; cblkno++) { |
|
|
|
|
for (cblkno = 0; cblkno < nb_codeblocks; cblkno++) { |
|
|
|
|
Jpeg2000Cblk *cblk = prec->cblk + cblkno; |
|
|
|
|
uint16_t Cx0, Cy0; |
|
|
|
|
|
|
|
|
|