1 files changed, 27 insertions, 35 deletions

diff --git a/video/encoder_rtcp_feedback.cc b/video/encoder_rtcp_feedback.cc
index b81ff6120f..17095a0a0c 100644
--- a/video/encoder_rtcp_feedback.cc
+++ b/video/encoder_rtcp_feedback.cc
@@ -10,6 +10,9 @@
 
 #include "video/encoder_rtcp_feedback.h"
 
+#include <algorithm>
+#include <utility>
+
 #include "absl/types/optional.h"
 #include "api/video_codecs/video_encoder.h"
 #include "rtc_base/checks.h"
@@ -21,47 +24,36 @@ namespace {
 constexpr int kMinKeyframeSendIntervalMs = 300;
 }  // namespace
 
-EncoderRtcpFeedback::EncoderRtcpFeedback(Clock* clock,
-                                         const std::vector<uint32_t>& ssrcs,
-                                         VideoStreamEncoderInterface* encoder)
+EncoderRtcpFeedback::EncoderRtcpFeedback(
+    Clock* clock,
+    const std::vector<uint32_t>& ssrcs,
+    VideoStreamEncoderInterface* encoder,
+    std::function<std::vector<RtpSequenceNumberMap::Info>(
+        uint32_t ssrc,
+        const std::vector<uint16_t>& seq_nums)> get_packet_infos)
     : clock_(clock),
       ssrcs_(ssrcs),
-      rtp_video_sender_(nullptr),
+      get_packet_infos_(std::move(get_packet_infos)),
       video_stream_encoder_(encoder),
-      time_last_intra_request_ms_(-1),
-      min_keyframe_send_interval_ms_(
-          KeyframeIntervalSettings::ParseFromFieldTrials()
-              .MinKeyframeSendIntervalMs()
-              .value_or(kMinKeyframeSendIntervalMs)) {
+      time_last_packet_delivery_queue_(Timestamp::Millis(0)),
+      min_keyframe_send_interval_(
+          TimeDelta::Millis(KeyframeIntervalSettings::ParseFromFieldTrials()
+                                .MinKeyframeSendIntervalMs()
+                                .value_or(kMinKeyframeSendIntervalMs))) {
   RTC_DCHECK(!ssrcs.empty());
+  packet_delivery_queue_.Detach();
 }
 
-void EncoderRtcpFeedback::SetRtpVideoSender(
-    const RtpVideoSenderInterface* rtp_video_sender) {
-  RTC_DCHECK(rtp_video_sender);
-  RTC_DCHECK(!rtp_video_sender_);
-  rtp_video_sender_ = rtp_video_sender;
-}
+// Called via Call::DeliverRtcp.
+void EncoderRtcpFeedback::OnReceivedIntraFrameRequest(uint32_t ssrc) {
+  RTC_DCHECK_RUN_ON(&packet_delivery_queue_);
+  RTC_DCHECK(std::find(ssrcs_.begin(), ssrcs_.end(), ssrc) != ssrcs_.end());
 
-bool EncoderRtcpFeedback::HasSsrc(uint32_t ssrc) {
-  for (uint32_t registered_ssrc : ssrcs_) {
-    if (registered_ssrc == ssrc) {
-      return true;
-    }
-  }
-  return false;
-}
+  const Timestamp now = clock_->CurrentTime();
+  if (time_last_packet_delivery_queue_ + min_keyframe_send_interval_ > now)
+    return;
 
-void EncoderRtcpFeedback::OnReceivedIntraFrameRequest(uint32_t ssrc) {
-  RTC_DCHECK(HasSsrc(ssrc));
-  {
-    int64_t now_ms = clock_->TimeInMilliseconds();
-    MutexLock lock(&mutex_);
-    if (time_last_intra_request_ms_ + min_keyframe_send_interval_ms_ > now_ms) {
-      return;
-    }
-    time_last_intra_request_ms_ = now_ms;
-  }
+  time_last_packet_delivery_queue_ = now;
 
   // Always produce key frame for all streams.
   video_stream_encoder_->SendKeyFrame();
@@ -72,12 +64,12 @@ void EncoderRtcpFeedback::OnReceivedLossNotification(
     uint16_t seq_num_of_last_decodable,
     uint16_t seq_num_of_last_received,
     bool decodability_flag) {
-  RTC_DCHECK(rtp_video_sender_) << "Object initialization incomplete.";
+  RTC_DCHECK(get_packet_infos_) << "Object initialization incomplete.";
 
   const std::vector<uint16_t> seq_nums = {seq_num_of_last_decodable,
                                           seq_num_of_last_received};
   const std::vector<RtpSequenceNumberMap::Info> infos =
-      rtp_video_sender_->GetSentRtpPacketInfos(ssrc, seq_nums);
+      get_packet_infos_(ssrc, seq_nums);
   if (infos.empty()) {
     return;
   }