On Thu, 19 Jul 2012 03:41:11 +0200, Luca Barbato <lu_z...@gentoo.org> wrote:
> From: Michael Bradshaw <mbrads...@sorensonmedia.com>
>
> Based on FFmpeg version from
> commit 3275981207e30e140cffaea334ac390f1a04266a
> ---
> libavcodec/libopenjpegdec.c | 305
> +++++++++++++++++++++++++++++++++++--------
> 1 files changed, 250 insertions(+), 55 deletions(-)
>
> diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
> index 799ccd7..1c08f8a 100644
> --- a/libavcodec/libopenjpegdec.c
> +++ b/libavcodec/libopenjpegdec.c
> @@ -24,29 +24,200 @@
> * JPEG 2000 decoder using libopenjpeg
> */
>
> +#define OPJ_STATIC
> +#include <openjpeg.h>
> +
> +#include "libavutil/intreadwrite.h"
> #include "libavutil/imgutils.h"
> +#include "libavutil/pixfmt.h"
> +#include "libavutil/opt.h"
> #include "avcodec.h"
> -#include "libavutil/intreadwrite.h"
> #include "thread.h"
> -#define OPJ_STATIC
> -#include <openjpeg.h>
>
> #define JP2_SIG_TYPE 0x6A502020
> #define JP2_SIG_VALUE 0x0D0A870A
>
> +// pix_fmts with lower bpp have to be listed before
> +// similar pix_fmts with higher bpp.
> +#define RGB_PIXEL_FORMATS PIX_FMT_RGB24, PIX_FMT_RGBA, \
> + PIX_FMT_RGB48
> +
> +#define GRAY_PIXEL_FORMATS PIX_FMT_GRAY8, PIX_FMT_Y400A, \
> + PIX_FMT_GRAY16
> +
> +#define YUV_PIXEL_FORMATS PIX_FMT_YUV410P, PIX_FMT_YUV411P, \
> + PIX_FMT_YUVA420P, \
> + PIX_FMT_YUV420P, PIX_FMT_YUV422P, \
> + PIX_FMT_YUV440P, PIX_FMT_YUV444P, \
> + PIX_FMT_YUV420P9, PIX_FMT_YUV422P9, \
> + PIX_FMT_YUV444P9, \
> + PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, \
> + PIX_FMT_YUV444P10, \
> + PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, \
> + PIX_FMT_YUV444P16
> +
> +static const enum PixelFormat rgb_pix_fmts[] = {RGB_PIXEL_FORMATS};
> +static const enum PixelFormat gray_pix_fmts[] = {GRAY_PIXEL_FORMATS};
> +static const enum PixelFormat yuv_pix_fmts[] = {YUV_PIXEL_FORMATS};
> +static const enum PixelFormat any_pix_fmts[] = {RGB_PIXEL_FORMATS,
> + GRAY_PIXEL_FORMATS,
> + YUV_PIXEL_FORMATS};
> +
> typedef struct {
> opj_dparameters_t dec_params;
> AVFrame image;
> } LibOpenJPEGContext;
>
> -static int check_image_attributes(opj_image_t *image)
> +static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image,
> + enum PixelFormat pix_fmt)
What's with all the inlines? Does inlining them give any practical benefit?
> +{
> + AVPixFmtDescriptor descriptor = av_pix_fmt_descriptors[pix_fmt];
> + int match = 1;
> +
> + if (descriptor.nb_components != image->numcomps) {
> + return 0;
> + }
> +
> + switch (descriptor.nb_components) {
> + case 4: match = match && descriptor.comp[3].depth_minus1 + 1 >=
> image->comps[3].prec &&
> + 1 == image->comps[3].dx &&
> + 1 == image->comps[3].dy;
> + case 3: match = match && descriptor.comp[2].depth_minus1 + 1 >=
> image->comps[2].prec &&
> + 1 << descriptor.log2_chroma_w ==
> image->comps[2].dx &&
> + 1 << descriptor.log2_chroma_h ==
> image->comps[2].dy;
> + case 2: match = match && descriptor.comp[1].depth_minus1 + 1 >=
> image->comps[1].prec &&
> + 1 << descriptor.log2_chroma_w ==
> image->comps[1].dx &&
> + 1 << descriptor.log2_chroma_h ==
> image->comps[1].dy;
> + case 1: match = match && descriptor.comp[0].depth_minus1 + 1 >=
> image->comps[0].prec &&
> + 1 == image->comps[0].dx &&
> + 1 == image->comps[0].dy;
> + default:
> + break;
> + }
> +
> + return match;
> +}
> +
> +static inline enum PixelFormat libopenjpeg_guess_pix_fmt(const opj_image_t
> *image)
> +{
> + int index;
> + const enum PixelFormat *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);
> + break;
> + case CLRSPC_GRAY:
> + possible_fmts = gray_pix_fmts;
> + possible_fmts_nb = FF_ARRAY_ELEMS(gray_pix_fmts);
> + break;
> + case CLRSPC_SYCC:
> + possible_fmts = yuv_pix_fmts;
> + possible_fmts_nb = FF_ARRAY_ELEMS(yuv_pix_fmts);
> + break;
> + default:
> + possible_fmts = any_pix_fmts;
> + possible_fmts_nb = FF_ARRAY_ELEMS(any_pix_fmts);
> + break;
> + }
> +
> + for (index = 0; index < possible_fmts_nb; ++index) {
It's named index and not i because....?
also nit: ++ on the wrong side ;)
> + if (libopenjpeg_matches_pix_fmt(image, possible_fmts[index])) {
> + return possible_fmts[index];
> + }
> + }
> +
> + return PIX_FMT_NONE;
> +}
> +
> +static inline int libopenjpeg_ispacked(enum PixelFormat pix_fmt)
> {
> - 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;
> + int i, component_plane;
> +
> + if (pix_fmt == PIX_FMT_GRAY16)
> + return 0;
> +
> + component_plane = av_pix_fmt_descriptors[pix_fmt].comp[0].plane;
> + for (i = 1; i < av_pix_fmt_descriptors[pix_fmt].nb_components; i++) {
> + if (component_plane != av_pix_fmt_descriptors[pix_fmt].comp[i].plane)
> + return 0;
> + }
> + return 1;
> +}
> +
> +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];
> + }
> + }
> + }
> +}
> +
> +static inline void libopenjpeg_copy_to_packed16(AVFrame *picture,
> + opj_image_t *image)
> +{
> + uint16_t *img_ptr;
> + 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);
> + }
> + 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];
> + }
> + }
> + }
> +}
> +
> +static inline void libopenjpeg_copyto8(AVFrame *picture, opj_image_t *image)
> +{
> + int *comp_data;
> + uint8_t *img_ptr;
> + int index, x, y;
> +
> + for (index = 0; index < image->numcomps; index++) {
> + comp_data = image->comps[index].data;
> + 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++;
> + comp_data++;
> + }
> + }
> + }
> +}
> +
> +static inline void libopenjpeg_copyto16(AVFrame *p, opj_image_t *image)
> +{
> + int *comp_data;
> + uint16_t *img_ptr;
> + int index, x, y;
> + 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]);
> + for (x = 0; x < image->comps[index].w; x++) {
> + *img_ptr = *comp_data;
> + img_ptr++;
> + comp_data++;
> + }
> + }
> + }
> }
>
> static av_cold int libopenjpeg_decode_init(AVCodecContext *avctx)
> @@ -54,6 +225,7 @@ static av_cold int libopenjpeg_decode_init(AVCodecContext
> *avctx)
> LibOpenJPEGContext *ctx = avctx->priv_data;
>
> opj_set_default_decoder_parameters(&ctx->dec_params);
> + avcodec_get_frame_defaults(&ctx->image);
unrelated
> avctx->coded_frame = &ctx->image;
> return 0;
> }
> @@ -77,10 +249,10 @@ static int libopenjpeg_decode_frame(AVCodecContext
> *avctx,
> opj_dinfo_t *dec;
> opj_cio_t *stream;
> opj_image_t *image;
> - int width, height, has_alpha = 0, ret = -1;
> - int x, y, index;
> - uint8_t *img_ptr;
> - int adjust[4];
> + int width, height, ret = -1;
> + int pixel_size = 0;
> + int ispacked = 0;
> + int i;
>
> *data_size = 0;
>
> @@ -124,69 +296,92 @@ static int libopenjpeg_decode_frame(AVCodecContext
> *avctx,
> 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);
> + av_log(avctx, AV_LOG_ERROR,
> + "%dx%d dimension invalid.\n", width, height);
unrelated
> goto done;
> }
> avcodec_set_dimensions(avctx, width, height);
>
> - switch(image->numcomps)
> - {
> - case 1: avctx->pix_fmt = PIX_FMT_GRAY8;
> - break;
> - 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");
> - }
> - break;
> - 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);
> - goto done;
> - }
> -
> - if(picture->data[0])
> + if (avctx->pix_fmt != PIX_FMT_NONE) {
> + if (!libopenjpeg_matches_pix_fmt(image, avctx->pix_fmt)) {
> + avctx->pix_fmt = PIX_FMT_NONE;
> + }
> + }
> +
> + if (avctx->pix_fmt == PIX_FMT_NONE) {
> + avctx->pix_fmt = libopenjpeg_guess_pix_fmt(image);
> + }
> +
> + if (avctx->pix_fmt == PIX_FMT_NONE) {
> + av_log(avctx, AV_LOG_ERROR, "Unable to determine pixel format\n");
> + goto done;
Set ret to something sensible please.
--
Anton Khirnov
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
