shithub: libvpx

Download patch

ref: 5bc4c37a89eea7ad4ca1eaeeb310da38240b7a4c
parent: e405eb06b147d259b4509de896dbe4d8562f7133
parent: bcbc6ed82df08ea7b02b5a7b996ad4cbb80e1293
author: Marco Paniconi <marpan@google.com>
date: Fri Oct 6 18:41:34 EDT 2017 

Merge "Revert "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,16 +507,12 @@
         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) {