ref: d28750537eaad88991f84239d1203282b65ca6dd
parent: 2f6fce3e5a30c9016aa816e2d57678d88729af37
parent: 3b04d467ac8eb143bceb388d242a199423e006fd
author: Deb Mukherjee <debargha@google.com>
date: Wed Jan 30 03:38:17 EST 2013
Merge "Further improvement on compound inter-intra expt" into experimental
--- a/vp9/common/vp9_reconintra.c
+++ b/vp9/common/vp9_reconintra.c
@@ -393,6 +393,7 @@
70, 70, 69, 69, 69, 69, 68, 68,
68, 68, 68, 67, 67, 67, 67, 67,
};
+
int size_scale = (size >= 64 ? 1:
size == 32 ? 2 :
size == 16 ? 4 :
@@ -469,8 +470,21 @@
break;
case D45_PRED:
- case DC_PRED:
+ for (i = 0; i < size; ++i) {+ for (j = 0; j < size; ++j) {+ int k = i * interstride + j;
+ int scale = (weights1d[i * size_scale] +
+ weights1d[j * size_scale]) >> 1;
+ interpred[k] =
+ ((scale_max - scale) * interpred[k] +
+ scale * intrapred[i * intrastride + j] + scale_round)
+ >> scale_bits;
+ }
+ }
+ break;
+
case TM_PRED:
+ case DC_PRED:
default:
// simple average
for (i = 0; i < size; ++i) {--
⑨