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

Unified Diff: device/capture/video/mac/video_capture_device_avfoundation_mac.mm

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: device/capture/video/mac/video_capture_device_avfoundation_mac.mm
diff --git a/media/capture/video/mac/video_capture_device_avfoundation_mac.mm b/device/capture/video/mac/video_capture_device_avfoundation_mac.mm
similarity index 98%
rename from media/capture/video/mac/video_capture_device_avfoundation_mac.mm
rename to device/capture/video/mac/video_capture_device_avfoundation_mac.mm
index 72685e864d0e138eebd0b473f26c5d626fa6ed13..4fd02e6f3bace372728eadd6deab345f5166183d 100644
--- a/media/capture/video/mac/video_capture_device_avfoundation_mac.mm
+++ b/device/capture/video/mac/video_capture_device_avfoundation_mac.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "media/capture/video/mac/video_capture_device_avfoundation_mac.h"
+#import "device/capture/video/mac/video_capture_device_avfoundation_mac.h"
#import <CoreMedia/CoreMedia.h>
#import <CoreVideo/CoreVideo.h>
@@ -14,9 +14,9 @@
#include "base/mac/foundation_util.h"
#include "base/mac/mac_util.h"
#include "base/metrics/histogram_macros.h"
+#include "device/capture/video/mac/video_capture_device_mac.h"
#include "media/base/timestamp_constants.h"
#include "media/base/video_capture_types.h"
-#include "media/capture/video/mac/video_capture_device_mac.h"
#include "ui/gfx/geometry/size.h"
// Prefer MJPEG if frame width or height is larger than this.
@@ -165,7 +165,7 @@ void ExtractBaseAddressAndLength(
return deviceNames;
}
-+ (void)getDevice:(const media::VideoCaptureDeviceDescriptor&)descriptor
++ (void)getDevice:(const device::VideoCaptureDeviceDescriptor&)descriptor
supportedFormats:(media::VideoCaptureFormats*)formats {
NSArray* devices = [AVCaptureDeviceGlue devices];
CrAVCaptureDevice* device = nil;
@@ -200,7 +200,7 @@ void ExtractBaseAddressAndLength(
#pragma mark Public methods
-- (id)initWithFrameReceiver:(media::VideoCaptureDeviceMac*)frameReceiver {
+- (id)initWithFrameReceiver:(device::VideoCaptureDeviceMac*)frameReceiver {
if ((self = [super init])) {
DCHECK(main_thread_checker_.CalledOnValidThread());
DCHECK(frameReceiver);
@@ -216,7 +216,7 @@ void ExtractBaseAddressAndLength(
[super dealloc];
}
-- (void)setFrameReceiver:(media::VideoCaptureDeviceMac*)frameReceiver {
+- (void)setFrameReceiver:(device::VideoCaptureDeviceMac*)frameReceiver {
base::AutoLock lock(lock_);
frameReceiver_ = frameReceiver;
}

Powered by Google App Engine
This is Rietveld 408576698