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

Removed ability to set CryptoOptions through PeerConnectionFactory from bindings.

Browse Source 
This change removes the ability to set CryptoOptions through the PeerConnection
Factory in both Java and IOS. Native will be removed after the Chromium change
lands. The semantics have been changed such that these options should only be
set on individual PeerConnections and not directly on the Factory itself. This
allows for more flexibility in setting CryptoOptions for PeerConnections which
are created as part of a factory.

Bug: webrtc:10020
Change-Id: I9ef3d431e728927b9ced5de6188cedeb2671254b
Reviewed-on: https://webrtc-review.googlesource.com/c/111560
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25736}
This commit is contained in:
Benjamin Wright
2018-11-20 13:02:37 -08:00
committed by Commit Bot
parent a526ae65cc
commit e4cccae299
4 changed files with 0 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sdk/android/src/jni/pc/peerconnectionfactory.cc
View File

@ -50,12 +50,6 @@ JavaToNativePeerConnectionFactoryOptions(JNIEnv* jni,
bool disable_encryption = Java_Options_getDisableEncryption(jni, options);
bool disable_network_monitor =
Java_Options_getDisableNetworkMonitor(jni, options);
bool enable_aes128_sha1_32_crypto_cipher =
Java_Options_getEnableAes128Sha1_32CryptoCipher(jni, options);
bool enable_gcm_crypto_suites =
Java_Options_getEnableGcmCryptoSuites(jni, options);
bool require_frame_encryption =
Java_Options_getRequireFrameEncryption(jni, options);
PeerConnectionFactoryInterface::Options native_options;
@ -65,13 +59,6 @@ JavaToNativePeerConnectionFactoryOptions(JNIEnv* jni,
native_options.disable_encryption = disable_encryption;
native_options.disable_network_monitor = disable_network_monitor;
native_options.crypto_options.srtp.enable_aes128_sha1_32_crypto_cipher =
enable_aes128_sha1_32_crypto_cipher;
native_options.crypto_options.srtp.enable_gcm_crypto_suites =
enable_gcm_crypto_suites;
native_options.crypto_options.sframe.require_frame_encryption =
require_frame_encryption;
return native_options;
}