Let CreateVideoDecoder take a cricket::VideoCodec.

webrtc/media/engine/webrtcvideodecoderfactory.h

 /*
  *  Copyright (c) 2013 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.
  */
 
 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
 #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
 
 #include "webrtc/common_types.h"
+#include "webrtc/media/base/codec.h"
 #include "webrtc/rtc_base/refcount.h"
 
 namespace webrtc {
 class VideoDecoder;
 }
 
 namespace cricket {
 
 struct VideoDecoderParams {
   std::string receive_stream_id;
 };
 
 class WebRtcVideoDecoderFactory {
  public:
   // Caller takes the ownership of the returned object and it should be released
   // by calling DestroyVideoDecoder().
   virtual webrtc::VideoDecoder* CreateVideoDecoder(

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

I want to have as few methods as possible in this interface, and it's easy for
an implementation to just ignore VideoDecoderParams, so I don't think we need to
add this method that uses cricket::VideoCodec but no params.

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

I can see that. I was planning on moving callers over to this method in a
separate CL but maybe it's better to just introduce it at that point.

-      webrtc::VideoCodecType type) = 0;
+      const cricket::VideoCodec& codec) {
+    // Default implementation that delegates to old version in order to preserve
+    // backwards-compatability.
+    webrtc::VideoCodecType type = webrtc::PayloadNameToCodecType(codec.name);
+    return CreateVideoDecoder(type);
+  }
+  virtual webrtc::VideoDecoder* CreateVideoDecoderWithParams(

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

Add an empty line between the methods.

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

Done.

+      const cricket::VideoCodec& codec,
+      VideoDecoderParams params) {
+    return CreateVideoDecoder(codec);

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

We have to be careful with backwards-compatability and this function will
actually throw away VideoDecoderParams now. We should call the other
CreateVideoDecoderWithParams from here.

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

Yeah, I guess subclasses can have overridden implementations that do something
with this. Good point.

+  }
+  // DEPRECATED.
+  // These methods should not be used by new code and will eventually be
+  // removed. See http://crbug.com/webrtc/8140.
+  virtual webrtc::VideoDecoder* CreateVideoDecoder(
+      webrtc::VideoCodecType type) {
+    RTC_NOTREACHED();
+  };
   virtual webrtc::VideoDecoder* CreateVideoDecoderWithParams(
       webrtc::VideoCodecType type,
       VideoDecoderParams params) {
     return CreateVideoDecoder(type);
   }
   virtual ~WebRtcVideoDecoderFactory() {}
 
   virtual void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) = 0;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_