Changed AudioEncoder::Encode to take an rtc::Buffer* instead of uint8_t* and a maximum size.

webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.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 37 matching lines @@
   return speech_encoder_->Max10MsFramesInAPacket();
 }
 
 int AudioEncoderCopyRed::GetTargetBitrate() const {
   return speech_encoder_->GetTargetBitrate();
 }
 
 AudioEncoder::EncodedInfo AudioEncoderCopyRed::EncodeInternal(
     uint32_t rtp_timestamp,
     rtc::ArrayView<const int16_t> audio,
-    size_t max_encoded_bytes,
-    uint8_t* encoded) {
+    rtc::Buffer* encoded) {
+
+  size_t primary_offset = encoded->size();

[kwiberg-webrtc, 2016/02/25 00:29:04]

const

[ossu, 2016/02/25 10:39:51]

Acknowledged.

   EncodedInfo info =
-      speech_encoder_->Encode(rtp_timestamp, audio, max_encoded_bytes, encoded);
-  RTC_CHECK_GE(max_encoded_bytes,
-               info.encoded_bytes + secondary_info_.encoded_bytes);
+      speech_encoder_->Encode(rtp_timestamp, audio, encoded);
+
   RTC_CHECK(info.redundant.empty()) << "Cannot use nested redundant encoders.";
+  RTC_DCHECK_EQ(encoded->size() - primary_offset, info.encoded_bytes);
 
   if (info.encoded_bytes > 0) {
     // |info| will be implicitly cast to an EncodedInfoLeaf struct, effectively
     // discarding the (empty) vector of redundant information. This is
     // intentional.
     info.redundant.push_back(info);
     RTC_DCHECK_EQ(info.redundant.size(), 1u);
     if (secondary_info_.encoded_bytes > 0) {
-      memcpy(&encoded[info.encoded_bytes], secondary_encoded_.data(),
-             secondary_info_.encoded_bytes);
+      encoded->AppendData(secondary_encoded_);
       info.redundant.push_back(secondary_info_);
       RTC_DCHECK_EQ(info.redundant.size(), 2u);
     }
     // Save primary to secondary.
-    secondary_encoded_.SetData(encoded, info.encoded_bytes);
+    secondary_encoded_.SetData(encoded->data() + primary_offset,
+                               info.encoded_bytes);
     secondary_info_ = info;
     RTC_DCHECK_EQ(info.speech, info.redundant[0].speech);
   }
   // Update main EncodedInfo.
   info.payload_type = red_payload_type_;
   info.encoded_bytes = 0;
   for (std::vector<EncodedInfoLeaf>::const_iterator it = info.redundant.begin();
        it != info.redundant.end(); ++it) {
     info.encoded_bytes += it->encoded_bytes;
   }
@@ skipping 24 matching lines @@
 
 void AudioEncoderCopyRed::SetProjectedPacketLossRate(double fraction) {
   speech_encoder_->SetProjectedPacketLossRate(fraction);
 }
 
 void AudioEncoderCopyRed::SetTargetBitrate(int bits_per_second) {
   speech_encoder_->SetTargetBitrate(bits_per_second);
 }
 
 }  // namespace webrtc