summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vp9/encoder/vp9_speed_features.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index 6f3806b96..4d4a579e6 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -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) {