commit c4ad25de3c78332d4f0e48c16b7208a14ce6a66f
author Jingning Han <jingning@google.com> Tue Nov 08 15:21:20 2016 -0800
committer Jingning Han <jingning@google.com> Wed Nov 09 07:50:51 2016 -0800
tree 46bb10effb8e0dc6cc9283cab5db9d931b8f72ee
parent 5114b7bf71ca827d5496895718749a7de1604ba7

Support rectangular tx_size distortion calculation by default

Remove the CONFIG_EXT_TX flag.

Change-Id: I7e35036156e116a2c00c982a8d57473258e002ea

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index d85d3ea..d68e6ef 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1121,7 +1121,6 @@
                                TX_SIZE tx_size) {
   uint64_t sse;
   switch (tx_size) {
-#if CONFIG_EXT_TX
     case TX_4X8:
       sse = aom_sum_squares_2d_i16(diff, diff_stride, 4) +
             aom_sum_squares_2d_i16(diff + 4 * diff_stride, diff_stride, 4);
@@ -1146,7 +1145,6 @@
       sse = aom_sum_squares_2d_i16(diff, diff_stride, 16) +
             aom_sum_squares_2d_i16(diff + 16, diff_stride, 16);
       break;
-#endif  // CONFIG_EXT_TX
     default:
       assert(tx_size < TX_SIZES);
       sse = aom_sum_squares_2d_i16(diff, diff_stride, tx_size_wide[tx_size]);