commit c03b64825102c1a760df7669abe777e76ccc4f37
author Debargha Mukherjee <debargha@google.com> Thu Jan 10 12:08:51 2019 -0800
committer Debargha Mukherjee <debargha@google.com> Wed Jan 16 02:55:29 2019 +0000
tree d9385ca1c4918d68ae593ed955d49275605d0cc8
parent 8e05f2966dc5ad7bc30ffdadd6238bc4ad50e728

Make stats collection uniform

Make uniform across different block sizes.

Change-Id: Ia42e9fde45f8e7515cc4f8d0d8a5e4efa545d3cf

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 64237e2..71e89ab 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2541,7 +2541,7 @@
   if (rd_stats->invalid_rate) return;
   if (rd_stats->rate == INT_MAX || rd_stats->dist == INT64_MAX) return;
 
-#if CONFIG_COLLECT_INTER_MODE_RD_STATS
+#if 0  // CONFIG_COLLECT_INTER_MODE_RD_STATS
   if (cpi->sf.inter_mode_rd_model_estimation == 1 &&
       !tile_data->inter_mode_rd_models[plane_bsize].ready)
     return;
@@ -2549,7 +2549,10 @@
   (void)tile_data;
   // Generate small sample to restrict output size.
   static unsigned int seed = 95014;
-  if (lcg_rand16(&seed) % 256 > 0) return;
+
+  if ((lcg_rand16(&seed) % (1 << (14 - num_pels_log2_lookup[plane_bsize]))) !=
+      1)
+    return;
 
   const char output_file[] = "pu_stats.txt";
   FILE *fout = fopen(output_file, "a");
@@ -2621,11 +2624,10 @@
   fprintf(fout, " %g %g %g", model_rate_norm, model_dist_norm,
           model_rdcost_norm);
 
-#if CONFIG_COLLECT_INTER_MODE_RD_STATS
+#if 0  // CONFIG_COLLECT_INTER_MODE_RD_STATS
   if (cpi->sf.inter_mode_rd_model_estimation == 1) {
     assert(tile_data->inter_mode_rd_models[plane_bsize].ready);
     const int64_t overall_sse = get_sse(cpi, x);
-    assert(tile_data->inter_mode_rd_models[plane_bsize].ready);
     int est_residue_cost = 0;
     int64_t est_dist = 0;
     get_est_rate_dist(tile_data, plane_bsize, overall_sse, &est_residue_cost,