* JPEG 2000 decoding support via OpenJPEG
* Copyright (c) 2009 Jaikrishnan Menon <realityman@gmx.net>
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
-* @file libavcodec/libopenjpeg.c
+* @file
* JPEG 2000 decoder using libopenjpeg
*/
+#include "libavutil/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)
void *data, int *data_size,
AVPacket *avpkt)
{
- const uint8_t *buf = avpkt->data;
+ uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
LibOpenJPEGContext *ctx = avctx->priv_data;
AVFrame *picture = &ctx->image, *output = data;
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) {
}
width = image->comps[0].w << avctx->lowres;
height = image->comps[0].h << avctx->lowres;
- if(avcodec_check_dimensions(avctx, width, height) < 0) {
+ 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,
- CODEC_ID_JPEG2000,
- sizeof(LibOpenJPEGContext),
- libopenjpeg_decode_init,
- NULL,
- libopenjpeg_decode_close,
- libopenjpeg_decode_frame,
- CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 decoder"),
-} ;
+AVCodec ff_libopenjpeg_decoder = {
+ .name = "libopenjpeg",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_JPEG2000,
+ .priv_data_size = sizeof(LibOpenJPEGContext),
+ .init = libopenjpeg_decode_init,
+ .close = libopenjpeg_decode_close,
+ .decode = libopenjpeg_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .max_lowres = 5,
+ .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 decoder"),
+};