|
|
|
@ -24,13 +24,14 @@ |
|
|
|
|
* JPEG 2000 decoder using libopenjpeg |
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
#include "libavutil/opt.h" |
|
|
|
|
#define OPJ_STATIC |
|
|
|
|
#include <openjpeg.h> |
|
|
|
|
|
|
|
|
|
#include "libavutil/imgutils.h" |
|
|
|
|
#include "avcodec.h" |
|
|
|
|
#include "libavutil/intreadwrite.h" |
|
|
|
|
#include "libavutil/opt.h" |
|
|
|
|
#include "avcodec.h" |
|
|
|
|
#include "thread.h" |
|
|
|
|
#define OPJ_STATIC |
|
|
|
|
#include <openjpeg.h> |
|
|
|
|
|
|
|
|
|
#define JP2_SIG_TYPE 0x6A502020 |
|
|
|
|
#define JP2_SIG_VALUE 0x0D0A870A |
|
|
|
@ -94,8 +95,8 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, |
|
|
|
|
(AV_RB32(buf + 8) == JP2_SIG_VALUE)) { |
|
|
|
|
dec = opj_create_decompress(CODEC_JP2); |
|
|
|
|
} else { |
|
|
|
|
// If the AVPacket contains a jp2c box, then skip to
|
|
|
|
|
// the starting byte of the codestream.
|
|
|
|
|
/* 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); |
|
|
|
@ -113,20 +114,24 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, |
|
|
|
|
// Tie decoder with decoding parameters
|
|
|
|
|
opj_setup_decoder(dec, &ctx->dec_params); |
|
|
|
|
stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size); |
|
|
|
|
|
|
|
|
|
if (!stream) { |
|
|
|
|
av_log(avctx, AV_LOG_ERROR, "Codestream could not be opened for reading.\n"); |
|
|
|
|
av_log(avctx, AV_LOG_ERROR, |
|
|
|
|
"Codestream could not be opened for reading.\n"); |
|
|
|
|
opj_destroy_decompress(dec); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Decode the header only
|
|
|
|
|
// Decode the header only.
|
|
|
|
|
image = opj_decode_with_info(dec, stream, NULL); |
|
|
|
|
opj_cio_close(stream); |
|
|
|
|
|
|
|
|
|
if (!image) { |
|
|
|
|
av_log(avctx, AV_LOG_ERROR, "Error decoding codestream.\n"); |
|
|
|
|
opj_destroy_decompress(dec); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
width = image->x1 - image->x0; |
|
|
|
|
height = image->y1 - image->y0; |
|
|
|
|
|
|
|
|
@ -136,26 +141,33 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (av_image_check_size(width, height, 0, avctx) < 0) { |
|
|
|
|
av_log(avctx, AV_LOG_ERROR, "%dx%d dimension invalid.\n", width, height); |
|
|
|
|
av_log(avctx, AV_LOG_ERROR, |
|
|
|
|
"%dx%d dimension invalid.\n", width, height); |
|
|
|
|
goto done; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
avcodec_set_dimensions(avctx, width, height); |
|
|
|
|
|
|
|
|
|
switch(image->numcomps) |
|
|
|
|
{ |
|
|
|
|
case 1: avctx->pix_fmt = PIX_FMT_GRAY8; |
|
|
|
|
switch (image->numcomps) { |
|
|
|
|
case 1: |
|
|
|
|
avctx->pix_fmt = PIX_FMT_GRAY8; |
|
|
|
|
break; |
|
|
|
|
case 3: if(check_image_attributes(image)) { |
|
|
|
|
case 3: |
|
|
|
|
if (check_image_attributes(image)) { |
|
|
|
|
avctx->pix_fmt = PIX_FMT_RGB24; |
|
|
|
|
} else { |
|
|
|
|
avctx->pix_fmt = PIX_FMT_GRAY8; |
|
|
|
|
av_log(avctx, AV_LOG_ERROR, "Only first component will be used.\n"); |
|
|
|
|
av_log(avctx, AV_LOG_ERROR, |
|
|
|
|
"Only first component will be used.\n"); |
|
|
|
|
} |
|
|
|
|
break; |
|
|
|
|
case 4: has_alpha = 1; |
|
|
|
|
case 4: |
|
|
|
|
has_alpha = 1; |
|
|
|
|
avctx->pix_fmt = PIX_FMT_RGBA; |
|
|
|
|
break; |
|
|
|
|
default: av_log(avctx, AV_LOG_ERROR, "%d components unsupported.\n", image->numcomps); |
|
|
|
|
default: |
|
|
|
|
av_log(avctx, AV_LOG_ERROR, "%d components unsupported.\n", |
|
|
|
|
image->numcomps); |
|
|
|
|
goto done; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -170,22 +182,22 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, |
|
|
|
|
ff_thread_finish_setup(avctx); |
|
|
|
|
|
|
|
|
|
ctx->dec_params.cp_limit_decoding = NO_LIMITATION; |
|
|
|
|
// Tie decoder with decoding parameters
|
|
|
|
|
// Tie decoder with decoding parameters.
|
|
|
|
|
opj_setup_decoder(dec, &ctx->dec_params); |
|
|
|
|
stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size); |
|
|
|
|
if (!stream) { |
|
|
|
|
av_log(avctx, AV_LOG_ERROR, "Codestream could not be opened for reading.\n"); |
|
|
|
|
av_log(avctx, AV_LOG_ERROR, |
|
|
|
|
"Codestream could not be opened for reading.\n"); |
|
|
|
|
opj_destroy_decompress(dec); |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Decode the codestream
|
|
|
|
|
// Decode the codestream.
|
|
|
|
|
image = opj_decode_with_info(dec, stream, NULL); |
|
|
|
|
opj_cio_close(stream); |
|
|
|
|
|
|
|
|
|
for(x = 0; x < image->numcomps; x++) { |
|
|
|
|
for (x = 0; x < image->numcomps; x++) |
|
|
|
|
adjust[x] = FFMAX(image->comps[x].prec - 8, 0); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for (y = 0; y < avctx->height; y++) { |
|
|
|
|
index = y * avctx->width; |
|
|
|
|