Skip to content

F
ffmpeg
Commit 28f36dce authored by Michael Bradshaw's avatar Michael Bradshaw
Browse files
Options

libopenjpegenc: simplify switch statement 

Signed-off-by: 's avatarMichael Bradshaw <mjbshaw@gmail.com>
parent c58c6739
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
libavcodec/libopenjpegenc.c
View file @ 28f36dce
...@@ -377,15 +377,6 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -377,15 +377,6 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
cpyresult = libopenjpeg_copy_packed16(avctx, frame, image); cpyresult = libopenjpeg_copy_packed16(avctx, frame, image);
break; break;
case AV_PIX_FMT_GBR24P: case AV_PIX_FMT_GBR24P:
gbrframe = *frame;
gbrframe.data[0] = frame->data[2]; // swap to be rgb
gbrframe.data[1] = frame->data[0];
gbrframe.data[2] = frame->data[1];
gbrframe.linesize[0] = frame->linesize[2];
gbrframe.linesize[1] = frame->linesize[0];
gbrframe.linesize[2] = frame->linesize[1];
cpyresult = libopenjpeg_copy_unpacked8(avctx, &gbrframe, image);
break;
case AV_PIX_FMT_GBRP9: case AV_PIX_FMT_GBRP9:
case AV_PIX_FMT_GBRP10: case AV_PIX_FMT_GBRP10:
case AV_PIX_FMT_GBRP12: case AV_PIX_FMT_GBRP12:
...@@ -398,7 +389,11 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -398,7 +389,11 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
gbrframe.linesize[0] = frame->linesize[2]; gbrframe.linesize[0] = frame->linesize[2];
gbrframe.linesize[1] = frame->linesize[0]; gbrframe.linesize[1] = frame->linesize[0];
gbrframe.linesize[2] = frame->linesize[1]; gbrframe.linesize[2] = frame->linesize[1];
cpyresult = libopenjpeg_copy_unpacked16(avctx, &gbrframe, image); if (avctx->pix_fmt == AV_PIX_FMT_GBR24P) {
cpyresult = libopenjpeg_copy_unpacked8(avctx, &gbrframe, image);
} else {
cpyresult = libopenjpeg_copy_unpacked16(avctx, &gbrframe, image);
}
break; break;
case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_GRAY8:
case AV_PIX_FMT_YUV410P: case AV_PIX_FMT_YUV410P:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment