Skip to content

Commit

Permalink
Merge pull request #2800 from jan-ivar/duplicates
Browse files Browse the repository at this point in the history 
Remove duplicate rids in proposedSendEncodings.
  • Loading branch information
@jan-ivar
jan-ivar authored Dec 13, 2022
2 parents e8639d8 + 700899c commit 04bb249
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 58 deletions.
84 changes: 38 additions & 46 deletions amendments.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,6 @@
"id": 11
}
],
"rm-simulcast-pause": [
{
"description": "Remove interaction between encoding.active and simulcast ~rid",
"pr": 2754,
"difftype": "modify",
"type": "correction",
"status": "candidate",
"id": 12
}
],
"remote-rid-reneg": [
{
"description": "Don't fail sRD(offer) over rid mismatch, just answer with unicast.",
Expand All @@ -150,16 +140,6 @@
"id": 23
}
],
"direction-set": [
{
"description": "Make RTCTransceiver.direction reflects local preference in offers and answers",
"pr": 2759,
"difftype": "modify",
"type": "correction",
"status": "candidate",
"id": 14
}
],
"simulcast-functionality": [
{
"description": "Clarify simulcast envelope is determined by negotiation",
Expand Down Expand Up @@ -326,52 +306,64 @@
"id": 19
}
],
"overwrite-suitable-sendencodings": [
"set-last-stable-offer-properties": [
{
"description": "Rollback restores ridless encoding trounced by sRD(simulcastOffer).",
"pr": 2797,
"type": "addition",
"status": "candidate",
"id": 24
}
],
"set-rollback-per-transceiver": [
{
"description": "Allow remote offer rid pruning of encodings through the client answer.",
"pr": 2758,
"difftype": "modify",
"type": "correction",
"description": "Rollback restores ridless encoding trounced by sRD(simulcastOffer).",
"pr": 2797,
"type": "addition",
"status": "candidate",
"id": 22
"id": 24
}
],
"answer-rejects-encodings": [
"apply-remote-description": [
{
"description": "Remove interaction between encoding.active and simulcast ~rid",
"pr": 2754,
"difftype": "modify",
"type": "correction",
"status": "candidate",
"id": 12
},
{
"description": "Make RTCTransceiver.direction reflects local preference in offers and answers",
"pr": 2759,
"difftype": "modify",
"type": "correction",
"status": "candidate",
"id": 14
},
{
"description": "Allow remote offer rid pruning of encodings through the client answer.",
"pr": 2758,
"difftype": "modify",
"type": "correction",
"status": "candidate",
"id": 22
}
],
"answer-missing-encodings": [
},
{
"description": "Don't fail sRD(offer) over rid mismatch, just answer with unicast.",
"pr": 2794,
"difftype": "modify",
"type": "correction",
"status": "candidate",
"id": 23
}
],
"set-last-stable-offer-properties": [
{
"description": "Rollback restores ridless encoding trounced by sRD(simulcastOffer).",
"pr": 2797,
"type": "addition",
"status": "candidate",
"id": 24
}
],
"set-rollback-per-transceiver": [
},
{
"description": "Rollback restores ridless encoding trounced by sRD(simulcastOffer).",
"pr": 2797,
"type": "addition",
"description": "Remove duplicate rids in proposedSendEncodings.",
"pr": 2800,
"difftype": "modify",
"type": "correction",
"status": "candidate",
"id": 24
"id": 25
}
]
}
12 changes: 6 additions & 6 deletions base-rec.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2956,7 +2956,7 @@ <h5 id="x4-4-1-5-set-the-session-description"><bdi class="secno">4.4.1.5 </bdi>
each <a data-link-type="dfn" href="#dfn-media-description" class="internalDFN" id="ref-for-dfn-media-description-9">media description</a> in
<var>description</var>:
</p>
<ol>
<ol id="apply-remote-description">
<li class="needs-tests">
<p>
If the <var>description</var> is of type
Expand Down Expand Up @@ -2996,7 +2996,7 @@ <h5 id="x4-4-1-5-set-the-session-description"><bdi class="secno">4.4.1.5 </bdi>
<var>transceiver</var>, to represent the <a data-link-type="dfn" href="#dfn-media-description" class="internalDFN" id="ref-for-dfn-media-description-10">media description</a>.
</p>
</li>
<li class="needs-tests" id="overwrite-suitable-sendencodings">
<li class="needs-tests">
<p>
If a suitable transceiver was found
(<var>transceiver</var> is set) and
Expand Down Expand Up @@ -3061,7 +3061,7 @@ <h5 id="x4-4-1-5-set-the-session-description"><bdi class="secno">4.4.1.5 </bdi>
</p>
<ol>
<li class="needs-tests">
<p id="answer-missing-encodings">
<p>
If <var>description</var> indicates that
simulcast is not supported or desired,
then remove all dictionaries in
Expand All @@ -3071,15 +3071,15 @@ <h5 id="x4-4-1-5-set-the-session-description"><bdi class="secno">4.4.1.5 </bdi>
</p>
</li>
<li class="needs-tests">
<p id="answer-rejects-encodings">
<p>
If <var>description</var> rejects any of
the offered layers, then remove the
dictionaries that correspond to rejected
layers from
<var>transceiver</var>.<a href="#dfn-sender" class="internalDFN" data-link-type="dfn" id="ref-for-dfn-sender-11">[[Sender]]</a>.<a href="#dfn-sendencodings" class="internalDFN" data-link-type="dfn" id="ref-for-dfn-sendencodings-5">[[SendEncodings]]</a>.
</p>
</li>
<li class="needs-tests" id="rm-simulcast-pause">
<li class="needs-tests">
<p>
Update the paused status as indicated by
[<cite><a class="bibref" data-link-type="biblio" href="#bib-rfc8853" title="Using Simulcast in Session Description Protocol (SDP) and RTP Sessions">RFC8853</a></cite>] of each simulcast
Expand Down Expand Up @@ -3164,7 +3164,7 @@ <h5 id="x4-4-1-5-set-the-session-description"><bdi class="secno">4.4.1.5 </bdi>
</p>
</li>
<li class="needs-tests">
<p id="direction-set">
<p>
Set
<var>transceiver</var>.<a href="#dfn-currentdirection" class="internalDFN" data-link-type="dfn" id="ref-for-dfn-currentdirection-2">[[CurrentDirection]]</a>
and
Expand Down
23 changes: 17 additions & 6 deletions webrtc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2327,7 +2327,7 @@ <h4>
each [= media description =] in
<var>description</var>:
</p>
<ol>
<ol id="apply-remote-description">
<li>
<p>
If the <var>description</var> is of type
Expand All @@ -2346,6 +2346,18 @@ <h4>
be an empty list.
</p>
</li>
<li>
<p>
For each encoding, <var>encoding</var>, in
<var>proposedSendEncodings</var> in reverse
order, if <var>encoding</var>'s
{{RTCRtpCodingParameters/rid}} matches that of
another encoding in
<var>proposedSendEncodings</var>, remove
<var>encoding</var>
from <var>proposedSendEncodings</var>.
</p>
</li>
<li>Let <var>supportedEncodings</var> be the
maximum number of encodings that the
implementation can support. If the length of
Expand All @@ -2370,7 +2382,7 @@ <h4>
media description =].
</p>
</li>
<li id="overwrite-suitable-sendencodings">
<li>
<p>
If a suitable transceiver was found
(<var>transceiver</var> is set), and
Expand Down Expand Up @@ -2451,7 +2463,7 @@ <h4>
</p>
<ol>
<li>
<p id="answer-missing-encodings">
<p>
If <var>description</var> indicates that
simulcast is not supported or desired, or
<var>description</var> is missing all of
Expand All @@ -2463,15 +2475,14 @@ <h4>
</p>
</li>
<li>
<p id="answer-rejects-encodings">
<p>
If <var>description</var> is missing any of
the previously negotiated layers, then
remove the dictionaries that correspond to
the missing layers from
<var>transceiver</var>.{{RTCRtpTransceiver/[[Sender]]}}.{{RTCRtpSender/[[SendEncodings]]}}.
</p>
</li>
<li id="rm-simulcast-pause" class="diff-rm"><!-- kept for candidate amendment management --></li>
</ol>
</li>
<li data-tests=
Expand Down Expand Up @@ -2547,7 +2558,7 @@ <h4>
</p>
</li>
<li>
<p id="direction-set">
<p>
Set
<var>transceiver</var>.{{RTCRtpTransceiver/[[CurrentDirection]]}}
to <var>direction</var>.
Expand Down

0 comments on commit 04bb249

Please sign in to comment.