Rename GetGopEncodeInfo in AV1RateControlQMode
AV1RateControlQMode now implements GetGopEncodeInfoWithLookahead
instead of GetGopEncodeInfo, but at this point it ignores the
lookahead_stats argument.
Also, GetGopEncodeInfo is no longer pure virtual, and the default
implementation returns an error. This will allow derived classes
to only implement GetGopEncodeInfoWithLookahead, so that remaining
references to GetGopEncodeInfo can be removed.
Bug: b/242892473
Change-Id: Iea2105e96f5601827139458029c48a0e185f9f0e
diff --git a/av1/ratectrl_qmode.cc b/av1/ratectrl_qmode.cc
index 8edefd7..e38ddb0 100644
--- a/av1/ratectrl_qmode.cc
+++ b/av1/ratectrl_qmode.cc
@@ -1229,9 +1229,12 @@
}
}
-StatusOr<GopEncodeInfo> AV1RateControlQMode::GetGopEncodeInfo(
+StatusOr<GopEncodeInfo> AV1RateControlQMode::GetGopEncodeInfoWithLookahead(
const GopStruct &gop_struct, const TplGopStats &tpl_gop_stats,
+ const std::vector<LookaheadStats> &lookahead_stats,
const RefFrameTable &ref_frame_table_snapshot_init) {
+ // TODO(b/242892473): Use lookahead_stats.
+ (void)lookahead_stats;
Status status = ValidateTplStats(gop_struct, tpl_gop_stats);
if (!status.ok()) {
return status;
diff --git a/av1/ratectrl_qmode.h b/av1/ratectrl_qmode.h
index 7a59687..99e84c8 100644
--- a/av1/ratectrl_qmode.h
+++ b/av1/ratectrl_qmode.h
@@ -94,8 +94,9 @@
Status SetRcParam(const RateControlParam &rc_param) override;
StatusOr<GopStructList> DetermineGopInfo(
const FirstpassInfo &firstpass_info) override;
- StatusOr<GopEncodeInfo> GetGopEncodeInfo(
+ StatusOr<GopEncodeInfo> GetGopEncodeInfoWithLookahead(
const GopStruct &gop_struct, const TplGopStats &tpl_gop_stats,
+ const std::vector<LookaheadStats> &lookahead_stats,
const RefFrameTable &ref_frame_table_snapshot) override;
// Public for testing only.
diff --git a/av1/ratectrl_qmode_interface.h b/av1/ratectrl_qmode_interface.h
index f4459f0..b24a50c 100644
--- a/av1/ratectrl_qmode_interface.h
+++ b/av1/ratectrl_qmode_interface.h
@@ -267,7 +267,13 @@
// TODO(b/242892473): Remove when all references are gone.
virtual StatusOr<GopEncodeInfo> GetGopEncodeInfo(
const GopStruct &gop_struct, const TplGopStats &tpl_gop_stats,
- const RefFrameTable &ref_frame_table_snapshot_init) = 0;
+ const RefFrameTable &ref_frame_table_snapshot_init) {
+ (void)gop_struct;
+ (void)tpl_gop_stats;
+ (void)ref_frame_table_snapshot_init;
+ return { { AOM_CODEC_UNSUP_FEATURE,
+ "GetGopEncodeInfo is deprecated and unimplemented" } };
+ }
// Accepts GOP structure and TPL info from the encoder and returns q index and
// rdmult for each frame. This should be called with consecutive GOPs as
