Unify VideoCodecType to/from string functionality

webrtc/media/engine/internalencoderfactory.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.
  */
 
@@ skipping 25 matching lines @@
 
   supported_codecs_.push_back(cricket::VideoCodec(kRedCodecName));
   supported_codecs_.push_back(cricket::VideoCodec(kUlpfecCodecName));
 }
 
 InternalEncoderFactory::~InternalEncoderFactory() {}
 
 // WebRtcVideoEncoderFactory implementation.
 webrtc::VideoEncoder* InternalEncoderFactory::CreateVideoEncoder(
     const cricket::VideoCodec& codec) {
-  switch (CodecTypeFromName(codec.name)) {
+  const webrtc::VideoCodecType codec_type =
+      webrtc::PayloadNameToCodecType(codec.name)
+          .value_or(webrtc::kVideoCodecUnknown);
+  switch (codec_type) {
     case webrtc::kVideoCodecH264:
       return webrtc::H264Encoder::Create();
     case webrtc::kVideoCodecVP8:
       return webrtc::VP8Encoder::Create();
     case webrtc::kVideoCodecVP9:
       return webrtc::VP9Encoder::Create();
     default:
       return nullptr;
   }
 }
 
 const std::vector<cricket::VideoCodec>&
 InternalEncoderFactory::supported_codecs() const {
   return supported_codecs_;
 }
 
 void InternalEncoderFactory::DestroyVideoEncoder(
     webrtc::VideoEncoder* encoder) {
   delete encoder;
 }
 
 }  // namespace cricket