| Index: webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
|
| diff --git a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
|
| index 39ed12cfa3d2708c9b0ee74c3724a0d707154ad7..bf3f5aba8e5cbbd3807cc186ae11ba5329d47e01 100644
|
| --- a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
|
| +++ b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
|
| @@ -738,15 +738,10 @@ public class VideoCapturerAndroid implements
|
| firstFrameReported = true;
|
| }
|
|
|
| - int rotation = getFrameOrientation();
|
| - if (info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT) {
|
| - // Undo the mirror that the OS "helps" us with.
|
| - // http://developer.android.com/reference/android/hardware/Camera.html#setDisplayOrientation(int)
|
| - transformMatrix =
|
| - RendererCommon.multiplyMatrices(transformMatrix, RendererCommon.horizontalFlipMatrix());
|
| - }
|
| cameraStatistics.addFrame();
|
| + // Don't pay any attention to transformMatrix - use a hardcoded vertical flip as transform and
|
| + // calculate rotation manually using sensor and device orientation.
|
| frameObserver.onTextureFrameCaptured(captureFormat.width, captureFormat.height, oesTextureId,
|
| - transformMatrix, rotation, timestampNs);
|
| + RendererCommon.verticalFlipMatrix(), getFrameOrientation(), timestampNs);
|
| }
|
| }
|
|
|