zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use 352x288 for iPhone 4S.

Browse Source 
NOTRY=True
BUG=

Review-Url: https://codereview.webrtc.org/2206773002
Cr-Commit-Position: refs/heads/master@{#13629}
This commit is contained in:
tkchin
2016-08-03 11:39:00 -07:00
committed by Commit bot
parent f98dc105ba
commit 9dfa249796
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm
View File

@ -29,6 +29,7 @@
// TODO(tkchin): support other formats. // TODO(tkchin): support other formats.
static NSString *const kDefaultPreset = AVCaptureSessionPreset640x480; static NSString *const kDefaultPreset = AVCaptureSessionPreset640x480;
static NSString *const kIPhone4SPreset = AVCaptureSessionPreset352x288;
static cricket::VideoFormat const kDefaultFormat = static cricket::VideoFormat const kDefaultFormat =
cricket::VideoFormat(640, cricket::VideoFormat(640,
480, 480,
@ -36,8 +37,8 @@ static cricket::VideoFormat const kDefaultFormat =
cricket::FOURCC_NV12); cricket::FOURCC_NV12);
// iPhone4S is too slow to handle 30fps. // iPhone4S is too slow to handle 30fps.
static cricket::VideoFormat const kIPhone4SFormat = static cricket::VideoFormat const kIPhone4SFormat =
cricket::VideoFormat(640, cricket::VideoFormat(352,
480, 288,
cricket::VideoFormat::FpsToInterval(15), cricket::VideoFormat::FpsToInterval(15),
cricket::FOURCC_NV12); cricket::FOURCC_NV12);
@ -360,11 +361,17 @@ static cricket::VideoFormat const kIPhone4SFormat =
captureSession.usesApplicationAudioSession = NO; captureSession.usesApplicationAudioSession = NO;
} }
#endif #endif
if (![captureSession canSetSessionPreset:kDefaultPreset]) { NSString *preset = kDefaultPreset;
#if TARGET_OS_IPHONE
if ([UIDevice deviceType] == RTCDeviceTypeIPhone4S) {
preset = kIPhone4SPreset;
}
#endif
if (![captureSession canSetSessionPreset:preset]) {
RTCLogError(@"Session preset unsupported."); RTCLogError(@"Session preset unsupported.");
return NO; return NO;
} }
captureSession.sessionPreset = kDefaultPreset; captureSession.sessionPreset = preset;
// Add the output. // Add the output.
AVCaptureVideoDataOutput *videoDataOutput = [self videoDataOutput]; AVCaptureVideoDataOutput *videoDataOutput = [self videoDataOutput];
@ -570,7 +577,7 @@ struct AVFoundationFrame {
AVFoundationVideoCapturer::AVFoundationVideoCapturer() AVFoundationVideoCapturer::AVFoundationVideoCapturer()
: _capturer(nil), _startThread(nullptr) { : _capturer(nil), _startThread(nullptr) {
// Set our supported formats. This matches kDefaultPreset. // Set our supported formats. This matches preset.
std::vector<cricket::VideoFormat> supported_formats; std::vector<cricket::VideoFormat> supported_formats;
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
if ([UIDevice deviceType] == RTCDeviceTypeIPhone4S) { if ([UIDevice deviceType] == RTCDeviceTypeIPhone4S) {