opj_image_cmptparm_t *cmptparm;
opj_image_t *img;
int i;
- int bpp;
+ int bpp = 8;
int sub_dx[4];
int sub_dy[4];
int numcomps = 0;
case PIX_FMT_GRAY8:
color_space = CLRSPC_GRAY;
numcomps = 1;
- bpp = 8;
+ break;
+ case PIX_FMT_GRAY8A:
+ color_space = CLRSPC_GRAY;
+ numcomps = 2;
+ break;
+ case PIX_FMT_GRAY16:
+ color_space = CLRSPC_GRAY;
+ numcomps = 1;
+ bpp = 16;
break;
case PIX_FMT_RGB24:
color_space = CLRSPC_SRGB;
numcomps = 3;
- bpp = 24;
break;
case PIX_FMT_RGBA:
color_space = CLRSPC_SRGB;
numcomps = 4;
- bpp = 32;
+ 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;
- bpp = 12;
break;
case PIX_FMT_YUV422P:
color_space = CLRSPC_SYCC;
numcomps = 3;
- bpp = 16;
break;
case PIX_FMT_YUV440P:
color_space = CLRSPC_SYCC;
numcomps = 3;
- bpp = 16;
break;
case PIX_FMT_YUV444P:
color_space = CLRSPC_SYCC;
numcomps = 3;
- bpp = 24;
+ break;
+ case PIX_FMT_YUVA420P:
+ color_space = CLRSPC_SYCC;
+ numcomps = 4;
+ break;
+ case PIX_FMT_YUV420P9:
+ case PIX_FMT_YUV422P9:
+ case PIX_FMT_YUV444P9:
+ color_space = CLRSPC_SYCC;
+ numcomps = 3;
+ bpp = 9;
+ break;
+ case PIX_FMT_YUV420P10:
+ case PIX_FMT_YUV422P10:
+ case PIX_FMT_YUV444P10:
+ color_space = CLRSPC_SYCC;
+ numcomps = 3;
+ bpp = 10;
+ break;
+ case PIX_FMT_YUV420P16:
+ case PIX_FMT_YUV422P16:
+ case PIX_FMT_YUV444P16:
+ color_space = CLRSPC_SYCC;
+ numcomps = 3;
+ bpp = 16;
break;
default:
av_log(avctx, AV_LOG_ERROR, "The requested pixel format '%s' is not supported\n", av_get_pix_fmt_name(avctx->pix_fmt));
return NULL;
}
for (i = 0; i < numcomps; i++) {
- cmptparm[i].prec = 8;
+ cmptparm[i].prec = bpp;
cmptparm[i].bpp = bpp;
cmptparm[i].sgnd = 0;
cmptparm[i].dx = sub_dx[i];
opj_set_default_encoder_parameters(&ctx->enc_params);
ctx->enc_params.tcp_numlayers = 1;
- ctx->enc_params.tcp_rates[0] = FFMAX(avctx->compression_level, 0);
+ ctx->enc_params.tcp_rates[0] = FFMAX(avctx->compression_level, 0) * 2;
ctx->enc_params.cp_disto_alloc = 1;
ctx->compress = opj_create_compress(CODEC_J2K);
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 compno;
int x;
int y;
+ int image_index;
+ int frame_index;
+ const int numcomps = image->numcomps;
+
+ 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;
+ }
+ }
+
+ for (compno = 0; compno < numcomps; ++compno) {
+ for (y = 0; y < avctx->height; ++y) {
+ image_index = y * avctx->width;
+ frame_index = y * frame->linesize[0] + compno;
+ for (x = 0; x < avctx->width; ++x) {
+ image->comps[compno].data[image_index++] = frame->data[0][frame_index];
+ frame_index += numcomps;
+ }
+ }
+ }
+
+ return 1;
+}
- av_assert0(numcomps == 1 || numcomps == 3 || numcomps == 4);
+static int libopenjpeg_copy_packed16(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image)
+{
+ int compno;
+ int x;
+ int y;
+ int image_index;
+ int frame_index;
+ const int numcomps = image->numcomps;
+ uint16_t *frame_ptr = (uint16_t*)frame->data[0];
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;
}
}
for (compno = 0; compno < numcomps; ++compno) {
for (y = 0; y < avctx->height; ++y) {
+ image_index = y * avctx->width;
+ frame_index = y * (frame->linesize[0] / 2) + compno;
for (x = 0; x < avctx->width; ++x) {
- image->comps[compno].data[y * avctx->width + x] = frame->data[0][y * frame->linesize[0] + x * numcomps + compno];
+ image->comps[compno].data[image_index++] = frame_ptr[frame_index];
+ frame_index += numcomps;
+ }
+ }
+ }
+
+ return 1;
+}
+
+static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image)
+{
+ int compno;
+ int x;
+ int y;
+ int width;
+ int height;
+ int image_index;
+ int frame_index;
+ 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;
+ }
+ }
+
+ for (compno = 0; compno < numcomps; ++compno) {
+ width = avctx->width / image->comps[compno].dx;
+ height = avctx->height / image->comps[compno].dy;
+ for (y = 0; y < height; ++y) {
+ image_index = y * width;
+ frame_index = y * frame->linesize[compno];
+ for (x = 0; x < width; ++x) {
+ image->comps[compno].data[image_index++] = frame->data[compno][frame_index++];
}
}
}
return 1;
}
-static int libopenjpeg_copy_yuv(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;
+ int image_index;
+ int frame_index;
+ 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;
}
}
for (compno = 0; compno < numcomps; ++compno) {
width = avctx->width / image->comps[compno].dx;
height = avctx->height / image->comps[compno].dy;
+ frame_ptr = (uint16_t*)frame->data[compno];
for (y = 0; y < height; ++y) {
+ image_index = y * width;
+ frame_index = y * (frame->linesize[compno] / 2);
for (x = 0; x < width; ++x) {
- image->comps[compno].data[y * width + x] = frame->data[compno][y * frame->linesize[compno] + x];
+ image->comps[compno].data[image_index++] = frame_ptr[frame_index++];
}
}
}
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_RGB24:
- cpyresult = libopenjpeg_copy_rgba(avctx, frame, image, 3);
- break;
case PIX_FMT_RGBA:
- cpyresult = libopenjpeg_copy_rgba(avctx, frame, image, 4);
+ case PIX_FMT_GRAY8A:
+ cpyresult = libopenjpeg_copy_packed8(avctx, frame, image);
+ break;
+ case PIX_FMT_RGB48:
+ case PIX_FMT_RGBA64:
+ cpyresult = libopenjpeg_copy_packed16(avctx, frame, image);
break;
+ case PIX_FMT_GRAY8:
case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P:
case PIX_FMT_YUV440P:
case PIX_FMT_YUV444P:
- cpyresult = libopenjpeg_copy_yuv(avctx, frame, image);
+ case PIX_FMT_YUVA420P:
+ 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_YUV422P9:
+ case PIX_FMT_YUV422P10:
+ case PIX_FMT_YUV422P16:
+ case PIX_FMT_YUV444P9:
+ case PIX_FMT_YUV444P10:
+ case PIX_FMT_YUV444P16:
+ 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));
AVCodec ff_libopenjpeg_encoder = {
- .name = "libopenjpeg",
- .type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_JPEG2000,
+ .name = "libopenjpeg",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_JPEG2000,
.priv_data_size = sizeof(LibOpenJPEGContext),
- .init = libopenjpeg_encode_init,
- .encode = libopenjpeg_encode_frame,
- .close = libopenjpeg_encode_close,
- .decode = NULL,
- .capabilities = 0,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_GRAY8,PIX_FMT_RGB24,PIX_FMT_RGBA,PIX_FMT_YUV420P,PIX_FMT_YUV422P,PIX_FMT_YUV440P,PIX_FMT_YUV444P},
+ .init = libopenjpeg_encode_init,
+ .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_FMT_RGBA64,
+ PIX_FMT_GRAY8,PIX_FMT_GRAY8A,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,
+ PIX_FMT_YUV420P10,PIX_FMT_YUV422P10,PIX_FMT_YUV444P10,
+ PIX_FMT_YUV420P16,PIX_FMT_YUV422P16,PIX_FMT_YUV444P16,
+ PIX_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 encoder"),
} ;
projects / ffmpeg / blobdiff