Let CreateVideoDecoder take a cricket::VideoCodec.

webrtc/media/engine/webrtcvideoengine.cc

 /*
  *  Copyright (c) 2014 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 2159 matching lines @@
   }
 }
 
 WebRtcVideoChannel::WebRtcVideoReceiveStream::AllocatedDecoder
 WebRtcVideoChannel::WebRtcVideoReceiveStream::CreateOrReuseVideoDecoder(
     std::vector<AllocatedDecoder>* old_decoders,
     const VideoCodec& codec) {
   webrtc::VideoCodecType type = webrtc::PayloadNameToCodecType(codec.name);
 
   for (size_t i = 0; i < old_decoders->size(); ++i) {
     if ((*old_decoders)[i].type == type) {

[magjed_webrtc, 2017/08/24 08:59:39]

This caching looks like a problem as well. I think we need to base it on
|codec|, otherwise if an external factory has many different custom codecs, they
will all be mapped to Generic here.

I think it would be enough to store cricket::VideoCodec instead of
webrtc::VideoCodecType in AllocatedDecoder and compare the codecs with '=='.
It's an independent change and probably best to fix it in a separate CL.

[kthelgason, 2017/08/24 10:49:47]

I spotted this as well but decided to fix it in a separate CL.

       AllocatedDecoder decoder = (*old_decoders)[i];
       (*old_decoders)[i] = old_decoders->back();
       old_decoders->pop_back();
       return decoder;
     }
   }
 
   if (external_decoder_factory_ != NULL) {
     webrtc::VideoDecoder* decoder =
         external_decoder_factory_->CreateVideoDecoderWithParams(
-            type, {stream_params_.id});
+            codec, {stream_params_.id});
     if (decoder != NULL) {
       return AllocatedDecoder(decoder, type, true /* is_external */);
     }
   }
 
   InternalDecoderFactory internal_decoder_factory;
   return AllocatedDecoder(internal_decoder_factory.CreateVideoDecoderWithParams(
-                              type, {stream_params_.id}),
+                              codec, {stream_params_.id}),
                           type, false /* is_external */);
 }
 
 void WebRtcVideoChannel::WebRtcVideoReceiveStream::ConfigureCodecs(
     const std::vector<VideoCodecSettings>& recv_codecs,
     std::vector<AllocatedDecoder>* old_decoders) {
   *old_decoders = allocated_decoders_;
   allocated_decoders_.clear();
   config_.decoders.clear();
   for (size_t i = 0; i < recv_codecs.size(); ++i) {
@@ skipping 439 matching lines @@
     stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() -
                                                 1);
   }
 
   std::vector<webrtc::VideoStream> streams;
   streams.push_back(stream);
   return streams;
 }
 
 }  // namespace cricket