diff options
author | Marco Paniconi <marpan@google.com> | 2017-10-06 06:29:46 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-06 06:29:46 +0000 |
commit | 7af6c6c9ca56ee62dd5de4dd73f0acae1d65ba09 (patch) | |
tree | ea9fc80f3d360babbdfbd9316b259d827546dc8f | |
parent | d2fb834ebd60efcb3fc5935b668f0d57f0a2a9c5 (diff) | |
parent | 9311ef18b4b4eff0da3adf9d702a34f489a270ff (diff) | |
download | libvpx-7af6c6c9ca56ee62dd5de4dd73f0acae1d65ba09.tar libvpx-7af6c6c9ca56ee62dd5de4dd73f0acae1d65ba09.tar.gz libvpx-7af6c6c9ca56ee62dd5de4dd73f0acae1d65ba09.tar.bz2 libvpx-7af6c6c9ca56ee62dd5de4dd73f0acae1d65ba09.zip |
Merge "Speed >=5 real-time: add TM intra mode for high_source_sad."
-rw-r--r-- | vp9/encoder/vp9_speed_features.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index 4d4a579e6..6f3806b96 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -507,12 +507,16 @@ 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 - // Use H and V intra mode for block sizes <= 16X16. - sf->intra_y_mode_bsize_mask[i] = INTRA_DC_H_V; + } 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; + } + } } } if (content == VP9E_CONTENT_SCREEN) { |