X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Flibopenjpeg.c;h=1facd210445ae8df664cfff2b2f1a3c613216da1;hb=53026339190132b79644bd2dec73ba9c9a902a4f;hp=70581ee73c1aa68cbbb0372771d792fbaf76ed0d;hpb=3d6fac8cee1a5d4afb0b79894d83d076d4715e19;p=ffmpeg diff --git a/libavcodec/libopenjpeg.c b/libavcodec/libopenjpeg.c index 70581ee73c1..1facd210445 100644 --- a/libavcodec/libopenjpeg.c +++ b/libavcodec/libopenjpeg.c @@ -2,30 +2,32 @@ * JPEG 2000 decoding support via OpenJPEG * Copyright (c) 2009 Jaikrishnan Menon * - * 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" +#include "thread.h" #define OPJ_STATIC #include @@ -39,12 +41,12 @@ typedef struct { 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) @@ -56,10 +58,20 @@ static av_cold int libopenjpeg_decode_init(AVCodecContext *avctx) return 0; } +static av_cold int libopenjpeg_decode_init_thread_copy(AVCodecContext *avctx) +{ + LibOpenJPEGContext *ctx = avctx->priv_data; + + avctx->coded_frame = &ctx->image; + return 0; +} + static int libopenjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; LibOpenJPEGContext *ctx = avctx->priv_data; AVFrame *picture = &ctx->image, *output = data; opj_dinfo_t *dec; @@ -76,9 +88,13 @@ static int libopenjpeg_decode_frame(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) { @@ -87,6 +103,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, } opj_set_event_mgr((opj_common_ptr)dec, NULL, NULL); + ctx->dec_params.cp_limit_decoding = LIMIT_TO_MAIN_HEADER; // Tie decoder with decoding parameters opj_setup_decoder(dec, &ctx->dec_params); stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size); @@ -96,7 +113,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, return -1; } - // Decode the codestream + // Decode the header only image = opj_decode_with_info(dec, stream, NULL); opj_cio_close(stream); if(!image) { @@ -104,9 +121,9 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, 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->x1 - image->x0; + height = image->y1 - image->y0; + 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; } @@ -124,28 +141,45 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, } 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; } if(picture->data[0]) - avctx->release_buffer(avctx, picture); + ff_thread_release_buffer(avctx, picture); + + if(ff_thread_get_buffer(avctx, picture) < 0){ + av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed\n"); + return -1; + } - if(avctx->get_buffer(avctx, picture) < 0) { - av_log(avctx, AV_LOG_ERROR, "Couldn't allocate image buffer.\n"); + ff_thread_finish_setup(avctx); + + ctx->dec_params.cp_limit_decoding = NO_LIMITATION; + 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); + if(!stream) { + av_log(avctx, AV_LOG_ERROR, "Codestream could not be opened for reading.\n"); + opj_destroy_decompress(dec); return -1; } + // Decode the codestream + image = opj_decode_with_info(dec, stream, NULL); + opj_cio_close(stream); + for(x = 0; x < image->numcomps; x++) { adjust[x] = FFMAX(image->comps[x].prec - 8, 0); } - for(y = 0; y < height; y++) { - index = y*width; + for(y = 0; y < avctx->height; y++) { + index = y*avctx->width; img_ptr = picture->data[0] + y*picture->linesize[0]; - for(x = 0; x < width; x++, index++) { + for(x = 0; x < avctx->width; x++, index++) { *img_ptr++ = image->comps[0].data[index] >> adjust[0]; if(image->numcomps > 2 && check_image_attributes(image)) { *img_ptr++ = image->comps[1].data[index] >> adjust[1]; @@ -171,20 +205,21 @@ static av_cold int libopenjpeg_decode_close(AVCodecContext *avctx) LibOpenJPEGContext *ctx = avctx->priv_data; if(ctx->image.data[0]) - avctx->release_buffer(avctx, &ctx->image); + ff_thread_release_buffer(avctx, &ctx->image); return 0 ; } -AVCodec libopenjpeg_decoder = { - "libopenjpeg", - CODEC_TYPE_VIDEO, - CODEC_ID_JPEG2000, - sizeof(LibOpenJPEGContext), - libopenjpeg_decode_init, - NULL, - libopenjpeg_decode_close, - libopenjpeg_decode_frame, - NULL, - .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 | CODEC_CAP_FRAME_THREADS, + .max_lowres = 5, + .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 decoder"), + .init_thread_copy = ONLY_IF_THREADS_ENABLED(libopenjpeg_decode_init_thread_copy) +};