Revert of Stop using hardcoded payload types for video codecs

webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc

Index: webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc
diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc
index 69a483e8b35ef26d79c3cc9cc0a07004e47e29a4..cc37a91736e9e1df696e32ecbba445ff0bd43c4b 100644
--- a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc
+++ b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc
@@ -11,13 +11,12 @@
 #include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"
 
 #include "webrtc/base/logging.h"
-#include "webrtc/media/engine/internalencoderfactory.h"
 #include "webrtc/modules/video_coding/include/video_error_codes.h"
 
 namespace webrtc {
 
 VideoEncoderSoftwareFallbackWrapper::VideoEncoderSoftwareFallbackWrapper(
-    const cricket::VideoCodec& codec,
+    VideoCodecType codec_type,
     webrtc::VideoEncoder* encoder)
     : number_of_cores_(0),
       max_payload_size_(0),
@@ -26,19 +25,17 @@
       channel_parameters_set_(false),
       packet_loss_(0),
       rtt_(0),
-      codec_(codec),
+      encoder_type_(CodecToEncoderType(codec_type)),
       encoder_(encoder),
       callback_(nullptr) {}
 
 bool VideoEncoderSoftwareFallbackWrapper::InitFallbackEncoder() {
-  cricket::WebRtcVideoEncoderFactory& internal_factory =
-      cricket::InternalEncoderFactory::GetInstance();
-  if (!FindMatchingCodec(internal_factory.supported_codecs(), codec_)) {
+  if (!VideoEncoder::IsSupportedSoftware(encoder_type_)) {
     LOG(LS_WARNING)
         << "Encoder requesting fallback to codec not supported in software.";
     return false;
   }
-  fallback_encoder_.reset(internal_factory.CreateVideoEncoder(codec_));
+  fallback_encoder_.reset(VideoEncoder::Create(encoder_type_));
   if (fallback_encoder_->InitEncode(&codec_settings_, number_of_cores_,
                                     max_payload_size_) !=
       WEBRTC_VIDEO_CODEC_OK) {
@@ -80,7 +77,7 @@
 
   int32_t ret =
       encoder_->InitEncode(codec_settings, number_of_cores, max_payload_size);
-  if (ret == WEBRTC_VIDEO_CODEC_OK || codec_.name.empty()) {
+  if (ret == WEBRTC_VIDEO_CODEC_OK || encoder_type_ == kUnsupportedCodec) {
     if (fallback_encoder_)
       fallback_encoder_->Release();
     fallback_encoder_.reset();