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

Revert "Add bindings for simulcast and RIDs in Android SDK."

Browse Source 
This reverts commit 177670afd6d4aa414e4aa75983da538b7f350ee8.

Reason for revert: Fails android_instrumentation_test_apk:
https://ci.chromium.org/p/webrtc/builders/ci/Android64%20(M%20Nexus5X)/11553

Original change's description:
> Add bindings for simulcast and RIDs in Android SDK.
>
> This adds the bindings for rid in RtpParameters.Encoding and bindings
> for send_encodings in RtpTransceiverInit to allow creating a transceiver
> with multiple send encodings.
>
> Bug: webrtc:10464
> Change-Id: I4c205dc0f466768c63b7efcb3c68e93277236da0
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/128960
> Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
> Reviewed-by: Seth Hampson <shampson@webrtc.org>
> Commit-Queue: Amit Hilbuch <amithi@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27323}

TBR=magjed@webrtc.org,shampson@webrtc.org,amithi@webrtc.org

Change-Id: Id6c4e2d41c3c2fbfad31baed907cfa73d82ef14a
No-Tree-Checks: True
No-Try: True
Bug: webrtc:10464
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130466
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27354}
This commit is contained in:
Oleh Prypin
2019-03-29 15:29:51 +00:00
committed by Commit Bot
parent d9b62d3228
commit e8bc3a0a5a
5 changed files with 4 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sdk/android/src/jni/pc/rtp_parameters.cc
View File

@ -24,8 +24,7 @@ ScopedJavaLocalRef<jobject> NativeToJavaRtpEncodingParameter(
JNIEnv* env,
const RtpEncodingParameters& encoding) {
return Java_Encoding_Constructor(
env, NativeToJavaString(env, encoding.rid), encoding.active,
NativeToJavaInteger(env, encoding.max_bitrate_bps),
env, encoding.active, NativeToJavaInteger(env, encoding.max_bitrate_bps),
NativeToJavaInteger(env, encoding.min_bitrate_bps),
NativeToJavaInteger(env, encoding.max_framerate),
NativeToJavaInteger(env, encoding.num_temporal_layers),
@ -65,11 +64,6 @@ RtpEncodingParameters JavaToNativeRtpEncodingParameters(
JNIEnv* jni,
const JavaRef<jobject>& j_encoding_parameters) {
RtpEncodingParameters encoding;
ScopedJavaLocalRef<jstring> j_rid =
Java_Encoding_getRid(jni, j_encoding_parameters);
if (!IsNull(jni, j_rid)) {
encoding.rid = JavaToNativeString(jni, j_rid);
}
encoding.active = Java_Encoding_getActive(jni, j_encoding_parameters);
ScopedJavaLocalRef<jobject> j_max_bitrate =
Java_Encoding_getMaxBitrateBps(jni, j_encoding_parameters);

6
sdk/android/src/jni/pc/rtp_transceiver.cc
View File

@ -48,12 +48,6 @@ RtpTransceiverInit JavaToNativeRtpTransceiverInit(
Java_RtpTransceiverInit_getStreamIds(jni, j_init);
init.stream_ids = JavaListToNativeVector<std::string, jstring>(
jni, j_stream_ids, &JavaToNativeString);
// Convert the send encodings.
ScopedJavaLocalRef<jobject> j_send_encodings =
Java_RtpTransceiverInit_getSendEncodings(jni, j_init);
init.send_encodings = JavaListToNativeVector<RtpEncodingParameters, jobject>(
jni, j_send_encodings, &JavaToNativeRtpEncodingParameters);
return init;
}