highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libopenjpegenc: Remove two redundant function parameters.

Browse Source
This commit is contained in:
Michael Bradshaw 2012-01-17 12:01:42 +01:00 committed by Carl Eugen Hoyos
parent a02694c926
commit 56af084cb5
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/libopenjpegenc.c
View File

@ -197,13 +197,12 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static int libopenjpeg_copy_packed8(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image, int numcomps) static int libopenjpeg_copy_packed8(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image)
{ {
int compno; int compno;
int x; int x;
int y; int y;
const int numcomps = image->numcomps;
av_assert0(numcomps == 1 || numcomps == 3 || numcomps == 4);
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) {
@ -223,15 +222,14 @@ static int libopenjpeg_copy_packed8(AVCodecContext *avctx, AVFrame *frame, opj_i
return 1; return 1;
} }
static int libopenjpeg_copy_packed16(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image, int numcomps) static int libopenjpeg_copy_packed16(AVCodecContext *avctx, AVFrame *frame, opj_image_t *image)
{ {
int compno; int compno;
int x; int x;
int y; int y;
const int numcomps = image->numcomps;
uint16_t *frame_ptr = (uint16_t*)frame->data[0]; uint16_t *frame_ptr = (uint16_t*)frame->data[0];
av_assert0(numcomps == 1 || numcomps == 3 || numcomps == 4);
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) {
av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n"); av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n");
@ -329,16 +327,12 @@ 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:
cpyresult = libopenjpeg_copy_packed8(avctx, frame, image, 3);
break;
case PIX_FMT_RGBA: case PIX_FMT_RGBA:
cpyresult = libopenjpeg_copy_packed8(avctx, frame, image, 4); cpyresult = libopenjpeg_copy_packed8(avctx, frame, image);
break; break;
case PIX_FMT_RGB48: case PIX_FMT_RGB48:
cpyresult = libopenjpeg_copy_packed16(avctx, frame, image, 3);
break;
case PIX_FMT_RGBA64: case PIX_FMT_RGBA64:
cpyresult = libopenjpeg_copy_packed16(avctx, frame, image, 4); cpyresult = libopenjpeg_copy_packed16(avctx, frame, image);
break; break;
case PIX_FMT_GRAY8: case PIX_FMT_GRAY8:
case PIX_FMT_YUV420P: case PIX_FMT_YUV420P: