webrtc wpt: add test for payload type demuxing

and rename the file BUG=webrtc:12029 Change-Id: I52753f98686715a19f910d7d0ff883e55a840722 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500842 Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com> Reviewed-by: Harald Alvestrand <hta@chromium.org> Cr-Commit-Position: refs/heads/master@{#823921}

webrtc wpt: add test for payload type demuxing
and rename the file BUG=webrtc:12029 Change-Id: I52753f98686715a19f910d7d0ff883e55a840722 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500842 Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com> Reviewed-by: Harald Alvestrand <hta@chromium.org> Cr-Commit-Position: refs/heads/master@{#823921}
23886755 · Philipp Hancke · Commit Bot · 45c57b9f · 23886755 · 23886755
Commit 23886755 authored Nov 04, 2020 by Philipp Hancke Committed by Commit Bot Nov 04, 2020
2 changed files
--- a/third_party/blink/web_tests/TestExpectations
+++ b/third_party/blink/web_tests/TestExpectations
@@ -6195,7 +6195,7 @@ crbug.com/1136726 [ Linux ] virtual/gpu-rasterization/images/imagemap-focus-ring
 crbug.com/1138591 [ Mac10.15 ] http/tests/dom/raf-throttling-out-of-view-cross-origin-page.html [ Failure ]

 # WebRTC: Payload demuxing times out in Plan B. This is expected.
-crbug.com/1139052 virtual/webrtc-wpt-plan-b/external/wpt/webrtc/protocol/unbundled-pt-demuxing.https.html [ Timeout ]
+crbug.com/1139052 virtual/webrtc-wpt-plan-b/external/wpt/webrtc/protocol/rtp-demuxing.html [ Timeout ]

 crbug.com/1137228 [ Mac ] external/wpt/infrastructure/testdriver/click_iframe_crossorigin.sub.html [ Pass Failure ]


--- a/third_party/blink/web_tests/external/wpt/webrtc/protocol/unbundled-pt-demuxing.https.html
+++ b/third_party/blink/web_tests/external/wpt/webrtc/protocol/unbundled-pt-demuxing.https.html
 <!doctype html>
 <meta charset=utf-8>
-<title>RTCPeerConnection payload type demuxing for unbundled connections</title>
+<title>RTCPeerConnection payload type demuxing</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="../RTCPeerConnection-helper.js"></script>
 <script>
 'use strict';
 promise_test(async t => {
-  const caller = new RTCPeerConnection({bundlePolicy: 'max-compat'});
+  const caller = new RTCPeerConnection();
  t.add_cleanup(() => caller.close());
  const callee = new RTCPeerConnection();
  t.add_cleanup(() => callee.close());
+  exchangeIceCandidates(caller, callee);

  const stream = await getNoiseStream({video: true});
  t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
@@ -33,8 +34,58 @@ promise_test(async t => {
    };
  });

+  // Restrict first transceiver to VP8, second to H264.
+  const {codecs} = RTCRtpSender.getCapabilities('video');
+  const vp8 = codecs.find(c => c.mimeType === 'video/VP8');
+  const h264 = codecs.find(c => c.mimeType === 'video/H264');
+  caller.getTransceivers()[0].setCodecPreferences([vp8]);
+  caller.getTransceivers()[1].setCodecPreferences([h264]);
+
+  const offer = await caller.createOffer();
+  // Replace the mid header extension and all ssrc lines
+  // with bogus. The receiver will be forced to do payload type demuxing.
+  const sdp = offer.sdp
+    .replace(/rtp-hdrext:sdes/g, 'rtp-hdrext:something')
+    .replace(/a=ssrc:/g, 'a=notssrc');
+
+  await callee.setRemoteDescription({type: 'offer', sdp});
+  await caller.setLocalDescription(offer);
+
+  const answer = await callee.createAnswer();
+  await caller.setRemoteDescription(answer);
+  await callee.setLocalDescription(answer);
+
+  await metadataToBeLoaded;
+}, 'Can demux two video tracks with different payload types on a bundled connection');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection({bundlePolicy: 'max-compat'});
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection();
+  t.add_cleanup(() => callee.close());
  exchangeIceCandidates(caller, callee);

+  const stream = await getNoiseStream({video: true});
+  t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
+  stream.getTracks().forEach(track => caller.addTrack(track, stream));
+  stream.getTracks().forEach(track => caller.addTrack(track.clone(), stream.clone()));
+
+  let callCount = 0;
+  let metadataToBeLoaded = new Promise(resolve => {
+    callee.ontrack = (e) => {
+      const stream = e.streams[0];
+      const v = document.createElement('video');
+      v.autoplay = true;
+      v.srcObject = stream;
+      v.id = stream.id
+      v.addEventListener('loadedmetadata', () => {
+        if (++callCount === 2) {
+          resolve();
+        }
+      });
+    };
+  });
+
  const offer = await caller.createOffer();
  // Replace BUNDLE, the mid header extension and all ssrc lines
  // with bogus. The receiver will be forced to do payload type demuxing
@@ -52,5 +103,6 @@ promise_test(async t => {
  await callee.setLocalDescription(answer);

  await metadataToBeLoaded;
-}, 'Can demux two video tracks on an unbundled connection by payload type');
+}, 'Can demux two video tracks with the same payload type on an unbundled connection');
+
 </script>