From f1d99f8df8d4359f202765f283cdc4587bd59ec3 Mon Sep 17 00:00:00 2001 From: Jan-Ivar Bruaroey Date: Mon, 21 Nov 2022 21:00:20 -0500 Subject: [PATCH 1/3] Remove duplicate rids in proposedSendEncodings. --- webrtc.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/webrtc.html b/webrtc.html index 32130b783..36e0ceafa 100644 --- a/webrtc.html +++ b/webrtc.html @@ -2360,6 +2360,18 @@

be an empty list.

+
  • +

    + For each encoding, encoding, in + proposedSendEncodings in reverse + order, if encoding's + {{RTCRtpCodingParameters/rid}} matches that of + another encoding in + proposedSendEncodings, remove + encoding + from proposedSendEncodings. +

    +
  • Let supportedEncodings be the maximum number of encodings that the implementation can support. If the length of From de8107a1bbc8478fe44b83f78181df02a434ed3a Mon Sep 17 00:00:00 2001 From: Jan-Ivar Bruaroey Date: Wed, 30 Nov 2022 17:24:11 -0500 Subject: [PATCH 2/3] Update ammendments. --- amendments.json | 10 ++++++++++ base-rec.html | 2 +- webrtc.html | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/amendments.json b/amendments.json index 015cf52d0..b8cde5af0 100644 --- a/amendments.json +++ b/amendments.json @@ -346,5 +346,15 @@ "status": "candidate", "id": 22 } + ], + "apply-proposed-sendencodings": [ + { + "description": "Remove duplicate rids in proposedSendEncodings.", + "pr": 2800, + "difftype": "modify", + "type": "correction", + "status": "candidate", + "id": 25 + } ] } diff --git a/base-rec.html b/base-rec.html index 84ac0cdff..7455ba761 100644 --- a/base-rec.html +++ b/base-rec.html @@ -2956,7 +2956,7 @@
    4.4.1.5 each media description in description:

    -
      +

      1. If the description is of type diff --git a/webrtc.html b/webrtc.html index 36e0ceafa..c55799b3c 100644 --- a/webrtc.html +++ b/webrtc.html @@ -2341,7 +2341,7 @@

        each [= media description =] in description:

        -
          +

          1. If the description is of type From 700899cd1afad62a48cf333ca5247aef7a110b09 Mon Sep 17 00:00:00 2001 From: Jan-Ivar Bruaroey Date: Tue, 13 Dec 2022 18:00:10 -0500 Subject: [PATCH 3/3] Collapse 5 amendment ids into 1 to resolve nested amendment error. --- amendments.json | 84 +++++++++++++++++++------------------------------ base-rec.html | 12 +++---- webrtc.html | 11 +++---- 3 files changed, 44 insertions(+), 63 deletions(-) diff --git a/amendments.json b/amendments.json index 1a01eebb6..21af09c14 100644 --- a/amendments.json +++ b/amendments.json @@ -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.", @@ -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", @@ -326,36 +306,6 @@ "id": 19 } ], - "overwrite-suitable-sendencodings": [ - { - "description": "Allow remote offer rid pruning of encodings through the client answer.", - "pr": 2758, - "difftype": "modify", - "type": "correction", - "status": "candidate", - "id": 22 - } - ], - "answer-rejects-encodings": [ - { - "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).", @@ -374,7 +324,39 @@ "id": 24 } ], - "apply-proposed-sendencodings": [ + "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 + }, + { + "description": "Don't fail sRD(offer) over rid mismatch, just answer with unicast.", + "pr": 2794, + "difftype": "modify", + "type": "correction", + "status": "candidate", + "id": 23 + }, { "description": "Remove duplicate rids in proposedSendEncodings.", "pr": 2800, diff --git a/base-rec.html b/base-rec.html index 736e14a75..ab61b361e 100644 --- a/base-rec.html +++ b/base-rec.html @@ -2956,7 +2956,7 @@

            4.4.1.5 each media description in description:

            -
              +

              1. If the description is of type @@ -2996,7 +2996,7 @@

                4.4.1.5 transceiver, to represent the media description.

                2. -
              2. +

              3. If a suitable transceiver was found (transceiver is set) and @@ -3061,7 +3061,7 @@

                4.4.1.5

                1. -

                  +

                  If description indicates that simulcast is not supported or desired, then remove all dictionaries in @@ -3071,7 +3071,7 @@

                  4.4.1.5

                2. -

                  +

                  If description rejects any of the offered layers, then remove the dictionaries that correspond to rejected @@ -3079,7 +3079,7 @@

                  4.4.1.5 transceiver.[[Sender]].[[SendEncodings]].

                  3. -
                3. +

                4. Update the paused status as indicated by [RFC8853] of each simulcast @@ -3164,7 +3164,7 @@

                  4.4.1.5

                5. -

                  +

                  Set transceiver.[[CurrentDirection]] and diff --git a/webrtc.html b/webrtc.html index cfc027c25..301ff8230 100644 --- a/webrtc.html +++ b/webrtc.html @@ -2327,7 +2327,7 @@

                  each [= media description =] in description:

                  -
                    +

                    1. If the description is of type @@ -2382,7 +2382,7 @@

                      media description =].

                      2. -
                    2. +

                    3. If a suitable transceiver was found (transceiver is set), and @@ -2463,7 +2463,7 @@

                      1. -

                        +

                        If description indicates that simulcast is not supported or desired, or description is missing all of @@ -2475,7 +2475,7 @@

                      2. -

                        +

                        If description is missing any of the previously negotiated layers, then remove the dictionaries that correspond to @@ -2483,7 +2483,6 @@

                        transceiver.{{RTCRtpTransceiver/[[Sender]]}}.{{RTCRtpSender/[[SendEncodings]]}}.

                        3. -

                    5. -

                      +

                      Set transceiver.{{RTCRtpTransceiver/[[CurrentDirection]]}} to direction.