]> granicus.if.org Git - libvpx/commitdiff
Merge "Remove 2nd-order transform for first-order DC coefficients." into experimental
authorRonald S. Bultje <rbultje@google.com>
Wed, 13 Feb 2013 21:58:02 +0000 (13:58 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 13 Feb 2013 21:58:02 +0000 (13:58 -0800)
1  2 
vp9/common/vp9_blockd.h
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_dequantize.h
vp9/decoder/vp9_idct_blk.c

Simple merge
index 04e3fe5b3b794175b78e4ac6100cd9765ea0b49a,9f4db6bf759ec401370bcd9ac12d42165149f974..facd761f0af1e57e99909b2fb556db88964a9357
@@@ -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;
Simple merge
Simple merge