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

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

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
« no previous file with comments | « device/capture/video/mac/DEPS ('k') | device/capture/video/mac/video_capture_device_avfoundation_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/capture/video/mac/video_capture_device_avfoundation_mac.h
diff --git a/media/capture/video/mac/video_capture_device_avfoundation_mac.h b/device/capture/video/mac/video_capture_device_avfoundation_mac.h
similarity index 89%
rename from media/capture/video/mac/video_capture_device_avfoundation_mac.h
rename to device/capture/video/mac/video_capture_device_avfoundation_mac.h
index f6985dacef2cf79b73b7c5c6e752bfba9de2a848..43fb91c439b60983d8b1ec0efcceaf6442c6c686 100644
--- a/media/capture/video/mac/video_capture_device_avfoundation_mac.h
+++ b/device/capture/video/mac/video_capture_device_avfoundation_mac.h
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
-#define MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
+#ifndef DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
+#define DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
#import <Foundation/Foundation.h>
#import "base/mac/scoped_nsobject.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
+#include "device/capture/video/video_capture_device.h"
#import "media/base/mac/avfoundation_glue.h"
#include "media/base/video_capture_types.h"
-#include "media/capture/video/video_capture_device.h"
-namespace media {
+namespace device {
class VideoCaptureDeviceMac;
}
@@ -64,7 +64,7 @@ class VideoCaptureDeviceMac;
float frameRate_;
base::Lock lock_; // Protects concurrent setting and using |frameReceiver_|.
- media::VideoCaptureDeviceMac* frameReceiver_; // weak.
+ device::VideoCaptureDeviceMac* frameReceiver_; // weak.
base::scoped_nsobject<CrAVCaptureSession> captureSession_;
@@ -85,15 +85,15 @@ class VideoCaptureDeviceMac;
+ (NSDictionary*)deviceNames;
// Retrieve the capture supported formats for a given device |descriptor|.
-+ (void)getDevice:(const media::VideoCaptureDeviceDescriptor&)descriptor
++ (void)getDevice:(const device::VideoCaptureDeviceDescriptor&)descriptor
supportedFormats:(media::VideoCaptureFormats*)formats;
// Initializes the instance and the underlying capture session and registers the
// frame receiver.
-- (id)initWithFrameReceiver:(media::VideoCaptureDeviceMac*)frameReceiver;
+- (id)initWithFrameReceiver:(device::VideoCaptureDeviceMac*)frameReceiver;
// Sets the frame receiver.
-- (void)setFrameReceiver:(media::VideoCaptureDeviceMac*)frameReceiver;
+- (void)setFrameReceiver:(device::VideoCaptureDeviceMac*)frameReceiver;
// Sets which capture device to use by name, retrieved via |deviceNames|. Once
// the deviceId is known, the library objects are created if needed and
@@ -124,4 +124,4 @@ class VideoCaptureDeviceMac;
@end
-#endif // MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
+#endif // DEVICE_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_AVFOUNDATION_MAC_H_
« no previous file with comments | « device/capture/video/mac/DEPS ('k') | device/capture/video/mac/video_capture_device_avfoundation_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698