NetEq decoder database: Don't keep track of sample rate for builtin decoders

webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc

 /*
  *  Copyright (c) 2013 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 13 matching lines @@
 namespace webrtc {
 
 using ::testing::_;
 using ::testing::Return;
 
 class NetEqExternalDecoderUnitTest : public test::NetEqExternalDecoderTest {
  protected:
   static const int kFrameSizeMs = 10;  // Frame size of Pcm16B.
 
   NetEqExternalDecoderUnitTest(NetEqDecoder codec,
+                               int sample_rate_hz,
                                MockExternalPcm16B* decoder)
-      : NetEqExternalDecoderTest(codec, decoder),
+      : NetEqExternalDecoderTest(codec, sample_rate_hz, decoder),
         external_decoder_(decoder),
-        samples_per_ms_(CodecSampleRateHz(codec) / 1000),
+        samples_per_ms_(sample_rate_hz / 1000),
         frame_size_samples_(kFrameSizeMs * samples_per_ms_),
         rtp_generator_(new test::RtpGenerator(samples_per_ms_)),
         input_(new int16_t[frame_size_samples_]),
         // Payload should be no larger than input.
         encoded_(new uint8_t[2 * frame_size_samples_]),
         payload_size_bytes_(0),
         last_send_time_(0),
         last_arrival_time_(0) {
     // NetEq is not allowed to delete the external decoder (hence Times(0)).
     EXPECT_CALL(*external_decoder_, Die()).Times(0);
@@ skipping 118 matching lines @@
 // the decoder object, while the second one uses an externally created decoder
 // object (ExternalPcm16B wrapped in MockExternalPcm16B, both defined above).
 // The test verifies that the output from both instances match.
 class NetEqExternalVsInternalDecoderTest : public NetEqExternalDecoderUnitTest,
                                            public ::testing::Test {
  protected:
   static const size_t kMaxBlockSize = 480;  // 10 ms @ 48 kHz.
 
   NetEqExternalVsInternalDecoderTest()
       : NetEqExternalDecoderUnitTest(NetEqDecoder::kDecoderPCM16Bswb32kHz,
+                                     32000,
                                      new MockExternalPcm16B),
-        sample_rate_hz_(
-            CodecSampleRateHz(NetEqDecoder::kDecoderPCM16Bswb32kHz)) {
+        sample_rate_hz_(32000) {
     NetEq::Config config;
-    config.sample_rate_hz =
-        CodecSampleRateHz(NetEqDecoder::kDecoderPCM16Bswb32kHz);
+    config.sample_rate_hz = sample_rate_hz_;
     neteq_internal_.reset(
         NetEq::Create(config, CreateBuiltinAudioDecoderFactory()));
   }
 
   void SetUp() override {
     ASSERT_EQ(NetEq::kOK, neteq_internal_->RegisterPayloadType(
                               NetEqDecoder::kDecoderPCM16Bswb32kHz,
                               "pcm16-swb32", kPayloadType));
   }
 
@@ skipping 48 matching lines @@
   enum TestStates {
     kInitialPhase,
     kNormalPhase,
     kExpandPhase,
     kFadedExpandPhase,
     kRecovered
   };
 
   LargeTimestampJumpTest()
       : NetEqExternalDecoderUnitTest(NetEqDecoder::kDecoderPCM16B,
+                                     8000,
                                      new MockExternalPcm16B),
         test_state_(kInitialPhase) {
     EXPECT_CALL(*external_decoder(), HasDecodePlc())
         .WillRepeatedly(Return(false));
   }
 
   virtual void UpdateState(AudioFrame::SpeechType output_type) {
     switch (test_state_) {
       case kInitialPhase: {
         if (output_type == AudioFrame::kNormalSpeech) {
@@ skipping 185 matching lines @@
                                                         kStartSeqeunceNumber,
                                                         kStartTimestamp,
                                                         kJumpFromTimestamp,
                                                         kJumpToTimestamp));
 
   RunTest(130);  // Run 130 laps @ 10 ms each in the test loop.
   EXPECT_EQ(kRecovered, test_state_);
 }
 
 }  // namespace webrtc