Revert of WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType

webrtc/modules/audio_coding/neteq/decoder_database.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 105 matching lines @@
 bool DecoderDatabase::Empty() const { return decoders_.empty(); }
 
 int DecoderDatabase::Size() const { return static_cast<int>(decoders_.size()); }
 
 void DecoderDatabase::Reset() {
   decoders_.clear();
   active_decoder_type_ = -1;
   active_cng_decoder_type_ = -1;
 }
 
-std::vector<int> DecoderDatabase::SetCodecs(
-    const std::map<int, SdpAudioFormat>& codecs) {
-  // First collect all payload types that we'll remove or reassign, then remove
-  // them from the database.
-  std::vector<int> changed_payload_types;
-  for (const std::pair<uint8_t, const DecoderInfo&> kv : decoders_) {
-    auto i = codecs.find(kv.first);
-    if (i == codecs.end() || i->second != kv.second.GetFormat()) {
-      changed_payload_types.push_back(kv.first);
-    }
-  }
-  for (int pl_type : changed_payload_types) {
-    Remove(pl_type);
-  }
-
-  // Enter the new and changed payload type mappings into the database.
-  for (const auto& kv : codecs) {
-    const int& rtp_payload_type = kv.first;
-    const SdpAudioFormat& audio_format = kv.second;
-    RTC_DCHECK_GE(rtp_payload_type, 0);
-    RTC_DCHECK_LE(rtp_payload_type, 0x7f);
-    if (decoders_.count(rtp_payload_type) == 0) {
-      decoders_.insert(std::make_pair(
-          rtp_payload_type, DecoderInfo(audio_format, decoder_factory_.get())));
-    } else {
-      // The mapping for this payload type hasn't changed.
-    }
-  }
-
-  return changed_payload_types;
-}
-
 int DecoderDatabase::RegisterPayload(uint8_t rtp_payload_type,
                                      NetEqDecoder codec_type,
                                      const std::string& name) {
   if (rtp_payload_type > 0x7F) {
     return kInvalidRtpPayloadType;
   }
   // kCodecArbitrary is only supported through InsertExternal.
   if (codec_type == NetEqDecoder::kDecoderArbitrary ||
       !CodecSupported(codec_type)) {
     return kCodecNotSupported;
@@ skipping 178 matching lines @@
       // Payload type is not found.
       LOG(LS_WARNING) << "CheckPayloadTypes: unknown RTP payload type "
                       << static_cast<int>(it->payload_type);
       return kDecoderNotFound;
     }
   }
   return kOK;
 }
 
 }  // namespace webrtc