Merge "Adding consts and cleaning up vp9_rdopt."

diff --cc vp9/encoder/vp9_rdopt.c
index a013e11c22ff86203697c73d30b2b8834dc6a006,a0d160aef79f2b0966662a6595636871090ce5b4..810f8ba2592e8439831408aaf7dd58f878a1a01d
--- 1/vp9/encoder/vp9_rdopt.c
--- 2/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@@ -554,12 -549,11 +549,12 @@@ static INLINE int cost_coeffs(MACROBLOC
                                int plane, int block,
                                ENTROPY_CONTEXT *A, ENTROPY_CONTEXT *L,
                                TX_SIZE tx_size,
 -                              const int16_t *scan, const int16_t *nb) {
 +                              const int16_t *scan, const int16_t *nb,
 +                              int use_fast_coef_costing) {
    MACROBLOCKD *const xd = &x->e_mbd;
    MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;
-   struct macroblock_plane *p = &x->plane[plane];
-   struct macroblockd_plane *pd = &xd->plane[plane];
+   const struct macroblock_plane *p = &x->plane[plane];
+   const struct macroblockd_plane *pd = &xd->plane[plane];
    const PLANE_TYPE type = pd->plane_type;
    const int16_t *band_count = &band_counts[tx_size][1];
    const int eob = p->eobs[block];
@@@ -740,10 -727,9 +735,10 @@@ static void txfm_rd_in_plane(MACROBLOC
                               int *rate, int64_t *distortion,
                               int *skippable, int64_t *sse,
                               int64_t ref_best_rd, int plane,
 -                             BLOCK_SIZE bsize, TX_SIZE tx_size) {
 +                             BLOCK_SIZE bsize, TX_SIZE tx_size,
 +                             int use_fast_coef_casting) {
    MACROBLOCKD *const xd = &x->e_mbd;
-   struct macroblockd_plane *const pd = &xd->plane[plane];
+   const struct macroblockd_plane *const pd = &xd->plane[plane];
    struct rdcost_block_args args = { 0 };
    args.x = x;
    args.best_rd = ref_best_rd;