Reland "WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType"

webrtc/modules/audio_coding/neteq/decoder_database.h

 /*
  *  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 131 matching lines @@
   virtual bool Empty() const;
 
   // Returns the number of decoders registered in the database.
   virtual int Size() const;
 
   // Resets the database, erasing all registered payload types, and deleting
   // any AudioDecoder objects that were not externally created and inserted
   // using InsertExternal().
   virtual void Reset();
 
+  // Replaces the existing set of decoders with the given set. Returns the
+  // payload types that were reassigned or removed while doing so.
+  virtual std::vector<int> SetCodecs(
+      const std::map<int, SdpAudioFormat>& codecs);
+
   // Registers |rtp_payload_type| as a decoder of type |codec_type|. The |name|
   // is only used to populate the name field in the DecoderInfo struct in the
   // database, and can be arbitrary (including empty). Returns kOK on success;
   // otherwise an error code.
   virtual int RegisterPayload(uint8_t rtp_payload_type,
                               NetEqDecoder codec_type,
                               const std::string& name);
 
   // Registers a decoder for the given payload type. Returns kOK on success;
   // otherwise an error code.
@@ skipping 70 matching lines @@
   int active_decoder_type_;
   int active_cng_decoder_type_;
   mutable std::unique_ptr<ComfortNoiseDecoder> active_cng_decoder_;
   rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(DecoderDatabase);
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECODER_DATABASE_H_