commit 6f14969a2b0a5d0435364d4309dfc2a3d50f583e
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Mon Dec 11 15:52:05 2017 +0000
committer Rupert Swarbrick <rupert.swarbrick@argondesign.com> Tue Dec 12 09:38:25 2017 +0000
tree 626d4ade496a9ed1ba436f1044f27c209696a591
parent 8e5b39a1960dabe56483c082763bd2c590578d04

Fix apparent typo in av1_rd_pick_inter_mode_sb

We should be selecting a transform size when tx_mode is TX_MODE_SELECT
and we're not lossless. (In lossless mode, the transform size is
forced to be TX_4X4).

Change-Id: I65b346fb2116689598e2251e97897be91f481ceb

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 5267a9b..243b32c 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -10447,7 +10447,7 @@
             args.left_pred_buf, args.left_pred_stride);
       }
       av1_subtract_plane(x, bsize, 0);
-      if (cm->tx_mode == TX_MODE_SELECT || xd->lossless[mbmi->segment_id]) {
+      if (cm->tx_mode == TX_MODE_SELECT && !xd->lossless[mbmi->segment_id]) {
         // av1_rd_pick_inter_mode_sb
         select_tx_type_yrd(cpi, x, &rd_stats_y, bsize, mi_row, mi_col,
                            INT64_MAX);