Merge branch 'main' into noconnectionstateclose

w3c · Jul 13, 2023 · 2b3d707 · 2b3d707
2 parents 46a3411 + bc552d5
commit 2b3d707
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/amendments.json b/amendments.json
@@ -493,6 +493,15 @@
       "id": 33
     }
   ],
+  "removetrack-algo": [
+    {
+      "description": "Make removeTrack() a no-op after transceiver.stop()",
+      "pr": 2875,
+      "type": "correction",
+      "status": "candidate",
+      "id": 34
+    }
+  ],
   "connectionstate-algo": [
     {
       "description": "Don't fire connectionstatechange on pc.close()",

diff --git a/base-rec.html b/base-rec.html
@@ -8195,7 +8195,7 @@ <h4 id="methods-5">
                   When the <a data-link-type="idl" href="#dom-rtcpeerconnection-removetrack" class="internalDFN" id="ref-for-dom-rtcpeerconnection-removetrack-4"><code><code>removeTrack</code></code></a> method is invoked, the user agent
                   <em class="rfc2119">MUST</em> run the following steps:
                 </p>
-                <ol>
+                <ol id="removetrack-algo">
                   <li class="no-test-needed">
                     <p>
                       Let <var>sender</var> be the argument to <a data-link-type="idl" href="#dom-rtcpeerconnection-removetrack" class="internalDFN" id="ref-for-dom-rtcpeerconnection-removetrack-5"><code><code>removeTrack</code></code></a>.

diff --git a/respec-w3c-common.js b/respec-w3c-common.js
diff --git a/webrtc.html b/webrtc.html
@@ -8040,7 +8040,7 @@ <h2>
                   When the {{removeTrack}} method is invoked, the user agent
                   MUST run the following steps:
                 </p>
-                <ol class=algorithm>
+                <ol class=algorithm id="removetrack-algo">
                   <li class="no-test-needed">
                     <p>
                       Let <var>sender</var> be the argument to {{removeTrack}}.
@@ -8067,6 +8067,18 @@ <h2>
                       {{InvalidAccessError}}.
                     </p>
                   </li>
+                  <li class="no-test-needed">
+                    <p>
+                      Let <var>transceiver</var> be the {{RTCRtpTransceiver}}
+                      object corresponding to <var>sender</var>.
+                    </p>
+                  </li>
+                  <li data-tests="RTCPeerConnection-removeTrack.https.html">
+                    <p>
+                      If <var>transceiver</var>.{{RTCRtpTransceiver/[[Stopping]]}} is
+                      <code>true</code>, abort these steps.
+                    </p>
+                  </li>
                   <li data-tests="RTCPeerConnection-removeTrack.https.html">
                     <p>
                       Let <var>senders</var> be the result of executing the
@@ -8093,12 +8105,6 @@ <h2>
                       Set <var>sender</var>.{{RTCRtpSender/[[SenderTrack]]}} to null.
                     </p>
                   </li>
-                  <li class="no-test-needed">
-                    <p>
-                      Let <var>transceiver</var> be the {{RTCRtpTransceiver}}
-                      object corresponding to <var>sender</var>.
-                    </p>
-                  </li>
                   <li data-tests="RTCPeerConnection-removeTrack.https.html">
                     <p>
                       If <var>transceiver</var>.{{RTCRtpTransceiver/[[Direction]]}} is
@@ -12693,7 +12699,9 @@ <h3>
                   </td>
                   <td>
                     The {{RTCIceTransport}} has received at least one remote
-                    candidate and is checking candidate pairs and has either
+                    candidate (by means of {{RTCPeerConnection/addIceCandidate()}} or discovered as a
+                    peer-reflexive candidate when receiving a STUN binding
+                    request) and is checking candidate pairs and has either
                     not yet found a connection or consent checks [[!RFC7675]]
                     have failed on all previously successful candidate pairs.
                     In addition to checking, it may also still be gathering.