*/
/**
-* @file libavcodec/libopenjpeg.c
+* @file
* JPEG 2000 decoder using libopenjpeg
*/
+#include "libavcore/imgutils.h"
#include "avcodec.h"
#include "libavutil/intreadwrite.h"
#define OPJ_STATIC
static int check_image_attributes(opj_image_t *image)
{
- return(image->comps[0].dx == image->comps[1].dx &&
+ return image->comps[0].dx == image->comps[1].dx &&
image->comps[1].dx == image->comps[2].dx &&
image->comps[0].dy == image->comps[1].dy &&
image->comps[1].dy == image->comps[2].dy &&
image->comps[0].prec == image->comps[1].prec &&
- image->comps[1].prec == image->comps[2].prec);
+ image->comps[1].prec == image->comps[2].prec;
}
static av_cold int libopenjpeg_decode_init(AVCodecContext *avctx)
if((AV_RB32(buf) == 12) &&
(AV_RB32(buf + 4) == JP2_SIG_TYPE) &&
(AV_RB32(buf + 8) == JP2_SIG_VALUE)) {
- dec = opj_create_decompress(CODEC_JP2);
+ dec = opj_create_decompress(CODEC_JP2);
} else {
- dec = opj_create_decompress(CODEC_J2K);
+ // If the AVPacket contains a jp2c box, then skip to
+ // the starting byte of the codestream.
+ if (AV_RB32(buf + 4) == AV_RB32("jp2c"))
+ buf += 8;
+ dec = opj_create_decompress(CODEC_J2K);
}
if(!dec) {
}
opj_set_event_mgr((opj_common_ptr)dec, NULL, NULL);
+ ctx->dec_params.cp_reduce = avctx->lowres;
// Tie decoder with decoding parameters
opj_setup_decoder(dec, &ctx->dec_params);
stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
opj_destroy_decompress(dec);
return -1;
}
- width = image->comps[0].w;
- height = image->comps[0].h;
- if(avcodec_check_dimensions(avctx, width, height) < 0) {
+ width = image->comps[0].w << avctx->lowres;
+ height = image->comps[0].h << avctx->lowres;
+ if(av_image_check_size(width, height, 0, avctx) < 0) {
av_log(avctx, AV_LOG_ERROR, "%dx%d dimension invalid.\n", width, height);
goto done;
}
}
break;
case 4: has_alpha = 1;
- avctx->pix_fmt = PIX_FMT_RGB32;
+ avctx->pix_fmt = PIX_FMT_RGBA;
break;
default: av_log(avctx, AV_LOG_ERROR, "%d components unsupported.\n", image->numcomps);
goto done;
AVCodec libopenjpeg_decoder = {
"libopenjpeg",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_JPEG2000,
sizeof(LibOpenJPEGContext),
libopenjpeg_decode_init,
NULL,
libopenjpeg_decode_close,
libopenjpeg_decode_frame,
- NULL,
+ CODEC_CAP_DR1,
+ .max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 decoder"),
} ;