From bcbc6ed82df08ea7b02b5a7b996ad4cbb80e1293 Mon Sep 17 00:00:00 2001 From: Marco Paniconi Date: Fri, 6 Oct 2017 22:14:56 +0000 Subject: Revert "Speed >=5 real-time: add TM intra mode for high_source_sad." This reverts commit 9311ef18b4b4eff0da3adf9d702a34f489a270ff. Reason for revert: Notice small regression in some clips. Will revisit in another change. Original change's description: > Speed >=5 real-time: add TM intra mode for high_source_sad. > > Small/neutral change in metrics or speed for ytlive. > Some improvement in quality on frames with big content change. > > Change-Id: Ib3b0703a5f28ea6710e90324436e27598ab7384d TBR=marpan@google.com,builds@webmproject.org,jianj@google.com Change-Id: I9d8ec5195bb05ddf329d325699355185affb9b13 No-Presubmit: true No-Tree-Checks: true No-Try: true --- vp9/encoder/vp9_speed_features.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'vp9/encoder') 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) { -- cgit v1.2.3