commit 496ae0b2c2fc73a4f09dfa5acf87c5ab2ee360a1
author Mark Wachsler <wachsler@google.com> Wed Aug 03 19:31:04 2022 +0000
committer Mark Wachsler <wachsler@google.com> Thu Aug 04 16:26:10 2022 +0000
tree cf7fced843db2230cf7c0ea8315e5f58cb9e8c61
parent 1b5de9e67c97c5821e20b793b4fca6b1d82fe5aa

Add max_ref_frames and max_depth paramters to API

They are not yet implemented (or even validated) and should not be
until all callers of the API populate them.

Bug: b/240412144
Change-Id: I126265cc1dbd6108e052fb4587d9fa702097362b

av1/ratectrl_qmode_interface.h

diff --git a/av1/ratectrl_qmode_interface.h b/av1/ratectrl_qmode_interface.h
index 316a699..1e4e5c6 100644
--- a/av1/ratectrl_qmode_interface.h
+++ b/av1/ratectrl_qmode_interface.h
@@ -30,10 +30,19 @@
 };
 
 struct RateControlParam {
+  // Range of allowed GOP sizes (number of displayed frames).
   int max_gop_show_frame_count;
   int min_gop_show_frame_count;
-  int ref_frame_table_size;  // number of reference frame buffers
+  // Number of reference frame buffers, i.e., size of the DPB.
+  int ref_frame_table_size;
+  // Maximum number of references a single frame may use.
+  int max_ref_frames;
+  // Maximum pyramid depth. e.g., 1 means only one ARF per GOP,
+  // 2 would allow an additional level of intermediate ARFs.
+  int max_depth;
+
   int base_q_index;
+
   int frame_width;
   int frame_height;
 };

test/ratectrl_qmode_test.cc

diff --git a/test/ratectrl_qmode_test.cc b/test/ratectrl_qmode_test.cc
index 1678beb..60a230f 100644
--- a/test/ratectrl_qmode_test.cc
+++ b/test/ratectrl_qmode_test.cc
@@ -950,6 +950,8 @@
   RateControlParam rc_param = {};
   rc_param.max_gop_show_frame_count = 8;
   rc_param.ref_frame_table_size = 3;
+  rc_param.max_ref_frames = 3;
+  rc_param.max_depth = 3;
   rc_param.frame_width = 128;
   rc_param.frame_height = 128;
   ASSERT_THAT(rc.SetRcParam(rc_param), IsOkStatus());
@@ -984,6 +986,8 @@
   RateControlParam rc_param = {};
   rc_param.max_gop_show_frame_count = 8;
   rc_param.ref_frame_table_size = 3;
+  rc_param.max_ref_frames = 3;
+  rc_param.max_depth = 3;
   rc_param.frame_height = 128;
   rc_param.frame_width = 128;
   ASSERT_THAT(rc.SetRcParam(rc_param), IsOkStatus());
@@ -1024,6 +1028,8 @@
   rc_param.max_gop_show_frame_count = 32;
   rc_param.min_gop_show_frame_count = 4;
   rc_param.ref_frame_table_size = 7;
+  rc_param.max_ref_frames = 7;
+  rc_param.max_depth = 5;
   ASSERT_THAT(rc.SetRcParam(rc_param), IsOkStatus());
 
   const auto gop_info = rc.DetermineGopInfo(firstpass_info);
@@ -1051,6 +1057,8 @@
   rc_param.max_gop_show_frame_count = 16;
   rc_param.min_gop_show_frame_count = 4;
   rc_param.ref_frame_table_size = 7;
+  rc_param.max_ref_frames = 7;
+  rc_param.max_depth = 5;
   // Just an arbitrary base qp for the test.
   rc_param.base_q_index = 128;
   ASSERT_THAT(rc.SetRcParam(rc_param), IsOkStatus());