Move VideoDecoderSoftwareFallbackWrapper from webrtc/video_decoder.h to webrtc/media/engine/

webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc

Index: webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc
diff --git a/webrtc/video/video_decoder.cc b/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc
similarity index 64%
copy from webrtc/video/video_decoder.cc
copy to webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc
index b15a83f7b3f3038923985c6b1a281278172ed4db..8dd0f841ea204c875a99322c05115ed0521397a1 100644
--- a/webrtc/video/video_decoder.cc
+++ b/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *  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
@@ -8,40 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/video_decoder.h"
+#include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"
+
+#include <string>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
-#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
-#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
-#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
+#include "webrtc/modules/video_coding/include/video_error_codes.h"
 
 namespace webrtc {
-VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) {
-  switch (codec_type) {
-    case kH264:
-      if (!H264Decoder::IsSupported()) {
-        // This could happen in a software-fallback for a codec type only
-        // supported externally (e.g. H.264 on iOS or Android) or in current
-        // usage in WebRtcVideoEngine2 if the external decoder fails to be
-        // created.
-        LOG(LS_ERROR) << "Unable to create an H.264 decoder fallback. "
-                      << "Decoding of this stream will be broken.";
-        return new NullVideoDecoder();
-      }
-      return H264Decoder::Create();
-    case kVp8:
-      return VP8Decoder::Create();
-    case kVp9:
-      RTC_DCHECK(VP9Decoder::IsSupported());
-      return VP9Decoder::Create();
-    case kUnsupportedCodec:
-      LOG(LS_ERROR) << "Creating NullVideoDecoder for unsupported codec.";
-      return new NullVideoDecoder();
-  }
-  RTC_NOTREACHED();
-  return nullptr;
-}
+
+namespace {
 
 VideoDecoder::DecoderType CodecTypeToDecoderType(VideoCodecType codec_type) {
   switch (codec_type) {
@@ -56,6 +32,8 @@ VideoDecoder::DecoderType CodecTypeToDecoderType(VideoCodecType codec_type) {
   }
 }
 
+}  // anonymous namespace
+
 VideoDecoderSoftwareFallbackWrapper::VideoDecoderSoftwareFallbackWrapper(
     VideoCodecType codec_type,
     VideoDecoder* decoder)
@@ -149,36 +127,4 @@ const char* VideoDecoderSoftwareFallbackWrapper::ImplementationName() const {
   return decoder_->ImplementationName();
 }
 
-NullVideoDecoder::NullVideoDecoder() {}
-
-int32_t NullVideoDecoder::InitDecode(const VideoCodec* codec_settings,
-                                     int32_t number_of_cores) {
-  LOG(LS_ERROR) << "Can't initialize NullVideoDecoder.";
-  return WEBRTC_VIDEO_CODEC_OK;
-}
-
-int32_t NullVideoDecoder::Decode(const EncodedImage& input_image,
-    bool missing_frames,
-    const RTPFragmentationHeader* fragmentation,
-    const CodecSpecificInfo* codec_specific_info,
-    int64_t render_time_ms) {
-  LOG(LS_ERROR) << "The NullVideoDecoder doesn't support decoding.";
-  return WEBRTC_VIDEO_CODEC_OK;
-}
-
-int32_t NullVideoDecoder::RegisterDecodeCompleteCallback(
-    DecodedImageCallback* callback) {
-  LOG(LS_ERROR)
-      << "Can't register decode complete callback on NullVideoDecoder.";
-  return WEBRTC_VIDEO_CODEC_OK;
-}
-
-int32_t NullVideoDecoder::Release() {
-  return WEBRTC_VIDEO_CODEC_OK;
-}
-
-const char* NullVideoDecoder::ImplementationName() const {
-  return "NullVideoDecoder";
-}
-
 }  // namespace webrtc