iSAC: Make separate AudioEncoder and AudioDecoder objects

webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc

Index: webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
index d54fbe9099a50a86b427b0fcecc8b6b26df8ec56..3983c077010383185a1de8ae1ff280840aa11eb8 100644
--- a/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc
@@ -358,17 +358,14 @@ class AudioDecoderIsacFloatTest : public AudioDecoderTest {
     codec_input_rate_hz_ = 16000;
     frame_size_ = 480;
     data_length_ = 10 * frame_size_;
-    AudioEncoderDecoderIsac::Config config;
+    AudioEncoderIsac::Config config;
     config.payload_type = payload_type_;
     config.sample_rate_hz = codec_input_rate_hz_;
     config.adaptive_mode = false;
     config.frame_size_ms =
         1000 * static_cast<int>(frame_size_) / codec_input_rate_hz_;
-
-    // We need to create separate AudioEncoderDecoderIsac objects for encoding
-    // and decoding, because the test class destructor destroys them both.
-    audio_encoder_.reset(new AudioEncoderDecoderIsac(config));
-    decoder_ = new AudioEncoderDecoderIsac(config);
+    audio_encoder_.reset(new AudioEncoderIsac(config));
+    decoder_ = new AudioDecoderIsac();
   }
 };
 
@@ -378,17 +375,14 @@ class AudioDecoderIsacSwbTest : public AudioDecoderTest {
     codec_input_rate_hz_ = 32000;
     frame_size_ = 960;
     data_length_ = 10 * frame_size_;
-    AudioEncoderDecoderIsac::Config config;
+    AudioEncoderIsac::Config config;
     config.payload_type = payload_type_;
     config.sample_rate_hz = codec_input_rate_hz_;
     config.adaptive_mode = false;
     config.frame_size_ms =
         1000 * static_cast<int>(frame_size_) / codec_input_rate_hz_;
-
-    // We need to create separate AudioEncoderDecoderIsac objects for encoding
-    // and decoding, because the test class destructor destroys them both.
-    audio_encoder_.reset(new AudioEncoderDecoderIsac(config));
-    decoder_ = new AudioEncoderDecoderIsac(config);
+    audio_encoder_.reset(new AudioEncoderIsac(config));
+    decoder_ = new AudioDecoderIsac();
   }
 };
 
@@ -398,18 +392,14 @@ class AudioDecoderIsacFixTest : public AudioDecoderTest {
     codec_input_rate_hz_ = 16000;
     frame_size_ = 480;
     data_length_ = 10 * frame_size_;
-    AudioEncoderDecoderIsacFix::Config config;
+    AudioEncoderIsacFix::Config config;
     config.payload_type = payload_type_;
     config.sample_rate_hz = codec_input_rate_hz_;
     config.adaptive_mode = false;
     config.frame_size_ms =
         1000 * static_cast<int>(frame_size_) / codec_input_rate_hz_;
-
-    // We need to create separate AudioEncoderDecoderIsacFix objects for
-    // encoding and decoding, because the test class destructor destroys them
-    // both.
-    audio_encoder_.reset(new AudioEncoderDecoderIsacFix(config));
-    decoder_ = new AudioEncoderDecoderIsacFix(config);
+    audio_encoder_.reset(new AudioEncoderIsacFix(config));
+    decoder_ = new AudioDecoderIsacFix();
   }
 };