Pass audio to AudioEncoder::Encode() in an ArrayView

webrtc/modules/audio_coding/main/acm2/codec_owner_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 28 matching lines @@
     ASSERT_TRUE(
         codec_owner_.SetEncoders(kDefaultCodecInst, kCngPt, VADNormal, -1));
   }
 
   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];
     AudioEncoder::EncodedInfo encoded_info;
-    encoded_info = codec_owner_.Encoder()->Encode(
-        timestamp_, kZeroData, kDataLengthSamples, kPacketSizeSamples, out);
+    encoded_info = codec_owner_.Encoder()->Encode(timestamp_, kZeroData,
+                                                  kPacketSizeSamples, 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 78 matching lines @@
 TEST_F(CodecOwnerTest, ExternalEncoder) {
   MockAudioEncoder external_encoder;
   codec_owner_.SetEncoders(&external_encoder, -1, VADNormal, -1);
   const int kSampleRateHz = 8000;
   const int kPacketSizeSamples = kSampleRateHz / 100;
   int16_t audio[kPacketSizeSamples] = {0};
   uint8_t encoded[kPacketSizeSamples];
   AudioEncoder::EncodedInfo info;
   EXPECT_CALL(external_encoder, SampleRateHz())
       .WillRepeatedly(Return(kSampleRateHz));
+  EXPECT_CALL(external_encoder, NumChannels()).WillRepeatedly(Return(1));
 
   {
     InSequence s;
     info.encoded_timestamp = 0;
     EXPECT_CALL(external_encoder,
-                EncodeInternal(0, audio, arraysize(encoded), encoded))
+                EncodeInternal(0, rtc::ArrayView<const int16_t>(audio),
+                               arraysize(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, audio, arraysize(encoded), encoded))
+                EncodeInternal(2, rtc::ArrayView<const int16_t>(audio),
+                               arraysize(encoded), encoded))
         .WillOnce(Return(info));
     EXPECT_CALL(external_encoder, Die());
   }
 
-  info = codec_owner_.Encoder()->Encode(0, audio, arraysize(audio),
-                                        arraysize(encoded), encoded);
+  info = codec_owner_.Encoder()->Encode(0, audio, arraysize(encoded), encoded);
   EXPECT_EQ(0u, info.encoded_timestamp);
   external_encoder.Mark("A");
 
   // Change to internal encoder.
   CodecInst codec_inst = kDefaultCodecInst;
   codec_inst.pacsize = kPacketSizeSamples;
   ASSERT_TRUE(codec_owner_.SetEncoders(codec_inst, -1, VADNormal, -1));
   // Don't expect any more calls to the external encoder.
-  info = codec_owner_.Encoder()->Encode(1, audio, arraysize(audio),
-                                        arraysize(encoded), encoded);
+  info = codec_owner_.Encoder()->Encode(1, audio, arraysize(encoded), encoded);
   external_encoder.Mark("B");
 
   // Change back to external encoder again.
   codec_owner_.SetEncoders(&external_encoder, -1, VADNormal, -1);
-  info = codec_owner_.Encoder()->Encode(2, audio, arraysize(audio),
-                                        arraysize(encoded), encoded);
+  info = codec_owner_.Encoder()->Encode(2, audio, arraysize(encoded), encoded);
   EXPECT_EQ(2u, info.encoded_timestamp);
 }
 
 TEST_F(CodecOwnerTest, CngResetsSpeechEncoder) {
   TestCngAndRedResetSpeechEncoder(true, false);
 }
 
 TEST_F(CodecOwnerTest, RedResetsSpeechEncoder) {
   TestCngAndRedResetSpeechEncoder(false, true);
 }
 
 TEST_F(CodecOwnerTest, CngAndRedResetsSpeechEncoder) {
   TestCngAndRedResetSpeechEncoder(true, true);
 }
 
 TEST_F(CodecOwnerTest, NoCngAndRedNoSpeechEncoderReset) {
   TestCngAndRedResetSpeechEncoder(false, false);
 }
 
 TEST_F(CodecOwnerTest, SetEncodersError) {
   CodecInst codec_inst = kDefaultCodecInst;
   static const char bad_name[] = "Robert'); DROP TABLE Students;";
   std::memcpy(codec_inst.plname, bad_name, sizeof bad_name);
   EXPECT_FALSE(codec_owner_.SetEncoders(codec_inst, -1, VADNormal, -1));
 }
 
 }  // namespace acm2
 }  // namespace webrtc