virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

libopenjpeg: support decoding with bits per pixel greater than 8

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Approved-by: Alex Zhukov
This commit is contained in:
Jean First 2011-12-22 22:26:21 +01:00 committed by Michael Niedermayer
parent 28dff06176
commit 0d4a77472a
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/libopenjpegdec.c
View File

@ -54,7 +54,7 @@ static enum PixelFormat check_image_attributes(AVCodecContext *avctx, opj_image_
case 0111111: goto libopenjpeg_yuv444_rgb;
case 0112121: goto libopenjpeg_yuv422;
case 0112222: goto libopenjpeg_yuv420;
default: return PIX_FMT_RGB24;
default: goto libopenjpeg_rgb;
}
libopenjpeg_yuv420:
@ -80,6 +80,13 @@ libopenjpeg_yuv444_rgb:
case 10: return PIX_FMT_YUV444P10;
case 16: return PIX_FMT_YUV444P16;
}
libopenjpeg_rgb:
switch (c0.prec) {
case 8: return PIX_FMT_RGB24;
default: return PIX_FMT_RGB48;
}
return PIX_FMT_RGB24;
}
@ -107,6 +114,24 @@ static inline void libopenjpeg_copy_to_packed8(AVFrame *picture, opj_image_t *im
}
}
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;
@ -275,6 +300,11 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
libopenjpeg_copy_to_packed8(picture, image);
}
break;
case 6:
if (ispacked) {
libopenjpeg_copy_to_packed16(picture, image);
}
break;
default:
av_log(avctx, AV_LOG_ERROR, "unsupported pixel size %d\n", pixel_size);
goto done;