commit 35ab4baa20a730de71b390008900a16563cbbe8e
author Erik Språng <sprang@webrtc.org> Tue Aug 18 11:53:57 2015 +0200
committer Erik Språng <sprang@webrtc.org> Tue Aug 18 09:54:18 2015 +0000
tree f5b92488e84411a249c290429587eb95fc75cf2e
parent 7b3de4b7d0d30eed77f986cd0efb7c4deb4d1bb1

Use RtcpPacket to send REMB in RtcpSender

BUG=webrtc:2450
R=asapersson@webrtc.org

Review URL: https://codereview.webrtc.org/1290573004 .

Cr-Commit-Position: refs/heads/master@{#9722}

webrtc/modules/rtp_rtcp/source/rtcp_sender.cc

diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
index e118fb2..5ebd4a8 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -638,48 +638,16 @@
 }
 
 RTCPSender::BuildResult RTCPSender::BuildREMB(RtcpContext* ctx) {
-  // sanity
-  if (ctx->position + 20 + 4 * remb_ssrcs_.size() >= IP_PACKET_SIZE)
+  rtcp::Remb remb;
+  remb.From(ssrc_);
+  for (uint32_t ssrc : remb_ssrcs_)
+    remb.AppliesTo(ssrc);
+  remb.WithBitrateBps(remb_bitrate_);
+
+  PacketBuiltCallback callback(ctx);
+  if (!callback.BuildPacket(remb))
     return BuildResult::kTruncated;
 
-  // add application layer feedback
-  uint8_t FMT = 15;
-  *ctx->AllocateData(1) = 0x80 + FMT;
-  *ctx->AllocateData(1) = 206;
-
-  *ctx->AllocateData(1) = 0;
-  *ctx->AllocateData(1) = static_cast<uint8_t>(remb_ssrcs_.size() + 4);
-
-  // Add our own SSRC
-  ByteWriter<uint32_t>::WriteBigEndian(ctx->AllocateData(4), ssrc_);
-
-  // Remote SSRC must be 0
-  ByteWriter<uint32_t>::WriteBigEndian(ctx->AllocateData(4), 0);
-
-  *ctx->AllocateData(1) = 'R';
-  *ctx->AllocateData(1) = 'E';
-  *ctx->AllocateData(1) = 'M';
-  *ctx->AllocateData(1) = 'B';
-
-  *ctx->AllocateData(1) = remb_ssrcs_.size();
-  // 6 bit Exp
-  // 18 bit mantissa
-  uint8_t brExp = 0;
-  for (uint32_t i = 0; i < 64; i++) {
-    if (remb_bitrate_ <= (0x3FFFFu << i)) {
-      brExp = i;
-      break;
-    }
-  }
-  const uint32_t brMantissa = (remb_bitrate_ >> brExp);
-  *ctx->AllocateData(1) =
-      static_cast<uint8_t>((brExp << 2) + ((brMantissa >> 16) & 0x03));
-  *ctx->AllocateData(1) = static_cast<uint8_t>(brMantissa >> 8);
-  *ctx->AllocateData(1) = static_cast<uint8_t>(brMantissa);
-
-  for (size_t i = 0; i < remb_ssrcs_.size(); i++)
-    ByteWriter<uint32_t>::WriteBigEndian(ctx->AllocateData(4), remb_ssrcs_[i]);
-
   TRACE_EVENT_INSTANT0(TRACE_DISABLED_BY_DEFAULT("webrtc_rtp"),
                        "RTCPSender::REMB");