From: Ronald S. Bultje <rbultje@google.com>
Date: Wed, 30 Jan 2013 05:46:31 +0000 (-0800)
Subject: Default superblock skip flag to 32x32 for skip-blocks.
X-Git-Tag: v1.3.0~1151^2~222^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3febf9707d6bac6ef6e50812e131fc84dc13cf6a;p=libvpx

Default superblock skip flag to 32x32 for skip-blocks.

This is identical to the later decisions made in encode_superblock().
This commit doesn't actually change anything, but makes the mbmi state
more consistent between the RD loop and the final encode result.

Change-Id: I9e735afb7c5a52e5b61728cb88c67ef9b9bf59be
---

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index bb6b4fb6f..779069847 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -4955,7 +4955,7 @@ static int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
     mbmi->mb_skip_coeff = (cpi->common.mb_no_coeff_skip) ? 1 : 0;
     mbmi->partitioning = 0;
     mbmi->txfm_size = cm->txfm_mode == TX_MODE_SELECT ?
-                      TX_16X16 : cm->txfm_mode;
+                      TX_32X32 : cm->txfm_mode;
 
     vpx_memset(best_txfm_diff, 0, sizeof(best_txfm_diff));
     vpx_memset(best_pred_diff, 0, sizeof(best_pred_diff));