Move the FEC enabling logic from CodecManager to Rent-A-Codec

webrtc/modules/audio_coding/main/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 83 matching lines @@
 
   // Verify NoEncoding.
   expected_timestamp += 2 * kDataLengthSamples;
   {
     SCOPED_TRACE("Fourth encoding");
     EncodeAndVerify(0, expected_timestamp, kCngPt, 1);
   }
 }
 
 TEST(RentACodecTest, ExternalEncoder) {
+  const int kSampleRateHz = 8000;
   MockAudioEncoder external_encoder;
+  EXPECT_CALL(external_encoder, SampleRateHz())
+      .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;
   EXPECT_EQ(&external_encoder, rac.RentEncoderStack(&external_encoder, &param));
-  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));
 
   {
     ::testing::InSequence s;
     info.encoded_timestamp = 0;
     EXPECT_CALL(external_encoder,
                 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"));
@@ skipping 27 matching lines @@
 }
 
 // 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));
   EXPECT_CALL(speech_encoder, SampleRateHz()).WillRepeatedly(Return(8000));
+  EXPECT_CALL(speech_encoder, SetFec(false)).WillRepeatedly(Return(true));
   {
     ::testing::InSequence s;
     EXPECT_CALL(speech_encoder, Mark("disabled"));
     EXPECT_CALL(speech_encoder, Mark("enabled"));
     if (use_cng || use_red)
       EXPECT_CALL(speech_encoder, Reset());
     EXPECT_CALL(speech_encoder, Die());
   }
 
   RentACodec::StackParameters param1, param2;
@@ skipping 24 matching lines @@
 
 TEST(RentACodecTest, RentEncoderError) {
   const CodecInst codec_inst = {
       0, "Robert'); DROP TABLE Students;", 8000, 160, 1, 64000};
   RentACodec rent_a_codec;
   EXPECT_FALSE(rent_a_codec.RentEncoder(codec_inst));
 }
 
 }  // namespace acm2
 }  // namespace webrtc