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

Side by Side Diff: media/video/capture/mac/video_capture_device_factory_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
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/video/capture/mac/video_capture_device_factory_mac.h" 5 #include "media/video/capture/mac/video_capture_device_factory_mac.h"
6 6
7 #import <IOKit/audio/IOAudioTypes.h> 7 #import <IOKit/audio/IOAudioTypes.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/task_runner_util.h" 12 #include "base/task_runner_util.h"
13 #import "media/video/capture/mac/avfoundation_glue.h" 13 #import "media/base/mac/avfoundation_glue.h"
14 #import "media/video/capture/mac/video_capture_device_avfoundation_mac.h"
14 #include "media/video/capture/mac/video_capture_device_mac.h" 15 #include "media/video/capture/mac/video_capture_device_mac.h"
15 #import "media/video/capture/mac/video_capture_device_avfoundation_mac.h"
16 #import "media/video/capture/mac/video_capture_device_qtkit_mac.h" 16 #import "media/video/capture/mac/video_capture_device_qtkit_mac.h"
17 17
18 namespace media { 18 namespace media {
19 19
20 // Some devices are not correctly supported in AVFoundation, f.i. Blackmagic, 20 // Some devices are not correctly supported in AVFoundation, f.i. Blackmagic,
21 // see http://crbug.com/347371. The devices are identified by a characteristic 21 // see http://crbug.com/347371. The devices are identified by a characteristic
22 // trailing substring of uniqueId and by (part of) the vendor's name. 22 // trailing substring of uniqueId and by (part of) the vendor's name.
23 // Blackmagic cameras are known to crash if VGA is requested , see 23 // Blackmagic cameras are known to crash if VGA is requested , see
24 // http://crbug.com/396812; for them HD is the only supported resolution. 24 // http://crbug.com/396812; for them HD is the only supported resolution.
25 const struct NameAndVid { 25 const struct NameAndVid {
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 kBlacklistedCameras[i].capture_frame_rate, 200 kBlacklistedCameras[i].capture_frame_rate,
201 media::PIXEL_FORMAT_UYVY)); 201 media::PIXEL_FORMAT_UYVY));
202 break; 202 break;
203 } 203 }
204 } 204 }
205 } 205 }
206 } 206 }
207 } 207 }
208 208
209 } // namespace media 209 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698