webrtc/api/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java - Issue 1950953002: Revert of Android GlDrawer: Add frame size as argument to draw functions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/api/androidtests/src/org/webrtc/SurfaceTextureHelperTest.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

« no previous file with comments | « webrtc/api/androidtests/src/org/webrtc/GlRectDrawerTest.java ('k') | webrtc/api/java/android/org/webrtc/GlRectDrawer.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/api/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java

diff --git a/webrtc/api/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java b/webrtc/api/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java

index a2a33917098c673db95fb545831e24366a560886..c5b9ec430e83aa7e8cea92505bc87ba0baa8674b 100644

--- a/webrtc/api/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java

+++ b/webrtc/api/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java

@@ -131,8 +131,7 @@

// Wait for an OES texture to arrive and draw it onto the pixel buffer.

listener.waitForNewFrame();

eglBase.makeCurrent();

- drawer.drawOes(listener.oesTextureId, listener.transformMatrix, width, height,

- 0, 0, width, height);

+ drawer.drawOes(listener.oesTextureId, listener.transformMatrix, 0, 0, width, height);

surfaceTextureHelper.returnTextureFrame();

@@ -203,8 +202,7 @@

// Draw the pending texture frame onto the pixel buffer.

eglBase.makeCurrent();

final GlRectDrawer drawer = new GlRectDrawer();

- drawer.drawOes(listener.oesTextureId, listener.transformMatrix, width, height,

- 0, 0, width, height);

+ drawer.drawOes(listener.oesTextureId, listener.transformMatrix, 0, 0, width, height);

drawer.release();

// Download the pixels in the pixel buffer as RGBA. Not all platforms support RGB, e.g. Nexus 9.