From: Jean First <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
Approved-by: Alex Zhukov
---
libavcodec/libopenjpegdec.c | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index c1174ba..e0165aa 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -56,7 +56,7 @@ static enum PixelFormat check_image_attributes(AVCodecContext
*avctx,
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:
@@ -83,6 +83,12 @@ libopenjpeg_yuv444_rgb:
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;
}
@@ -115,6 +121,25 @@ static inline void libopenjpeg_copy_to_packed8(AVFrame
*picture,
}
}
+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;
@@ -288,6 +313,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;
--
1.7.8.rc1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
