Commit d2875053 authored by Deb Mukherjee's avatar Deb Mukherjee Committed by Gerrit Code Review
Browse files

Merge "Further improvement on compound inter-intra expt" into experimental

parents 2f6fce3e 3b04d467
...@@ -393,6 +393,7 @@ static void combine_interintra(MB_PREDICTION_MODE mode, ...@@ -393,6 +393,7 @@ static void combine_interintra(MB_PREDICTION_MODE mode,
70, 70, 69, 69, 69, 69, 68, 68, 70, 70, 69, 69, 69, 69, 68, 68,
68, 68, 68, 67, 67, 67, 67, 67, 68, 68, 68, 67, 67, 67, 67, 67,
}; };
int size_scale = (size >= 64 ? 1: int size_scale = (size >= 64 ? 1:
size == 32 ? 2 : size == 32 ? 2 :
size == 16 ? 4 : size == 16 ? 4 :
...@@ -469,8 +470,21 @@ static void combine_interintra(MB_PREDICTION_MODE mode, ...@@ -469,8 +470,21 @@ static void combine_interintra(MB_PREDICTION_MODE mode,
break; break;
case D45_PRED: 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 TM_PRED:
case DC_PRED:
default: default:
// simple average // simple average
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment