Remove some unused calls from Video Engine classes SendCodecsHaLntf, SendCodecRtxTime and SendCodecRtcpMode were introduced during the send/receive split. Refactoring has removed the need for them. They can be deleted. Bug: None Change-Id: I328a8f8dfcc89743270f87c307a558276bb730a3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/455240 Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47120}
diff --git a/media/base/fake_media_engine.h b/media/base/fake_media_engine.h index 75e204d..6cd6e66 100644 --- a/media/base/fake_media_engine.h +++ b/media/base/fake_media_engine.h
@@ -749,14 +749,11 @@ void GenerateSendKeyFrame(uint32_t ssrc, const std::vector<std::string>& rids) override; - RtcpMode SendCodecRtcpMode() const override { return RtcpMode::kCompound; } void SetSsrcListChangedCallback( absl::AnyInvocable<void(const std::set<uint32_t>&)> /* callback */) override {} - bool SendCodecHasLntf() const override { return false; } bool SendCodecHasNack() const override { return false; } - std::optional<int> SendCodecRtxTime() const override { return std::nullopt; } bool GetStats(VideoMediaSendInfo* info) override; bool SetOptions(const VideoOptions& options) override;
diff --git a/media/base/media_channel.h b/media/base/media_channel.h index 3cc8f7b..93693ec 100644 --- a/media/base/media_channel.h +++ b/media/base/media_channel.h
@@ -982,10 +982,6 @@ // so that it's getting the send stream stats separately by calling // GetStats(), and merges with BandwidthEstimationInfo by itself. virtual void FillBitrateInfo(BandwidthEstimationInfo* bwe_info) = 0; - // Information queries to support SetReceiverFeedbackParameters - virtual RtcpMode SendCodecRtcpMode() const = 0; - virtual bool SendCodecHasLntf() const = 0; - virtual std::optional<int> SendCodecRtxTime() const = 0; }; class VideoMediaReceiveChannelInterface : public MediaReceiveChannelInterface {
diff --git a/media/engine/webrtc_video_engine.h b/media/engine/webrtc_video_engine.h index d79174f..e6b4b23 100644 --- a/media/engine/webrtc_video_engine.h +++ b/media/engine/webrtc_video_engine.h
@@ -263,19 +263,6 @@ uint32_t ssrc, scoped_refptr<FrameTransformerInterface> frame_transformer) override; // Information queries to support SetReceiverFeedbackParameters - RtcpMode SendCodecRtcpMode() const override { - RTC_DCHECK_RUN_ON(&thread_checker_); - return send_params_.rtcp.reduced_size ? RtcpMode::kReducedSize - : RtcpMode::kCompound; - } - - bool SendCodecHasLntf() const override { - RTC_DCHECK_RUN_ON(&thread_checker_); - if (!send_codec()) { - return false; - } - return HasLntf(send_codec()->codec); - } bool SendCodecHasNack() const override { RTC_DCHECK_RUN_ON(&thread_checker_); if (!send_codec()) { @@ -283,13 +270,6 @@ } return HasNack(send_codec()->codec); } - std::optional<int> SendCodecRtxTime() const override { - RTC_DCHECK_RUN_ON(&thread_checker_); - if (!send_codec()) { - return std::nullopt; - } - return send_codec()->rtx_time; - } private: struct ChangedSenderParameters {