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

webrtc/media/engine/internaldecoderfactory.cc

Index: webrtc/media/engine/internaldecoderfactory.cc
diff --git a/webrtc/video/video_decoder.cc b/webrtc/media/engine/internaldecoderfactory.cc
similarity index 21%
rename from webrtc/video/video_decoder.cc
rename to webrtc/media/engine/internaldecoderfactory.cc
index 4ac4ff5b0746eab0a54f287421b5532dd187e10a..760575df550c243515e9feaa1b835b6a7961be17 100644
--- a/webrtc/video/video_decoder.cc
+++ b/webrtc/media/engine/internaldecoderfactory.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,71 +8,83 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/video_decoder.h"
+#include "webrtc/media/engine/internaldecoderfactory.h"
+
+#include <utility>
 
-#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"
 
-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();
+namespace cricket {
+
+namespace {
+
+// Video decoder class to be used for unknown codecs. Doesn't support decoding
+// but logs messages to LS_ERROR.
+class NullVideoDecoder : public webrtc::VideoDecoder {
+ public:
+  int32_t InitDecode(const webrtc::VideoCodec* codec_settings,
+                     int32_t number_of_cores) override {
+    LOG(LS_ERROR) << "Can't initialize NullVideoDecoder.";
+    return WEBRTC_VIDEO_CODEC_OK;
   }
-  RTC_NOTREACHED();
-  return nullptr;
-}
 
-NullVideoDecoder::NullVideoDecoder() {}
+  int32_t Decode(const webrtc::EncodedImage& input_image,
+                 bool missing_frames,
+                 const webrtc::RTPFragmentationHeader* fragmentation,
+                 const webrtc::CodecSpecificInfo* codec_specific_info,
+                 int64_t render_time_ms) override {
+    LOG(LS_ERROR) << "The NullVideoDecoder doesn't support decoding.";
+    return WEBRTC_VIDEO_CODEC_OK;
+  }
 
-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 RegisterDecodeCompleteCallback(
+      webrtc::DecodedImageCallback* callback) override {
+    LOG(LS_ERROR)
+        << "Can't register decode complete callback on 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 Release() override { 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;
-}
+  const char* ImplementationName() const override { return "NullVideoDecoder"; }
+};
+
+}  // anonymous namespace
+
+InternalDecoderFactory::InternalDecoderFactory() {}
+
+InternalDecoderFactory::~InternalDecoderFactory() {}
 
-int32_t NullVideoDecoder::Release() {
-  return WEBRTC_VIDEO_CODEC_OK;
+// WebRtcVideoDecoderFactory implementation.
+webrtc::VideoDecoder* InternalDecoderFactory::CreateVideoDecoder(
+    webrtc::VideoCodecType type) {
+  switch (type) {
+    case webrtc::kVideoCodecH264:
+      if (webrtc::H264Decoder::IsSupported())
+        return webrtc::H264Decoder::Create();
+      // 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();
+    case webrtc::kVideoCodecVP8:
+      return webrtc::VP8Decoder::Create();
+    case webrtc::kVideoCodecVP9:
+      RTC_DCHECK(webrtc::VP9Decoder::IsSupported());
+      return webrtc::VP9Decoder::Create();
+    default:
+      LOG(LS_ERROR) << "Creating NullVideoDecoder for unsupported codec.";
+      return new NullVideoDecoder();
+  }
 }
 
-const char* NullVideoDecoder::ImplementationName() const {
-  return "NullVideoDecoder";
+void InternalDecoderFactory::DestroyVideoDecoder(
+    webrtc::VideoDecoder* decoder) {
+  delete decoder;
 }
 
-}  // namespace webrtc
+}  // namespace cricket