From 060aa5708450b8f6f6035fd51ef22fbf07785dda Mon Sep 17 00:00:00 2001
From: Magnus Jedvert <magjed@webrtc.org>
Date: Thu, 12 May 2016 10:07:03 +0200
Subject: [PATCH] VideoCapturerAndroid: Force setDisplayOrientation to 0

BUG=b/27994417
R=glaznev@webrtc.org

Review URL: https://codereview.webrtc.org/1968913002 .

Cr-Commit-Position: refs/heads/master@{#12695}
---
 webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
index 39ed12cfa3..4e7f5f4c06 100644
--- a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
+++ b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
@@ -556,6 +556,8 @@ public class VideoCapturerAndroid implements
     }
 
     camera.setParameters(parameters);
+    // Calculate orientation manually and send it as CVO instead.
+    camera.setDisplayOrientation(0 /* degrees */);
     if (!isCapturingToTexture) {
       queuedBuffers.clear();
       final int frameSize = captureFormat.frameSize();