Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'

* commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec':
  jpegls: K&R formatting cosmetics

Conflicts:
	libavcodec/jpegls.c
	libavcodec/jpegls.h
	libavcodec/jpeglsdec.c
	libavcodec/jpeglsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 113 insertions, 97 deletions

diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index dd971ccc26..b13f9ef734 100644
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -34,18 +34,16 @@
 #include "jpegls.h"
 #include "jpeglsdec.h"
 
-
 /*
-* Uncomment this to significantly speed up decoding of broken JPEG-LS
-* (or test broken JPEG-LS decoder) and slow down ordinary decoding a bit.
-*
-* There is no Golomb code with length >= 32 bits possible, so check and
-* avoid situation of 32 zeros, FFmpeg Golomb decoder is painfully slow
-* on this errors.
-*/
+ * Uncomment this to significantly speed up decoding of broken JPEG-LS
+ * (or test broken JPEG-LS decoder) and slow down ordinary decoding a bit.
+ *
+ * There is no Golomb code with length >= 32 bits possible, so check and
+ * avoid situation of 32 zeros, FFmpeg Golomb decoder is painfully slow
+ * on this errors.
+ */
 //#define JLS_BROKEN
 
-
 /**
  * Decode LSE block with initialization parameters
  */
@@ -56,13 +54,13 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s)
     skip_bits(&s->gb, 16);  /* length: FIXME: verify field validity */
     id = get_bits(&s->gb, 8);
 
-    switch(id){
+    switch (id) {
     case 1:
-        s->maxval= get_bits(&s->gb, 16);
-        s->t1= get_bits(&s->gb, 16);
-        s->t2= get_bits(&s->gb, 16);
-        s->t3= get_bits(&s->gb, 16);
-        s->reset= get_bits(&s->gb, 16);
+        s->maxval = get_bits(&s->gb, 16);
+        s->t1     = get_bits(&s->gb, 16);
+        s->t2     = get_bits(&s->gb, 16);
+        s->t3     = get_bits(&s->gb, 16);
+        s->reset  = get_bits(&s->gb, 16);
 
 //        ff_jpegls_reset_coding_parameters(s, 0);
         //FIXME quant table?
@@ -86,27 +84,30 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s)
 /**
  * Get context-dependent Golomb code, decode it and update context
  */
-static inline int ls_get_code_regular(GetBitContext *gb, JLSState *state, int Q){
+static inline int ls_get_code_regular(GetBitContext *gb, JLSState *state, int Q)
+{
     int k, ret;
 
-    for(k = 0; (state->N[Q] << k) < state->A[Q]; k++);
+    for (k = 0; (state->N[Q] << k) < state->A[Q]; k++)
+        ;
 
 #ifdef JLS_BROKEN
-    if(!show_bits_long(gb, 32))return -1;
+    if (!show_bits_long(gb, 32))
+        return -1;
 #endif
     ret = get_ur_golomb_jpegls(gb, k, state->limit, state->qbpp);
 
     /* decode mapped error */
-    if(ret & 1)
+    if (ret & 1)
         ret = -(ret + 1 >> 1);
     else
         ret >>= 1;
 
     /* for NEAR=0, k=0 and 2*B[Q] <= - N[Q] mapping is reversed */
-    if(!state->near && !k && (2 * state->B[Q] <= -state->N[Q]))
+    if (!state->near && !k && (2 * state->B[Q] <= -state->N[Q]))
         ret = -(ret + 1);
 
-    ret= ff_jpegls_update_state_regular(state, Q, ret);
+    ret = ff_jpegls_update_state_regular(state, Q, ret);
 
     return ret;
 }
@@ -114,28 +115,33 @@ static inline int ls_get_code_regular(GetBitContext *gb, JLSState *state, int Q)
 /**
  * Get Golomb code, decode it and update state for run termination
  */
-static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state, int RItype, int limit_add){
+static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state,
+                                      int RItype, int limit_add)
+{
     int k, ret, temp, map;
     int Q = 365 + RItype;
 
-    temp=  state->A[Q];
-    if(RItype)
+    temp = state->A[Q];
+    if (RItype)
         temp += state->N[Q] >> 1;
 
-    for(k = 0; (state->N[Q] << k) < temp; k++);
+    for (k = 0; (state->N[Q] << k) < temp; k++)
+        ;
 
 #ifdef JLS_BROKEN
-    if(!show_bits_long(gb, 32))return -1;
+    if (!show_bits_long(gb, 32))
+        return -1;
 #endif
-    ret = get_ur_golomb_jpegls(gb, k, state->limit - limit_add - 1, state->qbpp);
+    ret = get_ur_golomb_jpegls(gb, k, state->limit - limit_add - 1,
+                               state->qbpp);
 
     /* decode mapped error */
     map = 0;
-    if(!k && (RItype || ret) && (2 * state->B[Q] < state->N[Q]))
+    if (!k && (RItype || ret) && (2 * state->B[Q] < state->N[Q]))
         map = 1;
     ret += RItype + map;
 
-    if(ret & 1){
+    if (ret & 1) {
         ret = map - (ret + 1 >> 1);
         state->B[Q]++;
     } else {
@@ -144,7 +150,7 @@ static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state, int RI
 
     /* update state */
     state->A[Q] += FFABS(ret) - RItype;
-    ret *= state->twonear;
+    ret         *= state->twonear;
     ff_jpegls_downscale_state(state, Q);
 
     return ret;
@@ -153,12 +159,15 @@ static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state, int RI
 /**
  * Decode one line of image
  */
-static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, void *last, void *dst, int last2, int w, int stride, int comp, int bits){
+static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s,
+                                  void *last, void *dst, int last2, int w,
+                                  int stride, int comp, int bits)
+{
     int i, x = 0;
     int Ra, Rb, Rc, Rd;
     int D0, D1, D2;
 
-    while(x < w) {
+    while (x < w) {
         int err, pred;
 
         /* compute gradients */
@@ -170,52 +179,54 @@ static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, void *
         D1 = Rb - Rc;
         D2 = Rc - Ra;
         /* run mode */
-        if((FFABS(D0) <= state->near) && (FFABS(D1) <= state->near) && (FFABS(D2) <= state->near)) {
+        if ((FFABS(D0) <= state->near) &&
+            (FFABS(D1) <= state->near) &&
+            (FFABS(D2) <= state->near)) {
             int r;
             int RItype;
 
             /* decode full runs while available */
-            while(get_bits1(&s->gb)) {
+            while (get_bits1(&s->gb)) {
                 int r;
                 r = 1 << ff_log2_run[state->run_index[comp]];
-                if(x + r * stride > w) {
+                if (x + r * stride > w)
                     r = (w - x) / stride;
-                }
-                for(i = 0; i < r; i++) {
+                for (i = 0; i < r; i++) {
                     W(dst, x, Ra);
                     x += stride;
                 }
                 /* if EOL reached, we stop decoding */
                 if (r != 1 << ff_log2_run[state->run_index[comp]])
                     return;
-                if(state->run_index[comp] < 31)
+                if (state->run_index[comp] < 31)
                     state->run_index[comp]++;
-                if(x + stride > w)
+                if (x + stride > w)
                     return;
             }
             /* decode aborted run */
             r = ff_log2_run[state->run_index[comp]];
-            if(r)
+            if (r)
                 r = get_bits_long(&s->gb, r);
-            if(x + r * stride > w) {
+            if (x + r * stride > w) {
                 r = (w - x) / stride;
             }
-            for(i = 0; i < r; i++) {
+            for (i = 0; i < r; i++) {
                 W(dst, x, Ra);
                 x += stride;
             }
 
             /* decode run termination value */
-            Rb = R(last, x);
+            Rb     = R(last, x);
             RItype = (FFABS(Ra - Rb) <= state->near) ? 1 : 0;
-            err = ls_get_code_runterm(&s->gb, state, RItype, ff_log2_run[state->run_index[comp]]);
-            if(state->run_index[comp])
+            err    = ls_get_code_runterm(&s->gb, state, RItype,
+                                         ff_log2_run[state->run_index[comp]]);
+            if (state->run_index[comp])
                 state->run_index[comp]--;
 
-            if(state->near && RItype){
+            if (state->near && RItype) {
                 pred = Ra + err;
             } else {
-                if(Rb < Ra)
+                if (Rb < Ra)
                     pred = Rb - err;
                 else
                     pred = Rb + err;
@@ -223,31 +234,33 @@ static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, void *
         } else { /* regular mode */
             int context, sign;
 
-            context = ff_jpegls_quantize(state, D0) * 81 + ff_jpegls_quantize(state, D1) * 9 + ff_jpegls_quantize(state, D2);
-            pred = mid_pred(Ra, Ra + Rb - Rc, Rb);
+            context = ff_jpegls_quantize(state, D0) * 81 +
+                      ff_jpegls_quantize(state, D1) *  9 +
+                      ff_jpegls_quantize(state, D2);
+            pred    = mid_pred(Ra, Ra + Rb - Rc, Rb);
 
-            if(context < 0){
+            if (context < 0) {
                 context = -context;
-                sign = 1;
-            }else{
+                sign    = 1;
+            } else {
                 sign = 0;
             }
 
-            if(sign){
+            if (sign) {
                 pred = av_clip(pred - state->C[context], 0, state->maxval);
-                err = -ls_get_code_regular(&s->gb, state, context);
+                err  = -ls_get_code_regular(&s->gb, state, context);
             } else {
                 pred = av_clip(pred + state->C[context], 0, state->maxval);
-                err = ls_get_code_regular(&s->gb, state, context);
+                err  = ls_get_code_regular(&s->gb, state, context);
             }
 
             /* we have to do something more for near-lossless coding */
             pred += err;
         }
-        if(state->near){
-            if(pred < -state->near)
+        if (state->near) {
+            if (pred < -state->near)
                 pred += state->range * state->twonear;
-            else if(pred > state->maxval + state->near)
+            else if (pred > state->maxval + state->near)
                 pred -= state->range * state->twonear;
             pred = av_clip(pred, 0, state->maxval);
         }
@@ -258,7 +271,9 @@ static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, void *
     }
 }
 
-int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transform, int ilv){
+int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
+                             int point_transform, int ilv)
+{
     int i, t = 0;
     uint8_t *zero, *last, *cur;
     JLSState *state;
@@ -266,45 +281,47 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transfor
 
     zero = av_mallocz(s->picture.linesize[0]);
     last = zero;
-    cur = s->picture.data[0];
+    cur  = s->picture.data[0];
 
     state = av_mallocz(sizeof(JLSState));
     /* initialize JPEG-LS state from JPEG parameters */
-    state->near = near;
-    state->bpp = (s->bits < 2) ? 2 : s->bits;
+    state->near   = near;
+    state->bpp    = (s->bits < 2) ? 2 : s->bits;
     state->maxval = s->maxval;
-    state->T1 = s->t1;
-    state->T2 = s->t2;
-    state->T3 = s->t3;
-    state->reset = s->reset;
+    state->T1     = s->t1;
+    state->T2     = s->t2;
+    state->T3     = s->t3;
+    state->reset  = s->reset;
     ff_jpegls_reset_coding_parameters(state, 0);
     ff_jpegls_init_state(state);
 
-    if(s->bits <= 8)
+    if (s->bits <= 8)
         shift = point_transform + (8 - s->bits);
     else
         shift = point_transform + (16 - s->bits);
 
     if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
-        av_log(s->avctx, AV_LOG_DEBUG, "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",
+        av_log(s->avctx, AV_LOG_DEBUG,
+               "JPEG-LS params: %ix%i NEAR=%i MV=%i T(%i,%i,%i) "
+               "RESET=%i, LIMIT=%i, qbpp=%i, RANGE=%i\n",
                 s->width, s->height, state->near, state->maxval,
                 state->T1, state->T2, state->T3,
                 state->reset, state->limit, state->qbpp, state->range);
         av_log(s->avctx, AV_LOG_DEBUG, "JPEG params: ILV=%i Pt=%i BPP=%i, scan = %i\n",
                 ilv, point_transform, s->bits, s->cur_scan);
     }
-    if(ilv == 0) { /* separate planes */
+    if (ilv == 0) { /* separate planes */
         stride = (s->nb_components > 1) ? 3 : 1;
-        off = av_clip(s->cur_scan - 1, 0, stride - 1);
-        width = s->width * stride;
-        cur += off;
-        for(i = 0; i < s->height; i++) {
-            if(s->bits <= 8){
-                ls_decode_line(state, s, last, cur, t, width, stride, off,  8);
+        off    = av_clip(s->cur_scan - 1, 0, stride - 1);
+        width  = s->width * stride;
+        cur   += off;
+        for (i = 0; i < s->height; i++) {
+            if (s->bits <= 8) {
+                ls_decode_line(state, s, last, cur, t, width, stride, off, 8);
                 t = last[0];
-            }else{
+            } else {
                 ls_decode_line(state, s, last, cur, t, width, stride, off, 16);
-                t = *((uint16_t*)last);
+                t = *((uint16_t *)last);
             }
             last = cur;
             cur += s->picture.linesize[0];
@@ -314,15 +331,16 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transfor
                 skip_bits(&s->gb, 16); /* skip RSTn */
             }
         }
-    } else if(ilv == 1) { /* line interleaving */
+    } else if (ilv == 1) { /* line interleaving */
         int j;
-        int Rc[3] = {0, 0, 0};
+        int Rc[3] = { 0, 0, 0 };
         stride = (s->nb_components > 1) ? 3 : 1;
         memset(cur, 0, s->picture.linesize[0]);
         width = s->width * stride;
-        for(i = 0; i < s->height; i++) {
-            for(j = 0; j < stride; j++) {
-                ls_decode_line(state, s, last + j, cur + j, Rc[j], width, stride, j, 8);
+        for (i = 0; i < s->height; i++) {
+            for (j = 0; j < stride; j++) {
+                ls_decode_line(state, s, last + j, cur + j,
+                               Rc[j], width, stride, j, 8);
                 Rc[j] = last[j];
 
                 if (s->restart_interval && !--s->restart_count) {
@@ -333,35 +351,34 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transfor
             last = cur;
             cur += s->picture.linesize[0];
         }
-    } else if(ilv == 2) { /* sample interleaving */
-        av_log(s->avctx, AV_LOG_ERROR, "Sample interleaved images are not supported.\n");
+    } else if (ilv == 2) { /* sample interleaving */
+        av_log(s->avctx, AV_LOG_ERROR,
+               "Sample interleaved images are not supported.\n");
         av_free(state);
         av_free(zero);
         return -1;
     }
 
-    if(shift){ /* we need to do point transform or normalize samples */
+    if (shift) { /* we need to do point transform or normalize samples */
         int x, w;
 
         w = s->width * s->nb_components;
 
-        if(s->bits <= 8){
+        if (s->bits <= 8) {
             uint8_t *src = s->picture.data[0];
 
-            for(i = 0; i < s->height; i++){
-                for(x = off; x < w; x+= stride){
+            for (i = 0; i < s->height; i++) {
+                for (x = off; x < w; x += stride)
                     src[x] <<= shift;
-                }
                 src += s->picture.linesize[0];
             }
-        }else{
-            uint16_t *src = (uint16_t*) s->picture.data[0];
+        } else {
+            uint16_t *src = (uint16_t *)s->picture.data[0];
 
-            for(i = 0; i < s->height; i++){
-                for(x = 0; x < w; x++){
+            for (i = 0; i < s->height; i++) {
+                for (x = 0; x < w; x++)
                     src[x] <<= shift;
-                }
-                src += s->picture.linesize[0]/2;
+                src += s->picture.linesize[0] / 2;
             }
         }
     }
@@ -371,9 +388,9 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transfor
     return 0;
 }
 
-
 AVCodec ff_jpegls_decoder = {
     .name           = "jpegls",
+    .long_name      = NULL_IF_CONFIG_SMALL("JPEG-LS"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_JPEGLS,
     .priv_data_size = sizeof(MJpegDecodeContext),
@@ -381,5 +398,4 @@ AVCodec ff_jpegls_decoder = {
     .close          = ff_mjpeg_decode_end,
     .decode         = ff_mjpeg_decode_frame,
     .capabilities   = CODEC_CAP_DR1,
-    .long_name      = NULL_IF_CONFIG_SMALL("JPEG-LS"),
 };