commit b17b61c910281c163826c971d5093acdd5ec4296
author Remya Prakasan <remya.prakasan@ittiam.com> Wed May 18 16:41:04 2022 +0530
committer Yunqing Wang <yunqingwang@google.com> Wed May 25 15:31:53 2022 +0000
tree a106ece5ae02bf6d0d3d0b6e5d83fb13d30226bd
parent 2727d2d517f05f29c58ef984604fac43b3c02736

Make FPMT code related to gf_group->src_offset default

Made the code related to gf_group->src_offset default.
Also merged the code to conditionally call av1_scaled_reference()
and release_scaled_references() for FPMT to the default path.

Change-Id: I74fe275e7ced2000a0f7fdbbc4ffd5e793badee5

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 73da66a..5850e38 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -345,18 +345,16 @@
 
   frame_params->show_frame = *pop_lookahead;
 
-#if CONFIG_FRAME_PARALLEL_ENCODE
-#if CONFIG_FPMT_TEST
+#if CONFIG_FRAME_PARALLEL_ENCODE && CONFIG_FPMT_TEST
   if (cpi->ppi->fpmt_unit_test_cfg == PARALLEL_ENCODE) {
 #else
   {
-#endif  // CONFIG_FPMT_TEST
+#endif  // CONFIG_FRAME_PARALLEL_ENCODE && CONFIG_FPMT_TEST
     // Future frame in parallel encode set
     if (gf_group->src_offset[cpi->gf_frame_index] != 0 &&
         !is_stat_generation_stage(cpi))
       src_index = gf_group->src_offset[cpi->gf_frame_index];
   }
-#endif  // CONFIG_FRAME_PARALLEL_ENCODE
   if (frame_params->show_frame) {
     // show frame, pop from buffer
     // Get last frame source.
@@ -1344,11 +1342,9 @@
     return -1;
   }
 
-#if CONFIG_FRAME_PARALLEL_ENCODE
   // reset src_offset to allow actual encode call for this frame to get its
   // source.
   gf_group->src_offset[cpi->gf_frame_index] = 0;
-#endif
 
   // Source may be changed if temporal filtered later.
   frame_input.source = &source->img;