commit c60ef810a167b123ddd85dc7bfebceee6e080fe5
author Yunqing Wang <yunqingwang@google.com> Mon Sep 15 18:50:19 2014 -0700
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Mon Sep 15 18:50:19 2014 -0700
tree e415c9ed752f5c4e4779b7d6574fb570f78f0573
parent 8caba8565ac03426e541930c5a09205877c0f18d
parent 46aed7b8d0b5f6f33d047c47a229f0f93033e39e

Merge "Set the skip flag to 1 for skippable blocks"

vp9/encoder/vp9_rdopt.c

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index b0522c4..f322319 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3161,6 +3161,10 @@
     vp9_zero(best_tx_diff);
   }
 
+  // TODO(yunqingwang): Moving this line in front of the above best_filter_diff
+  // updating code causes PSNR loss. Need to figure out the confliction.
+  x->skip |= best_mode_skippable;
+
   store_coding_context(x, ctx, best_mode_index, best_pred_diff,
                        best_tx_diff, best_filter_diff, best_mode_skippable);