commit 94b2f295d73c390fdabeff8544d54790f393478b
author Remya Prakasan <remya.prakasan@ittiam.com> Thu Jul 08 14:51:47 2021 +0530
committer Yunqing Wang <yunqingwang@google.com> Thu Jul 08 18:08:51 2021 +0000
tree c9ae5318677ba08c7abb3e929724f3fdc20064d2
parent 567595a2958a451bd506beba32be1d4651a6c646

FPMT: Initialize parallel_frames_data for parallel encode frames

Initialized frame_size, timestamp_ratio and flush for frames in a
parallel encode set.

Change-Id: I4c9c62f6793540a26f2fac5604aa39adae5214cb

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 92fd5e8..c29b226 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -4402,11 +4402,8 @@
 }
 
 // Initialises frames belonging to a parallel encode set.
-int av1_init_parallel_frame_context(
-#if CONFIG_FRAME_PARALLEL_ENCODE_2
-    const AV1_COMP_DATA *const first_cpi_data,
-#endif
-    AV1_PRIMARY *const ppi) {
+int av1_init_parallel_frame_context(const AV1_COMP_DATA *const first_cpi_data,
+                                    AV1_PRIMARY *const ppi) {
   AV1_COMP *const first_cpi = ppi->cpi;
   GF_GROUP *const gf_group = &ppi->gf_group;
   int gf_index_start = first_cpi->gf_frame_index;
@@ -4481,6 +4478,9 @@
       memcpy(cur_cpi->common.ref_frame_map, first_cpi->common.ref_frame_map,
              sizeof(first_cpi->common.ref_frame_map));
       cur_cpi_data->lib_flags = 0;
+      cur_cpi_data->timestamp_ratio = first_cpi_data->timestamp_ratio;
+      cur_cpi_data->flush = first_cpi_data->flush;
+      cur_cpi_data->frame_size = 0;
 #if CONFIG_FRAME_PARALLEL_ENCODE_2
       if (gf_group->update_type[gf_index_start] == INTNL_ARF_UPDATE) {
         // If the first frame in a parallel encode set is INTNL_ARF_UPDATE

av1/encoder/encoder.h

diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index b183209..201cf7f 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -3214,11 +3214,8 @@
 AV1_COMP *av1_get_parallel_frame_enc_data(AV1_PRIMARY *const ppi,
                                           AV1_COMP_DATA *const first_cpi_data);
 
-int av1_init_parallel_frame_context(
-#if CONFIG_FRAME_PARALLEL_ENCODE_2
-    const AV1_COMP_DATA *const first_cpi_data,
-#endif
-    AV1_PRIMARY *const ppi);
+int av1_init_parallel_frame_context(const AV1_COMP_DATA *const first_cpi_data,
+                                    AV1_PRIMARY *const ppi);
 #endif  // CONFIG_FRAME_PARALLEL_ENCODE
 
 /*!\endcond */