shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "encodemb cpplint issues revisited."

--- a/vp9/encoder/vp9_encodemb.c

+++ b/vp9/encoder/vp9_encodemb.c

@@ -80,8 +80,7 @@

   vp9_subtract_sbuv(x, bsize);

 }

-

-#define RDTRUNC(RM,DM,R,D) ( (128+(R)*(RM)) & 0xFF )

+#define RDTRUNC(RM, DM, R, D) ((128 + (R) * (RM)) & 0xFF)

 typedef struct vp9_token_state vp9_token_state;

 struct vp9_token_state {

@@ -92,7 +91,7 @@

   short         qc;

 };

-// TODO: experiments to find optimal multiple numbers

+// TODO(jimbankoski): experiment to find optimal RD numbers.

 #define Y1_RD_MULT 4

 #define UV_RD_MULT 2

@@ -272,11 +271,10 @@

       best_index[i][1] = best;

       /* Finally, make this the new head of the trellis. */

       next = i;

-    }

-    /* There's no choice to make for a zero coefficient, so we don't

-     *  add a new trellis node, but we do need to update the costs.

-     */

-    else {

+    } else {

+      /* There's no choice to make for a zero coefficient, so we don't

+       *  add a new trellis node, but we do need to update the costs.

+       */

       band = get_coef_band(band_translate, i + 1);

       t0 = tokens[next][0].token;

       t1 = tokens[next][1].token;