Simple cleanups of AudioDecoder and AudioEncoder classes

webrtc/modules/audio_coding/neteq/neteq_network_stats_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 "testing/gmock/include/gmock/gmock.h"
 #include "webrtc/base/scoped_ptr.h"
-#include "webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h"
 #include "webrtc/modules/audio_coding/neteq/tools/neteq_external_decoder_test.h"
 #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
 
 namespace webrtc {
 namespace test {
 
 using ::testing::_;
 using ::testing::SetArgPointee;
 using ::testing::Return;
 
-
-class MockAudioDecoderOpus : public AudioDecoderOpus {
+class MockAudioDecoder final : public AudioDecoder {
  public:
   static const int kPacketDuration = 960;  // 48 kHz * 20 ms
 
-  explicit MockAudioDecoderOpus(int num_channels)
-      : AudioDecoderOpus(num_channels),
-        fec_enabled_(false) {
+  explicit MockAudioDecoder(size_t num_channels)
+      : num_channels_(num_channels), fec_enabled_(false) {
   }
-  virtual ~MockAudioDecoderOpus() { Die(); }
+  ~MockAudioDecoder() override { Die(); }
   MOCK_METHOD0(Die, void());
 
   MOCK_METHOD0(Reset, void());
 
   int PacketDuration(const uint8_t* encoded,
                      size_t encoded_len) const override {
     return kPacketDuration;
   }
 
   int PacketDurationRedundant(const uint8_t* encoded,
                               size_t encoded_len) const override {
     return kPacketDuration;
   }
 
   bool PacketHasFec(const uint8_t* encoded, size_t encoded_len) const override {
     return fec_enabled_;
   }
 
+  size_t Channels() const override { return num_channels_; }
+
   void set_fec_enabled(bool enable_fec) { fec_enabled_ = enable_fec; }
 
   bool fec_enabled() const { return fec_enabled_; }
 
  protected:
   // Override the following methods such that no actual payload is needed.
   int DecodeInternal(const uint8_t* encoded,
                      size_t encoded_len,
                      int /*sample_rate_hz*/,
                      int16_t* decoded,
                      SpeechType* speech_type) override {
     *speech_type = kSpeech;
     memset(decoded, 0, sizeof(int16_t) * kPacketDuration * Channels());
     return kPacketDuration * Channels();
   }
 
   int DecodeRedundantInternal(const uint8_t* encoded,
                               size_t encoded_len,
                               int sample_rate_hz,
                               int16_t* decoded,
                               SpeechType* speech_type) override {
     return DecodeInternal(encoded, encoded_len, sample_rate_hz, decoded,
                           speech_type);
   }
 
  private:
+  const size_t num_channels_;
   bool fec_enabled_;
 };
 
 class NetEqNetworkStatsTest : public NetEqExternalDecoderTest {
  public:
   static const int kPayloadSizeByte = 30;
-  static const int kFrameSizeMs = 20;  // frame size of Opus
+  static const int kFrameSizeMs = 20;
   static const int kMaxOutputSize = 960;  // 10 ms * 48 kHz * 2 channels.
 
 enum logic {
   IGNORE,
   EQUAL,
   SMALLER_THAN,
   LARGER_THAN,
 };
 
 struct NetEqNetworkStatsCheck {
   logic current_buffer_size_ms;
   logic preferred_buffer_size_ms;
   logic jitter_peaks_found;
   logic packet_loss_rate;
   logic packet_discard_rate;
   logic expand_rate;
   logic speech_expand_rate;
   logic preemptive_rate;
   logic accelerate_rate;
   logic secondary_decoded_rate;
   logic clockdrift_ppm;
   logic added_zero_samples;
   NetEqNetworkStatistics stats_ref;
 };
 
   NetEqNetworkStatsTest(NetEqDecoder codec,
-                        MockAudioDecoderOpus* decoder)
+                        MockAudioDecoder* decoder)
       : NetEqExternalDecoderTest(codec, decoder),
         external_decoder_(decoder),
         samples_per_ms_(CodecSampleRateHz(codec) / 1000),
         frame_size_samples_(kFrameSizeMs * samples_per_ms_),
         rtp_generator_(new test::RtpGenerator(samples_per_ms_)),
         last_lost_time_(0),
         packet_loss_interval_(0xffffffff) {
     Init();
   }
 
@@ skipping 98 matching lines @@
       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
     };
     RunTest(50, expects);
 
     // Next we introduce packet losses.
     SetPacketLossRate(0.1);
     expects.stats_ref.packet_loss_rate = 1337;
     expects.stats_ref.expand_rate = expects.stats_ref.speech_expand_rate = 1065;
     RunTest(50, expects);
 
-    // Next we enable Opus FEC.
+    // Next we enable FEC.
     external_decoder_->set_fec_enabled(true);
     // If FEC fills in the lost packets, no packet loss will be counted.
     expects.stats_ref.packet_loss_rate = 0;
     expects.stats_ref.expand_rate = expects.stats_ref.speech_expand_rate = 0;
     expects.stats_ref.secondary_decoded_rate = 2006;
     RunTest(50, expects);
   }
 
   void NoiseExpansionTest() {
     NetEqNetworkStatsCheck expects = {
@@ skipping 13 matching lines @@
     };
     RunTest(50, expects);
 
     SetPacketLossRate(1);
     expects.stats_ref.expand_rate = 16384;
     expects.stats_ref.speech_expand_rate = 5324;
     RunTest(10, expects);  // Lost 10 * 20ms in a row.
   }
 
  private:
-  MockAudioDecoderOpus* external_decoder_;
+  MockAudioDecoder* external_decoder_;
   const int samples_per_ms_;
   const size_t frame_size_samples_;
   rtc::scoped_ptr<test::RtpGenerator> rtp_generator_;
   WebRtcRTPHeader rtp_header_;
   uint32_t last_lost_time_;
   uint32_t packet_loss_interval_;
   uint8_t payload_[kPayloadSizeByte];
   int16_t output_[kMaxOutputSize];
 };
 
-TEST(NetEqNetworkStatsTest, OpusDecodeFec) {
-  MockAudioDecoderOpus decoder(1);
+TEST(NetEqNetworkStatsTest, DecodeFec) {
+  MockAudioDecoder decoder(1);
   NetEqNetworkStatsTest test(kDecoderOpus, &decoder);
   test.DecodeFecTest();
   EXPECT_CALL(decoder, Die()).Times(1);
 }
 
-TEST(NetEqNetworkStatsTest, StereoOpusDecodeFec) {
-  MockAudioDecoderOpus decoder(2);
+TEST(NetEqNetworkStatsTest, StereoDecodeFec) {
+  MockAudioDecoder decoder(2);
   NetEqNetworkStatsTest test(kDecoderOpus, &decoder);
   test.DecodeFecTest();
   EXPECT_CALL(decoder, Die()).Times(1);
 }
 
 TEST(NetEqNetworkStatsTest, NoiseExpansionTest) {
-  MockAudioDecoderOpus decoder(1);
+  MockAudioDecoder decoder(1);
   NetEqNetworkStatsTest test(kDecoderOpus, &decoder);
   test.NoiseExpansionTest();
   EXPECT_CALL(decoder, Die()).Times(1);
 }
 
 }  // namespace test
 }  // namespace webrtc