Revert of AcmReceiver::DecoderByPayloadType: Ask NetEq for decoder

webrtc/modules/audio_coding/acm2/acm_receiver.cc

Index: webrtc/modules/audio_coding/acm2/acm_receiver.cc
diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.cc b/webrtc/modules/audio_coding/acm2/acm_receiver.cc
index 042e8c9f38f3c47356942f87ac4f64438756ada5..b89091f3626374d8f3fe0693c5437f8b2e989d2e 100644
--- a/webrtc/modules/audio_coding/acm2/acm_receiver.cc
+++ b/webrtc/modules/audio_coding/acm2/acm_receiver.cc
@@ -314,15 +314,19 @@
 int AcmReceiver::DecoderByPayloadType(uint8_t payload_type,
                                       CodecInst* codec) const {
   rtc::CritScope lock(&crit_sect_);
-  const rtc::Optional<CodecInst> ci = neteq_->GetDecoder(payload_type);
-  if (ci) {
-    *codec = *ci;
-    return 0;
-  } else {
+  auto it = decoders_.find(payload_type);
+  if (it == decoders_.end()) {
     LOG(LERROR) << "AcmReceiver::DecoderByPayloadType "
                 << static_cast<int>(payload_type);
     return -1;
   }
+  const Decoder& decoder = it->second;
+  *codec = *RentACodec::CodecInstById(
+      *RentACodec::CodecIdFromIndex(decoder.acm_codec_id));
+  codec->pltype = decoder.payload_type;
+  codec->channels = decoder.channels;
+  codec->plfreq = decoder.sample_rate_hz;
+  return 0;
 }
 
 int AcmReceiver::EnableNack(size_t max_nack_list_size) {