diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2016-06-30 06:40:10 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2016-06-30 06:40:10 +0000 |
| commit | 9f00edeb8f23f0788e3e13f561a2c5c1b3f14503 (patch) | |
| tree | 0c6e7b84f9f3b76b677f0f0e9ee3d4ca588a3498 /pjmedia | |
| parent | 6b7a0578f7742561876dc39cf0c5a8bfbf099c6c (diff) | |
Re #1931: Add one more session preset to support, i.e. resolution 960x540
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5372 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia-videodev/darwin_dev.m | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pjmedia/src/pjmedia-videodev/darwin_dev.m b/pjmedia/src/pjmedia-videodev/darwin_dev.m index 7e7d0d59..6ac018bc 100644 --- a/pjmedia/src/pjmedia-videodev/darwin_dev.m +++ b/pjmedia/src/pjmedia-videodev/darwin_dev.m @@ -82,6 +82,9 @@ static darwin_supported_size darwin_sizes[] = #endif { 352, 288, NULL }, { 640, 480, NULL }, +#if !TARGET_OS_IPHONE + { 960, 540, NULL }, +#endif { 1280, 720, NULL } #if TARGET_OS_IPHONE ,{ 1920, 1080, NULL } @@ -222,6 +225,9 @@ static void set_preset_str() #endif darwin_sizes[idx++].preset_str = AVCaptureSessionPreset352x288; darwin_sizes[idx++].preset_str = AVCaptureSessionPreset640x480; +#if !TARGET_OS_IPHONE + darwin_sizes[idx++].preset_str = AVCaptureSessionPreset960x540; +#endif darwin_sizes[idx++].preset_str = AVCaptureSessionPreset1280x720; #if TARGET_OS_IPHONE darwin_sizes[idx++].preset_str = AVCaptureSessionPreset1920x1080; |