From: Ronald S. Bultje <rbultje@google.com>
Date: Wed, 13 Feb 2013 21:58:02 +0000 (-0800)
Subject: Merge "Remove 2nd-order transform for first-order DC coefficients." into experimental
X-Git-Tag: v1.3.0~1151^2~172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51afedbe28e5eca16cbb2ff10c9b71bf04e5ecb4;p=libvpx

Merge "Remove 2nd-order transform for first-order DC coefficients." into experimental
---

51afedbe28e5eca16cbb2ff10c9b71bf04e5ecb4
diff --cc vp9/decoder/vp9_decodframe.c
index 04e3fe5b3,9f4db6bf7..facd761f0
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@@ -443,9 -451,9 +444,9 @@@ static void decode_4x4(VP9D_COMP *pbi, 
                             xd->dst.v_buffer,
                             xd->dst.uv_stride,
                             xd->eobs + 16);
-   } else if (mode == SPLITMV) {
+   } else if (mode == SPLITMV || get_2nd_order_usage(xd) == 0) {
      assert(get_2nd_order_usage(xd) == 0);
 -    pbi->idct_add_y_block(xd->qcoeff,
 +    xd->itxm_add_y_block(xd->qcoeff,
                            xd->block[0].dequant,
                            xd->predictor,
                            xd->dst.y_buffer,
@@@ -646,10 -654,10 +647,10 @@@ static void decode_4x4_sb(VP9D_COMP *pb
              xd->dst.y_stride, xd->dst.y_stride);
        }
      }
-   } else {
+   } else if (get_2nd_order_usage(xd) == 1) {
      vp9_dequantize_b(b);
      if (xd->eobs[24] > 1) {
 -      vp9_short_inv_walsh4x4(&b->dqcoeff[0], b->diff);
 +      xd->inv_2ndtxm4x4(&b->dqcoeff[0], b->diff);
        ((int *)b->qcoeff)[0] = 0;
        ((int *)b->qcoeff)[1] = 0;
        ((int *)b->qcoeff)[2] = 0;