| @@ -87,6 +87,11 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p · 86 unmodified lines |
| 87 | 87 | numcomps = 3; |
| 88 | 88 | bpp = 16; |
| 89 | 89 | break; |
| 90 | + case PIX_FMT_RGBA64: |
| 91 | + color_space = CLRSPC_SRGB; |
| 92 | + numcomps = 4; |
| 93 | + bpp = 16; |
| 94 | + break; |
| 90 | 95 | case PIX_FMT_YUV420P: |
| 91 | 96 | color_space = CLRSPC_SYCC; |
| 92 | 97 | numcomps = 3; |
| @@ -224,7 +229,7 @@ static int libopenjpeg_copy_rgb16(AVCodecContext *avctx, AVFrame *frame, opj_ima · 131 unmodified lines |
| 224 | 229 | int y; |
| 225 | 230 | uint16_t *frame_ptr = (uint16_t*)frame->data[0]; |
| 226 | 231 | |
| 227 | | − av_assert0(numcomps == 1 || numcomps == 3); |
| 232 | + av_assert0(numcomps == 1 || numcomps == 3 || numcomps == 4); |
| 228 | 233 | |
| 229 | 234 | for (compno = 0; compno < numcomps; ++compno) { |
| 230 | 235 | 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 · 103 unmodified lines |
| 334 | 339 | case PIX_FMT_RGB48: |
| 335 | 340 | cpyresult = libopenjpeg_copy_rgb16(avctx, frame, image, 3); |
| 336 | 341 | break; |
| 342 | + case PIX_FMT_RGBA64: |
| 343 | + cpyresult = libopenjpeg_copy_rgb16(avctx, frame, image, 4); |
| 344 | + break; |
| 337 | 345 | case PIX_FMT_YUV420P: |
| 338 | 346 | case PIX_FMT_YUV422P: |
| 339 | 347 | case PIX_FMT_YUV440P: |
| @@ -408,7 +416,7 @@ AVCodec ff_libopenjpeg_encoder = { · 68 unmodified lines |
| 408 | 416 | .encode = libopenjpeg_encode_frame, |
| 409 | 417 | .close = libopenjpeg_encode_close, |
| 410 | 418 | .capabilities = 0, |
| 411 | | − .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24,PIX_FMT_RGBA,PIX_FMT_RGB48, |
| 419 | + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24,PIX_FMT_RGBA,PIX_FMT_RGB48,PIX_FMT_RGBA64, |
| 412 | 420 | PIX_FMT_GRAY8,PIX_FMT_GRAY16, |
| 413 | 421 | PIX_FMT_YUV420P,PIX_FMT_YUV422P,PIX_FMT_YUVA420P, |
| 414 | 422 | PIX_FMT_YUV440P,PIX_FMT_YUV444P, |