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

24
webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java
View File

@ -50,16 +50,18 @@ public class PeerConnectionFactory {
public boolean disableNetworkMonitor;
}
// |context| is an android.content.Context object, but we keep it untyped here
// to allow building on non-Android platforms.
// Callers may specify either |initializeAudio| or |initializeVideo| as false
// to skip initializing the respective engine (and avoid the need for the
// respective permissions).
// |renderEGLContext| can be provided to suport HW video decoding to
// texture and will be used to create a shared EGL context on video
// decoding thread.
public static native boolean initializeAndroidGlobals(Object context, boolean initializeAudio,
boolean initializeVideo, boolean videoHwAcceleration);
// Must be called at least once before creating a PeerConnectionFactory
// (for example, at application startup time).
public static native void initializeAndroidGlobals(
android.content.Context context, boolean videoHwAcceleration);
// Older signature of initializeAndroidGlobals. The extra parameters are now meaningless.
@Deprecated
public static boolean initializeAndroidGlobals(android.content.Context context,
boolean initializeAudio, boolean initializeVideo, boolean videoHwAcceleration) {
initializeAndroidGlobals(context, videoHwAcceleration);
return true;
}
// Field trial initialization. Must be called before PeerConnectionFactory
// is created.
@ -90,6 +92,8 @@ public class PeerConnectionFactory {
this(null);
}
// Note: initializeAndroidGlobals must be called at least once before
// constructing a PeerConnectionFactory.
public PeerConnectionFactory(Options options) {
nativeFactory = nativeCreatePeerConnectionFactory(options);
if (nativeFactory == 0) {