Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Unified Diff: webrtc/api/java/jni/androidmediadecoder_jni.cc

Issue 1783793002: VideoCapturer: Update interface (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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
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 e1b84d7373b556b66d000185637092d535cb4102..92d8583bc71264e5c22dbfeab9a1d8782f767ef3 100644
--- a/webrtc/api/java/jni/androidmediadecoder_jni.cc
+++ b/webrtc/api/java/jni/androidmediadecoder_jni.cc
@@ -343,19 +343,9 @@ int32_t MediaCodecVideoDecoder::InitDecodeOnCodecThread() {
ResetVariables();
- jobject java_surface_texture_helper_ = nullptr;
if (use_surface_) {
- java_surface_texture_helper_ = jni->CallStaticObjectMethod(
- FindClass(jni, "org/webrtc/SurfaceTextureHelper"),
- GetStaticMethodID(jni,
- FindClass(jni, "org/webrtc/SurfaceTextureHelper"),
- "create",
- "(Lorg/webrtc/EglBase$Context;)"
- "Lorg/webrtc/SurfaceTextureHelper;"),
- render_egl_context_);
- RTC_CHECK(java_surface_texture_helper_ != nullptr);
surface_texture_helper_ = new rtc::RefCountedObject<SurfaceTextureHelper>(
- jni, java_surface_texture_helper_);
+ jni, render_egl_context_);
}
jobject j_video_codec_enum = JavaEnumFromIndexAndClassName(
@@ -366,7 +356,8 @@ int32_t MediaCodecVideoDecoder::InitDecodeOnCodecThread() {
j_video_codec_enum,
codec_.width,
codec_.height,
- java_surface_texture_helper_);
+ use_surface_ ? surface_texture_helper_->GetJavaSurfaceTextureHelper()
+ : nullptr);
if (CheckException(jni) || !success) {
ALOGE << "Codec initialization error - fallback to SW codec.";

Powered by Google App Engine
This is Rietveld 408576698