talk/app/webrtc/java/jni/androidvideocapturer_jni.h - 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/androidvideocapturer_jni.h

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

Patch Set: Fork NativeHandleImpl and disable texture capture, plus some revert rebase nits 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/androidmediadecoder_jni.cc ('k') | talk/app/webrtc/java/jni/androidvideocapturer_jni.cc » ('j') | talk/app/webrtc/java/jni/androidvideocapturer_jni.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: talk/app/webrtc/java/jni/androidvideocapturer_jni.h

diff --git a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h

index 0a88df6f4f5505518f00be3191165d472df87774..360674bb70c00f79670357b81429328b39d9cf26 100644

--- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h

+++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h

@@ -39,7 +39,7 @@

namespace webrtc_jni {

-class NativeHandleImpl;

+class NativeTextureHandleImpl;

// AndroidVideoCapturerJni implements AndroidVideoCapturerDelegate.

// The purpose of the delegate is to hide the JNI specifics from the C++ only

@@ -61,7 +61,7 @@ class AndroidVideoCapturerJni : public webrtc::AndroidVideoCapturerDelegate {

void OnMemoryBufferFrame(void* video_frame, int length, int width,

int height, int rotation, int64_t timestamp_ns);

void OnTextureFrame(int width, int height, int64_t timestamp_ns,

- const NativeHandleImpl& handle);

+ const NativeTextureHandleImpl& handle);

void OnOutputFormatRequest(int width, int height, int fps);

protected: