shithub: libvpx

Download patch

ref: 7af6c6c9ca56ee62dd5de4dd73f0acae1d65ba09
parent: d2fb834ebd60efcb3fc5935b668f0d57f0a2a9c5
parent: 9311ef18b4b4eff0da3adf9d702a34f489a270ff
author: Marco Paniconi <marpan@google.com>
date: Fri Oct 6 02:29:46 EDT 2017 

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


--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -507,12 +507,16 @@
         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) {