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

libopenjpeg: K&R formatting cosmetics

Browse Source
This commit is contained in:
Luca Barbato 2012-07-19 22:22:08 +02:00 committed by Diego Biurrun
parent 731fa116b4
commit 51a5ddfa01
2 changed files with 97 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libavcodec/libopenjpegdec.c
View File

@ -24,14 +24,15 @@
* JPEG 2000 decoder using libopenjpeg * JPEG 2000 decoder using libopenjpeg
*/ */
#include "libavutil/opt.h"
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "libavutil/intreadwrite.h"
#include "thread.h"
#define OPJ_STATIC #define OPJ_STATIC
#include <openjpeg.h> #include <openjpeg.h>
#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "thread.h"
#define JP2_SIG_TYPE 0x6A502020 #define JP2_SIG_TYPE 0x6A502020
#define JP2_SIG_VALUE 0x0D0A870A #define JP2_SIG_VALUE 0x0D0A870A
@ -94,8 +95,8 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
(AV_RB32(buf + 8) == JP2_SIG_VALUE)) { (AV_RB32(buf + 8) == JP2_SIG_VALUE)) {
dec = opj_create_decompress(CODEC_JP2); dec = opj_create_decompress(CODEC_JP2);
} else { } else {
// If the AVPacket contains a jp2c box, then skip to /* If the AVPacket contains a jp2c box, then skip to
// the starting byte of the codestream. * the starting byte of the codestream. */
if (AV_RB32(buf + 4) == AV_RB32("jp2c")) if (AV_RB32(buf + 4) == AV_RB32("jp2c"))
buf += 8; buf += 8;
dec = opj_create_decompress(CODEC_J2K); dec = opj_create_decompress(CODEC_J2K);
@ -113,20 +114,24 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
// Tie decoder with decoding parameters // Tie decoder with decoding parameters
opj_setup_decoder(dec, &ctx->dec_params); opj_setup_decoder(dec, &ctx->dec_params);
stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size); stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
if (!stream) { if (!stream) {
av_log(avctx, AV_LOG_ERROR, "Codestream could not be opened for reading.\n"); av_log(avctx, AV_LOG_ERROR,
"Codestream could not be opened for reading.\n");
opj_destroy_decompress(dec); opj_destroy_decompress(dec);
return -1; return -1;
} }
// Decode the header only // Decode the header only.
image = opj_decode_with_info(dec, stream, NULL); image = opj_decode_with_info(dec, stream, NULL);
opj_cio_close(stream); opj_cio_close(stream);
if (!image) { if (!image) {
av_log(avctx, AV_LOG_ERROR, "Error decoding codestream.\n"); av_log(avctx, AV_LOG_ERROR, "Error decoding codestream.\n");
opj_destroy_decompress(dec); opj_destroy_decompress(dec);
return -1; return -1;
} }
width = image->x1 - image->x0; width = image->x1 - image->x0;
height = image->y1 - image->y0; height = image->y1 - image->y0;
@ -136,26 +141,33 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
} }
if (av_image_check_size(width, height, 0, avctx) < 0) { if (av_image_check_size(width, height, 0, avctx) < 0) {
av_log(avctx, AV_LOG_ERROR, "%dx%d dimension invalid.\n", width, height); av_log(avctx, AV_LOG_ERROR,
"%dx%d dimension invalid.\n", width, height);
goto done; goto done;
} }
avcodec_set_dimensions(avctx, width, height); avcodec_set_dimensions(avctx, width, height);
switch(image->numcomps) switch (image->numcomps) {
{ case 1:
case 1: avctx->pix_fmt = PIX_FMT_GRAY8; avctx->pix_fmt = PIX_FMT_GRAY8;
break; break;
case 3: if(check_image_attributes(image)) { case 3:
if (check_image_attributes(image)) {
avctx->pix_fmt = PIX_FMT_RGB24; avctx->pix_fmt = PIX_FMT_RGB24;
} else { } else {
avctx->pix_fmt = PIX_FMT_GRAY8; avctx->pix_fmt = PIX_FMT_GRAY8;
av_log(avctx, AV_LOG_ERROR, "Only first component will be used.\n"); av_log(avctx, AV_LOG_ERROR,
"Only first component will be used.\n");
} }
break; break;
case 4: has_alpha = 1; case 4:
has_alpha = 1;
avctx->pix_fmt = PIX_FMT_RGBA; avctx->pix_fmt = PIX_FMT_RGBA;
break; break;
default: av_log(avctx, AV_LOG_ERROR, "%d components unsupported.\n", image->numcomps); default:
av_log(avctx, AV_LOG_ERROR, "%d components unsupported.\n",
image->numcomps);
goto done; goto done;
} }
@ -170,22 +182,22 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
ff_thread_finish_setup(avctx); ff_thread_finish_setup(avctx);
ctx->dec_params.cp_limit_decoding = NO_LIMITATION; ctx->dec_params.cp_limit_decoding = NO_LIMITATION;
// Tie decoder with decoding parameters // Tie decoder with decoding parameters.
opj_setup_decoder(dec, &ctx->dec_params); opj_setup_decoder(dec, &ctx->dec_params);
stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size); stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
if (!stream) { if (!stream) {
av_log(avctx, AV_LOG_ERROR, "Codestream could not be opened for reading.\n"); av_log(avctx, AV_LOG_ERROR,
"Codestream could not be opened for reading.\n");
opj_destroy_decompress(dec); opj_destroy_decompress(dec);
return -1; return -1;
} }
// Decode the codestream // Decode the codestream.
image = opj_decode_with_info(dec, stream, NULL); image = opj_decode_with_info(dec, stream, NULL);
opj_cio_close(stream); opj_cio_close(stream);
for(x = 0; x < image->numcomps; x++) { for (x = 0; x < image->numcomps; x++)
adjust[x] = FFMAX(image->comps[x].prec - 8, 0); adjust[x] = FFMAX(image->comps[x].prec - 8, 0);
}
for (y = 0; y < avctx->height; y++) { for (y = 0; y < avctx->height; y++) {
index = y * avctx->width; index = y * avctx->width;

23
libavcodec/libopenjpegenc.c
View File

@ -27,9 +27,9 @@
#define OPJ_STATIC #define OPJ_STATIC
#include <openjpeg.h> #include <openjpeg.h>
#include "libavutil/opt.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
@ -76,13 +76,14 @@ static opj_image_t *libopenjpeg_create_image(AVCodecContext *avctx,
int sub_dy[4]; int sub_dy[4];
int numcomps = av_pix_fmt_descriptors[avctx->pix_fmt].nb_components; int numcomps = av_pix_fmt_descriptors[avctx->pix_fmt].nb_components;
sub_dx[0] = sub_dx[3] = 1; sub_dx[0] =
sub_dy[0] = sub_dy[3] = 1; sub_dx[3] = 1;
sub_dx[1] = sub_dx[2] = sub_dy[0] =
1 << av_pix_fmt_descriptors[avctx->pix_fmt].log2_chroma_w; sub_dy[3] = 1;
sub_dy[1] = sub_dy[2] = sub_dx[1] =
1 << av_pix_fmt_descriptors[avctx->pix_fmt].log2_chroma_h; 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:
@ -251,13 +252,12 @@ static void libopenjpeg_copy_unpacked8(AVCodecContext *avctx,
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
image_index = y * width; image_index = y * width;
frame_index = y * frame->linesize[compno]; frame_index = y * frame->linesize[compno];
for (x = 0; x < width; ++x) { for (x = 0; x < width; ++x)
image->comps[compno].data[image_index++] = image->comps[compno].data[image_index++] =
frame->data[compno][frame_index++]; frame->data[compno][frame_index++];
} }
} }
} }
}
static void libopenjpeg_copy_unpacked16(AVCodecContext *avctx, static void libopenjpeg_copy_unpacked16(AVCodecContext *avctx,
const AVFrame *frame, const AVFrame *frame,
@ -277,13 +277,12 @@ static void libopenjpeg_copy_unpacked16(AVCodecContext *avctx,
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
image_index = y * width; image_index = y * width;
frame_index = y * (frame->linesize[compno] / 2); frame_index = y * (frame->linesize[compno] / 2);
for (x = 0; x < width; ++x) { for (x = 0; x < width; ++x)
image->comps[compno].data[image_index++] = image->comps[compno].data[image_index++] =
frame_ptr[frame_index++]; frame_ptr[frame_index++];
} }
} }
} }
}
static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet) const AVFrame *frame, int *got_packet)