Merge remote-tracking branch 'qatar/master'

* qatar/master:
  VP3: K&R formatting cosmetics

Conflicts:
	libavcodec/vp3.c

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

4 files changed, 3785 insertions, 3751 deletions

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 512e45905f..95b7994723 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -34,20 +34,21 @@
 #include <string.h>
 
 #include "libavutil/imgutils.h"
+
 #include "avcodec.h"
-#include "internal.h"
 #include "get_bits.h"
 #include "hpeldsp.h"
+#include "internal.h"
 #include "mathops.h"
+#include "thread.h"
 #include "videodsp.h"
 #include "vp3data.h"
 #include "vp3dsp.h"
 #include "xiph.h"
-#include "thread.h"
 
 #define FRAGMENT_PIXELS 8
 
-//FIXME split things out into their own arrays
+// FIXME split things out into their own arrays
 typedef struct Vp3Fragment {
     int16_t dc;
     uint8_t coding_method;
@@ -81,51 +82,49 @@ static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb);
 
 
 /* There are 6 preset schemes, plus a free-form scheme */
-static const int ModeAlphabet[6][CODING_MODE_COUNT] =
-{
+static const int ModeAlphabet[6][CODING_MODE_COUNT] = {
     /* scheme 1: Last motion vector dominates */
-    {    MODE_INTER_LAST_MV,    MODE_INTER_PRIOR_LAST,
-         MODE_INTER_PLUS_MV,    MODE_INTER_NO_MV,
-         MODE_INTRA,            MODE_USING_GOLDEN,
-         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
+    { MODE_INTER_LAST_MV,    MODE_INTER_PRIOR_LAST,
+      MODE_INTER_PLUS_MV,    MODE_INTER_NO_MV,
+      MODE_INTRA,            MODE_USING_GOLDEN,
+      MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
 
     /* scheme 2 */
-    {    MODE_INTER_LAST_MV,    MODE_INTER_PRIOR_LAST,
-         MODE_INTER_NO_MV,      MODE_INTER_PLUS_MV,
-         MODE_INTRA,            MODE_USING_GOLDEN,
-         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
+    { MODE_INTER_LAST_MV,    MODE_INTER_PRIOR_LAST,
+      MODE_INTER_NO_MV,      MODE_INTER_PLUS_MV,
+      MODE_INTRA,            MODE_USING_GOLDEN,
+      MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
 
     /* scheme 3 */
-    {    MODE_INTER_LAST_MV,    MODE_INTER_PLUS_MV,
-         MODE_INTER_PRIOR_LAST, MODE_INTER_NO_MV,
-         MODE_INTRA,            MODE_USING_GOLDEN,
-         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
+    { MODE_INTER_LAST_MV,    MODE_INTER_PLUS_MV,
+      MODE_INTER_PRIOR_LAST, MODE_INTER_NO_MV,
+      MODE_INTRA,            MODE_USING_GOLDEN,
+      MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
 
     /* scheme 4 */
-    {    MODE_INTER_LAST_MV,    MODE_INTER_PLUS_MV,
-         MODE_INTER_NO_MV,      MODE_INTER_PRIOR_LAST,
-         MODE_INTRA,            MODE_USING_GOLDEN,
-         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
+    { MODE_INTER_LAST_MV,    MODE_INTER_PLUS_MV,
+      MODE_INTER_NO_MV,      MODE_INTER_PRIOR_LAST,
+      MODE_INTRA,            MODE_USING_GOLDEN,
+      MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
 
     /* scheme 5: No motion vector dominates */
-    {    MODE_INTER_NO_MV,      MODE_INTER_LAST_MV,
-         MODE_INTER_PRIOR_LAST, MODE_INTER_PLUS_MV,
-         MODE_INTRA,            MODE_USING_GOLDEN,
-         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
+    { MODE_INTER_NO_MV,      MODE_INTER_LAST_MV,
+      MODE_INTER_PRIOR_LAST, MODE_INTER_PLUS_MV,
+      MODE_INTRA,            MODE_USING_GOLDEN,
+      MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
 
     /* scheme 6 */
-    {    MODE_INTER_NO_MV,      MODE_USING_GOLDEN,
-         MODE_INTER_LAST_MV,    MODE_INTER_PRIOR_LAST,
-         MODE_INTER_PLUS_MV,    MODE_INTRA,
-         MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
-
+    { MODE_INTER_NO_MV,      MODE_USING_GOLDEN,
+      MODE_INTER_LAST_MV,    MODE_INTER_PRIOR_LAST,
+      MODE_INTER_PLUS_MV,    MODE_INTRA,
+      MODE_GOLDEN_MV,        MODE_INTER_FOURMV },
 };
 
 static const uint8_t hilbert_offset[16][2] = {
-    {0,0}, {1,0}, {1,1}, {0,1},
-    {0,2}, {0,3}, {1,3}, {1,2},
-    {2,2}, {2,3}, {3,3}, {3,2},
-    {3,1}, {2,1}, {2,0}, {3,0}
+    { 0, 0 }, { 1, 0 }, { 1, 1 }, { 0, 1 },
+    { 0, 2 }, { 0, 3 }, { 1, 3 }, { 1, 2 },
+    { 2, 2 }, { 2, 3 }, { 3, 3 }, { 3, 2 },
+    { 3, 1 }, { 2, 1 }, { 2, 0 }, { 3, 0 }
 };
 
 #define MIN_DEQUANT_VAL 2
@@ -184,7 +183,7 @@ typedef struct Vp3DecodeContext {
     uint32_t coded_ac_scale_factor[64];
     uint8_t base_matrix[384][64];
     uint8_t qr_count[2][3];
-    uint8_t qr_size [2][3][64];
+    uint8_t qr_size[2][3][64];
     uint16_t qr_base[2][3][64];
 
     /**
@@ -211,7 +210,8 @@ typedef struct Vp3DecodeContext {
 #define TOKEN_COEFF(coeff)              (((coeff) << 2) + 2)
 
     /**
-     * number of blocks that contain DCT coefficients at the given level or higher
+     * number of blocks that contain DCT coefficients at
+     * the given level or higher
      */
     int num_coded_frags[3][64];
     int total_num_coded_frags;
@@ -255,7 +255,7 @@ typedef struct Vp3DecodeContext {
     uint32_t huffman_table[80][32][2];
 
     uint8_t filter_limit_values[64];
-    DECLARE_ALIGNED(8, int, bounding_values_array)[256+2];
+    DECLARE_ALIGNED(8, int, bounding_values_array)[256 + 2];
 } Vp3DecodeContext;
 
 /************************************************************************
@@ -313,7 +313,6 @@ static av_cold int vp3_decode_end(AVCodecContext *avctx)
     ff_free_vlc(&s->mode_code_vlc);
     ff_free_vlc(&s->motion_vector_vlc);
 
-
     return 0;
 }
 
@@ -330,19 +329,22 @@ static int init_block_mapping(Vp3DecodeContext *s)
     int x, y, i, j = 0;
 
     for (plane = 0; plane < 3; plane++) {
-        int sb_width    = plane ? s->c_superblock_width  : s->y_superblock_width;
-        int sb_height   = plane ? s->c_superblock_height : s->y_superblock_height;
+        int sb_width    = plane ? s->c_superblock_width
+                                : s->y_superblock_width;
+        int sb_height   = plane ? s->c_superblock_height
+                                : s->y_superblock_height;
         int frag_width  = s->fragment_width[!!plane];
         int frag_height = s->fragment_height[!!plane];
 
         for (sb_y = 0; sb_y < sb_height; sb_y++)
             for (sb_x = 0; sb_x < sb_width; sb_x++)
                 for (i = 0; i < 16; i++) {
-                    x = 4*sb_x + hilbert_offset[i][0];
-                    y = 4*sb_y + hilbert_offset[i][1];
+                    x = 4 * sb_x + hilbert_offset[i][0];
+                    y = 4 * sb_y + hilbert_offset[i][1];
 
                     if (x < frag_width && y < frag_height)
-                        s->superblock_fragments[j++] = s->fragment_start[plane] + y*frag_width + x;
+                        s->superblock_fragments[j++] = s->fragment_start[plane] +
+                                                       y * frag_width + x;
                     else
                         s->superblock_fragments[j++] = -1;
                 }
@@ -361,30 +363,31 @@ static void init_dequantizer(Vp3DecodeContext *s, int qpi)
     int dc_scale_factor = s->coded_dc_scale_factor[s->qps[qpi]];
     int i, plane, inter, qri, bmi, bmj, qistart;
 
-    for(inter=0; inter<2; inter++){
-        for(plane=0; plane<3; plane++){
-            int sum=0;
-            for(qri=0; qri<s->qr_count[inter][plane]; qri++){
-                sum+= s->qr_size[inter][plane][qri];
-                if(s->qps[qpi] <= sum)
+    for (inter = 0; inter < 2; inter++) {
+        for (plane = 0; plane < 3; plane++) {
+            int sum = 0;
+            for (qri = 0; qri < s->qr_count[inter][plane]; qri++) {
+                sum += s->qr_size[inter][plane][qri];
+                if (s->qps[qpi] <= sum)
                     break;
             }
-            qistart= sum - s->qr_size[inter][plane][qri];
-            bmi= s->qr_base[inter][plane][qri  ];
-            bmj= s->qr_base[inter][plane][qri+1];
-            for(i=0; i<64; i++){
-                int coeff= (  2*(sum    -s->qps[qpi])*s->base_matrix[bmi][i]
-                            - 2*(qistart-s->qps[qpi])*s->base_matrix[bmj][i]
-                            + s->qr_size[inter][plane][qri])
-                           / (2*s->qr_size[inter][plane][qri]);
-
-                int qmin= 8<<(inter + !i);
-                int qscale= i ? ac_scale_factor : dc_scale_factor;
+            qistart = sum - s->qr_size[inter][plane][qri];
+            bmi     = s->qr_base[inter][plane][qri];
+            bmj     = s->qr_base[inter][plane][qri + 1];
+            for (i = 0; i < 64; i++) {
+                int coeff = (2 * (sum     - s->qps[qpi]) * s->base_matrix[bmi][i] -
+                             2 * (qistart - s->qps[qpi]) * s->base_matrix[bmj][i] +
+                             s->qr_size[inter][plane][qri]) /
+                            (2 * s->qr_size[inter][plane][qri]);
+
+                int qmin   = 8 << (inter + !i);
+                int qscale = i ? ac_scale_factor : dc_scale_factor;
 
                 s->qmat[qpi][inter][plane][s->idct_permutation[i]] =
                     av_clip((qscale * coeff) / 100 * 4, qmin, 4096);
             }
-            // all DC coefficients use the same quant so as not to interfere with DC prediction
+            /* all DC coefficients use the same quant so as not to interfere
+             * with DC prediction */
             s->qmat[qpi][inter][plane][0] = s->qmat[0][inter][plane][0];
         }
     }
@@ -398,7 +401,7 @@ static void init_dequantizer(Vp3DecodeContext *s, int qpi)
  */
 static void init_loop_filter(Vp3DecodeContext *s)
 {
-    int *bounding_values= s->bounding_values_array+127;
+    int *bounding_values = s->bounding_values_array + 127;
     int filter_limit;
     int x;
     int value;
@@ -427,7 +430,9 @@ static void init_loop_filter(Vp3DecodeContext *s)
  */
 static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
 {
-    int superblock_starts[3] = { 0, s->u_superblock_start, s->v_superblock_start };
+    int superblock_starts[3] = {
+        0, s->u_superblock_start, s->v_superblock_start
+    };
     int bit = 0;
     int current_superblock = 0;
     int current_run = 0;
@@ -439,11 +444,9 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
 
     if (s->keyframe) {
         memset(s->superblock_coding, SB_FULLY_CODED, s->superblock_count);
-
     } else {
-
         /* unpack the list of partially-coded superblocks */
-        bit = get_bits1(gb) ^ 1;
+        bit         = get_bits1(gb) ^ 1;
         current_run = 0;
 
         while (current_superblock < s->superblock_count && get_bits_left(gb) > 0) {
@@ -452,13 +455,14 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
             else
                 bit ^= 1;
 
-                current_run = get_vlc2(gb,
-                    s->superblock_run_length_vlc.table, 6, 2) + 1;
-                if (current_run == 34)
-                    current_run += get_bits(gb, 12);
+            current_run = get_vlc2(gb, s->superblock_run_length_vlc.table,
+                                   6, 2) + 1;
+            if (current_run == 34)
+                current_run += get_bits(gb, 12);
 
             if (current_superblock + current_run > s->superblock_count) {
-                av_log(s->avctx, AV_LOG_ERROR, "Invalid partially coded superblock run length\n");
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "Invalid partially coded superblock run length\n");
                 return -1;
             }
 
@@ -475,33 +479,33 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
             int superblocks_decoded = 0;
 
             current_superblock = 0;
-            bit = get_bits1(gb) ^ 1;
-            current_run = 0;
-
-            while (superblocks_decoded < s->superblock_count - num_partial_superblocks
-                   && get_bits_left(gb) > 0) {
+            bit                = get_bits1(gb) ^ 1;
+            current_run        = 0;
 
+            while (superblocks_decoded < s->superblock_count - num_partial_superblocks &&
+                   get_bits_left(gb) > 0) {
                 if (s->theora && current_run == MAXIMUM_LONG_BIT_RUN)
                     bit = get_bits1(gb);
                 else
                     bit ^= 1;
 
-                        current_run = get_vlc2(gb,
-                            s->superblock_run_length_vlc.table, 6, 2) + 1;
-                        if (current_run == 34)
-                            current_run += get_bits(gb, 12);
+                current_run = get_vlc2(gb, s->superblock_run_length_vlc.table,
+                                       6, 2) + 1;
+                if (current_run == 34)
+                    current_run += get_bits(gb, 12);
 
                 for (j = 0; j < current_run; current_superblock++) {
                     if (current_superblock >= s->superblock_count) {
-                        av_log(s->avctx, AV_LOG_ERROR, "Invalid fully coded superblock run length\n");
+                        av_log(s->avctx, AV_LOG_ERROR,
+                               "Invalid fully coded superblock run length\n");
                         return -1;
                     }
 
-                /* skip any superblocks already marked as partially coded */
-                if (s->superblock_coding[current_superblock] == SB_NOT_CODED) {
-                    s->superblock_coding[current_superblock] = 2*bit;
-                    j++;
-                }
+                    /* skip any superblocks already marked as partially coded */
+                    if (s->superblock_coding[current_superblock] == SB_NOT_CODED) {
+                        s->superblock_coding[current_superblock] = 2 * bit;
+                        j++;
+                    }
                 }
                 superblocks_decoded += current_run;
             }
@@ -510,9 +514,8 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
         /* if there were partial blocks, initialize bitstream for
          * unpacking fragment codings */
         if (num_partial_superblocks) {
-
             current_run = 0;
-            bit = get_bits1(gb);
+            bit         = get_bits1(gb);
             /* toggle the bit because as soon as the first run length is
              * fetched the bit will be toggled again */
             bit ^= 1;
@@ -526,30 +529,27 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
 
     for (plane = 0; plane < 3; plane++) {
         int sb_start = superblock_starts[plane];
-        int sb_end = sb_start + (plane ? s->c_superblock_count : s->y_superblock_count);
+        int sb_end   = sb_start + (plane ? s->c_superblock_count
+                                         : s->y_superblock_count);
         int num_coded_frags = 0;
 
-    for (i = sb_start; i < sb_end && get_bits_left(gb) > 0; i++) {
-
-        /* iterate through all 16 fragments in a superblock */
-        for (j = 0; j < 16; j++) {
-
-            /* if the fragment is in bounds, check its coding status */
-            current_fragment = s->superblock_fragments[i * 16 + j];
-            if (current_fragment != -1) {
-                int coded = s->superblock_coding[i];
-
-                if (s->superblock_coding[i] == SB_PARTIALLY_CODED) {
-
-                    /* fragment may or may not be coded; this is the case
-                     * that cares about the fragment coding runs */
-                    if (current_run-- == 0) {
-                        bit ^= 1;
-                        current_run = get_vlc2(gb,
-                            s->fragment_run_length_vlc.table, 5, 2);
+        for (i = sb_start; i < sb_end && get_bits_left(gb) > 0; i++) {
+            /* iterate through all 16 fragments in a superblock */
+            for (j = 0; j < 16; j++) {
+                /* if the fragment is in bounds, check its coding status */
+                current_fragment = s->superblock_fragments[i * 16 + j];
+                if (current_fragment != -1) {
+                    int coded = s->superblock_coding[i];
+
+                    if (s->superblock_coding[i] == SB_PARTIALLY_CODED) {
+                        /* fragment may or may not be coded; this is the case
+                         * that cares about the fragment coding runs */
+                        if (current_run-- == 0) {
+                            bit        ^= 1;
+                            current_run = get_vlc2(gb, s->fragment_run_length_vlc.table, 5, 2);
+                        }
+                        coded = bit;
                     }
-                    coded = bit;
-                }
 
                     if (coded) {
                         /* default mode; actual mode will be decoded in
@@ -563,14 +563,15 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
                         s->all_fragments[current_fragment].coding_method =
                             MODE_COPY;
                     }
+                }
             }
         }
-    }
         s->total_num_coded_frags += num_coded_frags;
         for (i = 0; i < 64; i++)
             s->num_coded_frags[plane][i] = num_coded_frags;
         if (plane < 2)
-            s->coded_fragment_list[plane+1] = s->coded_fragment_list[plane] + num_coded_frags;
+            s->coded_fragment_list[plane + 1] = s->coded_fragment_list[plane] +
+                                                num_coded_frags;
     }
     return 0;
 }
@@ -593,9 +594,7 @@ static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
     if (s->keyframe) {
         for (i = 0; i < s->fragment_count; i++)
             s->all_fragments[i].coding_method = MODE_INTRA;
-
     } else {
-
         /* fetch the mode coding scheme for this frame */
         scheme = get_bits(gb, 3);
 
@@ -607,7 +606,7 @@ static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
                 custom_mode_alphabet[get_bits(gb, 3)] = i;
             alphabet = custom_mode_alphabet;
         } else
-            alphabet = ModeAlphabet[scheme-1];
+            alphabet = ModeAlphabet[scheme - 1];
 
         /* iterate through all of the macroblocks that contain 1 or more
          * coded fragments */
@@ -616,65 +615,70 @@ static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
                 if (get_bits_left(gb) <= 0)
                     return -1;
 
-            for (j = 0; j < 4; j++) {
-                int mb_x = 2*sb_x +   (j>>1);
-                int mb_y = 2*sb_y + (((j>>1)+j)&1);
-                current_macroblock = mb_y * s->macroblock_width + mb_x;
+                for (j = 0; j < 4; j++) {
+                    int mb_x = 2 * sb_x + (j >> 1);
+                    int mb_y = 2 * sb_y + (((j >> 1) + j) & 1);
+                    current_macroblock = mb_y * s->macroblock_width + mb_x;
 
-                if (mb_x >= s->macroblock_width || mb_y >= s->macroblock_height)
-                    continue;
+                    if (mb_x >= s->macroblock_width ||
+                        mb_y >= s->macroblock_height)
+                        continue;
 
-#define BLOCK_X (2*mb_x + (k&1))
-#define BLOCK_Y (2*mb_y + (k>>1))
-                /* coding modes are only stored if the macroblock has at least one
-                 * luma block coded, otherwise it must be INTER_NO_MV */
-                for (k = 0; k < 4; k++) {
-                    current_fragment = BLOCK_Y*s->fragment_width[0] + BLOCK_X;
-                    if (s->all_fragments[current_fragment].coding_method != MODE_COPY)
-                        break;
-                }
-                if (k == 4) {
-                    s->macroblock_coding[current_macroblock] = MODE_INTER_NO_MV;
-                    continue;
-                }
+#define BLOCK_X (2 * mb_x + (k & 1))
+#define BLOCK_Y (2 * mb_y + (k >> 1))
+                    /* coding modes are only stored if the macroblock has
+                     * at least one luma block coded, otherwise it must be
+                     * INTER_NO_MV */
+                    for (k = 0; k < 4; k++) {
+                        current_fragment = BLOCK_Y *
+                                           s->fragment_width[0] + BLOCK_X;
+                        if (s->all_fragments[current_fragment].coding_method != MODE_COPY)
+                            break;
+                    }
+                    if (k == 4) {
+                        s->macroblock_coding[current_macroblock] = MODE_INTER_NO_MV;
+                        continue;
+                    }
 
-                /* mode 7 means get 3 bits for each coding mode */
-                if (scheme == 7)
-                    coding_mode = get_bits(gb, 3);
-                else
-                    coding_mode = alphabet
-                        [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
+                    /* mode 7 means get 3 bits for each coding mode */
+                    if (scheme == 7)
+                        coding_mode = get_bits(gb, 3);
+                    else
+                        coding_mode = alphabet[get_vlc2(gb, s->mode_code_vlc.table, 3, 3)];
 
-                s->macroblock_coding[current_macroblock] = coding_mode;
-                for (k = 0; k < 4; k++) {
-                    frag = s->all_fragments + BLOCK_Y*s->fragment_width[0] + BLOCK_X;
-                    if (frag->coding_method != MODE_COPY)
-                        frag->coding_method = coding_mode;
-                }
+                    s->macroblock_coding[current_macroblock] = coding_mode;
+                    for (k = 0; k < 4; k++) {
+                        frag = s->all_fragments + BLOCK_Y * s->fragment_width[0] + BLOCK_X;
+                        if (frag->coding_method != MODE_COPY)
+                            frag->coding_method = coding_mode;
+                    }
 
-#define SET_CHROMA_MODES \
-    if (frag[s->fragment_start[1]].coding_method != MODE_COPY) \
-        frag[s->fragment_start[1]].coding_method = coding_mode;\
-    if (frag[s->fragment_start[2]].coding_method != MODE_COPY) \
+#define SET_CHROMA_MODES                                                      \
+    if (frag[s->fragment_start[1]].coding_method != MODE_COPY)                \
+        frag[s->fragment_start[1]].coding_method = coding_mode;               \
+    if (frag[s->fragment_start[2]].coding_method != MODE_COPY)                \
         frag[s->fragment_start[2]].coding_method = coding_mode;
 
-                if (s->chroma_y_shift) {
-                    frag = s->all_fragments + mb_y*s->fragment_width[1] + mb_x;
-                    SET_CHROMA_MODES
-                } else if (s->chroma_x_shift) {
-                    frag = s->all_fragments + 2*mb_y*s->fragment_width[1] + mb_x;
-                    for (k = 0; k < 2; k++) {
-                        SET_CHROMA_MODES
-                        frag += s->fragment_width[1];
-                    }
-                } else {
-                    for (k = 0; k < 4; k++) {
-                        frag = s->all_fragments + BLOCK_Y*s->fragment_width[1] + BLOCK_X;
+                    if (s->chroma_y_shift) {
+                        frag = s->all_fragments + mb_y *
+                               s->fragment_width[1] + mb_x;
                         SET_CHROMA_MODES
+                    } else if (s->chroma_x_shift) {
+                        frag = s->all_fragments +
+                               2 * mb_y * s->fragment_width[1] + mb_x;
+                        for (k = 0; k < 2; k++) {
+                            SET_CHROMA_MODES
+                            frag += s->fragment_width[1];
+                        }
+                    } else {
+                        for (k = 0; k < 4; k++) {
+                            frag = s->all_fragments +
+                                   BLOCK_Y * s->fragment_width[1] + BLOCK_X;
+                            SET_CHROMA_MODES
+                        }
                     }
                 }
             }
-            }
         }
     }
 
@@ -712,151 +716,152 @@ static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
             if (get_bits_left(gb) <= 0)
                 return -1;
 
-        for (j = 0; j < 4; j++) {
-            int mb_x = 2*sb_x +   (j>>1);
-            int mb_y = 2*sb_y + (((j>>1)+j)&1);
-            current_macroblock = mb_y * s->macroblock_width + mb_x;
+            for (j = 0; j < 4; j++) {
+                int mb_x = 2 * sb_x + (j >> 1);
+                int mb_y = 2 * sb_y + (((j >> 1) + j) & 1);
+                current_macroblock = mb_y * s->macroblock_width + mb_x;
 
-            if (mb_x >= s->macroblock_width || mb_y >= s->macroblock_height ||
-                (s->macroblock_coding[current_macroblock] == MODE_COPY))
-                continue;
+                if (mb_x >= s->macroblock_width  ||
+                    mb_y >= s->macroblock_height ||
+                    s->macroblock_coding[current_macroblock] == MODE_COPY)
+                    continue;
 
-            switch (s->macroblock_coding[current_macroblock]) {
+                switch (s->macroblock_coding[current_macroblock]) {
+                case MODE_INTER_PLUS_MV:
+                case MODE_GOLDEN_MV:
+                    /* all 6 fragments use the same motion vector */
+                    if (coding_mode == 0) {
+                        motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
+                        motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
+                    } else {
+                        motion_x[0] = fixed_motion_vector_table[get_bits(gb, 6)];
+                        motion_y[0] = fixed_motion_vector_table[get_bits(gb, 6)];
+                    }
 
-            case MODE_INTER_PLUS_MV:
-            case MODE_GOLDEN_MV:
-                /* all 6 fragments use the same motion vector */
-                if (coding_mode == 0) {
-                    motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
-                    motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
-                } else {
-                    motion_x[0] = fixed_motion_vector_table[get_bits(gb, 6)];
-                    motion_y[0] = fixed_motion_vector_table[get_bits(gb, 6)];
-                }
+                    /* vector maintenance, only on MODE_INTER_PLUS_MV */
+                    if (s->macroblock_coding[current_macroblock] == MODE_INTER_PLUS_MV) {
+                        prior_last_motion_x = last_motion_x;
+                        prior_last_motion_y = last_motion_y;
+                        last_motion_x       = motion_x[0];
+                        last_motion_y       = motion_y[0];
+                    }
+                    break;
 
-                /* vector maintenance, only on MODE_INTER_PLUS_MV */
-                if (s->macroblock_coding[current_macroblock] ==
-                    MODE_INTER_PLUS_MV) {
+                case MODE_INTER_FOURMV:
+                    /* vector maintenance */
                     prior_last_motion_x = last_motion_x;
                     prior_last_motion_y = last_motion_y;
-                    last_motion_x = motion_x[0];
-                    last_motion_y = motion_y[0];
-                }
-                break;
-
-            case MODE_INTER_FOURMV:
-                /* vector maintenance */
-                prior_last_motion_x = last_motion_x;
-                prior_last_motion_y = last_motion_y;
 
-                /* fetch 4 vectors from the bitstream, one for each
-                 * Y fragment, then average for the C fragment vectors */
-                for (k = 0; k < 4; k++) {
-                    current_fragment = BLOCK_Y*s->fragment_width[0] + BLOCK_X;
-                    if (s->all_fragments[current_fragment].coding_method != MODE_COPY) {
-                        if (coding_mode == 0) {
-                            motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
-                            motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
+                    /* fetch 4 vectors from the bitstream, one for each
+                     * Y fragment, then average for the C fragment vectors */
+                    for (k = 0; k < 4; k++) {
+                        current_fragment = BLOCK_Y * s->fragment_width[0] + BLOCK_X;
+                        if (s->all_fragments[current_fragment].coding_method != MODE_COPY) {
+                            if (coding_mode == 0) {
+                                motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
+                                motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)];
+                            } else {
+                                motion_x[k] = fixed_motion_vector_table[get_bits(gb, 6)];
+                                motion_y[k] = fixed_motion_vector_table[get_bits(gb, 6)];
+                            }
+                            last_motion_x = motion_x[k];
+                            last_motion_y = motion_y[k];
                         } else {
-                            motion_x[k] = fixed_motion_vector_table[get_bits(gb, 6)];
-                            motion_y[k] = fixed_motion_vector_table[get_bits(gb, 6)];
+                            motion_x[k] = 0;
+                            motion_y[k] = 0;
                         }
-                        last_motion_x = motion_x[k];
-                        last_motion_y = motion_y[k];
-                    } else {
-                        motion_x[k] = 0;
-                        motion_y[k] = 0;
                     }
-                }
-                break;
-
-            case MODE_INTER_LAST_MV:
-                /* all 6 fragments use the last motion vector */
-                motion_x[0] = last_motion_x;
-                motion_y[0] = last_motion_y;
-
-                /* no vector maintenance (last vector remains the
-                 * last vector) */
-                break;
-
-            case MODE_INTER_PRIOR_LAST:
-                /* all 6 fragments use the motion vector prior to the
-                 * last motion vector */
-                motion_x[0] = prior_last_motion_x;
-                motion_y[0] = prior_last_motion_y;
-
-                /* vector maintenance */
-                prior_last_motion_x = last_motion_x;
-                prior_last_motion_y = last_motion_y;
-                last_motion_x = motion_x[0];
-                last_motion_y = motion_y[0];
-                break;
-
-            default:
-                /* covers intra, inter without MV, golden without MV */
-                motion_x[0] = 0;
-                motion_y[0] = 0;
-
-                /* no vector maintenance */
-                break;
-            }
+                    break;
 
-            /* assign the motion vectors to the correct fragments */
-            for (k = 0; k < 4; k++) {
-                current_fragment =
-                    BLOCK_Y*s->fragment_width[0] + BLOCK_X;
-                if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) {
-                    s->motion_val[0][current_fragment][0] = motion_x[k];
-                    s->motion_val[0][current_fragment][1] = motion_y[k];
-                } else {
-                    s->motion_val[0][current_fragment][0] = motion_x[0];
-                    s->motion_val[0][current_fragment][1] = motion_y[0];
-                }
-            }
+                case MODE_INTER_LAST_MV:
+                    /* all 6 fragments use the last motion vector */
+                    motion_x[0] = last_motion_x;
+                    motion_y[0] = last_motion_y;
 
-            if (s->chroma_y_shift) {
-                if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) {
-                    motion_x[0] = RSHIFT(motion_x[0] + motion_x[1] + motion_x[2] + motion_x[3], 2);
-                    motion_y[0] = RSHIFT(motion_y[0] + motion_y[1] + motion_y[2] + motion_y[3], 2);
-                }
-                motion_x[0] = (motion_x[0]>>1) | (motion_x[0]&1);
-                motion_y[0] = (motion_y[0]>>1) | (motion_y[0]&1);
-                frag = mb_y*s->fragment_width[1] + mb_x;
-                s->motion_val[1][frag][0] = motion_x[0];
-                s->motion_val[1][frag][1] = motion_y[0];
-            } else if (s->chroma_x_shift) {
-                if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) {
-                    motion_x[0] = RSHIFT(motion_x[0] + motion_x[1], 1);
-                    motion_y[0] = RSHIFT(motion_y[0] + motion_y[1], 1);
-                    motion_x[1] = RSHIFT(motion_x[2] + motion_x[3], 1);
-                    motion_y[1] = RSHIFT(motion_y[2] + motion_y[3], 1);
-                } else {
-                    motion_x[1] = motion_x[0];
-                    motion_y[1] = motion_y[0];
-                }
-                motion_x[0] = (motion_x[0]>>1) | (motion_x[0]&1);
-                motion_x[1] = (motion_x[1]>>1) | (motion_x[1]&1);
-
-                frag = 2*mb_y*s->fragment_width[1] + mb_x;
-                for (k = 0; k < 2; k++) {
-                    s->motion_val[1][frag][0] = motion_x[k];
-                    s->motion_val[1][frag][1] = motion_y[k];
-                    frag += s->fragment_width[1];
+                    /* no vector maintenance (last vector remains the
+                     * last vector) */
+                    break;
+
+                case MODE_INTER_PRIOR_LAST:
+                    /* all 6 fragments use the motion vector prior to the
+                     * last motion vector */
+                    motion_x[0] = prior_last_motion_x;
+                    motion_y[0] = prior_last_motion_y;
+
+                    /* vector maintenance */
+                    prior_last_motion_x = last_motion_x;
+                    prior_last_motion_y = last_motion_y;
+                    last_motion_x       = motion_x[0];
+                    last_motion_y       = motion_y[0];
+                    break;
+
+                default:
+                    /* covers intra, inter without MV, golden without MV */
+                    motion_x[0] = 0;
+                    motion_y[0] = 0;
+
+                    /* no vector maintenance */
+                    break;
                 }
-            } else {
+
+                /* assign the motion vectors to the correct fragments */
                 for (k = 0; k < 4; k++) {
-                    frag = BLOCK_Y*s->fragment_width[1] + BLOCK_X;
+                    current_fragment =
+                        BLOCK_Y * s->fragment_width[0] + BLOCK_X;
+                    if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) {
+                        s->motion_val[0][current_fragment][0] = motion_x[k];
+                        s->motion_val[0][current_fragment][1] = motion_y[k];
+                    } else {
+                        s->motion_val[0][current_fragment][0] = motion_x[0];
+                        s->motion_val[0][current_fragment][1] = motion_y[0];
+                    }
+                }
+
+                if (s->chroma_y_shift) {
                     if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) {
+                        motion_x[0] = RSHIFT(motion_x[0] + motion_x[1] +
+                                             motion_x[2] + motion_x[3], 2);
+                        motion_y[0] = RSHIFT(motion_y[0] + motion_y[1] +
+                                             motion_y[2] + motion_y[3], 2);
+                    }
+                    motion_x[0] = (motion_x[0] >> 1) | (motion_x[0] & 1);
+                    motion_y[0] = (motion_y[0] >> 1) | (motion_y[0] & 1);
+                    frag = mb_y * s->fragment_width[1] + mb_x;
+                    s->motion_val[1][frag][0] = motion_x[0];
+                    s->motion_val[1][frag][1] = motion_y[0];
+                } else if (s->chroma_x_shift) {
+                    if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) {
+                        motion_x[0] = RSHIFT(motion_x[0] + motion_x[1], 1);
+                        motion_y[0] = RSHIFT(motion_y[0] + motion_y[1], 1);
+                        motion_x[1] = RSHIFT(motion_x[2] + motion_x[3], 1);
+                        motion_y[1] = RSHIFT(motion_y[2] + motion_y[3], 1);
+                    } else {
+                        motion_x[1] = motion_x[0];
+                        motion_y[1] = motion_y[0];
+                    }
+                    motion_x[0] = (motion_x[0] >> 1) | (motion_x[0] & 1);
+                    motion_x[1] = (motion_x[1] >> 1) | (motion_x[1] & 1);
+
+                    frag = 2 * mb_y * s->fragment_width[1] + mb_x;
+                    for (k = 0; k < 2; k++) {
                         s->motion_val[1][frag][0] = motion_x[k];
                         s->motion_val[1][frag][1] = motion_y[k];
-                    } else {
-                        s->motion_val[1][frag][0] = motion_x[0];
-                        s->motion_val[1][frag][1] = motion_y[0];
+                        frag += s->fragment_width[1];
+                    }
+                } else {
+                    for (k = 0; k < 4; k++) {
+                        frag = BLOCK_Y * s->fragment_width[1] + BLOCK_X;
+                        if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) {
+                            s->motion_val[1][frag][0] = motion_x[k];
+                            s->motion_val[1][frag][1] = motion_y[k];
+                        } else {
+                            s->motion_val[1][frag][0] = motion_x[0];
+                            s->motion_val[1][frag][1] = motion_y[0];
+                        }
                     }
                 }
             }
         }
-        }
     }
 
     return 0;
@@ -867,10 +872,10 @@ static int unpack_block_qpis(Vp3DecodeContext *s, GetBitContext *gb)
     int qpi, i, j, bit, run_length, blocks_decoded, num_blocks_at_qpi;
     int num_blocks = s->total_num_coded_frags;
 
-    for (qpi = 0; qpi < s->nqps-1 && num_blocks > 0; qpi++) {
+    for (qpi = 0; qpi < s->nqps - 1 && num_blocks > 0; qpi++) {
         i = blocks_decoded = num_blocks_at_qpi = 0;
 
-        bit = get_bits1(gb) ^ 1;
+        bit        = get_bits1(gb) ^ 1;
         run_length = 0;
 
         do {
@@ -917,34 +922,37 @@ static int unpack_block_qpis(Vp3DecodeContext *s, GetBitContext *gb)
  * be passed into the next call to this same function.
  */
 static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
-                        VLC *table, int coeff_index,
-                        int plane,
-                        int eob_run)
+                       VLC *table, int coeff_index,
+                       int plane,
+                       int eob_run)
 {
     int i, j = 0;
     int token;
-    int zero_run = 0;
+    int zero_run  = 0;
     int16_t coeff = 0;
     int bits_to_get;
     int blocks_ended;
     int coeff_i = 0;
-    int num_coeffs = s->num_coded_frags[plane][coeff_index];
+    int num_coeffs      = s->num_coded_frags[plane][coeff_index];
     int16_t *dct_tokens = s->dct_tokens[plane][coeff_index];
 
     /* local references to structure members to avoid repeated deferences */
-    int *coded_fragment_list = s->coded_fragment_list[plane];
+    int *coded_fragment_list   = s->coded_fragment_list[plane];
     Vp3Fragment *all_fragments = s->all_fragments;
-    VLC_TYPE (*vlc_table)[2] = table->table;
+    VLC_TYPE(*vlc_table)[2] = table->table;
 
     if (num_coeffs < 0)
-        av_log(s->avctx, AV_LOG_ERROR, "Invalid number of coefficents at level %d\n", coeff_index);
+        av_log(s->avctx, AV_LOG_ERROR,
+               "Invalid number of coefficents at level %d\n", coeff_index);
 
     if (eob_run > num_coeffs) {
-        coeff_i = blocks_ended = num_coeffs;
-        eob_run -= num_coeffs;
+        coeff_i      =
+        blocks_ended = num_coeffs;
+        eob_run     -= num_coeffs;
     } else {
-        coeff_i = blocks_ended = eob_run;
-        eob_run = 0;
+        coeff_i      =
+        blocks_ended = eob_run;
+        eob_run      = 0;
     }
 
     // insert fake EOB token to cover the split between planes or zzi
@@ -952,66 +960,66 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
         dct_tokens[j++] = blocks_ended << 2;
 
     while (coeff_i < num_coeffs && get_bits_left(gb) > 0) {
-            /* decode a VLC into a token */
-            token = get_vlc2(gb, vlc_table, 11, 3);
-            /* use the token to get a zero run, a coefficient, and an eob run */
-            if ((unsigned) token <= 6U) {
-                eob_run = eob_run_base[token];
-                if (eob_run_get_bits[token])
-                    eob_run += get_bits(gb, eob_run_get_bits[token]);
-
-                // record only the number of blocks ended in this plane,
-                // any spill will be recorded in the next plane.
-                if (eob_run > num_coeffs - coeff_i) {
-                    dct_tokens[j++] = TOKEN_EOB(num_coeffs - coeff_i);
-                    blocks_ended   += num_coeffs - coeff_i;
-                    eob_run        -= num_coeffs - coeff_i;
-                    coeff_i         = num_coeffs;
-                } else {
-                    dct_tokens[j++] = TOKEN_EOB(eob_run);
-                    blocks_ended   += eob_run;
-                    coeff_i        += eob_run;
-                    eob_run = 0;
-                }
-            } else if (token >= 0) {
-                bits_to_get = coeff_get_bits[token];
-                if (bits_to_get)
-                    bits_to_get = get_bits(gb, bits_to_get);
-                coeff = coeff_tables[token][bits_to_get];
-
-                zero_run = zero_run_base[token];
-                if (zero_run_get_bits[token])
-                    zero_run += get_bits(gb, zero_run_get_bits[token]);
-
-                if (zero_run) {
-                    dct_tokens[j++] = TOKEN_ZERO_RUN(coeff, zero_run);
-                } else {
-                    // Save DC into the fragment structure. DC prediction is
-                    // done in raster order, so the actual DC can't be in with
-                    // other tokens. We still need the token in dct_tokens[]
-                    // however, or else the structure collapses on itself.
-                    if (!coeff_index)
-                        all_fragments[coded_fragment_list[coeff_i]].dc = coeff;
-
-                    dct_tokens[j++] = TOKEN_COEFF(coeff);
-                }
-
-                if (coeff_index + zero_run > 64) {
-                    av_log(s->avctx, AV_LOG_DEBUG, "Invalid zero run of %d with"
-                           " %d coeffs left\n", zero_run, 64-coeff_index);
-                    zero_run = 64 - coeff_index;
-                }
-
-                // zero runs code multiple coefficients,
-                // so don't try to decode coeffs for those higher levels
-                for (i = coeff_index+1; i <= coeff_index+zero_run; i++)
-                    s->num_coded_frags[plane][i]--;
-                coeff_i++;
+        /* decode a VLC into a token */
+        token = get_vlc2(gb, vlc_table, 11, 3);
+        /* use the token to get a zero run, a coefficient, and an eob run */
+        if ((unsigned) token <= 6U) {
+            eob_run = eob_run_base[token];
+            if (eob_run_get_bits[token])
+                eob_run += get_bits(gb, eob_run_get_bits[token]);
+
+            // record only the number of blocks ended in this plane,
+            // any spill will be recorded in the next plane.
+            if (eob_run > num_coeffs - coeff_i) {
+                dct_tokens[j++] = TOKEN_EOB(num_coeffs - coeff_i);
+                blocks_ended   += num_coeffs - coeff_i;
+                eob_run        -= num_coeffs - coeff_i;
+                coeff_i         = num_coeffs;
             } else {
-                av_log(s->avctx, AV_LOG_ERROR,
-                       "Invalid token %d\n", token);
-                return -1;
+                dct_tokens[j++] = TOKEN_EOB(eob_run);
+                blocks_ended   += eob_run;
+                coeff_i        += eob_run;
+                eob_run         = 0;
             }
+        } else if (token >= 0) {
+            bits_to_get = coeff_get_bits[token];
+            if (bits_to_get)
+                bits_to_get = get_bits(gb, bits_to_get);
+            coeff = coeff_tables[token][bits_to_get];
+
+            zero_run = zero_run_base[token];
+            if (zero_run_get_bits[token])
+                zero_run += get_bits(gb, zero_run_get_bits[token]);
+
+            if (zero_run) {
+                dct_tokens[j++] = TOKEN_ZERO_RUN(coeff, zero_run);
+            } else {
+                // Save DC into the fragment structure. DC prediction is
+                // done in raster order, so the actual DC can't be in with
+                // other tokens. We still need the token in dct_tokens[]
+                // however, or else the structure collapses on itself.
+                if (!coeff_index)
+                    all_fragments[coded_fragment_list[coeff_i]].dc = coeff;
+
+                dct_tokens[j++] = TOKEN_COEFF(coeff);
+            }
+
+            if (coeff_index + zero_run > 64) {
+                av_log(s->avctx, AV_LOG_DEBUG,
+                       "Invalid zero run of %d with %d coeffs left\n",
+                       zero_run, 64 - coeff_index);
+                zero_run = 64 - coeff_index;
+            }
+
+            // zero runs code multiple coefficients,
+            // so don't try to decode coeffs for those higher levels
+            for (i = coeff_index + 1; i <= coeff_index + zero_run; i++)
+                s->num_coded_frags[plane][i]--;
+            coeff_i++;
+        } else {
+            av_log(s->avctx, AV_LOG_ERROR, "Invalid token %d\n", token);
+            return -1;
+        }
     }
 
     if (blocks_ended > s->num_coded_frags[plane][coeff_index])
@@ -1020,14 +1028,14 @@ static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb,
     // decrement the number of blocks that have higher coeffecients for each
     // EOB run at this level
     if (blocks_ended)
-        for (i = coeff_index+1; i < 64; i++)
+        for (i = coeff_index + 1; i < 64; i++)
             s->num_coded_frags[plane][i] -= blocks_ended;
 
     // setup the next buffer
     if (plane < 2)
-        s->dct_tokens[plane+1][coeff_index] = dct_tokens + j;
+        s->dct_tokens[plane + 1][coeff_index] = dct_tokens + j;
     else if (coeff_index < 63)
-        s->dct_tokens[0][coeff_index+1] = dct_tokens + j;
+        s->dct_tokens[0][coeff_index + 1] = dct_tokens + j;
 
     return eob_run;
 }
@@ -1059,7 +1067,7 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
 
     /* unpack the Y plane DC coefficients */
     residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_y_table], 0,
-        0, residual_eob_run);
+                                   0, residual_eob_run);
     if (residual_eob_run < 0)
         return residual_eob_run;
 
@@ -1068,21 +1076,20 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
 
     /* unpack the C plane DC coefficients */
     residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0,
-        1, residual_eob_run);
+                                   1, residual_eob_run);
     if (residual_eob_run < 0)
         return residual_eob_run;
     residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0,
-        2, residual_eob_run);
+                                   2, residual_eob_run);
     if (residual_eob_run < 0)
         return residual_eob_run;
 
     /* reverse prediction of the C-plane DC coefficients */
-    if (!(s->avctx->flags & CODEC_FLAG_GRAY))
-    {
+    if (!(s->avctx->flags & CODEC_FLAG_GRAY)) {
         reverse_dc_prediction(s, s->fragment_start[1],
-            s->fragment_width[1], s->fragment_height[1]);
+                              s->fragment_width[1], s->fragment_height[1]);
         reverse_dc_prediction(s, s->fragment_start[2],
-            s->fragment_width[1], s->fragment_height[1]);
+                              s->fragment_width[1], s->fragment_height[1]);
     }
 
     /* fetch the AC table indexes */
@@ -1109,19 +1116,19 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
 
     /* decode all AC coefficents */
     for (i = 1; i <= 63; i++) {
-            residual_eob_run = unpack_vlcs(s, gb, y_tables[i], i,
-                0, residual_eob_run);
-            if (residual_eob_run < 0)
-                return residual_eob_run;
-
-            residual_eob_run = unpack_vlcs(s, gb, c_tables[i], i,
-                1, residual_eob_run);
-            if (residual_eob_run < 0)
-                return residual_eob_run;
-            residual_eob_run = unpack_vlcs(s, gb, c_tables[i], i,
-                2, residual_eob_run);
-            if (residual_eob_run < 0)
-                return residual_eob_run;
+        residual_eob_run = unpack_vlcs(s, gb, y_tables[i], i,
+                                       0, residual_eob_run);
+        if (residual_eob_run < 0)
+            return residual_eob_run;
+
+        residual_eob_run = unpack_vlcs(s, gb, c_tables[i], i,
+                                       1, residual_eob_run);
+        if (residual_eob_run < 0)
+            return residual_eob_run;
+        residual_eob_run = unpack_vlcs(s, gb, c_tables[i], i,
+                                       2, residual_eob_run);
+        if (residual_eob_run < 0)
+            return residual_eob_run;
     }
 
     return 0;
@@ -1132,8 +1139,8 @@ static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb)
  * the frame. Much of this function is adapted directly from the original
  * VP3 source code.
  */
-#define COMPATIBLE_FRAME(x) \
-  (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type)
+#define COMPATIBLE_FRAME(x)                                                   \
+    (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type)
 #define DC_COEFF(u) s->all_fragments[u].dc
 
 static void reverse_dc_prediction(Vp3DecodeContext *s,
@@ -1141,7 +1148,6 @@ static void reverse_dc_prediction(Vp3DecodeContext *s,
                                   int fragment_width,
                                   int fragment_height)
 {
-
 #define PUL 8
 #define PU 4
 #define PUR 2
@@ -1166,22 +1172,22 @@ static void reverse_dc_prediction(Vp3DecodeContext *s,
      *   3: left multiplier
      */
     static const int predictor_transform[16][4] = {
-        {  0,  0,  0,  0},
-        {  0,  0,  0,128},        // PL
-        {  0,  0,128,  0},        // PUR
-        {  0,  0, 53, 75},        // PUR|PL
-        {  0,128,  0,  0},        // PU
-        {  0, 64,  0, 64},        // PU|PL
-        {  0,128,  0,  0},        // PU|PUR
-        {  0,  0, 53, 75},        // PU|PUR|PL
-        {128,  0,  0,  0},        // PUL
-        {  0,  0,  0,128},        // PUL|PL
-        { 64,  0, 64,  0},        // PUL|PUR
-        {  0,  0, 53, 75},        // PUL|PUR|PL
-        {  0,128,  0,  0},        // PUL|PU
-       {-104,116,  0,116},        // PUL|PU|PL
-        { 24, 80, 24,  0},        // PUL|PU|PUR
-       {-104,116,  0,116}         // PUL|PU|PUR|PL
+        {    0,   0,   0,   0 },
+        {    0,   0,   0, 128 }, // PL
+        {    0,   0, 128,   0 }, // PUR
+        {    0,   0,  53,  75 }, // PUR|PL
+        {    0, 128,   0,   0 }, // PU
+        {    0,  64,   0,  64 }, // PU |PL
+        {    0, 128,   0,   0 }, // PU |PUR
+        {    0,   0,  53,  75 }, // PU |PUR|PL
+        {  128,   0,   0,   0 }, // PUL
+        {    0,   0,   0, 128 }, // PUL|PL
+        {   64,   0,  64,   0 }, // PUL|PUR
+        {    0,   0,  53,  75 }, // PUL|PUR|PL
+        {    0, 128,   0,   0 }, // PUL|PU
+        { -104, 116,   0, 116 }, // PUL|PU |PL
+        {   24,  80,  24,   0 }, // PUL|PU |PUR
+        { -104, 116,   0, 116 }  // PUL|PU |PUR|PL
     };
 
     /* This table shows which types of blocks can use other blocks for
@@ -1208,54 +1214,55 @@ static void reverse_dc_prediction(Vp3DecodeContext *s,
 
     int transform = 0;
 
-    vul = vu = vur = vl = 0;
-    last_dc[0] = last_dc[1] = last_dc[2] = 0;
+    vul =
+    vu  =
+    vur =
+    vl  = 0;
+    last_dc[0] =
+    last_dc[1] =
+    last_dc[2] = 0;
 
     /* for each fragment row... */
     for (y = 0; y < fragment_height; y++) {
-
         /* for each fragment in a row... */
         for (x = 0; x < fragment_width; x++, i++) {
 
             /* reverse prediction if this block was coded */
             if (s->all_fragments[i].coding_method != MODE_COPY) {
-
                 current_frame_type =
                     compatible_frame[s->all_fragments[i].coding_method];
 
-                transform= 0;
-                if(x){
-                    l= i-1;
+                transform = 0;
+                if (x) {
+                    l  = i - 1;
                     vl = DC_COEFF(l);
-                    if(COMPATIBLE_FRAME(l))
+                    if (COMPATIBLE_FRAME(l))
                         transform |= PL;
                 }
-                if(y){
-                    u= i-fragment_width;
+                if (y) {
+                    u  = i - fragment_width;
                     vu = DC_COEFF(u);
-                    if(COMPATIBLE_FRAME(u))
+                    if (COMPATIBLE_FRAME(u))
                         transform |= PU;
-                    if(x){
-                        ul= i-fragment_width-1;
+                    if (x) {
+                        ul  = i - fragment_width - 1;
                         vul = DC_COEFF(ul);
-                        if(COMPATIBLE_FRAME(ul))
+                        if (COMPATIBLE_FRAME(ul))
                             transform |= PUL;
                     }
-                    if(x + 1 < fragment_width){
-                        ur= i-fragment_width+1;
+                    if (x + 1 < fragment_width) {
+                        ur  = i - fragment_width + 1;
                         vur = DC_COEFF(ur);
-                        if(COMPATIBLE_FRAME(ur))
+                        if (COMPATIBLE_FRAME(ur))
                             transform |= PUR;
                     }
                 }
 
                 if (transform == 0) {
-
                     /* if there were no fragments to predict from, use last
                      * DC saved */
                     predicted_dc = last_dc[current_frame_type];
                 } else {
-
                     /* apply the appropriate predictor transform */
                     predicted_dc =
                         (predictor_transform[transform][0] * vul) +
@@ -1286,39 +1293,39 @@ static void reverse_dc_prediction(Vp3DecodeContext *s,
     }
 }
 
-static void apply_loop_filter(Vp3DecodeContext *s, int plane, int ystart, int yend)
+static void apply_loop_filter(Vp3DecodeContext *s, int plane,
+                              int ystart, int yend)
 {
     int x, y;
-    int *bounding_values= s->bounding_values_array+127;
+    int *bounding_values = s->bounding_values_array + 127;
 
     int width           = s->fragment_width[!!plane];
     int height          = s->fragment_height[!!plane];
-    int fragment        = s->fragment_start        [plane] + ystart * width;
+    int fragment        = s->fragment_start[plane] + ystart * width;
     ptrdiff_t stride    = s->current_frame.f->linesize[plane];
-    uint8_t *plane_data = s->current_frame.f->data    [plane];
-    if (!s->flipped_image) stride = -stride;
-    plane_data += s->data_offset[plane] + 8*ystart*stride;
+    uint8_t *plane_data = s->current_frame.f->data[plane];
+    if (!s->flipped_image)
+        stride = -stride;
+    plane_data += s->data_offset[plane] + 8 * ystart * stride;
 
     for (y = ystart; y < yend; y++) {
-
         for (x = 0; x < width; x++) {
             /* This code basically just deblocks on the edges of coded blocks.
              * However, it has to be much more complicated because of the
              * braindamaged deblock ordering used in VP3/Theora. Order matters
              * because some pixels get filtered twice. */
-            if( s->all_fragments[fragment].coding_method != MODE_COPY )
-            {
+            if (s->all_fragments[fragment].coding_method != MODE_COPY) {
                 /* do not perform left edge filter for left columns frags */
                 if (x > 0) {
                     s->vp3dsp.h_loop_filter(
-                        plane_data + 8*x,
+                        plane_data + 8 * x,
                         stride, bounding_values);
                 }
 
                 /* do not perform top edge filter for top row fragments */
                 if (y > 0) {
                     s->vp3dsp.v_loop_filter(
-                        plane_data + 8*x,
+                        plane_data + 8 * x,
                         stride, bounding_values);
                 }
 
@@ -1328,7 +1335,7 @@ static void apply_loop_filter(Vp3DecodeContext *s, int plane, int ystart, int ye
                 if ((x < width - 1) &&
                     (s->all_fragments[fragment + 1].coding_method == MODE_COPY)) {
                     s->vp3dsp.h_loop_filter(
-                        plane_data + 8*x + 8,
+                        plane_data + 8 * x + 8,
                         stride, bounding_values);
                 }
 
@@ -1338,14 +1345,14 @@ static void apply_loop_filter(Vp3DecodeContext *s, int plane, int ystart, int ye
                 if ((y < height - 1) &&
                     (s->all_fragments[fragment + width].coding_method == MODE_COPY)) {
                     s->vp3dsp.v_loop_filter(
-                        plane_data + 8*x + 8*stride,
+                        plane_data + 8 * x + 8 * stride,
                         stride, bounding_values);
                 }
             }
 
             fragment++;
         }
-        plane_data += 8*stride;
+        plane_data += 8 * stride;
     }
 }
 
@@ -1364,7 +1371,7 @@ static inline int vp3_dequant(Vp3DecodeContext *s, Vp3Fragment *frag,
         int token = *s->dct_tokens[plane][i];
         switch (token & 3) {
         case 0: // EOB
-            if (--token < 4) // 0-3 are token types, so the EOB run must now be 0
+            if (--token < 4) // 0-3 are token types so the EOB run must now be 0
                 s->dct_tokens[plane][i]++;
             else
                 *s->dct_tokens[plane][i] = token & ~3;
@@ -1403,30 +1410,32 @@ static void vp3_draw_horiz_band(Vp3DecodeContext *s, int y)
     int h, cy, i;
     int offset[AV_NUM_DATA_POINTERS];
 
-    if (HAVE_THREADS && s->avctx->active_thread_type&FF_THREAD_FRAME) {
-        int y_flipped = s->flipped_image ? s->avctx->height-y : y;
+    if (HAVE_THREADS && s->avctx->active_thread_type & FF_THREAD_FRAME) {
+        int y_flipped = s->flipped_image ? s->avctx->height - y : y;
 
-        // At the end of the frame, report INT_MAX instead of the height of the frame.
-        // This makes the other threads' ff_thread_await_progress() calls cheaper, because
-        // they don't have to clip their values.
-        ff_thread_report_progress(&s->current_frame, y_flipped==s->avctx->height ? INT_MAX : y_flipped-1, 0);
+        /* At the end of the frame, report INT_MAX instead of the height of
+         * the frame. This makes the other threads' ff_thread_await_progress()
+         * calls cheaper, because they don't have to clip their values. */
+        ff_thread_report_progress(&s->current_frame,
+                                  y_flipped == s->avctx->height ? INT_MAX
+                                                                : y_flipped - 1,
+                                  0);
     }
 
-    if(s->avctx->draw_horiz_band==NULL)
+    if (s->avctx->draw_horiz_band == NULL)
         return;
 
-    h= y - s->last_slice_end;
-    s->last_slice_end= y;
+    h = y - s->last_slice_end;
+    s->last_slice_end = y;
     y -= h;
 
-    if (!s->flipped_image) {
+    if (!s->flipped_image)
         y = s->avctx->height - y - h;
-    }
 
-    cy = y >> s->chroma_y_shift;
-    offset[0] = s->current_frame.f->linesize[0]*y;
-    offset[1] = s->current_frame.f->linesize[1]*cy;
-    offset[2] = s->current_frame.f->linesize[2]*cy;
+    cy        = y >> s->chroma_y_shift;
+    offset[0] = s->current_frame.f->linesize[0] * y;
+    offset[1] = s->current_frame.f->linesize[1] * cy;
+    offset[2] = s->current_frame.f->linesize[2] * cy;
     for (i = 3; i < AV_NUM_DATA_POINTERS; i++)
         offset[i] = 0;
 
@@ -1438,11 +1447,12 @@ static void vp3_draw_horiz_band(Vp3DecodeContext *s, int y)
  * Wait for the reference frame of the current fragment.
  * The progress value is in luma pixel rows.
  */
-static void await_reference_row(Vp3DecodeContext *s, Vp3Fragment *fragment, int motion_y, int y)
+static void await_reference_row(Vp3DecodeContext *s, Vp3Fragment *fragment,
+                                int motion_y, int y)
 {
     ThreadFrame *ref_frame;
     int ref_row;
-    int border = motion_y&1;
+    int border = motion_y & 1;
 
     if (fragment->coding_method == MODE_USING_GOLDEN ||
         fragment->coding_method == MODE_GOLDEN_MV)
@@ -1450,7 +1460,7 @@ static void await_reference_row(Vp3DecodeContext *s, Vp3Fragment *fragment, int
     else
         ref_frame = &s->last_frame;
 
-    ref_row = y + (motion_y>>1);
+    ref_row = y + (motion_y >> 1);
     ref_row = FFMAX(FFABS(ref_row), ref_row + 8 + border);
 
     ff_thread_await_progress(ref_frame, ref_row, 0);
@@ -1473,38 +1483,43 @@ static void render_slice(Vp3DecodeContext *s, int slice)
         return;
 
     for (plane = 0; plane < 3; plane++) {
-        uint8_t *output_plane = s->current_frame.f->data    [plane] + s->data_offset[plane];
-        uint8_t *  last_plane = s->   last_frame.f->data    [plane] + s->data_offset[plane];
-        uint8_t *golden_plane = s-> golden_frame.f->data    [plane] + s->data_offset[plane];
-        ptrdiff_t stride      = s->current_frame.f->linesize[plane];
-        int plane_width       = s->width  >> (plane && s->chroma_x_shift);
-        int plane_height      = s->height >> (plane && s->chroma_y_shift);
-        int8_t (*motion_val)[2] = s->motion_val[!!plane];
-
-        int sb_x, sb_y        = slice << (!plane && s->chroma_y_shift);
-        int slice_height      = sb_y + 1 + (!plane && s->chroma_y_shift);
-        int slice_width       = plane ? s->c_superblock_width : s->y_superblock_width;
-
-        int fragment_width    = s->fragment_width[!!plane];
-        int fragment_height   = s->fragment_height[!!plane];
-        int fragment_start    = s->fragment_start[plane];
-        int do_await          = !plane && HAVE_THREADS && (s->avctx->active_thread_type&FF_THREAD_FRAME);
-
-        if (!s->flipped_image) stride = -stride;
+        uint8_t *output_plane = s->current_frame.f->data[plane] +
+                                s->data_offset[plane];
+        uint8_t *last_plane = s->last_frame.f->data[plane] +
+                              s->data_offset[plane];
+        uint8_t *golden_plane = s->golden_frame.f->data[plane] +
+                                s->data_offset[plane];
+        ptrdiff_t stride = s->current_frame.f->linesize[plane];
+        int plane_width  = s->width  >> (plane && s->chroma_x_shift);
+        int plane_height = s->height >> (plane && s->chroma_y_shift);
+        int8_t(*motion_val)[2] = s->motion_val[!!plane];
+
+        int sb_x, sb_y = slice << (!plane && s->chroma_y_shift);
+        int slice_height = sb_y + 1 + (!plane && s->chroma_y_shift);
+        int slice_width  = plane ? s->c_superblock_width
+                                 : s->y_superblock_width;
+
+        int fragment_width  = s->fragment_width[!!plane];
+        int fragment_height = s->fragment_height[!!plane];
+        int fragment_start  = s->fragment_start[plane];
+
+        int do_await = !plane && HAVE_THREADS &&
+                       (s->avctx->active_thread_type & FF_THREAD_FRAME);
+
+        if (!s->flipped_image)
+            stride = -stride;
         if (CONFIG_GRAY && plane && (s->avctx->flags & CODEC_FLAG_GRAY))
             continue;
 
         /* for each superblock row in the slice (both of them)... */
         for (; sb_y < slice_height; sb_y++) {
-
             /* for each superblock in a row... */
             for (sb_x = 0; sb_x < slice_width; sb_x++) {
-
                 /* for each block in a superblock... */
                 for (j = 0; j < 16; j++) {
-                    x = 4*sb_x + hilbert_offset[j][0];
-                    y = 4*sb_y + hilbert_offset[j][1];
-                    fragment = y*fragment_width + x;
+                    x        = 4 * sb_x + hilbert_offset[j][0];
+                    y        = 4 * sb_y + hilbert_offset[j][1];
+                    fragment = y * fragment_width + x;
 
                     i = fragment_start + fragment;
 
@@ -1512,119 +1527,126 @@ static void render_slice(Vp3DecodeContext *s, int slice)
                     if (x >= fragment_width || y >= fragment_height)
                         continue;
 
-                first_pixel = 8*y*stride + 8*x;
-
-                if (do_await && s->all_fragments[i].coding_method != MODE_INTRA)
-                    await_reference_row(s, &s->all_fragments[i], motion_val[fragment][1], (16*y) >> s->chroma_y_shift);
-
-                /* transform if this block was coded */
-                if (s->all_fragments[i].coding_method != MODE_COPY) {
-                    if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) ||
-                        (s->all_fragments[i].coding_method == MODE_GOLDEN_MV))
-                        motion_source= golden_plane;
-                    else
-                        motion_source= last_plane;
-
-                    motion_source += first_pixel;
-                    motion_halfpel_index = 0;
-
-                    /* sort out the motion vector if this fragment is coded
-                     * using a motion vector method */
-                    if ((s->all_fragments[i].coding_method > MODE_INTRA) &&
-                        (s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) {
-                        int src_x, src_y;
-                        motion_x = motion_val[fragment][0];
-                        motion_y = motion_val[fragment][1];
-
-                        src_x= (motion_x>>1) + 8*x;
-                        src_y= (motion_y>>1) + 8*y;
-
-                        motion_halfpel_index = motion_x & 0x01;
-                        motion_source += (motion_x >> 1);
-
-                        motion_halfpel_index |= (motion_y & 0x01) << 1;
-                        motion_source += ((motion_y >> 1) * stride);
-
-                        if(src_x<0 || src_y<0 || src_x + 9 >= plane_width || src_y + 9 >= plane_height){
-                            uint8_t *temp= s->edge_emu_buffer;
-                            if(stride<0) temp -= 8*stride;
-
-                            s->vdsp.emulated_edge_mc(temp, motion_source,
-                                                     stride, stride,
-                                                     9, 9, src_x, src_y,
-                                                     plane_width,
-                                                     plane_height);
-                            motion_source= temp;
+                    first_pixel = 8 * y * stride + 8 * x;
+
+                    if (do_await &&
+                        s->all_fragments[i].coding_method != MODE_INTRA)
+                        await_reference_row(s, &s->all_fragments[i],
+                                            motion_val[fragment][1],
+                                            (16 * y) >> s->chroma_y_shift);
+
+                    /* transform if this block was coded */
+                    if (s->all_fragments[i].coding_method != MODE_COPY) {
+                        if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) ||
+                            (s->all_fragments[i].coding_method == MODE_GOLDEN_MV))
+                            motion_source = golden_plane;
+                        else
+                            motion_source = last_plane;
+
+                        motion_source       += first_pixel;
+                        motion_halfpel_index = 0;
+
+                        /* sort out the motion vector if this fragment is coded
+                         * using a motion vector method */
+                        if ((s->all_fragments[i].coding_method > MODE_INTRA) &&
+                            (s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) {
+                            int src_x, src_y;
+                            motion_x = motion_val[fragment][0];
+                            motion_y = motion_val[fragment][1];
+
+                            src_x = (motion_x >> 1) + 8 * x;
+                            src_y = (motion_y >> 1) + 8 * y;
+
+                            motion_halfpel_index = motion_x & 0x01;
+                            motion_source       += (motion_x >> 1);
+
+                            motion_halfpel_index |= (motion_y & 0x01) << 1;
+                            motion_source        += ((motion_y >> 1) * stride);
+
+                            if (src_x < 0 || src_y < 0 ||
+                                src_x + 9 >= plane_width ||
+                                src_y + 9 >= plane_height) {
+                                uint8_t *temp = s->edge_emu_buffer;
+                                if (stride < 0)
+                                    temp -= 8 * stride;
+
+                                s->vdsp.emulated_edge_mc(temp, motion_source,
+                                                         stride, stride,
+                                                         9, 9, src_x, src_y,
+                                                         plane_width,
+                                                         plane_height);
+                                motion_source = temp;
+                            }
                         }
-                    }
 
-
-                    /* first, take care of copying a block from either the
-                     * previous or the golden frame */
-                    if (s->all_fragments[i].coding_method != MODE_INTRA) {
-                        /* Note, it is possible to implement all MC cases with
-                           put_no_rnd_pixels_l2 which would look more like the
-                           VP3 source but this would be slower as
-                           put_no_rnd_pixels_tab is better optimzed */
-                        if(motion_halfpel_index != 3){
-                            s->hdsp.put_no_rnd_pixels_tab[1][motion_halfpel_index](
-                                output_plane + first_pixel,
-                                motion_source, stride, 8);
-                        }else{
-                            int d= (motion_x ^ motion_y)>>31; // d is 0 if motion_x and _y have the same sign, else -1
-                            s->vp3dsp.put_no_rnd_pixels_l2(
-                                output_plane + first_pixel,
-                                motion_source - d,
-                                motion_source + stride + 1 + d,
-                                stride, 8);
+                        /* first, take care of copying a block from either the
+                         * previous or the golden frame */
+                        if (s->all_fragments[i].coding_method != MODE_INTRA) {
+                            /* Note, it is possible to implement all MC cases
+                             * with put_no_rnd_pixels_l2 which would look more
+                             * like the VP3 source but this would be slower as
+                             * put_no_rnd_pixels_tab is better optimzed */
+                            if (motion_halfpel_index != 3) {
+                                s->hdsp.put_no_rnd_pixels_tab[1][motion_halfpel_index](
+                                    output_plane + first_pixel,
+                                    motion_source, stride, 8);
+                            } else {
+                                /* d is 0 if motion_x and _y have the same sign,
+                                 * else -1 */
+                                int d = (motion_x ^ motion_y) >> 31;
+                                s->vp3dsp.put_no_rnd_pixels_l2(output_plane + first_pixel,
+                                                               motion_source - d,
+                                                               motion_source + stride + 1 + d,
+                                                               stride, 8);
+                            }
                         }
-                    }
 
-                    /* invert DCT and place (or add) in final output */
+                        /* invert DCT and place (or add) in final output */
 
-                    if (s->all_fragments[i].coding_method == MODE_INTRA) {
-                        vp3_dequant(s, s->all_fragments + i, plane, 0, block);
-                        s->vp3dsp.idct_put(
-                            output_plane + first_pixel,
-                            stride,
-                            block);
-                    } else {
-                        if (vp3_dequant(s, s->all_fragments + i, plane, 1, block)) {
-                        s->vp3dsp.idct_add(
-                            output_plane + first_pixel,
-                            stride,
-                            block);
+                        if (s->all_fragments[i].coding_method == MODE_INTRA) {
+                            vp3_dequant(s, s->all_fragments + i,
+                                        plane, 0, block);
+                            s->vp3dsp.idct_put(output_plane + first_pixel,
+                                               stride,
+                                               block);
                         } else {
-                            s->vp3dsp.idct_dc_add(output_plane + first_pixel, stride, block);
+                            if (vp3_dequant(s, s->all_fragments + i,
+                                            plane, 1, block)) {
+                                s->vp3dsp.idct_add(output_plane + first_pixel,
+                                                   stride,
+                                                   block);
+                            } else {
+                                s->vp3dsp.idct_dc_add(output_plane + first_pixel,
+                                                      stride, block);
+                            }
                         }
+                    } else {
+                        /* copy directly from the previous frame */
+                        s->hdsp.put_pixels_tab[1][0](
+                            output_plane + first_pixel,
+                            last_plane + first_pixel,
+                            stride, 8);
                     }
-                } else {
-
-                    /* copy directly from the previous frame */
-                    s->hdsp.put_pixels_tab[1][0](
-                        output_plane + first_pixel,
-                        last_plane + first_pixel,
-                        stride, 8);
-
-                }
                 }
             }
 
             // Filter up to the last row in the superblock row
             if (!s->skip_loop_filter)
-                apply_loop_filter(s, plane, 4*sb_y - !!sb_y, FFMIN(4*sb_y+3, fragment_height-1));
+                apply_loop_filter(s, plane, 4 * sb_y - !!sb_y,
+                                  FFMIN(4 * sb_y + 3, fragment_height - 1));
         }
     }
 
-     /* this looks like a good place for slice dispatch... */
-     /* algorithm:
-      *   if (slice == s->macroblock_height - 1)
-      *     dispatch (both last slice & 2nd-to-last slice);
-      *   else if (slice > 0)
-      *     dispatch (slice - 1);
-      */
+    /* this looks like a good place for slice dispatch... */
+    /* algorithm:
+     *   if (slice == s->macroblock_height - 1)
+     *     dispatch (both last slice & 2nd-to-last slice);
+     *   else if (slice > 0)
+     *     dispatch (slice - 1);
+     */
 
-    vp3_draw_horiz_band(s, FFMIN((32 << s->chroma_y_shift) * (slice + 1) -16, s->height-16));
+    vp3_draw_horiz_band(s, FFMIN((32 << s->chroma_y_shift) * (slice + 1) - 16,
+                                 s->height - 16));
 }
 
 /// Allocate tables for per-frame data in Vp3DecodeContext
@@ -1637,19 +1659,23 @@ static av_cold int allocate_tables(AVCodecContext *avctx)
     c_fragment_count = s->fragment_width[1] * s->fragment_height[1];
 
     s->superblock_coding = av_mallocz(s->superblock_count);
-    s->all_fragments = av_mallocz(s->fragment_count * sizeof(Vp3Fragment));
+    s->all_fragments     = av_mallocz(s->fragment_count * sizeof(Vp3Fragment));
+
     s->coded_fragment_list[0] = av_mallocz(s->fragment_count * sizeof(int));
-    s->dct_tokens_base = av_mallocz(64*s->fragment_count * sizeof(*s->dct_tokens_base));
+
+    s->dct_tokens_base = av_mallocz(64 * s->fragment_count *
+                                    sizeof(*s->dct_tokens_base));
     s->motion_val[0] = av_mallocz(y_fragment_count * sizeof(*s->motion_val[0]));
     s->motion_val[1] = av_mallocz(c_fragment_count * sizeof(*s->motion_val[1]));
 
     /* work out the block mapping tables */
     s->superblock_fragments = av_mallocz(s->superblock_count * 16 * sizeof(int));
-    s->macroblock_coding = av_mallocz(s->macroblock_count + 1);
+    s->macroblock_coding    = av_mallocz(s->macroblock_count + 1);
 
-    if (!s->superblock_coding || !s->all_fragments || !s->dct_tokens_base ||
-        !s->coded_fragment_list[0] || !s->superblock_fragments || !s->macroblock_coding ||
-        !s->motion_val[0] || !s->motion_val[1]) {
+    if (!s->superblock_coding    || !s->all_fragments          ||
+        !s->dct_tokens_base      || !s->coded_fragment_list[0] ||
+        !s->superblock_fragments || !s->macroblock_coding      ||
+        !s->motion_val[0]        || !s->motion_val[1]) {
         vp3_decode_end(avctx);
         return -1;
     }
@@ -1689,13 +1715,13 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx)
 
     avctx->internal->allocate_progress = 1;
 
-    if (avctx->codec_tag == MKTAG('V','P','3','0'))
+    if (avctx->codec_tag == MKTAG('V', 'P', '3', '0'))
         s->version = 0;
     else
         s->version = 1;
 
-    s->avctx = avctx;
-    s->width = FFALIGN(avctx->width, 16);
+    s->avctx  = avctx;
+    s->width  = FFALIGN(avctx->width, 16);
     s->height = FFALIGN(avctx->height, 16);
     if (avctx->codec_id != AV_CODEC_ID_THEORA)
         avctx->pix_fmt = AV_PIX_FMT_YUV420P;
@@ -1718,135 +1744,132 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx)
 
     avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift, &s->chroma_y_shift);
 
-    s->y_superblock_width = (s->width + 31) / 32;
+    s->y_superblock_width  = (s->width  + 31) / 32;
     s->y_superblock_height = (s->height + 31) / 32;
-    s->y_superblock_count = s->y_superblock_width * s->y_superblock_height;
+    s->y_superblock_count  = s->y_superblock_width * s->y_superblock_height;
 
     /* work out the dimensions for the C planes */
-    c_width = s->width >> s->chroma_x_shift;
-    c_height = s->height >> s->chroma_y_shift;
-    s->c_superblock_width = (c_width + 31) / 32;
+    c_width                = s->width >> s->chroma_x_shift;
+    c_height               = s->height >> s->chroma_y_shift;
+    s->c_superblock_width  = (c_width  + 31) / 32;
     s->c_superblock_height = (c_height + 31) / 32;
-    s->c_superblock_count = s->c_superblock_width * s->c_superblock_height;
+    s->c_superblock_count  = s->c_superblock_width * s->c_superblock_height;
 
-    s->superblock_count = s->y_superblock_count + (s->c_superblock_count * 2);
+    s->superblock_count   = s->y_superblock_count + (s->c_superblock_count * 2);
     s->u_superblock_start = s->y_superblock_count;
     s->v_superblock_start = s->u_superblock_start + s->c_superblock_count;
 
-    s->macroblock_width = (s->width + 15) / 16;
+    s->macroblock_width  = (s->width  + 15) / 16;
     s->macroblock_height = (s->height + 15) / 16;
-    s->macroblock_count = s->macroblock_width * s->macroblock_height;
+    s->macroblock_count  = s->macroblock_width * s->macroblock_height;
 
-    s->fragment_width[0] = s->width / FRAGMENT_PIXELS;
+    s->fragment_width[0]  = s->width / FRAGMENT_PIXELS;
     s->fragment_height[0] = s->height / FRAGMENT_PIXELS;
-    s->fragment_width[1]  = s->fragment_width[0]  >> s->chroma_x_shift;
+    s->fragment_width[1]  = s->fragment_width[0] >> s->chroma_x_shift;
     s->fragment_height[1] = s->fragment_height[0] >> s->chroma_y_shift;
 
     /* fragment count covers all 8x8 blocks for all 3 planes */
     y_fragment_count     = s->fragment_width[0] * s->fragment_height[0];
     c_fragment_count     = s->fragment_width[1] * s->fragment_height[1];
-    s->fragment_count    = y_fragment_count + 2*c_fragment_count;
+    s->fragment_count    = y_fragment_count + 2 * c_fragment_count;
     s->fragment_start[1] = y_fragment_count;
     s->fragment_start[2] = y_fragment_count + c_fragment_count;
 
-    if (!s->theora_tables)
-    {
+    if (!s->theora_tables) {
         for (i = 0; i < 64; i++) {
             s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i];
             s->coded_ac_scale_factor[i] = vp31_ac_scale_factor[i];
-            s->base_matrix[0][i] = vp31_intra_y_dequant[i];
-            s->base_matrix[1][i] = vp31_intra_c_dequant[i];
-            s->base_matrix[2][i] = vp31_inter_dequant[i];
-            s->filter_limit_values[i] = vp31_filter_limit_values[i];
+            s->base_matrix[0][i]        = vp31_intra_y_dequant[i];
+            s->base_matrix[1][i]        = vp31_intra_c_dequant[i];
+            s->base_matrix[2][i]        = vp31_inter_dequant[i];
+            s->filter_limit_values[i]   = vp31_filter_limit_values[i];
         }
 
-        for(inter=0; inter<2; inter++){
-            for(plane=0; plane<3; plane++){
-                s->qr_count[inter][plane]= 1;
-                s->qr_size [inter][plane][0]= 63;
-                s->qr_base [inter][plane][0]=
-                s->qr_base [inter][plane][1]= 2*inter + (!!plane)*!inter;
+        for (inter = 0; inter < 2; inter++) {
+            for (plane = 0; plane < 3; plane++) {
+                s->qr_count[inter][plane]   = 1;
+                s->qr_size[inter][plane][0] = 63;
+                s->qr_base[inter][plane][0] =
+                s->qr_base[inter][plane][1] = 2 * inter + (!!plane) * !inter;
             }
         }
 
         /* init VLC tables */
         for (i = 0; i < 16; i++) {
-
             /* DC histograms */
             init_vlc(&s->dc_vlc[i], 11, 32,
-                &dc_bias[i][0][1], 4, 2,
-                &dc_bias[i][0][0], 4, 2, 0);
+                     &dc_bias[i][0][1], 4, 2,
+                     &dc_bias[i][0][0], 4, 2, 0);
 
             /* group 1 AC histograms */
             init_vlc(&s->ac_vlc_1[i], 11, 32,
-                &ac_bias_0[i][0][1], 4, 2,
-                &ac_bias_0[i][0][0], 4, 2, 0);
+                     &ac_bias_0[i][0][1], 4, 2,
+                     &ac_bias_0[i][0][0], 4, 2, 0);
 
             /* group 2 AC histograms */
             init_vlc(&s->ac_vlc_2[i], 11, 32,
-                &ac_bias_1[i][0][1], 4, 2,
-                &ac_bias_1[i][0][0], 4, 2, 0);
+                     &ac_bias_1[i][0][1], 4, 2,
+                     &ac_bias_1[i][0][0], 4, 2, 0);
 
             /* group 3 AC histograms */
             init_vlc(&s->ac_vlc_3[i], 11, 32,
-                &ac_bias_2[i][0][1], 4, 2,
-                &ac_bias_2[i][0][0], 4, 2, 0);
+                     &ac_bias_2[i][0][1], 4, 2,
+                     &ac_bias_2[i][0][0], 4, 2, 0);
 
             /* group 4 AC histograms */
             init_vlc(&s->ac_vlc_4[i], 11, 32,
-                &ac_bias_3[i][0][1], 4, 2,
-                &ac_bias_3[i][0][0], 4, 2, 0);
+                     &ac_bias_3[i][0][1], 4, 2,
+                     &ac_bias_3[i][0][0], 4, 2, 0);
         }
     } else {
-
         for (i = 0; i < 16; i++) {
             /* DC histograms */
             if (init_vlc(&s->dc_vlc[i], 11, 32,
-                &s->huffman_table[i][0][1], 8, 4,
-                &s->huffman_table[i][0][0], 8, 4, 0) < 0)
+                         &s->huffman_table[i][0][1], 8, 4,
+                         &s->huffman_table[i][0][0], 8, 4, 0) < 0)
                 goto vlc_fail;
 
             /* group 1 AC histograms */
             if (init_vlc(&s->ac_vlc_1[i], 11, 32,
-                &s->huffman_table[i+16][0][1], 8, 4,
-                &s->huffman_table[i+16][0][0], 8, 4, 0) < 0)
+                         &s->huffman_table[i + 16][0][1], 8, 4,
+                         &s->huffman_table[i + 16][0][0], 8, 4, 0) < 0)
                 goto vlc_fail;
 
             /* group 2 AC histograms */
             if (init_vlc(&s->ac_vlc_2[i], 11, 32,
-                &s->huffman_table[i+16*2][0][1], 8, 4,
-                &s->huffman_table[i+16*2][0][0], 8, 4, 0) < 0)
+                         &s->huffman_table[i + 16 * 2][0][1], 8, 4,
+                         &s->huffman_table[i + 16 * 2][0][0], 8, 4, 0) < 0)
                 goto vlc_fail;
 
             /* group 3 AC histograms */
             if (init_vlc(&s->ac_vlc_3[i], 11, 32,
-                &s->huffman_table[i+16*3][0][1], 8, 4,
-                &s->huffman_table[i+16*3][0][0], 8, 4, 0) < 0)
+                         &s->huffman_table[i + 16 * 3][0][1], 8, 4,
+                         &s->huffman_table[i + 16 * 3][0][0], 8, 4, 0) < 0)
                 goto vlc_fail;
 
             /* group 4 AC histograms */
             if (init_vlc(&s->ac_vlc_4[i], 11, 32,
-                &s->huffman_table[i+16*4][0][1], 8, 4,
-                &s->huffman_table[i+16*4][0][0], 8, 4, 0) < 0)
+                         &s->huffman_table[i + 16 * 4][0][1], 8, 4,
+                         &s->huffman_table[i + 16 * 4][0][0], 8, 4, 0) < 0)
                 goto vlc_fail;
         }
     }
 
     init_vlc(&s->superblock_run_length_vlc, 6, 34,
-        &superblock_run_length_vlc_table[0][1], 4, 2,
-        &superblock_run_length_vlc_table[0][0], 4, 2, 0);
+             &superblock_run_length_vlc_table[0][1], 4, 2,
+             &superblock_run_length_vlc_table[0][0], 4, 2, 0);
 
     init_vlc(&s->fragment_run_length_vlc, 5, 30,
-        &fragment_run_length_vlc_table[0][1], 4, 2,
-        &fragment_run_length_vlc_table[0][0], 4, 2, 0);
+             &fragment_run_length_vlc_table[0][1], 4, 2,
+             &fragment_run_length_vlc_table[0][0], 4, 2, 0);
 
     init_vlc(&s->mode_code_vlc, 3, 8,
-        &mode_code_vlc_table[0][1], 2, 1,
-        &mode_code_vlc_table[0][0], 2, 1, 0);
+             &mode_code_vlc_table[0][1], 2, 1,
+             &mode_code_vlc_table[0][0], 2, 1, 0);
 
     init_vlc(&s->motion_vector_vlc, 6, 63,
-        &motion_vector_vlc_table[0][1], 2, 1,
-        &motion_vector_vlc_table[0][0], 2, 1, 0);
+             &motion_vector_vlc_table[0][1], 2, 1,
+             &motion_vector_vlc_table[0][0], 2, 1, 0);
 
     return allocate_tables(avctx);
 
@@ -1861,7 +1884,6 @@ static int update_frames(AVCodecContext *avctx)
     Vp3DecodeContext *s = avctx->priv_data;
     int ret = 0;
 
-
     /* shuffle frames (last = current) */
     ff_thread_release_buffer(avctx, &s->last_frame);
     ret = ff_thread_ref_frame(&s->last_frame, &s->current_frame);
@@ -1901,11 +1923,12 @@ static int vp3_update_thread_context(AVCodecContext *dst, const AVCodecContext *
     Vp3DecodeContext *s = dst->priv_data, *s1 = src->priv_data;
     int qps_changed = 0, i, err;
 
-#define copy_fields(to, from, start_field, end_field) memcpy(&to->start_field, &from->start_field, (char*)&to->end_field - (char*)&to->start_field)
+#define copy_fields(to, from, start_field, end_field)                         \
+    memcpy(&to->start_field, &from->start_field,                              \
+           (char *) &to->end_field - (char *) &to->start_field)
 
-    if (!s1->current_frame.f->data[0]
-        ||s->width != s1->width
-        ||s->height!= s1->height) {
+    if (!s1->current_frame.f->data[0] ||
+        s->width != s1->width || s->height != s1->height) {
         if (s != s1)
             ref_frames(s, s1);
         return -1;
@@ -1921,8 +1944,10 @@ static int vp3_update_thread_context(AVCodecContext *dst, const AVCodecContext *
                 return err;
             y_fragment_count = s->fragment_width[0] * s->fragment_height[0];
             c_fragment_count = s->fragment_width[1] * s->fragment_height[1];
-            memcpy(s->motion_val[0], s1->motion_val[0], y_fragment_count * sizeof(*s->motion_val[0]));
-            memcpy(s->motion_val[1], s1->motion_val[1], c_fragment_count * sizeof(*s->motion_val[1]));
+            memcpy(s->motion_val[0], s1->motion_val[0],
+                   y_fragment_count * sizeof(*s->motion_val[0]));
+            memcpy(s->motion_val[1], s1->motion_val[1],
+                   c_fragment_count * sizeof(*s->motion_val[1]));
         }
 
         // copy previous frame data
@@ -1940,7 +1965,8 @@ static int vp3_update_thread_context(AVCodecContext *dst, const AVCodecContext *
         }
 
         if (s->qps[0] != s1->qps[0])
-            memcpy(&s->bounding_values_array, &s1->bounding_values_array, sizeof(s->bounding_values_array));
+            memcpy(&s->bounding_values_array, &s1->bounding_values_array,
+                   sizeof(s->bounding_values_array));
 
         if (qps_changed)
             copy_fields(s, s1, qps, superblock_count);
@@ -1954,8 +1980,8 @@ static int vp3_decode_frame(AVCodecContext *avctx,
                             void *data, int *got_frame,
                             AVPacket *avpkt)
 {
-    const uint8_t *buf = avpkt->data;
-    int buf_size = avpkt->size;
+    const uint8_t *buf  = avpkt->data;
+    int buf_size        = avpkt->size;
     Vp3DecodeContext *s = avctx->priv_data;
     GetBitContext gb;
     int i, ret;
@@ -1963,8 +1989,7 @@ static int vp3_decode_frame(AVCodecContext *avctx,
     init_get_bits(&gb, buf, buf_size * 8);
 
 #if CONFIG_THEORA_DECODER
-    if (s->theora && get_bits1(&gb))
-    {
+    if (s->theora && get_bits1(&gb)) {
         int type = get_bits(&gb, 7);
         skip_bits_long(&gb, 6*8); /* "theora" */
 
@@ -1990,7 +2015,8 @@ static int vp3_decode_frame(AVCodecContext *avctx,
             return ret;
         }
 
-        av_log(avctx, AV_LOG_ERROR, "Header packet passed to frame decoder, skipping\n");
+        av_log(avctx, AV_LOG_ERROR,
+               "Header packet passed to frame decoder, skipping\n");
         return -1;
     }
 #endif
@@ -2005,19 +2031,20 @@ static int vp3_decode_frame(AVCodecContext *avctx,
     for (i = 0; i < 3; i++)
         s->last_qps[i] = s->qps[i];
 
-    s->nqps=0;
-    do{
-        s->qps[s->nqps++]= get_bits(&gb, 6);
-    } while(s->theora >= 0x030200 && s->nqps<3 && get_bits1(&gb));
+    s->nqps = 0;
+    do {
+        s->qps[s->nqps++] = get_bits(&gb, 6);
+    } while (s->theora >= 0x030200 && s->nqps < 3 && get_bits1(&gb));
     for (i = s->nqps; i < 3; i++)
         s->qps[i] = -1;
 
     if (s->avctx->debug & FF_DEBUG_PICT_INFO)
         av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n",
-            s->keyframe?"key":"", avctx->frame_number+1, s->qps[0]);
+               s->keyframe ? "key" : "", avctx->frame_number + 1, s->qps[0]);
 
     s->skip_loop_filter = !s->filter_limit_values[s->qps[0]] ||
-        avctx->skip_loop_filter >= (s->keyframe ? AVDISCARD_ALL : AVDISCARD_NONKEY);
+                          avctx->skip_loop_filter >= (s->keyframe ? AVDISCARD_ALL
+                                                                  : AVDISCARD_NONKEY);
 
     if (s->qps[0] != s->last_qps[0])
         init_loop_filter(s);
@@ -2031,41 +2058,44 @@ static int vp3_decode_frame(AVCodecContext *avctx,
     if (avctx->skip_frame >= AVDISCARD_NONKEY && !s->keyframe)
         return buf_size;
 
-    s->current_frame.f->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
+    s->current_frame.f->pict_type = s->keyframe ? AV_PICTURE_TYPE_I
+                                                : AV_PICTURE_TYPE_P;
     s->current_frame.f->key_frame = s->keyframe;
     if (ff_thread_get_buffer(avctx, &s->current_frame, AV_GET_BUFFER_FLAG_REF) < 0)
         goto error;
 
     if (!s->edge_emu_buffer)
-        s->edge_emu_buffer = av_malloc(9*FFABS(s->current_frame.f->linesize[0]));
+        s->edge_emu_buffer = av_malloc(9 * FFABS(s->current_frame.f->linesize[0]));
 
     if (s->keyframe) {
-        if (!s->theora)
-        {
+        if (!s->theora) {
             skip_bits(&gb, 4); /* width code */
             skip_bits(&gb, 4); /* height code */
-            if (s->version)
-            {
+            if (s->version) {
                 s->version = get_bits(&gb, 5);
                 if (avctx->frame_number == 0)
-                    av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version);
+                    av_log(s->avctx, AV_LOG_DEBUG,
+                           "VP version: %d\n", s->version);
             }
         }
-        if (s->version || s->theora)
-        {
-                if (get_bits1(&gb))
-                    av_log(s->avctx, AV_LOG_ERROR, "Warning, unsupported keyframe coding type?!\n");
+        if (s->version || s->theora) {
+            if (get_bits1(&gb))
+                av_log(s->avctx, AV_LOG_ERROR,
+                       "Warning, unsupported keyframe coding type?!\n");
             skip_bits(&gb, 2); /* reserved? */
         }
     } else {
         if (!s->golden_frame.f->data[0]) {
-            av_log(s->avctx, AV_LOG_WARNING, "vp3: first frame not a keyframe\n");
+            av_log(s->avctx, AV_LOG_WARNING,
+                   "vp3: first frame not a keyframe\n");
 
             s->golden_frame.f->pict_type = AV_PICTURE_TYPE_I;
-            if (ff_thread_get_buffer(avctx, &s->golden_frame, AV_GET_BUFFER_FLAG_REF) < 0)
+            if (ff_thread_get_buffer(avctx, &s->golden_frame,
+                                     AV_GET_BUFFER_FLAG_REF) < 0)
                 goto error;
             ff_thread_release_buffer(avctx, &s->last_frame);
-            if ((ret = ff_thread_ref_frame(&s->last_frame, &s->golden_frame)) < 0)
+            if ((ret = ff_thread_ref_frame(&s->last_frame,
+                                           &s->golden_frame)) < 0)
                 goto error;
             ff_thread_report_progress(&s->last_frame, INT_MAX, 0);
         }
@@ -2074,23 +2104,23 @@ static int vp3_decode_frame(AVCodecContext *avctx,
     memset(s->all_fragments, 0, s->fragment_count * sizeof(Vp3Fragment));
     ff_thread_finish_setup(avctx);
 
-    if (unpack_superblocks(s, &gb)){
+    if (unpack_superblocks(s, &gb)) {
         av_log(s->avctx, AV_LOG_ERROR, "error in unpack_superblocks\n");
         goto error;
     }
-    if (unpack_modes(s, &gb)){
+    if (unpack_modes(s, &gb)) {
         av_log(s->avctx, AV_LOG_ERROR, "error in unpack_modes\n");
         goto error;
     }
-    if (unpack_vectors(s, &gb)){
+    if (unpack_vectors(s, &gb)) {
         av_log(s->avctx, AV_LOG_ERROR, "error in unpack_vectors\n");
         goto error;
     }
-    if (unpack_block_qpis(s, &gb)){
+    if (unpack_block_qpis(s, &gb)) {
         av_log(s->avctx, AV_LOG_ERROR, "error in unpack_block_qpis\n");
         goto error;
     }
-    if (unpack_dct_coeffs(s, &gb)){
+    if (unpack_dct_coeffs(s, &gb)) {
         av_log(s->avctx, AV_LOG_ERROR, "error in unpack_dct_coeffs\n");
         goto error;
     }
@@ -2100,7 +2130,7 @@ static int vp3_decode_frame(AVCodecContext *avctx,
         if (s->flipped_image)
             s->data_offset[i] = 0;
         else
-            s->data_offset[i] = (height-1) * s->current_frame.f->linesize[i];
+            s->data_offset[i] = (height - 1) * s->current_frame.f->linesize[i];
     }
 
     s->last_slice_end = 0;
@@ -2109,8 +2139,8 @@ static int vp3_decode_frame(AVCodecContext *avctx,
 
     // filter the last row
     for (i = 0; i < 3; i++) {
-        int row = (s->height >> (3+(i && s->chroma_y_shift))) - 1;
-        apply_loop_filter(s, i, row, row+1);
+        int row = (s->height >> (3 + (i && s->chroma_y_shift))) - 1;
+        apply_loop_filter(s, i, row, row + 1);
     }
     vp3_draw_horiz_band(s, s->avctx->height);
 
@@ -2118,7 +2148,7 @@ static int vp3_decode_frame(AVCodecContext *avctx,
         return ret;
     *got_frame = 1;
 
-    if (!HAVE_THREADS || !(s->avctx->active_thread_type&FF_THREAD_FRAME)) {
+    if (!HAVE_THREADS || !(s->avctx->active_thread_type & FF_THREAD_FRAME)) {
         ret = update_frames(avctx);
         if (ret < 0)
             return ret;
@@ -2129,7 +2159,7 @@ static int vp3_decode_frame(AVCodecContext *avctx,
 error:
     ff_thread_report_progress(&s->current_frame, INT_MAX, 0);
 
-    if (!HAVE_THREADS || !(s->avctx->active_thread_type&FF_THREAD_FRAME))
+    if (!HAVE_THREADS || !(s->avctx->active_thread_type & FF_THREAD_FRAME))
         av_frame_unref(s->current_frame.f);
 
     return -1;
@@ -2151,9 +2181,8 @@ static int read_huffman_tree(AVCodecContext *avctx, GetBitContext *gb)
         s->huffman_table[s->hti][token][0] = s->hbits;
         s->huffman_table[s->hti][token][1] = s->huff_code_size;
         s->entries++;
-    }
-    else {
-        if (s->huff_code_size >= 32) {/* overflow */
+    } else {
+        if (s->huff_code_size >= 32) { /* overflow */
             av_log(avctx, AV_LOG_ERROR, "huffman tree overflow\n");
             return -1;
         }
@@ -2203,16 +2232,18 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
     s->theora = get_bits_long(gb, 24);
     av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora);
 
-    /* 3.2.0 aka alpha3 has the same frame orientation as original vp3 */
-    /* but previous versions have the image flipped relative to vp3 */
-    if (s->theora < 0x030200)
-    {
+    /* 3.2.0 aka alpha3 has the same frame orientation as original vp3
+     * but previous versions have the image flipped relative to vp3 */
+    if (s->theora < 0x030200) {
         s->flipped_image = 1;
-        av_log(avctx, AV_LOG_DEBUG, "Old (<alpha3) Theora bitstream, flipped image\n");
+        av_log(avctx, AV_LOG_DEBUG,
+               "Old (<alpha3) Theora bitstream, flipped image\n");
     }
 
-    visible_width  = s->width  = get_bits(gb, 16) << 4;
-    visible_height = s->height = get_bits(gb, 16) << 4;
+    visible_width  =
+    s->width       = get_bits(gb, 16) << 4;
+    visible_height =
+    s->height      = get_bits(gb, 16) << 4;
 
     if (s->theora >= 0x030200) {
         visible_width  = get_bits_long(gb, 24);
@@ -2230,7 +2261,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
             return AVERROR_INVALIDDATA;
         }
         av_reduce(&avctx->time_base.num, &avctx->time_base.den,
-                  fps.den, fps.num, 1<<30);
+                  fps.den, fps.num, 1 << 30);
     }
 
     aspect.num = get_bits_long(gb, 24);
@@ -2238,7 +2269,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
     if (aspect.num && aspect.den) {
         av_reduce(&avctx->sample_aspect_ratio.num,
                   &avctx->sample_aspect_ratio.den,
-                  aspect.num, aspect.den, 1<<30);
+                  aspect.num, aspect.den, 1 << 30);
     }
 
     if (s->theora < 0x030200)
@@ -2248,8 +2279,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
 
     skip_bits(gb, 6); /* quality hint */
 
-    if (s->theora >= 0x030200)
-    {
+    if (s->theora >= 0x030200) {
         skip_bits(gb, 5); /* keyframe frequency force */
         avctx->pix_fmt = theora_pix_fmts[get_bits(gb, 2)];
         if (avctx->pix_fmt == AV_PIX_FMT_NONE) {
@@ -2261,20 +2291,20 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
 
 //    align_get_bits(gb);
 
-    if (   visible_width  <= s->width  && visible_width  > s->width-16
-        && visible_height <= s->height && visible_height > s->height-16
-        && !offset_x && (offset_y == s->height - visible_height))
+    if (visible_width  <= s->width  && visible_width  > s->width  - 16 &&
+        visible_height <= s->height && visible_height > s->height - 16 &&
+        !offset_x && (offset_y == s->height - visible_height))
         ret = ff_set_dimensions(avctx, visible_width, visible_height);
     else
         ret = ff_set_dimensions(avctx, s->width, s->height);
     if (ret < 0)
         return ret;
 
-    if (colorspace == 1) {
+    if (colorspace == 1)
         avctx->color_primaries = AVCOL_PRI_BT470M;
-    } else if (colorspace == 2) {
+    else if (colorspace == 2)
         avctx->color_primaries = AVCOL_PRI_BT470BG;
-    }
+
     if (colorspace == 1 || colorspace == 2) {
         avctx->colorspace = AVCOL_SPC_BT470BG;
         avctx->color_trc  = AVCOL_TRC_BT709;
@@ -2317,48 +2347,50 @@ static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb)
     else
         matrices = 3;
 
-    if(matrices > 384){
+    if (matrices > 384) {
         av_log(avctx, AV_LOG_ERROR, "invalid number of base matrixes\n");
         return -1;
     }
 
-    for(n=0; n<matrices; n++){
+    for (n = 0; n < matrices; n++)
         for (i = 0; i < 64; i++)
-            s->base_matrix[n][i]= get_bits(gb, 8);
-    }
+            s->base_matrix[n][i] = get_bits(gb, 8);
 
     for (inter = 0; inter <= 1; inter++) {
         for (plane = 0; plane <= 2; plane++) {
-            int newqr= 1;
+            int newqr = 1;
             if (inter || plane > 0)
                 newqr = get_bits1(gb);
             if (!newqr) {
                 int qtj, plj;
-                if(inter && get_bits1(gb)){
+                if (inter && get_bits1(gb)) {
                     qtj = 0;
                     plj = plane;
-                }else{
-                    qtj= (3*inter + plane - 1) / 3;
-                    plj= (plane + 2) % 3;
+                } else {
+                    qtj = (3 * inter + plane - 1) / 3;
+                    plj = (plane + 2) % 3;
                 }
-                s->qr_count[inter][plane]= s->qr_count[qtj][plj];
-                memcpy(s->qr_size[inter][plane], s->qr_size[qtj][plj], sizeof(s->qr_size[0][0]));
-                memcpy(s->qr_base[inter][plane], s->qr_base[qtj][plj], sizeof(s->qr_base[0][0]));
+                s->qr_count[inter][plane] = s->qr_count[qtj][plj];
+                memcpy(s->qr_size[inter][plane], s->qr_size[qtj][plj],
+                       sizeof(s->qr_size[0][0]));
+                memcpy(s->qr_base[inter][plane], s->qr_base[qtj][plj],
+                       sizeof(s->qr_base[0][0]));
             } else {
-                int qri= 0;
-                int qi = 0;
-
-                for(;;){
-                    i= get_bits(gb, av_log2(matrices-1)+1);
-                    if(i>= matrices){
-                        av_log(avctx, AV_LOG_ERROR, "invalid base matrix index\n");
+                int qri = 0;
+                int qi  = 0;
+
+                for (;;) {
+                    i = get_bits(gb, av_log2(matrices - 1) + 1);
+                    if (i >= matrices) {
+                        av_log(avctx, AV_LOG_ERROR,
+                               "invalid base matrix index\n");
                         return -1;
                     }
-                    s->qr_base[inter][plane][qri]= i;
-                    if(qi >= 63)
+                    s->qr_base[inter][plane][qri] = i;
+                    if (qi >= 63)
                         break;
-                    i = get_bits(gb, av_log2(63-qi)+1) + 1;
-                    s->qr_size[inter][plane][qri++]= i;
+                    i = get_bits(gb, av_log2(63 - qi) + 1) + 1;
+                    s->qr_size[inter][plane][qri++] = i;
                     qi += i;
                 }
 
@@ -2366,21 +2398,21 @@ static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb)
                     av_log(avctx, AV_LOG_ERROR, "invalid qi %d > 63\n", qi);
                     return -1;
                 }
-                s->qr_count[inter][plane]= qri;
+                s->qr_count[inter][plane] = qri;
             }
         }
     }
 
     /* Huffman tables */
     for (s->hti = 0; s->hti < 80; s->hti++) {
-        s->entries = 0;
+        s->entries        = 0;
         s->huff_code_size = 1;
         if (!get_bits1(gb)) {
             s->hbits = 0;
-            if(read_huffman_tree(avctx, gb))
+            if (read_huffman_tree(avctx, gb))
                 return -1;
             s->hbits = 1;
-            if(read_huffman_tree(avctx, gb))
+            if (read_huffman_tree(avctx, gb))
                 return -1;
         }
     }
@@ -2403,40 +2435,37 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
 
     s->theora = 1;
 
-    if (!avctx->extradata_size)
-    {
+    if (!avctx->extradata_size) {
         av_log(avctx, AV_LOG_ERROR, "Missing extradata!\n");
         return -1;
     }
 
     if (avpriv_split_xiph_headers(avctx->extradata, avctx->extradata_size,
-                              42, header_start, header_len) < 0) {
+                                  42, header_start, header_len) < 0) {
         av_log(avctx, AV_LOG_ERROR, "Corrupt extradata\n");
         return -1;
     }
 
-  for(i=0;i<3;i++) {
-    if (header_len[i] <= 0)
-        continue;
-    init_get_bits(&gb, header_start[i], header_len[i] * 8);
+    for (i = 0; i < 3; i++) {
+        if (header_len[i] <= 0)
+            continue;
+        init_get_bits(&gb, header_start[i], header_len[i] * 8);
 
-    ptype = get_bits(&gb, 8);
+        ptype = get_bits(&gb, 8);
 
-     if (!(ptype & 0x80))
-     {
-        av_log(avctx, AV_LOG_ERROR, "Invalid extradata!\n");
-//        return -1;
-     }
+        if (!(ptype & 0x80)) {
+            av_log(avctx, AV_LOG_ERROR, "Invalid extradata!\n");
+//          return -1;
+        }
 
-    // FIXME: Check for this as well.
-    skip_bits_long(&gb, 6*8); /* "theora" */
+        // FIXME: Check for this as well.
+        skip_bits_long(&gb, 6 * 8); /* "theora" */
 
-    switch(ptype)
-    {
+        switch (ptype) {
         case 0x80:
             if (theora_decode_header(avctx, &gb) < 0)
                 return -1;
-                break;
+            break;
         case 0x81:
 // FIXME: is this needed? it breaks sometimes
 //            theora_decode_comments(avctx, gb);
@@ -2446,14 +2475,17 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
                 return -1;
             break;
         default:
-            av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80);
+            av_log(avctx, AV_LOG_ERROR,
+                   "Unknown Theora config packet: %d\n", ptype & ~0x80);
+            break;
+        }
+        if (ptype != 0x81 && 8 * header_len[i] != get_bits_count(&gb))
+            av_log(avctx, AV_LOG_WARNING,
+                   "%d bits left in packet %X\n",
+                   8 * header_len[i] - get_bits_count(&gb), ptype);
+        if (s->theora < 0x030200)
             break;
     }
-    if(ptype != 0x81 && 8*header_len[i] != get_bits_count(&gb))
-        av_log(avctx, AV_LOG_WARNING, "%d bits left in packet %X\n", 8*header_len[i] - get_bits_count(&gb), ptype);
-    if (s->theora < 0x030200)
-        break;
-  }
 
     return vp3_decode_init(avctx);
 }
diff --git a/libavcodec/vp3_parser.c b/libavcodec/vp3_parser.c
index ce15309356..7ee046c543 100644
--- a/libavcodec/vp3_parser.c
+++ b/libavcodec/vp3_parser.c
@@ -21,22 +21,24 @@
 #include "parser.h"
 
 static int parse(AVCodecParserContext *s,
-                           AVCodecContext *avctx,
-                           const uint8_t **poutbuf, int *poutbuf_size,
-                           const uint8_t *buf, int buf_size)
+                 AVCodecContext *avctx,
+                 const uint8_t **poutbuf, int *poutbuf_size,
+                 const uint8_t *buf, int buf_size)
 {
-    if(avctx->codec_id == AV_CODEC_ID_THEORA)
-        s->pict_type= (buf[0]&0x40) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
+    if (avctx->codec_id == AV_CODEC_ID_THEORA)
+        s->pict_type = (buf[0] & 0x40) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
     else
-        s->pict_type= (buf[0]&0x80) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
+        s->pict_type = (buf[0] & 0x80) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
 
-    *poutbuf = buf;
+    *poutbuf      = buf;
     *poutbuf_size = buf_size;
     return buf_size;
 }
 
 AVCodecParser ff_vp3_parser = {
-    .codec_ids      = { AV_CODEC_ID_THEORA, AV_CODEC_ID_VP3, AV_CODEC_ID_VP6,
-                        AV_CODEC_ID_VP6F,   AV_CODEC_ID_VP6A },
-    .parser_parse   = parse,
+    .codec_ids    = {
+        AV_CODEC_ID_THEORA, AV_CODEC_ID_VP3,
+        AV_CODEC_ID_VP6, AV_CODEC_ID_VP6F, AV_CODEC_ID_VP6A
+    },
+    .parser_parse = parse,
 };
diff --git a/libavcodec/vp3data.h b/libavcodec/vp3data.h
index 904ec6abf5..bffc5bcc6b 100644
--- a/libavcodec/vp3data.h
+++ b/libavcodec/vp3data.h
@@ -26,175 +26,175 @@
 
 /* these coefficients dequantize intraframe Y plane coefficients
  * (note: same as JPEG) */
-static const int16_t vp31_intra_y_dequant[64] =
-{       16,  11,  10,  16,  24,  40,  51,  61,
-        12,  12,  14,  19,  26,  58,  60,  55,
-        14,  13,  16,  24,  40,  57,  69,  56,
-        14,  17,  22,  29,  51,  87,  80,  62,
-        18,  22,  37,  58,  68, 109, 103,  77,
-        24,  35,  55,  64,  81, 104, 113,  92,
-        49,  64,  78,  87, 103, 121, 120, 101,
-        72,  92,  95,  98, 112, 100, 103,  99
+static const int16_t vp31_intra_y_dequant[64] = {
+    16, 11, 10, 16,  24,  40,  51,  61,
+    12, 12, 14, 19,  26,  58,  60,  55,
+    14, 13, 16, 24,  40,  57,  69,  56,
+    14, 17, 22, 29,  51,  87,  80,  62,
+    18, 22, 37, 58,  68, 109, 103,  77,
+    24, 35, 55, 64,  81, 104, 113,  92,
+    49, 64, 78, 87, 103, 121, 120, 101,
+    72, 92, 95, 98, 112, 100, 103,  99
 };
 
 /* these coefficients dequantize intraframe C plane coefficients
  * (note: same as JPEG) */
-static const int16_t vp31_intra_c_dequant[64] =
-{       17,  18,     24,     47,     99,     99,     99,     99,
-        18,  21,     26,     66,     99,     99,     99,     99,
-        24,  26,     56,     99,     99,     99,     99,     99,
-        47,  66,     99,     99,     99,     99,     99,     99,
-        99,  99,     99,     99,     99,     99,     99,     99,
-        99,  99,     99,     99,     99,     99,     99,     99,
-        99,  99,     99,     99,     99,     99,     99,     99,
-        99,  99,     99,     99,     99,     99,     99,     99
+static const int16_t vp31_intra_c_dequant[64] = {
+    17, 18, 24, 47, 99, 99, 99, 99,
+    18, 21, 26, 66, 99, 99, 99, 99,
+    24, 26, 56, 99, 99, 99, 99, 99,
+    47, 66, 99, 99, 99, 99, 99, 99,
+    99, 99, 99, 99, 99, 99, 99, 99,
+    99, 99, 99, 99, 99, 99, 99, 99,
+    99, 99, 99, 99, 99, 99, 99, 99,
+    99, 99, 99, 99, 99, 99, 99, 99
 };
 
 /* these coefficients dequantize interframe coefficients (all planes) */
-static const int16_t vp31_inter_dequant[64] =
-{   16,  16,  16,  20,  24,  28,  32,  40,
-    16,  16,  20,  24,  28,  32,  40,  48,
-    16,  20,  24,  28,  32,  40,  48,  64,
-    20,  24,  28,  32,  40,  48,  64,  64,
-    24,  28,  32,  40,  48,  64,  64,  64,
-    28,  32,  40,  48,  64,  64,  64,  96,
-    32,  40,  48,  64,  64,  64,  96,  128,
-    40,  48,  64,  64,  64,  96,  128, 128
+static const int16_t vp31_inter_dequant[64] = {
+    16, 16, 16, 20, 24, 28,  32,  40,
+    16, 16, 20, 24, 28, 32,  40,  48,
+    16, 20, 24, 28, 32, 40,  48,  64,
+    20, 24, 28, 32, 40, 48,  64,  64,
+    24, 28, 32, 40, 48, 64,  64,  64,
+    28, 32, 40, 48, 64, 64,  64,  96,
+    32, 40, 48, 64, 64, 64,  96, 128,
+    40, 48, 64, 64, 64, 96, 128, 128
 };
 
-static const int16_t vp31_dc_scale_factor[64] =
-{ 220, 200, 190, 180, 170, 170, 160, 160,
-  150, 150, 140, 140, 130, 130, 120, 120,
-  110, 110, 100, 100, 90,  90,  90,  80,
-  80,  80,  70,  70,  70,  60,  60,  60,
-  60,  50,  50,  50,  50,  40,  40,  40,
-  40,  40,  30,  30,  30,  30,  30,  30,
-  30,  20,  20,  20,  20,  20,  20,  20,
-  20,  10,  10,  10,  10,  10,  10,  10
+static const int16_t vp31_dc_scale_factor[64] = {
+    220, 200, 190, 180, 170, 170, 160, 160,
+    150, 150, 140, 140, 130, 130, 120, 120,
+    110, 110, 100, 100,  90,  90,  90,  80,
+     80,  80,  70,  70,  70,  60,  60,  60,
+     60,  50,  50,  50,  50,  40,  40,  40,
+     40,  40,  30,  30,  30,  30,  30,  30,
+     30,  20,  20,  20,  20,  20,  20,  20,
+     20,  10,  10,  10,  10,  10,  10,  10
 };
 
-static const uint32_t vp31_ac_scale_factor[64] =
-{ 500,  450,  400,  370,  340,  310, 285, 265,
-  245,  225,  210,  195,  185,  180, 170, 160,
-  150,  145,  135,  130,  125,  115, 110, 107,
-  100,   96,   93,   89,   85,   82,  75,  74,
-   70,   68,   64,   60,   57,   56,  52,  50,
-   49,   45,   44,   43,   40,   38,  37,  35,
-   33,   32,   30,   29,   28,   25,  24,  22,
-   21,   19,   18,   17,   15,   13,  12,  10
+static const uint32_t vp31_ac_scale_factor[64] = {
+    500, 450, 400, 370, 340, 310, 285, 265,
+    245, 225, 210, 195, 185, 180, 170, 160,
+    150, 145, 135, 130, 125, 115, 110, 107,
+    100,  96,  93,  89,  85,  82,  75,  74,
+     70,  68,  64,  60,  57,  56,  52,  50,
+     49,  45,  44,  43,  40,  38,  37,  35,
+     33,  32,  30,  29,  28,  25,  24,  22,
+     21,  19,  18,  17,  15,  13,  12,  10
 };
 
-static const uint8_t vp31_filter_limit_values[64] =
-{  30, 25, 20, 20, 15, 15, 14, 14,
-   13, 13, 12, 12, 11, 11, 10, 10,
-    9,  9,  8,  8,  7,  7,  7,  7,
-    6,  6,  6,  6,  5,  5,  5,  5,
-    4,  4,  4,  4,  3,  3,  3,  3,
-    2,  2,  2,  2,  2,  2,  2,  2,
-    0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0
+static const uint8_t vp31_filter_limit_values[64] = {
+    30, 25, 20, 20, 15, 15, 14, 14,
+    13, 13, 12, 12, 11, 11, 10, 10,
+     9,  9,  8,  8,  7,  7,  7,  7,
+     6,  6,  6,  6,  5,  5,  5,  5,
+     4,  4,  4,  4,  3,  3,  3,  3,
+     2,  2,  2,  2,  2,  2,  2,  2,
+     0,  0,  0,  0,  0,  0,  0,  0,
+     0,  0,  0,  0,  0,  0,  0,  0
 };
 
 static const uint16_t superblock_run_length_vlc_table[34][2] = {
-    { 0, 1 },
+    {     0,  1 },
 
-    { 4, 3 },    { 5, 3 },
+    {     4,  3 }, {     5,  3 },
 
-    { 0xC, 4 },  { 0xD, 4 },
+    {   0xC,  4 }, {   0xD,  4 },
 
-    { 0x38, 6 },    { 0x39, 6 },    { 0x3A, 6 },    { 0x3B, 6 },
+    {  0x38,  6 }, {  0x39,  6 }, {  0x3A,  6 }, {  0x3B,  6 },
 
-    { 0xF0, 8 },    { 0xF1, 8 },    { 0xF2, 8 },    { 0xF3, 8 },
-    { 0xF4, 8 },    { 0xF5, 8 },    { 0xF6, 8 },    { 0xF7, 8 },
+    {  0xF0,  8 }, {  0xF1,  8 }, {  0xF2,  8 }, {  0xF3,  8 },
+    {  0xF4,  8 }, {  0xF5,  8 }, {  0xF6,  8 }, {  0xF7,  8 },
 
-    { 0x3E0, 10 },    { 0x3E1, 10 },    { 0x3E2, 10 },    { 0x3E3, 10 },
-    { 0x3E4, 10 },    { 0x3E5, 10 },    { 0x3E6, 10 },    { 0x3E7, 10 },
-    { 0x3E8, 10 },    { 0x3E9, 10 },    { 0x3EA, 10 },    { 0x3EB, 10 },
-    { 0x3EC, 10 },    { 0x3ED, 10 },    { 0x3EE, 10 },    { 0x3EF, 10 },
+    { 0x3E0, 10 }, { 0x3E1, 10 }, { 0x3E2, 10 }, { 0x3E3, 10 },
+    { 0x3E4, 10 }, { 0x3E5, 10 }, { 0x3E6, 10 }, { 0x3E7, 10 },
+    { 0x3E8, 10 }, { 0x3E9, 10 }, { 0x3EA, 10 }, { 0x3EB, 10 },
+    { 0x3EC, 10 }, { 0x3ED, 10 }, { 0x3EE, 10 }, { 0x3EF, 10 },
 
-    { 0x3F, 6 }  /* this last VLC is a special case for reading 12 more
-                    bits from stream and adding the value 34 */
+    {  0x3F,  6 } /* this last VLC is a special case for reading 12 more
+                   * bits from stream and adding the value 34 */
 };
 
 static const uint16_t fragment_run_length_vlc_table[30][2] = {
     /* 1 -> 2 */
-    { 0x0, 2 },    { 0x1, 2 },
+    {   0x0, 2 }, {   0x1, 2 },
 
     /* 3 -> 4 */
-    { 0x4, 3 },    { 0x5, 3 },
+    {   0x4, 3 }, {   0x5, 3 },
 
     /* 5 -> 6 */
-    { 0xC, 4 },    { 0xD, 4 },
+    {   0xC, 4 }, {   0xD, 4 },
 
     /* 7 -> 10 */
-    { 0x38, 6 },   { 0x39, 6 },
-    { 0x3A, 6 },   { 0x3B, 6 },
+    {  0x38, 6 }, {  0x39, 6 },
+    {  0x3A, 6 }, {  0x3B, 6 },
 
     /* 11 -> 14 */
-    { 0x78, 7 },   { 0x79, 7 },
-    { 0x7A, 7 },   { 0x7B, 7 },
+    {  0x78, 7 }, {  0x79, 7 },
+    {  0x7A, 7 }, {  0x7B, 7 },
 
     /* 15 -> 30 */
-    { 0x1F0, 9 },  { 0x1F1, 9 },  { 0x1F2, 9 },  { 0x1F3, 9 },
-    { 0x1F4, 9 },  { 0x1F5, 9 },  { 0x1F6, 9 },  { 0x1F7, 9 },
-    { 0x1F8, 9 },  { 0x1F9, 9 },  { 0x1FA, 9 },  { 0x1FB, 9 },
-    { 0x1FC, 9 },  { 0x1FD, 9 },  { 0x1FE, 9 },  { 0x1FF, 9 }
+    { 0x1F0, 9 }, { 0x1F1, 9 }, { 0x1F2, 9 }, { 0x1F3, 9 },
+    { 0x1F4, 9 }, { 0x1F5, 9 }, { 0x1F6, 9 }, { 0x1F7, 9 },
+    { 0x1F8, 9 }, { 0x1F9, 9 }, { 0x1FA, 9 }, { 0x1FB, 9 },
+    { 0x1FC, 9 }, { 0x1FD, 9 }, { 0x1FE, 9 }, { 0x1FF, 9 }
 };
 
 static const uint8_t mode_code_vlc_table[8][2] = {
-    { 0, 1 },      { 2, 2 },
-    { 6, 3 },      { 14, 4 },
-    { 30, 5 },     { 62, 6 },
-    { 126, 7 },    { 127, 7 }
+    {   0, 1 }, {   2, 2 },
+    {   6, 3 }, {  14, 4 },
+    {  30, 5 }, {  62, 6 },
+    { 126, 7 }, { 127, 7 }
 };
 
 static const uint8_t motion_vector_vlc_table[63][2] = {
-    { 0, 3 },
-    { 1, 3 },
-    { 2, 3 },
+    {    0, 3 },
+    {    1, 3 },
+    {    2, 3 },
 
-    { 6, 4 },    { 7, 4 },
+    {    6, 4 }, {    7, 4 },
 
-    { 8, 4 },    { 9, 4 },
+    {    8, 4 }, {    9, 4 },
 
-    { 40, 6 },    { 41, 6 },    { 42, 6 },    { 43, 6 },
-    { 44, 6 },    { 45, 6 },    { 46, 6 },    { 47, 6 },
+    {   40, 6 }, {   41, 6 }, {   42, 6 }, {   43, 6 },
+    {   44, 6 }, {   45, 6 }, {   46, 6 }, {   47, 6 },
 
-    { 96, 7 },    { 97, 7 },    { 98, 7 },    { 99, 7 },
-    { 100, 7 },   { 101, 7 },   { 102, 7 },   { 103, 7 },
-    { 104, 7 },   { 105, 7 },   { 106, 7 },   { 107, 7 },
-    { 108, 7 },   { 109, 7 },   { 110, 7 },   { 111, 7 },
+    {   96, 7 }, {   97, 7 }, {   98, 7 }, {   99, 7 },
+    {  100, 7 }, {  101, 7 }, {  102, 7 }, {  103, 7 },
+    {  104, 7 }, {  105, 7 }, {  106, 7 }, {  107, 7 },
+    {  108, 7 }, {  109, 7 }, {  110, 7 }, {  111, 7 },
 
-    { 0xE0, 8 },  { 0xE1, 8 },  { 0xE2, 8 },  { 0xE3, 8 },
-    { 0xE4, 8 },  { 0xE5, 8 },  { 0xE6, 8 },  { 0xE7, 8 },
-    { 0xE8, 8 },  { 0xE9, 8 },  { 0xEA, 8 },  { 0xEB, 8 },
-    { 0xEC, 8 },  { 0xED, 8 },  { 0xEE, 8 },  { 0xEF, 8 },
+    { 0xE0, 8 }, { 0xE1, 8 }, { 0xE2, 8 }, { 0xE3, 8 },
+    { 0xE4, 8 }, { 0xE5, 8 }, { 0xE6, 8 }, { 0xE7, 8 },
+    { 0xE8, 8 }, { 0xE9, 8 }, { 0xEA, 8 }, { 0xEB, 8 },
+    { 0xEC, 8 }, { 0xED, 8 }, { 0xEE, 8 }, { 0xEF, 8 },
 
-    { 0xF0, 8 },  { 0xF1, 8 },  { 0xF2, 8 },  { 0xF3, 8 },
-    { 0xF4, 8 },  { 0xF5, 8 },  { 0xF6, 8 },  { 0xF7, 8 },
-    { 0xF8, 8 },  { 0xF9, 8 },  { 0xFA, 8 },  { 0xFB, 8 },
-    { 0xFC, 8 },  { 0xFD, 8 },  { 0xFE, 8 },  { 0xFF, 8 }
+    { 0xF0, 8 }, { 0xF1, 8 }, { 0xF2, 8 }, { 0xF3, 8 },
+    { 0xF4, 8 }, { 0xF5, 8 }, { 0xF6, 8 }, { 0xF7, 8 },
+    { 0xF8, 8 }, { 0xF9, 8 }, { 0xFA, 8 }, { 0xFB, 8 },
+    { 0xFC, 8 }, { 0xFD, 8 }, { 0xFE, 8 }, { 0xFF, 8 }
 };
 
 static const int motion_vector_table[63] = {
-    0, 1, -1,
-    2, -2,
-    3, -3,
-    4, -4, 5, -5, 6, -6, 7, -7,
-    8, -8, 9, -9, 10, -10, 11, -11, 12, -12, 13, -13, 14, -14, 15, -15,
+     0,   1, -1,
+     2,  -2,
+     3,  -3,
+     4,  -4,  5,  -5,  6,  -6,  7,  -7,
+     8,  -8,  9,  -9, 10, -10, 11, -11, 12, -12, 13, -13, 14, -14, 15, -15,
     16, -16, 17, -17, 18, -18, 19, -19, 20, -20, 21, -21, 22, -22, 23, -23,
     24, -24, 25, -25, 26, -26, 27, -27, 28, -28, 29, -29, 30, -30, 31, -31
 };
 
 static const int8_t fixed_motion_vector_table[64] = {
-   0,   0,   1,  -1,   2,  -2,   3,  -3,
-   4,  -4,   5,  -5,   6,  -6,   7,  -7,
-   8,  -8,   9,  -9,  10, -10,  11, -11,
-  12, -12,  13, -13,  14, -14,  15, -15,
-  16, -16,  17, -17,  18, -18,  19, -19,
-  20, -20,  21, -21,  22, -22,  23, -23,
-  24, -24,  25, -25,  26, -26,  27, -27,
-  28, -28,  29, -29,  30, -30,  31, -31
+     0,   0,  1,  -1,  2,  -2,  3,  -3,
+     4,  -4,  5,  -5,  6,  -6,  7,  -7,
+     8,  -8,  9,  -9, 10, -10, 11, -11,
+    12, -12, 13, -13, 14, -14, 15, -15,
+    16, -16, 17, -17, 18, -18, 19, -19,
+    20, -20, 21, -21, 22, -22, 23, -23,
+    24, -24, 25, -25, 26, -26, 27, -27,
+    28, -28, 29, -29, 30, -30, 31, -31
 };
 
 /* only tokens 0..6 indicate eob runs */
@@ -206,27 +206,27 @@ static const int eob_run_get_bits[7] = {
 };
 
 static const int zero_run_base[32] = {
-    0, 0, 0, 0, 0, 0, 0,  /* 0..6 are never used */
-    0, 0,  /* 7..8 */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 9..22 */
-    1, 2, 3, 4, 5,  /* 23..27 */
-    6, 10, 1, 2  /* 28..31 */
+    0,  0, 0, 0, 0, 0, 0,   /* 0..6 are never used */
+    0,  0,                  /* 7..8 */
+    0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 9..22 */
+    1,  2, 3, 4, 5,         /* 23..27 */
+    6, 10, 1, 2             /* 28..31 */
 };
 static const int zero_run_get_bits[32] = {
-    0, 0, 0, 0, 0, 0, 0,  /* 0..6 are never used */
-    3, 6,  /* 7..8 */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  /* 9..22 */
-    0, 0, 0, 0, 0,  /* 23..27 */
-    2, 3, 0, 1  /* 28..31 */
+    0, 0, 0, 0, 0, 0, 0,    /* 0..6 are never used */
+    3, 6,                   /* 7..8 */
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 9..22 */
+    0, 0, 0, 0, 0,          /* 23..27 */
+    2, 3, 0, 1              /* 28..31 */
 };
 
 static const int coeff_get_bits[32] = {
-    0, 0, 0, 0, 0, 0, 0,  /* 0..6 are never used */
-    0, 0, 0, 0, 0, 0,  /* 7..12 use constant coeffs */
-    1, 1, 1, 1,  /* 13..16 are constants but still need sign bit */
-    2, 3, 4, 5, 6, 10,  /* 17..22, for reading large coeffs */
-    1, 1, 1, 1, 1, 1, 1,  /* 23..29 are constants but still need sign bit */
-    2, 2  /* 30..31 */
+    0, 0, 0, 0, 0, 0, 0,    /* 0..6 are never used */
+    0, 0, 0, 0, 0, 0,       /* 7..12 use constant coeffs */
+    1, 1, 1, 1,             /* 13..16 are constants but still need sign bit */
+    2, 3, 4, 5, 6,10,       /* 17..22, for reading large coeffs */
+    1, 1, 1, 1, 1, 1, 1,    /* 23..29 are constants but still need sign bit */
+    2, 2                    /* 30..31 */
 };
 
 static const int16_t coeff_table_token_7_8[1] = { 0 };
@@ -257,17 +257,17 @@ static const int16_t coeff_table_token_19[16] = {
 };
 
 static const int16_t coeff_table_token_20[32] = {
-    21, 22, 23, 24, 25, 26, 27, 28,
-    29, 30, 31, 32, 33, 34, 35, 36,
+     21,  22,  23,  24,  25,  26,  27,  28,
+     29,  30,  31,  32,  33,  34,  35,  36,
     -21, -22, -23, -24, -25, -26, -27, -28,
     -29, -30, -31, -32, -33, -34, -35, -36
 };
 
 static const int16_t coeff_table_token_21[64] = {
-    37, 38, 39, 40, 41, 42, 43, 44,
-    45, 46, 47, 48, 49, 50, 51, 52,
-    53, 54, 55, 56, 57, 58, 59, 60,
-    61, 62, 63, 64, 65, 66, 67, 68,
+     37,  38,  39,  40,  41,  42,  43,  44,
+     45,  46,  47,  48,  49,  50,  51,  52,
+     53,  54,  55,  56,  57,  58,  59,  60,
+     61,  62,  63,  64,  65,  66,  67,  68,
     -37, -38, -39, -40, -41, -42, -43, -44,
     -45, -46, -47, -48, -49, -50, -51, -52,
     -53, -54, -55, -56, -57, -58, -59, -60,
@@ -275,74 +275,74 @@ static const int16_t coeff_table_token_21[64] = {
 };
 
 static const int16_t coeff_table_token_22[1024] = {
-    69, 70, 71, 72, 73, 74, 75, 76,
-    77, 78, 79, 80, 81, 82, 83, 84,
-    85, 86, 87, 88, 89, 90, 91, 92,
-    93, 94, 95, 96, 97, 98, 99, 100,
-    101, 102, 103, 104, 105, 106, 107, 108,
-    109, 110, 111, 112, 113, 114, 115, 116,
-    117, 118, 119, 120, 121, 122, 123, 124,
-    125, 126, 127, 128, 129, 130, 131, 132,
-    133, 134, 135, 136, 137, 138, 139, 140,
-    141, 142, 143, 144, 145, 146, 147, 148,
-    149, 150, 151, 152, 153, 154, 155, 156,
-    157, 158, 159, 160, 161, 162, 163, 164,
-    165, 166, 167, 168, 169, 170, 171, 172,
-    173, 174, 175, 176, 177, 178, 179, 180,
-    181, 182, 183, 184, 185, 186, 187, 188,
-    189, 190, 191, 192, 193, 194, 195, 196,
-    197, 198, 199, 200, 201, 202, 203, 204,
-    205, 206, 207, 208, 209, 210, 211, 212,
-    213, 214, 215, 216, 217, 218, 219, 220,
-    221, 222, 223, 224, 225, 226, 227, 228,
-    229, 230, 231, 232, 233, 234, 235, 236,
-    237, 238, 239, 240, 241, 242, 243, 244,
-    245, 246, 247, 248, 249, 250, 251, 252,
-    253, 254, 255, 256, 257, 258, 259, 260,
-    261, 262, 263, 264, 265, 266, 267, 268,
-    269, 270, 271, 272, 273, 274, 275, 276,
-    277, 278, 279, 280, 281, 282, 283, 284,
-    285, 286, 287, 288, 289, 290, 291, 292,
-    293, 294, 295, 296, 297, 298, 299, 300,
-    301, 302, 303, 304, 305, 306, 307, 308,
-    309, 310, 311, 312, 313, 314, 315, 316,
-    317, 318, 319, 320, 321, 322, 323, 324,
-    325, 326, 327, 328, 329, 330, 331, 332,
-    333, 334, 335, 336, 337, 338, 339, 340,
-    341, 342, 343, 344, 345, 346, 347, 348,
-    349, 350, 351, 352, 353, 354, 355, 356,
-    357, 358, 359, 360, 361, 362, 363, 364,
-    365, 366, 367, 368, 369, 370, 371, 372,
-    373, 374, 375, 376, 377, 378, 379, 380,
-    381, 382, 383, 384, 385, 386, 387, 388,
-    389, 390, 391, 392, 393, 394, 395, 396,
-    397, 398, 399, 400, 401, 402, 403, 404,
-    405, 406, 407, 408, 409, 410, 411, 412,
-    413, 414, 415, 416, 417, 418, 419, 420,
-    421, 422, 423, 424, 425, 426, 427, 428,
-    429, 430, 431, 432, 433, 434, 435, 436,
-    437, 438, 439, 440, 441, 442, 443, 444,
-    445, 446, 447, 448, 449, 450, 451, 452,
-    453, 454, 455, 456, 457, 458, 459, 460,
-    461, 462, 463, 464, 465, 466, 467, 468,
-    469, 470, 471, 472, 473, 474, 475, 476,
-    477, 478, 479, 480, 481, 482, 483, 484,
-    485, 486, 487, 488, 489, 490, 491, 492,
-    493, 494, 495, 496, 497, 498, 499, 500,
-    501, 502, 503, 504, 505, 506, 507, 508,
-    509, 510, 511, 512, 513, 514, 515, 516,
-    517, 518, 519, 520, 521, 522, 523, 524,
-    525, 526, 527, 528, 529, 530, 531, 532,
-    533, 534, 535, 536, 537, 538, 539, 540,
-    541, 542, 543, 544, 545, 546, 547, 548,
-    549, 550, 551, 552, 553, 554, 555, 556,
-    557, 558, 559, 560, 561, 562, 563, 564,
-    565, 566, 567, 568, 569, 570, 571, 572,
-    573, 574, 575, 576, 577, 578, 579, 580,
-    -69, -70, -71, -72, -73, -74, -75, -76,
-    -77, -78, -79, -80, -81, -82, -83, -84,
-    -85, -86, -87, -88, -89, -90, -91, -92,
-    -93, -94, -95, -96, -97, -98, -99, -100,
+      69,   70,   71,   72,   73,   74,   75,   76,
+      77,   78,   79,   80,   81,   82,   83,   84,
+      85,   86,   87,   88,   89,   90,   91,   92,
+      93,   94,   95,   96,   97,   98,   99,  100,
+     101,  102,  103,  104,  105,  106,  107,  108,
+     109,  110,  111,  112,  113,  114,  115,  116,
+     117,  118,  119,  120,  121,  122,  123,  124,
+     125,  126,  127,  128,  129,  130,  131,  132,
+     133,  134,  135,  136,  137,  138,  139,  140,
+     141,  142,  143,  144,  145,  146,  147,  148,
+     149,  150,  151,  152,  153,  154,  155,  156,
+     157,  158,  159,  160,  161,  162,  163,  164,
+     165,  166,  167,  168,  169,  170,  171,  172,
+     173,  174,  175,  176,  177,  178,  179,  180,
+     181,  182,  183,  184,  185,  186,  187,  188,
+     189,  190,  191,  192,  193,  194,  195,  196,
+     197,  198,  199,  200,  201,  202,  203,  204,
+     205,  206,  207,  208,  209,  210,  211,  212,
+     213,  214,  215,  216,  217,  218,  219,  220,
+     221,  222,  223,  224,  225,  226,  227,  228,
+     229,  230,  231,  232,  233,  234,  235,  236,
+     237,  238,  239,  240,  241,  242,  243,  244,
+     245,  246,  247,  248,  249,  250,  251,  252,
+     253,  254,  255,  256,  257,  258,  259,  260,
+     261,  262,  263,  264,  265,  266,  267,  268,
+     269,  270,  271,  272,  273,  274,  275,  276,
+     277,  278,  279,  280,  281,  282,  283,  284,
+     285,  286,  287,  288,  289,  290,  291,  292,
+     293,  294,  295,  296,  297,  298,  299,  300,
+     301,  302,  303,  304,  305,  306,  307,  308,
+     309,  310,  311,  312,  313,  314,  315,  316,
+     317,  318,  319,  320,  321,  322,  323,  324,
+     325,  326,  327,  328,  329,  330,  331,  332,
+     333,  334,  335,  336,  337,  338,  339,  340,
+     341,  342,  343,  344,  345,  346,  347,  348,
+     349,  350,  351,  352,  353,  354,  355,  356,
+     357,  358,  359,  360,  361,  362,  363,  364,
+     365,  366,  367,  368,  369,  370,  371,  372,
+     373,  374,  375,  376,  377,  378,  379,  380,
+     381,  382,  383,  384,  385,  386,  387,  388,
+     389,  390,  391,  392,  393,  394,  395,  396,
+     397,  398,  399,  400,  401,  402,  403,  404,
+     405,  406,  407,  408,  409,  410,  411,  412,
+     413,  414,  415,  416,  417,  418,  419,  420,
+     421,  422,  423,  424,  425,  426,  427,  428,
+     429,  430,  431,  432,  433,  434,  435,  436,
+     437,  438,  439,  440,  441,  442,  443,  444,
+     445,  446,  447,  448,  449,  450,  451,  452,
+     453,  454,  455,  456,  457,  458,  459,  460,
+     461,  462,  463,  464,  465,  466,  467,  468,
+     469,  470,  471,  472,  473,  474,  475,  476,
+     477,  478,  479,  480,  481,  482,  483,  484,
+     485,  486,  487,  488,  489,  490,  491,  492,
+     493,  494,  495,  496,  497,  498,  499,  500,
+     501,  502,  503,  504,  505,  506,  507,  508,
+     509,  510,  511,  512,  513,  514,  515,  516,
+     517,  518,  519,  520,  521,  522,  523,  524,
+     525,  526,  527,  528,  529,  530,  531,  532,
+     533,  534,  535,  536,  537,  538,  539,  540,
+     541,  542,  543,  544,  545,  546,  547,  548,
+     549,  550,  551,  552,  553,  554,  555,  556,
+     557,  558,  559,  560,  561,  562,  563,  564,
+     565,  566,  567,  568,  569,  570,  571,  572,
+     573,  574,  575,  576,  577,  578,  579,  580,
+     -69,  -70,  -71,  -72,  -73,  -74,  -75,  -76,
+     -77,  -78,  -79,  -80,  -81,  -82,  -83,  -84,
+     -85,  -86,  -87,  -88,  -89,  -90,  -91,  -92,
+     -93,  -94,  -95,  -96,  -97,  -98,  -99, -100,
     -101, -102, -103, -104, -105, -106, -107, -108,
     -109, -110, -111, -112, -113, -114, -115, -116,
     -117, -118, -119, -120, -121, -122, -123, -124,
@@ -444,2738 +444,2738 @@ static const int16_t *const coeff_tables[32] = {
 };
 
 static const uint16_t dc_bias[16][32][2] = {
-  {  /* DC bias table 0 */
-    { 0x2D, 6 },
-    { 0x26, 7 },
-    { 0x166, 9 },
-    { 0x4E, 8 },
-    { 0x2CE, 10 },
-    { 0x59E, 11 },
-    { 0x27D, 11 },
-    { 0x8, 5 },
-    { 0x4F9, 12 },
-    { 0xF, 4 },
-    { 0xE, 4 },
-    { 0x1B, 5 },
-    { 0x6, 4 },
-    { 0x8, 4 },
-    { 0x5, 4 },
-    { 0x1A, 5 },
-    { 0x15, 5 },
-    { 0x7, 4 },
-    { 0xC, 4 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0x9, 4 },
-    { 0x17, 5 },
-    { 0x29, 6 },
-    { 0x28, 6 },
-    { 0xB2, 8 },
-    { 0x4F8, 12 },
-    { 0x59F, 11 },
-    { 0x9E, 9 },
-    { 0x13F, 10 },
-    { 0x12, 6 },
-    { 0x58, 7 }
-  },
-  {  /* DC bias table 1 */
-    { 0x10, 5 },
-    { 0x47, 7 },
-    { 0x1FF, 9 },
-    { 0x8C, 8 },
-    { 0x3FC, 10 },
-    { 0x46A, 11 },
-    { 0x469, 11 },
-    { 0x22, 6 },
-    { 0x11A1, 13 },
-    { 0xE, 4 },
-    { 0xD, 4 },
-    { 0x4, 4 },
-    { 0x5, 4 },
-    { 0x9, 4 },
-    { 0x6, 4 },
-    { 0x1E, 5 },
-    { 0x16, 5 },
-    { 0x7, 4 },
-    { 0xC, 4 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0xA, 4 },
-    { 0x17, 5 },
-    { 0x7D, 7 },
-    { 0x7E, 7 },
-    { 0x11B, 9 },
-    { 0x8D1, 12 },
-    { 0x3FD, 10 },
-    { 0x46B, 11 },
-    { 0x11A0, 13 },
-    { 0x7C, 7 },
-    { 0xFE, 8 }
-  },
-  {  /* DC bias table 2 */
-    { 0x16, 5 },
-    { 0x20, 6 },
-    { 0x86, 8 },
-    { 0x87, 8 },
-    { 0x367, 10 },
-    { 0x6CC, 11 },
-    { 0x6CB, 11 },
-    { 0x6E, 7 },
-    { 0x366D, 14 },
-    { 0xF, 4 },
-    { 0xE, 4 },
-    { 0x4, 4 },
-    { 0x5, 4 },
-    { 0xA, 4 },
-    { 0x6, 4 },
-    { 0x1A, 5 },
-    { 0x11, 5 },
-    { 0x7, 4 },
-    { 0xC, 4 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0x9, 4 },
-    { 0x17, 5 },
-    { 0x6F, 7 },
-    { 0x6D, 7 },
-    { 0x364, 10 },
-    { 0xD9A, 12 },
-    { 0x6CA, 11 },
-    { 0x1B37, 13 },
-    { 0x366C, 14 },
-    { 0x42, 7 },
-    { 0xD8, 8 }
-  },
-  {  /* DC bias table 3 */
-    { 0x0, 4 },
-    { 0x2D, 6 },
-    { 0xF7, 8 },
-    { 0x58, 7 },
-    { 0x167, 9 },
-    { 0x2CB, 10 },
-    { 0x2CA, 10 },
-    { 0xE, 6 },
-    { 0x1661, 13 },
-    { 0x3, 3 },
-    { 0x2, 3 },
-    { 0x8, 4 },
-    { 0x9, 4 },
-    { 0xD, 4 },
-    { 0x2, 4 },
-    { 0x1F, 5 },
-    { 0x17, 5 },
-    { 0x1, 4 },
-    { 0xC, 4 },
-    { 0xE, 4 },
-    { 0xA, 4 },
-    { 0x6, 5 },
-    { 0x78, 7 },
-    { 0xF, 6 },
-    { 0x7A, 7 },
-    { 0x164, 9 },
-    { 0x599, 11 },
-    { 0x2CD, 10 },
-    { 0xB31, 12 },
-    { 0x1660, 13 },
-    { 0x79, 7 },
-    { 0xF6, 8 }
-  },
-  {  /* DC bias table 4 */
-    { 0x3, 4 },
-    { 0x3C, 6 },
-    { 0xF, 7 },
-    { 0x7A, 7 },
-    { 0x1D, 8 },
-    { 0x20, 9 },
-    { 0x72, 10 },
-    { 0x6, 6 },
-    { 0x399, 13 },
-    { 0x4, 3 },
-    { 0x5, 3 },
-    { 0x5, 4 },
-    { 0x6, 4 },
-    { 0xE, 4 },
-    { 0x4, 4 },
-    { 0x0, 4 },
-    { 0x19, 5 },
-    { 0x2, 4 },
-    { 0xD, 4 },
-    { 0x7, 4 },
-    { 0x1F, 5 },
-    { 0x30, 6 },
-    { 0x11, 8 },
-    { 0x31, 6 },
-    { 0x5, 6 },
-    { 0x21, 9 },
-    { 0xE7, 11 },
-    { 0x38, 9 },
-    { 0x1CD, 12 },
-    { 0x398, 13 },
-    { 0x7B, 7 },
-    { 0x9, 7 }
-  },
-  {  /* DC bias table 5 */
-    { 0x9, 4 },
-    { 0x2, 5 },
-    { 0x74, 7 },
-    { 0x7, 6 },
-    { 0xEC, 8 },
-    { 0xD1, 9 },
-    { 0x1A6, 10 },
-    { 0x6, 6 },
-    { 0xD21, 13 },
-    { 0x5, 3 },
-    { 0x6, 3 },
-    { 0x8, 4 },
-    { 0x7, 4 },
-    { 0xF, 4 },
-    { 0x4, 4 },
-    { 0x0, 4 },
-    { 0x1C, 5 },
-    { 0x2, 4 },
-    { 0x5, 4 },
-    { 0x3, 4 },
-    { 0xC, 5 },
-    { 0x35, 7 },
-    { 0x1A7, 10 },
-    { 0x1B, 6 },
-    { 0x77, 7 },
-    { 0x1A5, 10 },
-    { 0x349, 11 },
-    { 0xD0, 9 },
-    { 0x691, 12 },
-    { 0xD20, 13 },
-    { 0x75, 7 },
-    { 0xED, 8 }
-  },
-  {  /* DC bias table 6 */
-    { 0xA, 4 },
-    { 0xC, 5 },
-    { 0x12, 6 },
-    { 0x1B, 6 },
-    { 0xB7, 8 },
-    { 0x16C, 9 },
-    { 0x99, 9 },
-    { 0x5A, 7 },
-    { 0x16D8, 13 },
-    { 0x7, 3 },
-    { 0x6, 3 },
-    { 0x9, 4 },
-    { 0x8, 4 },
-    { 0x0, 3 },
-    { 0x5, 4 },
-    { 0x17, 5 },
-    { 0xE, 5 },
-    { 0x2, 4 },
-    { 0x3, 4 },
-    { 0xF, 5 },
-    { 0x1A, 6 },
-    { 0x4D, 8 },
-    { 0x2DB3, 14 },
-    { 0x2C, 6 },
-    { 0x11, 6 },
-    { 0x2DA, 10 },
-    { 0x5B7, 11 },
-    { 0x98, 9 },
-    { 0xB6D, 12 },
-    { 0x2DB2, 14 },
-    { 0x10, 6 },
-    { 0x27, 7 }
-  },
-  {  /* DC bias table 7 */
-    { 0xD, 4 },
-    { 0xF, 5 },
-    { 0x1D, 6 },
-    { 0x8, 5 },
-    { 0x51, 7 },
-    { 0x56, 8 },
-    { 0xAF, 9 },
-    { 0x2A, 7 },
-    { 0x148A, 13 },
-    { 0x7, 3 },
-    { 0x0, 2 },
-    { 0x8, 4 },
-    { 0x9, 4 },
-    { 0xC, 4 },
-    { 0x6, 4 },
-    { 0x17, 5 },
-    { 0xB, 5 },
-    { 0x16, 5 },
-    { 0x15, 5 },
-    { 0x9, 5 },
-    { 0x50, 7 },
-    { 0xAE, 9 },
-    { 0x2917, 14 },
-    { 0x1C, 6 },
-    { 0x14, 6 },
-    { 0x290, 10 },
-    { 0x523, 11 },
-    { 0x149, 9 },
-    { 0xA44, 12 },
-    { 0x2916, 14 },
-    { 0x53, 7 },
-    { 0xA5, 8 }
-  },
-  {  /* DC bias table 8 */
-    { 0x1, 4 },
-    { 0x1D, 6 },
-    { 0xF5, 8 },
-    { 0xF4, 8 },
-    { 0x24D, 10 },
-    { 0x499, 11 },
-    { 0x498, 11 },
-    { 0x1, 5 },
-    { 0x21, 6 },
-    { 0x6, 3 },
-    { 0x5, 3 },
-    { 0x6, 4 },
-    { 0x5, 4 },
-    { 0x2, 4 },
-    { 0x7, 5 },
-    { 0x25, 6 },
-    { 0x7B, 7 },
-    { 0x1C, 6 },
-    { 0x20, 6 },
-    { 0xD, 6 },
-    { 0x48, 7 },
-    { 0x92, 8 },
-    { 0x127, 9 },
-    { 0xE, 4 },
-    { 0x4, 4 },
-    { 0x11, 5 },
-    { 0xC, 6 },
-    { 0x3C, 6 },
-    { 0xF, 5 },
-    { 0x0, 5 },
-    { 0x1F, 5 },
-    { 0x13, 5 }
-  },
-  {  /* DC bias table 9 */
-    { 0x5, 4 },
-    { 0x3C, 6 },
-    { 0x40, 7 },
-    { 0xD, 7 },
-    { 0x31, 9 },
-    { 0x61, 10 },
-    { 0x60, 10 },
-    { 0x2, 5 },
-    { 0xF5, 8 },
-    { 0x6, 3 },
-    { 0x5, 3 },
-    { 0x7, 4 },
-    { 0x6, 4 },
-    { 0x2, 4 },
-    { 0x9, 5 },
-    { 0x25, 6 },
-    { 0x7, 6 },
-    { 0x21, 6 },
-    { 0x24, 6 },
-    { 0x10, 6 },
-    { 0x41, 7 },
-    { 0xF4, 8 },
-    { 0x19, 8 },
-    { 0xE, 4 },
-    { 0x3, 4 },
-    { 0x11, 5 },
-    { 0x11, 6 },
-    { 0x3F, 6 },
-    { 0x3E, 6 },
-    { 0x7B, 7 },
-    { 0x0, 4 },
-    { 0x13, 5 }
-  },
-  {  /* DC bias table 10 */
-    { 0xA, 4 },
-    { 0x7, 5 },
-    { 0x1, 6 },
-    { 0x9, 6 },
-    { 0x131, 9 },
-    { 0x261, 10 },
-    { 0x260, 10 },
-    { 0x15, 6 },
-    { 0x1, 7 },
-    { 0x7, 3 },
-    { 0x6, 3 },
-    { 0x8, 4 },
-    { 0x7, 4 },
-    { 0x6, 4 },
-    { 0x12, 5 },
-    { 0x2F, 6 },
-    { 0x14, 6 },
-    { 0x27, 6 },
-    { 0x2D, 6 },
-    { 0x16, 6 },
-    { 0x4D, 7 },
-    { 0x99, 8 },
-    { 0x0, 7 },
-    { 0x4, 4 },
-    { 0x1, 4 },
-    { 0x5, 5 },
-    { 0x17, 6 },
-    { 0x2E, 6 },
-    { 0x2C, 6 },
-    { 0x8, 6 },
-    { 0x6, 5 },
-    { 0x1, 5 }
-  },
-  {  /* DC bias table 11 */
-    { 0x0, 3 },
-    { 0xE, 5 },
-    { 0x17, 6 },
-    { 0x2A, 6 },
-    { 0x10, 7 },
-    { 0xF9, 10 },
-    { 0xF8, 10 },
-    { 0x1E, 7 },
-    { 0x3F, 8 },
-    { 0x7, 3 },
-    { 0x6, 3 },
-    { 0x9, 4 },
-    { 0x8, 4 },
-    { 0x6, 4 },
-    { 0xF, 5 },
-    { 0x5, 5 },
-    { 0x16, 6 },
-    { 0x29, 6 },
-    { 0x2B, 6 },
-    { 0x15, 6 },
-    { 0x50, 7 },
-    { 0x11, 7 },
-    { 0x7D, 9 },
-    { 0x4, 4 },
-    { 0x17, 5 },
-    { 0x6, 5 },
-    { 0x14, 6 },
-    { 0x2C, 6 },
-    { 0x2D, 6 },
-    { 0xE, 6 },
-    { 0x9, 6 },
-    { 0x51, 7 }
-  },
-  {  /* DC bias table 12 */
-    { 0x2, 3 },
-    { 0x18, 5 },
-    { 0x2F, 6 },
-    { 0xD, 5 },
-    { 0x53, 7 },
-    { 0x295, 10 },
-    { 0x294, 10 },
-    { 0xA4, 8 },
-    { 0x7C, 8 },
-    { 0x0, 2 },
-    { 0x7, 3 },
-    { 0x9, 4 },
-    { 0x8, 4 },
-    { 0x1B, 5 },
-    { 0xC, 5 },
-    { 0x28, 6 },
-    { 0x6A, 7 },
-    { 0x1E, 6 },
-    { 0x1D, 6 },
-    { 0x69, 7 },
-    { 0xD7, 8 },
-    { 0x7D, 8 },
-    { 0x14B, 9 },
-    { 0x19, 5 },
-    { 0x16, 5 },
-    { 0x2E, 6 },
-    { 0x1C, 6 },
-    { 0x2B, 6 },
-    { 0x2A, 6 },
-    { 0x68, 7 },
-    { 0x3F, 7 },
-    { 0xD6, 8 }
-  },
-  {  /* DC bias table 13 */
-    { 0x2, 3 },
-    { 0x1B, 5 },
-    { 0xC, 5 },
-    { 0x18, 5 },
-    { 0x29, 6 },
-    { 0x7F, 8 },
-    { 0x2F0, 10 },
-    { 0x198, 9 },
-    { 0x179, 9 },
-    { 0x0, 2 },
-    { 0x7, 3 },
-    { 0x9, 4 },
-    { 0x8, 4 },
-    { 0x1A, 5 },
-    { 0xD, 5 },
-    { 0x2A, 6 },
-    { 0x64, 7 },
-    { 0x1E, 6 },
-    { 0x67, 7 },
-    { 0x5F, 7 },
-    { 0xCD, 8 },
-    { 0x7E, 8 },
-    { 0x2F1, 10 },
-    { 0x16, 5 },
-    { 0xE, 5 },
-    { 0x2E, 6 },
-    { 0x65, 7 },
-    { 0x2B, 6 },
-    { 0x28, 6 },
-    { 0x3E, 7 },
-    { 0xBD, 8 },
-    { 0x199, 9 }
-  },
-  {  /* DC bias table 14 */
-    { 0x2, 3 },
-    { 0x7, 4 },
-    { 0x16, 5 },
-    { 0x6, 4 },
-    { 0x36, 6 },
-    { 0x5C, 7 },
-    { 0x15D, 9 },
-    { 0x15C, 9 },
-    { 0x2BF, 10 },
-    { 0x0, 2 },
-    { 0x7, 3 },
-    { 0x9, 4 },
-    { 0x8, 4 },
-    { 0x18, 5 },
-    { 0x34, 6 },
-    { 0x2A, 6 },
-    { 0x5E, 7 },
-    { 0x6A, 7 },
-    { 0x64, 7 },
-    { 0x5D, 7 },
-    { 0xCB, 8 },
-    { 0xAD, 8 },
-    { 0x2BE, 10 },
-    { 0x14, 5 },
-    { 0x33, 6 },
-    { 0x6E, 7 },
-    { 0x5F, 7 },
-    { 0x6F, 7 },
-    { 0x6B, 7 },
-    { 0xCA, 8 },
-    { 0xAC, 8 },
-    { 0x15E, 9 }
-  },
-  {  /* DC bias table 15 */
-    { 0xF, 4 },
-    { 0x1D, 5 },
-    { 0x18, 5 },
-    { 0xB, 4 },
-    { 0x19, 5 },
-    { 0x29, 6 },
-    { 0xD6, 8 },
-    { 0x551, 11 },
-    { 0xAA1, 12 },
-    { 0x1, 2 },
-    { 0x0, 2 },
-    { 0x9, 4 },
-    { 0x8, 4 },
-    { 0x1B, 5 },
-    { 0x38, 6 },
-    { 0x28, 6 },
-    { 0x57, 7 },
-    { 0x6A, 7 },
-    { 0x68, 7 },
-    { 0x56, 7 },
-    { 0xE5, 8 },
-    { 0x155, 9 },
-    { 0xAA0, 12 },
-    { 0x73, 7 },
-    { 0x69, 7 },
-    { 0xD7, 8 },
-    { 0xAB, 8 },
-    { 0xE4, 8 },
-    { 0xA9, 8 },
-    { 0x151, 9 },
-    { 0x150, 9 },
-    { 0x2A9, 10 }
-  }
+    { /* DC bias table 0 */
+        {   0x2D,  6 },
+        {   0x26,  7 },
+        {  0x166,  9 },
+        {   0x4E,  8 },
+        {  0x2CE, 10 },
+        {  0x59E, 11 },
+        {  0x27D, 11 },
+        {    0x8,  5 },
+        {  0x4F9, 12 },
+        {    0xF,  4 },
+        {    0xE,  4 },
+        {   0x1B,  5 },
+        {    0x6,  4 },
+        {    0x8,  4 },
+        {    0x5,  4 },
+        {   0x1A,  5 },
+        {   0x15,  5 },
+        {    0x7,  4 },
+        {    0xC,  4 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {    0x9,  4 },
+        {   0x17,  5 },
+        {   0x29,  6 },
+        {   0x28,  6 },
+        {   0xB2,  8 },
+        {  0x4F8, 12 },
+        {  0x59F, 11 },
+        {   0x9E,  9 },
+        {  0x13F, 10 },
+        {   0x12,  6 },
+        {   0x58,  7 }
+    },
+    { /* DC bias table 1 */
+        {   0x10,  5 },
+        {   0x47,  7 },
+        {  0x1FF,  9 },
+        {   0x8C,  8 },
+        {  0x3FC, 10 },
+        {  0x46A, 11 },
+        {  0x469, 11 },
+        {   0x22,  6 },
+        { 0x11A1, 13 },
+        {    0xE,  4 },
+        {    0xD,  4 },
+        {    0x4,  4 },
+        {    0x5,  4 },
+        {    0x9,  4 },
+        {    0x6,  4 },
+        {   0x1E,  5 },
+        {   0x16,  5 },
+        {    0x7,  4 },
+        {    0xC,  4 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {    0xA,  4 },
+        {   0x17,  5 },
+        {   0x7D,  7 },
+        {   0x7E,  7 },
+        {  0x11B,  9 },
+        {  0x8D1, 12 },
+        {  0x3FD, 10 },
+        {  0x46B, 11 },
+        { 0x11A0, 13 },
+        {   0x7C,  7 },
+        {   0xFE,  8 }
+    },
+    { /* DC bias table 2 */
+        {   0x16,  5 },
+        {   0x20,  6 },
+        {   0x86,  8 },
+        {   0x87,  8 },
+        {  0x367, 10 },
+        {  0x6CC, 11 },
+        {  0x6CB, 11 },
+        {   0x6E,  7 },
+        { 0x366D, 14 },
+        {    0xF,  4 },
+        {    0xE,  4 },
+        {    0x4,  4 },
+        {    0x5,  4 },
+        {    0xA,  4 },
+        {    0x6,  4 },
+        {   0x1A,  5 },
+        {   0x11,  5 },
+        {    0x7,  4 },
+        {    0xC,  4 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {    0x9,  4 },
+        {   0x17,  5 },
+        {   0x6F,  7 },
+        {   0x6D,  7 },
+        {  0x364, 10 },
+        {  0xD9A, 12 },
+        {  0x6CA, 11 },
+        { 0x1B37, 13 },
+        { 0x366C, 14 },
+        {   0x42,  7 },
+        {   0xD8,  8 }
+    },
+    { /* DC bias table 3 */
+        {    0x0,  4 },
+        {   0x2D,  6 },
+        {   0xF7,  8 },
+        {   0x58,  7 },
+        {  0x167,  9 },
+        {  0x2CB, 10 },
+        {  0x2CA, 10 },
+        {    0xE,  6 },
+        { 0x1661, 13 },
+        {    0x3,  3 },
+        {    0x2,  3 },
+        {    0x8,  4 },
+        {    0x9,  4 },
+        {    0xD,  4 },
+        {    0x2,  4 },
+        {   0x1F,  5 },
+        {   0x17,  5 },
+        {    0x1,  4 },
+        {    0xC,  4 },
+        {    0xE,  4 },
+        {    0xA,  4 },
+        {    0x6,  5 },
+        {   0x78,  7 },
+        {    0xF,  6 },
+        {   0x7A,  7 },
+        {  0x164,  9 },
+        {  0x599, 11 },
+        {  0x2CD, 10 },
+        {  0xB31, 12 },
+        { 0x1660, 13 },
+        {   0x79,  7 },
+        {   0xF6,  8 }
+    },
+    { /* DC bias table 4 */
+        {    0x3,  4 },
+        {   0x3C,  6 },
+        {    0xF,  7 },
+        {   0x7A,  7 },
+        {   0x1D,  8 },
+        {   0x20,  9 },
+        {   0x72, 10 },
+        {    0x6,  6 },
+        {  0x399, 13 },
+        {    0x4,  3 },
+        {    0x5,  3 },
+        {    0x5,  4 },
+        {    0x6,  4 },
+        {    0xE,  4 },
+        {    0x4,  4 },
+        {    0x0,  4 },
+        {   0x19,  5 },
+        {    0x2,  4 },
+        {    0xD,  4 },
+        {    0x7,  4 },
+        {   0x1F,  5 },
+        {   0x30,  6 },
+        {   0x11,  8 },
+        {   0x31,  6 },
+        {    0x5,  6 },
+        {   0x21,  9 },
+        {   0xE7, 11 },
+        {   0x38,  9 },
+        {  0x1CD, 12 },
+        {  0x398, 13 },
+        {   0x7B,  7 },
+        {    0x9,  7 }
+    },
+    { /* DC bias table 5 */
+        {    0x9,  4 },
+        {    0x2,  5 },
+        {   0x74,  7 },
+        {    0x7,  6 },
+        {   0xEC,  8 },
+        {   0xD1,  9 },
+        {  0x1A6, 10 },
+        {    0x6,  6 },
+        {  0xD21, 13 },
+        {    0x5,  3 },
+        {    0x6,  3 },
+        {    0x8,  4 },
+        {    0x7,  4 },
+        {    0xF,  4 },
+        {    0x4,  4 },
+        {    0x0,  4 },
+        {   0x1C,  5 },
+        {    0x2,  4 },
+        {    0x5,  4 },
+        {    0x3,  4 },
+        {    0xC,  5 },
+        {   0x35,  7 },
+        {  0x1A7, 10 },
+        {   0x1B,  6 },
+        {   0x77,  7 },
+        {  0x1A5, 10 },
+        {  0x349, 11 },
+        {   0xD0,  9 },
+        {  0x691, 12 },
+        {  0xD20, 13 },
+        {   0x75,  7 },
+        {   0xED,  8 }
+    },
+    { /* DC bias table 6 */
+        {    0xA,  4 },
+        {    0xC,  5 },
+        {   0x12,  6 },
+        {   0x1B,  6 },
+        {   0xB7,  8 },
+        {  0x16C,  9 },
+        {   0x99,  9 },
+        {   0x5A,  7 },
+        { 0x16D8, 13 },
+        {    0x7,  3 },
+        {    0x6,  3 },
+        {    0x9,  4 },
+        {    0x8,  4 },
+        {    0x0,  3 },
+        {    0x5,  4 },
+        {   0x17,  5 },
+        {    0xE,  5 },
+        {    0x2,  4 },
+        {    0x3,  4 },
+        {    0xF,  5 },
+        {   0x1A,  6 },
+        {   0x4D,  8 },
+        { 0x2DB3, 14 },
+        {   0x2C,  6 },
+        {   0x11,  6 },
+        {  0x2DA, 10 },
+        {  0x5B7, 11 },
+        {   0x98,  9 },
+        {  0xB6D, 12 },
+        { 0x2DB2, 14 },
+        {   0x10,  6 },
+        {   0x27,  7 }
+    },
+    { /* DC bias table 7 */
+        {    0xD,  4 },
+        {    0xF,  5 },
+        {   0x1D,  6 },
+        {    0x8,  5 },
+        {   0x51,  7 },
+        {   0x56,  8 },
+        {   0xAF,  9 },
+        {   0x2A,  7 },
+        { 0x148A, 13 },
+        {    0x7,  3 },
+        {    0x0,  2 },
+        {    0x8,  4 },
+        {    0x9,  4 },
+        {    0xC,  4 },
+        {    0x6,  4 },
+        {   0x17,  5 },
+        {    0xB,  5 },
+        {   0x16,  5 },
+        {   0x15,  5 },
+        {    0x9,  5 },
+        {   0x50,  7 },
+        {   0xAE,  9 },
+        { 0x2917, 14 },
+        {   0x1C,  6 },
+        {   0x14,  6 },
+        {  0x290, 10 },
+        {  0x523, 11 },
+        {  0x149,  9 },
+        {  0xA44, 12 },
+        { 0x2916, 14 },
+        {   0x53,  7 },
+        {   0xA5,  8 }
+    },
+    { /* DC bias table 8 */
+        {    0x1,  4 },
+        {   0x1D,  6 },
+        {   0xF5,  8 },
+        {   0xF4,  8 },
+        {  0x24D, 10 },
+        {  0x499, 11 },
+        {  0x498, 11 },
+        {    0x1,  5 },
+        {   0x21,  6 },
+        {    0x6,  3 },
+        {    0x5,  3 },
+        {    0x6,  4 },
+        {    0x5,  4 },
+        {    0x2,  4 },
+        {    0x7,  5 },
+        {   0x25,  6 },
+        {   0x7B,  7 },
+        {   0x1C,  6 },
+        {   0x20,  6 },
+        {    0xD,  6 },
+        {   0x48,  7 },
+        {   0x92,  8 },
+        {  0x127,  9 },
+        {    0xE,  4 },
+        {    0x4,  4 },
+        {   0x11,  5 },
+        {    0xC,  6 },
+        {   0x3C,  6 },
+        {    0xF,  5 },
+        {    0x0,  5 },
+        {   0x1F,  5 },
+        {   0x13,  5 }
+    },
+    { /* DC bias table 9 */
+        {    0x5,  4 },
+        {   0x3C,  6 },
+        {   0x40,  7 },
+        {    0xD,  7 },
+        {   0x31,  9 },
+        {   0x61, 10 },
+        {   0x60, 10 },
+        {    0x2,  5 },
+        {   0xF5,  8 },
+        {    0x6,  3 },
+        {    0x5,  3 },
+        {    0x7,  4 },
+        {    0x6,  4 },
+        {    0x2,  4 },
+        {    0x9,  5 },
+        {   0x25,  6 },
+        {    0x7,  6 },
+        {   0x21,  6 },
+        {   0x24,  6 },
+        {   0x10,  6 },
+        {   0x41,  7 },
+        {   0xF4,  8 },
+        {   0x19,  8 },
+        {    0xE,  4 },
+        {    0x3,  4 },
+        {   0x11,  5 },
+        {   0x11,  6 },
+        {   0x3F,  6 },
+        {   0x3E,  6 },
+        {   0x7B,  7 },
+        {    0x0,  4 },
+        {   0x13,  5 }
+    },
+    { /* DC bias table 10 */
+        {    0xA,  4 },
+        {    0x7,  5 },
+        {    0x1,  6 },
+        {    0x9,  6 },
+        {  0x131,  9 },
+        {  0x261, 10 },
+        {  0x260, 10 },
+        {   0x15,  6 },
+        {    0x1,  7 },
+        {    0x7,  3 },
+        {    0x6,  3 },
+        {    0x8,  4 },
+        {    0x7,  4 },
+        {    0x6,  4 },
+        {   0x12,  5 },
+        {   0x2F,  6 },
+        {   0x14,  6 },
+        {   0x27,  6 },
+        {   0x2D,  6 },
+        {   0x16,  6 },
+        {   0x4D,  7 },
+        {   0x99,  8 },
+        {    0x0,  7 },
+        {    0x4,  4 },
+        {    0x1,  4 },
+        {    0x5,  5 },
+        {   0x17,  6 },
+        {   0x2E,  6 },
+        {   0x2C,  6 },
+        {    0x8,  6 },
+        {    0x6,  5 },
+        {    0x1,  5 }
+    },
+    { /* DC bias table 11 */
+        {    0x0,  3 },
+        {    0xE,  5 },
+        {   0x17,  6 },
+        {   0x2A,  6 },
+        {   0x10,  7 },
+        {   0xF9, 10 },
+        {   0xF8, 10 },
+        {   0x1E,  7 },
+        {   0x3F,  8 },
+        {    0x7,  3 },
+        {    0x6,  3 },
+        {    0x9,  4 },
+        {    0x8,  4 },
+        {    0x6,  4 },
+        {    0xF,  5 },
+        {    0x5,  5 },
+        {   0x16,  6 },
+        {   0x29,  6 },
+        {   0x2B,  6 },
+        {   0x15,  6 },
+        {   0x50,  7 },
+        {   0x11,  7 },
+        {   0x7D,  9 },
+        {    0x4,  4 },
+        {   0x17,  5 },
+        {    0x6,  5 },
+        {   0x14,  6 },
+        {   0x2C,  6 },
+        {   0x2D,  6 },
+        {    0xE,  6 },
+        {    0x9,  6 },
+        {   0x51,  7 }
+    },
+    { /* DC bias table 12 */
+        {    0x2,  3 },
+        {   0x18,  5 },
+        {   0x2F,  6 },
+        {    0xD,  5 },
+        {   0x53,  7 },
+        {  0x295, 10 },
+        {  0x294, 10 },
+        {   0xA4,  8 },
+        {   0x7C,  8 },
+        {    0x0,  2 },
+        {    0x7,  3 },
+        {    0x9,  4 },
+        {    0x8,  4 },
+        {   0x1B,  5 },
+        {    0xC,  5 },
+        {   0x28,  6 },
+        {   0x6A,  7 },
+        {   0x1E,  6 },
+        {   0x1D,  6 },
+        {   0x69,  7 },
+        {   0xD7,  8 },
+        {   0x7D,  8 },
+        {  0x14B,  9 },
+        {   0x19,  5 },
+        {   0x16,  5 },
+        {   0x2E,  6 },
+        {   0x1C,  6 },
+        {   0x2B,  6 },
+        {   0x2A,  6 },
+        {   0x68,  7 },
+        {   0x3F,  7 },
+        {   0xD6,  8 }
+    },
+    { /* DC bias table 13 */
+        {    0x2,  3 },
+        {   0x1B,  5 },
+        {    0xC,  5 },
+        {   0x18,  5 },
+        {   0x29,  6 },
+        {   0x7F,  8 },
+        {  0x2F0, 10 },
+        {  0x198,  9 },
+        {  0x179,  9 },
+        {    0x0,  2 },
+        {    0x7,  3 },
+        {    0x9,  4 },
+        {    0x8,  4 },
+        {   0x1A,  5 },
+        {    0xD,  5 },
+        {   0x2A,  6 },
+        {   0x64,  7 },
+        {   0x1E,  6 },
+        {   0x67,  7 },
+        {   0x5F,  7 },
+        {   0xCD,  8 },
+        {   0x7E,  8 },
+        {  0x2F1, 10 },
+        {   0x16,  5 },
+        {    0xE,  5 },
+        {   0x2E,  6 },
+        {   0x65,  7 },
+        {   0x2B,  6 },
+        {   0x28,  6 },
+        {   0x3E,  7 },
+        {   0xBD,  8 },
+        {  0x199,  9 }
+    },
+    { /* DC bias table 14 */
+        {    0x2,  3 },
+        {    0x7,  4 },
+        {   0x16,  5 },
+        {    0x6,  4 },
+        {   0x36,  6 },
+        {   0x5C,  7 },
+        {  0x15D,  9 },
+        {  0x15C,  9 },
+        {  0x2BF, 10 },
+        {    0x0,  2 },
+        {    0x7,  3 },
+        {    0x9,  4 },
+        {    0x8,  4 },
+        {   0x18,  5 },
+        {   0x34,  6 },
+        {   0x2A,  6 },
+        {   0x5E,  7 },
+        {   0x6A,  7 },
+        {   0x64,  7 },
+        {   0x5D,  7 },
+        {   0xCB,  8 },
+        {   0xAD,  8 },
+        {  0x2BE, 10 },
+        {   0x14,  5 },
+        {   0x33,  6 },
+        {   0x6E,  7 },
+        {   0x5F,  7 },
+        {   0x6F,  7 },
+        {   0x6B,  7 },
+        {   0xCA,  8 },
+        {   0xAC,  8 },
+        {  0x15E,  9 }
+    },
+    { /* DC bias table 15 */
+        {    0xF,  4 },
+        {   0x1D,  5 },
+        {   0x18,  5 },
+        {    0xB,  4 },
+        {   0x19,  5 },
+        {   0x29,  6 },
+        {   0xD6,  8 },
+        {  0x551, 11 },
+        {  0xAA1, 12 },
+        {    0x1,  2 },
+        {    0x0,  2 },
+        {    0x9,  4 },
+        {    0x8,  4 },
+        {   0x1B,  5 },
+        {   0x38,  6 },
+        {   0x28,  6 },
+        {   0x57,  7 },
+        {   0x6A,  7 },
+        {   0x68,  7 },
+        {   0x56,  7 },
+        {   0xE5,  8 },
+        {  0x155,  9 },
+        {  0xAA0, 12 },
+        {   0x73,  7 },
+        {   0x69,  7 },
+        {   0xD7,  8 },
+        {   0xAB,  8 },
+        {   0xE4,  8 },
+        {   0xA9,  8 },
+        {  0x151,  9 },
+        {  0x150,  9 },
+        {  0x2A9, 10 }
+    }
 };
 
 static const uint16_t ac_bias_0[16][32][2] = {
-  {  /* AC bias group 1, table 0 */
-    { 0x8, 5 },
-    { 0x25, 7 },
-    { 0x17A, 9 },
-    { 0x2F7, 10 },
-    { 0xBDB, 12 },
-    { 0x17B4, 13 },
-    { 0x2F6B, 14 },
-    { 0x1D, 5 },
-    { 0x2F6A, 14 },
-    { 0x8, 4 },
-    { 0x7, 4 },
-    { 0x1, 4 },
-    { 0x2, 4 },
-    { 0xA, 4 },
-    { 0x6, 4 },
-    { 0x0, 4 },
-    { 0x1C, 5 },
-    { 0x9, 4 },
-    { 0xD, 4 },
-    { 0xF, 4 },
-    { 0xC, 4 },
-    { 0x3, 4 },
-    { 0xA, 5 },
-    { 0x16, 5 },
-    { 0x13, 6 },
-    { 0x5D, 7 },
-    { 0x24, 7 },
-    { 0xBC, 8 },
-    { 0x5C, 7 },
-    { 0x5EC, 11 },
-    { 0xB, 5 },
-    { 0x5F, 7 }
-  },
-  {  /* AC bias group 1, table 1 */
-    { 0xF, 5 },
-    { 0x10, 6 },
-    { 0x4B, 8 },
-    { 0xC6, 8 },
-    { 0x31D, 10 },
-    { 0xC71, 12 },
-    { 0xC70, 12 },
-    { 0x1, 4 },
-    { 0xC73, 12 },
-    { 0x8, 4 },
-    { 0x9, 4 },
-    { 0x2, 4 },
-    { 0x3, 4 },
-    { 0xB, 4 },
-    { 0x6, 4 },
-    { 0x0, 4 },
-    { 0x1C, 5 },
-    { 0x5, 4 },
-    { 0xD, 4 },
-    { 0xF, 4 },
-    { 0xA, 4 },
-    { 0x19, 5 },
-    { 0x13, 6 },
-    { 0x1D, 5 },
-    { 0x30, 6 },
-    { 0x62, 7 },
-    { 0x24, 7 },
-    { 0x4A, 8 },
-    { 0x18F, 9 },
-    { 0xC72, 12 },
-    { 0xE, 5 },
-    { 0x11, 6 }
-  },
-  {  /* AC bias group 1, table 2 */
-    { 0x1B, 5 },
-    { 0x3, 6 },
-    { 0x8D, 8 },
-    { 0x40, 7 },
-    { 0x239, 10 },
-    { 0x471, 11 },
-    { 0x8E0, 12 },
-    { 0x3, 4 },
-    { 0x11C3, 13 },
-    { 0xA, 4 },
-    { 0x9, 4 },
-    { 0x4, 4 },
-    { 0x5, 4 },
-    { 0xE, 4 },
-    { 0x7, 4 },
-    { 0x1, 4 },
-    { 0x1E, 5 },
-    { 0x6, 4 },
-    { 0xC, 4 },
-    { 0xB, 4 },
-    { 0x2, 4 },
-    { 0x0, 5 },
-    { 0x41, 7 },
-    { 0x1F, 5 },
-    { 0x22, 6 },
-    { 0x2, 6 },
-    { 0x8F, 8 },
-    { 0x8C, 8 },
-    { 0x11D, 9 },
-    { 0x11C2, 13 },
-    { 0x1A, 5 },
-    { 0x21, 6 }
-  },
-  {  /* AC bias group 1, table 3 */
-    { 0x1F, 5 },
-    { 0x3, 6 },
-    { 0x3, 7 },
-    { 0x43, 7 },
-    { 0xB, 9 },
-    { 0x15, 10 },
-    { 0x51, 12 },
-    { 0x3, 4 },
-    { 0x50, 12 },
-    { 0xD, 4 },
-    { 0xC, 4 },
-    { 0x4, 4 },
-    { 0x6, 4 },
-    { 0xE, 4 },
-    { 0xA, 4 },
-    { 0x1, 4 },
-    { 0x1E, 5 },
-    { 0x5, 4 },
-    { 0x9, 4 },
-    { 0x7, 4 },
-    { 0x11, 5 },
-    { 0x2, 6 },
-    { 0x4, 8 },
-    { 0x2, 4 },
-    { 0x2D, 6 },
-    { 0x20, 6 },
-    { 0x42, 7 },
-    { 0x1, 7 },
-    { 0x0, 7 },
-    { 0x29, 11 },
-    { 0x17, 5 },
-    { 0x2C, 6 }
-  },
-  {  /* AC bias group 1, table 4 */
-    { 0x3, 4 },
-    { 0x1F, 6 },
-    { 0x3A, 7 },
-    { 0x5D, 7 },
-    { 0x173, 9 },
-    { 0x2E4, 10 },
-    { 0x172D, 13 },
-    { 0x4, 4 },
-    { 0x172C, 13 },
-    { 0xF, 4 },
-    { 0xE, 4 },
-    { 0x9, 4 },
-    { 0x8, 4 },
-    { 0xC, 4 },
-    { 0xA, 4 },
-    { 0x1, 4 },
-    { 0x16, 5 },
-    { 0x2, 4 },
-    { 0x5, 4 },
-    { 0x1A, 5 },
-    { 0x2F, 6 },
-    { 0x38, 7 },
-    { 0x5CA, 11 },
-    { 0x6, 4 },
-    { 0x37, 6 },
-    { 0x1E, 6 },
-    { 0x3B, 7 },
-    { 0x39, 7 },
-    { 0xB8, 8 },
-    { 0xB97, 12 },
-    { 0x0, 4 },
-    { 0x36, 6 }
-  },
-  {  /* AC bias group 1, table 5 */
-    { 0x6, 4 },
-    { 0x37, 6 },
-    { 0x5D, 7 },
-    { 0xC, 6 },
-    { 0xB9, 8 },
-    { 0x2E3, 10 },
-    { 0x5C4, 11 },
-    { 0x4, 4 },
-    { 0x1715, 13 },
-    { 0x0, 3 },
-    { 0xF, 4 },
-    { 0x8, 4 },
-    { 0x7, 4 },
-    { 0xC, 4 },
-    { 0x9, 4 },
-    { 0x1D, 5 },
-    { 0x16, 5 },
-    { 0x1C, 5 },
-    { 0x1A, 5 },
-    { 0xB, 5 },
-    { 0x5E, 7 },
-    { 0x170, 9 },
-    { 0x1714, 13 },
-    { 0xA, 4 },
-    { 0xA, 5 },
-    { 0x36, 6 },
-    { 0x5F, 7 },
-    { 0x1B, 7 },
-    { 0x1A, 7 },
-    { 0xB8B, 12 },
-    { 0x2, 4 },
-    { 0x7, 5 }
-  },
-  {  /* AC bias group 1, table 6 */
-    { 0xC, 4 },
-    { 0xB, 5 },
-    { 0x79, 7 },
-    { 0x22, 6 },
-    { 0xF0, 8 },
-    { 0x119, 9 },
-    { 0x230, 10 },
-    { 0x1D, 5 },
-    { 0x8C4, 12 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0xA, 4 },
-    { 0x9, 4 },
-    { 0xB, 4 },
-    { 0x7, 4 },
-    { 0x1C, 5 },
-    { 0x3D, 6 },
-    { 0xD, 5 },
-    { 0x8, 5 },
-    { 0x15, 6 },
-    { 0x8D, 8 },
-    { 0x118B, 13 },
-    { 0x118A, 13 },
-    { 0xD, 4 },
-    { 0x10, 5 },
-    { 0x9, 5 },
-    { 0x14, 6 },
-    { 0x47, 7 },
-    { 0xF1, 8 },
-    { 0x463, 11 },
-    { 0x1F, 5 },
-    { 0xC, 5 }
-  },
-  {  /* AC bias group 1, table 7 */
-    { 0x0, 3 },
-    { 0x1A, 5 },
-    { 0x33, 6 },
-    { 0xC, 5 },
-    { 0x46, 7 },
-    { 0x1E3, 9 },
-    { 0x3C5, 10 },
-    { 0x17, 5 },
-    { 0x1E21, 13 },
-    { 0x2, 3 },
-    { 0x1, 3 },
-    { 0x9, 4 },
-    { 0xA, 4 },
-    { 0x7, 4 },
-    { 0x1B, 5 },
-    { 0x3D, 6 },
-    { 0x1B, 6 },
-    { 0x22, 6 },
-    { 0x79, 7 },
-    { 0xF0, 8 },
-    { 0x1E20, 13 },
-    { 0x1E23, 13 },
-    { 0x1E22, 13 },
-    { 0xE, 4 },
-    { 0x16, 5 },
-    { 0x18, 5 },
-    { 0x32, 6 },
-    { 0x1A, 6 },
-    { 0x47, 7 },
-    { 0x789, 11 },
-    { 0x1F, 5 },
-    { 0x10, 5 }
-  },
-  {  /* AC bias group 1, table 8 */
-    { 0x1D, 5 },
-    { 0x61, 7 },
-    { 0x4E, 8 },
-    { 0x9E, 9 },
-    { 0x27C, 11 },
-    { 0x9F5, 13 },
-    { 0x9F4, 13 },
-    { 0x3, 4 },
-    { 0x60, 7 },
-    { 0x0, 3 },
-    { 0xF, 4 },
-    { 0xB, 4 },
-    { 0xA, 4 },
-    { 0x9, 4 },
-    { 0x5, 4 },
-    { 0xD, 5 },
-    { 0x31, 6 },
-    { 0x8, 5 },
-    { 0x38, 6 },
-    { 0x12, 6 },
-    { 0x26, 7 },
-    { 0x13F, 10 },
-    { 0x4FB, 12 },
-    { 0xD, 4 },
-    { 0x2, 4 },
-    { 0xC, 5 },
-    { 0x39, 6 },
-    { 0x1C, 6 },
-    { 0xF, 5 },
-    { 0x1D, 6 },
-    { 0x8, 4 },
-    { 0x19, 5 }
-  },
-  {  /* AC bias group 1, table 9 */
-    { 0x7, 4 },
-    { 0x19, 6 },
-    { 0xAB, 8 },
-    { 0xAA, 8 },
-    { 0x119, 10 },
-    { 0x461, 12 },
-    { 0x460, 12 },
-    { 0x1B, 5 },
-    { 0x47, 8 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0xC, 4 },
-    { 0xB, 4 },
-    { 0x9, 4 },
-    { 0x5, 4 },
-    { 0xD, 5 },
-    { 0x35, 6 },
-    { 0x3D, 6 },
-    { 0x3C, 6 },
-    { 0x18, 6 },
-    { 0x22, 7 },
-    { 0x8D, 9 },
-    { 0x231, 11 },
-    { 0xE, 4 },
-    { 0x1F, 5 },
-    { 0x9, 5 },
-    { 0x2B, 6 },
-    { 0x10, 6 },
-    { 0x34, 6 },
-    { 0x54, 7 },
-    { 0x8, 4 },
-    { 0x14, 5 }
-  },
-  {  /* AC bias group 1, table 10 */
-    { 0xC, 4 },
-    { 0x5, 5 },
-    { 0x8, 6 },
-    { 0x5B, 7 },
-    { 0x4D, 9 },
-    { 0x131, 11 },
-    { 0x261, 12 },
-    { 0x1A, 5 },
-    { 0x12, 7 },
-    { 0x0, 3 },
-    { 0xF, 4 },
-    { 0xA, 4 },
-    { 0x9, 4 },
-    { 0x6, 4 },
-    { 0x1B, 5 },
-    { 0x6, 5 },
-    { 0x1C, 6 },
-    { 0x2C, 6 },
-    { 0x15, 6 },
-    { 0x5A, 7 },
-    { 0x27, 8 },
-    { 0x99, 10 },
-    { 0x260, 12 },
-    { 0xE, 4 },
-    { 0x4, 4 },
-    { 0xF, 5 },
-    { 0x7, 5 },
-    { 0x1D, 6 },
-    { 0xB, 5 },
-    { 0x14, 6 },
-    { 0x8, 4 },
-    { 0x17, 5 }
-  },
-  {  /* AC bias group 1, table 11 */
-    { 0xF, 4 },
-    { 0x13, 5 },
-    { 0x75, 7 },
-    { 0x24, 6 },
-    { 0x95, 8 },
-    { 0x251, 10 },
-    { 0x4A0, 11 },
-    { 0x10, 5 },
-    { 0xC8, 8 },
-    { 0x2, 3 },
-    { 0x1, 3 },
-    { 0x1, 4 },
-    { 0x0, 4 },
-    { 0x1A, 5 },
-    { 0x11, 5 },
-    { 0x2C, 6 },
-    { 0x65, 7 },
-    { 0x74, 7 },
-    { 0x4B, 7 },
-    { 0xC9, 8 },
-    { 0x129, 9 },
-    { 0x943, 12 },
-    { 0x942, 12 },
-    { 0x3, 3 },
-    { 0xA, 4 },
-    { 0x1C, 5 },
-    { 0x18, 5 },
-    { 0x33, 6 },
-    { 0x17, 5 },
-    { 0x2D, 6 },
-    { 0x1B, 5 },
-    { 0x3B, 6 }
-  },
-  {  /* AC bias group 1, table 12 */
-    { 0x3, 3 },
-    { 0x1A, 5 },
-    { 0x2D, 6 },
-    { 0x38, 6 },
-    { 0x28, 7 },
-    { 0x395, 10 },
-    { 0xE51, 12 },
-    { 0x37, 6 },
-    { 0xE4, 8 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0x1F, 5 },
-    { 0x1E, 5 },
-    { 0x17, 5 },
-    { 0x3A, 6 },
-    { 0x73, 7 },
-    { 0x2A, 7 },
-    { 0x2B, 7 },
-    { 0x29, 7 },
-    { 0x1CB, 9 },
-    { 0x729, 11 },
-    { 0x1CA1, 13 },
-    { 0x1CA0, 13 },
-    { 0x4, 3 },
-    { 0xA, 4 },
-    { 0x4, 4 },
-    { 0x18, 5 },
-    { 0x36, 6 },
-    { 0xB, 5 },
-    { 0x2C, 6 },
-    { 0x19, 5 },
-    { 0x3B, 6 }
-  },
-  {  /* AC bias group 1, table 13 */
-    { 0x4, 3 },
-    { 0x4, 4 },
-    { 0x3F, 6 },
-    { 0x17, 5 },
-    { 0x75, 7 },
-    { 0x1F5, 9 },
-    { 0x7D1, 11 },
-    { 0x17, 6 },
-    { 0x1F6, 9 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0x1B, 5 },
-    { 0x1A, 5 },
-    { 0xA, 5 },
-    { 0x32, 6 },
-    { 0x74, 7 },
-    { 0xF8, 8 },
-    { 0xF9, 8 },
-    { 0x1F7, 9 },
-    { 0x3E9, 10 },
-    { 0xFA0, 12 },
-    { 0x1F43, 13 },
-    { 0x1F42, 13 },
-    { 0x3, 3 },
-    { 0xA, 4 },
-    { 0x1E, 5 },
-    { 0x1C, 5 },
-    { 0x3B, 6 },
-    { 0x18, 5 },
-    { 0x16, 6 },
-    { 0x16, 5 },
-    { 0x33, 6 }
-  },
-  {  /* AC bias group 1, table 14 */
-    { 0x4, 3 },
-    { 0x7, 4 },
-    { 0x18, 5 },
-    { 0x1E, 5 },
-    { 0x36, 6 },
-    { 0x31, 7 },
-    { 0x177, 9 },
-    { 0x77, 7 },
-    { 0x176, 9 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0x1A, 5 },
-    { 0x19, 5 },
-    { 0x3A, 6 },
-    { 0x19, 6 },
-    { 0x5C, 7 },
-    { 0xBA, 8 },
-    { 0x61, 8 },
-    { 0xC1, 9 },
-    { 0x180, 10 },
-    { 0x302, 11 },
-    { 0x607, 12 },
-    { 0x606, 12 },
-    { 0x2, 3 },
-    { 0xA, 4 },
-    { 0x1F, 5 },
-    { 0x1C, 5 },
-    { 0x37, 6 },
-    { 0x16, 5 },
-    { 0x76, 7 },
-    { 0xD, 5 },
-    { 0x2F, 6 }
-  },
-  {  /* AC bias group 1, table 15 */
-    { 0x0, 3 },
-    { 0xA, 4 },
-    { 0x1A, 5 },
-    { 0xC, 4 },
-    { 0x1D, 5 },
-    { 0x39, 6 },
-    { 0x78, 7 },
-    { 0x5E, 7 },
-    { 0x393, 11 },
-    { 0x2, 3 },
-    { 0x1, 3 },
-    { 0x16, 5 },
-    { 0xF, 5 },
-    { 0x2E, 6 },
-    { 0x5F, 7 },
-    { 0x73, 8 },
-    { 0xE5, 9 },
-    { 0x1C8, 10 },
-    { 0xE4A, 13 },
-    { 0x1C97, 14 },
-    { 0x1C96, 14 },
-    { 0xE49, 13 },
-    { 0xE48, 13 },
-    { 0x4, 3 },
-    { 0x6, 4 },
-    { 0x1F, 5 },
-    { 0x1B, 5 },
-    { 0x1D, 6 },
-    { 0x38, 6 },
-    { 0x38, 7 },
-    { 0x3D, 6 },
-    { 0x79, 7 }
-  }
+    { /* AC bias group 1, table 0 */
+        {    0x8,  5 },
+        {   0x25,  7 },
+        {  0x17A,  9 },
+        {  0x2F7, 10 },
+        {  0xBDB, 12 },
+        { 0x17B4, 13 },
+        { 0x2F6B, 14 },
+        {   0x1D,  5 },
+        { 0x2F6A, 14 },
+        {    0x8,  4 },
+        {    0x7,  4 },
+        {    0x1,  4 },
+        {    0x2,  4 },
+        {    0xA,  4 },
+        {    0x6,  4 },
+        {    0x0,  4 },
+        {   0x1C,  5 },
+        {    0x9,  4 },
+        {    0xD,  4 },
+        {    0xF,  4 },
+        {    0xC,  4 },
+        {    0x3,  4 },
+        {    0xA,  5 },
+        {   0x16,  5 },
+        {   0x13,  6 },
+        {   0x5D,  7 },
+        {   0x24,  7 },
+        {   0xBC,  8 },
+        {   0x5C,  7 },
+        {  0x5EC, 11 },
+        {    0xB,  5 },
+        {   0x5F,  7 }
+    },
+    { /* AC bias group 1, table 1 */
+        {    0xF,  5 },
+        {   0x10,  6 },
+        {   0x4B,  8 },
+        {   0xC6,  8 },
+        {  0x31D, 10 },
+        {  0xC71, 12 },
+        {  0xC70, 12 },
+        {    0x1,  4 },
+        {  0xC73, 12 },
+        {    0x8,  4 },
+        {    0x9,  4 },
+        {    0x2,  4 },
+        {    0x3,  4 },
+        {    0xB,  4 },
+        {    0x6,  4 },
+        {    0x0,  4 },
+        {   0x1C,  5 },
+        {    0x5,  4 },
+        {    0xD,  4 },
+        {    0xF,  4 },
+        {    0xA,  4 },
+        {   0x19,  5 },
+        {   0x13,  6 },
+        {   0x1D,  5 },
+        {   0x30,  6 },
+        {   0x62,  7 },
+        {   0x24,  7 },
+        {   0x4A,  8 },
+        {  0x18F,  9 },
+        {  0xC72, 12 },
+        {    0xE,  5 },
+        {   0x11,  6 }
+    },
+    { /* AC bias group 1, table 2 */
+        {   0x1B,  5 },
+        {    0x3,  6 },
+        {   0x8D,  8 },
+        {   0x40,  7 },
+        {  0x239, 10 },
+        {  0x471, 11 },
+        {  0x8E0, 12 },
+        {    0x3,  4 },
+        { 0x11C3, 13 },
+        {    0xA,  4 },
+        {    0x9,  4 },
+        {    0x4,  4 },
+        {    0x5,  4 },
+        {    0xE,  4 },
+        {    0x7,  4 },
+        {    0x1,  4 },
+        {   0x1E,  5 },
+        {    0x6,  4 },
+        {    0xC,  4 },
+        {    0xB,  4 },
+        {    0x2,  4 },
+        {    0x0,  5 },
+        {   0x41,  7 },
+        {   0x1F,  5 },
+        {   0x22,  6 },
+        {    0x2,  6 },
+        {   0x8F,  8 },
+        {   0x8C,  8 },
+        {  0x11D,  9 },
+        { 0x11C2, 13 },
+        {   0x1A,  5 },
+        {   0x21,  6 }
+    },
+    { /* AC bias group 1, table 3 */
+        {   0x1F,  5 },
+        {    0x3,  6 },
+        {    0x3,  7 },
+        {   0x43,  7 },
+        {    0xB,  9 },
+        {   0x15, 10 },
+        {   0x51, 12 },
+        {    0x3,  4 },
+        {   0x50, 12 },
+        {    0xD,  4 },
+        {    0xC,  4 },
+        {    0x4,  4 },
+        {    0x6,  4 },
+        {    0xE,  4 },
+        {    0xA,  4 },
+        {    0x1,  4 },
+        {   0x1E,  5 },
+        {    0x5,  4 },
+        {    0x9,  4 },
+        {    0x7,  4 },
+        {   0x11,  5 },
+        {    0x2,  6 },
+        {    0x4,  8 },
+        {    0x2,  4 },
+        {   0x2D,  6 },
+        {   0x20,  6 },
+        {   0x42,  7 },
+        {    0x1,  7 },
+        {    0x0,  7 },
+        {   0x29, 11 },
+        {   0x17,  5 },
+        {   0x2C,  6 }
+    },
+    { /* AC bias group 1, table 4 */
+        {    0x3,  4 },
+        {   0x1F,  6 },
+        {   0x3A,  7 },
+        {   0x5D,  7 },
+        {  0x173,  9 },
+        {  0x2E4, 10 },
+        { 0x172D, 13 },
+        {    0x4,  4 },
+        { 0x172C, 13 },
+        {    0xF,  4 },
+        {    0xE,  4 },
+        {    0x9,  4 },
+        {    0x8,  4 },
+        {    0xC,  4 },
+        {    0xA,  4 },
+        {    0x1,  4 },
+        {   0x16,  5 },
+        {    0x2,  4 },
+        {    0x5,  4 },
+        {   0x1A,  5 },
+        {   0x2F,  6 },
+        {   0x38,  7 },
+        {  0x5CA, 11 },
+        {    0x6,  4 },
+        {   0x37,  6 },
+        {   0x1E,  6 },
+        {   0x3B,  7 },
+        {   0x39,  7 },
+        {   0xB8,  8 },
+        {  0xB97, 12 },
+        {    0x0,  4 },
+        {   0x36,  6 }
+    },
+    { /* AC bias group 1, table 5 */
+        {    0x6,  4 },
+        {   0x37,  6 },
+        {   0x5D,  7 },
+        {    0xC,  6 },
+        {   0xB9,  8 },
+        {  0x2E3, 10 },
+        {  0x5C4, 11 },
+        {    0x4,  4 },
+        { 0x1715, 13 },
+        {    0x0,  3 },
+        {    0xF,  4 },
+        {    0x8,  4 },
+        {    0x7,  4 },
+        {    0xC,  4 },
+        {    0x9,  4 },
+        {   0x1D,  5 },
+        {   0x16,  5 },
+        {   0x1C,  5 },
+        {   0x1A,  5 },
+        {    0xB,  5 },
+        {   0x5E,  7 },
+        {  0x170,  9 },
+        { 0x1714, 13 },
+        {    0xA,  4 },
+        {    0xA,  5 },
+        {   0x36,  6 },
+        {   0x5F,  7 },
+        {   0x1B,  7 },
+        {   0x1A,  7 },
+        {  0xB8B, 12 },
+        {    0x2,  4 },
+        {    0x7,  5 }
+    },
+    { /* AC bias group 1, table 6 */
+        {    0xC,  4 },
+        {    0xB,  5 },
+        {   0x79,  7 },
+        {   0x22,  6 },
+        {   0xF0,  8 },
+        {  0x119,  9 },
+        {  0x230, 10 },
+        {   0x1D,  5 },
+        {  0x8C4, 12 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {    0xA,  4 },
+        {    0x9,  4 },
+        {    0xB,  4 },
+        {    0x7,  4 },
+        {   0x1C,  5 },
+        {   0x3D,  6 },
+        {    0xD,  5 },
+        {    0x8,  5 },
+        {   0x15,  6 },
+        {   0x8D,  8 },
+        { 0x118B, 13 },
+        { 0x118A, 13 },
+        {    0xD,  4 },
+        {   0x10,  5 },
+        {    0x9,  5 },
+        {   0x14,  6 },
+        {   0x47,  7 },
+        {   0xF1,  8 },
+        {  0x463, 11 },
+        {   0x1F,  5 },
+        {    0xC,  5 }
+    },
+    { /* AC bias group 1, table 7 */
+        {    0x0,  3 },
+        {   0x1A,  5 },
+        {   0x33,  6 },
+        {    0xC,  5 },
+        {   0x46,  7 },
+        {  0x1E3,  9 },
+        {  0x3C5, 10 },
+        {   0x17,  5 },
+        { 0x1E21, 13 },
+        {    0x2,  3 },
+        {    0x1,  3 },
+        {    0x9,  4 },
+        {    0xA,  4 },
+        {    0x7,  4 },
+        {   0x1B,  5 },
+        {   0x3D,  6 },
+        {   0x1B,  6 },
+        {   0x22,  6 },
+        {   0x79,  7 },
+        {   0xF0,  8 },
+        { 0x1E20, 13 },
+        { 0x1E23, 13 },
+        { 0x1E22, 13 },
+        {    0xE,  4 },
+        {   0x16,  5 },
+        {   0x18,  5 },
+        {   0x32,  6 },
+        {   0x1A,  6 },
+        {   0x47,  7 },
+        {  0x789, 11 },
+        {   0x1F,  5 },
+        {   0x10,  5 }
+    },
+    { /* AC bias group 1, table 8 */
+        {   0x1D,  5 },
+        {   0x61,  7 },
+        {   0x4E,  8 },
+        {   0x9E,  9 },
+        {  0x27C, 11 },
+        {  0x9F5, 13 },
+        {  0x9F4, 13 },
+        {    0x3,  4 },
+        {   0x60,  7 },
+        {    0x0,  3 },
+        {    0xF,  4 },
+        {    0xB,  4 },
+        {    0xA,  4 },
+        {    0x9,  4 },
+        {    0x5,  4 },
+        {    0xD,  5 },
+        {   0x31,  6 },
+        {    0x8,  5 },
+        {   0x38,  6 },
+        {   0x12,  6 },
+        {   0x26,  7 },
+        {  0x13F, 10 },
+        {  0x4FB, 12 },
+        {    0xD,  4 },
+        {    0x2,  4 },
+        {    0xC,  5 },
+        {   0x39,  6 },
+        {   0x1C,  6 },
+        {    0xF,  5 },
+        {   0x1D,  6 },
+        {    0x8,  4 },
+        {   0x19,  5 }
+    },
+    { /* AC bias group 1, table 9 */
+        {    0x7,  4 },
+        {   0x19,  6 },
+        {   0xAB,  8 },
+        {   0xAA,  8 },
+        {  0x119, 10 },
+        {  0x461, 12 },
+        {  0x460, 12 },
+        {   0x1B,  5 },
+        {   0x47,  8 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {    0xC,  4 },
+        {    0xB,  4 },
+        {    0x9,  4 },
+        {    0x5,  4 },
+        {    0xD,  5 },
+        {   0x35,  6 },
+        {   0x3D,  6 },
+        {   0x3C,  6 },
+        {   0x18,  6 },
+        {   0x22,  7 },
+        {   0x8D,  9 },
+        {  0x231, 11 },
+        {    0xE,  4 },
+        {   0x1F,  5 },
+        {    0x9,  5 },
+        {   0x2B,  6 },
+        {   0x10,  6 },
+        {   0x34,  6 },
+        {   0x54,  7 },
+        {    0x8,  4 },
+        {   0x14,  5 }
+    },
+    { /* AC bias group 1, table 10 */
+        {    0xC,  4 },
+        {    0x5,  5 },
+        {    0x8,  6 },
+        {   0x5B,  7 },
+        {   0x4D,  9 },
+        {  0x131, 11 },
+        {  0x261, 12 },
+        {   0x1A,  5 },
+        {   0x12,  7 },
+        {    0x0,  3 },
+        {    0xF,  4 },
+        {    0xA,  4 },
+        {    0x9,  4 },
+        {    0x6,  4 },
+        {   0x1B,  5 },
+        {    0x6,  5 },
+        {   0x1C,  6 },
+        {   0x2C,  6 },
+        {   0x15,  6 },
+        {   0x5A,  7 },
+        {   0x27,  8 },
+        {   0x99, 10 },
+        {  0x260, 12 },
+        {    0xE,  4 },
+        {    0x4,  4 },
+        {    0xF,  5 },
+        {    0x7,  5 },
+        {   0x1D,  6 },
+        {    0xB,  5 },
+        {   0x14,  6 },
+        {    0x8,  4 },
+        {   0x17,  5 }
+    },
+    { /* AC bias group 1, table 11 */
+        {    0xF,  4 },
+        {   0x13,  5 },
+        {   0x75,  7 },
+        {   0x24,  6 },
+        {   0x95,  8 },
+        {  0x251, 10 },
+        {  0x4A0, 11 },
+        {   0x10,  5 },
+        {   0xC8,  8 },
+        {    0x2,  3 },
+        {    0x1,  3 },
+        {    0x1,  4 },
+        {    0x0,  4 },
+        {   0x1A,  5 },
+        {   0x11,  5 },
+        {   0x2C,  6 },
+        {   0x65,  7 },
+        {   0x74,  7 },
+        {   0x4B,  7 },
+        {   0xC9,  8 },
+        {  0x129,  9 },
+        {  0x943, 12 },
+        {  0x942, 12 },
+        {    0x3,  3 },
+        {    0xA,  4 },
+        {   0x1C,  5 },
+        {   0x18,  5 },
+        {   0x33,  6 },
+        {   0x17,  5 },
+        {   0x2D,  6 },
+        {   0x1B,  5 },
+        {   0x3B,  6 }
+    },
+    { /* AC bias group 1, table 12 */
+        {    0x3,  3 },
+        {   0x1A,  5 },
+        {   0x2D,  6 },
+        {   0x38,  6 },
+        {   0x28,  7 },
+        {  0x395, 10 },
+        {  0xE51, 12 },
+        {   0x37,  6 },
+        {   0xE4,  8 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {   0x1F,  5 },
+        {   0x1E,  5 },
+        {   0x17,  5 },
+        {   0x3A,  6 },
+        {   0x73,  7 },
+        {   0x2A,  7 },
+        {   0x2B,  7 },
+        {   0x29,  7 },
+        {  0x1CB,  9 },
+        {  0x729, 11 },
+        { 0x1CA1, 13 },
+        { 0x1CA0, 13 },
+        {    0x4,  3 },
+        {    0xA,  4 },
+        {    0x4,  4 },
+        {   0x18,  5 },
+        {   0x36,  6 },
+        {    0xB,  5 },
+        {   0x2C,  6 },
+        {   0x19,  5 },
+        {   0x3B,  6 }
+    },
+    { /* AC bias group 1, table 13 */
+        {    0x4,  3 },
+        {    0x4,  4 },
+        {   0x3F,  6 },
+        {   0x17,  5 },
+        {   0x75,  7 },
+        {  0x1F5,  9 },
+        {  0x7D1, 11 },
+        {   0x17,  6 },
+        {  0x1F6,  9 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {   0x1B,  5 },
+        {   0x1A,  5 },
+        {    0xA,  5 },
+        {   0x32,  6 },
+        {   0x74,  7 },
+        {   0xF8,  8 },
+        {   0xF9,  8 },
+        {  0x1F7,  9 },
+        {  0x3E9, 10 },
+        {  0xFA0, 12 },
+        { 0x1F43, 13 },
+        { 0x1F42, 13 },
+        {    0x3,  3 },
+        {    0xA,  4 },
+        {   0x1E,  5 },
+        {   0x1C,  5 },
+        {   0x3B,  6 },
+        {   0x18,  5 },
+        {   0x16,  6 },
+        {   0x16,  5 },
+        {   0x33,  6 }
+    },
+    { /* AC bias group 1, table 14 */
+        {    0x4,  3 },
+        {    0x7,  4 },
+        {   0x18,  5 },
+        {   0x1E,  5 },
+        {   0x36,  6 },
+        {   0x31,  7 },
+        {  0x177,  9 },
+        {   0x77,  7 },
+        {  0x176,  9 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {   0x1A,  5 },
+        {   0x19,  5 },
+        {   0x3A,  6 },
+        {   0x19,  6 },
+        {   0x5C,  7 },
+        {   0xBA,  8 },
+        {   0x61,  8 },
+        {   0xC1,  9 },
+        {  0x180, 10 },
+        {  0x302, 11 },
+        {  0x607, 12 },
+        {  0x606, 12 },
+        {    0x2,  3 },
+        {    0xA,  4 },
+        {   0x1F,  5 },
+        {   0x1C,  5 },
+        {   0x37,  6 },
+        {   0x16,  5 },
+        {   0x76,  7 },
+        {    0xD,  5 },
+        {   0x2F,  6 }
+    },
+    { /* AC bias group 1, table 15 */
+        {    0x0,  3 },
+        {    0xA,  4 },
+        {   0x1A,  5 },
+        {    0xC,  4 },
+        {   0x1D,  5 },
+        {   0x39,  6 },
+        {   0x78,  7 },
+        {   0x5E,  7 },
+        {  0x393, 11 },
+        {    0x2,  3 },
+        {    0x1,  3 },
+        {   0x16,  5 },
+        {    0xF,  5 },
+        {   0x2E,  6 },
+        {   0x5F,  7 },
+        {   0x73,  8 },
+        {   0xE5,  9 },
+        {  0x1C8, 10 },
+        {  0xE4A, 13 },
+        { 0x1C97, 14 },
+        { 0x1C96, 14 },
+        {  0xE49, 13 },
+        {  0xE48, 13 },
+        {    0x4,  3 },
+        {    0x6,  4 },
+        {   0x1F,  5 },
+        {   0x1B,  5 },
+        {   0x1D,  6 },
+        {   0x38,  6 },
+        {   0x38,  7 },
+        {   0x3D,  6 },
+        {   0x79,  7 }
+    }
 };
 
 static const uint16_t ac_bias_1[16][32][2] = {
-  {  /* AC bias group 2, table 0 */
-    { 0xB, 5 },
-    { 0x2B, 7 },
-    { 0x54, 8 },
-    { 0x1B7, 9 },
-    { 0x6D9, 11 },
-    { 0xDB1, 12 },
-    { 0xDB0, 12 },
-    { 0x2, 4 },
-    { 0xAB, 9 },
-    { 0x9, 4 },
-    { 0xA, 4 },
-    { 0x7, 4 },
-    { 0x8, 4 },
-    { 0xF, 4 },
-    { 0xC, 4 },
-    { 0x3, 4 },
-    { 0x1D, 5 },
-    { 0x4, 4 },
-    { 0xB, 4 },
-    { 0x6, 4 },
-    { 0x1A, 5 },
-    { 0x3, 6 },
-    { 0xAA, 9 },
-    { 0x1, 4 },
-    { 0x0, 5 },
-    { 0x14, 6 },
-    { 0x6C, 7 },
-    { 0xDA, 8 },
-    { 0x2, 6 },
-    { 0x36D, 10 },
-    { 0x1C, 5 },
-    { 0x37, 6 }
-  },
-  {  /* AC bias group 2, table 1 */
-    { 0x1D, 5 },
-    { 0x4, 6 },
-    { 0xB6, 8 },
-    { 0x6A, 8 },
-    { 0x5B9, 11 },
-    { 0x16E1, 13 },
-    { 0x16E0, 13 },
-    { 0x7, 4 },
-    { 0x16F, 9 },
-    { 0xC, 4 },
-    { 0xD, 4 },
-    { 0x9, 4 },
-    { 0x8, 4 },
-    { 0xF, 4 },
-    { 0xA, 4 },
-    { 0x3, 4 },
-    { 0x17, 5 },
-    { 0x2, 4 },
-    { 0x4, 4 },
-    { 0x1C, 5 },
-    { 0x2C, 6 },
-    { 0x6B, 8 },
-    { 0xB71, 12 },
-    { 0x5, 4 },
-    { 0x3, 5 },
-    { 0x1B, 6 },
-    { 0x5A, 7 },
-    { 0x34, 7 },
-    { 0x5, 6 },
-    { 0x2DD, 10 },
-    { 0x0, 4 },
-    { 0xC, 5 }
-  },
-  {  /* AC bias group 2, table 2 */
-    { 0x3, 4 },
-    { 0x7F, 7 },
-    { 0xA1, 8 },
-    { 0xA0, 8 },
-    { 0x20C, 10 },
-    { 0x834, 12 },
-    { 0x106B, 13 },
-    { 0x7, 4 },
-    { 0x82, 8 },
-    { 0xE, 4 },
-    { 0xD, 4 },
-    { 0xB, 4 },
-    { 0xC, 4 },
-    { 0x0, 3 },
-    { 0x9, 4 },
-    { 0x2, 4 },
-    { 0x11, 5 },
-    { 0x1E, 5 },
-    { 0x15, 5 },
-    { 0x3E, 6 },
-    { 0x40, 7 },
-    { 0x41B, 11 },
-    { 0x106A, 13 },
-    { 0x6, 4 },
-    { 0xA, 5 },
-    { 0x29, 6 },
-    { 0x7E, 7 },
-    { 0x51, 7 },
-    { 0x21, 6 },
-    { 0x107, 9 },
-    { 0x4, 4 },
-    { 0xB, 5 }
-  },
-  {  /* AC bias group 2, table 3 */
-    { 0x7, 4 },
-    { 0x1B, 6 },
-    { 0xF6, 8 },
-    { 0xE9, 8 },
-    { 0x3A1, 10 },
-    { 0x740, 11 },
-    { 0xE82, 12 },
-    { 0x1F, 5 },
-    { 0x1EF, 9 },
-    { 0x1, 3 },
-    { 0x2, 3 },
-    { 0xB, 4 },
-    { 0xC, 4 },
-    { 0xD, 4 },
-    { 0x8, 4 },
-    { 0x1C, 5 },
-    { 0x3, 5 },
-    { 0x12, 5 },
-    { 0x2, 5 },
-    { 0x75, 7 },
-    { 0x1D1, 9 },
-    { 0x1D07, 13 },
-    { 0x1D06, 13 },
-    { 0xA, 4 },
-    { 0x13, 5 },
-    { 0x3B, 6 },
-    { 0x1A, 6 },
-    { 0x7A, 7 },
-    { 0x3C, 6 },
-    { 0x1EE, 9 },
-    { 0x0, 4 },
-    { 0xC, 5 }
-  },
-  {  /* AC bias group 2, table 4 */
-    { 0xD, 4 },
-    { 0x3D, 6 },
-    { 0x42, 7 },
-    { 0x37, 7 },
-    { 0xD9, 9 },
-    { 0x362, 11 },
-    { 0x6C6, 12 },
-    { 0x1F, 5 },
-    { 0x86, 8 },
-    { 0x1, 3 },
-    { 0x2, 3 },
-    { 0xC, 4 },
-    { 0xB, 4 },
-    { 0xA, 4 },
-    { 0x1, 4 },
-    { 0xF, 5 },
-    { 0x25, 6 },
-    { 0x3C, 6 },
-    { 0x1A, 6 },
-    { 0x87, 8 },
-    { 0x1B0, 10 },
-    { 0xD8F, 13 },
-    { 0xD8E, 13 },
-    { 0xE, 4 },
-    { 0x13, 5 },
-    { 0xC, 5 },
-    { 0x24, 6 },
-    { 0x20, 6 },
-    { 0x11, 5 },
-    { 0x6D, 8 },
-    { 0x0, 4 },
-    { 0xE, 5 }
-  },
-  {  /* AC bias group 2, table 5 */
-    { 0x0, 3 },
-    { 0x12, 5 },
-    { 0x76, 7 },
-    { 0x77, 7 },
-    { 0x14D, 9 },
-    { 0x533, 11 },
-    { 0x14C9, 13 },
-    { 0x13, 5 },
-    { 0xA5, 8 },
-    { 0x2, 3 },
-    { 0x3, 3 },
-    { 0xB, 4 },
-    { 0xC, 4 },
-    { 0x8, 4 },
-    { 0x1A, 5 },
-    { 0x2B, 6 },
-    { 0x75, 7 },
-    { 0x74, 7 },
-    { 0xA7, 8 },
-    { 0x298, 10 },
-    { 0x14C8, 13 },
-    { 0x14CB, 13 },
-    { 0x14CA, 13 },
-    { 0xF, 4 },
-    { 0x1C, 5 },
-    { 0x7, 5 },
-    { 0x2A, 6 },
-    { 0x28, 6 },
-    { 0x1B, 5 },
-    { 0xA4, 8 },
-    { 0x2, 4 },
-    { 0x6, 5 }
-  },
-  {  /* AC bias group 2, table 6 */
-    { 0x2, 3 },
-    { 0x1A, 5 },
-    { 0x2B, 6 },
-    { 0x3A, 6 },
-    { 0xED, 8 },
-    { 0x283, 10 },
-    { 0xA0A, 12 },
-    { 0x4, 5 },
-    { 0xA1, 8 },
-    { 0x4, 3 },
-    { 0x3, 3 },
-    { 0xB, 4 },
-    { 0xC, 4 },
-    { 0x1F, 5 },
-    { 0x6, 5 },
-    { 0x77, 7 },
-    { 0xA3, 8 },
-    { 0xA2, 8 },
-    { 0x140, 9 },
-    { 0x1417, 13 },
-    { 0x1416, 13 },
-    { 0xA09, 12 },
-    { 0xA08, 12 },
-    { 0x0, 3 },
-    { 0x1E, 5 },
-    { 0x7, 5 },
-    { 0x2A, 6 },
-    { 0x29, 6 },
-    { 0x1C, 5 },
-    { 0xEC, 8 },
-    { 0x1B, 5 },
-    { 0x5, 5 }
-  },
-  {  /* AC bias group 2, table 7 */
-    { 0x2, 3 },
-    { 0x2, 4 },
-    { 0x18, 5 },
-    { 0x1D, 5 },
-    { 0x35, 6 },
-    { 0xE4, 8 },
-    { 0x1CF, 11 },
-    { 0x1D, 7 },
-    { 0x72, 9 },
-    { 0x4, 3 },
-    { 0x5, 3 },
-    { 0x6, 4 },
-    { 0x7, 4 },
-    { 0x6, 5 },
-    { 0x73, 7 },
-    { 0x38, 8 },
-    { 0x1CE, 11 },
-    { 0x39B, 12 },
-    { 0x398, 12 },
-    { 0x733, 13 },
-    { 0x732, 13 },
-    { 0x735, 13 },
-    { 0x734, 13 },
-    { 0x0, 3 },
-    { 0x1F, 5 },
-    { 0x1B, 5 },
-    { 0x34, 6 },
-    { 0xF, 6 },
-    { 0x1E, 5 },
-    { 0xE5, 8 },
-    { 0x19, 5 },
-    { 0x38, 6 }
-  },
-  {  /* AC bias group 2, table 8 */
-    { 0x16, 5 },
-    { 0x50, 7 },
-    { 0x172, 9 },
-    { 0x2E7, 10 },
-    { 0x1732, 13 },
-    { 0x2E67, 14 },
-    { 0x2E66, 14 },
-    { 0x6, 4 },
-    { 0x51, 7 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0xD, 4 },
-    { 0xC, 4 },
-    { 0x9, 4 },
-    { 0x1C, 5 },
-    { 0x9, 5 },
-    { 0x1C, 6 },
-    { 0x1D, 6 },
-    { 0x5D, 7 },
-    { 0xB8, 8 },
-    { 0x5CD, 11 },
-    { 0x1731, 13 },
-    { 0x1730, 13 },
-    { 0xF, 4 },
-    { 0x5, 4 },
-    { 0xF, 5 },
-    { 0x8, 5 },
-    { 0x29, 6 },
-    { 0x1D, 5 },
-    { 0x2F, 6 },
-    { 0x8, 4 },
-    { 0x15, 5 }
-  },
-  {  /* AC bias group 2, table 9 */
-    { 0x9, 4 },
-    { 0x21, 6 },
-    { 0x40, 7 },
-    { 0xAD, 8 },
-    { 0x2B0, 10 },
-    { 0x1589, 13 },
-    { 0x1588, 13 },
-    { 0x1C, 5 },
-    { 0x5F, 7 },
-    { 0x0, 3 },
-    { 0xF, 4 },
-    { 0xD, 4 },
-    { 0xC, 4 },
-    { 0x6, 4 },
-    { 0x11, 5 },
-    { 0x2A, 6 },
-    { 0x57, 7 },
-    { 0x5E, 7 },
-    { 0x41, 7 },
-    { 0x159, 9 },
-    { 0x563, 11 },
-    { 0x158B, 13 },
-    { 0x158A, 13 },
-    { 0x1, 3 },
-    { 0x5, 4 },
-    { 0x14, 5 },
-    { 0x3B, 6 },
-    { 0x2E, 6 },
-    { 0x4, 4 },
-    { 0x3A, 6 },
-    { 0x7, 4 },
-    { 0x16, 5 }
-  },
-  {  /* AC bias group 2, table 10 */
-    { 0xE, 4 },
-    { 0x7, 5 },
-    { 0x46, 7 },
-    { 0x45, 7 },
-    { 0x64, 9 },
-    { 0x32A, 12 },
-    { 0x657, 13 },
-    { 0x18, 5 },
-    { 0xD, 6 },
-    { 0x0, 3 },
-    { 0xF, 4 },
-    { 0xA, 4 },
-    { 0xB, 4 },
-    { 0x1A, 5 },
-    { 0x36, 6 },
-    { 0x47, 7 },
-    { 0x44, 7 },
-    { 0x18, 7 },
-    { 0x33, 8 },
-    { 0xCB, 10 },
-    { 0x656, 13 },
-    { 0x329, 12 },
-    { 0x328, 12 },
-    { 0x2, 3 },
-    { 0x6, 4 },
-    { 0x19, 5 },
-    { 0xE, 5 },
-    { 0x37, 6 },
-    { 0x9, 4 },
-    { 0xF, 5 },
-    { 0x2, 4 },
-    { 0x10, 5 }
-  },
-  {  /* AC bias group 2, table 11 */
-    { 0x3, 3 },
-    { 0x18, 5 },
-    { 0x23, 6 },
-    { 0x77, 7 },
-    { 0x194, 9 },
-    { 0x1956, 13 },
-    { 0x32AF, 14 },
-    { 0x3A, 6 },
-    { 0x76, 7 },
-    { 0x2, 3 },
-    { 0x1, 3 },
-    { 0x1F, 5 },
-    { 0x1E, 5 },
-    { 0x14, 5 },
-    { 0x22, 6 },
-    { 0x64, 7 },
-    { 0x197, 9 },
-    { 0x196, 9 },
-    { 0x32B, 10 },
-    { 0x654, 11 },
-    { 0x32AE, 14 },
-    { 0x1955, 13 },
-    { 0x1954, 13 },
-    { 0x0, 3 },
-    { 0x9, 4 },
-    { 0x1C, 5 },
-    { 0x15, 5 },
-    { 0x10, 5 },
-    { 0xD, 4 },
-    { 0x17, 5 },
-    { 0x16, 5 },
-    { 0x33, 6 }
-  },
-  {  /* AC bias group 2, table 12 */
-    { 0x5, 3 },
-    { 0x6, 4 },
-    { 0x3E, 6 },
-    { 0x10, 5 },
-    { 0x48, 7 },
-    { 0x93F, 12 },
-    { 0x24FA, 14 },
-    { 0x32, 6 },
-    { 0x67, 7 },
-    { 0x2, 3 },
-    { 0x1, 3 },
-    { 0x1B, 5 },
-    { 0x1E, 5 },
-    { 0x34, 6 },
-    { 0x66, 7 },
-    { 0x92, 8 },
-    { 0x126, 9 },
-    { 0x24E, 10 },
-    { 0x49E, 11 },
-    { 0x49F7, 15 },
-    { 0x49F6, 15 },
-    { 0x24F9, 14 },
-    { 0x24F8, 14 },
-    { 0x0, 3 },
-    { 0x7, 4 },
-    { 0x18, 5 },
-    { 0x11, 5 },
-    { 0x3F, 6 },
-    { 0xE, 4 },
-    { 0x13, 5 },
-    { 0x35, 6 },
-    { 0x25, 6 }
-  },
-  {  /* AC bias group 2, table 13 */
-    { 0x5, 3 },
-    { 0x8, 4 },
-    { 0x12, 5 },
-    { 0x1C, 5 },
-    { 0x1C, 6 },
-    { 0xEA, 9 },
-    { 0x1D75, 14 },
-    { 0x1E, 6 },
-    { 0x66, 7 },
-    { 0x1, 3 },
-    { 0x2, 3 },
-    { 0x1B, 5 },
-    { 0x1A, 5 },
-    { 0x1F, 6 },
-    { 0x3B, 7 },
-    { 0x74, 8 },
-    { 0x1D6, 10 },
-    { 0x3AF, 11 },
-    { 0x1D74, 14 },
-    { 0x1D77, 14 },
-    { 0x1D76, 14 },
-    { 0xEB9, 13 },
-    { 0xEB8, 13 },
-    { 0xF, 4 },
-    { 0x6, 4 },
-    { 0x13, 5 },
-    { 0x3B, 6 },
-    { 0x3A, 6 },
-    { 0x0, 3 },
-    { 0x18, 5 },
-    { 0x32, 6 },
-    { 0x67, 7 }
-  },
-  {  /* AC bias group 2, table 14 */
-    { 0x4, 3 },
-    { 0xA, 4 },
-    { 0x1B, 5 },
-    { 0xC, 4 },
-    { 0xD, 5 },
-    { 0xE6, 8 },
-    { 0x684, 11 },
-    { 0x72, 7 },
-    { 0xE7, 8 },
-    { 0x2, 3 },
-    { 0x1, 3 },
-    { 0x17, 5 },
-    { 0x16, 5 },
-    { 0x18, 6 },
-    { 0xD1, 8 },
-    { 0x1A0, 9 },
-    { 0x686, 11 },
-    { 0xD0F, 12 },
-    { 0xD0A, 12 },
-    { 0x1A17, 13 },
-    { 0x1A16, 13 },
-    { 0x1A1D, 13 },
-    { 0x1A1C, 13 },
-    { 0xF, 4 },
-    { 0x1D, 5 },
-    { 0xE, 5 },
-    { 0x35, 6 },
-    { 0x38, 6 },
-    { 0x0, 3 },
-    { 0xF, 5 },
-    { 0x19, 6 },
-    { 0x69, 7 }
-  },
-  {  /* AC bias group 2, table 15 */
-    { 0x3, 3 },
-    { 0xC, 4 },
-    { 0x1B, 5 },
-    { 0x0, 3 },
-    { 0x3, 4 },
-    { 0x2E, 6 },
-    { 0x51, 9 },
-    { 0xBC, 8 },
-    { 0x53, 9 },
-    { 0x4, 3 },
-    { 0x2, 3 },
-    { 0x16, 5 },
-    { 0x15, 5 },
-    { 0x15, 7 },
-    { 0x50, 9 },
-    { 0xA4, 10 },
-    { 0x294, 12 },
-    { 0x52B, 13 },
-    { 0x52A, 13 },
-    { 0x52D, 13 },
-    { 0x52C, 13 },
-    { 0x52F, 13 },
-    { 0x52E, 13 },
-    { 0xE, 4 },
-    { 0x1A, 5 },
-    { 0x4, 5 },
-    { 0x28, 6 },
-    { 0x29, 6 },
-    { 0xF, 4 },
-    { 0xB, 6 },
-    { 0x5F, 7 },
-    { 0xBD, 8 }
-  }
+    { /* AC bias group 2, table 0 */
+        {    0xB,  5 },
+        {   0x2B,  7 },
+        {   0x54,  8 },
+        {  0x1B7,  9 },
+        {  0x6D9, 11 },
+        {  0xDB1, 12 },
+        {  0xDB0, 12 },
+        {    0x2,  4 },
+        {   0xAB,  9 },
+        {    0x9,  4 },
+        {    0xA,  4 },
+        {    0x7,  4 },
+        {    0x8,  4 },
+        {    0xF,  4 },
+        {    0xC,  4 },
+        {    0x3,  4 },
+        {   0x1D,  5 },
+        {    0x4,  4 },
+        {    0xB,  4 },
+        {    0x6,  4 },
+        {   0x1A,  5 },
+        {    0x3,  6 },
+        {   0xAA,  9 },
+        {    0x1,  4 },
+        {    0x0,  5 },
+        {   0x14,  6 },
+        {   0x6C,  7 },
+        {   0xDA,  8 },
+        {    0x2,  6 },
+        {  0x36D, 10 },
+        {   0x1C,  5 },
+        {   0x37,  6 }
+    },
+    { /* AC bias group 2, table 1 */
+        {   0x1D,  5 },
+        {    0x4,  6 },
+        {   0xB6,  8 },
+        {   0x6A,  8 },
+        {  0x5B9, 11 },
+        { 0x16E1, 13 },
+        { 0x16E0, 13 },
+        {    0x7,  4 },
+        {  0x16F,  9 },
+        {    0xC,  4 },
+        {    0xD,  4 },
+        {    0x9,  4 },
+        {    0x8,  4 },
+        {    0xF,  4 },
+        {    0xA,  4 },
+        {    0x3,  4 },
+        {   0x17,  5 },
+        {    0x2,  4 },
+        {    0x4,  4 },
+        {   0x1C,  5 },
+        {   0x2C,  6 },
+        {   0x6B,  8 },
+        {  0xB71, 12 },
+        {    0x5,  4 },
+        {    0x3,  5 },
+        {   0x1B,  6 },
+        {   0x5A,  7 },
+        {   0x34,  7 },
+        {    0x5,  6 },
+        {  0x2DD, 10 },
+        {    0x0,  4 },
+        {    0xC,  5 }
+    },
+    { /* AC bias group 2, table 2 */
+        {    0x3,  4 },
+        {   0x7F,  7 },
+        {   0xA1,  8 },
+        {   0xA0,  8 },
+        {  0x20C, 10 },
+        {  0x834, 12 },
+        { 0x106B, 13 },
+        {    0x7,  4 },
+        {   0x82,  8 },
+        {    0xE,  4 },
+        {    0xD,  4 },
+        {    0xB,  4 },
+        {    0xC,  4 },
+        {    0x0,  3 },
+        {    0x9,  4 },
+        {    0x2,  4 },
+        {   0x11,  5 },
+        {   0x1E,  5 },
+        {   0x15,  5 },
+        {   0x3E,  6 },
+        {   0x40,  7 },
+        {  0x41B, 11 },
+        { 0x106A, 13 },
+        {    0x6,  4 },
+        {    0xA,  5 },
+        {   0x29,  6 },
+        {   0x7E,  7 },
+        {   0x51,  7 },
+        {   0x21,  6 },
+        {  0x107,  9 },
+        {    0x4,  4 },
+        {    0xB,  5 }
+    },
+    { /* AC bias group 2, table 3 */
+        {    0x7,  4 },
+        {   0x1B,  6 },
+        {   0xF6,  8 },
+        {   0xE9,  8 },
+        {  0x3A1, 10 },
+        {  0x740, 11 },
+        {  0xE82, 12 },
+        {   0x1F,  5 },
+        {  0x1EF,  9 },
+        {    0x1,  3 },
+        {    0x2,  3 },
+        {    0xB,  4 },
+        {    0xC,  4 },
+        {    0xD,  4 },
+        {    0x8,  4 },
+        {   0x1C,  5 },
+        {    0x3,  5 },
+        {   0x12,  5 },
+        {    0x2,  5 },
+        {   0x75,  7 },
+        {  0x1D1,  9 },
+        { 0x1D07, 13 },
+        { 0x1D06, 13 },
+        {    0xA,  4 },
+        {   0x13,  5 },
+        {   0x3B,  6 },
+        {   0x1A,  6 },
+        {   0x7A,  7 },
+        {   0x3C,  6 },
+        {  0x1EE,  9 },
+        {    0x0,  4 },
+        {    0xC,  5 }
+    },
+    { /* AC bias group 2, table 4 */
+        {    0xD,  4 },
+        {   0x3D,  6 },
+        {   0x42,  7 },
+        {   0x37,  7 },
+        {   0xD9,  9 },
+        {  0x362, 11 },
+        {  0x6C6, 12 },
+        {   0x1F,  5 },
+        {   0x86,  8 },
+        {    0x1,  3 },
+        {    0x2,  3 },
+        {    0xC,  4 },
+        {    0xB,  4 },
+        {    0xA,  4 },
+        {    0x1,  4 },
+        {    0xF,  5 },
+        {   0x25,  6 },
+        {   0x3C,  6 },
+        {   0x1A,  6 },
+        {   0x87,  8 },
+        {  0x1B0, 10 },
+        {  0xD8F, 13 },
+        {  0xD8E, 13 },
+        {    0xE,  4 },
+        {   0x13,  5 },
+        {    0xC,  5 },
+        {   0x24,  6 },
+        {   0x20,  6 },
+        {   0x11,  5 },
+        {   0x6D,  8 },
+        {    0x0,  4 },
+        {    0xE,  5 }
+    },
+    { /* AC bias group 2, table 5 */
+        {    0x0,  3 },
+        {   0x12,  5 },
+        {   0x76,  7 },
+        {   0x77,  7 },
+        {  0x14D,  9 },
+        {  0x533, 11 },
+        { 0x14C9, 13 },
+        {   0x13,  5 },
+        {   0xA5,  8 },
+        {    0x2,  3 },
+        {    0x3,  3 },
+        {    0xB,  4 },
+        {    0xC,  4 },
+        {    0x8,  4 },
+        {   0x1A,  5 },
+        {   0x2B,  6 },
+        {   0x75,  7 },
+        {   0x74,  7 },
+        {   0xA7,  8 },
+        {  0x298, 10 },
+        { 0x14C8, 13 },
+        { 0x14CB, 13 },
+        { 0x14CA, 13 },
+        {    0xF,  4 },
+        {   0x1C,  5 },
+        {    0x7,  5 },
+        {   0x2A,  6 },
+        {   0x28,  6 },
+        {   0x1B,  5 },
+        {   0xA4,  8 },
+        {    0x2,  4 },
+        {    0x6,  5 }
+    },
+    { /* AC bias group 2, table 6 */
+        {    0x2,  3 },
+        {   0x1A,  5 },
+        {   0x2B,  6 },
+        {   0x3A,  6 },
+        {   0xED,  8 },
+        {  0x283, 10 },
+        {  0xA0A, 12 },
+        {    0x4,  5 },
+        {   0xA1,  8 },
+        {    0x4,  3 },
+        {    0x3,  3 },
+        {    0xB,  4 },
+        {    0xC,  4 },
+        {   0x1F,  5 },
+        {    0x6,  5 },
+        {   0x77,  7 },
+        {   0xA3,  8 },
+        {   0xA2,  8 },
+        {  0x140,  9 },
+        { 0x1417, 13 },
+        { 0x1416, 13 },
+        {  0xA09, 12 },
+        {  0xA08, 12 },
+        {    0x0,  3 },
+        {   0x1E,  5 },
+        {    0x7,  5 },
+        {   0x2A,  6 },
+        {   0x29,  6 },
+        {   0x1C,  5 },
+        {   0xEC,  8 },
+        {   0x1B,  5 },
+        {    0x5,  5 }
+    },
+    { /* AC bias group 2, table 7 */
+        {    0x2,  3 },
+        {    0x2,  4 },
+        {   0x18,  5 },
+        {   0x1D,  5 },
+        {   0x35,  6 },
+        {   0xE4,  8 },
+        {  0x1CF, 11 },
+        {   0x1D,  7 },
+        {   0x72,  9 },
+        {    0x4,  3 },
+        {    0x5,  3 },
+        {    0x6,  4 },
+        {    0x7,  4 },
+        {    0x6,  5 },
+        {   0x73,  7 },
+        {   0x38,  8 },
+        {  0x1CE, 11 },
+        {  0x39B, 12 },
+        {  0x398, 12 },
+        {  0x733, 13 },
+        {  0x732, 13 },
+        {  0x735, 13 },
+        {  0x734, 13 },
+        {    0x0,  3 },
+        {   0x1F,  5 },
+        {   0x1B,  5 },
+        {   0x34,  6 },
+        {    0xF,  6 },
+        {   0x1E,  5 },
+        {   0xE5,  8 },
+        {   0x19,  5 },
+        {   0x38,  6 }
+    },
+    { /* AC bias group 2, table 8 */
+        {   0x16,  5 },
+        {   0x50,  7 },
+        {  0x172,  9 },
+        {  0x2E7, 10 },
+        { 0x1732, 13 },
+        { 0x2E67, 14 },
+        { 0x2E66, 14 },
+        {    0x6,  4 },
+        {   0x51,  7 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {    0xD,  4 },
+        {    0xC,  4 },
+        {    0x9,  4 },
+        {   0x1C,  5 },
+        {    0x9,  5 },
+        {   0x1C,  6 },
+        {   0x1D,  6 },
+        {   0x5D,  7 },
+        {   0xB8,  8 },
+        {  0x5CD, 11 },
+        { 0x1731, 13 },
+        { 0x1730, 13 },
+        {    0xF,  4 },
+        {    0x5,  4 },
+        {    0xF,  5 },
+        {    0x8,  5 },
+        {   0x29,  6 },
+        {   0x1D,  5 },
+        {   0x2F,  6 },
+        {    0x8,  4 },
+        {   0x15,  5 }
+    },
+    { /* AC bias group 2, table 9 */
+        {    0x9,  4 },
+        {   0x21,  6 },
+        {   0x40,  7 },
+        {   0xAD,  8 },
+        {  0x2B0, 10 },
+        { 0x1589, 13 },
+        { 0x1588, 13 },
+        {   0x1C,  5 },
+        {   0x5F,  7 },
+        {    0x0,  3 },
+        {    0xF,  4 },
+        {    0xD,  4 },
+        {    0xC,  4 },
+        {    0x6,  4 },
+        {   0x11,  5 },
+        {   0x2A,  6 },
+        {   0x57,  7 },
+        {   0x5E,  7 },
+        {   0x41,  7 },
+        {  0x159,  9 },
+        {  0x563, 11 },
+        { 0x158B, 13 },
+        { 0x158A, 13 },
+        {    0x1,  3 },
+        {    0x5,  4 },
+        {   0x14,  5 },
+        {   0x3B,  6 },
+        {   0x2E,  6 },
+        {    0x4,  4 },
+        {   0x3A,  6 },
+        {    0x7,  4 },
+        {   0x16,  5 }
+    },
+    { /* AC bias group 2, table 10 */
+        {    0xE,  4 },
+        {    0x7,  5 },
+        {   0x46,  7 },
+        {   0x45,  7 },
+        {   0x64,  9 },
+        {  0x32A, 12 },
+        {  0x657, 13 },
+        {   0x18,  5 },
+        {    0xD,  6 },
+        {    0x0,  3 },
+        {    0xF,  4 },
+        {    0xA,  4 },
+        {    0xB,  4 },
+        {   0x1A,  5 },
+        {   0x36,  6 },
+        {   0x47,  7 },
+        {   0x44,  7 },
+        {   0x18,  7 },
+        {   0x33,  8 },
+        {   0xCB, 10 },
+        {  0x656, 13 },
+        {  0x329, 12 },
+        {  0x328, 12 },
+        {    0x2,  3 },
+        {    0x6,  4 },
+        {   0x19,  5 },
+        {    0xE,  5 },
+        {   0x37,  6 },
+        {    0x9,  4 },
+        {    0xF,  5 },
+        {    0x2,  4 },
+        {   0x10,  5 }
+    },
+    { /* AC bias group 2, table 11 */
+        {    0x3,  3 },
+        {   0x18,  5 },
+        {   0x23,  6 },
+        {   0x77,  7 },
+        {  0x194,  9 },
+        { 0x1956, 13 },
+        { 0x32AF, 14 },
+        {   0x3A,  6 },
+        {   0x76,  7 },
+        {    0x2,  3 },
+        {    0x1,  3 },
+        {   0x1F,  5 },
+        {   0x1E,  5 },
+        {   0x14,  5 },
+        {   0x22,  6 },
+        {   0x64,  7 },
+        {  0x197,  9 },
+        {  0x196,  9 },
+        {  0x32B, 10 },
+        {  0x654, 11 },
+        { 0x32AE, 14 },
+        { 0x1955, 13 },
+        { 0x1954, 13 },
+        {    0x0,  3 },
+        {    0x9,  4 },
+        {   0x1C,  5 },
+        {   0x15,  5 },
+        {   0x10,  5 },
+        {    0xD,  4 },
+        {   0x17,  5 },
+        {   0x16,  5 },
+        {   0x33,  6 }
+    },
+    { /* AC bias group 2, table 12 */
+        {    0x5,  3 },
+        {    0x6,  4 },
+        {   0x3E,  6 },
+        {   0x10,  5 },
+        {   0x48,  7 },
+        {  0x93F, 12 },
+        { 0x24FA, 14 },
+        {   0x32,  6 },
+        {   0x67,  7 },
+        {    0x2,  3 },
+        {    0x1,  3 },
+        {   0x1B,  5 },
+        {   0x1E,  5 },
+        {   0x34,  6 },
+        {   0x66,  7 },
+        {   0x92,  8 },
+        {  0x126,  9 },
+        {  0x24E, 10 },
+        {  0x49E, 11 },
+        { 0x49F7, 15 },
+        { 0x49F6, 15 },
+        { 0x24F9, 14 },
+        { 0x24F8, 14 },
+        {    0x0,  3 },
+        {    0x7,  4 },
+        {   0x18,  5 },
+        {   0x11,  5 },
+        {   0x3F,  6 },
+        {    0xE,  4 },
+        {   0x13,  5 },
+        {   0x35,  6 },
+        {   0x25,  6 }
+    },
+    { /* AC bias group 2, table 13 */
+        {    0x5,  3 },
+        {    0x8,  4 },
+        {   0x12,  5 },
+        {   0x1C,  5 },
+        {   0x1C,  6 },
+        {   0xEA,  9 },
+        { 0x1D75, 14 },
+        {   0x1E,  6 },
+        {   0x66,  7 },
+        {    0x1,  3 },
+        {    0x2,  3 },
+        {   0x1B,  5 },
+        {   0x1A,  5 },
+        {   0x1F,  6 },
+        {   0x3B,  7 },
+        {   0x74,  8 },
+        {  0x1D6, 10 },
+        {  0x3AF, 11 },
+        { 0x1D74, 14 },
+        { 0x1D77, 14 },
+        { 0x1D76, 14 },
+        {  0xEB9, 13 },
+        {  0xEB8, 13 },
+        {    0xF,  4 },
+        {    0x6,  4 },
+        {   0x13,  5 },
+        {   0x3B,  6 },
+        {   0x3A,  6 },
+        {    0x0,  3 },
+        {   0x18,  5 },
+        {   0x32,  6 },
+        {   0x67,  7 }
+    },
+    { /* AC bias group 2, table 14 */
+        {    0x4,  3 },
+        {    0xA,  4 },
+        {   0x1B,  5 },
+        {    0xC,  4 },
+        {    0xD,  5 },
+        {   0xE6,  8 },
+        {  0x684, 11 },
+        {   0x72,  7 },
+        {   0xE7,  8 },
+        {    0x2,  3 },
+        {    0x1,  3 },
+        {   0x17,  5 },
+        {   0x16,  5 },
+        {   0x18,  6 },
+        {   0xD1,  8 },
+        {  0x1A0,  9 },
+        {  0x686, 11 },
+        {  0xD0F, 12 },
+        {  0xD0A, 12 },
+        { 0x1A17, 13 },
+        { 0x1A16, 13 },
+        { 0x1A1D, 13 },
+        { 0x1A1C, 13 },
+        {    0xF,  4 },
+        {   0x1D,  5 },
+        {    0xE,  5 },
+        {   0x35,  6 },
+        {   0x38,  6 },
+        {    0x0,  3 },
+        {    0xF,  5 },
+        {   0x19,  6 },
+        {   0x69,  7 }
+    },
+    { /* AC bias group 2, table 15 */
+        {    0x3,  3 },
+        {    0xC,  4 },
+        {   0x1B,  5 },
+        {    0x0,  3 },
+        {    0x3,  4 },
+        {   0x2E,  6 },
+        {   0x51,  9 },
+        {   0xBC,  8 },
+        {   0x53,  9 },
+        {    0x4,  3 },
+        {    0x2,  3 },
+        {   0x16,  5 },
+        {   0x15,  5 },
+        {   0x15,  7 },
+        {   0x50,  9 },
+        {   0xA4, 10 },
+        {  0x294, 12 },
+        {  0x52B, 13 },
+        {  0x52A, 13 },
+        {  0x52D, 13 },
+        {  0x52C, 13 },
+        {  0x52F, 13 },
+        {  0x52E, 13 },
+        {    0xE,  4 },
+        {   0x1A,  5 },
+        {    0x4,  5 },
+        {   0x28,  6 },
+        {   0x29,  6 },
+        {    0xF,  4 },
+        {    0xB,  6 },
+        {   0x5F,  7 },
+        {   0xBD,  8 }
+    }
 };
 
 static const uint16_t ac_bias_2[16][32][2] = {
-  {  /* AC bias group 3, table 0 */
-    { 0x3, 4 },
-    { 0x9, 6 },
-    { 0xD0, 8 },
-    { 0x1A3, 9 },
-    { 0x344, 10 },
-    { 0xD14, 12 },
-    { 0x1A2B, 13 },
-    { 0x4, 4 },
-    { 0x15, 7 },
-    { 0x0, 3 },
-    { 0xF, 4 },
-    { 0xB, 4 },
-    { 0xC, 4 },
-    { 0xE, 4 },
-    { 0x9, 4 },
-    { 0x1B, 5 },
-    { 0xA, 5 },
-    { 0x14, 5 },
-    { 0xD, 5 },
-    { 0x2A, 6 },
-    { 0x14, 7 },
-    { 0x68B, 11 },
-    { 0x1A2A, 13 },
-    { 0x8, 4 },
-    { 0xB, 5 },
-    { 0x2B, 6 },
-    { 0xB, 6 },
-    { 0x69, 7 },
-    { 0x35, 6 },
-    { 0x8, 6 },
-    { 0x7, 4 },
-    { 0xC, 5 }
-  },
-  {  /* AC bias group 3, table 1 */
-    { 0xA, 4 },
-    { 0x3C, 6 },
-    { 0x32, 7 },
-    { 0x30, 7 },
-    { 0xC5, 9 },
-    { 0x621, 12 },
-    { 0x620, 12 },
-    { 0x1F, 5 },
-    { 0x33, 7 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0xE, 4 },
-    { 0xD, 4 },
-    { 0xC, 4 },
-    { 0x4, 4 },
-    { 0xD, 5 },
-    { 0x26, 6 },
-    { 0x27, 6 },
-    { 0x14, 6 },
-    { 0x63, 8 },
-    { 0x189, 10 },
-    { 0x623, 12 },
-    { 0x622, 12 },
-    { 0xB, 4 },
-    { 0x12, 5 },
-    { 0x3D, 6 },
-    { 0x22, 6 },
-    { 0x15, 6 },
-    { 0xB, 5 },
-    { 0x23, 6 },
-    { 0x7, 4 },
-    { 0x10, 5 }
-  },
-  {  /* AC bias group 3, table 2 */
-    { 0xF, 4 },
-    { 0xC, 5 },
-    { 0x43, 7 },
-    { 0x10, 6 },
-    { 0x44, 8 },
-    { 0x114, 10 },
-    { 0x455, 12 },
-    { 0x18, 5 },
-    { 0x23, 7 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0xE, 4 },
-    { 0xD, 4 },
-    { 0x9, 4 },
-    { 0x19, 5 },
-    { 0x9, 5 },
-    { 0x17, 6 },
-    { 0x16, 6 },
-    { 0x42, 7 },
-    { 0x8B, 9 },
-    { 0x454, 12 },
-    { 0x457, 12 },
-    { 0x456, 12 },
-    { 0xB, 4 },
-    { 0x15, 5 },
-    { 0xA, 5 },
-    { 0x29, 6 },
-    { 0x20, 6 },
-    { 0xD, 5 },
-    { 0x28, 6 },
-    { 0x7, 4 },
-    { 0x11, 5 }
-  },
-  {  /* AC bias group 3, table 3 */
-    { 0x1, 3 },
-    { 0x1A, 5 },
-    { 0x29, 6 },
-    { 0x2A, 6 },
-    { 0xA0, 8 },
-    { 0x285, 10 },
-    { 0x1425, 13 },
-    { 0x2, 5 },
-    { 0x0, 7 },
-    { 0x2, 3 },
-    { 0x3, 3 },
-    { 0xC, 4 },
-    { 0xB, 4 },
-    { 0x8, 4 },
-    { 0x12, 5 },
-    { 0x1, 6 },
-    { 0x51, 7 },
-    { 0x1, 7 },
-    { 0x143, 9 },
-    { 0x508, 11 },
-    { 0x1424, 13 },
-    { 0x1427, 13 },
-    { 0x1426, 13 },
-    { 0xF, 4 },
-    { 0x1C, 5 },
-    { 0x3, 5 },
-    { 0x37, 6 },
-    { 0x2B, 6 },
-    { 0x13, 5 },
-    { 0x36, 6 },
-    { 0x1D, 5 },
-    { 0x1, 5 }
-  },
-  {  /* AC bias group 3, table 4 */
-    { 0x4, 3 },
-    { 0x1F, 5 },
-    { 0x3D, 6 },
-    { 0x6, 5 },
-    { 0x16, 7 },
-    { 0x53, 9 },
-    { 0x14A, 11 },
-    { 0x34, 6 },
-    { 0x2A, 8 },
-    { 0x2, 3 },
-    { 0x3, 3 },
-    { 0xB, 4 },
-    { 0xC, 4 },
-    { 0x1C, 5 },
-    { 0x37, 6 },
-    { 0x17, 7 },
-    { 0x2B, 8 },
-    { 0x28, 8 },
-    { 0xA4, 10 },
-    { 0x52D, 13 },
-    { 0x52C, 13 },
-    { 0x52F, 13 },
-    { 0x52E, 13 },
-    { 0x0, 3 },
-    { 0x1D, 5 },
-    { 0x7, 5 },
-    { 0x4, 5 },
-    { 0x35, 6 },
-    { 0x14, 5 },
-    { 0x36, 6 },
-    { 0x15, 5 },
-    { 0x3C, 6 }
-  },
-  {  /* AC bias group 3, table 5 */
-    { 0x4, 3 },
-    { 0xA, 4 },
-    { 0x7, 5 },
-    { 0x1D, 5 },
-    { 0x9, 6 },
-    { 0x1F3, 9 },
-    { 0x7C7, 11 },
-    { 0x8, 6 },
-    { 0x1F0, 9 },
-    { 0x3, 3 },
-    { 0x2, 3 },
-    { 0xD, 4 },
-    { 0xC, 4 },
-    { 0x17, 5 },
-    { 0x7D, 7 },
-    { 0x1F2, 9 },
-    { 0x7C6, 11 },
-    { 0x7C5, 11 },
-    { 0x1F12, 13 },
-    { 0x3E27, 14 },
-    { 0x3E26, 14 },
-    { 0x1F11, 13 },
-    { 0x1F10, 13 },
-    { 0x0, 3 },
-    { 0x1E, 5 },
-    { 0x6, 5 },
-    { 0x39, 6 },
-    { 0x38, 6 },
-    { 0x3F, 6 },
-    { 0x2C, 6 },
-    { 0x5, 5 },
-    { 0x2D, 6 }
-  },
-  {  /* AC bias group 3, table 6 */
-    { 0x2, 3 },
-    { 0x7, 4 },
-    { 0x18, 5 },
-    { 0x3, 4 },
-    { 0x5, 5 },
-    { 0x35, 7 },
-    { 0x4F, 9 },
-    { 0x12, 7 },
-    { 0x4E5, 13 },
-    { 0x5, 3 },
-    { 0x4, 3 },
-    { 0xD, 4 },
-    { 0xE, 4 },
-    { 0x33, 6 },
-    { 0x26, 8 },
-    { 0x9D, 10 },
-    { 0x4E4, 13 },
-    { 0x4E7, 13 },
-    { 0x4E6, 13 },
-    { 0x4E1, 13 },
-    { 0x4E0, 13 },
-    { 0x4E3, 13 },
-    { 0x4E2, 13 },
-    { 0x0, 3 },
-    { 0x1F, 5 },
-    { 0xC, 5 },
-    { 0x3D, 6 },
-    { 0x3C, 6 },
-    { 0x32, 6 },
-    { 0x34, 7 },
-    { 0x1B, 6 },
-    { 0x8, 6 }
-  },
-  {  /* AC bias group 3, table 7 */
-    { 0x0, 3 },
-    { 0x4, 4 },
-    { 0x1C, 5 },
-    { 0xF, 4 },
-    { 0x2, 4 },
-    { 0x7, 5 },
-    { 0x75, 7 },
-    { 0xE8, 8 },
-    { 0x1D2A, 13 },
-    { 0x5, 3 },
-    { 0x4, 3 },
-    { 0xD, 4 },
-    { 0xC, 4 },
-    { 0x77, 7 },
-    { 0xE96, 12 },
-    { 0x3A57, 14 },
-    { 0x3A56, 14 },
-    { 0x3A5D, 14 },
-    { 0x3A5C, 14 },
-    { 0x3A5F, 14 },
-    { 0x3A5E, 14 },
-    { 0x1D29, 13 },
-    { 0x1D28, 13 },
-    { 0x3, 3 },
-    { 0x6, 5 },
-    { 0xA, 5 },
-    { 0x2C, 7 },
-    { 0x17, 6 },
-    { 0x76, 7 },
-    { 0x1D3, 9 },
-    { 0x3A4, 10 },
-    { 0x2D, 7 }
-  },
-  {  /* AC bias group 3, table 8 */
-    { 0xA, 4 },
-    { 0x24, 6 },
-    { 0xBF, 8 },
-    { 0x85, 8 },
-    { 0x211, 10 },
-    { 0x842, 12 },
-    { 0x1087, 13 },
-    { 0x18, 5 },
-    { 0x20, 6 },
-    { 0x1, 3 },
-    { 0x2, 3 },
-    { 0xE, 4 },
-    { 0xD, 4 },
-    { 0x7, 4 },
-    { 0x13, 5 },
-    { 0x25, 6 },
-    { 0x5E, 7 },
-    { 0x43, 7 },
-    { 0xBE, 8 },
-    { 0x109, 9 },
-    { 0x1086, 13 },
-    { 0x841, 12 },
-    { 0x840, 12 },
-    { 0xF, 4 },
-    { 0x1, 4 },
-    { 0x11, 5 },
-    { 0x0, 5 },
-    { 0x2E, 6 },
-    { 0x19, 5 },
-    { 0x1, 5 },
-    { 0x6, 4 },
-    { 0x16, 5 }
-  },
-  {  /* AC bias group 3, table 9 */
-    { 0x2, 3 },
-    { 0xF, 5 },
-    { 0x6F, 7 },
-    { 0x61, 7 },
-    { 0x374, 10 },
-    { 0x1BA8, 13 },
-    { 0x3753, 14 },
-    { 0x12, 5 },
-    { 0x36, 6 },
-    { 0x0, 3 },
-    { 0x1, 3 },
-    { 0xA, 4 },
-    { 0xB, 4 },
-    { 0x1A, 5 },
-    { 0x31, 6 },
-    { 0x60, 7 },
-    { 0xDC, 8 },
-    { 0x1BB, 9 },
-    { 0x6EB, 11 },
-    { 0x1BAB, 13 },
-    { 0x3752, 14 },
-    { 0x3755, 14 },
-    { 0x3754, 14 },
-    { 0xE, 4 },
-    { 0x6, 4 },
-    { 0x13, 5 },
-    { 0xE, 5 },
-    { 0x3E, 6 },
-    { 0x8, 4 },
-    { 0x1E, 5 },
-    { 0x19, 5 },
-    { 0x3F, 6 }
-  },
-  {  /* AC bias group 3, table 10 */
-    { 0x3, 3 },
-    { 0x1C, 5 },
-    { 0x25, 6 },
-    { 0x24, 6 },
-    { 0x1DA, 9 },
-    { 0x1DBD, 13 },
-    { 0x3B7C, 14 },
-    { 0x3C, 6 },
-    { 0x3D, 6 },
-    { 0x0, 3 },
-    { 0x1, 3 },
-    { 0xB, 4 },
-    { 0xA, 4 },
-    { 0xB, 5 },
-    { 0x77, 7 },
-    { 0xEC, 8 },
-    { 0x3B6, 10 },
-    { 0x76E, 11 },
-    { 0x1DBF, 13 },
-    { 0x76FB, 15 },
-    { 0x76FA, 15 },
-    { 0x3B79, 14 },
-    { 0x3B78, 14 },
-    { 0xD, 4 },
-    { 0x1F, 5 },
-    { 0x13, 5 },
-    { 0xA, 5 },
-    { 0x8, 5 },
-    { 0xC, 4 },
-    { 0x8, 4 },
-    { 0x9, 5 },
-    { 0x3A, 6 }
-  },
-  {  /* AC bias group 3, table 11 */
-    { 0x5, 3 },
-    { 0x3, 4 },
-    { 0x4, 5 },
-    { 0x10, 5 },
-    { 0x8F, 8 },
-    { 0x475, 11 },
-    { 0x11D1, 13 },
-    { 0x79, 7 },
-    { 0x27, 6 },
-    { 0x2, 3 },
-    { 0x3, 3 },
-    { 0x1, 4 },
-    { 0x0, 4 },
-    { 0x26, 6 },
-    { 0x46, 7 },
-    { 0x11C, 9 },
-    { 0x477, 11 },
-    { 0x8ED, 12 },
-    { 0x11D0, 13 },
-    { 0x11D3, 13 },
-    { 0x11D2, 13 },
-    { 0x11D9, 13 },
-    { 0x11D8, 13 },
-    { 0xD, 4 },
-    { 0x1F, 5 },
-    { 0x12, 5 },
-    { 0x5, 5 },
-    { 0x3D, 6 },
-    { 0xC, 4 },
-    { 0xE, 4 },
-    { 0x22, 6 },
-    { 0x78, 7 }
-  },
-  {  /* AC bias group 3, table 12 */
-    { 0x5, 3 },
-    { 0xC, 4 },
-    { 0x1B, 5 },
-    { 0x0, 4 },
-    { 0x6, 6 },
-    { 0x3E2, 10 },
-    { 0x3E3D, 14 },
-    { 0xF, 7 },
-    { 0x34, 6 },
-    { 0x3, 3 },
-    { 0x2, 3 },
-    { 0x1E, 5 },
-    { 0x1D, 5 },
-    { 0x7D, 7 },
-    { 0x1F0, 9 },
-    { 0x7C6, 11 },
-    { 0x3E3C, 14 },
-    { 0x3E3F, 14 },
-    { 0x3E3E, 14 },
-    { 0x3E39, 14 },
-    { 0x3E38, 14 },
-    { 0x3E3B, 14 },
-    { 0x3E3A, 14 },
-    { 0x8, 4 },
-    { 0x1C, 5 },
-    { 0x2, 5 },
-    { 0x3F, 6 },
-    { 0x35, 6 },
-    { 0x9, 4 },
-    { 0x1, 3 },
-    { 0xE, 7 },
-    { 0xF9, 8 }
-  },
-  {  /* AC bias group 3, table 13 */
-    { 0x4, 3 },
-    { 0xB, 4 },
-    { 0x1, 4 },
-    { 0xA, 4 },
-    { 0x1E, 6 },
-    { 0xE0, 9 },
-    { 0xE1E, 13 },
-    { 0x71, 8 },
-    { 0x39, 7 },
-    { 0x7, 3 },
-    { 0x6, 3 },
-    { 0xD, 5 },
-    { 0xC, 5 },
-    { 0x20, 7 },
-    { 0x1C2, 10 },
-    { 0x1C3F, 14 },
-    { 0x1C3E, 14 },
-    { 0xE19, 13 },
-    { 0xE18, 13 },
-    { 0xE1B, 13 },
-    { 0xE1A, 13 },
-    { 0xE1D, 13 },
-    { 0xE1C, 13 },
-    { 0x0, 4 },
-    { 0x9, 5 },
-    { 0x1D, 6 },
-    { 0x1F, 6 },
-    { 0x11, 6 },
-    { 0x5, 4 },
-    { 0x1, 3 },
-    { 0x43, 8 },
-    { 0x42, 8 }
-  },
-  {  /* AC bias group 3, table 14 */
-    { 0x4, 3 },
-    { 0xD, 4 },
-    { 0x7, 4 },
-    { 0x2, 3 },
-    { 0x14, 5 },
-    { 0x16C, 9 },
-    { 0x16D1, 13 },
-    { 0x2DF, 10 },
-    { 0x16E, 9 },
-    { 0x0, 2 },
-    { 0x7, 3 },
-    { 0x2C, 6 },
-    { 0x2B, 6 },
-    { 0x2DE, 10 },
-    { 0x16D0, 13 },
-    { 0x16D3, 13 },
-    { 0x16D2, 13 },
-    { 0x2DB5, 14 },
-    { 0x2DB4, 14 },
-    { 0x2DB7, 14 },
-    { 0x2DB6, 14 },
-    { 0x16D9, 13 },
-    { 0x16D8, 13 },
-    { 0xC, 5 },
-    { 0x2A, 6 },
-    { 0x5A, 7 },
-    { 0x1B, 6 },
-    { 0x1A, 6 },
-    { 0x17, 5 },
-    { 0xC, 4 },
-    { 0x5B7, 11 },
-    { 0x5B5, 11 }
-  },
-  {  /* AC bias group 3, table 15 */
-    { 0x2, 2 },
-    { 0xF, 4 },
-    { 0x1C, 5 },
-    { 0xC, 4 },
-    { 0x3B, 6 },
-    { 0x1AC, 9 },
-    { 0x1AD8, 13 },
-    { 0x35B3, 14 },
-    { 0x35B2, 14 },
-    { 0x1, 2 },
-    { 0x0, 2 },
-    { 0x69, 7 },
-    { 0x68, 7 },
-    { 0x35BD, 14 },
-    { 0x35BC, 14 },
-    { 0x35BF, 14 },
-    { 0x35BE, 14 },
-    { 0x35B9, 14 },
-    { 0x35B8, 14 },
-    { 0x35BB, 14 },
-    { 0x35BA, 14 },
-    { 0x35B5, 14 },
-    { 0x35B4, 14 },
-    { 0x1A9, 9 },
-    { 0x1A8, 9 },
-    { 0x35A, 10 },
-    { 0xD7, 8 },
-    { 0xD5, 8 },
-    { 0x3A, 6 },
-    { 0x1B, 5 },
-    { 0x35B7, 14 },
-    { 0x35B6, 14 }
-  }
+    { /* AC bias group 3, table 0 */
+        {    0x3,  4 },
+        {    0x9,  6 },
+        {   0xD0,  8 },
+        {  0x1A3,  9 },
+        {  0x344, 10 },
+        {  0xD14, 12 },
+        { 0x1A2B, 13 },
+        {    0x4,  4 },
+        {   0x15,  7 },
+        {    0x0,  3 },
+        {    0xF,  4 },
+        {    0xB,  4 },
+        {    0xC,  4 },
+        {    0xE,  4 },
+        {    0x9,  4 },
+        {   0x1B,  5 },
+        {    0xA,  5 },
+        {   0x14,  5 },
+        {    0xD,  5 },
+        {   0x2A,  6 },
+        {   0x14,  7 },
+        {  0x68B, 11 },
+        { 0x1A2A, 13 },
+        {    0x8,  4 },
+        {    0xB,  5 },
+        {   0x2B,  6 },
+        {    0xB,  6 },
+        {   0x69,  7 },
+        {   0x35,  6 },
+        {    0x8,  6 },
+        {    0x7,  4 },
+        {    0xC,  5 }
+    },
+    { /* AC bias group 3, table 1 */
+        {    0xA,  4 },
+        {   0x3C,  6 },
+        {   0x32,  7 },
+        {   0x30,  7 },
+        {   0xC5,  9 },
+        {  0x621, 12 },
+        {  0x620, 12 },
+        {   0x1F,  5 },
+        {   0x33,  7 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {    0xE,  4 },
+        {    0xD,  4 },
+        {    0xC,  4 },
+        {    0x4,  4 },
+        {    0xD,  5 },
+        {   0x26,  6 },
+        {   0x27,  6 },
+        {   0x14,  6 },
+        {   0x63,  8 },
+        {  0x189, 10 },
+        {  0x623, 12 },
+        {  0x622, 12 },
+        {    0xB,  4 },
+        {   0x12,  5 },
+        {   0x3D,  6 },
+        {   0x22,  6 },
+        {   0x15,  6 },
+        {    0xB,  5 },
+        {   0x23,  6 },
+        {    0x7,  4 },
+        {   0x10,  5 }
+    },
+    { /* AC bias group 3, table 2 */
+        {    0xF,  4 },
+        {    0xC,  5 },
+        {   0x43,  7 },
+        {   0x10,  6 },
+        {   0x44,  8 },
+        {  0x114, 10 },
+        {  0x455, 12 },
+        {   0x18,  5 },
+        {   0x23,  7 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {    0xE,  4 },
+        {    0xD,  4 },
+        {    0x9,  4 },
+        {   0x19,  5 },
+        {    0x9,  5 },
+        {   0x17,  6 },
+        {   0x16,  6 },
+        {   0x42,  7 },
+        {   0x8B,  9 },
+        {  0x454, 12 },
+        {  0x457, 12 },
+        {  0x456, 12 },
+        {    0xB,  4 },
+        {   0x15,  5 },
+        {    0xA,  5 },
+        {   0x29,  6 },
+        {   0x20,  6 },
+        {    0xD,  5 },
+        {   0x28,  6 },
+        {    0x7,  4 },
+        {   0x11,  5 }
+    },
+    { /* AC bias group 3, table 3 */
+        {    0x1,  3 },
+        {   0x1A,  5 },
+        {   0x29,  6 },
+        {   0x2A,  6 },
+        {   0xA0,  8 },
+        {  0x285, 10 },
+        { 0x1425, 13 },
+        {    0x2,  5 },
+        {    0x0,  7 },
+        {    0x2,  3 },
+        {    0x3,  3 },
+        {    0xC,  4 },
+        {    0xB,  4 },
+        {    0x8,  4 },
+        {   0x12,  5 },
+        {    0x1,  6 },
+        {   0x51,  7 },
+        {    0x1,  7 },
+        {  0x143,  9 },
+        {  0x508, 11 },
+        { 0x1424, 13 },
+        { 0x1427, 13 },
+        { 0x1426, 13 },
+        {    0xF,  4 },
+        {   0x1C,  5 },
+        {    0x3,  5 },
+        {   0x37,  6 },
+        {   0x2B,  6 },
+        {   0x13,  5 },
+        {   0x36,  6 },
+        {   0x1D,  5 },
+        {    0x1,  5 }
+    },
+    { /* AC bias group 3, table 4 */
+        {    0x4,  3 },
+        {   0x1F,  5 },
+        {   0x3D,  6 },
+        {    0x6,  5 },
+        {   0x16,  7 },
+        {   0x53,  9 },
+        {  0x14A, 11 },
+        {   0x34,  6 },
+        {   0x2A,  8 },
+        {    0x2,  3 },
+        {    0x3,  3 },
+        {    0xB,  4 },
+        {    0xC,  4 },
+        {   0x1C,  5 },
+        {   0x37,  6 },
+        {   0x17,  7 },
+        {   0x2B,  8 },
+        {   0x28,  8 },
+        {   0xA4, 10 },
+        {  0x52D, 13 },
+        {  0x52C, 13 },
+        {  0x52F, 13 },
+        {  0x52E, 13 },
+        {    0x0,  3 },
+        {   0x1D,  5 },
+        {    0x7,  5 },
+        {    0x4,  5 },
+        {   0x35,  6 },
+        {   0x14,  5 },
+        {   0x36,  6 },
+        {   0x15,  5 },
+        {   0x3C,  6 }
+    },
+    { /* AC bias group 3, table 5 */
+        {    0x4,  3 },
+        {    0xA,  4 },
+        {    0x7,  5 },
+        {   0x1D,  5 },
+        {    0x9,  6 },
+        {  0x1F3,  9 },
+        {  0x7C7, 11 },
+        {    0x8,  6 },
+        {  0x1F0,  9 },
+        {    0x3,  3 },
+        {    0x2,  3 },
+        {    0xD,  4 },
+        {    0xC,  4 },
+        {   0x17,  5 },
+        {   0x7D,  7 },
+        {  0x1F2,  9 },
+        {  0x7C6, 11 },
+        {  0x7C5, 11 },
+        { 0x1F12, 13 },
+        { 0x3E27, 14 },
+        { 0x3E26, 14 },
+        { 0x1F11, 13 },
+        { 0x1F10, 13 },
+        {    0x0,  3 },
+        {   0x1E,  5 },
+        {    0x6,  5 },
+        {   0x39,  6 },
+        {   0x38,  6 },
+        {   0x3F,  6 },
+        {   0x2C,  6 },
+        {    0x5,  5 },
+        {   0x2D,  6 }
+    },
+    { /* AC bias group 3, table 6 */
+        {    0x2,  3 },
+        {    0x7,  4 },
+        {   0x18,  5 },
+        {    0x3,  4 },
+        {    0x5,  5 },
+        {   0x35,  7 },
+        {   0x4F,  9 },
+        {   0x12,  7 },
+        {  0x4E5, 13 },
+        {    0x5,  3 },
+        {    0x4,  3 },
+        {    0xD,  4 },
+        {    0xE,  4 },
+        {   0x33,  6 },
+        {   0x26,  8 },
+        {   0x9D, 10 },
+        {  0x4E4, 13 },
+        {  0x4E7, 13 },
+        {  0x4E6, 13 },
+        {  0x4E1, 13 },
+        {  0x4E0, 13 },
+        {  0x4E3, 13 },
+        {  0x4E2, 13 },
+        {    0x0,  3 },
+        {   0x1F,  5 },
+        {    0xC,  5 },
+        {   0x3D,  6 },
+        {   0x3C,  6 },
+        {   0x32,  6 },
+        {   0x34,  7 },
+        {   0x1B,  6 },
+        {    0x8,  6 }
+    },
+    { /* AC bias group 3, table 7 */
+        {    0x0,  3 },
+        {    0x4,  4 },
+        {   0x1C,  5 },
+        {    0xF,  4 },
+        {    0x2,  4 },
+        {    0x7,  5 },
+        {   0x75,  7 },
+        {   0xE8,  8 },
+        { 0x1D2A, 13 },
+        {    0x5,  3 },
+        {    0x4,  3 },
+        {    0xD,  4 },
+        {    0xC,  4 },
+        {   0x77,  7 },
+        {  0xE96, 12 },
+        { 0x3A57, 14 },
+        { 0x3A56, 14 },
+        { 0x3A5D, 14 },
+        { 0x3A5C, 14 },
+        { 0x3A5F, 14 },
+        { 0x3A5E, 14 },
+        { 0x1D29, 13 },
+        { 0x1D28, 13 },
+        {    0x3,  3 },
+        {    0x6,  5 },
+        {    0xA,  5 },
+        {   0x2C,  7 },
+        {   0x17,  6 },
+        {   0x76,  7 },
+        {  0x1D3,  9 },
+        {  0x3A4, 10 },
+        {   0x2D,  7 }
+    },
+    { /* AC bias group 3, table 8 */
+        {    0xA,  4 },
+        {   0x24,  6 },
+        {   0xBF,  8 },
+        {   0x85,  8 },
+        {  0x211, 10 },
+        {  0x842, 12 },
+        { 0x1087, 13 },
+        {   0x18,  5 },
+        {   0x20,  6 },
+        {    0x1,  3 },
+        {    0x2,  3 },
+        {    0xE,  4 },
+        {    0xD,  4 },
+        {    0x7,  4 },
+        {   0x13,  5 },
+        {   0x25,  6 },
+        {   0x5E,  7 },
+        {   0x43,  7 },
+        {   0xBE,  8 },
+        {  0x109,  9 },
+        { 0x1086, 13 },
+        {  0x841, 12 },
+        {  0x840, 12 },
+        {    0xF,  4 },
+        {    0x1,  4 },
+        {   0x11,  5 },
+        {    0x0,  5 },
+        {   0x2E,  6 },
+        {   0x19,  5 },
+        {    0x1,  5 },
+        {    0x6,  4 },
+        {   0x16,  5 }
+    },
+    { /* AC bias group 3, table 9 */
+        {    0x2,  3 },
+        {    0xF,  5 },
+        {   0x6F,  7 },
+        {   0x61,  7 },
+        {  0x374, 10 },
+        { 0x1BA8, 13 },
+        { 0x3753, 14 },
+        {   0x12,  5 },
+        {   0x36,  6 },
+        {    0x0,  3 },
+        {    0x1,  3 },
+        {    0xA,  4 },
+        {    0xB,  4 },
+        {   0x1A,  5 },
+        {   0x31,  6 },
+        {   0x60,  7 },
+        {   0xDC,  8 },
+        {  0x1BB,  9 },
+        {  0x6EB, 11 },
+        { 0x1BAB, 13 },
+        { 0x3752, 14 },
+        { 0x3755, 14 },
+        { 0x3754, 14 },
+        {    0xE,  4 },
+        {    0x6,  4 },
+        {   0x13,  5 },
+        {    0xE,  5 },
+        {   0x3E,  6 },
+        {    0x8,  4 },
+        {   0x1E,  5 },
+        {   0x19,  5 },
+        {   0x3F,  6 }
+    },
+    { /* AC bias group 3, table 10 */
+        {    0x3,  3 },
+        {   0x1C,  5 },
+        {   0x25,  6 },
+        {   0x24,  6 },
+        {  0x1DA,  9 },
+        { 0x1DBD, 13 },
+        { 0x3B7C, 14 },
+        {   0x3C,  6 },
+        {   0x3D,  6 },
+        {    0x0,  3 },
+        {    0x1,  3 },
+        {    0xB,  4 },
+        {    0xA,  4 },
+        {    0xB,  5 },
+        {   0x77,  7 },
+        {   0xEC,  8 },
+        {  0x3B6, 10 },
+        {  0x76E, 11 },
+        { 0x1DBF, 13 },
+        { 0x76FB, 15 },
+        { 0x76FA, 15 },
+        { 0x3B79, 14 },
+        { 0x3B78, 14 },
+        {    0xD,  4 },
+        {   0x1F,  5 },
+        {   0x13,  5 },
+        {    0xA,  5 },
+        {    0x8,  5 },
+        {    0xC,  4 },
+        {    0x8,  4 },
+        {    0x9,  5 },
+        {   0x3A,  6 }
+    },
+    { /* AC bias group 3, table 11 */
+        {    0x5,  3 },
+        {    0x3,  4 },
+        {    0x4,  5 },
+        {   0x10,  5 },
+        {   0x8F,  8 },
+        {  0x475, 11 },
+        { 0x11D1, 13 },
+        {   0x79,  7 },
+        {   0x27,  6 },
+        {    0x2,  3 },
+        {    0x3,  3 },
+        {    0x1,  4 },
+        {    0x0,  4 },
+        {   0x26,  6 },
+        {   0x46,  7 },
+        {  0x11C,  9 },
+        {  0x477, 11 },
+        {  0x8ED, 12 },
+        { 0x11D0, 13 },
+        { 0x11D3, 13 },
+        { 0x11D2, 13 },
+        { 0x11D9, 13 },
+        { 0x11D8, 13 },
+        {    0xD,  4 },
+        {   0x1F,  5 },
+        {   0x12,  5 },
+        {    0x5,  5 },
+        {   0x3D,  6 },
+        {    0xC,  4 },
+        {    0xE,  4 },
+        {   0x22,  6 },
+        {   0x78,  7 }
+    },
+    { /* AC bias group 3, table 12 */
+        {    0x5,  3 },
+        {    0xC,  4 },
+        {   0x1B,  5 },
+        {    0x0,  4 },
+        {    0x6,  6 },
+        {  0x3E2, 10 },
+        { 0x3E3D, 14 },
+        {    0xF,  7 },
+        {   0x34,  6 },
+        {    0x3,  3 },
+        {    0x2,  3 },
+        {   0x1E,  5 },
+        {   0x1D,  5 },
+        {   0x7D,  7 },
+        {  0x1F0,  9 },
+        {  0x7C6, 11 },
+        { 0x3E3C, 14 },
+        { 0x3E3F, 14 },
+        { 0x3E3E, 14 },
+        { 0x3E39, 14 },
+        { 0x3E38, 14 },
+        { 0x3E3B, 14 },
+        { 0x3E3A, 14 },
+        {    0x8,  4 },
+        {   0x1C,  5 },
+        {    0x2,  5 },
+        {   0x3F,  6 },
+        {   0x35,  6 },
+        {    0x9,  4 },
+        {    0x1,  3 },
+        {    0xE,  7 },
+        {   0xF9,  8 }
+    },
+    { /* AC bias group 3, table 13 */
+        {    0x4,  3 },
+        {    0xB,  4 },
+        {    0x1,  4 },
+        {    0xA,  4 },
+        {   0x1E,  6 },
+        {   0xE0,  9 },
+        {  0xE1E, 13 },
+        {   0x71,  8 },
+        {   0x39,  7 },
+        {    0x7,  3 },
+        {    0x6,  3 },
+        {    0xD,  5 },
+        {    0xC,  5 },
+        {   0x20,  7 },
+        {  0x1C2, 10 },
+        { 0x1C3F, 14 },
+        { 0x1C3E, 14 },
+        {  0xE19, 13 },
+        {  0xE18, 13 },
+        {  0xE1B, 13 },
+        {  0xE1A, 13 },
+        {  0xE1D, 13 },
+        {  0xE1C, 13 },
+        {    0x0,  4 },
+        {    0x9,  5 },
+        {   0x1D,  6 },
+        {   0x1F,  6 },
+        {   0x11,  6 },
+        {    0x5,  4 },
+        {    0x1,  3 },
+        {   0x43,  8 },
+        {   0x42,  8 }
+    },
+    { /* AC bias group 3, table 14 */
+        {    0x4,  3 },
+        {    0xD,  4 },
+        {    0x7,  4 },
+        {    0x2,  3 },
+        {   0x14,  5 },
+        {  0x16C,  9 },
+        { 0x16D1, 13 },
+        {  0x2DF, 10 },
+        {  0x16E,  9 },
+        {    0x0,  2 },
+        {    0x7,  3 },
+        {   0x2C,  6 },
+        {   0x2B,  6 },
+        {  0x2DE, 10 },
+        { 0x16D0, 13 },
+        { 0x16D3, 13 },
+        { 0x16D2, 13 },
+        { 0x2DB5, 14 },
+        { 0x2DB4, 14 },
+        { 0x2DB7, 14 },
+        { 0x2DB6, 14 },
+        { 0x16D9, 13 },
+        { 0x16D8, 13 },
+        {    0xC,  5 },
+        {   0x2A,  6 },
+        {   0x5A,  7 },
+        {   0x1B,  6 },
+        {   0x1A,  6 },
+        {   0x17,  5 },
+        {    0xC,  4 },
+        {  0x5B7, 11 },
+        {  0x5B5, 11 }
+    },
+    { /* AC bias group 3, table 15 */
+        {    0x2,  2 },
+        {    0xF,  4 },
+        {   0x1C,  5 },
+        {    0xC,  4 },
+        {   0x3B,  6 },
+        {  0x1AC,  9 },
+        { 0x1AD8, 13 },
+        { 0x35B3, 14 },
+        { 0x35B2, 14 },
+        {    0x1,  2 },
+        {    0x0,  2 },
+        {   0x69,  7 },
+        {   0x68,  7 },
+        { 0x35BD, 14 },
+        { 0x35BC, 14 },
+        { 0x35BF, 14 },
+        { 0x35BE, 14 },
+        { 0x35B9, 14 },
+        { 0x35B8, 14 },
+        { 0x35BB, 14 },
+        { 0x35BA, 14 },
+        { 0x35B5, 14 },
+        { 0x35B4, 14 },
+        {  0x1A9,  9 },
+        {  0x1A8,  9 },
+        {  0x35A, 10 },
+        {   0xD7,  8 },
+        {   0xD5,  8 },
+        {   0x3A,  6 },
+        {   0x1B,  5 },
+        { 0x35B7, 14 },
+        { 0x35B6, 14 }
+    }
 };
 
 static const uint16_t ac_bias_3[16][32][2] = {
-  {  /* AC bias group 4, table 0 */
-    { 0x0, 3 },
-    { 0x10, 5 },
-    { 0x72, 7 },
-    { 0x71, 7 },
-    { 0x154, 9 },
-    { 0xAAB, 12 },
-    { 0xAA8, 12 },
-    { 0x14, 5 },
-    { 0x70, 7 },
-    { 0x2, 3 },
-    { 0x3, 3 },
-    { 0xC, 4 },
-    { 0xB, 4 },
-    { 0x3, 4 },
-    { 0x11, 5 },
-    { 0x73, 7 },
-    { 0x54, 7 },
-    { 0xAB, 8 },
-    { 0x2AB, 10 },
-    { 0x1553, 13 },
-    { 0x1552, 13 },
-    { 0x1555, 13 },
-    { 0x1554, 13 },
-    { 0xD, 4 },
-    { 0x1E, 5 },
-    { 0x12, 5 },
-    { 0x3E, 6 },
-    { 0x2B, 6 },
-    { 0x2, 4 },
-    { 0x3F, 6 },
-    { 0x1D, 5 },
-    { 0x13, 5 }
-  },
-  {  /* AC bias group 4, table 1 */
-    { 0x3, 3 },
-    { 0x1F, 5 },
-    { 0x29, 6 },
-    { 0x3D, 6 },
-    { 0xC, 7 },
-    { 0x69, 10 },
-    { 0x345, 13 },
-    { 0x2, 5 },
-    { 0x28, 6 },
-    { 0x2, 3 },
-    { 0x1, 3 },
-    { 0xE, 4 },
-    { 0xC, 4 },
-    { 0x15, 5 },
-    { 0x7, 6 },
-    { 0x1B, 8 },
-    { 0x6B, 10 },
-    { 0x6A, 10 },
-    { 0x344, 13 },
-    { 0x347, 13 },
-    { 0x346, 13 },
-    { 0x1A1, 12 },
-    { 0x1A0, 12 },
-    { 0xB, 4 },
-    { 0x1A, 5 },
-    { 0x12, 5 },
-    { 0x0, 5 },
-    { 0x3C, 6 },
-    { 0x8, 4 },
-    { 0x1B, 5 },
-    { 0x13, 5 },
-    { 0x1, 5 }
-  },
-  {  /* AC bias group 4, table 2 */
-    { 0x4, 3 },
-    { 0x4, 4 },
-    { 0x3F, 6 },
-    { 0x14, 5 },
-    { 0x56, 7 },
-    { 0x15C, 9 },
-    { 0x15D5, 13 },
-    { 0x3C, 6 },
-    { 0x2A, 6 },
-    { 0x0, 3 },
-    { 0x1, 3 },
-    { 0xE, 4 },
-    { 0xD, 4 },
-    { 0xC, 5 },
-    { 0xAF, 8 },
-    { 0x2BB, 10 },
-    { 0x15D4, 13 },
-    { 0x15D7, 13 },
-    { 0x15D6, 13 },
-    { 0x15D1, 13 },
-    { 0x15D0, 13 },
-    { 0x15D3, 13 },
-    { 0x15D2, 13 },
-    { 0xB, 4 },
-    { 0x19, 5 },
-    { 0xD, 5 },
-    { 0x3E, 6 },
-    { 0x31, 6 },
-    { 0x7, 4 },
-    { 0x5, 4 },
-    { 0x3D, 6 },
-    { 0x30, 6 }
-  },
-  {  /* AC bias group 4, table 3 */
-    { 0x5, 3 },
-    { 0x8, 4 },
-    { 0x1A, 5 },
-    { 0x0, 4 },
-    { 0x36, 6 },
-    { 0x11, 8 },
-    { 0x106, 12 },
-    { 0xA, 7 },
-    { 0x6E, 7 },
-    { 0x2, 3 },
-    { 0x3, 3 },
-    { 0x3, 4 },
-    { 0x2, 4 },
-    { 0x6F, 7 },
-    { 0x21, 9 },
-    { 0x20F, 13 },
-    { 0x20E, 13 },
-    { 0x101, 12 },
-    { 0x100, 12 },
-    { 0x103, 12 },
-    { 0x102, 12 },
-    { 0x105, 12 },
-    { 0x104, 12 },
-    { 0xC, 4 },
-    { 0x1E, 5 },
-    { 0x3, 5 },
-    { 0x3E, 6 },
-    { 0x3F, 6 },
-    { 0x9, 4 },
-    { 0xE, 4 },
-    { 0xB, 7 },
-    { 0x9, 7 }
-  },
-  {  /* AC bias group 4, table 4 */
-    { 0x2, 3 },
-    { 0xE, 4 },
-    { 0x1E, 5 },
-    { 0xC, 4 },
-    { 0x1F, 5 },
-    { 0x6E, 7 },
-    { 0xAD, 10 },
-    { 0xAF, 10 },
-    { 0x14, 7 },
-    { 0x4, 3 },
-    { 0x3, 3 },
-    { 0x1A, 5 },
-    { 0x17, 5 },
-    { 0x2A, 8 },
-    { 0x576, 13 },
-    { 0xAEF, 14 },
-    { 0xAEE, 14 },
-    { 0x571, 13 },
-    { 0x570, 13 },
-    { 0x573, 13 },
-    { 0x572, 13 },
-    { 0x575, 13 },
-    { 0x574, 13 },
-    { 0x3, 4 },
-    { 0x16, 5 },
-    { 0x4, 5 },
-    { 0x36, 6 },
-    { 0xB, 6 },
-    { 0xA, 4 },
-    { 0x0, 3 },
-    { 0x6F, 7 },
-    { 0xAC, 10 }
-  },
-  {  /* AC bias group 4, table 5 */
-    { 0x4, 3 },
-    { 0x5, 4 },
-    { 0x3, 3 },
-    { 0x1, 3 },
-    { 0x4, 4 },
-    { 0x2F, 6 },
-    { 0x526, 11 },
-    { 0x1495, 13 },
-    { 0xA6, 8 },
-    { 0x7, 3 },
-    { 0x6, 3 },
-    { 0x2D, 6 },
-    { 0x2C, 6 },
-    { 0x1494, 13 },
-    { 0x1497, 13 },
-    { 0x1496, 13 },
-    { 0x1491, 13 },
-    { 0x1490, 13 },
-    { 0x1493, 13 },
-    { 0x1492, 13 },
-    { 0x293D, 14 },
-    { 0x293C, 14 },
-    { 0x293F, 14 },
-    { 0x0, 3 },
-    { 0x28, 6 },
-    { 0xA5, 8 },
-    { 0x148, 9 },
-    { 0xA7, 8 },
-    { 0x2E, 6 },
-    { 0x15, 5 },
-    { 0xA4E, 12 },
-    { 0x293E, 14 }
-  },
-  {  /* AC bias group 4, table 6 */
-    { 0x4, 3 },
-    { 0x5, 4 },
-    { 0x3, 3 },
-    { 0x1, 3 },
-    { 0x4, 4 },
-    { 0x2F, 6 },
-    { 0x526, 11 },
-    { 0x1495, 13 },
-    { 0xA6, 8 },
-    { 0x7, 3 },
-    { 0x6, 3 },
-    { 0x2D, 6 },
-    { 0x2C, 6 },
-    { 0x1494, 13 },
-    { 0x1497, 13 },
-    { 0x1496, 13 },
-    { 0x1491, 13 },
-    { 0x1490, 13 },
-    { 0x1493, 13 },
-    { 0x1492, 13 },
-    { 0x293D, 14 },
-    { 0x293C, 14 },
-    { 0x293F, 14 },
-    { 0x0, 3 },
-    { 0x28, 6 },
-    { 0xA5, 8 },
-    { 0x148, 9 },
-    { 0xA7, 8 },
-    { 0x2E, 6 },
-    { 0x15, 5 },
-    { 0xA4E, 12 },
-    { 0x293E, 14 }
-  },
-  {  /* AC bias group 4, table 7 */
-    { 0x4, 3 },
-    { 0x5, 4 },
-    { 0x3, 3 },
-    { 0x1, 3 },
-    { 0x4, 4 },
-    { 0x2F, 6 },
-    { 0x526, 11 },
-    { 0x1495, 13 },
-    { 0xA6, 8 },
-    { 0x7, 3 },
-    { 0x6, 3 },
-    { 0x2D, 6 },
-    { 0x2C, 6 },
-    { 0x1494, 13 },
-    { 0x1497, 13 },
-    { 0x1496, 13 },
-    { 0x1491, 13 },
-    { 0x1490, 13 },
-    { 0x1493, 13 },
-    { 0x1492, 13 },
-    { 0x293D, 14 },
-    { 0x293C, 14 },
-    { 0x293F, 14 },
-    { 0x0, 3 },
-    { 0x28, 6 },
-    { 0xA5, 8 },
-    { 0x148, 9 },
-    { 0xA7, 8 },
-    { 0x2E, 6 },
-    { 0x15, 5 },
-    { 0xA4E, 12 },
-    { 0x293E, 14 }
-  },
-  {  /* AC bias group 4, table 8 */
-    { 0x3, 3 },
-    { 0x11, 5 },
-    { 0x20, 6 },
-    { 0x74, 7 },
-    { 0x10D, 9 },
-    { 0x863, 12 },
-    { 0x860, 12 },
-    { 0xA, 5 },
-    { 0x75, 7 },
-    { 0x1, 3 },
-    { 0x0, 3 },
-    { 0xB, 4 },
-    { 0xA, 4 },
-    { 0x18, 5 },
-    { 0x38, 6 },
-    { 0x42, 7 },
-    { 0x10F, 9 },
-    { 0x10E, 9 },
-    { 0x219, 10 },
-    { 0x10C3, 13 },
-    { 0x10C2, 13 },
-    { 0x10C5, 13 },
-    { 0x10C4, 13 },
-    { 0xF, 4 },
-    { 0x4, 4 },
-    { 0x19, 5 },
-    { 0xB, 5 },
-    { 0x39, 6 },
-    { 0x9, 4 },
-    { 0x1B, 5 },
-    { 0x1A, 5 },
-    { 0x3B, 6 }
-  },
-  {  /* AC bias group 4, table 9 */
-    { 0x5, 3 },
-    { 0x1, 4 },
-    { 0x3E, 6 },
-    { 0x1, 5 },
-    { 0xE2, 8 },
-    { 0x1C6F, 13 },
-    { 0x38D9, 14 },
-    { 0x39, 6 },
-    { 0x1F, 6 },
-    { 0x2, 3 },
-    { 0x1, 3 },
-    { 0x9, 4 },
-    { 0x8, 4 },
-    { 0x0, 5 },
-    { 0x70, 7 },
-    { 0x1C7, 9 },
-    { 0x38C, 10 },
-    { 0x71A, 11 },
-    { 0x38D8, 14 },
-    { 0x38DB, 14 },
-    { 0x38DA, 14 },
-    { 0x38DD, 14 },
-    { 0x38DC, 14 },
-    { 0xD, 4 },
-    { 0x1D, 5 },
-    { 0xE, 5 },
-    { 0x3F, 6 },
-    { 0x3C, 6 },
-    { 0xC, 4 },
-    { 0x6, 4 },
-    { 0x3D, 6 },
-    { 0x1E, 6 }
-  },
-  {  /* AC bias group 4, table 10 */
-    { 0x6, 3 },
-    { 0xB, 4 },
-    { 0x11, 5 },
-    { 0x1E, 5 },
-    { 0x74, 7 },
-    { 0x3AA, 10 },
-    { 0x1D5C, 13 },
-    { 0x1, 6 },
-    { 0x21, 6 },
-    { 0x1, 3 },
-    { 0x2, 3 },
-    { 0x7, 4 },
-    { 0x6, 4 },
-    { 0x3E, 6 },
-    { 0xEB, 8 },
-    { 0x1D4, 9 },
-    { 0xEAF, 12 },
-    { 0x3ABB, 14 },
-    { 0x3ABA, 14 },
-    { 0x1D59, 13 },
-    { 0x1D58, 13 },
-    { 0x1D5B, 13 },
-    { 0x1D5A, 13 },
-    { 0xA, 4 },
-    { 0x1C, 5 },
-    { 0x1, 5 },
-    { 0x3F, 6 },
-    { 0x3B, 6 },
-    { 0x1, 4 },
-    { 0x9, 4 },
-    { 0x20, 6 },
-    { 0x0, 6 }
-  },
-  {  /* AC bias group 4, table 11 */
-    { 0x4, 3 },
-    { 0xA, 4 },
-    { 0x17, 5 },
-    { 0x4, 4 },
-    { 0x16, 6 },
-    { 0x16A, 9 },
-    { 0x16B1, 13 },
-    { 0x17, 7 },
-    { 0x5B, 7 },
-    { 0x6, 3 },
-    { 0x7, 3 },
-    { 0x1, 4 },
-    { 0x0, 4 },
-    { 0xA, 6 },
-    { 0x2D7, 10 },
-    { 0xB5A, 12 },
-    { 0x16B0, 13 },
-    { 0x16B3, 13 },
-    { 0x16B2, 13 },
-    { 0x2D6D, 14 },
-    { 0x2D6C, 14 },
-    { 0x2D6F, 14 },
-    { 0x2D6E, 14 },
-    { 0x6, 4 },
-    { 0xA, 5 },
-    { 0x4, 5 },
-    { 0x2C, 6 },
-    { 0x17, 6 },
-    { 0x3, 4 },
-    { 0x7, 4 },
-    { 0x16, 7 },
-    { 0xB4, 8 }
-  },
-  {  /* AC bias group 4, table 12 */
-    { 0x5, 3 },
-    { 0xD, 4 },
-    { 0x5, 4 },
-    { 0x9, 4 },
-    { 0x33, 6 },
-    { 0x193, 9 },
-    { 0x192C, 13 },
-    { 0x61, 8 },
-    { 0x31, 7 },
-    { 0x0, 2 },
-    { 0x7, 3 },
-    { 0x10, 5 },
-    { 0x11, 5 },
-    { 0xC8, 8 },
-    { 0x192F, 13 },
-    { 0x325B, 14 },
-    { 0x325A, 14 },
-    { 0x1929, 13 },
-    { 0x1928, 13 },
-    { 0x192B, 13 },
-    { 0x192A, 13 },
-    { 0x325D, 14 },
-    { 0x325C, 14 },
-    { 0x18, 5 },
-    { 0x1A, 6 },
-    { 0x1B, 6 },
-    { 0x65, 7 },
-    { 0x19, 6 },
-    { 0x4, 4 },
-    { 0x7, 4 },
-    { 0x60, 8 },
-    { 0x324, 10 }
-  },
-  {  /* AC bias group 4, table 13 */
-    { 0x6, 3 },
-    { 0x0, 3 },
-    { 0x2, 4 },
-    { 0xF, 4 },
-    { 0x39, 6 },
-    { 0x1D9, 9 },
-    { 0x1D82, 13 },
-    { 0x761, 11 },
-    { 0x3BE, 10 },
-    { 0x1, 2 },
-    { 0x2, 2 },
-    { 0xF, 6 },
-    { 0xE, 6 },
-    { 0x762, 11 },
-    { 0x3B07, 14 },
-    { 0x3B06, 14 },
-    { 0x3B1D, 14 },
-    { 0x3B1C, 14 },
-    { 0x3B1F, 14 },
-    { 0x3B1E, 14 },
-    { 0x3B19, 14 },
-    { 0x3B18, 14 },
-    { 0x3B1B, 14 },
-    { 0x38, 6 },
-    { 0x1DE, 9 },
-    { 0xED, 8 },
-    { 0x3BF, 10 },
-    { 0xEE, 8 },
-    { 0x3A, 6 },
-    { 0x6, 5 },
-    { 0xEC0, 12 },
-    { 0x3B1A, 14 }
-  },
-  {  /* AC bias group 4, table 14 */
-    { 0x0, 2 },
-    { 0x2, 3 },
-    { 0xF, 5 },
-    { 0x6, 4 },
-    { 0x1C, 6 },
-    { 0x1D0, 10 },
-    { 0xE8C, 13 },
-    { 0x1D1B, 14 },
-    { 0x1D1A, 14 },
-    { 0x3, 2 },
-    { 0x2, 2 },
-    { 0xEA, 9 },
-    { 0xE9, 9 },
-    { 0xE89, 13 },
-    { 0xE88, 13 },
-    { 0xE8B, 13 },
-    { 0xE8A, 13 },
-    { 0x1D65, 14 },
-    { 0x1D64, 14 },
-    { 0x1D67, 14 },
-    { 0x1D66, 14 },
-    { 0x1D61, 14 },
-    { 0x1D60, 14 },
-    { 0x3AD, 11 },
-    { 0x1D63, 14 },
-    { 0x1D62, 14 },
-    { 0x1D1D, 14 },
-    { 0x1D1C, 14 },
-    { 0x3B, 7 },
-    { 0x1D7, 10 },
-    { 0x1D1F, 14 },
-    { 0x1D1E, 14 }
-  },
-  {  /* AC bias group 4, table 15 */
-    { 0x2, 2 },
-    { 0xF, 4 },
-    { 0x1C, 5 },
-    { 0xC, 4 },
-    { 0x3B, 6 },
-    { 0x1AC, 9 },
-    { 0x1AD8, 13 },
-    { 0x35B3, 14 },
-    { 0x35B2, 14 },
-    { 0x1, 2 },
-    { 0x0, 2 },
-    { 0x69, 7 },
-    { 0x68, 7 },
-    { 0x35BD, 14 },
-    { 0x35BC, 14 },
-    { 0x35BF, 14 },
-    { 0x35BE, 14 },
-    { 0x35B9, 14 },
-    { 0x35B8, 14 },
-    { 0x35BB, 14 },
-    { 0x35BA, 14 },
-    { 0x35B5, 14 },
-    { 0x35B4, 14 },
-    { 0x1A9, 9 },
-    { 0x1A8, 9 },
-    { 0x35A, 10 },
-    { 0xD7, 8 },
-    { 0xD5, 8 },
-    { 0x3A, 6 },
-    { 0x1B, 5 },
-    { 0x35B7, 14 },
-    { 0x35B6, 14 }
-  }
+    { /* AC bias group 4, table 0 */
+        {    0x0,  3 },
+        {   0x10,  5 },
+        {   0x72,  7 },
+        {   0x71,  7 },
+        {  0x154,  9 },
+        {  0xAAB, 12 },
+        {  0xAA8, 12 },
+        {   0x14,  5 },
+        {   0x70,  7 },
+        {    0x2,  3 },
+        {    0x3,  3 },
+        {    0xC,  4 },
+        {    0xB,  4 },
+        {    0x3,  4 },
+        {   0x11,  5 },
+        {   0x73,  7 },
+        {   0x54,  7 },
+        {   0xAB,  8 },
+        {  0x2AB, 10 },
+        { 0x1553, 13 },
+        { 0x1552, 13 },
+        { 0x1555, 13 },
+        { 0x1554, 13 },
+        {    0xD,  4 },
+        {   0x1E,  5 },
+        {   0x12,  5 },
+        {   0x3E,  6 },
+        {   0x2B,  6 },
+        {    0x2,  4 },
+        {   0x3F,  6 },
+        {   0x1D,  5 },
+        {   0x13,  5 }
+    },
+    { /* AC bias group 4, table 1 */
+        {    0x3,  3 },
+        {   0x1F,  5 },
+        {   0x29,  6 },
+        {   0x3D,  6 },
+        {    0xC,  7 },
+        {   0x69, 10 },
+        {  0x345, 13 },
+        {    0x2,  5 },
+        {   0x28,  6 },
+        {    0x2,  3 },
+        {    0x1,  3 },
+        {    0xE,  4 },
+        {    0xC,  4 },
+        {   0x15,  5 },
+        {    0x7,  6 },
+        {   0x1B,  8 },
+        {   0x6B, 10 },
+        {   0x6A, 10 },
+        {  0x344, 13 },
+        {  0x347, 13 },
+        {  0x346, 13 },
+        {  0x1A1, 12 },
+        {  0x1A0, 12 },
+        {    0xB,  4 },
+        {   0x1A,  5 },
+        {   0x12,  5 },
+        {    0x0,  5 },
+        {   0x3C,  6 },
+        {    0x8,  4 },
+        {   0x1B,  5 },
+        {   0x13,  5 },
+        {    0x1,  5 }
+    },
+    { /* AC bias group 4, table 2 */
+        {    0x4,  3 },
+        {    0x4,  4 },
+        {   0x3F,  6 },
+        {   0x14,  5 },
+        {   0x56,  7 },
+        {  0x15C,  9 },
+        { 0x15D5, 13 },
+        {   0x3C,  6 },
+        {   0x2A,  6 },
+        {    0x0,  3 },
+        {    0x1,  3 },
+        {    0xE,  4 },
+        {    0xD,  4 },
+        {    0xC,  5 },
+        {   0xAF,  8 },
+        {  0x2BB, 10 },
+        { 0x15D4, 13 },
+        { 0x15D7, 13 },
+        { 0x15D6, 13 },
+        { 0x15D1, 13 },
+        { 0x15D0, 13 },
+        { 0x15D3, 13 },
+        { 0x15D2, 13 },
+        {    0xB,  4 },
+        {   0x19,  5 },
+        {    0xD,  5 },
+        {   0x3E,  6 },
+        {   0x31,  6 },
+        {    0x7,  4 },
+        {    0x5,  4 },
+        {   0x3D,  6 },
+        {   0x30,  6 }
+    },
+    { /* AC bias group 4, table 3 */
+        {    0x5,  3 },
+        {    0x8,  4 },
+        {   0x1A,  5 },
+        {    0x0,  4 },
+        {   0x36,  6 },
+        {   0x11,  8 },
+        {  0x106, 12 },
+        {    0xA,  7 },
+        {   0x6E,  7 },
+        {    0x2,  3 },
+        {    0x3,  3 },
+        {    0x3,  4 },
+        {    0x2,  4 },
+        {   0x6F,  7 },
+        {   0x21,  9 },
+        {  0x20F, 13 },
+        {  0x20E, 13 },
+        {  0x101, 12 },
+        {  0x100, 12 },
+        {  0x103, 12 },
+        {  0x102, 12 },
+        {  0x105, 12 },
+        {  0x104, 12 },
+        {    0xC,  4 },
+        {   0x1E,  5 },
+        {    0x3,  5 },
+        {   0x3E,  6 },
+        {   0x3F,  6 },
+        {    0x9,  4 },
+        {    0xE,  4 },
+        {    0xB,  7 },
+        {    0x9,  7 }
+    },
+    { /* AC bias group 4, table 4 */
+        {    0x2,  3 },
+        {    0xE,  4 },
+        {   0x1E,  5 },
+        {    0xC,  4 },
+        {   0x1F,  5 },
+        {   0x6E,  7 },
+        {   0xAD, 10 },
+        {   0xAF, 10 },
+        {   0x14,  7 },
+        {    0x4,  3 },
+        {    0x3,  3 },
+        {   0x1A,  5 },
+        {   0x17,  5 },
+        {   0x2A,  8 },
+        {  0x576, 13 },
+        {  0xAEF, 14 },
+        {  0xAEE, 14 },
+        {  0x571, 13 },
+        {  0x570, 13 },
+        {  0x573, 13 },
+        {  0x572, 13 },
+        {  0x575, 13 },
+        {  0x574, 13 },
+        {    0x3,  4 },
+        {   0x16,  5 },
+        {    0x4,  5 },
+        {   0x36,  6 },
+        {    0xB,  6 },
+        {    0xA,  4 },
+        {    0x0,  3 },
+        {   0x6F,  7 },
+        {   0xAC, 10 }
+    },
+    { /* AC bias group 4, table 5 */
+        {    0x4,  3 },
+        {    0x5,  4 },
+        {    0x3,  3 },
+        {    0x1,  3 },
+        {    0x4,  4 },
+        {   0x2F,  6 },
+        {  0x526, 11 },
+        { 0x1495, 13 },
+        {   0xA6,  8 },
+        {    0x7,  3 },
+        {    0x6,  3 },
+        {   0x2D,  6 },
+        {   0x2C,  6 },
+        { 0x1494, 13 },
+        { 0x1497, 13 },
+        { 0x1496, 13 },
+        { 0x1491, 13 },
+        { 0x1490, 13 },
+        { 0x1493, 13 },
+        { 0x1492, 13 },
+        { 0x293D, 14 },
+        { 0x293C, 14 },
+        { 0x293F, 14 },
+        {    0x0,  3 },
+        {   0x28,  6 },
+        {   0xA5,  8 },
+        {  0x148,  9 },
+        {   0xA7,  8 },
+        {   0x2E,  6 },
+        {   0x15,  5 },
+        {  0xA4E, 12 },
+        { 0x293E, 14 }
+    },
+    { /* AC bias group 4, table 6 */
+        {    0x4,  3 },
+        {    0x5,  4 },
+        {    0x3,  3 },
+        {    0x1,  3 },
+        {    0x4,  4 },
+        {   0x2F,  6 },
+        {  0x526, 11 },
+        { 0x1495, 13 },
+        {   0xA6,  8 },
+        {    0x7,  3 },
+        {    0x6,  3 },
+        {   0x2D,  6 },
+        {   0x2C,  6 },
+        { 0x1494, 13 },
+        { 0x1497, 13 },
+        { 0x1496, 13 },
+        { 0x1491, 13 },
+        { 0x1490, 13 },
+        { 0x1493, 13 },
+        { 0x1492, 13 },
+        { 0x293D, 14 },
+        { 0x293C, 14 },
+        { 0x293F, 14 },
+        {    0x0,  3 },
+        {   0x28,  6 },
+        {   0xA5,  8 },
+        {  0x148,  9 },
+        {   0xA7,  8 },
+        {   0x2E,  6 },
+        {   0x15,  5 },
+        {  0xA4E, 12 },
+        { 0x293E, 14 }
+    },
+    { /* AC bias group 4, table 7 */
+        {    0x4,  3 },
+        {    0x5,  4 },
+        {    0x3,  3 },
+        {    0x1,  3 },
+        {    0x4,  4 },
+        {   0x2F,  6 },
+        {  0x526, 11 },
+        { 0x1495, 13 },
+        {   0xA6,  8 },
+        {    0x7,  3 },
+        {    0x6,  3 },
+        {   0x2D,  6 },
+        {   0x2C,  6 },
+        { 0x1494, 13 },
+        { 0x1497, 13 },
+        { 0x1496, 13 },
+        { 0x1491, 13 },
+        { 0x1490, 13 },
+        { 0x1493, 13 },
+        { 0x1492, 13 },
+        { 0x293D, 14 },
+        { 0x293C, 14 },
+        { 0x293F, 14 },
+        {    0x0,  3 },
+        {   0x28,  6 },
+        {   0xA5,  8 },
+        {  0x148,  9 },
+        {   0xA7,  8 },
+        {   0x2E,  6 },
+        {   0x15,  5 },
+        {  0xA4E, 12 },
+        { 0x293E, 14 }
+    },
+    { /* AC bias group 4, table 8 */
+        {    0x3,  3 },
+        {   0x11,  5 },
+        {   0x20,  6 },
+        {   0x74,  7 },
+        {  0x10D,  9 },
+        {  0x863, 12 },
+        {  0x860, 12 },
+        {    0xA,  5 },
+        {   0x75,  7 },
+        {    0x1,  3 },
+        {    0x0,  3 },
+        {    0xB,  4 },
+        {    0xA,  4 },
+        {   0x18,  5 },
+        {   0x38,  6 },
+        {   0x42,  7 },
+        {  0x10F,  9 },
+        {  0x10E,  9 },
+        {  0x219, 10 },
+        { 0x10C3, 13 },
+        { 0x10C2, 13 },
+        { 0x10C5, 13 },
+        { 0x10C4, 13 },
+        {    0xF,  4 },
+        {    0x4,  4 },
+        {   0x19,  5 },
+        {    0xB,  5 },
+        {   0x39,  6 },
+        {    0x9,  4 },
+        {   0x1B,  5 },
+        {   0x1A,  5 },
+        {   0x3B,  6 }
+    },
+    { /* AC bias group 4, table 9 */
+        {    0x5,  3 },
+        {    0x1,  4 },
+        {   0x3E,  6 },
+        {    0x1,  5 },
+        {   0xE2,  8 },
+        { 0x1C6F, 13 },
+        { 0x38D9, 14 },
+        {   0x39,  6 },
+        {   0x1F,  6 },
+        {    0x2,  3 },
+        {    0x1,  3 },
+        {    0x9,  4 },
+        {    0x8,  4 },
+        {    0x0,  5 },
+        {   0x70,  7 },
+        {  0x1C7,  9 },
+        {  0x38C, 10 },
+        {  0x71A, 11 },
+        { 0x38D8, 14 },
+        { 0x38DB, 14 },
+        { 0x38DA, 14 },
+        { 0x38DD, 14 },
+        { 0x38DC, 14 },
+        {    0xD,  4 },
+        {   0x1D,  5 },
+        {    0xE,  5 },
+        {   0x3F,  6 },
+        {   0x3C,  6 },
+        {    0xC,  4 },
+        {    0x6,  4 },
+        {   0x3D,  6 },
+        {   0x1E,  6 }
+    },
+    { /* AC bias group 4, table 10 */
+        {    0x6,  3 },
+        {    0xB,  4 },
+        {   0x11,  5 },
+        {   0x1E,  5 },
+        {   0x74,  7 },
+        {  0x3AA, 10 },
+        { 0x1D5C, 13 },
+        {    0x1,  6 },
+        {   0x21,  6 },
+        {    0x1,  3 },
+        {    0x2,  3 },
+        {    0x7,  4 },
+        {    0x6,  4 },
+        {   0x3E,  6 },
+        {   0xEB,  8 },
+        {  0x1D4,  9 },
+        {  0xEAF, 12 },
+        { 0x3ABB, 14 },
+        { 0x3ABA, 14 },
+        { 0x1D59, 13 },
+        { 0x1D58, 13 },
+        { 0x1D5B, 13 },
+        { 0x1D5A, 13 },
+        {    0xA,  4 },
+        {   0x1C,  5 },
+        {    0x1,  5 },
+        {   0x3F,  6 },
+        {   0x3B,  6 },
+        {    0x1,  4 },
+        {    0x9,  4 },
+        {   0x20,  6 },
+        {    0x0,  6 }
+    },
+    { /* AC bias group 4, table 11 */
+        {    0x4,  3 },
+        {    0xA,  4 },
+        {   0x17,  5 },
+        {    0x4,  4 },
+        {   0x16,  6 },
+        {  0x16A,  9 },
+        { 0x16B1, 13 },
+        {   0x17,  7 },
+        {   0x5B,  7 },
+        {    0x6,  3 },
+        {    0x7,  3 },
+        {    0x1,  4 },
+        {    0x0,  4 },
+        {    0xA,  6 },
+        {  0x2D7, 10 },
+        {  0xB5A, 12 },
+        { 0x16B0, 13 },
+        { 0x16B3, 13 },
+        { 0x16B2, 13 },
+        { 0x2D6D, 14 },
+        { 0x2D6C, 14 },
+        { 0x2D6F, 14 },
+        { 0x2D6E, 14 },
+        {    0x6,  4 },
+        {    0xA,  5 },
+        {    0x4,  5 },
+        {   0x2C,  6 },
+        {   0x17,  6 },
+        {    0x3,  4 },
+        {    0x7,  4 },
+        {   0x16,  7 },
+        {   0xB4,  8 }
+    },
+    { /* AC bias group 4, table 12 */
+        {    0x5,  3 },
+        {    0xD,  4 },
+        {    0x5,  4 },
+        {    0x9,  4 },
+        {   0x33,  6 },
+        {  0x193,  9 },
+        { 0x192C, 13 },
+        {   0x61,  8 },
+        {   0x31,  7 },
+        {    0x0,  2 },
+        {    0x7,  3 },
+        {   0x10,  5 },
+        {   0x11,  5 },
+        {   0xC8,  8 },
+        { 0x192F, 13 },
+        { 0x325B, 14 },
+        { 0x325A, 14 },
+        { 0x1929, 13 },
+        { 0x1928, 13 },
+        { 0x192B, 13 },
+        { 0x192A, 13 },
+        { 0x325D, 14 },
+        { 0x325C, 14 },
+        {   0x18,  5 },
+        {   0x1A,  6 },
+        {   0x1B,  6 },
+        {   0x65,  7 },
+        {   0x19,  6 },
+        {    0x4,  4 },
+        {    0x7,  4 },
+        {   0x60,  8 },
+        {  0x324, 10 }
+    },
+    { /* AC bias group 4, table 13 */
+        {    0x6,  3 },
+        {    0x0,  3 },
+        {    0x2,  4 },
+        {    0xF,  4 },
+        {   0x39,  6 },
+        {  0x1D9,  9 },
+        { 0x1D82, 13 },
+        {  0x761, 11 },
+        {  0x3BE, 10 },
+        {    0x1,  2 },
+        {    0x2,  2 },
+        {    0xF,  6 },
+        {    0xE,  6 },
+        {  0x762, 11 },
+        { 0x3B07, 14 },
+        { 0x3B06, 14 },
+        { 0x3B1D, 14 },
+        { 0x3B1C, 14 },
+        { 0x3B1F, 14 },
+        { 0x3B1E, 14 },
+        { 0x3B19, 14 },
+        { 0x3B18, 14 },
+        { 0x3B1B, 14 },
+        {   0x38,  6 },
+        {  0x1DE,  9 },
+        {   0xED,  8 },
+        {  0x3BF, 10 },
+        {   0xEE,  8 },
+        {   0x3A,  6 },
+        {    0x6,  5 },
+        {  0xEC0, 12 },
+        { 0x3B1A, 14 }
+    },
+    { /* AC bias group 4, table 14 */
+        {    0x0,  2 },
+        {    0x2,  3 },
+        {    0xF,  5 },
+        {    0x6,  4 },
+        {   0x1C,  6 },
+        {  0x1D0, 10 },
+        {  0xE8C, 13 },
+        { 0x1D1B, 14 },
+        { 0x1D1A, 14 },
+        {    0x3,  2 },
+        {    0x2,  2 },
+        {   0xEA,  9 },
+        {   0xE9,  9 },
+        {  0xE89, 13 },
+        {  0xE88, 13 },
+        {  0xE8B, 13 },
+        {  0xE8A, 13 },
+        { 0x1D65, 14 },
+        { 0x1D64, 14 },
+        { 0x1D67, 14 },
+        { 0x1D66, 14 },
+        { 0x1D61, 14 },
+        { 0x1D60, 14 },
+        {  0x3AD, 11 },
+        { 0x1D63, 14 },
+        { 0x1D62, 14 },
+        { 0x1D1D, 14 },
+        { 0x1D1C, 14 },
+        {   0x3B,  7 },
+        {  0x1D7, 10 },
+        { 0x1D1F, 14 },
+        { 0x1D1E, 14 }
+    },
+    { /* AC bias group 4, table 15 */
+        {    0x2,  2 },
+        {    0xF,  4 },
+        {   0x1C,  5 },
+        {    0xC,  4 },
+        {   0x3B,  6 },
+        {  0x1AC,  9 },
+        { 0x1AD8, 13 },
+        { 0x35B3, 14 },
+        { 0x35B2, 14 },
+        {    0x1,  2 },
+        {    0x0,  2 },
+        {   0x69,  7 },
+        {   0x68,  7 },
+        { 0x35BD, 14 },
+        { 0x35BC, 14 },
+        { 0x35BF, 14 },
+        { 0x35BE, 14 },
+        { 0x35B9, 14 },
+        { 0x35B8, 14 },
+        { 0x35BB, 14 },
+        { 0x35BA, 14 },
+        { 0x35B5, 14 },
+        { 0x35B4, 14 },
+        {  0x1A9,  9 },
+        {  0x1A8,  9 },
+        {  0x35A, 10 },
+        {   0xD7,  8 },
+        {   0xD5,  8 },
+        {   0x3A,  6 },
+        {   0x1B,  5 },
+        { 0x35B7, 14 },
+        { 0x35B6, 14 }
+    }
 };
 
 #endif /* AVCODEC_VP3DATA_H */
diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c
index 56fffb7cbc..d7edbb54ae 100644
--- a/libavcodec/vp3dsp.c
+++ b/libavcodec/vp3dsp.c
@@ -27,6 +27,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
+
 #include "avcodec.h"
 #include "dsputil.h"
 #include "rnd_avg.h"
@@ -41,9 +42,10 @@
 #define xC6S2 25080
 #define xC7S1 12785
 
-#define M(a,b) (((a) * (b))>>16)
+#define M(a, b) (((a) * (b)) >> 16)
 
-static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int type)
+static av_always_inline void idct(uint8_t *dst, int stride,
+                                  int16_t *input, int type)
 {
     int16_t *ip = input;
 
@@ -55,8 +57,8 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
     /* Inverse DCT on the rows now */
     for (i = 0; i < 8; i++) {
         /* Check for non-zero values */
-        if ( ip[0 * 8] | ip[1 * 8] | ip[2 * 8] | ip[3 * 8] |
-             ip[4 * 8] | ip[5 * 8] | ip[6 * 8] | ip[7 * 8] ) {
+        if (ip[0 * 8] | ip[1 * 8] | ip[2 * 8] | ip[3 * 8] |
+            ip[4 * 8] | ip[5 * 8] | ip[6 * 8] | ip[7 * 8]) {
             A = M(xC1S7, ip[1 * 8]) + M(xC7S1, ip[7 * 8]);
             B = M(xC7S1, ip[1 * 8]) - M(xC1S7, ip[7 * 8]);
             C = M(xC3S5, ip[3 * 8]) + M(xC5S3, ip[5 * 8]);
@@ -84,14 +86,14 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
             Hd = Bd + H;
 
             /*  Final sequence of operations over-write original inputs. */
-            ip[0 * 8] = Gd + Cd ;
-            ip[7 * 8] = Gd - Cd ;
+            ip[0 * 8] = Gd + Cd;
+            ip[7 * 8] = Gd - Cd;
 
             ip[1 * 8] = Add + Hd;
             ip[2 * 8] = Add - Hd;
 
-            ip[3 * 8] = Ed + Dd ;
-            ip[4 * 8] = Ed - Dd ;
+            ip[3 * 8] = Ed + Dd;
+            ip[4 * 8] = Ed - Dd;
 
             ip[5 * 8] = Fd + Bdd;
             ip[6 * 8] = Fd - Bdd;
@@ -102,11 +104,10 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
 
     ip = input;
 
-    for ( i = 0; i < 8; i++) {
+    for (i = 0; i < 8; i++) {
         /* Check for non-zero values (bitwise or faster than ||) */
-        if ( ip[1] | ip[2] | ip[3] |
-             ip[4] | ip[5] | ip[6] | ip[7] ) {
-
+        if (ip[1] | ip[2] | ip[3] |
+            ip[4] | ip[5] | ip[6] | ip[7]) {
             A = M(xC1S7, ip[1]) + M(xC7S1, ip[7]);
             B = M(xC7S1, ip[1]) - M(xC1S7, ip[7]);
             C = M(xC3S5, ip[3]) + M(xC5S3, ip[5]);
@@ -121,9 +122,9 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
             E = M(xC4S4, (ip[0] + ip[4])) + 8;
             F = M(xC4S4, (ip[0] - ip[4])) + 8;
 
-            if(type==1){  //HACK
-                E += 16*128;
-                F += 16*128;
+            if (type == 1) { // HACK
+                E += 16 * 128;
+                F += 16 * 128;
             }
 
             G = M(xC2S6, ip[2]) + M(xC6S2, ip[6]);
@@ -140,52 +141,51 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
 
             /* Final sequence of operations over-write original inputs. */
             if (type == 1) {
-                dst[0*stride] = av_clip_uint8((Gd + Cd )  >> 4);
-                dst[7*stride] = av_clip_uint8((Gd - Cd )  >> 4);
+                dst[0 * stride] = av_clip_uint8((Gd + Cd) >> 4);
+                dst[7 * stride] = av_clip_uint8((Gd - Cd) >> 4);
 
-                dst[1*stride] = av_clip_uint8((Add + Hd ) >> 4);
-                dst[2*stride] = av_clip_uint8((Add - Hd ) >> 4);
+                dst[1 * stride] = av_clip_uint8((Add + Hd) >> 4);
+                dst[2 * stride] = av_clip_uint8((Add - Hd) >> 4);
 
-                dst[3*stride] = av_clip_uint8((Ed + Dd )  >> 4);
-                dst[4*stride] = av_clip_uint8((Ed - Dd )  >> 4);
+                dst[3 * stride] = av_clip_uint8((Ed + Dd) >> 4);
+                dst[4 * stride] = av_clip_uint8((Ed - Dd) >> 4);
 
-                dst[5*stride] = av_clip_uint8((Fd + Bdd ) >> 4);
-                dst[6*stride] = av_clip_uint8((Fd - Bdd ) >> 4);
-            }else{
-                dst[0*stride] = av_clip_uint8(dst[0*stride] + ((Gd + Cd )  >> 4));
-                dst[7*stride] = av_clip_uint8(dst[7*stride] + ((Gd - Cd )  >> 4));
+                dst[5 * stride] = av_clip_uint8((Fd + Bdd) >> 4);
+                dst[6 * stride] = av_clip_uint8((Fd - Bdd) >> 4);
+            } else {
+                dst[0 * stride] = av_clip_uint8(dst[0 * stride] + ((Gd + Cd) >> 4));
+                dst[7 * stride] = av_clip_uint8(dst[7 * stride] + ((Gd - Cd) >> 4));
 
-                dst[1*stride] = av_clip_uint8(dst[1*stride] + ((Add + Hd ) >> 4));
-                dst[2*stride] = av_clip_uint8(dst[2*stride] + ((Add - Hd ) >> 4));
+                dst[1 * stride] = av_clip_uint8(dst[1 * stride] + ((Add + Hd) >> 4));
+                dst[2 * stride] = av_clip_uint8(dst[2 * stride] + ((Add - Hd) >> 4));
 
-                dst[3*stride] = av_clip_uint8(dst[3*stride] + ((Ed + Dd )  >> 4));
-                dst[4*stride] = av_clip_uint8(dst[4*stride] + ((Ed - Dd )  >> 4));
+                dst[3 * stride] = av_clip_uint8(dst[3 * stride] + ((Ed + Dd) >> 4));
+                dst[4 * stride] = av_clip_uint8(dst[4 * stride] + ((Ed - Dd) >> 4));
 
-                dst[5*stride] = av_clip_uint8(dst[5*stride] + ((Fd + Bdd ) >> 4));
-                dst[6*stride] = av_clip_uint8(dst[6*stride] + ((Fd - Bdd ) >> 4));
+                dst[5 * stride] = av_clip_uint8(dst[5 * stride] + ((Fd + Bdd) >> 4));
+                dst[6 * stride] = av_clip_uint8(dst[6 * stride] + ((Fd - Bdd) >> 4));
             }
-
         } else {
             if (type == 1) {
-                dst[0*stride]=
-                dst[1*stride]=
-                dst[2*stride]=
-                dst[3*stride]=
-                dst[4*stride]=
-                dst[5*stride]=
-                dst[6*stride]=
-                dst[7*stride]= av_clip_uint8(128 + ((xC4S4 * ip[0] + (IdctAdjustBeforeShift<<16))>>20));
-            }else{
-                if(ip[0]){
-                    int v= ((xC4S4 * ip[0] + (IdctAdjustBeforeShift<<16))>>20);
-                    dst[0*stride] = av_clip_uint8(dst[0*stride] + v);
-                    dst[1*stride] = av_clip_uint8(dst[1*stride] + v);
-                    dst[2*stride] = av_clip_uint8(dst[2*stride] + v);
-                    dst[3*stride] = av_clip_uint8(dst[3*stride] + v);
-                    dst[4*stride] = av_clip_uint8(dst[4*stride] + v);
-                    dst[5*stride] = av_clip_uint8(dst[5*stride] + v);
-                    dst[6*stride] = av_clip_uint8(dst[6*stride] + v);
-                    dst[7*stride] = av_clip_uint8(dst[7*stride] + v);
+                dst[0*stride] =
+                dst[1*stride] =
+                dst[2*stride] =
+                dst[3*stride] =
+                dst[4*stride] =
+                dst[5*stride] =
+                dst[6*stride] =
+                dst[7*stride] = av_clip_uint8(128 + ((xC4S4 * ip[0] + (IdctAdjustBeforeShift << 16)) >> 20));
+            } else {
+                if (ip[0]) {
+                    int v = (xC4S4 * ip[0] + (IdctAdjustBeforeShift << 16)) >> 20;
+                    dst[0 * stride] = av_clip_uint8(dst[0 * stride] + v);
+                    dst[1 * stride] = av_clip_uint8(dst[1 * stride] + v);
+                    dst[2 * stride] = av_clip_uint8(dst[2 * stride] + v);
+                    dst[3 * stride] = av_clip_uint8(dst[3 * stride] + v);
+                    dst[4 * stride] = av_clip_uint8(dst[4 * stride] + v);
+                    dst[5 * stride] = av_clip_uint8(dst[5 * stride] + v);
+                    dst[6 * stride] = av_clip_uint8(dst[6 * stride] + v);
+                    dst[7 * stride] = av_clip_uint8(dst[7 * stride] + v);
                 }
             }
         }
@@ -195,26 +195,26 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int
     }
 }
 
-static void vp3_idct_put_c(uint8_t *dest/*align 8*/, int line_size,
-                           int16_t *block/*align 16*/)
+static void vp3_idct_put_c(uint8_t *dest /* align 8 */, int line_size,
+                           int16_t *block /* align 16 */)
 {
     idct(dest, line_size, block, 1);
     memset(block, 0, sizeof(*block) * 64);
 }
 
-static void vp3_idct_add_c(uint8_t *dest/*align 8*/, int line_size,
-                           int16_t *block/*align 16*/)
+static void vp3_idct_add_c(uint8_t *dest /* align 8 */, int line_size,
+                           int16_t *block /* align 16 */)
 {
     idct(dest, line_size, block, 2);
     memset(block, 0, sizeof(*block) * 64);
 }
 
-static void vp3_idct_dc_add_c(uint8_t *dest/*align 8*/, int line_size,
-                              int16_t *block/*align 16*/)
+static void vp3_idct_dc_add_c(uint8_t *dest /* align 8 */, int line_size,
+                              int16_t *block /* align 16 */)
 {
     int i, dc = (block[0] + 15) >> 5;
 
-    for(i = 0; i < 8; i++){
+    for (i = 0; i < 8; i++) {
         dest[0] = av_clip_uint8(dest[0] + dc);
         dest[1] = av_clip_uint8(dest[1] + dc);
         dest[2] = av_clip_uint8(dest[2] + dc);
@@ -223,7 +223,7 @@ static void vp3_idct_dc_add_c(uint8_t *dest/*align 8*/, int line_size,
         dest[5] = av_clip_uint8(dest[5] + dc);
         dest[6] = av_clip_uint8(dest[6] + dc);
         dest[7] = av_clip_uint8(dest[7] + dc);
-        dest += line_size;
+        dest   += line_size;
     }
     block[0] = 0;
 }
@@ -233,15 +233,15 @@ static void vp3_v_loop_filter_c(uint8_t *first_pixel, int stride,
 {
     unsigned char *end;
     int filter_value;
-    const int nstride= -stride;
+    const int nstride = -stride;
 
-    for (end= first_pixel + 8; first_pixel < end; first_pixel++) {
-        filter_value =
-            (first_pixel[2 * nstride] - first_pixel[ stride])
-         +3*(first_pixel[0          ] - first_pixel[nstride]);
+    for (end = first_pixel + 8; first_pixel < end; first_pixel++) {
+        filter_value = (first_pixel[2 * nstride] - first_pixel[stride]) +
+                       (first_pixel[0] - first_pixel[nstride]) * 3;
         filter_value = bounding_values[(filter_value + 4) >> 3];
+
         first_pixel[nstride] = av_clip_uint8(first_pixel[nstride] + filter_value);
-        first_pixel[0] = av_clip_uint8(first_pixel[0] - filter_value);
+        first_pixel[0]       = av_clip_uint8(first_pixel[0] - filter_value);
     }
 }
 
@@ -251,11 +251,11 @@ static void vp3_h_loop_filter_c(uint8_t *first_pixel, int stride,
     unsigned char *end;
     int filter_value;
 
-    for (end= first_pixel + 8*stride; first_pixel != end; first_pixel += stride) {
-        filter_value =
-            (first_pixel[-2] - first_pixel[ 1])
-         +3*(first_pixel[ 0] - first_pixel[-1]);
+    for (end = first_pixel + 8 * stride; first_pixel != end; first_pixel += stride) {
+        filter_value = (first_pixel[-2] - first_pixel[1]) +
+                       (first_pixel[ 0] - first_pixel[-1]) * 3;
         filter_value = bounding_values[(filter_value + 4) >> 3];
+
         first_pixel[-1] = av_clip_uint8(first_pixel[-1] + filter_value);
         first_pixel[ 0] = av_clip_uint8(first_pixel[ 0] - filter_value);
     }