Unify VideoCodecType to/from string functionality

webrtc/media/engine/webrtcvideoencoderfactory.cc

Index: webrtc/media/engine/webrtcvideoencoderfactory.cc
diff --git a/webrtc/media/engine/webrtcvideoencoderfactory.cc b/webrtc/media/engine/webrtcvideoencoderfactory.cc
index ccc32d894bf2e19e336b972b04abca212e95424f..c7e5ac47fdb015b4f8ef452afff3f5598878dbfd 100644
--- a/webrtc/media/engine/webrtcvideoencoderfactory.cc
+++ b/webrtc/media/engine/webrtcvideoencoderfactory.cc
@@ -10,26 +10,14 @@
 
 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
 
-#include "webrtc/media/base/mediaconstants.h"
-
-static const char* NameFromCodecType(webrtc::VideoCodecType type) {
-  switch (type) {
-    case webrtc::kVideoCodecVP8:
-      return cricket::kVp8CodecName;
-    case webrtc::kVideoCodecVP9:
-      return cricket::kVp9CodecName;
-    case webrtc::kVideoCodecH264:
-      return cricket::kH264CodecName;
-    default:
-      return "Unknown codec";
-  }
-}
+#include "webrtc/common_types.h"
 
 namespace cricket {
 
 webrtc::VideoEncoder* WebRtcVideoEncoderFactory::CreateVideoEncoder(
     const cricket::VideoCodec& codec) {
-  return CreateVideoEncoder(CodecTypeFromName(codec.name));
+  return CreateVideoEncoder(webrtc::PayloadNameToCodecType(codec.name)
+                                .value_or(webrtc::kVideoCodecUnknown));
 }
 
 const std::vector<cricket::VideoCodec>&
@@ -43,7 +31,8 @@ WebRtcVideoEncoderFactory::supported_codecs() const {
 
 webrtc::VideoEncoder* WebRtcVideoEncoderFactory::CreateVideoEncoder(
     webrtc::VideoCodecType type) {
-  const cricket::VideoCodec codec(NameFromCodecType(type));
+  const cricket::VideoCodec codec(
+      webrtc::CodecTypeToPayloadName(type).value_or("Unknown codec"));
   return CreateVideoEncoder(codec);
 }
 
@@ -52,7 +41,9 @@ WebRtcVideoEncoderFactory::codecs() const {
   const std::vector<cricket::VideoCodec>& codecs = supported_codecs();
   for (const cricket::VideoCodec& codec : codecs) {
     encoder_codecs_.push_back(
-        VideoCodec(CodecTypeFromName(codec.name), codec.name));
+        VideoCodec(webrtc::PayloadNameToCodecType(codec.name)
+                       .value_or(webrtc::kVideoCodecUnknown),
+                   codec.name));
   }
   return encoder_codecs_;
 }