summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@google.com>2013-01-29 21:46:31 -0800
committerRonald S. Bultje <rbultje@google.com>2013-01-29 21:46:31 -0800
commit3febf9707d6bac6ef6e50812e131fc84dc13cf6a (patch)
treec25cf7fa29bc303c17cf7b70354f20ff46200885
parentb90996c51b1cac61f6831f1bc50cfd99616a2a78 (diff)
downloadlibvpx-3febf9707d6bac6ef6e50812e131fc84dc13cf6a.tar
libvpx-3febf9707d6bac6ef6e50812e131fc84dc13cf6a.tar.gz
libvpx-3febf9707d6bac6ef6e50812e131fc84dc13cf6a.tar.bz2
libvpx-3febf9707d6bac6ef6e50812e131fc84dc13cf6a.zip
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
-rw-r--r--vp9/encoder/vp9_rdopt.c2
1 files changed, 1 insertions, 1 deletions
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));