Stopped using the NetEqDecoder enum internally in NetEq.

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 439 matching lines @@
   rtc::MsanMarkUninitialized(rtc::MakeArrayView(&ci, 1));
   ci.pltype = payload_type;
   std::strncpy(ci.plname, di->name.c_str(), sizeof(ci.plname));
   ci.plname[sizeof(ci.plname) - 1] = '\0';
   ci.plfreq = di->IsRed() || di->IsDtmf() ? 8000 : di->SampleRateHz();
   AudioDecoder* const decoder = di->GetDecoder();
   ci.channels = decoder ? decoder->Channels() : 1;
   return rtc::Optional<CodecInst>(ci);
 }
 
-const SdpAudioFormat* NetEqImpl::GetDecoderFormat(int payload_type) const {
+rtc::Optional<SdpAudioFormat> NetEqImpl::GetDecoderFormat(
+    int payload_type) const {
   rtc::CritScope lock(&crit_sect_);
   const DecoderDatabase::DecoderInfo* const di =
       decoder_database_->GetDecoderInfo(payload_type);
   if (!di) {
-    return nullptr;  // Payload type not registered.
+    return rtc::Optional<SdpAudioFormat>();  // Payload type not registered.
   }
-  // This will return null if the payload type was registered without an
-  // SdpAudioFormat.
-  return di->GetFormat();
+  return rtc::Optional<SdpAudioFormat>(di->GetFormat());
 }
 
 int NetEqImpl::SetTargetNumberOfChannels() {
   return kNotImplemented;
 }
 
 int NetEqImpl::SetTargetSampleRate() {
   return kNotImplemented;
 }
 
@@ skipping 294 matching lines @@
       RTC_DCHECK(nack_);
       // Update the sample rate even if the rate is not new, because of Reset().
       nack_->UpdateSampleRate(fs_hz_);
     }
   }
 
   // TODO(hlundin): Move this code to DelayManager class.
   const DecoderDatabase::DecoderInfo* dec_info =
           decoder_database_->GetDecoderInfo(main_header.payloadType);
   assert(dec_info);  // Already checked that the payload type is known.
-  delay_manager_->LastDecoderType(dec_info->codec_type);
+  delay_manager_->LastDecodedWasCngOrDtmf(dec_info->IsComfortNoise() ||
+                                          dec_info->IsDtmf());
   if (delay_manager_->last_pack_cng_or_dtmf() == 0) {
     // Calculate the total speech length carried in each packet.
     const size_t buffer_length_after_insert =
         packet_buffer_->NumPacketsInBuffer();
 
     if (buffer_length_after_insert > buffer_length_before_insert) {
       const size_t packet_length_samples =
           (buffer_length_after_insert - buffer_length_before_insert) *
           decoder_frame_length_;
       if (packet_length_samples != decision_logic_->packet_length_samples()) {
@@ skipping 1314 matching lines @@
   }
 }
 
 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(),
       tick_timer_.get()));
 }
 }  // namespace webrtc