commit cbfc15b11b297217b039558dd541071c0be8287a
author Yaowu Xu <yaowu@google.com> Mon Mar 21 20:44:17 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 21 20:44:17 2016 +0000
tree 9eb90150d1bc38cda37ff14089573238f0e150ca
parent c28dbdf6658a958928d8c9c85877074274ac09d6
parent c96c3fa2b31a36b954009f8dd458c6e0d1e80cff

Merge "Properly set rate_nocoef when pallete mode is used" into nextgenv2

vp10/encoder/encodeframe.c

diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c
index c0045c2..03ac189 100644
--- a/vp10/encoder/encodeframe.c
+++ b/vp10/encoder/encodeframe.c
@@ -1234,7 +1234,10 @@
                                  PICK_MODE_CONTEXT *ctx,
                                  int mi_row, int mi_col, BLOCK_SIZE bsize,
                                  int output_enabled) {
-  int i, y, x_idx;
+  int y, x_idx;
+#if CONFIG_VAR_TX
+  int i;
+#endif
   VP10_COMMON *const cm = &cpi->common;
   RD_COUNTS *const rdc = &td->rd_counts;
   MACROBLOCK *const x = &td->mb;

vp10/encoder/rdopt.c

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 9b1928a..7cce5eb 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -8402,6 +8402,9 @@
   if (cm->allow_screen_content_tools && !is_inter_mode(best_mbmode.mode)) {
     PREDICTION_MODE mode_selected;
     int rate2 = 0, rate_y = 0;
+#if CONFIG_SUPERTX
+    int best_rate_nocoef;
+#endif
     int64_t distortion2 = 0, distortion_y = 0, dummy_rd = best_rd, this_rd;
     int skippable = 0, rate_overhead = 0;
     TX_SIZE best_tx_size, uv_tx;
@@ -8471,8 +8474,14 @@
 
     if (skippable) {
       rate2 -= (rate_y + rate_uv_tokenonly[uv_tx]);
+#if CONFIG_SUPERTX
+      best_rate_nocoef = rate2;
+#endif
       rate2 += vp10_cost_bit(vp10_get_skip_prob(cm, xd), 1);
     } else {
+#if CONFIG_SUPERTX
+      best_rate_nocoef = rate2 - (rate_y + rate_uv_tokenonly[uv_tx]);
+#endif
       rate2 += vp10_cost_bit(vp10_get_skip_prob(cm, xd), 0);
     }
     this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2);
@@ -8482,6 +8491,9 @@
       mbmi->mv[0].as_int = 0;
       max_plane = 1;
       rd_cost->rate = rate2;
+#if CONFIG_SUPERTX
+      *returnrate_nocoef = best_rate_nocoef;
+#endif
       rd_cost->dist = distortion2;
       rd_cost->rdcost = this_rd;
       best_rd = this_rd;