Remove the type parameter to NetEq::GetAudio

webrtc/modules/audio_coding/neteq/neteq_impl.cc

 /*
  *  Copyright (c) 2012 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 132 matching lines @@
 
   if (error != 0) {
     error_code_ = error;
     return kFail;
   }
   return kOK;
 }
 
 namespace {
 void SetAudioFrameActivityAndType(bool vad_enabled,
-                                  NetEqOutputType type,
+                                  NetEqImpl::OutputType type,
                                   AudioFrame::VADActivity last_vad_activity,
                                   AudioFrame* audio_frame) {
   switch (type) {
-    case kOutputNormal: {
+    case NetEqImpl::OutputType::kNormalSpeech: {
       audio_frame->speech_type_ = AudioFrame::kNormalSpeech;
       audio_frame->vad_activity_ = AudioFrame::kVadActive;
       break;
     }
-    case kOutputVADPassive: {
+    case NetEqImpl::OutputType::kVadPassive: {
       // This should only be reached if the VAD is enabled.
       RTC_DCHECK(vad_enabled);
       audio_frame->speech_type_ = AudioFrame::kNormalSpeech;
       audio_frame->vad_activity_ = AudioFrame::kVadPassive;
       break;
     }
-    case kOutputCNG: {
+    case NetEqImpl::OutputType::kCNG: {
       audio_frame->speech_type_ = AudioFrame::kCNG;
       audio_frame->vad_activity_ = AudioFrame::kVadPassive;
       break;
     }
-    case kOutputPLC: {
+    case NetEqImpl::OutputType::kPLC: {
       audio_frame->speech_type_ = AudioFrame::kPLC;
       audio_frame->vad_activity_ = last_vad_activity;
       break;
     }
-    case kOutputPLCtoCNG: {
+    case NetEqImpl::OutputType::kPLCCNG: {
       audio_frame->speech_type_ = AudioFrame::kPLCCNG;
       audio_frame->vad_activity_ = AudioFrame::kVadPassive;
       break;
     }
     default:
       RTC_NOTREACHED();
   }
   if (!vad_enabled) {
     // Always set kVadUnknown when receive VAD is inactive.
     audio_frame->vad_activity_ = AudioFrame::kVadUnknown;
   }
 }
 }
 
-int NetEqImpl::GetAudio(AudioFrame* audio_frame, NetEqOutputType* type) {
+int NetEqImpl::GetAudio(AudioFrame* audio_frame) {
   TRACE_EVENT0("webrtc", "NetEqImpl::GetAudio");
   rtc::CritScope lock(&crit_sect_);
   int error = GetAudioInternal(audio_frame);
   RTC_DCHECK_EQ(
       audio_frame->sample_rate_hz_,
       rtc::checked_cast<int>(audio_frame->samples_per_channel_ * 100));
   if (error != 0) {
     error_code_ = error;
     return kFail;
   }
-  if (type) {
-    *type = LastOutputType();
-  }
   SetAudioFrameActivityAndType(vad_->enabled(), LastOutputType(),
                                last_vad_activity_, audio_frame);
   last_vad_activity_ = audio_frame->vad_activity_;
   last_output_sample_rate_hz_ = audio_frame->sample_rate_hz_;
   RTC_DCHECK(last_output_sample_rate_hz_ == 8000 ||
              last_output_sample_rate_hz_ == 16000 ||
              last_output_sample_rate_hz_ == 32000 ||
              last_output_sample_rate_hz_ == 48000)
       << "Unexpected sample rate " << last_output_sample_rate_hz_;
   return kOK;
@@ skipping 1843 matching lines @@
   }
 
   // Create DecisionLogic if it is not created yet, then communicate new sample
   // rate and output size to DecisionLogic object.
   if (!decision_logic_.get()) {
     CreateDecisionLogic();
   }
   decision_logic_->SetSampleRate(fs_hz_, output_size_samples_);
 }
 
-NetEqOutputType NetEqImpl::LastOutputType() {
+NetEqImpl::OutputType NetEqImpl::LastOutputType() {
   assert(vad_.get());
   assert(expand_.get());
   if (last_mode_ == kModeCodecInternalCng || last_mode_ == kModeRfc3389Cng) {
-    return kOutputCNG;
+    return OutputType::kCNG;
   } else if (last_mode_ == kModeExpand && expand_->MuteFactor(0) == 0) {
     // Expand mode has faded down to background noise only (very long expand).
-    return kOutputPLCtoCNG;
+    return OutputType::kPLCCNG;
   } else if (last_mode_ == kModeExpand) {
-    return kOutputPLC;
+    return OutputType::kPLC;
   } else if (vad_->running() && !vad_->active_speech()) {
-    return kOutputVADPassive;
+    return OutputType::kVadPassive;
   } else {
-    return kOutputNormal;
+    return OutputType::kNormalSpeech;
   }
 }
 
 void NetEqImpl::CreateDecisionLogic() {
   decision_logic_.reset(DecisionLogic::Create(fs_hz_, output_size_samples_,
                                               playout_mode_,
                                               decoder_database_.get(),
                                               *packet_buffer_.get(),
                                               delay_manager_.get(),
                                               buffer_level_filter_.get()));
 }
 }  // namespace webrtc