summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 17:17:23 +0000
committerwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 17:17:23 +0000
commit297c4448c818eb1eaf38ea991fc2dba215513746 (patch)
tree58d91873b3b7d473907cba7b3095d2ef60d42bf4 /media
parentfa3406dabb6cc008b0191ec40291f7280f046594 (diff)
downloadchromium_src-297c4448c818eb1eaf38ea991fc2dba215513746.zip
chromium_src-297c4448c818eb1eaf38ea991fc2dba215513746.tar.gz
chromium_src-297c4448c818eb1eaf38ea991fc2dba215513746.tar.bz2
Keep original orientation of capture frames on Android.
This will be consistent with video capture on desktop platforms. R=qinmin@chromium.org Review URL: https://codereview.chromium.org/15900002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/android/java/src/org/chromium/media/VideoCapture.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/base/android/java/src/org/chromium/media/VideoCapture.java b/media/base/android/java/src/org/chromium/media/VideoCapture.java
index 150f3b6..284f742 100644
--- a/media/base/android/java/src/org/chromium/media/VideoCapture.java
+++ b/media/base/android/java/src/org/chromium/media/VideoCapture.java
@@ -283,8 +283,8 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
if (mCameraFacing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
rotation = (mCameraOrientation + rotation) % 360;
rotation = (360 - rotation) % 360;
- flipHorizontal = (rotation == 180 || rotation == 0);
- flipVertical = !flipHorizontal;
+ flipHorizontal = (rotation == 270 || rotation == 90);
+ flipVertical = flipHorizontal;
} else {
rotation = (mCameraOrientation - rotation + 360) % 360;
}