This reverts commit 3f1d15b35223dc129afd180d020318a56ea1d006. Reason for revert: Removing this breaks a debugging tool that people relied on. I will update that tool to use the new capturer before relanding this. Original change's description: > Remove deprecated mac capture code. > > Bug: webrtc:6898, webrtc:6333, webrtc:7861 > Change-Id: Ie33eaa47585012f98b59ccffc0c849c1d9da54da > Reviewed-on: https://webrtc-review.googlesource.com/79920 > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > Commit-Queue: Kári Helgason <kthelgason@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23454} TBR=henrika@webrtc.org,andersc@webrtc.org,kthelgason@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:6898, webrtc:6333, webrtc:7861 Change-Id: Ifc367eecfe92a2b2e4a826a820dc9c3c970ea01e Reviewed-on: https://webrtc-review.googlesource.com/84380 Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Commit-Queue: Kári Helgason <kthelgason@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23681}
83 lines
2.6 KiB
Plaintext
83 lines
2.6 KiB
Plaintext
/*
|
|
* Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#if !defined(__has_feature) || !__has_feature(objc_arc)
|
|
#error "This file requires ARC support."
|
|
#endif
|
|
|
|
#import <AVFoundation/AVFoundation.h>
|
|
|
|
#import "modules/video_capture/objc/device_info_objc.h"
|
|
#include "modules/video_capture/video_capture_config.h"
|
|
|
|
@implementation DeviceInfoIosObjC
|
|
|
|
+ (int)captureDeviceCount {
|
|
return [[AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo] count];
|
|
}
|
|
|
|
+ (AVCaptureDevice*)captureDeviceForIndex:(int)index {
|
|
return [[AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]
|
|
objectAtIndex:index];
|
|
}
|
|
|
|
+ (AVCaptureDevice*)captureDeviceForUniqueId:(NSString*)uniqueId {
|
|
for (AVCaptureDevice* device in
|
|
[AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo]) {
|
|
if ([uniqueId isEqual:device.uniqueID]) {
|
|
return device;
|
|
}
|
|
}
|
|
|
|
return nil;
|
|
}
|
|
|
|
+ (NSString*)deviceNameForIndex:(int)index {
|
|
return [DeviceInfoIosObjC captureDeviceForIndex:index].localizedName;
|
|
}
|
|
|
|
+ (NSString*)deviceUniqueIdForIndex:(int)index {
|
|
return [DeviceInfoIosObjC captureDeviceForIndex:index].uniqueID;
|
|
}
|
|
|
|
+ (NSString*)deviceNameForUniqueId:(NSString*)uniqueId {
|
|
return [[AVCaptureDevice deviceWithUniqueID:uniqueId] localizedName];
|
|
}
|
|
|
|
+ (webrtc::VideoCaptureCapability)capabilityForPreset:(NSString*)preset {
|
|
webrtc::VideoCaptureCapability capability;
|
|
|
|
// TODO(tkchin): Maybe query AVCaptureDevice for supported formats, and
|
|
// then get the dimensions / frame rate from each supported format
|
|
if ([preset isEqualToString:AVCaptureSessionPreset352x288]) {
|
|
capability.width = 352;
|
|
capability.height = 288;
|
|
capability.maxFPS = 30;
|
|
capability.videoType = webrtc::VideoType::kNV12;
|
|
capability.interlaced = false;
|
|
} else if ([preset isEqualToString:AVCaptureSessionPreset640x480]) {
|
|
capability.width = 640;
|
|
capability.height = 480;
|
|
capability.maxFPS = 30;
|
|
capability.videoType = webrtc::VideoType::kNV12;
|
|
capability.interlaced = false;
|
|
} else if ([preset isEqualToString:AVCaptureSessionPreset1280x720]) {
|
|
capability.width = 1280;
|
|
capability.height = 720;
|
|
capability.maxFPS = 30;
|
|
capability.videoType = webrtc::VideoType::kNV12;
|
|
capability.interlaced = false;
|
|
}
|
|
|
|
return capability;
|
|
}
|
|
|
|
@end
|