Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(961)

Unified Diff: webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java

Issue 2377003002: Format all Java in WebRTC. (Closed)
Patch Set: Manual changes. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java
diff --git a/webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java b/webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java
index 0595e2be210d7b1e49eb4080196d22b27cd5a50d..a3816e6e39622cc8afb700a06868749ea9f2ae64 100644
--- a/webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java
+++ b/webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java
@@ -26,8 +26,7 @@ import java.util.Map;
*/
public class GlRectDrawer implements RendererCommon.GlDrawer {
// Simple vertex shader, used for both YUV and OES.
- private static final String VERTEX_SHADER_STRING =
- "varying vec2 interp_tc;\n"
+ private static final String VERTEX_SHADER_STRING = "varying vec2 interp_tc;\n"
magjed_webrtc 2016/09/28 13:45:04 I don't like this change - revert and add // clang
+ "attribute vec4 in_pos;\n"
+ "attribute vec4 in_tc;\n"
+ "\n"
@@ -38,8 +37,7 @@ public class GlRectDrawer implements RendererCommon.GlDrawer {
+ " interp_tc = (texMatrix * in_tc).xy;\n"
+ "}\n";
- private static final String YUV_FRAGMENT_SHADER_STRING =
- "precision mediump float;\n"
+ private static final String YUV_FRAGMENT_SHADER_STRING = "precision mediump float;\n"
+ "varying vec2 interp_tc;\n"
+ "\n"
+ "uniform sampler2D y_tex;\n"
@@ -56,8 +54,7 @@ public class GlRectDrawer implements RendererCommon.GlDrawer {
+ " y + 1.77 * u, 1);\n"
+ "}\n";
- private static final String RGB_FRAGMENT_SHADER_STRING =
- "precision mediump float;\n"
+ private static final String RGB_FRAGMENT_SHADER_STRING = "precision mediump float;\n"
+ "varying vec2 interp_tc;\n"
+ "\n"
+ "uniform sampler2D rgb_tex;\n"
@@ -67,7 +64,7 @@ public class GlRectDrawer implements RendererCommon.GlDrawer {
+ "}\n";
private static final String OES_FRAGMENT_SHADER_STRING =
- "#extension GL_OES_EGL_image_external : require\n"
+ "#extension GL_OES_EGL_image_external : require\n"
+ "precision mediump float;\n"
+ "varying vec2 interp_tc;\n"
+ "\n"
@@ -79,22 +76,20 @@ public class GlRectDrawer implements RendererCommon.GlDrawer {
// Vertex coordinates in Normalized Device Coordinates, i.e. (-1, -1) is bottom-left and (1, 1) is
// top-right.
- private static final FloatBuffer FULL_RECTANGLE_BUF =
- GlUtil.createFloatBuffer(new float[] {
- -1.0f, -1.0f, // Bottom left.
- 1.0f, -1.0f, // Bottom right.
- -1.0f, 1.0f, // Top left.
- 1.0f, 1.0f, // Top right.
- });
+ private static final FloatBuffer FULL_RECTANGLE_BUF = GlUtil.createFloatBuffer(new float[] {
magjed_webrtc 2016/09/28 13:45:04 this change is fine though
+ -1.0f, -1.0f, // Bottom left.
+ 1.0f, -1.0f, // Bottom right.
+ -1.0f, 1.0f, // Top left.
+ 1.0f, 1.0f, // Top right.
+ });
// Texture coordinates - (0, 0) is bottom-left and (1, 1) is top-right.
- private static final FloatBuffer FULL_RECTANGLE_TEX_BUF =
- GlUtil.createFloatBuffer(new float[] {
- 0.0f, 0.0f, // Bottom left.
- 1.0f, 0.0f, // Bottom right.
- 0.0f, 1.0f, // Top left.
- 1.0f, 1.0f // Top right.
- });
+ private static final FloatBuffer FULL_RECTANGLE_TEX_BUF = GlUtil.createFloatBuffer(new float[] {
+ 0.0f, 0.0f, // Bottom left.
+ 1.0f, 0.0f, // Bottom right.
+ 0.0f, 1.0f, // Top left.
+ 1.0f, 1.0f // Top right.
+ });
private static class Shader {
public final GlShader glShader;

Powered by Google App Engine
This is Rietveld 408576698