webrtc/api/java/jni/androidmediadecoder_jni.cc - Issue 1840193007: Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer

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

Issue 1840193007: Android: Handle SurfaceTextureHelper ctor failure for decoder and capturer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Change whitespace alignment 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

« webrtc/api/java/android/org/webrtc/SurfaceTextureHelper.java ('K') | « webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java ('k') | webrtc/api/java/jni/androidvideocapturer_jni.cc » ('j') | webrtc/api/java/jni/surfacetexturehelper_jni.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/api/java/jni/androidmediadecoder_jni.cc

diff --git a/webrtc/api/java/jni/androidmediadecoder_jni.cc b/webrtc/api/java/jni/androidmediadecoder_jni.cc

index a0e5579c37c32aea84ba74293b4a8a5d6bec1ab4..11c8d66f20456e8ef108af41e6ed7ea966e63060 100644

--- a/webrtc/api/java/jni/androidmediadecoder_jni.cc

+++ b/webrtc/api/java/jni/androidmediadecoder_jni.cc

@@ -345,8 +345,13 @@ int32_t MediaCodecVideoDecoder::InitDecodeOnCodecThread() {

ResetVariables();

if (use_surface_) {

- surface_texture_helper_ = new rtc::RefCountedObject<SurfaceTextureHelper>(

+ surface_texture_helper_ = SurfaceTextureHelper::create(

jni, "Decoder SurfaceTextureHelper", render_egl_context_);

+ if (!surface_texture_helper_) {

+ ALOGE << "Couldn't create SurfaceTextureHelper - fallback to SW codec";

+ sw_fallback_required_ = true;

+ return WEBRTC_VIDEO_CODEC_ERROR;

+ }

}

jobject j_video_codec_enum = JavaEnumFromIndexAndClassName(