Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1739)

Unified Diff: content/browser/renderer_host/media/video_capture_provider_switcher.cc

Issue 2900583002: Revert of [Mojo Video Capture] Hook up video capture service behind a feature flag (Closed)
Patch Set: Rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/video_capture_provider_switcher.cc
diff --git a/content/browser/renderer_host/media/video_capture_provider_switcher.cc b/content/browser/renderer_host/media/video_capture_provider_switcher.cc
deleted file mode 100644
index eaeb799d405c0e0de53a594bbb6c5ffd22009c0c..0000000000000000000000000000000000000000
--- a/content/browser/renderer_host/media/video_capture_provider_switcher.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/renderer_host/media/video_capture_provider_switcher.h"
-
-#include "base/callback_helpers.h"
-
-namespace content {
-
-namespace {
-
-class VideoCaptureDeviceLauncherSwitcher : public VideoCaptureDeviceLauncher {
- public:
- VideoCaptureDeviceLauncherSwitcher(
- std::unique_ptr<VideoCaptureDeviceLauncher> media_device_launcher,
- std::unique_ptr<VideoCaptureDeviceLauncher> other_types_launcher)
- : media_device_launcher_(std::move(media_device_launcher)),
- other_types_launcher_(std::move(other_types_launcher)) {}
-
- ~VideoCaptureDeviceLauncherSwitcher() override {}
-
- void LaunchDeviceAsync(const std::string& device_id,
- MediaStreamType stream_type,
- const media::VideoCaptureParams& params,
- base::WeakPtr<media::VideoFrameReceiver> receiver,
- Callbacks* callbacks,
- base::OnceClosure done_cb) override {
- if (stream_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) {
- // Use of Unretained() is safe, because |media_device_launcher_| is owned
- // by |this|.
- abort_launch_cb_ =
- base::Bind(&VideoCaptureDeviceLauncher::AbortLaunch,
- base::Unretained(media_device_launcher_.get()));
- return media_device_launcher_->LaunchDeviceAsync(
- device_id, stream_type, params, std::move(receiver), callbacks,
- std::move(done_cb));
- }
- // Use of Unretained() is safe, because |other_types_launcher_| is owned by
- // |this|.
- abort_launch_cb_ =
- base::Bind(&VideoCaptureDeviceLauncher::AbortLaunch,
- base::Unretained(other_types_launcher_.get()));
- return other_types_launcher_->LaunchDeviceAsync(
- device_id, stream_type, params, std::move(receiver), callbacks,
- std::move(done_cb));
- }
-
- void AbortLaunch() override {
- if (abort_launch_cb_.is_null())
- return;
- base::ResetAndReturn(&abort_launch_cb_).Run();
- }
-
- private:
- const std::unique_ptr<VideoCaptureDeviceLauncher> media_device_launcher_;
- const std::unique_ptr<VideoCaptureDeviceLauncher> other_types_launcher_;
- base::OnceClosure abort_launch_cb_;
-};
-
-} // anonymous namespace
-
-VideoCaptureProviderSwitcher::VideoCaptureProviderSwitcher(
- std::unique_ptr<VideoCaptureProvider> media_device_capture_provider,
- std::unique_ptr<VideoCaptureProvider> other_types_capture_provider)
- : media_device_capture_provider_(std::move(media_device_capture_provider)),
- other_types_capture_provider_(std::move(other_types_capture_provider)) {}
-
-VideoCaptureProviderSwitcher::~VideoCaptureProviderSwitcher() = default;
-
-void VideoCaptureProviderSwitcher::Uninitialize() {
- media_device_capture_provider_->Uninitialize();
- other_types_capture_provider_->Uninitialize();
-}
-
-void VideoCaptureProviderSwitcher::GetDeviceInfosAsync(
- const GetDeviceInfosCallback& result_callback) {
- media_device_capture_provider_->GetDeviceInfosAsync(result_callback);
-}
-
-std::unique_ptr<VideoCaptureDeviceLauncher>
-VideoCaptureProviderSwitcher::CreateDeviceLauncher() {
- return base::MakeUnique<VideoCaptureDeviceLauncherSwitcher>(
- media_device_capture_provider_->CreateDeviceLauncher(),
- other_types_capture_provider_->CreateDeviceLauncher());
-}
-
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698