Use RtcpPacket to send APP 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 764 matching lines @@
     }
   }
   uint16_t length = static_cast<uint16_t>(2 + 2 * numBoundingSet);
   ctx->buffer[posLength++] = static_cast<uint8_t>(length >> 8);
   ctx->buffer[posLength] = static_cast<uint8_t>(length);
 
   return BuildResult::kSuccess;
 }
 
 RTCPSender::BuildResult RTCPSender::BuildAPP(RtcpContext* ctx) {
-  // sanity
-  if (app_data_ == NULL) {
-    LOG(LS_WARNING) << "Failed to build app specific.";
-    return BuildResult::kError;
-  }
-  if (ctx->position + 12 + app_length_ >= IP_PACKET_SIZE) {
-    LOG(LS_WARNING) << "Failed to build app specific.";
+  rtcp::App app;
+  app.From(ssrc_);
+  app.WithSubType(app_sub_type_);
+  app.WithName(app_name_);

[åsapersson, 2015/08/31 14:32:52]

Note that there is an assert in WithData.

[sprang_webrtc, 2015/08/31 15:29:28]

That's ok, in RTCPSender::SetApplicationSpecificData() with lenght = 0, the
buffer will be reset to a zero-length array, so the assert won't trigger:
    app_data_.reset(new uint8_t[length]);

[åsapersson, 2015/08/31 16:48:06]

Acknowledged.

+  app.WithData(app_data_.get(), app_length_);
+
+  PacketBuiltCallback callback(ctx);
+  if (!callback.BuildPacket(app))
     return BuildResult::kTruncated;
-  }
-  *ctx->AllocateData(1) = 0x80 + app_sub_type_;
-
-  // Add APP ID
-  *ctx->AllocateData(1) = 204;
-
-  uint16_t length = (app_length_ >> 2) + 2;  // include SSRC and name
-  *ctx->AllocateData(1) = static_cast<uint8_t>(length >> 8);
-  *ctx->AllocateData(1) = static_cast<uint8_t>(length);
-
-  // Add our own SSRC
-  ByteWriter<uint32_t>::WriteBigEndian(ctx->AllocateData(4), ssrc_);
-
-  // Add our application name
-  ByteWriter<uint32_t>::WriteBigEndian(ctx->AllocateData(4), app_name_);
-
-  // Add the data
-  memcpy(ctx->AllocateData(app_length_), app_data_.get(), app_length_);
 
   return BuildResult::kSuccess;
 }
 
 RTCPSender::BuildResult RTCPSender::BuildNACK(RtcpContext* ctx) {
   // sanity
   if (ctx->position + 16 >= IP_PACKET_SIZE) {
     LOG(LS_WARNING) << "Failed to build NACK.";
     return BuildResult::kTruncated;
   }
@@ skipping 527 matching lines @@
 
 bool RTCPSender::AllVolatileFlagsConsumed() const {
   for (const ReportFlag& flag : report_flags_) {
     if (flag.is_volatile)
       return false;
   }
   return true;
 }
 
 }  // namespace webrtc