commit 7be99bdea13d8863a26a4b0b30b8415785809334
author Zeke Chin <tkchin@webrtc.org> Fri May 29 16:34:38 2015 -0700
committer Zeke Chin <tkchin@webrtc.org> Fri May 29 23:34:43 2015 +0000
tree 15f98c6c1ad17453c281c3ed949cbe257522411f
parent 14c2695f2968d6e8546545a9b62940563073b4b6

Revert "Match video orientation with device orientation for portrait and portrait upside down"

Misspelt contributor's email address. Easier to revert and reland.
TBR=hjon@andyet.net

This reverts commit 14c2695f2968d6e8546545a9b62940563073b4b6.

BUG=

Review URL: https://webrtc-codereview.appspot.com/54619004

Cr-Commit-Position: refs/heads/master@{#9337}

talk/app/webrtc/objc/avfoundationvideocapturer.mm

diff --git a/talk/app/webrtc/objc/avfoundationvideocapturer.mm b/talk/app/webrtc/objc/avfoundationvideocapturer.mm
index bd472a4..9f5361a 100644
--- a/talk/app/webrtc/objc/avfoundationvideocapturer.mm
+++ b/talk/app/webrtc/objc/avfoundationvideocapturer.mm
@@ -262,10 +262,9 @@
   AVCaptureVideoOrientation orientation = AVCaptureVideoOrientationPortrait;
   switch ([UIDevice currentDevice].orientation) {
     case UIDeviceOrientationPortrait:
-      orientation = AVCaptureVideoOrientationPortrait;
-      break;
-    case UIDeviceOrientationPortraitUpsideDown:
       orientation = AVCaptureVideoOrientationPortraitUpsideDown;
+    case UIDeviceOrientationPortraitUpsideDown:
+      orientation = AVCaptureVideoOrientationPortrait;
       break;
     case UIDeviceOrientationLandscapeLeft:
       orientation = AVCaptureVideoOrientationLandscapeRight;

webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm

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 c842159..71ccc98 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,11 +250,10 @@
   switch ([UIDevice currentDevice].orientation) {
     case UIDeviceOrientationPortrait:
       _connection.videoOrientation =
-          AVCaptureVideoOrientationPortrait;
-      break;
+          AVCaptureVideoOrientationPortraitUpsideDown;
     case UIDeviceOrientationPortraitUpsideDown:
       _connection.videoOrientation =
-          AVCaptureVideoOrientationPortraitUpsideDown;
+          AVCaptureVideoOrientationPortrait;
       break;
     case UIDeviceOrientationLandscapeLeft:
       _connection.videoOrientation =