From 63bf02fdf17a8048359ca216044eaf53e0c8c767 Mon Sep 17 00:00:00 2001 From: Dominique Hazael-Massieux Date: Tue, 3 Sep 2024 11:54:36 +0200 Subject: [PATCH] Use more granular diff targets for amendments 19, 20, 21, 24, 32, 49 Allows to deal with different maturity levels --- amendments.json | 137 ++++++++++++++++++++++++++++++++++++++++++------ base-rec.html | 4 +- webrtc.html | 20 +++---- 3 files changed, 133 insertions(+), 28 deletions(-) diff --git a/amendments.json b/amendments.json index 3cd32f4fc..a2ac2372c 100644 --- a/amendments.json +++ b/amendments.json @@ -478,7 +478,87 @@ "difftype": "append" } ], - "setparameters-algo": [ + "setparameters-codec-validation-1": [ + { + "description": "Add codec to RTCRtpEncodingParameters", + "type": "addition", + "status": "candidate", + "id": 49, + "pr": 2985, + "difftype": "append", + "tests": [ + "webrtc/RTCRtpParameters-codec.html" + ], + "testUpdates": [ + "web-platform-tests/wpt#47663" + ] + } + ], + "setparameters-codec-validation-2": [ + { + "description": "Add codec to RTCRtpEncodingParameters", + "type": "addition", + "status": "candidate", + "id": 49, + "pr": 2985, + "difftype": "append", + "tests": [ + "webrtc/RTCRtpParameters-codec.html" + ], + "testUpdates": [ + "web-platform-tests/wpt#47663" + ] + } + ], + "setparameters-codec-validation-3": [ + { + "description": "Add codec to RTCRtpEncodingParameters", + "type": "addition", + "status": "candidate", + "id": 49, + "pr": 2985, + "difftype": "append", + "tests": [ + "webrtc/RTCRtpParameters-codec.html" + ], + "testUpdates": [ + "web-platform-tests/wpt#47663" + ] + } + ], + "setparameters-codec-validation-4": [ + { + "description": "Add codec to RTCRtpEncodingParameters", + "type": "addition", + "status": "candidate", + "difftype": "append", + "id": 49, + "pr": 2985, + "tests": [ + "webrtc/RTCRtpParameters-codec.html" + ], + "testUpdates": [ + "web-platform-tests/wpt#47663" + ] + } + ], + "setparameters-codec-validation-5": [ + { + "description": "Add codec to RTCRtpEncodingParameters", + "type": "addition", + "status": "candidate", + "difftype": "append", + "id": 49, + "pr": 2985, + "tests": [ + "webrtc/RTCRtpParameters-codec.html" + ], + "testUpdates": [ + "web-platform-tests/wpt#47663" + ] + } + ], + "setparameters-srbd-mv-validation-1": [ { "description": "Remove RTCRtpEncodingParameters.scaleResolutionDownBy for audio", "pr": [2772, 2799], @@ -490,8 +570,25 @@ ], "type": "correction", "status": "proposed", + "difftype": "append", "id": 20 }, + { + "description": "Add RTCRtpEncodingParameters.maxFramerate", + "pr": 2785, + "tests": [ + "webrtc/RTCRtpParameters-maxFramerate.html" + ], + "testUpdates": [ + "web-platform-tests/wpt#43173" + ], + "type": "addition", + "status": "proposed", + "difftype": "append", + "id": 19 + } + ], + "setparameters-srbd-mv-validation-2": [ { "description": "Default RTCRtpEncodingParameters.scaleResolutionDownBy to 1 for video", "pr": 2772, @@ -503,8 +600,26 @@ ], "type": "correction", "status": "proposed", + "difftype": "append", "id": 21 - }, + } + ], + "setparameters-srbd-mv-validation-3": [ + { + "description": "Remove RTCRtpEncodingParameters.scaleResolutionDownBy for audio", + "pr": [2772, 2799], + "tests": [ + "webrtc/RTCRtpParameters-encodings.html" + ], + "testUpdates": [ + "web-platform-tests/wpt#37477" + ], + "type": "correction", + "status": "proposed", + "id": 20 + } + ], + "setparameters-srbd-mv-validation-4": [ { "description": "Add RTCRtpEncodingParameters.maxFramerate", "pr": 2785, @@ -516,8 +631,11 @@ ], "type": "addition", "status": "proposed", + "difftype": "append", "id": 19 - }, + } + ], + "setparameters-stopped": [ { "description": "Reject setParameters(), replaceTrack(), & insertDTMF() after stop()", "pr": 2829, @@ -525,19 +643,6 @@ "type": "correction", "status": "candidate", "id": 32 - }, - { - "description": "Add codec to RTCRtpEncodingParameters", - "type": "addition", - "status": "candidate", - "id": 49, - "pr": 2985, - "tests": [ - "webrtc/RTCRtpParameters-codec.html" - ], - "testUpdates": [ - "web-platform-tests/wpt#47663" - ] } ], "init-srbd": [ diff --git a/base-rec.html b/base-rec.html index 2beba449a..13daec693 100644 --- a/base-rec.html +++ b/base-rec.html @@ -9050,7 +9050,7 @@

sender (i.e. sender is transceiver.[[Sender]]). -
  • +
  • If transceiver.[[Stopped]] is true, return a promise rejected with a newly created InvalidStateError. @@ -9094,7 +9094,7 @@

    • -
  • +

  • Verify that each encoding in encodings has a scaleResolutionDownBy diff --git a/webrtc.html b/webrtc.html index 231ce932d..70896f757 100644 --- a/webrtc.html +++ b/webrtc.html @@ -9027,7 +9027,7 @@

    transceiver.{{RTCRtpTransceiver/[[Sender]]}}).

  • + "RTCRtpSender-setParameters.html,RTCRtpTransceiver.https.html" id="setparameters-stopped"> If transceiver.{{RTCRtpTransceiver/[[Stopping]]}} is true, return a promise [= rejected =] with a newly [= exception/created =] {{InvalidStateError}}. @@ -9048,14 +9048,14 @@

  • Let codecs be parameters.{{RTCRtpParameters/codecs}}.
    • -
  • +

  • Let choosableCodecs be codecs.

    • -
  • +

  • If choosableCodecs is an empty list, set choosableCodecs to transceiver.{{RTCRtpTransceiver/[[PreferredCodecs]]}}.

    • -
  • +

  • If choosableCodecs is still an empty list, set choosableCodecs to the [=RTCRtpSender/list of implemented send codecs=] for transceiver's kind.

    • @@ -9084,13 +9084,13 @@

    Note that this also applies to transactionId.

    • -
  • +
  • Any encoding in encodings [=map/exists|contains=] a codec [= codec dictionary match | not found =] in choosableCodecs.
    • -
  • +

  • If [=RTCRtpTransceiver/transceiver kind=] is `"audio"`, remove the {{RTCRtpEncodingParameters/scaleResolutionDownBy}} and @@ -9099,7 +9099,7 @@

    [=map/contain=] any of them.

    • -
  • +

  • If [=RTCRtpTransceiver/transceiver kind=] is `"video"`, then for each encoding in encodings that doesn't @@ -9110,7 +9110,7 @@

    member with the value `1.0`.

    • -
  • +

  • If [=RTCRtpTransceiver/transceiver kind=] is `"video"`, and any encoding in encodings @@ -9121,7 +9121,7 @@

    exception/created =] {{RangeError}}.

    • -
  • +

  • Verify that each encoding in encodings has a {{RTCRtpEncodingParameters/maxFramerate}} @@ -9132,7 +9132,7 @@

    exception/created =] {{RangeError}}.

    • -
  • +

  • If the user agent does not support setting the codec for any encoding or mixing different codec values on the different encodings, return a promise [= rejected =] with a newly [= exception/created =] {{OperationError}}.