generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Deb Mukherjee 2013-01-30 08:38:17 -08:00 committed by Gerrit Code Review
commit d28750537e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vp9/common/vp9_reconintra.c
View File

@ -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,
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) {