virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Support gray8a encoding with libopenjpeg.

Browse Source 
Reviewed-by: Michael Bradshaw
Reviewed-by: Paul B Mahol
This commit is contained in:
Carl Eugen Hoyos
2012-01-19 23:13:48 +01:00
parent e209a37777
commit df42dd7323
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/libopenjpegenc.c
View File

@@ -69,6 +69,10 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p
color_space = CLRSPC_GRAY; color_space = CLRSPC_GRAY;
numcomps = 1; numcomps = 1;
break; break;
case PIX_FMT_GRAY8A:
color_space = CLRSPC_GRAY;
numcomps = 2;
break;
case PIX_FMT_GRAY16: case PIX_FMT_GRAY16:
color_space = CLRSPC_GRAY; color_space = CLRSPC_GRAY;
numcomps = 1; numcomps = 1;
@@ -328,6 +332,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf
switch (avctx->pix_fmt) { switch (avctx->pix_fmt) {
case PIX_FMT_RGB24: case PIX_FMT_RGB24:
case PIX_FMT_RGBA: case PIX_FMT_RGBA:
case PIX_FMT_GRAY8A:
cpyresult = libopenjpeg_copy_packed8(avctx, frame, image); cpyresult = libopenjpeg_copy_packed8(avctx, frame, image);
break; break;
case PIX_FMT_RGB48: case PIX_FMT_RGB48:
@@ -411,7 +416,7 @@ AVCodec ff_libopenjpeg_encoder = {
.close = libopenjpeg_encode_close, .close = libopenjpeg_encode_close,
.capabilities = 0, .capabilities = 0,
.pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24,PIX_FMT_RGBA,PIX_FMT_RGB48,PIX_FMT_RGBA64, .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_GRAY8,PIX_FMT_GRAY8A,PIX_FMT_GRAY16,
PIX_FMT_YUV420P,PIX_FMT_YUV422P,PIX_FMT_YUVA420P, 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,

2
libavcodec/version.h
View File

@@ -22,7 +22,7 @@
#define LIBAVCODEC_VERSION_MAJOR 53 #define LIBAVCODEC_VERSION_MAJOR 53
#define LIBAVCODEC_VERSION_MINOR 57 #define LIBAVCODEC_VERSION_MINOR 57
#define LIBAVCODEC_VERSION_MICRO 104 #define LIBAVCODEC_VERSION_MICRO 105
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \