Merge "Removing unused functions."

vp9/encoder/vp9_rdopt.c

@@ -421,32 +421,6 @@ static void model_rd_for_sb(VP9_COMP *cpi, BLOCK_SIZE_TYPE bsize,
   *out_dist_sum = dist_sum << 4;
 }
 
-static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE_TYPE bsize,
-                              MACROBLOCK *x, MACROBLOCKD *xd,
-                              int *out_rate_sum, int64_t *out_dist_sum) {
-  // Note our transform coeffs are 8 times an orthogonal transform.
-  // Hence quantizer step is also 8 times. To get effective quantizer
-  // we need to divide by 8 before sending to modeling function.
-  struct macroblock_plane *const p = &x->plane[0];
-  struct macroblockd_plane *const pd = &xd->plane[0];
-
-  // TODO(dkovalev) the same code in get_plane_block_size
-  const int bwl = plane_block_width_log2by4(bsize, pd);
-  const int bhl = plane_block_height_log2by4(bsize, pd);
-  const BLOCK_SIZE_TYPE bs = get_block_size(bwl, bhl);
-  unsigned int sse;
-  int rate;
-  int64_t dist;
-  (void) cpi->fn_ptr[bs].vf(p->src.buf, p->src.stride,
-                            pd->dst.buf, pd->dst.stride, &sse);
-  // sse works better than var, since there is no dc prediction used
-  model_rd_from_var_lapndz(sse, 16 << (bwl + bhl),
-                           pd->dequant[1] >> 3, &rate, &dist);
-
-  *out_rate_sum = rate;
-  *out_dist_sum = dist << 4;
-}
-
 static void model_rd_for_sb_y_tx(VP9_COMP *cpi, BLOCK_SIZE_TYPE bsize,
                                  TX_SIZE tx_size,
                                  MACROBLOCK *x, MACROBLOCKD *xd,
@@ -715,17 +689,6 @@ static int rdcost_uv(VP9_COMMON *const cm, MACROBLOCK *x,
   return cost;
 }
 
-static int block_error_sby(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize,
-                           int shift, int64_t *sse) {
-  struct macroblockd_plane *p = &x->e_mbd.plane[0];
-  const int bwl = plane_block_width_log2by4(bsize, p);
-  const int bhl = plane_block_height_log2by4(bsize, p);
-  int64_t e = vp9_block_error(x->plane[0].coeff, x->e_mbd.plane[0].dqcoeff,
-                              16 << (bwl + bhl), sse) >> shift;
-  *sse >>= shift;
-  return e;
-}
-
 static int64_t block_error_sbuv(MACROBLOCK *x, BLOCK_SIZE_TYPE bsize,
                                 int shift, int64_t *sse) {
   int64_t sum = 0, this_sse;