Merge "Compute count_ls in vp9_kmeans"

diff --cc vp9/encoder/vp9_encodeframe.c
index bc0691b,9bf2fd1..8aa3df0
--- 1/vp9/encoder/vp9_encodeframe.c
--- 2/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -5896,11 -5891,11 +5900,11 @@@ static void encode_frame_internal(VP9_C
  
        for (mi_row = 0; mi_row < cm->mi_rows; mi_row += MI_BLOCK_SIZE)
          for (mi_col = 0; mi_col < cm->mi_cols; mi_col += MI_BLOCK_SIZE)
 -          wiener_var_rdmult(cpi, BLOCK_64X64, mi_row, mi_col, cpi->rd.RDMULT);
 +          wiener_var_segment(cpi, BLOCK_64X64, mi_row, mi_col);
  
        vp9_kmeans(cpi->kmeans_ctr_ls, cpi->kmeans_boundary_ls,
-                  cpi->kmeans_ctr_num, cpi->kmeans_data_arr,
-                  cpi->kmeans_data_size);
+                  cpi->kmeans_count_ls, cpi->kmeans_ctr_num,
+                  cpi->kmeans_data_arr, cpi->kmeans_data_size);
  
        vp9_perceptual_aq_mode_setup(cpi, &cm->seg);
      }