Move VideoDecoder::Create() logic to separate internal video decoder factory

webrtc/media/engine/videodecodersoftwarefallbackwrapper.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.
  */
 
 #include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"
 
 #include <string>
 
 #include "webrtc/base/logging.h"
+#include "webrtc/media/engine/internaldecoderfactory.h"
 #include "webrtc/modules/video_coding/include/video_error_codes.h"
 
 namespace webrtc {
 
-namespace {
-
-VideoDecoder::DecoderType CodecTypeToDecoderType(VideoCodecType codec_type) {
-  switch (codec_type) {
-    case kVideoCodecH264:
-      return VideoDecoder::kH264;
-    case kVideoCodecVP8:
-      return VideoDecoder::kVp8;
-    case kVideoCodecVP9:
-      return VideoDecoder::kVp9;
-    default:
-      return VideoDecoder::kUnsupportedCodec;
-  }
-}
-
-}  // anonymous namespace
-
 VideoDecoderSoftwareFallbackWrapper::VideoDecoderSoftwareFallbackWrapper(
     VideoCodecType codec_type,
     VideoDecoder* decoder)
-    : decoder_type_(CodecTypeToDecoderType(codec_type)),
-      decoder_(decoder),
-      callback_(nullptr) {
-}
+    : codec_type_(codec_type), decoder_(decoder), callback_(nullptr) {}
 
 int32_t VideoDecoderSoftwareFallbackWrapper::InitDecode(
     const VideoCodec* codec_settings,
     int32_t number_of_cores) {
   codec_settings_ = *codec_settings;
   number_of_cores_ = number_of_cores;
   return decoder_->InitDecode(codec_settings, number_of_cores);
 }
 
 bool VideoDecoderSoftwareFallbackWrapper::InitFallbackDecoder() {
-  RTC_CHECK(decoder_type_ != kUnsupportedCodec)
+  RTC_CHECK(codec_type_ != kVideoCodecUnknown)
       << "Decoder requesting fallback to codec not supported in software.";
   LOG(LS_WARNING) << "Decoder falling back to software decoding.";
-  fallback_decoder_.reset(VideoDecoder::Create(decoder_type_));
+  cricket::InternalDecoderFactory internal_decoder_factory;
+  fallback_decoder_.reset(
+      internal_decoder_factory.CreateVideoDecoder(codec_type_));
   if (fallback_decoder_->InitDecode(&codec_settings_, number_of_cores_) !=
       WEBRTC_VIDEO_CODEC_OK) {
     LOG(LS_ERROR) << "Failed to initialize software-decoder fallback.";
     fallback_decoder_.reset();
     return false;
   }
   if (callback_)
     fallback_decoder_->RegisterDecodeCompleteCallback(callback_);
   fallback_implementation_name_ =
       std::string(fallback_decoder_->ImplementationName()) +
@@ skipping 53 matching lines @@
   return decoder_->PrefersLateDecoding();
 }
 
 const char* VideoDecoderSoftwareFallbackWrapper::ImplementationName() const {
   if (fallback_decoder_)
     return fallback_implementation_name_.c_str();
   return decoder_->ImplementationName();
 }
 
 }  // namespace webrtc