From 7be99bdea13d8863a26a4b0b30b8415785809334 Mon Sep 17 00:00:00 2001
From: Zeke Chin <tkchin@webrtc.org>
Date: Fri, 29 May 2015 16:34:38 -0700
Subject: [PATCH] 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            | 5 ++---
 .../modules/video_capture/ios/rtc_video_capture_ios_objc.mm  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/talk/app/webrtc/objc/avfoundationvideocapturer.mm b/talk/app/webrtc/objc/avfoundationvideocapturer.mm
index bd472a498a..9f5361a60b 100644
--- a/talk/app/webrtc/objc/avfoundationvideocapturer.mm
+++ b/talk/app/webrtc/objc/avfoundationvideocapturer.mm
@@ -262,10 +262,9 @@ static dispatch_queue_t kBackgroundQueue = nil;
   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;
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 c8421596da..71ccc9817e 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 @@ using namespace webrtc::videocapturemodule;
   switch ([UIDevice currentDevice].orientation) {
     case UIDeviceOrientationPortrait:
       _connection.videoOrientation =
-          AVCaptureVideoOrientationPortrait;
-      break;
+          AVCaptureVideoOrientationPortraitUpsideDown;
     case UIDeviceOrientationPortraitUpsideDown:
       _connection.videoOrientation =
-          AVCaptureVideoOrientationPortraitUpsideDown;
+          AVCaptureVideoOrientationPortrait;
       break;
     case UIDeviceOrientationLandscapeLeft:
       _connection.videoOrientation =