Pass SdpAudioFormat through Channel, without converting to CodecInst

webrtc/call/audio_receive_stream.h

Index: webrtc/call/audio_receive_stream.h
diff --git a/webrtc/call/audio_receive_stream.h b/webrtc/call/audio_receive_stream.h
index 1299ded4291bdcab67c97cff3a37374189848bc8..3841672595c2d5cfe1a03848e34e51622723157f 100644
--- a/webrtc/call/audio_receive_stream.h
+++ b/webrtc/call/audio_receive_stream.h
@@ -102,11 +102,8 @@ class AudioReceiveStream {
     // stream to one audio stream. Tracked by issue webrtc:4762.
     std::string sync_group;
 
-    // Decoders for every payload that we can receive. Call owns the
-    // AudioDecoder instances once the Config is submitted to
-    // Call::CreateReceiveStream().
-    // TODO(solenberg): Use unique_ptr<> once our std lib fully supports C++11.
-    std::map<uint8_t, AudioDecoder*> decoder_map;
+    // Decoder specifications for every payload type that we can receive.
+    std::map<int, SdpAudioFormat> decoder_map;

[the sun, 2016/12/14 08:58:21]

nit: is decoder_map really the right name nowadays? payload_type_map?

[kwiberg-webrtc, 2016/12/14 13:09:36]

It's a payload type -> decoder specification map, so either of those names could
work. In my mind, it's more important that its a map *to* decoders (or decoder
specs) than that it's a map *from* payload types, so I'm inclined to leave the
name as is.

If you feel strongly about it, I can change it.

 
     rtc::scoped_refptr<AudioDecoderFactory> decoder_factory;
   };