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..bf03ecdd6416c8f53957973929bc6799aa5e1026 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;
+    // Decoders for every payload that we can receive.

[the sun, 2016/12/08 10:53:52]

nit: "Decoders" is not strictly true ... "Formats"?

[kwiberg-webrtc, 2016/12/09 02:39:01]

I picked "decoder specifications".

+    std::map<int, SdpAudioFormat> decoder_map;
 
     rtc::scoped_refptr<AudioDecoderFactory> decoder_factory;
   };