Skip to content

F
ffmpeg.wasm-core
Commit 64f72bb6 authored by Hendrik Leppkes's avatar Hendrik Leppkes
Browse files
Options

Merge commit '29b00f88' 

* commit '29b00f88':
  jpeg2000: Templatize the frame writer
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents dc1050a3 29b00f88
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 96 deletions
libavcodec/jpeg2000dec.c
View file @ 64f72bb6
...@@ -1616,7 +1616,7 @@ static inline void mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) ...@@ -1616,7 +1616,7 @@ static inline void mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
s->dsp.mct_decode[tile->codsty[0].transform](src[0], src[1], src[2], csize); s->dsp.mct_decode[tile->codsty[0].transform](src[0], src[1], src[2], csize);
} }
static void tile_codeblocks(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) static inline void tile_codeblocks(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
{ {
Jpeg2000T1Context t1; Jpeg2000T1Context t1;
...@@ -1679,17 +1679,72 @@ static void tile_codeblocks(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) ...@@ -1679,17 +1679,72 @@ static void tile_codeblocks(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
} /*end comp */ } /*end comp */
} }
#define WRITE_FRAME(D, PIXEL) \
static inline void write_frame_ ## D(Jpeg2000DecoderContext * s, Jpeg2000Tile * tile, \
AVFrame * picture, int precision) \
{ \
const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(s->avctx->pix_fmt); \
int planar = !!(pixdesc->flags & AV_PIX_FMT_FLAG_PLANAR); \
int pixelsize = planar ? 1 : pixdesc->nb_components; \
\
int compno; \
int x, y; \
\
for (compno = 0; compno < s->ncomponents; compno++) { \
Jpeg2000Component *comp = tile->comp + compno; \
Jpeg2000CodingStyle *codsty = tile->codsty + compno; \
PIXEL *line; \
float *datap = comp->f_data; \
int32_t *i_datap = comp->i_data; \
int cbps = s->cbps[compno]; \
int w = tile->comp[compno].coord[0][1] - s->image_offset_x; \
int plane = 0; \
\
if (planar) \
plane = s->cdef[compno] ? s->cdef[compno]-1 : (s->ncomponents-1); \
\
y = tile->comp[compno].coord[1][0] - s->image_offset_y / s->cdy[compno]; \
line = (PIXEL *)picture->data[plane] + y * (picture->linesize[plane] / sizeof(PIXEL));\
for (; y < tile->comp[compno].coord[1][1] - s->image_offset_y; y++) { \
PIXEL *dst; \
\
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++) { \
int val = lrintf(*datap) + (1 << (cbps - 1)); \
/* DC level shift and clip see ISO 15444-1:2002 G.1.2 */ \
val = av_clip(val, 0, (1 << cbps) - 1); \
*dst = val << (precision - cbps); \
datap++; \
dst += pixelsize; \
} \
} else { \
for (; x < w; x++) { \
int val = *i_datap + (1 << (cbps - 1)); \
/* DC level shift and clip see ISO 15444-1:2002 G.1.2 */ \
val = av_clip(val, 0, (1 << cbps) - 1); \
*dst = val << (precision - cbps); \
i_datap++; \
dst += pixelsize; \
} \
} \
line += picture->linesize[plane] / sizeof(PIXEL); \
} \
} \
\
}
WRITE_FRAME(8, uint8_t)
WRITE_FRAME(16, uint16_t)
#undef WRITE_FRAME
static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
AVFrame *picture) AVFrame *picture)
{ {
const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(s->avctx->pix_fmt); int x;
int planar = !!(pixdesc->flags & AV_PIX_FMT_FLAG_PLANAR);
int pixelsize = planar ? 1 : pixdesc->nb_components;
int compno;
int x, y;
uint8_t *line;
tile_codeblocks(s, tile); tile_codeblocks(s, tile);
...@@ -1705,99 +1760,14 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, ...@@ -1705,99 +1760,14 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
} }
if (s->precision <= 8) { if (s->precision <= 8) {
for (compno = 0; compno < s->ncomponents; compno++) { write_frame_8(s, tile, picture, 8);
Jpeg2000Component *comp = tile->comp + compno;
Jpeg2000CodingStyle *codsty = tile->codsty + compno;
float *datap = comp->f_data;
int32_t *i_datap = comp->i_data;
int cbps = s->cbps[compno];
int w = tile->comp[compno].coord[0][1] - s->image_offset_x;
int plane = 0;
if (planar)
plane = s->cdef[compno] ? s->cdef[compno]-1 : (s->ncomponents-1);
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 / s->cdx[compno];
dst = line + x * pixelsize + compno*!planar;
if (codsty->transform == FF_DWT97) {
for (; x < w; x ++) {
int val = lrintf(*datap) + (1 << (cbps - 1));
/* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
val = av_clip(val, 0, (1 << cbps) - 1);
*dst = val << (8 - cbps);
datap++;
dst += pixelsize;
}
} else {
for (; x < w; x ++) {
int val = *i_datap + (1 << (cbps - 1));
/* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
val = av_clip(val, 0, (1 << cbps) - 1);
*dst = val << (8 - cbps);
i_datap++;
dst += pixelsize;
}
}
line += picture->linesize[plane];
}
}
} else { } else {
int precision = picture->format == AV_PIX_FMT_XYZ12 || int precision = picture->format == AV_PIX_FMT_XYZ12 ||
picture->format == AV_PIX_FMT_RGB48 || picture->format == AV_PIX_FMT_RGB48 ||
picture->format == AV_PIX_FMT_RGBA64 || picture->format == AV_PIX_FMT_RGBA64 ||
picture->format == AV_PIX_FMT_GRAY16 ? 16 : s->precision; picture->format == AV_PIX_FMT_GRAY16 ? 16 : s->precision;
for (compno = 0; compno < s->ncomponents; compno++) { write_frame_16(s, tile, picture, precision);
Jpeg2000Component *comp = tile->comp + compno;
Jpeg2000CodingStyle *codsty = tile->codsty + compno;
float *datap = comp->f_data;
int32_t *i_datap = comp->i_data;
uint16_t *linel;
int cbps = s->cbps[compno];
int w = tile->comp[compno].coord[0][1] - s->image_offset_x;
int plane = 0;
if (planar)
plane = s->cdef[compno] ? s->cdef[compno]-1 : (s->ncomponents-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 / 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));
/* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
val = av_clip(val, 0, (1 << cbps) - 1);
/* align 12 bit values in little-endian mode */
*dst = val << (precision - cbps);
datap++;
dst += pixelsize;
}
} else {
for (; x < w; x ++) {
int val = *i_datap + (1 << (cbps - 1));
/* DC level shift and clip see ISO 15444-1:2002 G.1.2 */
val = av_clip(val, 0, (1 << cbps) - 1);
/* align 12 bit values in little-endian mode */
*dst = val << (precision - cbps);
i_datap++;
dst += pixelsize;
}
}
linel += picture->linesize[plane] >> 1;
}
}
} }
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment