commit e8bc3a0a5ab6d7d36efbe4bf0742adac3dc49345
author Oleh Prypin <oprypin@webrtc.org> Fri Mar 29 15:29:51 2019 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Mar 29 15:51:07 2019 +0000
tree 34999c3db69bf6d3d62073da1b642d76f8ced990
parent d9b62d32283e12cb6b49a03e16f9128229047d81

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 <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}

sdk/android/api/org/webrtc/RtpTransceiver.java

diff --git a/sdk/android/api/org/webrtc/RtpTransceiver.java b/sdk/android/api/org/webrtc/RtpTransceiver.java
index 64d8eb4..7f875e6 100644
--- a/sdk/android/api/org/webrtc/RtpTransceiver.java
+++ b/sdk/android/api/org/webrtc/RtpTransceiver.java
@@ -14,7 +14,6 @@
 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 static final class RtpTransceiverInit {
     private final RtpTransceiverDirection direction;
     private final List<String> streamIds;
-    private final List<RtpParameters.Encoding> 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<String> streamIds) {
-      this(direction, streamIds, Collections.emptyList());
-    }
-
-    public RtpTransceiverInit(RtpTransceiverDirection direction, List<String> streamIds,
-        List<RtpParameters.Encoding> sendEncodings) {
       this.direction = direction;
       this.streamIds = new ArrayList<String>(streamIds);
-      this.sendEncodings = new ArrayList<RtpParameters.Encoding>(sendEncodings);
     }
 
     @CalledByNative("RtpTransceiverInit")
@@ -102,11 +94,6 @@
     List<String> getStreamIds() {
       return new ArrayList<String>(this.streamIds);
     }
-
-    @CalledByNative("RtpTransceiverInit")
-    List<RtpParameters.Encoding> getSendEncodings() {
-      return new ArrayList<RtpParameters.Encoding>(this.sendEncodings);
-    }
   }
 
   private long nativeRtpTransceiver;