From 0742b1e4ae6c0c9c132adfabe945c352bae2cbc6 Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Thu, 15 Nov 2012 15:14:38 -0800 Subject: Fixing 8x8/4x4 ADST for intra modes with tx select This patch allows use of 8x8 and 4x4 ADST correctly for Intra 16x16 modes and Intra 8x8 modes when the block size selected is smaller than the prediction mode. Also includes some cleanups and refactoring. Rebase. Change-Id: Ie3257bdf07bdb9c6e9476915e3a80183c8fa005a --- vp9/common/vp9_mvref_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vp9/common/vp9_mvref_common.c') diff --git a/vp9/common/vp9_mvref_common.c b/vp9/common/vp9_mvref_common.c index dce49304d..bf60630e3 100644 --- a/vp9/common/vp9_mvref_common.c +++ b/vp9/common/vp9_mvref_common.c @@ -278,7 +278,7 @@ void vp9_find_mv_refs( &index, c_refmv, ref_weight); // If there is a second valid mv then add it as well. - if (c2_ref_frame != INTRA_FRAME) { + if (c2_ref_frame > INTRA_FRAME) { scale_mv(xd, ref_frame, c2_ref_frame, &c2_refmv, ref_sign_bias ); ref_weight = ref_distance_weight[i] + ((c2_ref_frame == ref_frame) << 4); @@ -304,7 +304,7 @@ void vp9_find_mv_refs( &index, c_refmv, ref_weight); // If there is a second valid mv then add it as well. - if (c2_ref_frame != INTRA_FRAME) { + if (c2_ref_frame > INTRA_FRAME) { scale_mv(xd, ref_frame, c2_ref_frame, &c2_refmv, ref_sign_bias ); ref_weight = ref_distance_weight[i] + ((c2_ref_frame == ref_frame) << 4); @@ -337,7 +337,7 @@ void vp9_find_mv_refs( &index, c_refmv, ref_weight); // If there is a second valid mv then add it as well. - if (c2_ref_frame != INTRA_FRAME) { + if (c2_ref_frame > INTRA_FRAME) { scale_mv(xd, ref_frame, c2_ref_frame, &c2_refmv, ref_sign_bias ); ref_weight = ref_distance_weight[i] + ((c2_ref_frame == ref_frame) << 4); -- cgit v1.2.3