diff --git a/sdk/android/api/org/webrtc/PeerConnectionFactory.java b/sdk/android/api/org/webrtc/PeerConnectionFactory.java index b880f9b6ed..04806b868b 100644 --- a/sdk/android/api/org/webrtc/PeerConnectionFactory.java +++ b/sdk/android/api/org/webrtc/PeerConnectionFactory.java @@ -196,7 +196,7 @@ public class PeerConnectionFactory { ContextUtils.initialize(options.applicationContext); NativeLibrary.initialize(options.nativeLibraryLoader); nativeInitializeAndroidGlobals(options.enableVideoHwAcceleration); - initializeFieldTrials(options.fieldTrials); + nativeInitializeFieldTrials(options.fieldTrials); if (options.enableInternalTracer && !internalTracerInitialized) { initializeInternalTracer(); } @@ -247,36 +247,6 @@ public class PeerConnectionFactory { nativeStopInternalTracingCapture(); } - @Deprecated - public PeerConnectionFactory() { - this(null); - } - - // Note: initializeAndroidGlobals must be called at least once before - // constructing a PeerConnectionFactory. - @Deprecated - public PeerConnectionFactory(Options options) { - this(options, null /* encoderFactory */, null /* decoderFactory */); - } - - @Deprecated - public PeerConnectionFactory( - Options options, VideoEncoderFactory encoderFactory, VideoDecoderFactory decoderFactory) { - checkInitializeHasBeenCalled(); - nativeFactory = nativeCreatePeerConnectionFactory(ContextUtils.getApplicationContext(), options, - 0 /* audioDeviceModule */, encoderFactory, decoderFactory, 0, 0); - if (nativeFactory == 0) { - throw new RuntimeException("Failed to initialize PeerConnectionFactory!"); - } - } - - @Deprecated - public PeerConnectionFactory(Options options, VideoEncoderFactory encoderFactory, - VideoDecoderFactory decoderFactory, AudioProcessingFactory audioProcessingFactory) { - this(options, new LegacyAudioDeviceModule(), encoderFactory, decoderFactory, - audioProcessingFactory, null /* fecControllerFactoryFactory */); - } - private PeerConnectionFactory(Options options, @Nullable AudioDeviceModule audioDeviceModule, @Nullable VideoEncoderFactory encoderFactory, @Nullable VideoDecoderFactory decoderFactory, @Nullable AudioProcessingFactory audioProcessingFactory, @@ -391,11 +361,6 @@ public class PeerConnectionFactory { nativeStopAecDump(nativeFactory); } - @Deprecated - public void setOptions(Options options) { - nativeSetOptions(nativeFactory, options); - } - /** Set the EGL context used by HW Video encoding and decoding. * * @param localEglContext Must be the same as used by VideoCapturerAndroid and any local video @@ -484,9 +449,6 @@ public class PeerConnectionFactory { private static native void nativeInitializeAndroidGlobals(boolean videoHwAcceleration); private static native void nativeInitializeFieldTrials(String fieldTrialsInitString); private static native String nativeFindFieldTrialsFullName(String name); - // Internal tracing initialization. Must be called before PeerConnectionFactory is created to - // prevent racing with tracing code. - // Deprecated, use PeerConnectionFactory.initialize instead. private static native void nativeInitializeInternalTracer(); // Internal tracing shutdown, called to prevent resource leaks. Must be called after // PeerConnectionFactory is gone to prevent races with code performing tracing. @@ -508,7 +470,6 @@ public class PeerConnectionFactory { private static native boolean nativeStartAecDump( long factory, int file_descriptor, int filesize_limit_bytes); private static native void nativeStopAecDump(long factory); - @Deprecated public native void nativeSetOptions(long factory, Options options); private static native void nativeSetVideoHwAccelerationOptions( long factory, Object localEGLContext, Object remoteEGLContext); private static native void nativeInvokeThreadsCallbacks(long factory); diff --git a/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java b/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java index aa249449c3..f20608b1c8 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java @@ -336,7 +336,7 @@ class CameraVideoCapturerTestFixtures { PeerConnectionFactory.InitializationOptions.builder(testObjectFactory.getAppContext()) .createInitializationOptions()); - this.peerConnectionFactory = new PeerConnectionFactory(null /* options */); + this.peerConnectionFactory = PeerConnectionFactory.builder().createPeerConnectionFactory(); this.testObjectFactory = testObjectFactory; } diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java index 86b84f4402..08d9ea0716 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java @@ -642,8 +642,7 @@ public class PeerConnectionTest { @Test @SmallTest public void testCreationWithConfig() throws Exception { - PeerConnectionFactory.Options options = new PeerConnectionFactory.Options(); - PeerConnectionFactory factory = new PeerConnectionFactory(options); + PeerConnectionFactory factory = PeerConnectionFactory.builder().createPeerConnectionFactory(); List iceServers = Arrays.asList( PeerConnection.IceServer.builder("stun:stun.l.google.com:19302").createIceServer(), PeerConnection.IceServer.builder("turn:fake.example.com") @@ -669,7 +668,8 @@ public class PeerConnectionTest { // have those. PeerConnectionFactory.Options options = new PeerConnectionFactory.Options(); options.networkIgnoreMask = 0; - PeerConnectionFactory factory = new PeerConnectionFactory(options); + PeerConnectionFactory factory = + PeerConnectionFactory.builder().setOptions(options).createPeerConnectionFactory(); List iceServers = new ArrayList<>(); iceServers.add( @@ -908,7 +908,8 @@ public class PeerConnectionTest { // have those. PeerConnectionFactory.Options options = new PeerConnectionFactory.Options(); options.networkIgnoreMask = 0; - PeerConnectionFactory factory = new PeerConnectionFactory(options); + PeerConnectionFactory factory = + PeerConnectionFactory.builder().setOptions(options).createPeerConnectionFactory(); List iceServers = new ArrayList<>(); iceServers.add( @@ -1062,7 +1063,8 @@ public class PeerConnectionTest { // have those. PeerConnectionFactory.Options options = new PeerConnectionFactory.Options(); options.networkIgnoreMask = 0; - PeerConnectionFactory factory = new PeerConnectionFactory(options); + PeerConnectionFactory factory = + PeerConnectionFactory.builder().setOptions(options).createPeerConnectionFactory(); List iceServers = new ArrayList<>(); iceServers.add( @@ -1255,8 +1257,7 @@ public class PeerConnectionTest { @Test @MediumTest public void testRemoteStreamUpdatedWhenTracksAddedOrRemoved() throws Exception { - PeerConnectionFactory.Options options = new PeerConnectionFactory.Options(); - PeerConnectionFactory factory = new PeerConnectionFactory(options); + PeerConnectionFactory factory = PeerConnectionFactory.builder().createPeerConnectionFactory(); // This test is fine with no ICE servers. List iceServers = new ArrayList<>(); diff --git a/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java b/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java index ebee38dd64..3b4f09269e 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/WebRtcJniBootTest.java @@ -28,8 +28,6 @@ public class WebRtcJniBootTest { PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions .builder(InstrumentationRegistry.getTargetContext()) .createInitializationOptions()); - - PeerConnectionFactory.Options options = new PeerConnectionFactory.Options(); - new PeerConnectionFactory(options); + PeerConnectionFactory.builder().createPeerConnectionFactory(); } } diff --git a/sdk/android/src/jni/pc/peerconnectionfactory.cc b/sdk/android/src/jni/pc/peerconnectionfactory.cc index 481d904aa0..105be31a16 100644 --- a/sdk/android/src/jni/pc/peerconnectionfactory.cc +++ b/sdk/android/src/jni/pc/peerconnectionfactory.cc @@ -412,28 +412,6 @@ static void JNI_PeerConnectionFactory_StopAecDump(JNIEnv* jni, factory->StopAecDump(); } -static void JNI_PeerConnectionFactory_SetOptions( - JNIEnv* jni, - const JavaParamRef&, - jlong native_factory, - const JavaParamRef& options) { - rtc::scoped_refptr factory( - factoryFromJava(native_factory)); - PeerConnectionFactoryInterface::Options options_to_set = - JavaToNativePeerConnectionFactoryOptions(jni, options); - factory->SetOptions(options_to_set); - - if (options_to_set.disable_network_monitor) { - OwnedFactoryAndThreads* owner = - reinterpret_cast(native_factory); - if (owner->network_monitor_factory()) { - rtc::NetworkMonitorFactory::ReleaseFactory( - owner->network_monitor_factory()); - owner->clear_network_monitor_factory(); - } - } -} - static jlong JNI_PeerConnectionFactory_CreatePeerConnection( JNIEnv* jni, const JavaParamRef&,