]> granicus.if.org Git - libvpx/commitdiff
Avoid inverse transform/recon without residual
authorJohn Koleszar <jkoleszar@google.com>
Thu, 13 Jun 2013 23:37:52 +0000 (16:37 -0700)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 13 Jun 2013 23:39:00 +0000 (16:39 -0700)
Avoid calling decode_block, inverse transform/add in the block is
a skip block for SBs smaller than 8x8 and intra-coded SBs.

Change-Id: I1684182f4a0050c8d6bb46cba6830d9425e7127d

vp9/decoder/vp9_decodframe.c

index d9fd77c8aaf99ef4e584330621644e0c5f88363f..2c7844beab6fc19ab37451853d25755d2984e076 100644 (file)
@@ -270,6 +270,10 @@ static void decode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize,
   vp9_predict_intra_block(xd, tx_ib, plane_b_size, tx_size,
                           b_mode, dst, xd->plane[plane].dst.stride);
 
+  // Early exit if there are no coefficients
+  if (xd->mode_info_context->mbmi.mb_skip_coeff)
+    return;
+
   switch (ss_txfrm_size / 2) {
     case TX_4X4:
       tx_type = plane == 0 ? get_tx_type_4x4(xd, raster_block) : DCT_DCT;
@@ -318,8 +322,9 @@ static void decode_atom(VP9D_COMP *pbi, MACROBLOCKD *xd,
     if (!vp9_reader_has_error(r)) {
       vp9_decode_tokens(pbi, xd, r, bsize);
     }
+
+    foreach_transformed_block(xd, bsize, decode_block, xd);
   }
-  foreach_transformed_block(xd, bsize, decode_block, xd);
 }
 
 static void decode_sb_intra(VP9D_COMP *pbi, MACROBLOCKD *xd,