zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing unnecessary parameters from initializeAndroidGlobals.

Browse Source 
The "initialize audio/video" parameters are no longer needed, but
at the same time were required to be true, causing a lot of confusion.
This CL removes them, but leaves the old method signature around,
marked "deprecated".

BUG=webrtc:3416
TBR=solenberg@webrtc.org

Review-Url: https://codereview.webrtc.org/2800353002
Cr-Commit-Position: refs/heads/master@{#17626}
This commit is contained in:
deadbeef
2017-04-10 15:08:02 -07:00
committed by Commit bot
parent 6799553a2c
commit b4fc73a3ab
12 changed files with 27 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/sdk/android/src/jni/DEPS
View File

@ -2,7 +2,7 @@ include_rules = [
"+third_party/libyuv",
"+webrtc/common_video/h264/h264_bitstream_parser.h",
"+webrtc/common_video/libyuv/include/webrtc_libyuv.h",
"+webrtc/modules/utility/include/jvm_android.h",
"+webrtc/modules/video_coding/utility/vp8_header_parser.h",
"+webrtc/pc",
"+webrtc/voice_engine/include/voe_base.h",
]

11
webrtc/sdk/android/src/jni/peerconnection_jni.cc
View File

@ -63,6 +63,7 @@
#include "webrtc/media/base/videocapturer.h"
#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
#include "webrtc/modules/utility/include/jvm_android.h"
#include "webrtc/system_wrappers/include/field_trial.h"
#include "webrtc/pc/webrtcsdp.h"
#include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
@ -1131,25 +1132,19 @@ JOW(jlong, PeerConnectionFactory_nativeCreateObserver)(
return (jlong)new PCOJava(jni, j_observer);
}
JOW(jboolean, PeerConnectionFactory_initializeAndroidGlobals)
JOW(void, PeerConnectionFactory_initializeAndroidGlobals)
(JNIEnv* jni,
jclass,
jobject context,
jboolean initialize_audio,
jboolean initialize_video,
jboolean video_hw_acceleration) {
bool failure = false;
video_hw_acceleration_enabled = video_hw_acceleration;
AndroidNetworkMonitor::SetAndroidContext(jni, context);
if (!factory_static_initialized) {
RTC_DCHECK(j_application_context == nullptr);
j_application_context = NewGlobalRef(jni, context);
if (initialize_audio)
failure |= webrtc::VoiceEngine::SetAndroidObjects(GetJVM(), context);
webrtc::JVM::Initialize(GetJVM(), context);
factory_static_initialized = true;
}
return !failure;
}
JOW(void, PeerConnectionFactory_initializeFieldTrials)(