From 0cbe05cc8692c4bf5519633a44160e0704786777 Mon Sep 17 00:00:00 2001 From: Magnus Jedvert Date: Tue, 10 Jul 2018 10:33:15 +0200 Subject: [PATCH] Android: Remove custom matrix helper functions in RendererCommon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9487 Change-Id: I2b5720d55cae9684a7ef2b14cabce262a5321ef0 Reviewed-on: https://webrtc-review.googlesource.com/87820 Reviewed-by: Sami Kalliomäki Commit-Queue: Magnus Jedvert Cr-Commit-Position: refs/heads/master@{#24183} --- .../api/org/webrtc/RendererCommon.java | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/sdk/android/api/org/webrtc/RendererCommon.java b/sdk/android/api/org/webrtc/RendererCommon.java index d6472393f7..f039a06f29 100644 --- a/sdk/android/api/org/webrtc/RendererCommon.java +++ b/sdk/android/api/org/webrtc/RendererCommon.java @@ -118,57 +118,6 @@ public class RendererCommon { // The minimum fraction of the frame content that will be shown for |SCALE_ASPECT_BALANCED|. // This limits excessive cropping when adjusting display size. private static float BALANCED_VISIBLE_FRACTION = 0.5625f; - // clang-format off - @Deprecated - public static final float[] identityMatrix() { - return new float[] { - 1, 0, 0, 0, - 0, 1, 0, 0, - 0, 0, 1, 0, - 0, 0, 0, 1}; - } - // Matrix with transform y' = 1 - y. - @Deprecated - public static final float[] verticalFlipMatrix() { - return new float[] { - 1, 0, 0, 0, - 0, -1, 0, 0, - 0, 0, 1, 0, - 0, 1, 0, 1}; - } - - // Matrix with transform x' = 1 - x. - @Deprecated - public static final float[] horizontalFlipMatrix() { - return new float[] { - -1, 0, 0, 0, - 0, 1, 0, 0, - 0, 0, 1, 0, - 1, 0, 0, 1}; - } - // clang-format on - - /** - * Returns texture matrix that will have the effect of rotating the frame |rotationDegree| - * clockwise when rendered. - */ - @Deprecated - public static float[] rotateTextureMatrix(float[] textureMatrix, float rotationDegree) { - final float[] rotationMatrix = new float[16]; - Matrix.setRotateM(rotationMatrix, 0, rotationDegree, 0, 0, 1); - adjustOrigin(rotationMatrix); - return multiplyMatrices(textureMatrix, rotationMatrix); - } - - /** - * Returns new matrix with the result of a * b. - */ - @Deprecated - public static float[] multiplyMatrices(float[] a, float[] b) { - final float[] resultMatrix = new float[16]; - Matrix.multiplyMM(resultMatrix, 0, a, 0, b, 0); - return resultMatrix; - } /** * Returns layout transformation matrix that applies an optional mirror effect and compensates