talk/app/webrtc/java/jni/surfacetexturehelper_jni.cc - Issue 1394103005: Revert "Android MediaCodecVideoDecoder: Manage lifetime of texture frames"

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/jni/surfacetexturehelper_jni.cc

Issue 1394103005: Revert "Android MediaCodecVideoDecoder: Manage lifetime of texture frames" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Uncomment android capture code and add bug number Created 5 years, 2 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 | « talk/app/webrtc/java/jni/surfacetexturehelper_jni.h ('k') | talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: talk/app/webrtc/java/jni/surfacetexturehelper_jni.cc

diff --git a/talk/app/webrtc/java/jni/surfacetexturehelper_jni.cc b/talk/app/webrtc/java/jni/surfacetexturehelper_jni.cc

index ad1db1a5f4bed1afad249ef1220330d46cf3bbf2..9e1092f2d40c7260ae14579a413a9f5f463f5674 100644

--- a/talk/app/webrtc/java/jni/surfacetexturehelper_jni.cc

+++ b/talk/app/webrtc/java/jni/surfacetexturehelper_jni.cc

@@ -68,7 +68,7 @@ void SurfaceTextureHelper::ReturnTextureFrame() const {

rtc::scoped_refptr<webrtc::VideoFrameBuffer>

SurfaceTextureHelper::CreateTextureFrame(int width, int height,

- const NativeHandleImpl& native_handle) {

+ const NativeTextureHandleImpl& native_handle) {

return new rtc::RefCountedObject<AndroidTextureBuffer>(

width, height, native_handle,

rtc::Bind(&SurfaceTextureHelper::ReturnTextureFrame, this));