Skip to content

avcodec/jpeg2000: Fixups #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
etemesi254 wants to merge 3 commits into
base: patch/htj2k
Choose a base branch
from
Open

avcodec/jpeg2000: Fixups #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7340364
avcodec/jpeg2000: Fixups
etemesi254 Apr 9, 2023
014c2d0
add av_log2 changes
etemesi254 Apr 11, 2023
80de846
avcodec/jpeg2000: Refill buffer if bytes are less than 32
etemesi254 Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions libavcodec/jpeg2000dec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
return incl;

if (!cblk->npasses) {
int zbp = tag_tree_decode(s, prec->zerobits + cblkno, 100);
int zbp = tag_tree_decode(s,prec->zerobits + cblkno, 100);
int v = expn[bandno] + numgbits - 1 - zbp;

if (v < 0 || v > 30) {
Expand Down Expand Up @@ -1121,13 +1121,8 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
// Retrieve pass lengths for each pass
int href_passes = (cblk->npasses + newpasses - 1) % 3;
int segment_passes = newpasses - href_passes;
int pass_bound = 2;
int eb = 0;
int eb = av_log2(segment_passes);
int extra_bit = newpasses > 2 ? 1 : 0;
while (pass_bound <=segment_passes) {
eb++;
pass_bound +=pass_bound;
}
if ((ret = get_bits(s, llen + eb + 3)) < 0)
return ret;
cblk->pass_lengths[0] = ret;
Expand Down Expand Up @@ -1888,9 +1883,9 @@ static inline void tile_codeblocks(const Jpeg2000DecoderContext *s, Jpeg2000Tile

/* Loop on tile components */
for (compno = 0; compno < s->ncomponents; compno++) {
Jpeg2000Component *comp = tile->comp + compno;
Jpeg2000CodingStyle *codsty = tile->codsty + compno;
Jpeg2000QuantStyle *quantsty = tile->qntsty + compno;
Jpeg2000Component *comp = tile->comp + compno;
Jpeg2000CodingStyle *codsty = tile->codsty + compno;
Jpeg2000QuantStyle *quantsty= tile->qntsty + compno;

int coded = 0;
int subbandno = 0;
Expand Down Expand Up @@ -1922,12 +1917,13 @@ static inline void tile_codeblocks(const Jpeg2000DecoderContext *s, Jpeg2000Tile
cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height;
cblkno++) {
int x, y, ret;
/* See Rec. ITU-T T.814, Equation E-2 */
// Annex E (Equation E-2) ISO/IEC 15444-1:2019
int magp = quantsty->expn[subbandno] + quantsty->nguardbits - 1;

Jpeg2000Cblk *cblk = prec->cblk + cblkno;

if (s->is_htj2k)
if (codsty->cblk_style & JPEG2000_CTSY_HTJ2K_F)
// HT codeblocks, covers both full and partial blocks
ret = ff_jpeg2000_decode_htj2k(s, codsty, &t1, cblk,
cblk->coord[0][1] - cblk->coord[0][0],
cblk->coord[1][1] - cblk->coord[1][0],
Expand Down
2 changes: 1 addition & 1 deletion libavcodec/jpeg2000htdec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ static int jpeg2000_bitbuf_refill_backwards(StateVars *buffer, const uint8_t *ar
int32_t position = buffer->pos;
uint32_t new_bits = 32;

if (buffer->bits_left > 32)
if (buffer->bits_left >= 32)
return 0; // enough data, no need to pull in more bits

/**
Expand Down