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;
return 0;
}
-static int libopenjpeg_copy_rgba(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image, int numcomps)
+static int libopenjpeg_copy_packed8(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image, int numcomps)
{
int compno;
int x;
for (compno = 0; compno < numcomps; ++compno) {
if (image->comps[compno].w > frame->linesize[0] / numcomps) {
+ av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n");
return 0;
}
}
return 1;
}
-static int libopenjpeg_copy_rgb16(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image, int numcomps)
+static int libopenjpeg_copy_packed16(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);
+ av_assert0(numcomps == 1 || numcomps == 3 || numcomps == 4);
for (compno = 0; compno < numcomps; ++compno) {
if (image->comps[compno].w > frame->linesize[0] / numcomps) {
+ av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n");
return 0;
}
}
return 1;
}
-static int libopenjpeg_copy_yuv8(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image)
+static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image)
{
int compno;
int x;
int y;
int width;
int height;
- const int numcomps = avctx->pix_fmt == PIX_FMT_YUVA420P ? 4 : 3;
+ const int numcomps = image->numcomps;
for (compno = 0; compno < numcomps; ++compno) {
if (image->comps[compno].w > frame->linesize[compno]) {
+ av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n");
return 0;
}
}
return 1;
}
-static int libopenjpeg_copy_yuv16(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image)
+static int libopenjpeg_copy_unpacked16(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image)
{
int compno;
int x;
int y;
int width;
int height;
- const int numcomps = 3;
+ const int numcomps = image->numcomps;
uint16_t *frame_ptr;
for (compno = 0; compno < numcomps; ++compno) {
if (image->comps[compno].w > frame->linesize[compno]) {
+ av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n");
return 0;
}
}
image->y1 = (avctx->height - 1) * ctx->enc_params.subsampling_dy + 1;
switch (avctx->pix_fmt) {
- 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);
+ cpyresult = libopenjpeg_copy_packed8(avctx, frame, image, 3);
break;
case PIX_FMT_RGBA:
- cpyresult = libopenjpeg_copy_rgba(avctx, frame, image, 4);
+ cpyresult = libopenjpeg_copy_packed8(avctx, frame, image, 4);
break;
case PIX_FMT_RGB48:
- cpyresult = libopenjpeg_copy_rgb16(avctx, frame, image, 3);
+ cpyresult = libopenjpeg_copy_packed16(avctx, frame, image, 3);
break;
+ case PIX_FMT_RGBA64:
+ cpyresult = libopenjpeg_copy_packed16(avctx, frame, image, 4);
+ break;
+ case PIX_FMT_GRAY8:
case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P:
case PIX_FMT_YUV440P:
case PIX_FMT_YUV444P:
case PIX_FMT_YUVA420P:
- cpyresult = libopenjpeg_copy_yuv8(avctx, frame, image);
+ cpyresult = libopenjpeg_copy_unpacked8(avctx, frame, image);
break;
+ case PIX_FMT_GRAY16:
case PIX_FMT_YUV420P9:
case PIX_FMT_YUV420P10:
case PIX_FMT_YUV420P16:
case PIX_FMT_YUV444P9:
case PIX_FMT_YUV444P10:
case PIX_FMT_YUV444P16:
- cpyresult = libopenjpeg_copy_yuv16(avctx, frame, image);
+ cpyresult = libopenjpeg_copy_unpacked16(avctx, frame, image);
break;
default:
av_log(avctx, AV_LOG_ERROR, "The frame's pixel format '%s' is not supported\n", av_get_pix_fmt_name(avctx->pix_fmt));
.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,