commit ee153c92fef781ac5d3bd2e5dba1de8a0badf54f
author Per Kjellander <perkj@webrtc.org> Thu Oct 10 16:43:46 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Thu Oct 10 16:40:39 2019 +0000
tree 698e0b7ea26e32bfc47bd8dbe7c62382e8520ce2
parent 9e70f3614347983f3c30ef0eeef315889128cbea

Send rtcp::RemoteEstimate and rtcp::TransportFeedback in one packet

Change-Id: I53912f4e82a9fd795f8886d6b2cdb313bde08c4d
BUG: webrtc:10742
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/156380
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29437}

modules/pacing/packet_router.h

diff --git a/modules/pacing/packet_router.h b/modules/pacing/packet_router.h
index be535fe..85aa003 100644
--- a/modules/pacing/packet_router.h
+++ b/modules/pacing/packet_router.h
@@ -22,6 +22,7 @@
 #include "api/transport/network_types.h"
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "modules/rtp_rtcp/source/rtcp_packet.h"
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/critical_section.h"
@@ -30,9 +31,6 @@
 namespace webrtc {
 
 class RtpRtcp;
-namespace rtcp {
-class TransportFeedback;
-}  // namespace rtcp
 
 // PacketRouter keeps track of rtp send modules to support the pacer.
 // In addition, it handles feedback messages, which are sent on a send
@@ -76,10 +74,9 @@
   // Send REMB feedback.
   bool SendRemb(int64_t bitrate_bps, const std::vector<uint32_t>& ssrcs);
 
-  // Send transport feedback packet to send-side.
-  bool SendTransportFeedback(rtcp::TransportFeedback* packet) override;
-  // Send RemoteEstimate packet to send-side.
-  void SendNetworkStateEstimatePacket(rtcp::RemoteEstimate* packet) override;
+  // Sends |packets| in one or more IP packets.
+  bool SendCombinedRtcpPacket(
+      std::vector<std::unique_ptr<rtcp::RtcpPacket>> packets) override;
 
  private:
   RtpRtcp* FindRtpModule(uint32_t ssrc)