From f116abf774246608c5e1498b8d674436bacaa9a4 Mon Sep 17 00:00:00 2001
From: Yaowu Xu <yaowu@google.com>
Date: Thu, 23 May 2013 14:39:28 -0700
Subject: [PATCH] update txfm size counting
Change-Id: I3a26baf8b2f945fea4f1aea156e60fa79f620f86
---
vp9/encoder/vp9_encodeframe.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 4012a841c3..fbd455c03d 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1688,9 +1688,8 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t,
}
if (output_enabled) {
- if (cm->txfm_mode == TX_MODE_SELECT &&
- (mbmi->ref_frame == INTRA_FRAME ||
- !(mbmi->mb_skip_coeff ||
+ if (cm->txfm_mode == TX_MODE_SELECT && mbmi->mode != I4X4_PRED &&
+ !(mbmi->ref_frame != INTRA_FRAME && (mbmi->mb_skip_coeff ||
vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP)))) {
if (bsize >= BLOCK_SIZE_SB32X32) {
cpi->txfm_count_32x32p[mbmi->txfm_size]++;
--
GitLab