1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Added RGBA and YUV440 decoding support for libopenjpeg decoder

Reviewed-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Bradshaw 2011-11-30 21:44:41 -07:00 committed by Michael Niedermayer
parent d1669e5fe3
commit 3f07ef1dff

View File

@ -52,6 +52,7 @@ static enum PixelFormat check_image_attributes(AVCodecContext *avctx, opj_image_
switch (compRatio) { switch (compRatio) {
case 0111111: goto libopenjpeg_yuv444_rgb; case 0111111: goto libopenjpeg_yuv444_rgb;
case 0111212: return PIX_FMT_YUV440P;
case 0112121: goto libopenjpeg_yuv422; case 0112121: goto libopenjpeg_yuv422;
case 0112222: goto libopenjpeg_yuv420; case 0112222: goto libopenjpeg_yuv420;
default: goto libopenjpeg_rgb; default: goto libopenjpeg_rgb;
@ -296,6 +297,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
libopenjpeg_copyto16(picture, image); libopenjpeg_copyto16(picture, image);
break; break;
case 3: case 3:
case 4:
if (ispacked) { if (ispacked) {
libopenjpeg_copy_to_packed8(picture, image); libopenjpeg_copy_to_packed8(picture, image);
} }