Commit 5bc4c37a authored by Marco Paniconi's avatar Marco Paniconi Committed by Gerrit Code Review
Browse files

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

parents e405eb06 bcbc6ed8
......@@ -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) {
......
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