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 9d66f830b088a278090c611276b947b7359b7da2..48548cce562341b0cc9aafa406cfe756330ab4af 100644 |
--- a/webrtc/api/java/jni/androidmediadecoder_jni.cc |
+++ b/webrtc/api/java/jni/androidmediadecoder_jni.cc |
@@ -344,8 +344,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_) { |
AlexG
2016/03/31 23:03:22
Better to fallback to SW codec in this case - byte
magjed_webrtc
2016/05/04 09:51:51
Done.
|
+ ALOGE << "Couldn't create SurfaceTextureHelper -" |
+ " falling back to byte buffer output"; |
+ use_surface_ = false; |
+ } |
} |
jobject j_video_codec_enum = JavaEnumFromIndexAndClassName( |