Split ByteBuffer into writer/reader objects.

webrtc/media/base/rtpdump.cc

 /*
  *  Copyright (c) 2010 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 18 matching lines @@
 const char RtpDumpFileHeader::kFirstLine[] = "#!rtpplay1.0 0.0.0.0/0\n";
 
 RtpDumpFileHeader::RtpDumpFileHeader(uint32_t start_ms, uint32_t s, uint16_t p)
     : start_sec(start_ms / 1000),
       start_usec(start_ms % 1000 * 1000),
       source(s),
       port(p),
       padding(0) {
 }
 
-void RtpDumpFileHeader::WriteToByteBuffer(rtc::ByteBuffer* buf) {
+void RtpDumpFileHeader::WriteToByteBuffer(rtc::ByteBufferWriter* buf) {
   buf->WriteUInt32(start_sec);
   buf->WriteUInt32(start_usec);
   buf->WriteUInt32(source);
   buf->WriteUInt16(port);
   buf->WriteUInt16(padding);
 }
 
 static const uint32_t kDefaultTimeIncrease = 30;
 
 bool RtpDumpPacket::IsValidRtpPacket() const {
@@ skipping 56 matching lines @@
     }
     file_header_read_ = true;
   }
 
   // Read the RTP dump packet header.
   char header[RtpDumpPacket::kHeaderLength];
   res = stream_->ReadAll(header, sizeof(header), NULL, NULL);
   if (res != rtc::SR_SUCCESS) {
     return res;
   }
-  rtc::ByteBuffer buf(header, sizeof(header));
+  rtc::ByteBufferReader buf(header, sizeof(header));
   uint16_t dump_packet_len;
   uint16_t data_len;
   // Read the full length of the rtpdump packet, including the rtpdump header.
   buf.ReadUInt16(&dump_packet_len);
   packet->data.resize(dump_packet_len - sizeof(header));
   // Read the size of the original packet, which may be larger than the size in
   // the rtpdump file, in the event that only part of the packet (perhaps just
   // the header) was recorded. Note that this field is set to zero for RTCP
   // packets, which have their own internal length field.
   buf.ReadUInt16(&data_len);
@@ skipping 23 matching lines @@
     return res;
   }
   if (!CheckFirstLine(first_line)) {
     return rtc::SR_ERROR;
   }
 
   // Read the 16 byte file header.
   char header[RtpDumpFileHeader::kHeaderLength];
   res = stream_->ReadAll(header, sizeof(header), NULL, NULL);
   if (res == rtc::SR_SUCCESS) {
-    rtc::ByteBuffer buf(header, sizeof(header));
+    rtc::ByteBufferReader buf(header, sizeof(header));
     uint32_t start_sec;
     uint32_t start_usec;
     buf.ReadUInt32(&start_sec);
     buf.ReadUInt32(&start_usec);
     start_time_ms_ = start_sec * 1000 + start_usec / 1000;
     // Increase the length by 1 since first_line does not contain the ending \n.
     first_line_and_file_header_len_ = first_line.size() + 1 + sizeof(header);
   }
   return res;
 }
@@ skipping 112 matching lines @@
   if (packet->IsValidRtpPacket()) {
     // Get the old RTP sequence number and timestamp.
     int sequence = 0;
     packet->GetRtpSeqNum(&sequence);
     uint32_t timestamp = 0;
     packet->GetRtpTimestamp(&timestamp);
     // Increase the RTP sequence number and timestamp.
     sequence += loop_count_ * rtp_seq_num_increase_;
     timestamp += loop_count_ * rtp_timestamp_increase_;
     // Write the updated sequence number and timestamp back to the RTP packet.
-    rtc::ByteBuffer buffer;
+    rtc::ByteBufferWriter buffer;
     buffer.WriteUInt16(sequence);
     buffer.WriteUInt32(timestamp);
     memcpy(&packet->data[2], buffer.Data(), buffer.Length());
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////
 // Implementation of RtpDumpWriter.
 ///////////////////////////////////////////////////////////////////////////
 
@@ skipping 15 matching lines @@
 }
 
 rtc::StreamResult RtpDumpWriter::WriteFileHeader() {
   rtc::StreamResult res = WriteToStream(
       RtpDumpFileHeader::kFirstLine,
       strlen(RtpDumpFileHeader::kFirstLine));
   if (res != rtc::SR_SUCCESS) {
     return res;
   }
 
-  rtc::ByteBuffer buf;
+  rtc::ByteBufferWriter buf;
   RtpDumpFileHeader file_header(rtc::Time(), 0, 0);
   file_header.WriteToByteBuffer(&buf);
   return WriteToStream(buf.Data(), buf.Length());
 }
 
 rtc::StreamResult RtpDumpWriter::WritePacket(const void* data,
                                              size_t data_len,
                                              uint32_t elapsed,
                                              bool rtcp) {
   if (!stream_ || !data || 0 == data_len) return rtc::SR_ERROR;
 
   rtc::StreamResult res = rtc::SR_SUCCESS;
   // Write the file header if it has not been written yet.
   if (!file_header_written_) {
     res = WriteFileHeader();
     if (res != rtc::SR_SUCCESS) {
       return res;
     }
     file_header_written_ = true;
   }
 
   // Figure out what to write.
   size_t write_len = FilterPacket(data, data_len, rtcp);
   if (write_len == 0) {
     return rtc::SR_SUCCESS;
   }
 
   // Write the dump packet header.
-  rtc::ByteBuffer buf;
+  rtc::ByteBufferWriter buf;
   buf.WriteUInt16(
       static_cast<uint16_t>(RtpDumpPacket::kHeaderLength + write_len));
   buf.WriteUInt16(static_cast<uint16_t>(rtcp ? 0 : data_len));
   buf.WriteUInt32(elapsed);
   res = WriteToStream(buf.Data(), buf.Length());
   if (res != rtc::SR_SUCCESS) {
     return res;
   }
 
   // Write the header or full packet as indicated by write_len.
@@ skipping 31 matching lines @@
       stream_->WriteAll(data, data_len, NULL, NULL);
   uint32_t delay = rtc::TimeSince(before);
   if (delay >= warn_slow_writes_delay_) {
     LOG(LS_WARNING) << "Slow RtpDump: took " << delay << "ms to write "
                     << data_len << " bytes.";
   }
   return result;
 }
 
 }  // namespace cricket