[FFmpeg-cvslog] RGBA64 encoding with libopenjpeg.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Jan 14 01:34:16 2012 +0100| [36397ea1c7e27ab850149cc61394c2baa26dd532] | committer: Carl Eugen Hoyos

RGBA64 encoding with libopenjpeg.

Reviewed-by: Michael Bradshaw

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36397ea1c7e27ab850149cc61394c2baa26dd532
---

 libavcodec/libopenjpegenc.c |   12 ++++++++++--
 libavcodec/version.h        |    2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
index 9faa0f0..b3106ac 100644
--- a/libavcodec/libopenjpegenc.c
+++ b/libavcodec/libopenjpegenc.c
@@ -87,6 +87,11 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p
         numcomps = 3;
         bpp = 16;
         break;
+    case PIX_FMT_RGBA64:
+        color_space = CLRSPC_SRGB;
+        numcomps = 4;
+        bpp = 16;
+        break;
     case PIX_FMT_YUV420P:
         color_space = CLRSPC_SYCC;
         numcomps = 3;
@@ -224,7 +229,7 @@ static int libopenjpeg_copy_rgb16(AVCodecContext *avctx, AVFrame *frame, opj_ima
     int y;
     uint16_t *frame_ptr = (uint16_t*)frame->data[0];
 
-    av_assert0(numcomps == 1 || numcomps == 3);
+    av_assert0(numcomps == 1 || numcomps == 3 || numcomps == 4);
 
     for (compno = 0; compno < numcomps; ++compno) {
         if (image->comps[compno].w > frame->linesize[0] / numcomps) {
@@ -334,6 +339,9 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf
     case PIX_FMT_RGB48:
         cpyresult = libopenjpeg_copy_rgb16(avctx, frame, image, 3);
         break;
+    case PIX_FMT_RGBA64:
+        cpyresult = libopenjpeg_copy_rgb16(avctx, frame, image, 4);
+        break;
     case PIX_FMT_YUV420P:
     case PIX_FMT_YUV422P:
     case PIX_FMT_YUV440P:
@@ -408,7 +416,7 @@ AVCodec ff_libopenjpeg_encoder = {
     .encode         = libopenjpeg_encode_frame,
     .close          = libopenjpeg_encode_close,
     .capabilities   = 0,
-    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24,PIX_FMT_RGBA,PIX_FMT_RGB48,
+    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24,PIX_FMT_RGBA,PIX_FMT_RGB48,PIX_FMT_RGBA64,
                                            PIX_FMT_GRAY8,PIX_FMT_GRAY16,
                                            PIX_FMT_YUV420P,PIX_FMT_YUV422P,PIX_FMT_YUVA420P,
                                            PIX_FMT_YUV440P,PIX_FMT_YUV444P,
diff --git a/libavcodec/version.h b/libavcodec/version.h
index af4353f..fd0c3cf 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -22,7 +22,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 53
 #define LIBAVCODEC_VERSION_MINOR 55
-#define LIBAVCODEC_VERSION_MICRO 104
+#define LIBAVCODEC_VERSION_MICRO 105
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \