Rename EncoderKeyFrameCallback back to EncoderRtcpFeedback
The name EncoderRtcpFeedback is more appropriate because:
1. "Callback" implies a single function exposed, which is
not the case.
2. We intend to add OnLossNotification() to the same class.
Bug: webrtc:10501
Change-Id: I75b2e06eb070e85e872eba9fbc354aa4b68c7993
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131289
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27490}diff --git a/video/encoder_rtcp_feedback.cc b/video/encoder_rtcp_feedback.cc
new file mode 100644
index 0000000..2c54701
--- /dev/null
+++ b/video/encoder_rtcp_feedback.cc
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "video/encoder_rtcp_feedback.h"
+
+#include "absl/types/optional.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/experiments/keyframe_interval_settings.h"
+
+namespace webrtc {
+
+namespace {
+constexpr int kMinKeyframeSendIntervalMs = 300;
+} // namespace
+
+EncoderRtcpFeedback::EncoderRtcpFeedback(Clock* clock,
+ const std::vector<uint32_t>& ssrcs,
+ VideoStreamEncoderInterface* encoder)
+ : clock_(clock),
+ ssrcs_(ssrcs),
+ video_stream_encoder_(encoder),
+ time_last_intra_request_ms_(-1),
+ min_keyframe_send_interval_ms_(
+ KeyframeIntervalSettings::ParseFromFieldTrials()
+ .MinKeyframeSendIntervalMs()
+ .value_or(kMinKeyframeSendIntervalMs)) {
+ RTC_DCHECK(!ssrcs.empty());
+}
+
+bool EncoderRtcpFeedback::HasSsrc(uint32_t ssrc) {
+ for (uint32_t registered_ssrc : ssrcs_) {
+ if (registered_ssrc == ssrc) {
+ return true;
+ }
+ }
+ return false;
+}
+
+void EncoderRtcpFeedback::OnReceivedIntraFrameRequest(uint32_t ssrc) {
+ RTC_DCHECK(HasSsrc(ssrc));
+ {
+ int64_t now_ms = clock_->TimeInMilliseconds();
+ rtc::CritScope lock(&crit_);
+ if (time_last_intra_request_ms_ + min_keyframe_send_interval_ms_ > now_ms) {
+ return;
+ }
+ time_last_intra_request_ms_ = now_ms;
+ }
+
+ // Always produce key frame for all streams.
+ video_stream_encoder_->SendKeyFrame();
+}
+
+void EncoderRtcpFeedback::OnKeyFrameRequested(uint64_t channel_id) {
+ if (channel_id != ssrcs_[0]) {
+ RTC_LOG(LS_INFO) << "Key frame request on unknown channel id " << channel_id
+ << " expected " << ssrcs_[0];
+ return;
+ }
+
+ video_stream_encoder_->SendKeyFrame();
+}
+
+} // namespace webrtc
