Use RtcpPacket to send REMB in RtcpSender

webrtc/modules/rtp_rtcp/source/rtcp_sender.cc

 /*
  *  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.
  */
 
@@ skipping 620 matching lines @@
   rpsi.WithPictureId(ctx->picture_id);
 
   PacketBuiltCallback callback(ctx);
   if (!callback.BuildPacket(rpsi))
     return BuildResult::kTruncated;
 
   return BuildResult::kSuccess;
 }
 
 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");
 
   return BuildResult::kSuccess;
 }
 
 void RTCPSender::SetTargetBitrate(unsigned int target_bitrate) {
   CriticalSectionScoped lock(critical_section_rtcp_sender_.get());
   tmmbr_send_ = target_bitrate / 1000;
 }
@@ skipping 718 matching lines @@
 
 bool RTCPSender::AllVolatileFlagsConsumed() const {
   for (const ReportFlag& flag : report_flags_) {
     if (flag.is_volatile)
       return false;
   }
   return true;
 }
 
 }  // namespace webrtc