From 308a5903e9fa032b10c86846089e2bb9c14c65a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Tue, 26 Nov 2024 15:36:02 +0100 Subject: [PATCH 01/12] Add remote track channelCount --- amendments.json | 16 ++++++++++++++++ base-rec.html | 1 + webrtc.html | 15 +++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/amendments.json b/amendments.json index 8aa3098a3..978a0c94c 100644 --- a/amendments.json +++ b/amendments.json @@ -1242,5 +1242,21 @@ "web-platform-tests/wpt#48361" ] } + ], + "remote-track-settings-channel-count": [ + { + "description": "Use Performance.timeOrigin + Performance.now() for stats timestamps", + "type": "addition", + "status": "candidate", + "difftype": "append", + "id": 51, + "pr": 3025, + "tests": [ + "webrtc/RTCRtpEncodingParameters-codec-opus-stereo.https.html" + ], + "testUpdates": [ + "web-platform-tests/wpt#48599" + ] + } ] } diff --git a/base-rec.html b/base-rec.html index 4c06e7f62..752a6a4ad 100644 --- a/base-rec.html +++ b/base-rec.html @@ -15948,6 +15948,7 @@

diff --git a/webrtc.html b/webrtc.html index bf901ce08..79f9cea2a 100644 --- a/webrtc.html +++ b/webrtc.html @@ -16583,6 +16583,21 @@

double rounded to the tenth decimal place. +
+ + + channelCount + + + {{ConstrainULong}} + + + As a setting, this is the number of channels of the latest + audio frame received, reflecting the number of + {{RTCRtpCodec/channels}} that the decoder outputted. + + +

From 3579baa3104d41b776075e633ed1d41055a06c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Thu, 28 Nov 2024 15:24:15 +0100 Subject: [PATCH 02/12] Update description --- amendments.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/amendments.json b/amendments.json index f091820f2..f7db65352 100644 --- a/amendments.json +++ b/amendments.json @@ -1245,17 +1245,18 @@ ], "remote-track-settings-channel-count": [ { - "description": "Use Performance.timeOrigin + Performance.now() for stats timestamps", + "description": "Add channelCount to remote track settings", "type": "addition", "status": "candidate", "difftype": "append", - "id": 51, + "id": 52, "pr": 3025, "tests": [ "webrtc/RTCRtpEncodingParameters-codec-opus-stereo.https.html" ], "testUpdates": [ - "web-platform-tests/wpt#48599" + "web-platform-tests/wpt#48599", + "web-platform-tests/wpt#49392" ] } ] From 5d27f27eeb9bd9905c96b51c210b1fd1af7d96b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Thu, 28 Nov 2024 15:32:17 +0100 Subject: [PATCH 03/12] data-tests --- webrtc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc.html b/webrtc.html index 15b043bad..4b50df8b9 100644 --- a/webrtc.html +++ b/webrtc.html @@ -16612,7 +16612,7 @@

- + channelCount From 7475848950e8cf3a430144de2337034f83ea9776 Mon Sep 17 00:00:00 2001 From: Dominique Hazael-Massieux Date: Fri, 17 Jan 2025 14:24:29 +0100 Subject: [PATCH 04/12] Fix amendments.json --- amendments.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/amendments.json b/amendments.json index 9436a02da..eb86eecac 100644 --- a/amendments.json +++ b/amendments.json @@ -1257,7 +1257,8 @@ "testUpdates": [ "web-platform-tests/wpt#48599", "web-platform-tests/wpt#49392" -======= + ] + }, "codec-match-without-level-id": [ { "description": "Two codecs are considered the same even if level-id is not", From 7eff351d1faa6bbd4e7f1621e40a63f45bbdd352 Mon Sep 17 00:00:00 2001 From: Dominique Hazael-Massieux Date: Fri, 17 Jan 2025 14:25:58 +0100 Subject: [PATCH 05/12] Fix amendments.json --- amendments.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/amendments.json b/amendments.json index eb86eecac..f9336ecf3 100644 --- a/amendments.json +++ b/amendments.json @@ -1258,7 +1258,8 @@ "web-platform-tests/wpt#48599", "web-platform-tests/wpt#49392" ] - }, + } + ], "codec-match-without-level-id": [ { "description": "Two codecs are considered the same even if level-id is not", From 20dbf357859e6be8d047445746ed78285571b834 Mon Sep 17 00:00:00 2001 From: henbos Date: Thu, 27 Mar 2025 15:32:18 +0100 Subject: [PATCH 06/12] Update amendments.json Co-authored-by: Dominique Hazael-Massieux --- amendments.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amendments.json b/amendments.json index f9336ecf3..4c1f8cafc 100644 --- a/amendments.json +++ b/amendments.json @@ -1243,7 +1243,7 @@ ] } ], - "remote-track-settings-channel-count": [ + "def-constraint-channelCount": [ { "description": "Add channelCount to remote track settings", "type": "addition", From 61999b9357e079e6eed5db7b0a3c249926a603e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Thu, 27 Mar 2025 15:38:26 +0100 Subject: [PATCH 07/12] Address dom comments --- base-rec.html | 1 - webrtc.html | 2 -- 2 files changed, 3 deletions(-) diff --git a/base-rec.html b/base-rec.html index be6c27242..813c12a68 100644 --- a/base-rec.html +++ b/base-rec.html @@ -15949,7 +15949,6 @@

diff --git a/webrtc.html b/webrtc.html index 7b7ae63b5..94638e596 100644 --- a/webrtc.html +++ b/webrtc.html @@ -16677,7 +16677,6 @@

double rounded to the tenth decimal place. -
channelCount @@ -16691,7 +16690,6 @@

{{RTCRtpCodec/channels}} that the decoder outputted. -

From becc7a3e2858b57f59019df970bb20ea269f06c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Thu, 27 Mar 2025 15:44:21 +0100 Subject: [PATCH 08/12] Add MUST language --- webrtc.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webrtc.html b/webrtc.html index 94638e596..e7ff1d9cb 100644 --- a/webrtc.html +++ b/webrtc.html @@ -16687,7 +16687,8 @@

As a setting, this is the number of channels of the latest audio frame received, reflecting the number of - {{RTCRtpCodec/channels}} that the decoder outputted. + {{RTCRtpCodec/channels}} that the decoder outputted. A stereo + capable decoder MUST produce stereo and return the value 2. From 57dbd5059ed85169a6363151dee79fc84a99ab08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Thu, 27 Mar 2025 15:52:53 +0100 Subject: [PATCH 09/12] nit --- amendments.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amendments.json b/amendments.json index 4c1f8cafc..1db226861 100644 --- a/amendments.json +++ b/amendments.json @@ -1257,7 +1257,7 @@ "testUpdates": [ "web-platform-tests/wpt#48599", "web-platform-tests/wpt#49392" - ] + ] } ], "codec-match-without-level-id": [ From 7f3c5eb3a7b4f993859cc32b42bae47f9ef20578 Mon Sep 17 00:00:00 2001 From: Dominique Hazael-Massieux Date: Thu, 27 Mar 2025 15:58:55 +0100 Subject: [PATCH 10/12] Adapt amendments to appended rows --- amendments.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/amendments.js b/amendments.js index 249816e93..6f39155ba 100644 --- a/amendments.js +++ b/amendments.js @@ -18,13 +18,19 @@ function removeComments(el) { function markInsertion(el, controller) { const wrapper = document.createElement("ins"); - if (el.tagName === "DIV" || el.tagName === "SECTION" || el.tagName === "DT" || el.tagName === "DD" || el.tagName === "LI") { + if (el.tagName === "DIV" || el.tagName === "SECTION" || el.tagName === "DT" || el.tagName === "DD" || el.tagName === "LI" || el.tagName === "TR") { // special casing the case where
is used to group
/
if (el.tagName === "DIV" && el.parentNode.tagName === "DL") { for (let child of el.children) { wrapChildNodes(child, document.createElement("ins")); } el.children[0].prepend(controller); + } else if (el.tagName === "TR") { + for (let child of el.children) { + wrapChildNodes(child, document.createElement("ins")); + } + el.children[0].prepend(controller); + } else { wrapChildNodes(el, wrapper); el.prepend(controller); From 577d9cbef19de5a276ec7bc3366b71ec6808009b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Fri, 28 Mar 2025 11:17:40 +0100 Subject: [PATCH 11/12] Clarify and take stereo flag into account --- webrtc.html | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/webrtc.html b/webrtc.html index a9ee92f20..488cff484 100644 --- a/webrtc.html +++ b/webrtc.html @@ -16740,10 +16740,19 @@

{{ConstrainULong}} - As a setting, this is the number of channels of the latest - audio frame received, reflecting the number of - {{RTCRtpCodec/channels}} that the decoder outputted. A stereo - capable decoder MUST produce stereo and return the value 2. + As a setting, this is the number of {{RTCRtpCodec/channels}} + that the decoder produced when the last audio frame was + decoded. The number of channels that the decoder produces MUST + reflect the number of channels configured in response to SDP + negotiation. Before any frames have been decoded, this setting + MUST NOT [=map/exist=]. +

+ For example, the opus audio codec has a "stereo" flag. If + "stereo=0" was negotiated, the decoder produces one channel + regardless if the bitstream is mono or stereo, and if + "stereo=1" was negotiated, the decoder produces two channels + regardless if the bitstream is mono or stereo. +

From 953516db7564a790d10ceffb36b17213d5e44e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Bostr=C3=B6m?= Date: Fri, 28 Mar 2025 14:39:42 +0100 Subject: [PATCH 12/12] Local SDP --- webrtc.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc.html b/webrtc.html index 488cff484..1a4740288 100644 --- a/webrtc.html +++ b/webrtc.html @@ -16743,8 +16743,8 @@

As a setting, this is the number of {{RTCRtpCodec/channels}} that the decoder produced when the last audio frame was decoded. The number of channels that the decoder produces MUST - reflect the number of channels configured in response to SDP - negotiation. Before any frames have been decoded, this setting + reflect the number of channels configured when the local SDP + was set. Before any frames have been decoded, this setting MUST NOT [=map/exist=].

For example, the opus audio codec has a "stereo" flag. If