Use RtcpPacket to send TMMBR 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 688 matching lines @@
       if (numBoundingSet > 0 || numBoundingSet <= numCandidates)
         tmmbrOwner = tmmbr_help_.IsOwner(ssrc_, numBoundingSet);
       if (!tmmbrOwner) {
         // did not enter bounding set, no meaning to send this request
         return BuildResult::kAborted;
       }
     }
   }
 
   if (tmmbr_send_) {
-    // sanity
-    if (ctx->position + 20 >= IP_PACKET_SIZE)
+    rtcp::Tmmbr tmmbr;
+    tmmbr.From(ssrc_);
+    tmmbr.To(remote_ssrc_);
+    tmmbr.WithBitrateKbps(tmmbr_send_);
+    tmmbr.WithOverhead(packet_oh_send_);
+
+    PacketBuiltCallback callback(ctx);
+    if (!callback.BuildPacket(tmmbr))
       return BuildResult::kTruncated;
-
-    // add TMMBR indicator
-    uint8_t FMT = 3;
-    *ctx->AllocateData(1) = 0x80 + FMT;
-    *ctx->AllocateData(1) = 205;
-
-    // Length of 4
-    *ctx->AllocateData(1) = 0;
-    *ctx->AllocateData(1) = 4;
-
-    // Add our own SSRC
-    ByteWriter<uint32_t>::WriteBigEndian(ctx->AllocateData(4), ssrc_);
-
-    // RFC 5104     4.2.1.2.  Semantics
-
-    // SSRC of media source
-    ByteWriter<uint32_t>::WriteBigEndian(ctx->AllocateData(4), 0);
-
-    // Additional Feedback Control Information (FCI)
-    ByteWriter<uint32_t>::WriteBigEndian(ctx->AllocateData(4), remote_ssrc_);
-
-    uint32_t bitRate = tmmbr_send_ * 1000;
-    uint32_t mmbrExp = 0;
-    for (uint32_t i = 0; i < 64; i++) {
-      if (bitRate <= (0x1FFFFu << i)) {
-        mmbrExp = i;
-        break;
-      }
-    }
-    uint32_t mmbrMantissa = (bitRate >> mmbrExp);
-
-    *ctx->AllocateData(1) =
-        static_cast<uint8_t>((mmbrExp << 2) + ((mmbrMantissa >> 15) & 0x03));
-    *ctx->AllocateData(1) = static_cast<uint8_t>(mmbrMantissa >> 7);
-    *ctx->AllocateData(1) = static_cast<uint8_t>(
-        (mmbrMantissa << 1) + ((packet_oh_send_ >> 8) & 0x01));
-    *ctx->AllocateData(1) = static_cast<uint8_t>(packet_oh_send_);
   }
   return BuildResult::kSuccess;
 }
 
 RTCPSender::BuildResult RTCPSender::BuildTMMBN(RtcpContext* ctx) {
   TMMBRSet* boundingSet = tmmbr_help_.BoundingSetToSend();
   if (boundingSet == NULL)
     return BuildResult::kError;
 
   // sanity
@@ skipping 620 matching lines @@
 
 bool RTCPSender::AllVolatileFlagsConsumed() const {
   for (const ReportFlag& flag : report_flags_) {
     if (flag.is_volatile)
       return false;
   }
   return true;
 }
 
 }  // namespace webrtc