talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java - Issue 1403713002: MediaCodecVideoEncoder add support to encode from textures

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: talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java

Issue 1403713002: MediaCodecVideoEncoder add support to encode from textures (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Fixed tests Created 5 years, 1 month 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

« talk/app/webrtc/java/android/org/webrtc/EglBase.java ('K') | « talk/app/webrtc/java/android/org/webrtc/EglBase.java ('k') | talk/app/webrtc/java/jni/androidmediaencoder_jni.h » ('j') | talk/app/webrtc/java/jni/androidmediaencoder_jni.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java

diff --git a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java

index c4785c9913f34527a4c09fbddbcaaa9b18e2eecf..cc52e3177781026042041ab525bcd7392743b54d 100644

--- a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java

+++ b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java

@@ -174,7 +174,7 @@ public class SurfaceViewRenderer extends SurfaceView

@Override public void run() {

synchronized (layoutLock) {

if (isSurfaceCreated) {

- eglBase.createSurface(getHolder());

+ eglBase.createSurface(getHolder().getSurface());

magjed_webrtc 2015/11/18 13:12:52 Rebase against master.

perkj_webrtc 2015/11/18 14:51:20 dito- this will go away once the decoder patch has

eglBase.makeCurrent();

// Necessary for YUV frames with odd width.

GLES20.glPixelStorei(GLES20.GL_UNPACK_ALIGNMENT, 1);