From e8bc3a0a5ab6d7d36efbe4bf0742adac3dc49345 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Fri, 29 Mar 2019 15:29:51 +0000 Subject: [PATCH] Revert "Add bindings for simulcast and RIDs in Android SDK." 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 > Reviewed-by: Seth Hampson > Commit-Queue: Amit Hilbuch > 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 Reviewed-by: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#27354} --- sdk/android/api/org/webrtc/RtpParameters.java | 22 ++----------- .../api/org/webrtc/RtpTransceiver.java | 15 +-------- .../src/org/webrtc/PeerConnectionTest.java | 31 ------------------- sdk/android/src/jni/pc/rtp_parameters.cc | 8 +---- sdk/android/src/jni/pc/rtp_transceiver.cc | 6 ---- 5 files changed, 4 insertions(+), 78 deletions(-) diff --git a/sdk/android/api/org/webrtc/RtpParameters.java b/sdk/android/api/org/webrtc/RtpParameters.java index 56d39ee9f1..5fe36ef7ec 100644 --- a/sdk/android/api/org/webrtc/RtpParameters.java +++ b/sdk/android/api/org/webrtc/RtpParameters.java @@ -12,7 +12,6 @@ package org.webrtc; import android.support.annotation.Nullable; import java.lang.Double; -import java.lang.String; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -29,9 +28,6 @@ import org.webrtc.MediaStreamTrack; */ public class RtpParameters { public static class Encoding { - // If non-null, this represents the RID that identifies this encoding layer. - // RIDs are used to identify layers in simulcast. - @Nullable public String rid; // Set to true to cause this encoding to be sent, and false for it not to // be sent. public boolean active = true; @@ -52,17 +48,9 @@ public class RtpParameters { // Can't be changed between getParameters/setParameters. public Long ssrc; - // This constructor is useful for creating simulcast layers. - Encoding(String rid, boolean active, Double scaleResolutionDownBy) { - this.rid = rid; - this.active = active; - this.scaleResolutionDownBy = scaleResolutionDownBy; - } - @CalledByNative("Encoding") - Encoding(String rid, boolean active, Integer maxBitrateBps, Integer minBitrateBps, - Integer maxFramerate, Integer numTemporalLayers, Double scaleResolutionDownBy, Long ssrc) { - this.rid = rid; + Encoding(boolean active, Integer maxBitrateBps, Integer minBitrateBps, Integer maxFramerate, + Integer numTemporalLayers, Double scaleResolutionDownBy, Long ssrc) { this.active = active; this.maxBitrateBps = maxBitrateBps; this.minBitrateBps = minBitrateBps; @@ -72,12 +60,6 @@ public class RtpParameters { this.ssrc = ssrc; } - @Nullable - @CalledByNative("Encoding") - String getRid() { - return rid; - } - @CalledByNative("Encoding") boolean getActive() { return active; diff --git a/sdk/android/api/org/webrtc/RtpTransceiver.java b/sdk/android/api/org/webrtc/RtpTransceiver.java index 64d8eb41d1..7f875e6c8e 100644 --- a/sdk/android/api/org/webrtc/RtpTransceiver.java +++ b/sdk/android/api/org/webrtc/RtpTransceiver.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.webrtc.MediaStreamTrack; -import org.webrtc.RtpParameters; /** * Java wrapper for a C++ RtpTransceiverInterface. @@ -72,25 +71,18 @@ public class RtpTransceiver { public static final class RtpTransceiverInit { private final RtpTransceiverDirection direction; private final List streamIds; - private final List sendEncodings; public RtpTransceiverInit() { this(RtpTransceiverDirection.SEND_RECV); } public RtpTransceiverInit(RtpTransceiverDirection direction) { - this(direction, Collections.emptyList(), Collections.emptyList()); + this(direction, Collections.emptyList()); } public RtpTransceiverInit(RtpTransceiverDirection direction, List streamIds) { - this(direction, streamIds, Collections.emptyList()); - } - - public RtpTransceiverInit(RtpTransceiverDirection direction, List streamIds, - List sendEncodings) { this.direction = direction; this.streamIds = new ArrayList(streamIds); - this.sendEncodings = new ArrayList(sendEncodings); } @CalledByNative("RtpTransceiverInit") @@ -102,11 +94,6 @@ public class RtpTransceiver { List getStreamIds() { return new ArrayList(this.streamIds); } - - @CalledByNative("RtpTransceiverInit") - List getSendEncodings() { - return new ArrayList(this.sendEncodings); - } } private long nativeRtpTransceiver; diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java index 2a5f3e6e76..c4ff2859ac 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java @@ -31,7 +31,6 @@ import java.nio.charset.Charset; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashSet; import java.util.IdentityHashMap; import java.util.List; @@ -51,10 +50,6 @@ import org.webrtc.PeerConnection.IceGatheringState; import org.webrtc.PeerConnection.PeerConnectionState; import org.webrtc.PeerConnection.SignalingState; import org.webrtc.PeerConnection.TlsCertPolicy; -import org.webrtc.RtpParameters; -import org.webrtc.RtpParameters.Encoding; -import org.webrtc.RtpTransceiver; -import org.webrtc.RtpTransceiver.RtpTransceiverInit; /** End-to-end tests for PeerConnection.java. */ @RunWith(BaseJUnit4ClassRunner.class) @@ -837,31 +832,6 @@ public class PeerConnectionTest { assertNotNull(offeringPC); } - // Test that RIDs get set in the RTP sender when passed in through an RtpTransceiverInit. - @Test - @SmallTest - public void testSetRidInSimulcast() throws Exception { - PeerConnectionFactory factory = PeerConnectionFactory.builder().createPeerConnectionFactory(); - PeerConnection.RTCConfiguration config = new PeerConnection.RTCConfiguration(Arrays.asList()); - ObserverExpectations expectations = new ObserverExpectations("PCTest:simulcast_rids"); - PeerConnection pc = factory.createPeerConnection(config, expectations); - List encodings = new ArrayList(); - encodings.add(new Encoding("F", true, null)); - encodings.add(new Encoding("H", true, null)); - RtpTransceiverInit init = new RtpTransceiverInit( - RtpTransceiver.RtpTransceiverDirection.SEND_ONLY, Collections.emptyList(), encodings); - RtpTransceiver transceiver = - pc.addTransceiver(MediaStreamTrack.MediaType.MEDIA_TYPE_VIDEO, init); - RtpSender sender = transceiver.getSender(); - RtpParameters parameters = sender.getParameters(); - assertNotNull(parameters); - List sendEncodings = parameters.getEncodings(); - assertNotNull(sendEncodings); - assertEquals(2, sendEncodings.size()); - assertEquals("F", sendEncodings.get(0).getRid()); - assertEquals("H", sendEncodings.get(1).getRid()); - } - @Test @MediumTest public void testCompleteSession() throws Exception { @@ -1060,7 +1030,6 @@ public class PeerConnectionTest { assertNull(rtpParameters.encodings.get(0).maxFramerate); assertNull(rtpParameters.encodings.get(0).numTemporalLayers); assertNull(rtpParameters.encodings.get(0).scaleResolutionDownBy); - assertNull(rtpParameters.encodings.get(0).rid); rtpParameters.encodings.get(0).maxBitrateBps = 300000; rtpParameters.encodings.get(0).minBitrateBps = 100000; diff --git a/sdk/android/src/jni/pc/rtp_parameters.cc b/sdk/android/src/jni/pc/rtp_parameters.cc index 44a3d1a8b1..9b3c070c98 100644 --- a/sdk/android/src/jni/pc/rtp_parameters.cc +++ b/sdk/android/src/jni/pc/rtp_parameters.cc @@ -24,8 +24,7 @@ ScopedJavaLocalRef 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& j_encoding_parameters) { RtpEncodingParameters encoding; - ScopedJavaLocalRef 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 j_max_bitrate = Java_Encoding_getMaxBitrateBps(jni, j_encoding_parameters); diff --git a/sdk/android/src/jni/pc/rtp_transceiver.cc b/sdk/android/src/jni/pc/rtp_transceiver.cc index 52fcdadb84..a958bc9cf8 100644 --- a/sdk/android/src/jni/pc/rtp_transceiver.cc +++ b/sdk/android/src/jni/pc/rtp_transceiver.cc @@ -48,12 +48,6 @@ RtpTransceiverInit JavaToNativeRtpTransceiverInit( Java_RtpTransceiverInit_getStreamIds(jni, j_init); init.stream_ids = JavaListToNativeVector( jni, j_stream_ids, &JavaToNativeString); - - // Convert the send encodings. - ScopedJavaLocalRef j_send_encodings = - Java_RtpTransceiverInit_getSendEncodings(jni, j_init); - init.send_encodings = JavaListToNativeVector( - jni, j_send_encodings, &JavaToNativeRtpEncodingParameters); return init; }