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

Introduce CreateDataChannelOrError

Browse Source 
Deprecate CreateDataChannel, and make it a simple wrapper function.

Bug: webrtc:12796
Change-Id: I053d75a264596ba87ca734a29df9241de93a80c3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219784
Reviewed-by: Xavier Lepaul‎ <xalep@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34130}
This commit is contained in:
Harald Alvestrand
2021-05-21 13:33:51 +00:00
committed by WebRTC LUCI CQ
parent 0d0ed76ac1
commit a9af50f151
12 changed files with 60 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/android/src/jni/pc/peer_connection.cc
View File

@ -538,10 +538,12 @@ static ScopedJavaLocalRef<jobject> JNI_PeerConnection_CreateDataChannel(
const JavaParamRef<jstring>& j_label,
const JavaParamRef<jobject>& j_init) {
DataChannelInit init = JavaToNativeDataChannelInit(jni, j_init);
rtc::scoped_refptr<DataChannelInterface> channel(
ExtractNativePC(jni, j_pc)->CreateDataChannel(
JavaToNativeString(jni, j_label), &init));
return WrapNativeDataChannel(jni, channel);
auto result = ExtractNativePC(jni, j_pc)->CreateDataChannelOrError(
JavaToNativeString(jni, j_label), &init);
if (!result.ok()) {
return WrapNativeDataChannel(jni, nullptr);
}
return WrapNativeDataChannel(jni, result.MoveValue());
}
static void JNI_PeerConnection_CreateOffer(