Rename GetGopEncodeInfoWithLookahead
All references to the old three-argument version of
GetGopEncodeInfo are gone, so GetGopEncodeInfoWithLookahead
can be renamed back to GetGopEncodeInfo.
Bug: b/242892473
Change-Id: I18b904cd1ef353c23a98f82feab63d7dc228474b
diff --git a/av1/ratectrl_qmode.cc b/av1/ratectrl_qmode.cc
index e38ddb0..8a54e15 100644
--- a/av1/ratectrl_qmode.cc
+++ b/av1/ratectrl_qmode.cc
@@ -1229,7 +1229,7 @@
}
}
-StatusOr<GopEncodeInfo> AV1RateControlQMode::GetGopEncodeInfoWithLookahead(
+StatusOr<GopEncodeInfo> AV1RateControlQMode::GetGopEncodeInfo(
const GopStruct &gop_struct, const TplGopStats &tpl_gop_stats,
const std::vector<LookaheadStats> &lookahead_stats,
const RefFrameTable &ref_frame_table_snapshot_init) {
diff --git a/av1/ratectrl_qmode.h b/av1/ratectrl_qmode.h
index 99e84c8..93bd834 100644
--- a/av1/ratectrl_qmode.h
+++ b/av1/ratectrl_qmode.h
@@ -94,7 +94,7 @@
Status SetRcParam(const RateControlParam &rc_param) override;
StatusOr<GopStructList> DetermineGopInfo(
const FirstpassInfo &firstpass_info) override;
- StatusOr<GopEncodeInfo> GetGopEncodeInfoWithLookahead(
+ StatusOr<GopEncodeInfo> GetGopEncodeInfo(
const GopStruct &gop_struct, const TplGopStats &tpl_gop_stats,
const std::vector<LookaheadStats> &lookahead_stats,
const RefFrameTable &ref_frame_table_snapshot) override;
diff --git a/av1/ratectrl_qmode_interface.h b/av1/ratectrl_qmode_interface.h
index 71285d0..446e2ac 100644
--- a/av1/ratectrl_qmode_interface.h
+++ b/av1/ratectrl_qmode_interface.h
@@ -281,7 +281,7 @@
// ref_frame_table_snapshot_init; for subsequent GOPs, it should be the
// final_snapshot returned on the previous call.
//
- virtual StatusOr<GopEncodeInfo> GetGopEncodeInfoWithLookahead(
+ virtual StatusOr<GopEncodeInfo> GetGopEncodeInfo(
const GopStruct &gop_struct, const TplGopStats &tpl_gop_stats,
const std::vector<LookaheadStats> &lookahead_stats,
const RefFrameTable &ref_frame_table_snapshot_init) = 0;
diff --git a/test/mock_ratectrl_qmode.h b/test/mock_ratectrl_qmode.h
index 252d3a6..3b6f290 100644
--- a/test/mock_ratectrl_qmode.h
+++ b/test/mock_ratectrl_qmode.h
@@ -23,7 +23,7 @@
(override));
MOCK_METHOD(StatusOr<GopStructList>, DetermineGopInfo,
(const FirstpassInfo &firstpass_info), (override));
- MOCK_METHOD(StatusOr<GopEncodeInfo>, GetGopEncodeInfoWithLookahead,
+ MOCK_METHOD(StatusOr<GopEncodeInfo>, GetGopEncodeInfo,
(const GopStruct &gop_struct, const TplGopStats &tpl_gop_stats,
const std::vector<LookaheadStats> &lookahead_stats,
const RefFrameTable &ref_frame_table_snapshot_init),
diff --git a/test/ratectrl_qmode_test.cc b/test/ratectrl_qmode_test.cc
index 5956d51..29bc52d 100644
--- a/test/ratectrl_qmode_test.cc
+++ b/test/ratectrl_qmode_test.cc
@@ -1052,7 +1052,7 @@
int num_gop_skipped = 0;
for (size_t gop_idx = 0; gop_idx < gop_list.size(); gop_idx++) {
size_t tpl_gop_idx = gop_idx - num_gop_skipped;
- const auto gop_encode_info = rc.GetGopEncodeInfoWithLookahead(
+ const auto gop_encode_info = rc.GetGopEncodeInfo(
gop_list[gop_idx], tpl_gop_list[tpl_gop_idx], {}, ref_frame_table);
ASSERT_THAT(gop_encode_info.status(), IsOkStatus());
for (auto &frame_param : gop_encode_info->param_list) {
@@ -1069,9 +1069,9 @@
tpl_gop_stats.frame_stats_list.assign(
5, CreateToyTplFrameStatsWithDiffSizes(8, 8));
AV1RateControlQMode rc;
- const Status status = rc.GetGopEncodeInfoWithLookahead(
- gop_struct, tpl_gop_stats, {}, RefFrameTable())
- .status();
+ const Status status =
+ rc.GetGopEncodeInfo(gop_struct, tpl_gop_stats, {}, RefFrameTable())
+ .status();
EXPECT_EQ(status.code, AOM_CODEC_INVALID_PARAM);
EXPECT_THAT(status.message,
HasSubstr("Frame count of GopStruct (7) doesn't match frame "
@@ -1094,9 +1094,9 @@
tpl_gop_stats.frame_stats_list[0] = CreateToyTplFrameStatsWithDiffSizes(8, 8);
AV1RateControlQMode rc;
- const Status status = rc.GetGopEncodeInfoWithLookahead(
- gop_struct, tpl_gop_stats, {}, RefFrameTable())
- .status();
+ const Status status =
+ rc.GetGopEncodeInfo(gop_struct, tpl_gop_stats, {}, RefFrameTable())
+ .status();
EXPECT_EQ(status.code, AOM_CODEC_INVALID_PARAM);
EXPECT_THAT(status.message,
HasSubstr("The frame with global_coding_idx 2 is a reference "
