Remove the type parameter to NetEq::GetAudio

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 170 matching lines @@
     neteq_internal_.reset(NetEq::Create(config));
   }
 
   void SetUp() override {
     ASSERT_EQ(NetEq::kOK, neteq_internal_->RegisterPayloadType(
                               NetEqDecoder::kDecoderPCM16Bswb32kHz,
                               "pcm16-swb32", kPayloadType));
   }
 
   void GetAndVerifyOutput() override {
-    NetEqOutputType output_type;
     // Get audio from internal decoder instance.
-    EXPECT_EQ(NetEq::kOK,
-              neteq_internal_->GetAudio(&output_internal_, &output_type));
+    EXPECT_EQ(NetEq::kOK, neteq_internal_->GetAudio(&output_internal_));
     EXPECT_EQ(1u, output_internal_.num_channels_);
     EXPECT_EQ(static_cast<size_t>(kOutputLengthMs * sample_rate_hz_ / 1000),
               output_internal_.samples_per_channel_);
 
     // Get audio from external decoder instance.
-    GetOutputAudio(&output_, &output_type);
+    GetOutputAudio(&output_);
 
     for (size_t i = 0; i < output_.samples_per_channel_; ++i) {
       ASSERT_EQ(output_.data_[i], output_internal_.data_[i])
           << "Diff in sample " << i << ".";
     }
   }
 
   void InsertPacket(WebRtcRTPHeader rtp_header,
                     rtc::ArrayView<const uint8_t> payload,
                     uint32_t receive_timestamp) override {
@@ skipping 33 matching lines @@
   };
 
   LargeTimestampJumpTest()
       : NetEqExternalDecoderUnitTest(NetEqDecoder::kDecoderPCM16B,
                                      new MockExternalPcm16B),
         test_state_(kInitialPhase) {
     EXPECT_CALL(*external_decoder(), HasDecodePlc())
         .WillRepeatedly(Return(false));
   }
 
-  virtual void UpdateState(NetEqOutputType output_type) {
+  virtual void UpdateState(AudioFrame::SpeechType output_type) {
     switch (test_state_) {
       case kInitialPhase: {
-        if (output_type == kOutputNormal) {
+        if (output_type == AudioFrame::kNormalSpeech) {
           test_state_ = kNormalPhase;
         }
         break;
       }
       case kNormalPhase: {
-        if (output_type == kOutputPLC) {
+        if (output_type == AudioFrame::kPLC) {
           test_state_ = kExpandPhase;
         }
         break;
       }
       case kExpandPhase: {
-        if (output_type == kOutputPLCtoCNG) {
+        if (output_type == AudioFrame::kPLCCNG) {
           test_state_ = kFadedExpandPhase;
-        } else if (output_type == kOutputNormal) {
+        } else if (output_type == AudioFrame::kNormalSpeech) {
           test_state_ = kRecovered;
         }
         break;
       }
       case kFadedExpandPhase: {
-        if (output_type == kOutputNormal) {
+        if (output_type == AudioFrame::kNormalSpeech) {
           test_state_ = kRecovered;
         }
         break;
       }
       case kRecovered: {
         break;
       }
     }
   }
 
   void GetAndVerifyOutput() override {
     AudioFrame output;
-    NetEqOutputType output_type;
-    GetOutputAudio(&output, &output_type);
-    UpdateState(output_type);
+    GetOutputAudio(&output);
+    UpdateState(output.speech_type_);
 
     if (test_state_ == kExpandPhase || test_state_ == kFadedExpandPhase) {
       // Don't verify the output in this phase of the test.
       return;
     }
 
     ASSERT_EQ(1u, output.num_channels_);
     for (size_t i = 0; i < output.samples_per_channel_; ++i) {
       if (output.data_[i] != 0)
         return;
@@ skipping 59 matching lines @@
                                                         kStartTimestamp,
                                                         kJumpFromTimestamp,
                                                         kJumpToTimestamp));
 
   RunTest(130);  // Run 130 laps @ 10 ms each in the test loop.
   EXPECT_EQ(kRecovered, test_state_);
 }
 
 class ShortTimestampJumpTest : public LargeTimestampJumpTest {
  protected:
-  void UpdateState(NetEqOutputType output_type) override {
+  void UpdateState(AudioFrame::SpeechType output_type) override {
     switch (test_state_) {
       case kInitialPhase: {
-        if (output_type == kOutputNormal) {
+        if (output_type == AudioFrame::kNormalSpeech) {
           test_state_ = kNormalPhase;
         }
         break;
       }
       case kNormalPhase: {
-        if (output_type == kOutputPLC) {
+        if (output_type == AudioFrame::kPLC) {
           test_state_ = kExpandPhase;
         }
         break;
       }
       case kExpandPhase: {
-        if (output_type == kOutputNormal) {
+        if (output_type == AudioFrame::kNormalSpeech) {
           test_state_ = kRecovered;
         }
         break;
       }
       case kRecovered: {
         break;
       }
       default: { FAIL(); }
     }
   }
@@ skipping 46 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