Pass SdpAudioFormat through Channel, without converting to CodecInst

webrtc/media/engine/payload_type_mapper.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
 #include "webrtc/media/engine/payload_type_mapper.h"
 
 #include "webrtc/common_types.h"
 #include "webrtc/media/base/mediaconstants.h"
+#include "webrtc/modules/audio_coding/codecs/audio_format.h"
 
 namespace cricket {
 
+webrtc::SdpAudioFormat AudioCodecToSdpAudioFormat(const AudioCodec& ac) {
+  return webrtc::SdpAudioFormat(ac.name, ac.clockrate, ac.channels, ac.params);
+}
+
 PayloadTypeMapper::PayloadTypeMapper()
     // RFC 3551 reserves payload type numbers in the range 96-127 exclusively
     // for dynamic assignment. Once those are used up, it is recommended that
     // payload types unassigned by the RFC are used for dynamic payload type
     // mapping, before any static payload ids. At this point, we only support
     // mapping within the exclusive range.
     : next_unused_payload_type_(96),
       max_payload_type_(127),
       mappings_({
           // Static payload type assignments according to RFC 3551.
@@ skipping 108 matching lines @@
       if (name_cmp == 0)
         return a.parameters < b.parameters;
       return name_cmp < 0;
     }
     return a.num_channels < b.num_channels;
   }
   return a.clockrate_hz < b.clockrate_hz;
 }
 
 }  // namespace cricket