From c2cb266c93d5918f7a54fd62c07c387dde9186a2 Mon Sep 17 00:00:00 2001 From: Jon Hjelle Date: Fri, 29 May 2015 16:38:26 -0700 Subject: [PATCH] Match video orientation with device orientation for portrait and portrait upside down BUG= R=tkchin@webrtc.org Committed: https://crrev.com/14c2695f2968d6e8546545a9b62940563073b4b6 Patch from Jon Hjelle . Cr-Commit-Position: refs/heads/master@{#9336} Review URL: https://webrtc-codereview.appspot.com/55459004 Patch from Jon Hjelle . Cr-Commit-Position: refs/heads/master@{#9338} --- talk/app/webrtc/objc/avfoundationvideocapturer.mm | 5 +++-- .../modules/video_capture/ios/rtc_video_capture_ios_objc.mm | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/talk/app/webrtc/objc/avfoundationvideocapturer.mm b/talk/app/webrtc/objc/avfoundationvideocapturer.mm index 9f5361a60b..bd472a498a 100644 --- a/talk/app/webrtc/objc/avfoundationvideocapturer.mm +++ b/talk/app/webrtc/objc/avfoundationvideocapturer.mm @@ -262,10 +262,11 @@ static dispatch_queue_t kBackgroundQueue = nil; AVCaptureVideoOrientation orientation = AVCaptureVideoOrientationPortrait; switch ([UIDevice currentDevice].orientation) { case UIDeviceOrientationPortrait: - orientation = AVCaptureVideoOrientationPortraitUpsideDown; - case UIDeviceOrientationPortraitUpsideDown: orientation = AVCaptureVideoOrientationPortrait; break; + case UIDeviceOrientationPortraitUpsideDown: + orientation = AVCaptureVideoOrientationPortraitUpsideDown; + break; case UIDeviceOrientationLandscapeLeft: orientation = AVCaptureVideoOrientationLandscapeRight; break; diff --git a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm b/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm index 71ccc9817e..c8421596da 100644 --- a/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm +++ b/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm @@ -250,10 +250,11 @@ using namespace webrtc::videocapturemodule; switch ([UIDevice currentDevice].orientation) { case UIDeviceOrientationPortrait: _connection.videoOrientation = - AVCaptureVideoOrientationPortraitUpsideDown; + AVCaptureVideoOrientationPortrait; + break; case UIDeviceOrientationPortraitUpsideDown: _connection.videoOrientation = - AVCaptureVideoOrientationPortrait; + AVCaptureVideoOrientationPortraitUpsideDown; break; case UIDeviceOrientationLandscapeLeft: _connection.videoOrientation =