RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-10 09:09:50 +00:00
Code Issues Projects Releases Wiki Activity

Applied patches from Michael Niedermayer to clean up the code

Browse Source
This commit is contained in:
Michael Bradshaw 2011-11-18 15:02:44 -07:00
parent b0a453bf24
commit 1b987c4bb0
1 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/libopenjpegenc.c
View File

@ -25,6 +25,7 @@
*/ */
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/avassert.h"
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#define OPJ_STATIC #define OPJ_STATIC
@ -58,71 +59,57 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p
int numcomps = 0; int numcomps = 0;
OPJ_COLOR_SPACE color_space = CLRSPC_UNKNOWN; OPJ_COLOR_SPACE color_space = CLRSPC_UNKNOWN;
sub_dx[0] = sub_dx[3] = 1;
sub_dy[0] = sub_dy[3] = 1;
sub_dx[1] = sub_dx[2] = 1<<av_pix_fmt_descriptors[avctx->pix_fmt].log2_chroma_w;
sub_dy[1] = sub_dy[2] = 1<<av_pix_fmt_descriptors[avctx->pix_fmt].log2_chroma_h;
switch (avctx->pix_fmt) { switch (avctx->pix_fmt) {
case PIX_FMT_GRAY8: case PIX_FMT_GRAY8:
color_space = CLRSPC_GRAY; color_space = CLRSPC_GRAY;
numcomps = 1; numcomps = 1;
bpp = 8; bpp = 8;
sub_dx[0] = 1;
sub_dy[0] = 1;
break; break;
case PIX_FMT_RGB24: case PIX_FMT_RGB24:
color_space = CLRSPC_SRGB; color_space = CLRSPC_SRGB;
numcomps = 3; numcomps = 3;
bpp = 24; bpp = 24;
sub_dx[0] = sub_dx[1] = sub_dx[2] = 1;
sub_dy[0] = sub_dy[1] = sub_dy[2] = 1;
break; break;
case PIX_FMT_RGBA: case PIX_FMT_RGBA:
color_space = CLRSPC_SRGB; color_space = CLRSPC_SRGB;
numcomps = 4; numcomps = 4;
bpp = 32; bpp = 32;
sub_dx[0] = sub_dx[1] = sub_dx[2] = sub_dx[3] = 1;
sub_dy[0] = sub_dy[1] = sub_dy[2] = sub_dy[3] = 1;
break; break;
case PIX_FMT_YUV420P: case PIX_FMT_YUV420P:
color_space = CLRSPC_SYCC; color_space = CLRSPC_SYCC;
numcomps = 3; numcomps = 3;
bpp = 12; bpp = 12;
sub_dx[0] = 1;
sub_dx[1] = sub_dx[2] = 2;
sub_dy[0] = 1;
sub_dy[1] = sub_dy[2] = 2;
break; break;
case PIX_FMT_YUV422P: case PIX_FMT_YUV422P:
color_space = CLRSPC_SYCC; color_space = CLRSPC_SYCC;
numcomps = 3; numcomps = 3;
bpp = 16; bpp = 16;
sub_dx[0] = 1;
sub_dx[1] = sub_dx[2] = 2;
sub_dy[0] = sub_dy[1] = sub_dy[2] = 1;
break; break;
case PIX_FMT_YUV440P: case PIX_FMT_YUV440P:
color_space = CLRSPC_SYCC; color_space = CLRSPC_SYCC;
numcomps = 3; numcomps = 3;
bpp = 16; bpp = 16;
sub_dx[0] = sub_dx[1] = sub_dx[2] = 1; break;
sub_dy[0] = 1;
sub_dy[1] = sub_dy[2] = 2;
break;
case PIX_FMT_YUV444P: case PIX_FMT_YUV444P:
color_space = CLRSPC_SYCC; color_space = CLRSPC_SYCC;
numcomps = 3; numcomps = 3;
bpp = 24; bpp = 24;
sub_dx[0] = sub_dx[1] = sub_dx[2] = 1;
sub_dy[0] = sub_dy[1] = sub_dy[2] = 1;
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "The requested pixel format '%s' is not supported\n", av_get_pix_fmt_name(avctx->pix_fmt)); 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; return NULL;
} }
cmptparm = av_malloc(numcomps * sizeof(opj_image_cmptparm_t)); cmptparm = av_mallocz(numcomps * sizeof(opj_image_cmptparm_t));
if (!cmptparm) { if (!cmptparm) {
av_log(avctx, AV_LOG_ERROR, "Not enough memory"); av_log(avctx, AV_LOG_ERROR, "Not enough memory");
return NULL; return NULL;
} }
memset(cmptparm, 0, numcomps * sizeof(opj_image_cmptparm_t));
for (i = 0; i < numcomps; i++) { for (i = 0; i < numcomps; i++) {
cmptparm[i].prec = 8; cmptparm[i].prec = 8;
cmptparm[i].bpp = bpp; cmptparm[i].bpp = bpp;
@ -144,7 +131,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
opj_set_default_encoder_parameters(&ctx->enc_params); opj_set_default_encoder_parameters(&ctx->enc_params);
ctx->enc_params.tcp_numlayers = 1; ctx->enc_params.tcp_numlayers = 1;
ctx->enc_params.tcp_rates[0] = avctx->compression_level > 0 ? avctx->compression_level : 0; ctx->enc_params.tcp_rates[0] = FFMAX(avctx->compression_level, 0);
ctx->enc_params.cp_disto_alloc = 1; ctx->enc_params.cp_disto_alloc = 1;
ctx->compress = opj_create_compress(CODEC_J2K); ctx->compress = opj_create_compress(CODEC_J2K);
@ -156,7 +143,6 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
avctx->coded_frame = avcodec_alloc_frame(); avctx->coded_frame = avcodec_alloc_frame();
if (!avctx->coded_frame) { if (!avctx->coded_frame) {
av_freep(&ctx->compress); av_freep(&ctx->compress);
ctx->compress = NULL;
av_log(avctx, AV_LOG_ERROR, "Error allocating coded frame\n"); av_log(avctx, AV_LOG_ERROR, "Error allocating coded frame\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -164,9 +150,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
ctx->image = mj2_create_image(avctx, &ctx->enc_params); ctx->image = mj2_create_image(avctx, &ctx->enc_params);
if (!ctx->image) { if (!ctx->image) {
av_freep(&ctx->compress); av_freep(&ctx->compress);
ctx->compress = NULL;
av_freep(&avctx->coded_frame); av_freep(&avctx->coded_frame);
avctx->coded_frame = NULL;
av_log(avctx, AV_LOG_ERROR, "Error creating the mj2 image\n"); av_log(avctx, AV_LOG_ERROR, "Error creating the mj2 image\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -186,9 +170,7 @@ static int libopenjpeg_copy_rgba(AVCodecContext *avctx, AVFrame *frame, opj_imag
int x; int x;
int y; int y;
if (numcomps != 1 && numcomps != 3 && numcomps != 4) { av_assert0(numcomps == 1 || numcomps == 3 || numcomps == 4);
return 0;
}
for (compno = 0; compno < numcomps; ++compno) { for (compno = 0; compno < numcomps; ++compno) {
if (image->comps[compno].w > frame->linesize[0] / numcomps) { if (image->comps[compno].w > frame->linesize[0] / numcomps) {
@ -326,5 +308,5 @@ AVCodec ff_libopenjpeg_encoder = {
.decode = NULL, .decode = NULL,
.capabilities = 0, .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}, .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},
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 encoder/decoder"), .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 encoder"),
} ; } ;