iSAC: Make separate AudioEncoder and AudioDecoder objects

webrtc/modules/audio_coding/codecs/isac/main/source/audio_encoder_isac_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.
  */
 
 #include <limits>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_isac.h"
 
 namespace webrtc {
 
 namespace {
 
-void TestBadConfig(const AudioEncoderDecoderIsac::Config& config) {
+void TestBadConfig(const AudioEncoderIsac::Config& config) {
   EXPECT_FALSE(config.IsOk());
 }
 
-void TestGoodConfig(const AudioEncoderDecoderIsac::Config& config) {
+void TestGoodConfig(const AudioEncoderIsac::Config& config) {
   EXPECT_TRUE(config.IsOk());
-  AudioEncoderDecoderIsac ed(config);
+  AudioEncoderIsac ed(config);

[hlundin-webrtc, 2015/08/10 07:43:33]

Variable name "ed" user to represent "EncoderDecoder", I presume. Change it, and
don't just call it "e". :)

[kwiberg-webrtc, 2015/08/10 10:00:05]

Done. Although I fail to see what harm could come from using a short name like
"e" for a variable that clearly goes out of scope as soon as the current line
ends...

I'd point you to the manifesto of the Short Variable Names Movement, but since
their acronym is just S, they're a bit hard to google and I don't have the link
handy.

 }
 
 // Wrap subroutine calls that test things in this, so that the error messages
 // will be accompanied by stack traces that make it possible to tell which
 // subroutine invocation caused the failure.
 #define S(x) do { SCOPED_TRACE(#x); x; } while (0)
 
 }  // namespace
 
 TEST(AudioEncoderIsacTest, TestConfigBitrate) {
-  AudioEncoderDecoderIsac::Config config;
+  AudioEncoderIsac::Config config;
 
   // The default value is some real, positive value.
   EXPECT_GT(config.bit_rate, 1);
   S(TestGoodConfig(config));
 
   // 0 is another way to ask for the default value.
   config.bit_rate = 0;
   S(TestGoodConfig(config));
 
   // Try some unreasonable values and watch them fail.
   config.bit_rate = -1;
   S(TestBadConfig(config));
   config.bit_rate = 1;
   S(TestBadConfig(config));
   config.bit_rate = std::numeric_limits<int>::max();
   S(TestBadConfig(config));
 }
 
 }  // namespace webrtc