From fb20afd38c7d0925c6419d18b3292714e8b96c69 Mon Sep 17 00:00:00 2001
From: Elad Alon <eladalon@webrtc.org>
Date: Wed, 10 Apr 2019 16:38:16 +0200
Subject: [PATCH] Pass notifications of RTT, PLR and LossNotification RTCP
 through EncoderSimulcastProxy

LibvpxVp8Encoder is held by EncoderSimulcastProxy. Make EncoderSimulcastProxy
pass on notifications of RTT, PLR and LossNotification RTCP messages
onwards to the encoder it holds.

Bug: webrtc:10501
Change-Id: Id6c9a0a9fe09a0868e28c5d7ff94d4a71f3d6332
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132221
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27546}
---
 media/engine/encoder_simulcast_proxy.cc | 13 +++++++++++++
 media/engine/encoder_simulcast_proxy.h  |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/media/engine/encoder_simulcast_proxy.cc b/media/engine/encoder_simulcast_proxy.cc
index e87e1031b5..8c2f82514b 100644
--- a/media/engine/encoder_simulcast_proxy.cc
+++ b/media/engine/encoder_simulcast_proxy.cc
@@ -61,6 +61,19 @@ int EncoderSimulcastProxy::SetRateAllocation(
   return encoder_->SetRateAllocation(bitrate, new_framerate);
 }
 
+void EncoderSimulcastProxy::OnPacketLossRateUpdate(float packet_loss_rate) {
+  return encoder_->OnPacketLossRateUpdate(packet_loss_rate);
+}
+
+void EncoderSimulcastProxy::OnRttUpdate(int64_t rtt_ms) {
+  return encoder_->OnRttUpdate(rtt_ms);
+}
+
+void EncoderSimulcastProxy::OnLossNotification(
+    const LossNotification& loss_notification) {
+  encoder_->OnLossNotification(loss_notification);
+}
+
 VideoEncoder::EncoderInfo EncoderSimulcastProxy::GetEncoderInfo() const {
   return encoder_->GetEncoderInfo();
 }
diff --git a/media/engine/encoder_simulcast_proxy.h b/media/engine/encoder_simulcast_proxy.h
index e9f9f34173..1251e58f29 100644
--- a/media/engine/encoder_simulcast_proxy.h
+++ b/media/engine/encoder_simulcast_proxy.h
@@ -50,6 +50,9 @@ class RTC_EXPORT EncoderSimulcastProxy : public VideoEncoder {
   int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override;
   int SetRateAllocation(const VideoBitrateAllocation& bitrate,
                         uint32_t new_framerate) override;
+  void OnPacketLossRateUpdate(float packet_loss_rate) override;
+  void OnRttUpdate(int64_t rtt_ms) override;
+  void OnLossNotification(const LossNotification& loss_notification) override;
   EncoderInfo GetEncoderInfo() const override;
 
  private: