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

webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc

 /*
  *  Copyright (c) 2015 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 24 matching lines @@
     RentACodec::StackParameters param;
     param.use_cng = true;
     param.speech_encoder = speech_encoder_;
     encoder_ = rent_a_codec_.RentEncoderStack(&param);
   }
 
   void EncodeAndVerify(size_t expected_out_length,
                        uint32_t expected_timestamp,
                        int expected_payload_type,
                        int expected_send_even_if_empty) {
-    uint8_t out[kPacketSizeSamples];
+    rtc::Buffer out;
     AudioEncoder::EncodedInfo encoded_info;
     encoded_info =
-        encoder_->Encode(timestamp_, kZeroData, kPacketSizeSamples, out);
+        encoder_->Encode(timestamp_, kZeroData, &out);
     timestamp_ += kDataLengthSamples;
     EXPECT_TRUE(encoded_info.redundant.empty());
     EXPECT_EQ(expected_out_length, encoded_info.encoded_bytes);
     EXPECT_EQ(expected_timestamp, encoded_info.encoded_timestamp);
     if (expected_payload_type >= 0)
       EXPECT_EQ(expected_payload_type, encoded_info.payload_type);
     if (expected_send_even_if_empty >= 0)
       EXPECT_EQ(static_cast<bool>(expected_send_even_if_empty),
                 encoded_info.send_even_if_empty);
   }
@@ skipping 49 matching lines @@
       .WillRepeatedly(Return(kSampleRateHz));
   EXPECT_CALL(external_encoder, NumChannels()).WillRepeatedly(Return(1));
   EXPECT_CALL(external_encoder, SetFec(false)).WillRepeatedly(Return(true));
 
   RentACodec rac;
   RentACodec::StackParameters param;
   param.speech_encoder = &external_encoder;
   EXPECT_EQ(&external_encoder, rac.RentEncoderStack(&param));
   const int kPacketSizeSamples = kSampleRateHz / 100;
   int16_t audio[kPacketSizeSamples] = {0};
-  uint8_t encoded[kPacketSizeSamples];
+  rtc::Buffer encoded;
   AudioEncoder::EncodedInfo info;
 
   {
     ::testing::InSequence s;
     info.encoded_timestamp = 0;
     EXPECT_CALL(external_encoder,
                 EncodeInternal(0, rtc::ArrayView<const int16_t>(audio),
-                               arraysize(encoded), encoded))
+                               &encoded))
         .WillOnce(Return(info));
     EXPECT_CALL(external_encoder, Mark("A"));
     EXPECT_CALL(external_encoder, Mark("B"));
     info.encoded_timestamp = 2;
     EXPECT_CALL(external_encoder,
                 EncodeInternal(2, rtc::ArrayView<const int16_t>(audio),
-                               arraysize(encoded), encoded))
+                               &encoded))
         .WillOnce(Return(info));
     EXPECT_CALL(external_encoder, Die());
   }
 
-  info = external_encoder.Encode(0, audio, arraysize(encoded), encoded);
+  info = external_encoder.Encode(0, audio, &encoded);
   EXPECT_EQ(0u, info.encoded_timestamp);
   external_encoder.Mark("A");
 
   // Change to internal encoder.
   CodecInst codec_inst = kDefaultCodecInst;
   codec_inst.pacsize = kPacketSizeSamples;
   param.speech_encoder = rac.RentEncoder(codec_inst);
   ASSERT_TRUE(param.speech_encoder);
   EXPECT_EQ(param.speech_encoder, rac.RentEncoderStack(&param));
 
   // Don't expect any more calls to the external encoder.
-  info = param.speech_encoder->Encode(1, audio, arraysize(encoded), encoded);
+  info = param.speech_encoder->Encode(1, audio, &encoded);
   external_encoder.Mark("B");
 
   // Change back to external encoder again.
   param.speech_encoder = &external_encoder;
   EXPECT_EQ(&external_encoder, rac.RentEncoderStack(&param));
-  info = external_encoder.Encode(2, audio, arraysize(encoded), encoded);
+  info = external_encoder.Encode(2, audio, &encoded);
   EXPECT_EQ(2u, info.encoded_timestamp);
 }
 
 // Verify that the speech encoder's Reset method is called when CNG or RED
 // (or both) are switched on, but not when they're switched off.
 void TestCngAndRedResetSpeechEncoder(bool use_cng, bool use_red) {
   MockAudioEncoder speech_encoder;
   EXPECT_CALL(speech_encoder, NumChannels()).WillRepeatedly(Return(1));
   EXPECT_CALL(speech_encoder, Max10MsFramesInAPacket())
       .WillRepeatedly(Return(2));
@@ skipping 46 matching lines @@
 #if GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 TEST(RentACodecTest, RentEncoderStackWithoutSpeechEncoder) {
   RentACodec::StackParameters sp;
   EXPECT_EQ(nullptr, sp.speech_encoder);
   EXPECT_DEATH(RentACodec().RentEncoderStack(&sp), "");
 }
 #endif
 
 }  // namespace acm2
 }  // namespace webrtc