Reorder headers and usual K&R style update.
---
libavcodec/libopenjpegdec.c | 85 +++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 36 deletions(-)
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index 53215a1..b540adc 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -24,13 +24,14 @@
* JPEG 2000 decoder using libopenjpeg
*/
-#include "libavutil/opt.h"
+#define OPJ_STATIC
+#include <openjpeg.h>
+
+#include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h"
+#include "libavutil/opt.h"
#include "avcodec.h"
-#include "libavutil/intreadwrite.h"
#include "thread.h"
-#define OPJ_STATIC
-#include <openjpeg.h>
#define JP2_SIG_TYPE 0x6A502020
#define JP2_SIG_VALUE 0x0D0A870A
@@ -89,7 +90,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
*data_size = 0;
// Check if input is a raw jpeg2k codestream or in jp2 wrapping
- if((AV_RB32(buf) == 12) &&
+ if ((AV_RB32(buf) == 12) &&
(AV_RB32(buf + 4) == JP2_SIG_TYPE) &&
(AV_RB32(buf + 8) == JP2_SIG_VALUE)) {
dec = opj_create_decompress(CODEC_JP2);
@@ -101,7 +102,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
dec = opj_create_decompress(CODEC_J2K);
}
- if(!dec) {
+ if (!dec) {
av_log(avctx, AV_LOG_ERROR, "Error initializing decoder.\n");
return -1;
}
@@ -113,8 +114,10 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
// Tie decoder with decoding parameters
opj_setup_decoder(dec, &ctx->dec_params);
stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
- if(!stream) {
- av_log(avctx, AV_LOG_ERROR, "Codestream could not be opened for
reading.\n");
+
+ if (!stream) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Codestream could not be opened for reading.\n");
opj_destroy_decompress(dec);
return -1;
}
@@ -122,11 +125,13 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
// Decode the header only
image = opj_decode_with_info(dec, stream, NULL);
opj_cio_close(stream);
- if(!image) {
+
+ if (!image) {
av_log(avctx, AV_LOG_ERROR, "Error decoding codestream.\n");
opj_destroy_decompress(dec);
return -1;
}
+
width = image->x1 - image->x0;
height = image->y1 - image->y0;
@@ -135,34 +140,41 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
height = (height + (1 << ctx->lowres) - 1) >> ctx->lowres;
}
- if(av_image_check_size(width, height, 0, avctx) < 0) {
- av_log(avctx, AV_LOG_ERROR, "%dx%d dimension invalid.\n", width,
height);
+ if (av_image_check_size(width, height, 0, avctx) < 0) {
+ av_log(avctx, AV_LOG_ERROR,
+ "%dx%d dimension invalid.\n", width, height);
goto done;
}
+
avcodec_set_dimensions(avctx, width, height);
- switch(image->numcomps)
- {
- case 1: avctx->pix_fmt = PIX_FMT_GRAY8;
- break;
- case 3: if(check_image_attributes(image)) {
- avctx->pix_fmt = PIX_FMT_RGB24;
- } else {
- avctx->pix_fmt = PIX_FMT_GRAY8;
- av_log(avctx, AV_LOG_ERROR, "Only first component will be
used.\n");
- }
- break;
- case 4: has_alpha = 1;
- avctx->pix_fmt = PIX_FMT_RGBA;
- break;
- default: av_log(avctx, AV_LOG_ERROR, "%d components unsupported.\n",
image->numcomps);
- goto done;
+ switch (image->numcomps) {
+ case 1:
+ avctx->pix_fmt = PIX_FMT_GRAY8;
+ break;
+ case 3:
+ if (check_image_attributes(image)) {
+ avctx->pix_fmt = PIX_FMT_RGB24;
+ } else {
+ avctx->pix_fmt = PIX_FMT_GRAY8;
+ av_log(avctx, AV_LOG_ERROR,
+ "Only first component will be used.\n");
+ }
+ break;
+ case 4:
+ has_alpha = 1;
+ avctx->pix_fmt = PIX_FMT_RGBA;
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "%d components unsupported.\n",
+ image->numcomps);
+ goto done;
}
- if(picture->data[0])
+ if (picture->data[0])
ff_thread_release_buffer(avctx, picture);
- if(ff_thread_get_buffer(avctx, picture) < 0){
+ if (ff_thread_get_buffer(avctx, picture) < 0) {
av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed\n");
return -1;
}
@@ -173,8 +185,9 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
// Tie decoder with decoding parameters
opj_setup_decoder(dec, &ctx->dec_params);
stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
- if(!stream) {
- av_log(avctx, AV_LOG_ERROR, "Codestream could not be opened for
reading.\n");
+ if (!stream) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Codestream could not be opened for reading.\n");
opj_destroy_decompress(dec);
return -1;
}
@@ -183,19 +196,19 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
image = opj_decode_with_info(dec, stream, NULL);
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);
}
- for(y = 0; y < avctx->height; y++) {
+ for (y = 0; y < avctx->height; y++) {
index = y*avctx->width;
img_ptr = picture->data[0] + y*picture->linesize[0];
- for(x = 0; x < avctx->width; x++, index++) {
+ for (x = 0; x < avctx->width; x++, index++) {
*img_ptr++ = image->comps[0].data[index] >> adjust[0];
- if(image->numcomps > 2 && check_image_attributes(image)) {
+ if (image->numcomps > 2 && check_image_attributes(image)) {
*img_ptr++ = image->comps[1].data[index] >> adjust[1];
*img_ptr++ = image->comps[2].data[index] >> adjust[2];
- if(has_alpha)
+ if (has_alpha)
*img_ptr++ = image->comps[3].data[index] >> adjust[3];
}
}
--
1.7.8.rc1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
