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

Side by Side Diff: media/video/capture/mac/video_capture_device_mac.mm

Issue 518313003: Move Mac media glue code from media/video/capture/mac to media/base/mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sort header includes by path. Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « media/video/capture/mac/video_capture_device_factory_mac_unittest.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/video/capture/mac/video_capture_device_mac.h" 5 #include "media/video/capture/mac/video_capture_device_mac.h"
6 6
7 #include <IOKit/IOCFPlugIn.h> 7 #include <IOKit/IOCFPlugIn.h>
8 #include <IOKit/usb/IOUSBLib.h> 8 #include <IOKit/usb/IOUSBLib.h>
9 #include <IOKit/usb/USBSpec.h> 9 #include <IOKit/usb/USBSpec.h>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/message_loop/message_loop_proxy.h" 14 #include "base/message_loop/message_loop_proxy.h"
15 #include "base/mac/scoped_ioobject.h" 15 #include "base/mac/scoped_ioobject.h"
16 #include "base/mac/scoped_ioplugininterface.h" 16 #include "base/mac/scoped_ioplugininterface.h"
17 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #import "media/video/capture/mac/avfoundation_glue.h" 19 #import "media/base/mac/avfoundation_glue.h"
20 #import "media/video/capture/mac/platform_video_capturing_mac.h" 20 #import "media/video/capture/mac/platform_video_capturing_mac.h"
21 #import "media/video/capture/mac/video_capture_device_avfoundation_mac.h" 21 #import "media/video/capture/mac/video_capture_device_avfoundation_mac.h"
22 #import "media/video/capture/mac/video_capture_device_qtkit_mac.h" 22 #import "media/video/capture/mac/video_capture_device_qtkit_mac.h"
23 23
24 @implementation DeviceNameAndTransportType 24 @implementation DeviceNameAndTransportType
25 25
26 - (id)initWithName:(NSString*)deviceName transportType:(int32_t)transportType { 26 - (id)initWithName:(NSString*)deviceName transportType:(int32_t)transportType {
27 if (self = [super init]) { 27 if (self = [super init]) {
28 deviceName_.reset([deviceName copy]); 28 deviceName_.reset([deviceName copy]);
29 transportType_ = transportType; 29 transportType_ = transportType;
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 if (![capture_device_ setCaptureHeight:capture_format_.frame_size.height() 573 if (![capture_device_ setCaptureHeight:capture_format_.frame_size.height()
574 width:capture_format_.frame_size.width() 574 width:capture_format_.frame_size.width()
575 frameRate:capture_format_.frame_rate]) { 575 frameRate:capture_format_.frame_rate]) {
576 ReceiveError("Could not configure capture device."); 576 ReceiveError("Could not configure capture device.");
577 return false; 577 return false;
578 } 578 }
579 return true; 579 return true;
580 } 580 }
581 581
582 } // namespace media 582 } // namespace media
OLDNEW
« no previous file with comments | « media/video/capture/mac/video_capture_device_factory_mac_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698