RepoMirrors/ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-16 20:07:04 +00:00

Support yuva420p encoding via libopenjpeg.

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2011-12-02 03:26:21 +01:00
parent d7fc100694
commit 40c36196d5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/libopenjpegenc.c
View File

@ -93,6 +93,10 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p
color_space = CLRSPC_SYCC; color_space = CLRSPC_SYCC;
numcomps = 3; numcomps = 3;
break; break;
case PIX_FMT_YUVA420P:
color_space = CLRSPC_SYCC;
numcomps = 4;
break;
case PIX_FMT_YUV420P9: case PIX_FMT_YUV420P9:
case PIX_FMT_YUV422P9: case PIX_FMT_YUV422P9:
case PIX_FMT_YUV444P9: case PIX_FMT_YUV444P9:
@ -210,7 +214,7 @@ static int libopenjpeg_copy_yuv8(AVCodecContext *avctx, AVFrame *frame, opj_imag
int y; int y;
int width; int width;
int height; int height;
const int numcomps = 3; const int numcomps = avctx->pix_fmt == PIX_FMT_YUVA420P ? 4 : 3;
for (compno = 0; compno < numcomps; ++compno) { for (compno = 0; compno < numcomps; ++compno) {
if (image->comps[compno].w > frame->linesize[compno]) { if (image->comps[compno].w > frame->linesize[compno]) {
@ -292,6 +296,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf
case PIX_FMT_YUV422P: case PIX_FMT_YUV422P:
case PIX_FMT_YUV440P: case PIX_FMT_YUV440P:
case PIX_FMT_YUV444P: case PIX_FMT_YUV444P:
case PIX_FMT_YUVA420P:
cpyresult = libopenjpeg_copy_yuv8(avctx, frame, image); cpyresult = libopenjpeg_copy_yuv8(avctx, frame, image);
break; break;
case PIX_FMT_YUV420P9: case PIX_FMT_YUV420P9:
@ -363,7 +368,7 @@ AVCodec ff_libopenjpeg_encoder = {
.decode = NULL, .decode = NULL,
.capabilities = 0, .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_GRAY8,
PIX_FMT_YUV420P,PIX_FMT_YUV422P, PIX_FMT_YUV420P,PIX_FMT_YUV422P,PIX_FMT_YUVA420P,
PIX_FMT_YUV440P,PIX_FMT_YUV444P, PIX_FMT_YUV440P,PIX_FMT_YUV444P,
PIX_FMT_YUV420P9,PIX_FMT_YUV422P9,PIX_FMT_YUV444P9, PIX_FMT_YUV420P9,PIX_FMT_YUV422P9,PIX_FMT_YUV444P9,
PIX_FMT_YUV420P10,PIX_FMT_YUV422P10,PIX_FMT_YUV444P10, PIX_FMT_YUV420P10,PIX_FMT_YUV422P10,PIX_FMT_YUV444P10,