Reason for revert: Internal project has been fixed Original issue's description: > Revert of Unify the macOS and iOS capturer implementations (patchset #4 id:60001 of https://codereview.webrtc.org/2309253005/ ) > > Reason for revert: > Breaks internal project > > Original issue's description: > > Unify the macOS and iOS capturer implementations > > > > This removes the QTKit based capturer for mac, and removes the need > > to link against deprecated system libraries on macOS. > > > > BUG=webrtc:3968,webrtc:6275,webrtc:6333 > > > > Committed: https://crrev.com/242d8bdddd77109781cbb70c59d161be7566ac98 > > Cr-Commit-Position: refs/heads/master@{#14418} > > TBR=magjed@webrtc.org,tkchin@webrtc.org,perkj@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:3968,webrtc:6275,webrtc:6333 > > Committed: https://crrev.com/eddb7571d81e51a66f4abaf55013c85b4132c837 > Cr-Commit-Position: refs/heads/master@{#14429} TBR=magjed@webrtc.org,tkchin@webrtc.org,perkj@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:3968,webrtc:6275,webrtc:6333 Review-Url: https://codereview.webrtc.org/2375273004 Cr-Commit-Position: refs/heads/master@{#14451}
92 lines
3.0 KiB
Plaintext
92 lines
3.0 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 "webrtc/modules/video_capture/objc/device_info_objc.h"
|
|
#include "webrtc/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.expectedCaptureDelay =
|
|
webrtc::videocapturemodule::kDefaultCaptureDelay;
|
|
capability.rawType = webrtc::kVideoNV12;
|
|
capability.codecType = webrtc::kVideoCodecUnknown;
|
|
capability.interlaced = false;
|
|
} else if ([preset isEqualToString:AVCaptureSessionPreset640x480]) {
|
|
capability.width = 640;
|
|
capability.height = 480;
|
|
capability.maxFPS = 30;
|
|
capability.expectedCaptureDelay =
|
|
webrtc::videocapturemodule::kDefaultCaptureDelay;
|
|
capability.rawType = webrtc::kVideoNV12;
|
|
capability.codecType = webrtc::kVideoCodecUnknown;
|
|
capability.interlaced = false;
|
|
} else if ([preset isEqualToString:AVCaptureSessionPreset1280x720]) {
|
|
capability.width = 1280;
|
|
capability.height = 720;
|
|
capability.maxFPS = 30;
|
|
capability.expectedCaptureDelay =
|
|
webrtc::videocapturemodule::kDefaultCaptureDelay;
|
|
capability.rawType = webrtc::kVideoNV12;
|
|
capability.codecType = webrtc::kVideoCodecUnknown;
|
|
capability.interlaced = false;
|
|
}
|
|
|
|
return capability;
|
|
}
|
|
|
|
@end
|