Reland: Fix references to getFirstEncoding in WebRTC tests

Bug: 986069, 1237909, 1410672 Change-Id: I23f79cd5d08061d2a549200e0c4378b0a02ac40a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4201362 Auto-Submit: Florent Castelli <[email protected]> Commit-Queue: Harald Alvestrand <[email protected]> Reviewed-by: Harald Alvestrand <[email protected]> Cr-Commit-Position: refs/heads/main@{#1099163}
Tobias710219 · Jan 31, 2023 · 5dee4bb · 5dee4bb
1 parent 7eee77e
commit 5dee4bb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 45 deletions.
diff --git a/webrtc-extensions/RTCRtpParameters-adaptivePtime.html b/webrtc-extensions/RTCRtpParameters-adaptivePtime.html
@@ -6,12 +6,6 @@
 <script>
   'use strict';
 
-  function getFirstEncoding(param) {
-    const { encodings } = param;
-    assert_equals(encodings.length, 1);
-    return encodings[0];
-  }
-
   promise_test(async t => {
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
@@ -20,14 +14,14 @@
     });
 
     let param = sender.getParameters();
-    let encoding = getFirstEncoding(param);
+    let encoding = param.encodings[0];
 
     assert_true(encoding.adaptivePtime);
 
     encoding.adaptivePtime = false;
     await sender.setParameters(param);
     param = sender.getParameters();
-    encoding = getFirstEncoding(param);
+    encoding = param.encodings[0];
 
     assert_false(encoding.adaptivePtime);
 
@@ -39,7 +33,7 @@
     const { sender } = pc.addTransceiver('audio', { sendEncodings: [{}] });
 
     const param = sender.getParameters();
-    const encoding = getFirstEncoding(param);
+    const encoding = param.encodings[0];
 
     assert_false(encoding.adaptivePtime);
 

diff --git a/webrtc-priority/RTCRtpParameters-encodings.html b/webrtc-priority/RTCRtpParameters-encodings.html
@@ -25,7 +25,7 @@
 
     const param = sender.getParameters();
     validateSenderRtpParameters(param);
-    const encoding = getFirstEncoding(param);
+    const encoding = param.encodings[0];
 
     assert_equals(encoding.active, false);
     assert_equals(encoding.priority, 'low');

diff --git a/webrtc-svc/RTCRtpParameters-scalability.html b/webrtc-svc/RTCRtpParameters-scalability.html
@@ -21,36 +21,26 @@
     });
 
     const param = sender.getParameters();
-    const encoding = getFirstEncoding(param);
+    const encoding = param.encodings[0];
 
     assert_equals(encoding.scalabilityMode, 'L1T3');
 
     encoding.scalabilityMode = 'L1T2';
     await sender.setParameters(param);
 
     const updatedParam = sender.getParameters();
-    const updatedEncoding = getFirstEncoding(updatedParam);
+    const updatedEncoding = updatedParam.encodings[0];
 
     assert_equals(updatedEncoding.scalabilityMode, 'L1T2');
   }, `Setting and updating scalabilityMode to a legal value should be accepted`);
 
-  promise_test(async t => {
-    const capabilities = RTCRtpSender.getCapabilities('video');
-    var svcSupported = false;
-    for (const codec of capabilities.codecs) {
-      if ('scalabilityModes' in codec && codec.scalabilityModes.length > 0) {
-        svcSupported = true;
-      }
-    }
-    assert_true(svcSupported);
-  }, `Sender capabilities should include at least some scalability modes`);
-
   promise_test(async t => {
     const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
     const { sender } = pc.addTransceiver('video');
     const param = sender.getParameters();
-    assert_equals(param.encodings.length, 0);
+    const encoding = param.encodings[0];
+    assert_true(!('scalabilityMode' in encoding));
   }, 'Not setting sendEncodings results in no mode info before negotiation');
 
   promise_test(async t => {
@@ -60,29 +50,10 @@
       sendEncodings: [{}],
     });
     const param = sender.getParameters();
-    const encoding = getFirstEncoding(param);
-
+    const encoding = param.encodings[0];
     assert_true(!('scalabilityMode' in encoding));
   }, 'Not setting a scalability mode results in no mode set before negotiation');
 
-  promise_test(async t => {
-    const pc1 = new RTCPeerConnection();
-    const pc2 = new RTCPeerConnection();
-    t.add_cleanup(() => pc1.close());
-    t.add_cleanup(() => pc2.close());
-    const { sender } = pc1.addTransceiver('video', {
-      sendEncodings: [{}],
-    });
-    const param = sender.getParameters();
-    const encoding = getFirstEncoding(param);
-
-    exchangeIceCandidates(pc1, pc2);
-    await exchangeOfferAnswer(pc1, pc2);
-    const param2 = sender.getParameters();
-    const encoding2 = getFirstEncoding(param);
-    assert_true('scalabilityMode' in encoding2);
-  }, 'Not setting a scalability mode results in some mode set after negotiation');
-
   promise_test(async t => {
       const pc = new RTCPeerConnection();
     t.add_cleanup(() => pc.close());
@@ -105,7 +76,7 @@
     });
     // Before negotiation, the mode should be preserved.
     const param = transceiver.sender.getParameters();
-    const encoding = getFirstEncoding(param);
+    const encoding = param.encodings[0];
     assert_true('scalabilityMode' in encoding);
     // If L3T3 is not supported at all, abort test.
     assert_implements_optional(encoding.scalabilityMode === 'L3T3');