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

Merge "Revert "Speed >=5 real-time: add TM intra mode for high_source_sad.""

Browse Source
This commit is contained in:
Marco Paniconi 2017-10-06 22:41:34 +00:00 committed by Gerrit Code Review
commit 5bc4c37a89
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vp9/encoder/vp9_speed_features.c
View File

@ -507,16 +507,12 @@ static void set_rt_speed_feature_framesize_independent(
for (i = 0; i < BLOCK_SIZES; ++i)
sf->intra_y_mode_bsize_mask[i] = INTRA_DC_TM_H_V;
} else {
for (i = 0; i < BLOCK_SIZES; ++i) {
if (i > BLOCK_16X16) {
for (i = 0; i < BLOCK_SIZES; ++i)
if (i > BLOCK_16X16)
sf->intra_y_mode_bsize_mask[i] = INTRA_DC;
} else {
if (cpi->rc.high_source_sad)
sf->intra_y_mode_bsize_mask[i] = INTRA_DC_TM_H_V;
else
sf->intra_y_mode_bsize_mask[i] = INTRA_DC_H_V;
}
}
else
// Use H and V intra mode for block sizes <= 16X16.
sf->intra_y_mode_bsize_mask[i] = INTRA_DC_H_V;
}
}
if (content == VP9E_CONTENT_SCREEN) {