commit eae653fe1d24a43d264567451631352117b0eb50
author Remya Prakasan <remya.prakasan@ittiam.com> Wed Mar 30 13:05:57 2022 +0530
committer Yunqing Wang <yunqingwang@google.com> Tue Apr 05 21:54:14 2022 +0000
tree daa6b2afdb6145d06fe16ec82290e86c025fe419
parent 58795226ff80a66aa387da19d4ed1ac8de7d4b1e

Make FPMT code to make frames non-reference default

FPMT code to make frames non-reference and handling of
primary_ref_frame has been made default.

Change-Id: I0e46adabf806078b9d01910858783b88dc99a339

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 11708a2..ee59763 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -1480,17 +1480,13 @@
     const int cur_frame_disp =
         cpi->common.current_frame.frame_number + order_offset;
 
-#if CONFIG_FRAME_PARALLEL_ENCODE
     int get_ref_frames = 0;
-#if CONFIG_FPMT_TEST
+#if CONFIG_FRAME_PARALLEL_ENCODE && CONFIG_FPMT_TEST
     get_ref_frames =
         (cpi->ppi->fpmt_unit_test_cfg == PARALLEL_SIMULATION_ENCODE) ? 1 : 0;
-#endif  // CONFIG_FPMT_TEST
+#endif  // CONFIG_FRAME_PARALLEL_ENCODE && CONFIG_FPMT_TEST
     if (get_ref_frames ||
         gf_group->frame_parallel_level[cpi->gf_frame_index] == 0) {
-#else
-    {
-#endif  // CONFIG_FRAME_PARALLEL_ENCODE
       if (!ext_flags->refresh_frame.update_pending) {
         av1_get_ref_frames(ref_frame_map_pairs, cur_frame_disp,
 #if CONFIG_FRAME_PARALLEL_ENCODE_2
@@ -1514,7 +1510,6 @@
         get_ref_frame_flags(&cpi->sf, is_one_pass_rt_params(cpi), ref_frame_buf,
                             ext_flags->ref_frame_flags);
 
-#if CONFIG_FRAME_PARALLEL_ENCODE
     // Set primary_ref_frame of non-reference frames as PRIMARY_REF_NONE.
     if (cpi->ppi->gf_group.is_frame_non_ref[cpi->gf_frame_index]) {
       frame_params.primary_ref_frame = PRIMARY_REF_NONE;
@@ -1522,10 +1517,6 @@
       frame_params.primary_ref_frame =
           choose_primary_ref_frame(cpi, &frame_params);
     }
-#else
-    frame_params.primary_ref_frame =
-        choose_primary_ref_frame(cpi, &frame_params);
-#endif  // CONFIG_FRAME_PARALLEL_ENCODE
 
     frame_params.order_offset = gf_group->arf_src_offset[cpi->gf_frame_index];
 
@@ -1547,11 +1538,9 @@
 #endif  // CONFIG_FRAME_PARALLEL_ENCODE
 #endif  // CONFIG_FRAME_PARALLEL_ENCODE_2
 
-#if CONFIG_FRAME_PARALLEL_ENCODE
     // Make the frames marked as is_frame_non_ref to non-reference frames.
     if (gf_group->is_frame_non_ref[cpi->gf_frame_index])
       frame_params.refresh_frame_flags = 0;
-#endif  // CONFIG_FRAME_PARALLEL_ENCODE
 
     frame_params.existing_fb_idx_to_show = INVALID_IDX;
     // Find the frame buffer to show based on display order.

av1/encoder/tpl_model.c

diff --git a/av1/encoder/tpl_model.c b/av1/encoder/tpl_model.c
index d53255a..764de09 100644
--- a/av1/encoder/tpl_model.c
+++ b/av1/encoder/tpl_model.c
@@ -1438,10 +1438,8 @@
         av1_get_refresh_frame_flags(cpi, &frame_params, frame_update_type,
                                     gf_index, true_disp, ref_frame_map_pairs);
 
-#if CONFIG_FRAME_PARALLEL_ENCODE
     // Make the frames marked as is_frame_non_ref to non-reference frames.
     if (cpi->ppi->gf_group.is_frame_non_ref[gf_index]) refresh_mask = 0;
-#endif  // CONFIG_FRAME_PARALLEL_ENCODE
 
     int refresh_frame_map_index = av1_get_refresh_ref_frame_map(refresh_mask);