diff options
Diffstat (limited to 'libavcodec/libopenjpegdec.c')
| -rw-r--r-- | libavcodec/libopenjpegdec.c | 151 |
1 files changed, 72 insertions, 79 deletions
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 73b1b9f71e..1cd1b9b009 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -2,20 +2,20 @@ * JPEG 2000 decoding support via OpenJPEG * Copyright (c) 2009 Jaikrishnan Menon <realityman@gmx.net> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg 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. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,7 +25,6 @@ */ #define OPJ_STATIC -#include <openjpeg.h> #include "libavutil/common.h" #include "libavutil/imgutils.h" @@ -37,6 +36,12 @@ #include "internal.h" #include "thread.h" +#if HAVE_OPENJPEG_1_5_OPENJPEG_H +# include <openjpeg-1.5/openjpeg.h> +#else +# include <openjpeg.h> +#endif + #define JP2_SIG_TYPE 0x6A502020 #define JP2_SIG_VALUE 0x0D0A870A @@ -46,72 +51,71 @@ AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64 #define GRAY_PIXEL_FORMATS AV_PIX_FMT_GRAY8, AV_PIX_FMT_YA8, \ - AV_PIX_FMT_GRAY16 - -#define YUV_PIXEL_FORMATS AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, \ - AV_PIX_FMT_YUVA420P, \ - AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, \ - AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, \ - AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, \ - AV_PIX_FMT_YUV444P9, \ - AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, \ - AV_PIX_FMT_YUV444P10, \ - AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, \ - AV_PIX_FMT_YUV444P16 + AV_PIX_FMT_GRAY16, AV_PIX_FMT_YA16 + +#define YUV_PIXEL_FORMATS AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUVA420P, \ + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA422P, \ + AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVA444P, \ + AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9, \ + AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9, \ + AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, \ + AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10, \ + AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, \ + AV_PIX_FMT_YUV420P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV444P14, \ + AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, \ + AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16 #define XYZ_PIXEL_FORMATS AV_PIX_FMT_XYZ12 -static const enum AVPixelFormat rgb_pix_fmts[] = { +static const enum AVPixelFormat libopenjpeg_rgb_pix_fmts[] = { RGB_PIXEL_FORMATS }; -static const enum AVPixelFormat gray_pix_fmts[] = { +static const enum AVPixelFormat libopenjpeg_gray_pix_fmts[] = { GRAY_PIXEL_FORMATS }; -static const enum AVPixelFormat yuv_pix_fmts[] = { +static const enum AVPixelFormat libopenjpeg_yuv_pix_fmts[] = { YUV_PIXEL_FORMATS }; -static const enum AVPixelFormat any_pix_fmts[] = { +static const enum AVPixelFormat libopenjpeg_all_pix_fmts[] = { RGB_PIXEL_FORMATS, GRAY_PIXEL_FORMATS, YUV_PIXEL_FORMATS, XYZ_PIXEL_FORMATS }; typedef struct LibOpenJPEGContext { AVClass *class; opj_dparameters_t dec_params; - int lowres; int lowqual; } LibOpenJPEGContext; -static int libopenjpeg_matches_pix_fmt(const opj_image_t *img, - enum AVPixelFormat pix_fmt) +static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image, enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); int match = 1; - if (desc->nb_components != img->numcomps) { + if (desc->nb_components != image->numcomps) { return 0; } switch (desc->nb_components) { case 4: match = match && - desc->comp[3].depth_minus1 + 1 >= img->comps[3].prec && - 1 == img->comps[3].dx && - 1 == img->comps[3].dy; + desc->comp[3].depth_minus1 + 1 >= image->comps[3].prec && + 1 == image->comps[3].dx && + 1 == image->comps[3].dy; case 3: match = match && - desc->comp[2].depth_minus1 + 1 >= img->comps[2].prec && - 1 << desc->log2_chroma_w == img->comps[2].dx && - 1 << desc->log2_chroma_h == img->comps[2].dy; + desc->comp[2].depth_minus1 + 1 >= image->comps[2].prec && + 1 << desc->log2_chroma_w == image->comps[2].dx && + 1 << desc->log2_chroma_h == image->comps[2].dy; case 2: match = match && - desc->comp[1].depth_minus1 + 1 >= img->comps[1].prec && - 1 << desc->log2_chroma_w == img->comps[1].dx && - 1 << desc->log2_chroma_h == img->comps[1].dy; + desc->comp[1].depth_minus1 + 1 >= image->comps[1].prec && + 1 << desc->log2_chroma_w == image->comps[1].dx && + 1 << desc->log2_chroma_h == image->comps[1].dy; case 1: match = match && - desc->comp[0].depth_minus1 + 1 >= img->comps[0].prec && - 1 == img->comps[0].dx && - 1 == img->comps[0].dy; + desc->comp[0].depth_minus1 + 1 >= image->comps[0].prec && + 1 == image->comps[0].dx && + 1 == image->comps[0].dy; default: break; } @@ -119,28 +123,27 @@ static int libopenjpeg_matches_pix_fmt(const opj_image_t *img, return match; } -static enum AVPixelFormat libopenjpeg_guess_pix_fmt(const opj_image_t *image) -{ +static inline enum AVPixelFormat libopenjpeg_guess_pix_fmt(const opj_image_t *image) { int index; const enum AVPixelFormat *possible_fmts = NULL; int possible_fmts_nb = 0; switch (image->color_space) { case CLRSPC_SRGB: - possible_fmts = rgb_pix_fmts; - possible_fmts_nb = FF_ARRAY_ELEMS(rgb_pix_fmts); + possible_fmts = libopenjpeg_rgb_pix_fmts; + possible_fmts_nb = FF_ARRAY_ELEMS(libopenjpeg_rgb_pix_fmts); break; case CLRSPC_GRAY: - possible_fmts = gray_pix_fmts; - possible_fmts_nb = FF_ARRAY_ELEMS(gray_pix_fmts); + possible_fmts = libopenjpeg_gray_pix_fmts; + possible_fmts_nb = FF_ARRAY_ELEMS(libopenjpeg_gray_pix_fmts); break; case CLRSPC_SYCC: - possible_fmts = yuv_pix_fmts; - possible_fmts_nb = FF_ARRAY_ELEMS(yuv_pix_fmts); + possible_fmts = libopenjpeg_yuv_pix_fmts; + possible_fmts_nb = FF_ARRAY_ELEMS(libopenjpeg_yuv_pix_fmts); break; default: - possible_fmts = any_pix_fmts; - possible_fmts_nb = FF_ARRAY_ELEMS(any_pix_fmts); + possible_fmts = libopenjpeg_all_pix_fmts; + possible_fmts_nb = FF_ARRAY_ELEMS(libopenjpeg_all_pix_fmts); break; } @@ -167,40 +170,37 @@ static inline int libopenjpeg_ispacked(enum AVPixelFormat pix_fmt) return 1; } -static void libopenjpeg_copy_to_packed8(AVFrame *picture, opj_image_t *image) -{ +static inline void libopenjpeg_copy_to_packed8(AVFrame *picture, opj_image_t *image) { uint8_t *img_ptr; int index, x, y, c; - for (y = 0; y < picture->height; y++) { index = y * picture->width; img_ptr = picture->data[0] + y * picture->linesize[0]; for (x = 0; x < picture->width; x++, index++) for (c = 0; c < image->numcomps; c++) - *img_ptr++ = image->comps[c].data[index]; + *img_ptr++ = 0x80 * image->comps[c].sgnd + image->comps[c].data[index]; } } -static void libopenjpeg_copy_to_packed16(AVFrame *picture, opj_image_t *image) -{ +static inline void libopenjpeg_copy_to_packed16(AVFrame *picture, opj_image_t *image) { uint16_t *img_ptr; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(picture->format); int index, x, y, c; int adjust[4]; - for (x = 0; x < image->numcomps; x++) - adjust[x] = FFMAX(FFMIN(16 - image->comps[x].prec, 8), 0); + adjust[x] = FFMAX(FFMIN(desc->comp[x].depth_minus1 + 1 - image->comps[x].prec, 8), 0) + desc->comp[x].shift; for (y = 0; y < picture->height; y++) { index = y * picture->width; img_ptr = (uint16_t *) (picture->data[0] + y * picture->linesize[0]); for (x = 0; x < picture->width; x++, index++) for (c = 0; c < image->numcomps; c++) - *img_ptr++ = image->comps[c].data[index] << adjust[c]; + *img_ptr++ = (1 << image->comps[c].prec - 1) * image->comps[c].sgnd + + (unsigned)image->comps[c].data[index] << adjust[c]; } } -static void libopenjpeg_copyto8(AVFrame *picture, opj_image_t *image) -{ +static inline void libopenjpeg_copyto8(AVFrame *picture, opj_image_t *image) { int *comp_data; uint8_t *img_ptr; int index, x, y; @@ -210,7 +210,7 @@ static void libopenjpeg_copyto8(AVFrame *picture, opj_image_t *image) for (y = 0; y < image->comps[index].h; y++) { img_ptr = picture->data[index] + y * picture->linesize[index]; for (x = 0; x < image->comps[index].w; x++) { - *img_ptr = (uint8_t) *comp_data; + *img_ptr = 0x80 * image->comps[index].sgnd + *comp_data; img_ptr++; comp_data++; } @@ -218,18 +218,22 @@ static void libopenjpeg_copyto8(AVFrame *picture, opj_image_t *image) } } -static void libopenjpeg_copyto16(AVFrame *p, opj_image_t *image) -{ +static inline void libopenjpeg_copyto16(AVFrame *picture, opj_image_t *image) { int *comp_data; uint16_t *img_ptr; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(picture->format); int index, x, y; + int adjust[4]; + for (x = 0; x < image->numcomps; x++) + adjust[x] = FFMAX(FFMIN(desc->comp[x].depth_minus1 + 1 - image->comps[x].prec, 8), 0) + desc->comp[x].shift; for (index = 0; index < image->numcomps; index++) { comp_data = image->comps[index].data; for (y = 0; y < image->comps[index].h; y++) { - img_ptr = (uint16_t *)(p->data[index] + y * p->linesize[index]); + img_ptr = (uint16_t *)(picture->data[index] + y * picture->linesize[index]); for (x = 0; x < image->comps[index].w; x++) { - *img_ptr = *comp_data; + *img_ptr = (1 << image->comps[index].prec - 1) * image->comps[index].sgnd + + (unsigned)*comp_data << adjust[index]; img_ptr++; comp_data++; } @@ -283,9 +287,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, return AVERROR_UNKNOWN; } opj_set_event_mgr((opj_common_ptr) dec, NULL, NULL); - ctx->dec_params.cp_limit_decoding = LIMIT_TO_MAIN_HEADER; - ctx->dec_params.cp_reduce = ctx->lowres; ctx->dec_params.cp_layer = ctx->lowqual; // Tie decoder with decoding parameters opj_setup_decoder(dec, &ctx->dec_params); @@ -311,11 +313,6 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, width = image->x1 - image->x0; height = image->y1 - image->y0; - if (ctx->lowres) { - width = (width + (1 << ctx->lowres) - 1) >> ctx->lowres; - height = (height + (1 << ctx->lowres) - 1) >> ctx->lowres; - } - ret = ff_set_dimensions(avctx, width, height); if (ret < 0) goto done; @@ -329,20 +326,17 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, if (avctx->pix_fmt == AV_PIX_FMT_NONE) { av_log(avctx, AV_LOG_ERROR, "Unable to determine pixel format\n"); - ret = AVERROR_INVALIDDATA; goto done; } - for (i = 0; i < image->numcomps; i++) if (image->comps[i].prec > avctx->bits_per_raw_sample) avctx->bits_per_raw_sample = image->comps[i].prec; - if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed\n"); + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) goto done; - } 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); @@ -416,12 +410,10 @@ done: static const AVOption options[] = { { "lowqual", "Limit the number of layers used for decoding", OFFSET(lowqual), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VD }, - { "lowres", "Lower the decoding resolution by a power of two", - OFFSET(lowres), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VD }, { NULL }, }; -static const AVClass class = { +static const AVClass openjpeg_class = { .class_name = "libopenjpeg", .item_name = av_default_item_name, .option = options, @@ -437,5 +429,6 @@ AVCodec ff_libopenjpeg_decoder = { .init = libopenjpeg_decode_init, .decode = libopenjpeg_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .priv_class = &class, + .max_lowres = 31, + .priv_class = &openjpeg_class, }; |