Remove duplicate or unused code in common/invtrans.c.

Also make some minor stylistic changes to bring the code closer to
the style guide.

Change-Id: Idafa280724f49868ed6b7d65b7fd9227d781994b

diff --git a/vp8/common/invtrans.c b/vp8/common/invtrans.c
index a912642fb1bf14e1c452aebb6a46d6ae82a97be1..e0f4d6f191808ee81948fb2e57963f3f8b0a7de6 100644 (file)
--- a/vp8/common/invtrans.c
+++ b/vp8/common/invtrans.c
@@ -8,11 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-
 #include "invtrans.h"
 
-
-
 static void recon_dcblock(MACROBLOCKD *xd) {
   BLOCKD *b = &xd->block[24];
   int i;
@@ -20,40 +17,41 @@ static void recon_dcblock(MACROBLOCKD *xd) {
   for (i = 0; i < 16; i++) {
     xd->block[i].dqcoeff[0] = b->diff[i];
   }
-
 }
+
 static void recon_dcblock_8x8(MACROBLOCKD *xd) {
   BLOCKD *b = &xd->block[24]; // for coeff 0, 2, 8, 10
+
   xd->block[0].dqcoeff[0] = b->diff[0];
   xd->block[4].dqcoeff[0] = b->diff[1];
   xd->block[8].dqcoeff[0] = b->diff[4];
   xd->block[12].dqcoeff[0] = b->diff[8];
-
 }
 
-void vp8_inverse_transform_b_4x4(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch) {
+void vp8_inverse_transform_b_4x4(const vp8_idct_rtcd_vtable_t *rtcd,
+                                 BLOCKD *b, int pitch) {
   if (b->eob <= 1)
     IDCT_INVOKE(rtcd, idct1)(b->dqcoeff, b->diff, pitch);
   else
     IDCT_INVOKE(rtcd, idct16)(b->dqcoeff, b->diff, pitch);
 }
 
-
 void vp8_inverse_transform_mby_4x4(const vp8_idct_rtcd_vtable_t *rtcd,
                                    MACROBLOCKD *xd) {
   int i;
   BLOCKD *blockd = xd->block;
 
-  /* do 2nd order transform on the dc block */
-  IDCT_INVOKE(rtcd, iwalsh16)(blockd[24].dqcoeff, blockd[24].diff);
-
-  recon_dcblock(xd);
+  if (xd->mode_info_context->mbmi.mode != SPLITMV) {
+    /* do 2nd order transform on the dc block */
+    IDCT_INVOKE(rtcd, iwalsh16)(blockd[24].dqcoeff, blockd[24].diff);
+    recon_dcblock(xd);
+  }
 
   for (i = 0; i < 16; i++) {
     vp8_inverse_transform_b_4x4(rtcd, &blockd[i], 32);
   }
-
 }
+
 void vp8_inverse_transform_mbuv_4x4(const vp8_idct_rtcd_vtable_t *rtcd,
                                     MACROBLOCKD *xd) {
   int i;
@@ -62,55 +60,35 @@ void vp8_inverse_transform_mbuv_4x4(const vp8_idct_rtcd_vtable_t *rtcd,
   for (i = 16; i < 24; i++) {
     vp8_inverse_transform_b_4x4(rtcd, &blockd[i], 16);
   }
-
 }
 
-
 void vp8_inverse_transform_mb_4x4(const vp8_idct_rtcd_vtable_t *rtcd,
                                   MACROBLOCKD *xd) {
-  int i;
-  BLOCKD *blockd = xd->block;
-
-  if (xd->mode_info_context->mbmi.mode != B_PRED &&
-      xd->mode_info_context->mbmi.mode != I8X8_PRED &&
-      xd->mode_info_context->mbmi.mode != SPLITMV) {
-    /* do 2nd order transform on the dc block */
-
-    IDCT_INVOKE(rtcd, iwalsh16)(&blockd[24].dqcoeff[0], blockd[24].diff);
-    recon_dcblock(xd);
-  }
-
-  for (i = 0; i < 16; i++) {
-    vp8_inverse_transform_b_4x4(rtcd, &blockd[i], 32);
-  }
-
-
-  for (i = 16; i < 24; i++) {
-    vp8_inverse_transform_b_4x4(rtcd, &blockd[i], 16);
-  }
-
+  vp8_inverse_transform_mby_4x4(rtcd, xd);
+  vp8_inverse_transform_mbuv_4x4(rtcd, xd);
 }
 
-
-void vp8_inverse_transform_b_8x8(const vp8_idct_rtcd_vtable_t *rtcd, short *input_dqcoeff, short *output_coeff, int pitch) { // pay attention to use when 8x8
+void vp8_inverse_transform_b_8x8(const vp8_idct_rtcd_vtable_t *rtcd,
+                                 short *input_dqcoeff, short *output_coeff,
+                                 int pitch) {
   // int b,i;
   // if (b->eob > 1)
   IDCT_INVOKE(rtcd, idct8)(input_dqcoeff, output_coeff, pitch);
   // else
   // IDCT_INVOKE(rtcd, idct8_1)(b->dqcoeff, b->diff, pitch);//pitch
-
 }
 
-
 void vp8_inverse_transform_mby_8x8(const vp8_idct_rtcd_vtable_t *rtcd,
                                    MACROBLOCKD *xd) {
   int i;
   BLOCKD *blockd = xd->block;
 
-  // do 2nd order transform on the dc block
-  IDCT_INVOKE(rtcd, ihaar2)(blockd[24].dqcoeff, blockd[24].diff, 8);
+  if (xd->mode_info_context->mbmi.mode != SPLITMV) {
+    // do 2nd order transform on the dc block
+    IDCT_INVOKE(rtcd, ihaar2)(blockd[24].dqcoeff, blockd[24].diff, 8);
+    recon_dcblock_8x8(xd); // need to change for 8x8
+  }
 
-  recon_dcblock_8x8(xd); // need to change for 8x8
   for (i = 0; i < 9; i += 8) {
     vp8_inverse_transform_b_8x8(rtcd, &blockd[i].dqcoeff[0],
                                 &blockd[i].diff[0], 32);
@@ -119,8 +97,8 @@ void vp8_inverse_transform_mby_8x8(const vp8_idct_rtcd_vtable_t *rtcd,
     vp8_inverse_transform_b_8x8(rtcd, &blockd[i + 2].dqcoeff[0],
                                 &blockd[i].diff[0], 32);
   }
-
 }
+
 void vp8_inverse_transform_mbuv_8x8(const vp8_idct_rtcd_vtable_t *rtcd,
                                     MACROBLOCKD *xd) {
   int i;
@@ -130,39 +108,12 @@ void vp8_inverse_transform_mbuv_8x8(const vp8_idct_rtcd_vtable_t *rtcd,
     vp8_inverse_transform_b_8x8(rtcd, &blockd[i].dqcoeff[0],
                                 &blockd[i].diff[0], 16);
   }
-
 }
 
-
 void vp8_inverse_transform_mb_8x8(const vp8_idct_rtcd_vtable_t *rtcd,
                                   MACROBLOCKD *xd) {
-  int i;
-  BLOCKD *blockd = xd->block;
-
-  if (xd->mode_info_context->mbmi.mode != B_PRED &&
-      xd->mode_info_context->mbmi.mode != SPLITMV) {
-    // do 2nd order transform on the dc block
-
-    IDCT_INVOKE(rtcd, ihaar2)(&blockd[24].dqcoeff[0],
-                              blockd[24].diff, 8);// dqcoeff[0]
-    recon_dcblock_8x8(xd); // need to change for 8x8
-
-  }
-
-  for (i = 0; i < 9; i += 8) {
-    vp8_inverse_transform_b_8x8(rtcd, &blockd[i].dqcoeff[0],
-                                &blockd[i].diff[0], 32);
-  }
-  for (i = 2; i < 11; i += 8) {
-    vp8_inverse_transform_b_8x8(rtcd, &blockd[i + 2].dqcoeff[0],
-                                &blockd[i].diff[0], 32);
-  }
-
-  for (i = 16; i < 24; i += 4) {
-    vp8_inverse_transform_b_8x8(rtcd, &blockd[i].dqcoeff[0],
-                                &blockd[i].diff[0], 16);
-  }
-
+  vp8_inverse_transform_mby_8x8(rtcd, xd);
+  vp8_inverse_transform_mbuv_8x8(rtcd, xd);
 }
 
 void vp8_inverse_transform_b_16x16(const vp8_idct_rtcd_vtable_t *rtcd,
@@ -173,33 +124,12 @@ void vp8_inverse_transform_b_16x16(const vp8_idct_rtcd_vtable_t *rtcd,
 
 void vp8_inverse_transform_mby_16x16(const vp8_idct_rtcd_vtable_t *rtcd,
                                      MACROBLOCKD *xd) {
-    vp8_inverse_transform_b_16x16(rtcd, &xd->block[0].dqcoeff[0],
-                                  &xd->block[0].diff[0], 32);
-}
-
-// U,V blocks are 8x8 per macroblock, so just run 8x8
-void vp8_inverse_transform_mbuv_16x16(const vp8_idct_rtcd_vtable_t *rtcd,
-                                      MACROBLOCKD *xd) {
-  int i;
-  BLOCKD *blockd = xd->block;
-
-  for (i = 16; i < 24; i += 4)
-    vp8_inverse_transform_b_8x8(rtcd, &blockd[i].dqcoeff[0],
-                                &blockd[i].diff[0], 16);
+  vp8_inverse_transform_b_16x16(rtcd, &xd->block[0].dqcoeff[0],
+                                &xd->block[0].diff[0], 32);
 }
 
 void vp8_inverse_transform_mb_16x16(const vp8_idct_rtcd_vtable_t *rtcd,
                                     MACROBLOCKD *xd) {
-  int i;
-  BLOCKD *blockd = xd->block;
-
-  // Luma
-  vp8_inverse_transform_b_16x16(rtcd, &blockd[0].dqcoeff[0],
-                                &blockd[0].diff[0], 32);
-
-  // U, V
-  // Chroma blocks are downscaled, so run an 8x8 on them.
-  for (i = 16; i < 24; i+= 4)
-    vp8_inverse_transform_b_8x8(rtcd, &blockd[i].dqcoeff[0],
-                                &blockd[i].diff[0], 16);
+  vp8_inverse_transform_mby_16x16(rtcd, xd);
+  vp8_inverse_transform_mbuv_8x8(rtcd, xd);
 }

diff --git a/vp8/common/invtrans.h b/vp8/common/invtrans.h
index 4944f6f5054ba9f44cbe1f4abe1cc1dfcbded67c..47a9caaf2b030434ea72a9b00c9f063defb6ad6d 100644 (file)
--- a/vp8/common/invtrans.h
+++ b/vp8/common/invtrans.h
@@ -31,5 +31,4 @@ extern void vp8_inverse_transform_b_16x16(const vp8_idct_rtcd_vtable_t *rtcd,
                                           int pitch);
 extern void vp8_inverse_transform_mb_16x16(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *xd);
 extern void vp8_inverse_transform_mby_16x16(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *xd);
-extern void vp8_inverse_transform_mbuv_16x16(const vp8_idct_rtcd_vtable_t *rtcd, MACROBLOCKD *xd);
 #endif