diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 10:01:29 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2013-07-02 20:05:47 +0200 |
commit | aa16bbaf9bcaef880f70c834d46cb51cf823722f (patch) | |
tree | abacc1f0efb0137e3c8b654448296c5bfd5905b7 /libavcodec | |
parent | daeb4e3042f2ecae2d41aaa4cae0bed932539788 (diff) | |
download | ffmpeg-streaming-aa16bbaf9bcaef880f70c834d46cb51cf823722f.zip ffmpeg-streaming-aa16bbaf9bcaef880f70c834d46cb51cf823722f.tar.gz |
jpeg2000: Refactor SOT marker parsing
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/jpeg2000dec.c | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 15dfc2b..ac44a29 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -41,9 +41,8 @@ #define HAD_QCC 0x02 typedef struct Jpeg2000TilePart { - uint16_t tp_idx; // Tile-part index uint8_t tile_index; // Tile index who refers the tile-part - uint32_t tp_len; // Length of tile-part + const uint8_t *tp_end; GetByteContext tpg; // bit stream in tile-part } Jpeg2000TilePart; @@ -55,6 +54,7 @@ typedef struct Jpeg2000Tile { Jpeg2000CodingStyle codsty[4]; Jpeg2000QuantStyle qntsty[4]; Jpeg2000TilePart tile_part[3]; + uint16_t tp_idx; // Tile-part index } Jpeg2000Tile; typedef struct Jpeg2000DecoderContext { @@ -503,24 +503,18 @@ static int get_sot(Jpeg2000DecoderContext *s, int n) return AVERROR_PATCHWELCOME; } - tp = s->tile[s->curtileno].tile_part + TPsot; + s->tile[Isot].tp_idx = TPsot; + tp = s->tile[Isot].tile_part + TPsot; tp->tile_index = Isot; - tp->tp_len = Psot; - tp->tp_idx = TPsot; - - /* Start of bit stream. Pointer to SOD marker - * Check SOD marker is present. */ - if (JPEG2000_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; - } + tp->tp_end = s->g.buffer + Psot - n - 2; - /* End address of bit stream = - * start address + (Psot - size of SOT HEADER(n) - * - size of SOT MARKER(2) - size of SOD marker(2) */ + if (!TPsot) { + Jpeg2000Tile *tile = s->tile + s->curtileno; + + /* copy defaults */ + memcpy(tile->codsty, s->codsty, s->ncomponents * sizeof(Jpeg2000CodingStyle)); + memcpy(tile->qntsty, s->qntsty, s->ncomponents * sizeof(Jpeg2000QuantStyle)); + } return 0; } @@ -577,12 +571,6 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno) if (!tile->comp) return AVERROR(ENOMEM); - /* copy codsty, qnsty to tile. TODO: Is it the best way? - * codsty, qnsty is an array of 4 structs Jpeg2000CodingStyle - * and Jpeg2000QuantStyle */ - memcpy(tile->codsty, s->codsty, s->ncomponents * sizeof(*tile->codsty)); - memcpy(tile->qntsty, s->qntsty, s->ncomponents * sizeof(*tile->qntsty)); - for (compno = 0; compno < s->ncomponents; compno++) { Jpeg2000Component *comp = tile->comp + compno; Jpeg2000CodingStyle *codsty = tile->codsty + compno; @@ -1269,7 +1257,11 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) ret = get_qcd(s, len, qntsty, properties); break; case JPEG2000_SOT: - ret = get_sot(s, len); + if (!(ret = get_sot(s, len))) { + codsty = s->tile[s->curtileno].codsty; + qntsty = s->tile[s->curtileno].qntsty; + properties = s->tile[s->curtileno].properties; + } break; case JPEG2000_COM: // the comment is ignored @@ -1286,7 +1278,7 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) bytestream2_skip(&s->g, len - 2); break; } - if (((bytestream2_tell(&s->g) - oldpos != len) && (marker != JPEG2000_SOT)) || ret) { + if (bytestream2_tell(&s->g) - oldpos != len || ret) { av_log(s->avctx, AV_LOG_ERROR, "error during processing marker segment %.4x\n", marker); return ret ? ret : -1; |