Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / libopenjpegenc.c

diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
index 721e6bb4d3ca4116a58a3e2f11bf12c78461041d..b3106ac8b68656c1b05968a4993bb878b064e919 100644 (file)
--- a/libavcodec/libopenjpegenc.c
+++ b/libavcodec/libopenjpegenc.c
@@ -69,6 +69,11 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p
         color_space = CLRSPC_GRAY;
         numcomps = 1;
         break;
+    case PIX_FMT_GRAY16:
+        color_space = CLRSPC_GRAY;
+        numcomps = 1;
+        bpp = 16;
+        break;
     case PIX_FMT_RGB24:
         color_space = CLRSPC_SRGB;
         numcomps = 3;
@@ -77,6 +82,16 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p
         color_space = CLRSPC_SRGB;
         numcomps = 4;
         break;
+    case PIX_FMT_RGB48:
+        color_space = CLRSPC_SRGB;
+        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;
@@ -207,6 +222,32 @@ static int libopenjpeg_copy_rgba(AVCodecContext *avctx, AVFrame *frame, opj_imag
     return 1;
 }
 
+static int libopenjpeg_copy_rgb16(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image, int numcomps)
+{
+    int compno;
+    int x;
+    int y;
+    uint16_t *frame_ptr = (uint16_t*)frame->data[0];
+
+    av_assert0(numcomps == 1 || numcomps == 3 || numcomps == 4);
+
+    for (compno = 0; compno < numcomps; ++compno) {
+        if (image->comps[compno].w > frame->linesize[0] / numcomps) {
+            return 0;
+        }
+    }
+
+    for (compno = 0; compno < numcomps; ++compno) {
+        for (y = 0; y < avctx->height; ++y) {
+            for (x = 0; x < avctx->width; ++x) {
+                image->comps[compno].data[y * avctx->width + x] = frame_ptr[y * frame->linesize[0] / 2 + x * numcomps + compno];
+            }
+        }
+    }
+
+    return 1;
+}
+
 static int libopenjpeg_copy_yuv8(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image)
 {
     int compno;
@@ -286,12 +327,21 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf
     case PIX_FMT_GRAY8:
         cpyresult = libopenjpeg_copy_rgba(avctx, frame, image, 1);
         break;
+    case PIX_FMT_GRAY16:
+        cpyresult = libopenjpeg_copy_rgb16(avctx, frame, image, 1);
+        break;
     case PIX_FMT_RGB24:
         cpyresult = libopenjpeg_copy_rgba(avctx, frame, image, 3);
         break;
     case PIX_FMT_RGBA:
         cpyresult = libopenjpeg_copy_rgba(avctx, frame, image, 4);
         break;
+    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:
@@ -366,7 +416,8 @@ 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_GRAY8,
+    .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,
                                            PIX_FMT_YUV420P9,PIX_FMT_YUV422P9,PIX_FMT_YUV444P9,