videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-31 16:31:54 +02:00
Code Releases Activity

Allow decoding of j2k images with bpp<8 and 8<bpp<16 with libopenjpeg.

Browse Source 
Fixes one of several problems described in ticket #1279.
This commit is contained in:
Carl Eugen Hoyos 2012-05-11 17:50:28 +02:00
parent 75a9479b39
commit 6d376346eb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/libopenjpegdec.c
View File

@ -35,6 +35,8 @@
#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,PIX_FMT_RGBA64
#define GRAY_PIXEL_FORMATS PIX_FMT_GRAY8,PIX_FMT_GRAY8A,PIX_FMT_GRAY16
#define YUV_PIXEL_FORMATS PIX_FMT_YUV420P,PIX_FMT_YUV422P,PIX_FMT_YUVA420P, \
@ -62,16 +64,16 @@ static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image, enum Pix
}
switch (descriptor.nb_components) {
case 4: match = match && descriptor.comp[3].depth_minus1 + 1 == image->comps[3].prec &&
case 4: match = match && descriptor.comp[3].depth_minus1 + 1 >= image->comps[3].prec &&
1 << descriptor.log2_chroma_w == image->comps[3].dx &&
1 << descriptor.log2_chroma_h == image->comps[3].dy;
case 3: match = match && descriptor.comp[2].depth_minus1 + 1 == image->comps[2].prec &&
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 &&
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 &&
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: