commit 5dc7620e19b2e8b524027d292d5fab59f5b4f239
author Urvang Joshi <urvang@google.com> Mon Oct 15 11:48:33 2018 -0700
committer Urvang Joshi <urvang@google.com> Mon Oct 15 23:04:35 2018 +0000
tree 54030dc5bb6e2b9e049d5dff1fe9dedacb7b3708
parent 07f8a18bb4d4109224e47801edc55a85960f5ef4

TX Raw data: Get small random sample.

This is to restrict the output file size.

Also, remove duplicate vars.

Change-Id: If5b5b4c63a7017c5c190763839c84675c7f697f0

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 83b156f..812438c 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3203,41 +3203,37 @@
 #endif  // CONFIG_COLLECT_RD_STATS == 1
 
 #if COLLECT_TX_SIZE_DATA
-    const int mi_row = -xd->mb_to_top_edge >> (3 + MI_SIZE_LOG2);
-    const int mi_col = -xd->mb_to_left_edge >> (3 + MI_SIZE_LOG2);
-    const int within_border =
-        mi_row >= xd->tile.mi_row_start &&
-        (mi_row + mi_size_high[plane_bsize] < xd->tile.mi_row_end) &&
-        mi_col >= xd->tile.mi_col_start &&
-        (mi_col + mi_size_wide[plane_bsize] < xd->tile.mi_col_end);
+    // Generate small sample to restrict output size.
+    static unsigned int seed = 21743;
+    if (lcg_rand16(&seed) % 200 == 0) {
+      FILE *fp = NULL;
 
-    FILE *fp = NULL;
-
-    if (within_border) {
-      fp = fopen(av1_tx_size_data_output_file, "a");
-    }
-
-    if (fp) {
-      // Transform info and RD
-      const int txb_w = tx_size_wide[tx_size];
-      const int txb_h = tx_size_high[tx_size];
-
-      // Residue signal.
-      const int diff_stride = block_size_wide[plane_bsize];
-      struct macroblock_plane *const p = &x->plane[plane];
-      const int16_t *src_diff =
-          &p->src_diff[(blk_row * diff_stride + blk_col) * 4];
-
-      for (int r = 0; r < txb_h; ++r) {
-        for (int c = 0; c < txb_w; ++c) {
-          fprintf(fp, "%d,", src_diff[c]);
-        }
-        src_diff += diff_stride;
+      if (within_border) {
+        fp = fopen(av1_tx_size_data_output_file, "a");
       }
 
-      fprintf(fp, "%d,%d,%d,%" PRId64, txb_w, txb_h, tx_type, rd);
-      fprintf(fp, "\n");
-      fclose(fp);
+      if (fp) {
+        // Transform info and RD
+        const int txb_w = tx_size_wide[tx_size];
+        const int txb_h = tx_size_high[tx_size];
+
+        // Residue signal.
+        const int diff_stride = block_size_wide[plane_bsize];
+        struct macroblock_plane *const p = &x->plane[plane];
+        const int16_t *src_diff =
+            &p->src_diff[(blk_row * diff_stride + blk_col) * 4];
+
+        for (int r = 0; r < txb_h; ++r) {
+          for (int c = 0; c < txb_w; ++c) {
+            fprintf(fp, "%d,", src_diff[c]);
+          }
+          src_diff += diff_stride;
+        }
+
+        fprintf(fp, "%d,%d,%d,%" PRId64, txb_w, txb_h, tx_type, rd);
+        fprintf(fp, "\n");
+        fclose(fp);
+      }
     }
 #endif  // COLLECT_TX_SIZE_DATA