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

Unified Diff: content/browser/media/capture/desktop_capture_device.cc

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/media/capture/desktop_capture_device.cc
diff --git a/content/browser/media/capture/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc
index efd4e318ce3367cbdfabddce3079cd7882ea7ade..a0906097a45db189fa7c9b1457b73883c1c995f7 100644
--- a/content/browser/media/capture/desktop_capture_device.cc
+++ b/content/browser/media/capture/desktop_capture_device.cc
@@ -22,9 +22,9 @@
#include "content/browser/media/capture/desktop_capture_device_uma_types.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/desktop_media_id.h"
+#include "device/capture/content/capture_resolution_chooser.h"
#include "device/power_save_blocker/power_save_blocker.h"
#include "media/base/video_util.h"
-#include "media/capture/content/capture_resolution_chooser.h"
#include "third_party/libyuv/include/libyuv/scale_argb.h"
#include "third_party/webrtc/modules/desktop_capture/cropping_window_capturer.h"
#include "third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h"
@@ -107,7 +107,7 @@ class DesktopCaptureDevice::Core : public webrtc::DesktopCapturer::Callback {
webrtc::DesktopSize previous_frame_size_;
// Determines the size of frames to deliver to the |client_|.
- std::unique_ptr<media::CaptureResolutionChooser> resolution_chooser_;
+ std::unique_ptr<device::CaptureResolutionChooser> resolution_chooser_;
// DesktopFrame into which captured frames are down-scaled and/or letterboxed,
// depending upon the caller's requested capture capabilities. If frames can
@@ -169,7 +169,7 @@ void DesktopCaptureDevice::Core::AllocateAndStart(
client_ = std::move(client);
requested_frame_rate_ = params.requested_format.frame_rate;
- resolution_chooser_.reset(new media::CaptureResolutionChooser(
+ resolution_chooser_.reset(new device::CaptureResolutionChooser(
params.requested_format.frame_size,
params.resolution_change_policy));
@@ -357,7 +357,7 @@ void DesktopCaptureDevice::Core::DoCapture() {
}
// static
-std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
+std::unique_ptr<device::VideoCaptureDevice> DesktopCaptureDevice::Create(
const DesktopMediaID& source) {
webrtc::DesktopCaptureOptions options =
webrtc::DesktopCaptureOptions::CreateDefault();
@@ -401,7 +401,7 @@ std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
default: { NOTREACHED(); }
}
- std::unique_ptr<media::VideoCaptureDevice> result;
+ std::unique_ptr<device::VideoCaptureDevice> result;
if (capturer)
result.reset(new DesktopCaptureDevice(std::move(capturer), source.type));
« no previous file with comments | « content/browser/media/capture/desktop_capture_device.h ('k') | content/browser/media/capture/desktop_capture_device_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698