libopenjpeg: K&R formatting cosmetics

libavcodec/libopenjpegdec.c

@@ -28,10 +28,11 @@
 #include <openjpeg.h>
 
 #include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
 #include "libavutil/imgutils.h"
-#include "libavutil/pixfmt.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
+#include "libavutil/pixfmt.h"
+
 #include "avcodec.h"
 #include "internal.h"
 #include "thread.h"
@@ -60,13 +61,18 @@
 
 #define XYZ_PIXEL_FORMATS  AV_PIX_FMT_XYZ12
 
-static const enum AVPixelFormat rgb_pix_fmts[]  = {RGB_PIXEL_FORMATS};
-static const enum AVPixelFormat gray_pix_fmts[] = {GRAY_PIXEL_FORMATS};
-static const enum AVPixelFormat yuv_pix_fmts[]  = {YUV_PIXEL_FORMATS};
-static const enum AVPixelFormat any_pix_fmts[]  = {RGB_PIXEL_FORMATS,
-                                                 GRAY_PIXEL_FORMATS,
-                                                 YUV_PIXEL_FORMATS,
-                                                 XYZ_PIXEL_FORMATS};
+static const enum AVPixelFormat rgb_pix_fmts[] = {
+    RGB_PIXEL_FORMATS
+};
+static const enum AVPixelFormat gray_pix_fmts[] = {
+    GRAY_PIXEL_FORMATS
+};
+static const enum AVPixelFormat yuv_pix_fmts[] = {
+    YUV_PIXEL_FORMATS
+};
+static const enum AVPixelFormat any_pix_fmts[] = {
+    RGB_PIXEL_FORMATS, GRAY_PIXEL_FORMATS, YUV_PIXEL_FORMATS, XYZ_PIXEL_FORMATS
+};
 
 typedef struct {
     AVClass *class;
@@ -138,11 +144,10 @@ static enum AVPixelFormat libopenjpeg_guess_pix_fmt(const opj_image_t *image)
         break;
     }
 
-    for (index = 0; index < possible_fmts_nb; ++index) {
+    for (index = 0; index < possible_fmts_nb; ++index)
         if (libopenjpeg_matches_pix_fmt(image, possible_fmts[index])) {
             return possible_fmts[index];
         }
-    }
 
     return AV_PIX_FMT_NONE;
 }
@@ -156,10 +161,9 @@ static inline int libopenjpeg_ispacked(enum AVPixelFormat pix_fmt)
         return 0;
 
     component_plane = desc->comp[0].plane;
-    for (i = 1; i < desc->nb_components; i++) {
+    for (i = 1; i < desc->nb_components; i++)
         if (component_plane != desc->comp[i].plane)
             return 0;
-    }
     return 1;
 }
 
@@ -169,14 +173,12 @@ static void libopenjpeg_copy_to_packed8(AVFrame *picture, opj_image_t *image)
     int index, x, y, c;
 
     for (y = 0; y < picture->height; y++) {
-        index = y*picture->width;
-        img_ptr = picture->data[0] + y*picture->linesize[0];
-        for (x = 0; x < picture->width; x++, index++) {
-            for (c = 0; c < image->numcomps; c++) {
+        index   = y * picture->width;
+        img_ptr = picture->data[0] + y * picture->linesize[0];
+        for (x = 0; x < picture->width; x++, index++)
+            for (c = 0; c < image->numcomps; c++)
                 *img_ptr++ = image->comps[c].data[index];
     }
-        }
-    }
 }
 
 static void libopenjpeg_copy_to_packed16(AVFrame *picture, opj_image_t *image)
@@ -189,14 +191,12 @@ static void libopenjpeg_copy_to_packed16(AVFrame *picture, opj_image_t *image)
         adjust[x] = FFMAX(FFMIN(16 - image->comps[x].prec, 8), 0);
 
     for (y = 0; y < picture->height; y++) {
-        index = y*picture->width;
-        img_ptr = (uint16_t*) (picture->data[0] + y*picture->linesize[0]);
-        for (x = 0; x < picture->width; x++, index++) {
-            for (c = 0; c < image->numcomps; c++) {
+        index   = y * picture->width;
+        img_ptr = (uint16_t *) (picture->data[0] + y * picture->linesize[0]);
+        for (x = 0; x < picture->width; x++, index++)
+            for (c = 0; c < image->numcomps; c++)
                 *img_ptr++ = image->comps[c].data[index] << adjust[c];
     }
-        }
-    }
 }
 
 static void libopenjpeg_copyto8(AVFrame *picture, opj_image_t *image)
@@ -227,7 +227,7 @@ static void libopenjpeg_copyto16(AVFrame *p, opj_image_t *image)
     for (index = 0; index < image->numcomps; index++) {
         comp_data = image->comps[index].data;
         for (y = 0; y < image->comps[index].h; y++) {
-            img_ptr = (uint16_t*) (p->data[index] + y * p->linesize[index]);
+            img_ptr = (uint16_t *)(p->data[index] + y * p->linesize[index]);
             for (x = 0; x < image->comps[index].w; x++) {
                 *img_ptr = *comp_data;
                 img_ptr++;
@@ -282,14 +282,14 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "Error initializing decoder.\n");
         return AVERROR_UNKNOWN;
     }
-    opj_set_event_mgr((opj_common_ptr)dec, NULL, NULL);
+    opj_set_event_mgr((opj_common_ptr) dec, NULL, NULL);
 
     ctx->dec_params.cp_limit_decoding = LIMIT_TO_MAIN_HEADER;
     ctx->dec_params.cp_reduce         = ctx->lowres;
     ctx->dec_params.cp_layer          = ctx->lowqual;
     // Tie decoder with decoding parameters
     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) {
         av_log(avctx, AV_LOG_ERROR,
@@ -345,7 +345,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
     ctx->dec_params.cp_limit_decoding = NO_LIMITATION;
     // Tie decoder with decoding parameters.
     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) {
         av_log(avctx, AV_LOG_ERROR,
                "Codestream could not be opened for reading.\n");
@@ -414,8 +414,10 @@ done:
 #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
 
 static const AVOption options[] = {
-    { "lowqual", "Limit the number of layers used for decoding",    OFFSET(lowqual), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VD },
-    { "lowres",  "Lower the decoding resolution by a power of two", OFFSET(lowres),  AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VD },
+    { "lowqual", "Limit the number of layers used for decoding",
+        OFFSET(lowqual), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VD },
+    { "lowres",  "Lower the decoding resolution by a power of two",
+        OFFSET(lowres),  AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VD },
     { NULL },
 };
 

libavcodec/libopenjpegenc.c

@@ -184,7 +184,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
     ctx->event_mgr.info_handler    = info_callback;
     ctx->event_mgr.error_handler   = error_callback;
     ctx->event_mgr.warning_handler = warning_callback;
-    opj_set_event_mgr((opj_common_ptr)ctx->compress, &ctx->event_mgr, avctx);
+    opj_set_event_mgr((opj_common_ptr) ctx->compress, &ctx->event_mgr, avctx);
 
     return 0;
 
@@ -202,7 +202,7 @@ static void libopenjpeg_copy_packed8(AVCodecContext *avctx,
     int image_index, frame_index;
     const int numcomps = image->numcomps;
 
-    for (compno = 0; compno < numcomps; ++compno) {
+    for (compno = 0; compno < numcomps; ++compno)
         for (y = 0; y < avctx->height; ++y) {
             image_index = y * avctx->width;
             frame_index = y * frame->linesize[0] + compno;
@@ -212,7 +212,6 @@ static void libopenjpeg_copy_packed8(AVCodecContext *avctx,
                 frame_index += numcomps;
             }
         }
-    }
 }
 
 static void libopenjpeg_copy_packed16(AVCodecContext *avctx,
@@ -222,9 +221,9 @@ static void libopenjpeg_copy_packed16(AVCodecContext *avctx,
     int x, y;
     int image_index, frame_index;
     const int numcomps  = image->numcomps;
-    uint16_t *frame_ptr = (uint16_t*)frame->data[0];
+    uint16_t *frame_ptr = (uint16_t *)frame->data[0];
 
-    for (compno = 0; compno < numcomps; ++compno) {
+    for (compno = 0; compno < numcomps; ++compno)
         for (y = 0; y < avctx->height; ++y) {
             image_index = y * avctx->width;
             frame_index = y * (frame->linesize[0] / 2) + compno;
@@ -234,7 +233,6 @@ static void libopenjpeg_copy_packed16(AVCodecContext *avctx,
                 frame_index += numcomps;
             }
         }
-    }
 }
 
 static void libopenjpeg_copy_unpacked8(AVCodecContext *avctx,
@@ -273,7 +271,7 @@ static void libopenjpeg_copy_unpacked16(AVCodecContext *avctx,
     for (compno = 0; compno < numcomps; ++compno) {
         width     = avctx->width / image->comps[compno].dx;
         height    = avctx->height / image->comps[compno].dy;
-        frame_ptr = (uint16_t*)frame->data[compno];
+        frame_ptr = (uint16_t *)frame->data[compno];
         for (y = 0; y < height; ++y) {
             image_index = y * width;
             frame_index = y * (frame->linesize[compno] / 2);
@@ -340,7 +338,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     }
 
     opj_setup_encoder(compress, &ctx->enc_params, image);
-    stream = opj_cio_open((opj_common_ptr)compress, NULL, 0);
+    stream = opj_cio_open((opj_common_ptr) compress, NULL, 0);
     if (!stream) {
         av_log(avctx, AV_LOG_ERROR, "Error creating the cio stream\n");
         return AVERROR(ENOMEM);