return AVERROR_INVALIDDATA;
for (i = 0; i < s->ncomponents; i++) { // Ssiz_i XRsiz_i, YRsiz_i
- uint8_t x = bytestream_get_byte(&s->buf);
+ uint8_t x = bytestream2_get_byteu(&s->g);
s->cbps[i] = (x & 0x7f) + 1;
s->precision = FFMAX(s->cbps[i], s->precision);
s->sgnd[i] = (x & 0x80) == 1;
- s->cdx[i] = bytestream_get_byte(&s->buf);
- s->cdy[i] = bytestream_get_byte(&s->buf);
+ s->cdx[i] = bytestream2_get_byteu(&s->g);
+ s->cdy[i] = bytestream2_get_byteu(&s->g);
}
s->numXtiles = ff_jpeg2k_ceildiv(s->width - s->tile_offset_x,
s->tile_width);
@@ -249,10 +242,11 @@ static int get_cox(Jpeg2KDecoderContext *s,
Jpeg2KCodingStyle *c)
{
uint8_t byte;
- if (s->buf_end - s->buf < 5)
+ if (bytestream2_get_bytes_left(&s->g) < 5)
return AVERROR_INVALIDDATA;
+
// num of resolution levels - 1
- c->nreslevels = bytestream_get_byte(&s->buf) + 1;
+ c->nreslevels = bytestream2_get_byteu(&s->g) + 1;
if (c->nreslevels > JPEG2K_MAX_RESLEVELS)
return AVERROR_INVALIDDATA;
@@ -263,8 +257,8 @@ static int get_cox(Jpeg2KDecoderContext *s,
Jpeg2KCodingStyle *c)
else
c->nreslevels2decode = c->nreslevels - s->reduction_factor;
- c->log2_cblk_width = bytestream_get_byte(&s->buf) + 2; // cblk width
- c->log2_cblk_height = bytestream_get_byte(&s->buf) + 2; // cblk height
+ c->log2_cblk_width = bytestream2_get_byteu(&s->g) + 2; // cblk width
+ c->log2_cblk_height = bytestream2_get_byteu(&s->g) + 2; // cblk height
if (c->log2_cblk_width > 10 || c->log2_cblk_height > 10 ||
c->log2_cblk_width + c->log2_cblk_height > 14) {
@@ -272,12 +266,12 @@ static int get_cox(Jpeg2KDecoderContext *s,
Jpeg2KCodingStyle *c)
return AVERROR_INVALIDDATA;
}
- c->cblk_style = bytestream_get_byte(&s->buf);
+ c->cblk_style = bytestream2_get_byteu(&s->g);
if (c->cblk_style != 0) { // cblk style
avpriv_request_sample(s->avctx, "Support for extra cblk styles");
return AVERROR_PATCHWELCOME;
}
- c->transform = bytestream_get_byte(&s->buf); // DWT transformation type
+ c->transform = bytestream2_get_byteu(&s->g); // DWT transformation type
/* set integer 9/7 DWT in case of BITEXACT flag */
if ((s->avctx->flags & CODEC_FLAG_BITEXACT) && (c->transform == FF_DWT97))
c->transform = FF_DWT97_INT;
@@ -285,7 +279,7 @@ static int get_cox(Jpeg2KDecoderContext *s,
Jpeg2KCodingStyle *c)
if (c->csty & JPEG2K_CSTY_PREC) {
int i;
for (i = 0; i < c->nreslevels; i++) {
- byte = bytestream_get_byte(&s->buf);
+ byte = bytestream2_get_byte(&s->g);
c->log2_prec_widths[i] = byte & 0x0F; // precinct PPx
c->log2_prec_heights[i] = (byte >> 4) & 0x0F; // precinct PPy
}
@@ -300,19 +294,19 @@ static int get_cod(Jpeg2KDecoderContext *s,
Jpeg2KCodingStyle *c,
Jpeg2KCodingStyle tmp;
int compno;
- if (s->buf_end - s->buf < 5)
+ if (bytestream2_get_bytes_left(&s->g) < 5)
return AVERROR_INVALIDDATA;
tmp.log2_prec_width =
tmp.log2_prec_height = 15;
- tmp.csty = bytestream_get_byte(&s->buf);
+ tmp.csty = bytestream2_get_byteu(&s->g);
// get progression order
- tmp.prog_order = bytestream_get_byte(&s->buf);
+ tmp.prog_order = bytestream2_get_byteu(&s->g);
- tmp.nlayers = bytestream_get_be16(&s->buf);
- tmp.mct = bytestream_get_byte(&s->buf); // multiple component
transformation
+ tmp.nlayers = bytestream2_get_be16u(&s->g);
+ tmp.mct = bytestream2_get_byteu(&s->g); // multiple component
transformation
get_cox(s, &tmp);
for (compno = 0; compno < s->ncomponents; compno++)
@@ -328,13 +322,13 @@ static int get_coc(Jpeg2KDecoderContext *s,
Jpeg2KCodingStyle *c,
{
int compno;
- if (s->buf_end - s->buf < 2)
+ if (bytestream2_get_bytes_left(&s->g) < 2)
return AVERROR_INVALIDDATA;
- compno = bytestream_get_byte(&s->buf);
+ compno = bytestream2_get_byteu(&s->g);
c += compno;
- c->csty = bytestream_get_byte(&s->buf);
+ c->csty = bytestream2_get_byteu(&s->g);
get_cox(s, c);
properties[compno] |= HAD_COC;
@@ -346,24 +340,25 @@ static int get_qcx(Jpeg2KDecoderContext *s, int n,
Jpeg2KQuantStyle *q)
{
int i, x;
- if (s->buf_end - s->buf < 1)
+ if (bytestream2_get_bytes_left(&s->g) < 1)
return AVERROR_INVALIDDATA;
- x = bytestream_get_byte(&s->buf); // Sqcd
+ x = bytestream2_get_byteu(&s->g); // Sqcd
q->nguardbits = x >> 5;
q->quantsty = x & 0x1f;
if (q->quantsty == JPEG2K_QSTY_NONE) {
n -= 3;
- if (s->buf_end - s->buf < n)
+ if (bytestream2_get_bytes_left(&s->g) < n ||
+ n > JPEG2K_MAX_DECLEVELS)
return AVERROR_INVALIDDATA;
for (i = 0; i < n; i++)
- q->expn[i] = bytestream_get_byte(&s->buf) >> 3;
+ q->expn[i] = bytestream2_get_byteu(&s->g) >> 3;
} else if (q->quantsty == JPEG2K_QSTY_SI) {
- if (s->buf_end - s->buf < 2)
+ if (bytestream2_get_bytes_left(&s->g) < 2)
return AVERROR_INVALIDDATA;
- x = bytestream_get_be16(&s->buf);
+ x = bytestream2_get_be16u(&s->g);
q->expn[0] = x >> 11;
q->mant[0] = x & 0x7ff;
for (i = 1; i < JPEG2K_MAX_DECLEVELS * 3; i++) {
@@ -373,10 +368,11 @@ static int get_qcx(Jpeg2KDecoderContext *s, int n,
Jpeg2KQuantStyle *q)
}
} else {
n = (n - 3) >> 1;
- if (s->buf_end - s->buf < n)
+ if (bytestream2_get_bytes_left(&s->g) < 2 * n ||
+ n > JPEG2K_MAX_DECLEVELS)
return AVERROR_INVALIDDATA;
for (i = 0; i < n; i++) {
- x = bytestream_get_be16(&s->buf);
+ x = bytestream2_get_be16u(&s->g);
q->expn[i] = x >> 11;
q->mant[i] = x & 0x7ff;
}
@@ -406,10 +402,10 @@ static int get_qcc(Jpeg2KDecoderContext *s, int n,
Jpeg2KQuantStyle *q,
{
int compno;
- if (s->buf_end - s->buf < 1)
+ if (bytestream2_get_bytes_left(&s->g) < 1)
return AVERROR_INVALIDDATA;
- compno = bytestream_get_byte(&s->buf);
+ compno = bytestream2_get_byteu(&s->g);
properties[compno] |= HAD_QCC;
return get_qcx(s, n - 1, q + compno);
}
@@ -422,19 +418,19 @@ static int get_sot(Jpeg2KDecoderContext *s, int n)
uint32_t Psot;
uint8_t TPsot;
- if (s->buf_end - s->buf < 4)
+ if (bytestream2_get_bytes_left(&s->g) < 8)
return AVERROR_INVALIDDATA;
- Isot = bytestream_get_be16(&s->buf); // Isot
+ Isot = bytestream2_get_be16u(&s->g); // Isot
if (Isot) {
avpriv_request_sample(s->avctx, "Support for more than one tile");
return AVERROR_PATCHWELCOME;
}
- Psot = bytestream_get_be32(&s->buf); // Psot
- TPsot = bytestream_get_byte(&s->buf); // TPsot
+ Psot = bytestream2_get_be32u(&s->g); // Psot
+ TPsot = bytestream2_get_byteu(&s->g); // TPsot
/* Read TNSot but not used */
- bytestream_get_byte(&s->buf); // TNsot
+ bytestream2_get_byteu(&s->g); // TNsot
tp = s->tile[s->curtileno].tile_part + TPsot;
tp->tile_index = Isot;
@@ -443,9 +439,10 @@ static int get_sot(Jpeg2KDecoderContext *s, int n)
/* Start of bit stream. Pointer to SOD marker
* Check SOD marker is present. */
- if (JPEG2K_SOD == bytestream_get_be16(&s->buf))
- tp->tp_start_bstrm = s->buf;
- else {
+ if (JPEG2K_SOD == bytestream2_get_be16(&s->g)) {
+ bytestream2_init(&tp->tpg, s->g.buffer, tp->tp_len - n - 4);
+ bytestream2_skip(&s->g, tp->tp_len - n - 4);
+ } else {
av_log(s->avctx, AV_LOG_ERROR, "SOD marker not found \n");
return AVERROR_INVALIDDATA;
}
@@ -453,10 +450,6 @@ static int get_sot(Jpeg2KDecoderContext *s, int n)
/* End address of bit stream =
* start address + (Psot - size of SOT HEADER(n)
* - size of SOT MARKER(2) - size of SOD marker(2) */
- tp->tp_end_bstrm = s->buf + (tp->tp_len - n - 4);
-
- // set buffer pointer to end of tile part header
- s->buf = tp->tp_end_bstrm;
return 0;
}
@@ -472,8 +465,8 @@ static int get_sot(Jpeg2KDecoderContext *s, int n)
static uint8_t get_tlm(Jpeg2KDecoderContext *s, int n)
{
uint8_t Stlm, ST, SP, tile_tlm, i;
- bytestream_get_byte(&s->buf); /* Ztlm: skipped */
- Stlm = bytestream_get_byte(&s->buf);
+ bytestream2_get_byte(&s->g); /* Ztlm: skipped */
+ Stlm = bytestream2_get_byte(&s->g);
// too complex ? ST = ((Stlm >> 4) & 0x01) + ((Stlm >> 4) & 0x02);
ST = (Stlm >> 4) & 0x03;
@@ -485,19 +478,19 @@ static uint8_t get_tlm(Jpeg2KDecoderContext *s, int n)
case 0:
break;
case 1:
- bytestream_get_byte(&s->buf);
+ bytestream2_get_byte(&s->g);
break;
case 2:
- bytestream_get_be16(&s->buf);
+ bytestream2_get_be16(&s->g);
break;
case 3:
- bytestream_get_be32(&s->buf);
+ bytestream2_get_be32(&s->g);
break;
}
if (SP == 0) {
- bytestream_get_be16(&s->buf);
+ bytestream2_get_be16(&s->g);
} else {
- bytestream_get_be32(&s->buf);
+ bytestream2_get_be32(&s->g);
}
}
return 0;
@@ -629,8 +622,8 @@ static int jpeg2k_decode_packet(Jpeg2KDecoderContext *s,
jpeg2k_flush(s);
if (codsty->csty & JPEG2K_CSTY_EPH) {
- if (AV_RB16(s->buf) == JPEG2K_EPH)
- s->buf += 2;
+ if (bytestream2_peek_be16(&s->g) == JPEG2K_EPH)
+ bytestream2_skip(&s->g, 2);
else
av_log(s->avctx, AV_LOG_ERROR, "EPH marker not found.\n");
}
@@ -642,12 +635,12 @@ static int jpeg2k_decode_packet(Jpeg2KDecoderContext *s,
nb_code_blocks = prec->nb_codeblocks_height *
prec->nb_codeblocks_width;
for (cblkno = 0; cblkno < nb_code_blocks; cblkno++) {
Jpeg2KCblk *cblk = prec->cblk + cblkno;
- if (s->buf_end - s->buf < cblk->lengthinc)
+ if (bytestream2_get_bytes_left(&s->g) < cblk->lengthinc)
return AVERROR_INVALIDDATA;
/* Code-block data can be empty. In that case initialize data
* with 0xFFFF. */
if (cblk->lengthinc > 0) {
- bytestream_get_buffer(&s->buf, cblk->data, cblk->lengthinc);
+ bytestream2_get_bufferu(&s->g, cblk->data, cblk->lengthinc);
} else {
cblk->data[0] = 0xFF;
cblk->data[1] = 0xFF;
@@ -701,7 +694,7 @@ static int jpeg2k_decode_packets(Jpeg2KDecoderContext *s,
Jpeg2KTile *tile)
/* Set bit stream buffer address according to tile-part.
* For DCinema one tile-part per component, so can be
* indexed by component. */
- s->buf = tile->tile_part[compno].tp_start_bstrm;
+ s->g = tile->tile_part[compno].tpg;
/* Position loop (y axis)
* TODO: Automate computing of step 256.
@@ -746,7 +739,7 @@ static int jpeg2k_decode_packets(Jpeg2KDecoderContext *s,
Jpeg2KTile *tile)
}
/* EOC marker reached */
- s->buf += 2;
+ bytestream2_skip(&s->g, 2);
return 0;
}
@@ -1160,22 +1153,22 @@ static int
jpeg2k_read_main_headers(Jpeg2KDecoderContext *s)
for (;;) {
int len, ret = 0;
uint16_t marker;
- const uint8_t *oldbuf;
+ int oldpos;
- if (s->buf_end - s->buf < 2) {
+ if (bytestream2_get_bytes_left(&s->g) < 2) {
av_log(s->avctx, AV_LOG_ERROR, "Missing EOC\n");
break;
}
- marker = bytestream_get_be16(&s->buf);
- oldbuf = s->buf;
+ marker = bytestream2_get_be16u(&s->g);
+ oldpos = bytestream2_tell(&s->g);
if (marker == JPEG2K_EOC)
break;
- if (s->buf_end - s->buf < 2)
+ if (bytestream2_get_bytes_left(&s->g) < 2)
return AVERROR_INVALIDDATA;
- len = bytestream_get_be16(&s->buf);
+ len = bytestream2_get_be16u(&s->g);
switch (marker) {
case JPEG2K_SIZ:
ret = get_siz(s);
@@ -1197,7 +1190,7 @@ static int jpeg2k_read_main_headers(Jpeg2KDecoderContext
*s)
break;
case JPEG2K_COM:
// the comment is ignored
- s->buf += len - 2;
+ bytestream2_skip(&s->g, len - 2);
break;
case JPEG2K_TLM:
// Tile-part lengths
@@ -1205,12 +1198,12 @@ static int
jpeg2k_read_main_headers(Jpeg2KDecoderContext *s)
break;
default:
av_log(s->avctx, AV_LOG_ERROR,
- "unsupported marker 0x%.4X at pos 0x%tX\n",
- marker, s->buf - s->buf_start - 4);
- s->buf += len - 2;
+ "unsupported marker 0x%.4X at pos 0x%X\n",
+ marker, bytestream2_tell(&s->g) - 4);
+ bytestream2_skip(&s->g, len - 2);
break;
}
- if (((s->buf - oldbuf != len) && (marker != JPEG2K_SOT)) || ret) {
+ if (((bytestream2_tell(&s->g) - oldpos != len) && (marker !=
JPEG2K_SOT)) || ret) {
av_log(s->avctx, AV_LOG_ERROR,
"error during processing marker segment %.4x\n", marker);
return ret ? ret : -1;
@@ -1235,19 +1228,18 @@ static int
jpeg2k_read_bitstream_packets(Jpeg2KDecoderContext *s)
static int jp2_find_codestream(Jpeg2KDecoderContext *s)
{
- int32_t atom_size;
+ uint32_t atom_size, atom;
int found_codestream = 0, search_range = 10;
- // Skip JPEG 2000 signature atom.
- s->buf += 12;
-
- while (!found_codestream && search_range) {
- atom_size = AV_RB32(s->buf);
- if (AV_RB32(s->buf + 4) == JP2_CODESTREAM) {
+ while(!found_codestream && search_range && bytestream2_get_bytes_left(&s->g)
>= 8) {
+ atom_size = bytestream2_get_be32u(&s->g);
+ atom = bytestream2_get_be32u(&s->g);
+ if (atom == JP2_CODESTREAM) {
found_codestream = 1;
- s->buf += 8;
} else {
- s->buf += atom_size;
+ if (bytestream2_get_bytes_left(&s->g) < atom_size - 8)
+ return 0;
+ bytestream2_skipu(&s->g, atom_size - 8);
search_range--;
}
}
@@ -1266,28 +1258,32 @@ static int jpeg2k_decode_frame(AVCodecContext *avctx,
void *data,
int tileno, ret;
s->avctx = avctx;
- s->buf = s->buf_start = avpkt->data;
- s->buf_end = s->buf_start + avpkt->size;
+ bytestream2_init(&s->g, avpkt->data, avpkt->size);
s->curtileno = 0; // TODO: only one tile in DCI JP2K. to implement for
more tiles
// reduction factor, i.e number of resolution levels to skip
s->reduction_factor = s->lowres;
- if (s->buf_end - s->buf < 2)
+ if (bytestream2_get_bytes_left(&s->g) < 2)
return AVERROR_INVALIDDATA;
// check if the image is in jp2 format
- if ((AV_RB32(s->buf) == 12) &&
- (AV_RB32(s->buf + 4) == JP2_SIG_TYPE) &&
- (AV_RB32(s->buf + 8) == JP2_SIG_VALUE)) {
+ if (bytestream2_get_bytes_left(&s->g) >= 12 &&
+ (bytestream2_get_be32u(&s->g) == 12) &&
+ (bytestream2_get_be32u(&s->g) == JP2_SIG_TYPE) &&
+ (bytestream2_get_be32u(&s->g) == JP2_SIG_VALUE)) {
if (!jp2_find_codestream(s)) {
av_log(avctx, AV_LOG_ERROR,
"couldn't find jpeg2k codestream atom\n");
return AVERROR_INVALIDDATA;
}
+ } else {
+ bytestream2_seek(&s->g, 0, SEEK_SET);
+ if (bytestream2_peek_be16(&s->g) != JPEG2K_SOC)
+ bytestream2_skip(&s->g, 8);
}
- if (bytestream_get_be16(&s->buf) != JPEG2K_SOC) {
+ if (bytestream2_get_be16u(&s->g) != JPEG2K_SOC) {
av_log(avctx, AV_LOG_ERROR, "SOC marker not present\n");
return AVERROR_INVALIDDATA;
}
@@ -1310,9 +1306,10 @@ static int jpeg2k_decode_frame(AVCodecContext *avctx,
void *data,
*got_frame = 1;
+ return bytestream2_tell(&s->g);
end:
jpeg2k_dec_cleanup(s);
- return ret ? ret : s->buf - s->buf_start;
+ return ret;
}
static void jpeg2k_init_static_data(AVCodec *codec)
