[rtp_rtcp] rtc::scoped_ptr<rtcp::RawPacket> replaced with rtc::Buffer

webrtc/modules/rtp_rtcp/source/rtcp_packet.cc

 /*
  *  Copyright (c) 2014 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 13 matching lines @@
   ByteWriter<uint16_t>::WriteBigEndian(buffer + *offset, value);
   *offset += 2;
 }
 }  // namespace
 
 void RtcpPacket::Append(RtcpPacket* packet) {
   assert(packet);
   appended_packets_.push_back(packet);
 }
 
-rtc::scoped_ptr<RawPacket> RtcpPacket::Build() const {
+rtc::Buffer RtcpPacket::Build() const {
   size_t length = 0;
-  rtc::scoped_ptr<RawPacket> packet(new RawPacket(IP_PACKET_SIZE));
+  rtc::Buffer packet(IP_PACKET_SIZE);
 
   class PacketVerifier : public PacketReadyCallback {
    public:
-    explicit PacketVerifier(RawPacket* packet)
+    explicit PacketVerifier(rtc::Buffer* packet)
         : called_(false), packet_(packet) {}
     virtual ~PacketVerifier() {}
     void OnPacketReady(uint8_t* data, size_t length) override {
       RTC_CHECK(!called_) << "Fragmentation not supported.";
       called_ = true;
-      packet_->SetLength(length);
+      packet_->SetSize(length);
     }
 
    private:
     bool called_;
-    RawPacket* const packet_;
-  } verifier(packet.get());
-  CreateAndAddAppended(packet->MutableBuffer(), &length, packet->BufferLength(),
-                       &verifier);
-  OnBufferFull(packet->MutableBuffer(), &length, &verifier);
+    rtc::Buffer* const packet_;
+  } verifier(&packet);
+  CreateAndAddAppended(packet.data(), &length, packet.capacity(), &verifier);
+  OnBufferFull(packet.data(), &length, &verifier);
   return packet;
 }
 
 bool RtcpPacket::Build(PacketReadyCallback* callback) const {
   uint8_t buffer[IP_PACKET_SIZE];
   return BuildExternalBuffer(buffer, IP_PACKET_SIZE, callback);
 }
 
 bool RtcpPacket::BuildExternalBuffer(uint8_t* buffer,
                                      size_t max_length,
@@ skipping 49 matching lines @@
     size_t length,
     uint8_t* buffer,
     size_t* pos) {
   assert(length <= 0xffff);
   const uint8_t kVersion = 2;
   AssignUWord8(buffer, pos, (kVersion << 6) + count_or_format);
   AssignUWord8(buffer, pos, packet_type);
   AssignUWord16(buffer, pos, length);
 }
 
-RawPacket::RawPacket(size_t buffer_length)
-    : buffer_length_(buffer_length), length_(0) {
-  buffer_.reset(new uint8_t[buffer_length]);
-}
-
-RawPacket::RawPacket(const uint8_t* packet, size_t packet_length)
-    : buffer_length_(packet_length), length_(packet_length) {
-  buffer_.reset(new uint8_t[packet_length]);
-  memcpy(buffer_.get(), packet, packet_length);
-}
-
-const uint8_t* RawPacket::Buffer() const {
-  return buffer_.get();
-}
-
-uint8_t* RawPacket::MutableBuffer() {
-  return buffer_.get();
-}
-
-size_t RawPacket::BufferLength() const {
-  return buffer_length_;
-}
-
-size_t RawPacket::Length() const {
-  return length_;
-}
-
-void RawPacket::SetLength(size_t length) {
-  assert(length <= buffer_length_);
-  length_ = length;
-}
-
 }  // namespace rtcp
 }  // namespace webrtc