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

Adding data channel ID to Java binding of DataChannel.

Browse Source 
BUG=webrtc:6106

Review-Url: https://codereview.webrtc.org/2466993002
Cr-Commit-Position: refs/heads/master@{#14879}
This commit is contained in:
deadbeef
2016-11-01 14:59:00 -07:00
committed by Commit bot
parent 8a44e1d87b
commit ee8ad2bb0f
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/api/android/java/src/org/webrtc/DataChannel.java
View File

@ -98,6 +98,8 @@ public class DataChannel {
public native String label(); public native String label();
public native int id();
public native State state(); public native State state();
/** /**

7
webrtc/api/android/jni/peerconnection_jni.cc
View File

@ -856,6 +856,13 @@ JOW(jstring, DataChannel_label)(JNIEnv* jni, jobject j_dc) {
return JavaStringFromStdString(jni, ExtractNativeDC(jni, j_dc)->label()); return JavaStringFromStdString(jni, ExtractNativeDC(jni, j_dc)->label());
} }
JOW(jint, DataChannel_id)(JNIEnv* jni, jobject j_dc) {
int id = ExtractNativeDC(jni, j_dc)->id();
RTC_CHECK_LE(id, std::numeric_limits<int32_t>::max())
<< "id overflowed jint!";
return static_cast<jint>(id);
}
JOW(jobject, DataChannel_state)(JNIEnv* jni, jobject j_dc) { JOW(jobject, DataChannel_state)(JNIEnv* jni, jobject j_dc) {
return JavaEnumFromIndex( return JavaEnumFromIndex(
jni, "DataChannel$State", ExtractNativeDC(jni, j_dc)->state()); jni, "DataChannel$State", ExtractNativeDC(jni, j_dc)->state());