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

libopenjpegenc: Simplify gray encoding.

Browse Source
This commit is contained in:
Michael Bradshaw 2012-01-17 11:57:36 +01:00 committed by Carl Eugen Hoyos
parent 0abe25aa7b
commit a02694c926
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/libopenjpegenc.c
View File

@ -257,7 +257,7 @@ static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, AVFrame *frame, opj
int y; int y;
int width; int width;
int height; int height;
const int numcomps = avctx->pix_fmt == PIX_FMT_YUVA420P ? 4 : 3; const int numcomps = image->numcomps;
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]) {
@ -286,7 +286,7 @@ static int libopenjpeg_copy_unpacked16(AVCodecContext *avctx, AVFrame *frame, op
int y; int y;
int width; int width;
int height; int height;
const int numcomps = 3; const int numcomps = image->numcomps;
uint16_t *frame_ptr; uint16_t *frame_ptr;
for (compno = 0; compno < numcomps; ++compno) { for (compno = 0; compno < numcomps; ++compno) {
@ -328,12 +328,6 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf
image->y1 = (avctx->height - 1) * ctx->enc_params.subsampling_dy + 1; image->y1 = (avctx->height - 1) * ctx->enc_params.subsampling_dy + 1;
switch (avctx->pix_fmt) { switch (avctx->pix_fmt) {
case PIX_FMT_GRAY8:
cpyresult = libopenjpeg_copy_packed8(avctx, frame, image, 1);
break;
case PIX_FMT_GRAY16:
cpyresult = libopenjpeg_copy_packed16(avctx, frame, image, 1);
break;
case PIX_FMT_RGB24: case PIX_FMT_RGB24:
cpyresult = libopenjpeg_copy_packed8(avctx, frame, image, 3); cpyresult = libopenjpeg_copy_packed8(avctx, frame, image, 3);
break; break;
@ -346,6 +340,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf
case PIX_FMT_RGBA64: case PIX_FMT_RGBA64:
cpyresult = libopenjpeg_copy_packed16(avctx, frame, image, 4); cpyresult = libopenjpeg_copy_packed16(avctx, frame, image, 4);
break; break;
case PIX_FMT_GRAY8:
case PIX_FMT_YUV420P: case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P: case PIX_FMT_YUV422P:
case PIX_FMT_YUV440P: case PIX_FMT_YUV440P:
@ -353,6 +348,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf
case PIX_FMT_YUVA420P: case PIX_FMT_YUVA420P:
cpyresult = libopenjpeg_copy_unpacked8(avctx, frame, image); cpyresult = libopenjpeg_copy_unpacked8(avctx, frame, image);
break; break;
case PIX_FMT_GRAY16:
case PIX_FMT_YUV420P9: case PIX_FMT_YUV420P9:
case PIX_FMT_YUV420P10: case PIX_FMT_YUV420P10:
case PIX_FMT_YUV420P16: case PIX_FMT_YUV420P16: