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

Unified Diff: webrtc/api/java/android/org/webrtc/VideoRendererGui.java

Issue 1950953002: Revert of Android GlDrawer: Add frame size as argument to draw functions (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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/java/android/org/webrtc/VideoRendererGui.java
diff --git a/webrtc/api/java/android/org/webrtc/VideoRendererGui.java b/webrtc/api/java/android/org/webrtc/VideoRendererGui.java
index e292bac2ef22f499979d67ff637a47e5d6f7a31e..82417d6afcb2e60fe2971ab156e51a1d2cf502fe 100644
--- a/webrtc/api/java/android/org/webrtc/VideoRendererGui.java
+++ b/webrtc/api/java/android/org/webrtc/VideoRendererGui.java
@@ -243,8 +243,7 @@
GlUtil.checkNoGLES2Error("glBindFramebuffer");
// Copy the OES texture content. This will also normalize the sampling matrix.
- drawer.drawOes(pendingFrame.textureId, rotatedSamplingMatrix,
- textureCopy.getWidth(), textureCopy.getHeight(),
+ drawer.drawOes(pendingFrame.textureId, rotatedSamplingMatrix,
0, 0, textureCopy.getWidth(), textureCopy.getHeight());
rotatedSamplingMatrix = RendererCommon.identityMatrix();
@@ -264,10 +263,10 @@
// OpenGL defaults to lower left origin - flip viewport position vertically.
final int viewportY = screenHeight - displayLayout.bottom;
if (rendererType == RendererType.RENDERER_YUV) {
- drawer.drawYuv(yuvTextures, texMatrix, videoWidth, videoHeight,
+ drawer.drawYuv(yuvTextures, texMatrix,
displayLayout.left, viewportY, displayLayout.width(), displayLayout.height());
} else {
- drawer.drawRgb(textureCopy.getTextureId(), texMatrix, videoWidth, videoHeight,
+ drawer.drawRgb(textureCopy.getTextureId(), texMatrix,
displayLayout.left, viewportY, displayLayout.width(), displayLayout.height());
}

Powered by Google App Engine
This is Rietveld 408576698