Merge changes I92819356,I50b5a313,I807e60c6,I8a8df9fd into nextgenv2

* changes:
  Branch dct to new implementation for bd12
  Change dct32x32's range
  Fit dct's stage range into 32-bit when bitdepth is 12
  Pass tx_type into get_tx_scale

diff --cc vp10/decoder/decodeframe.c
Simple merge

diff --cc vp10/decoder/detokenize.c
index 58cd9e6a0285ee0a9c584b5b15b5e7bbad9b1bc0,343c7c8ceb35ed0135074514f49c2e58f1baaa8b..def3d7afd230dcdcc1a76f36521ebdf82d7e248d
--- 1/vp10/decoder/detokenize.c
--- 2/vp10/decoder/detokenize.c
+++ b/vp10/decoder/detokenize.c
@@@ -47,9 -47,10 +47,10 @@@ static INLINE int read_coeff(const vpx_
  
  static int decode_coefs(const MACROBLOCKD *xd,
                          PLANE_TYPE type,
-                         tran_low_t *dqcoeff, TX_SIZE tx_size, const int16_t *dq,
+                         tran_low_t *dqcoeff, TX_SIZE tx_size, TX_TYPE tx_type,
+                         const int16_t *dq,
                          int ctx, const int16_t *scan, const int16_t *nb,
 -                        vpx_reader *r) {
 +                        vp10_reader *r) {
    FRAME_COUNTS *counts = xd->counts;
    const int max_eob = 16 << (tx_size << 1);
    const FRAME_CONTEXT *const fc = xd->fc;

diff --cc vp10/decoder/detokenize.h
Simple merge

diff --cc vp10/encoder/rdopt.c
Simple merge