virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

jpeg2000: Update pixel format support

Browse Source 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Michael Niedermayer
2013-07-01 10:01:25 +02:00
committed by Luca Barbato
parent db13e02c6f
commit 33e665a6ab
1 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
libavcodec/jpeg2000dec.c
View File

@ -235,37 +235,35 @@ static int get_siz(Jpeg2000DecoderContext *s)
s->avctx->height = ff_jpeg2000_ceildivpow2(s->height - s->image_offset_y, s->avctx->height = ff_jpeg2000_ceildivpow2(s->height - s->image_offset_y,
s->reduction_factor); s->reduction_factor);
switch (s->avctx->profile) { switch (s->ncomponents) {
case FF_PROFILE_JPEG2000_DCINEMA_2K: case 1:
case FF_PROFILE_JPEG2000_DCINEMA_4K: if (s->precision > 8)
/* XYZ color-space for digital cinema profiles */ s->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
s->avctx->pix_fmt = AV_PIX_FMT_XYZ12; else
s->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
break; break;
default: case 3:
/* For other profiles selects color-space according number of switch (s->avctx->profile) {
* components and bit depth precision. */ case FF_PROFILE_JPEG2000_DCINEMA_2K:
switch (s->ncomponents) { case FF_PROFILE_JPEG2000_DCINEMA_4K:
case 1: /* XYZ color-space for digital cinema profiles */
if (s->precision > 8) s->avctx->pix_fmt = AV_PIX_FMT_XYZ12;
s->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
else
s->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
break; break;
case 3: default:
if (s->precision > 8) if (s->precision > 8)
s->avctx->pix_fmt = AV_PIX_FMT_RGB48; s->avctx->pix_fmt = AV_PIX_FMT_RGB48;
else else
s->avctx->pix_fmt = AV_PIX_FMT_RGB24; s->avctx->pix_fmt = AV_PIX_FMT_RGB24;
break; break;
case 4:
s->avctx->pix_fmt = AV_PIX_FMT_BGRA;
break;
default:
/* pixel format can not be identified */
s->avctx->pix_fmt = AV_PIX_FMT_NONE;
break;
} }
break; break;
case 4:
s->avctx->pix_fmt = AV_PIX_FMT_RGBA;
break;
default:
/* pixel format can not be identified */
s->avctx->pix_fmt = AV_PIX_FMT_NONE;
break;
} }
return 0; return 0;
} }
@ -1135,11 +1133,6 @@ static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
if (tile->codsty[0].mct) if (tile->codsty[0].mct)
mct_decode(s, tile); mct_decode(s, tile);
if (s->avctx->pix_fmt == AV_PIX_FMT_BGRA) { // RGBA -> BGRA
FFSWAP(float *, tile->comp[0].f_data, tile->comp[2].f_data);
FFSWAP(int *, tile->comp[0].i_data, tile->comp[2].i_data);
}
if (s->precision <= 8) { if (s->precision <= 8) {
for (compno = 0; compno < s->ncomponents; compno++) { for (compno = 0; compno < s->ncomponents; compno++) {
Jpeg2000Component *comp = tile->comp + compno; Jpeg2000Component *comp = tile->comp + compno;
@ -1443,8 +1436,5 @@ AVCodec ff_jpeg2000_decoder = {
.init_static_data = jpeg2000_init_static_data, .init_static_data = jpeg2000_init_static_data,
.decode = jpeg2000_decode_frame, .decode = jpeg2000_decode_frame,
.priv_class = &class, .priv_class = &class,
.pix_fmts = (enum AVPixelFormat[]) { AV_PIX_FMT_XYZ12,
AV_PIX_FMT_GRAY8,
-1 },
.profiles = NULL_IF_CONFIG_SMALL(profiles) .profiles = NULL_IF_CONFIG_SMALL(profiles)
}; };