Merge "Framework changes in nzc to allow more flexibility" into experimental

diff --cc vp9/common/vp9_entropy.c
Simple merge

diff --cc vp9/decoder/vp9_decodframe.c
Simple merge

diff --cc vp9/decoder/vp9_detokenize.c
Simple merge

diff --cc vp9/encoder/vp9_bitstream.c
Simple merge

diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
index 0083e8ae1a5000b5a547afe276ad2ad1b269e8f3,1f5b5dbb8f5789fa606dce2d3ee179fe0802db2c..71dd6b80b2455df287198709412cae7c460cfd44
--- 1/vp9/encoder/vp9_rdopt.c
--- 2/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@@ -595,16 -592,17 +592,17 @@@ static INLINE int cost_coeffs(VP9_COMMO
                                         [get_coef_band(scan, tx_size, c)]
                                         [pt][0], 1);
  #endif
 -      pt = vp9_get_coef_context(scan, nb, pad, token_cache, c, default_eob);
 +      pt = vp9_get_coef_context(scan, nb, pad, token_cache, c + 1, default_eob);
      }
  #if CONFIG_CODE_NONZEROCOUNT
-     cost += nzc_cost[nzc];
- #else
-     if (c < seg_eob)
-       cost += mb->token_costs[tx_size][type][ref]
-                              [get_coef_band(scan, tx_size, c)]
-                              [pt][DCT_EOB_TOKEN];
+     if (nzc_used)
+       cost += nzc_cost[nzc];
+     else
  #endif
+       if (c < seg_eob)
+         cost += mb->token_costs[tx_size][type][ref]
+                                [get_coef_band(scan, tx_size, c)]
+                                [pt][DCT_EOB_TOKEN];
    }
  
    // is eob first coefficient;

diff --cc vp9/encoder/vp9_tokenize.c
Simple merge