commit b8c938be08d33b8556eee29b0417a6754bb2ed49
author Cheng Chen <chengchen@google.com> Mon Mar 23 11:30:18 2020 -0700
committer Cheng Chen <chengchen@google.com> Mon Mar 23 22:03:00 2020 +0000
tree a0b1ede9f03a29b9e445f18ac051f2fa55e83065
parent 553e03851c346c95c060dc41ac12c2ad51616b03

Minor refactor: function names and comments.

Change the function name make comments correct.

Change-Id: Icc4df26b1b51449a252dedb4d3b5c3a69b135367

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 2f05ea2..9962d61 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -5195,11 +5195,10 @@
   }
 }
 
-// Set or save some encoding parameters. In the two encoding pass,
-// we want to make the encoding process fast. A fixed block partition size,
-// and a large q is used.
-static void set_or_save_encoding_params_for_screen_content(AV1_COMP *cpi,
-                                                           const int pass) {
+// Set some encoding parameters to make the encoding process fast.
+// A fixed block partition size, and a large q is used.
+static void set_encoding_params_for_screen_content(AV1_COMP *cpi,
+                                                   const int pass) {
   AV1_COMMON *const cm = &cpi->common;
   if (pass == 0) {
     // In the first pass, encode without screen content tools.
@@ -5209,17 +5208,18 @@
     cpi->is_screen_content_type = 0;
     cpi->sf.part_sf.partition_search_type = FIXED_PARTITION;
     cpi->sf.part_sf.always_this_block_size = BLOCK_32X32;
-  } else {
-    // In the second pass, encode with screen content tools.
-    // Use a high q, and a fixed block size for fast encoding.
-    cm->allow_screen_content_tools = 1;
-    // TODO(chengchen): turn intrabc on could lead to data race issue.
-    // cm->allow_intrabc = 1;
-    cpi->is_screen_content_type = 1;
-    cpi->sf.part_sf.partition_search_type = FIXED_PARTITION;
-    cpi->sf.part_sf.always_this_block_size = BLOCK_32X32;
-    av1_hash_table_create(&cm->cur_frame->hash_table);
+    return;
   }
+  assert(pass == 1);
+  // In the second pass, encode with screen content tools.
+  // Use a high q, and a fixed block size for fast encoding.
+  cm->allow_screen_content_tools = 1;
+  // TODO(chengchen): turn intrabc on could lead to data race issue.
+  // cm->allow_intrabc = 1;
+  cpi->is_screen_content_type = 1;
+  cpi->sf.part_sf.partition_search_type = FIXED_PARTITION;
+  cpi->sf.part_sf.always_this_block_size = BLOCK_32X32;
+  av1_hash_table_create(&cm->cur_frame->hash_table);
 }
 
 // Determines whether to use screen content tools for the key frame group.
@@ -5281,11 +5281,10 @@
     cm->cur_frame->seg.enabled = cm->seg.enabled;
   }
 
-  // The two encodes is to help determine whether to use screen content tools,
-  // with a high q and fixed partition.
-  // Then reset the partition speed feature.
+  // The two encoding passes aim to help determine whether to use screen
+  // content tools, with a high q and fixed partition.
   for (int pass = 0; pass < 2; ++pass) {
-    set_or_save_encoding_params_for_screen_content(cpi, pass);
+    set_encoding_params_for_screen_content(cpi, pass);
 #if CONFIG_TUNE_VMAF
     if (cpi->oxcf.tuning == AOM_TUNE_VMAF_WITH_PREPROCESSING ||
         cpi->oxcf.tuning == AOM_TUNE_VMAF_WITHOUT_PREPROCESSING ||