content/browser/media/capture/desktop_capture_device.cc - Issue 1162863003: Move ContentVideoCaptureDeviceCore from src/content to src/media

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1162863003: Move ContentVideoCaptureDeviceCore from src/content to src/media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compile error Created 5 years, 6 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

« no previous file with comments | « content/browser/media/capture/content_video_capture_device_core.cc ('k') | content/browser/media/capture/desktop_capture_device_aura.h » ('j') | media/capture/thread_safe_capture_oracle.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e42a678daff3cf9365a47848e9b1f45848dc81f2..fccae82a47df944e1e78e626a79f32fa6cbef5f1 100644

--- a/content/browser/media/capture/desktop_capture_device.cc

+++ b/content/browser/media/capture/desktop_capture_device.cc

@@ -12,12 +12,12 @@

#include "base/synchronization/lock.h"

#include "base/threading/thread.h"

#include "base/timer/timer.h"

-#include "content/browser/media/capture/capture_resolution_chooser.h"

#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 "content/public/browser/power_save_blocker.h"

#include "media/base/video_util.h"

+#include "media/capture/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"

@@ -100,7 +100,7 @@ class DesktopCaptureDevice::Core : public webrtc::DesktopCapturer::Callback {

webrtc::DesktopSize previous_frame_size_;

// Determines the size of frames to deliver to the |client_|.

- scoped_ptr<CaptureResolutionChooser> resolution_chooser_;

+ scoped_ptr<media::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

@@ -160,7 +160,7 @@ void DesktopCaptureDevice::Core::AllocateAndStart(

client_ = client.Pass();

requested_frame_rate_ = params.requested_format.frame_rate;

- resolution_chooser_.reset(new CaptureResolutionChooser(

+ resolution_chooser_.reset(new media::CaptureResolutionChooser(

params.requested_format.frame_size,

params.resolution_change_policy));