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

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

Issue 2529493002: mac: Remove more media/base/mac glue unneeded now that we target 10.9 (Closed)
Patch Set: . Created 4 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/capture/video/mac/video_capture_device_factory_mac.h" 5 #include "media/capture/video/mac/video_capture_device_factory_mac.h"
6 6
7 #import <IOKit/audio/IOAudioTypes.h> 7 #import <IOKit/audio/IOAudioTypes.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/profiler/scoped_tracker.h" 15 #include "base/profiler/scoped_tracker.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/task_runner_util.h" 17 #include "base/task_runner_util.h"
18 #import "media/base/mac/avfoundation_glue.h"
19 #import "media/capture/video/mac/video_capture_device_avfoundation_mac.h" 18 #import "media/capture/video/mac/video_capture_device_avfoundation_mac.h"
20 #import "media/capture/video/mac/video_capture_device_decklink_mac.h" 19 #import "media/capture/video/mac/video_capture_device_decklink_mac.h"
21 #include "media/capture/video/mac/video_capture_device_mac.h" 20 #include "media/capture/video/mac/video_capture_device_mac.h"
22 21
23 namespace media { 22 namespace media {
24 23
25 // Blacklisted devices are identified by a characteristic trailing substring of 24 // Blacklisted devices are identified by a characteristic trailing substring of
26 // uniqueId. At the moment these are just Blackmagic devices. 25 // uniqueId. At the moment these are just Blackmagic devices.
27 const char* kBlacklistedCamerasIdSignature[] = {"-01FDA82C8A9C"}; 26 const char* kBlacklistedCamerasIdSignature[] = {"-01FDA82C8A9C"};
28 27
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 } 126 }
128 127
129 // static 128 // static
130 VideoCaptureDeviceFactory* 129 VideoCaptureDeviceFactory*
131 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory( 130 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
132 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { 131 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
133 return new VideoCaptureDeviceFactoryMac(); 132 return new VideoCaptureDeviceFactoryMac();
134 } 133 }
135 134
136 } // namespace media 135 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698