Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Merge pull request #2935 from w3c/redefine-codecs" #2999

Merged
merged 3 commits into from
Sep 12, 2024
Merged

Revert "Merge pull request #2935 from w3c/redefine-codecs" #2999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fc830e
Revert "Merge pull request #2935 from w3c/redefine-codecs"
jan-ivar Sep 4, 2024
489e72e
Merge branch 'main' into revertcodecs
jan-ivar Sep 4, 2024
973ce47
Merge branch 'main' into revertcodecs
jan-ivar Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions amendments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,13 +536,6 @@
"type": "correction",
"status": "candidate",
"id": 13
},
{
"description": "Redefine SendCodecs and ReceiveCodecs",
"pr": 2935,
"type": "correction",
"status": "candidate",
"id": 41
}
],
"webidl-rtcrtpencodingparameters": [
Expand Down Expand Up @@ -898,15 +891,6 @@
"id": 42
}
],
"rtcrtpreceiver-receivecodecs": [
{
"description": "Redefine SendCodecs and ReceiveCodecs",
"pr": 2935,
"type": "correction",
"status": "candidate",
"id": 41
}
],
"internalslot-jitterbuffertarget": [
{
"description": "Add control for the receiver's jitter buffer",
Expand Down
2 changes: 1 addition & 1 deletion base-rec.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10115,7 +10115,7 @@ <h3 id="x5-3-rtcrtpreceiver-interface"><bdi class="secno">5.3 </bdi>
To <dfn id="dfn-create-an-rtcrtpreceiver">create an RTCRtpReceiver</dfn> with a string,
<var>kind</var>, run the following steps:
</p>
<ol id="create-receiver-algo">
<ol>
<li class="no-test-needed">
<p>
Let <var>receiver</var> be a new <a data-link-type="idl" href="#dom-rtcrtpreceiver" class="internalDFN" id="ref-for-dom-rtcrtpreceiver-24"><code><code>RTCRtpReceiver</code></code></a> object.
Expand Down
96 changes: 35 additions & 61 deletions webrtc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2190,13 +2190,11 @@ <h4>
</li>
<li>
<p>
For each of the codecs that <var>description</var> negotiates for receiving, execute the following steps:
<ol>
<li>Locate the matching codec description in <var>transceiver</var>.{{RTCRtpTransceiver/[[Receiver]]}}.{{RTCRtpReceiver/[[ReceiveCodecs]]}}.</li>
<li>If the matching codec description is not found, abort these steps.</li>
<li>Set the "enabled" flag in the matching codec description to "true".</li>
</ol>

Set
<var>transceiver</var>.{{RTCRtpTransceiver/[[Receiver]]}}.{{RTCRtpReceiver/[[ReceiveCodecs]]}}
to the codecs that <var>description</var>
negotiates for receiving and which the user
agent is currently prepared to receive.
</p>
<p class='note'>
If the <var>direction</var> is
Expand Down Expand Up @@ -2245,15 +2243,13 @@ <h4>
</li>
<li>
<p>
For each of the codecs that <var>description</var> negotiates for sending, execute the following steps:
<ol>
<li>Locate the matching codec description in <var>transceiver</var>.{{RTCRtpTransceiver/[[Sender]]}}.{{RTCRtpSender/[[SendCodecs]]}}.</li>
<li>If the matching codec description is not found, abort these steps.</li>
<li>Set the "enabled" flag in the matching codec description to "true".</li>
</ol>
</li>
<li>
Set <var>transceiver</var>.{{RTCRtpTransceiver/[[Sender]]}}.{{RTCRtpSender/[[LastReturnedParameters]]}}
Set
<var>transceiver</var>.{{RTCRtpTransceiver/[[Sender]]}}.{{RTCRtpSender/[[SendCodecs]]}}
to the codecs that <var>description</var>
negotiates for sending and which the user
agent is currently capable of sending,
and set
<var>transceiver</var>.{{RTCRtpTransceiver/[[Sender]]}}.{{RTCRtpSender/[[LastReturnedParameters]]}}
to <code>null</code>.
</p>
</li>
Expand Down Expand Up @@ -2521,12 +2517,11 @@ <h4>
</li>
<li>
<p>
For each of the codecs that <var>description</var> negotiates for receiving, execute the following steps:
<ol>
<li>Locate the matching codec description in <var>transceiver</var>.{{RTCRtpTransceiver/[[Receiver]]}}.{{RTCRtpReceiver/[[ReceiveCodecs]]}}.</li>
<li>If the matching codec description is not found, abort these steps.</li>
<li>Set the "enabled" flag in the matching codec description to "true".</li>
</ol>
Set
<var>transceiver</var>.{{RTCRtpTransceiver/[[Receiver]]}}.{{RTCRtpReceiver/[[ReceiveCodecs]]}}
to the codecs that <var>description</var>
negotiates for receiving and which the user
agent is currently prepared to receive.
</p>
</li>
<li>
Expand All @@ -2539,12 +2534,11 @@ <h4>
<ol>
<li>
<p>
For each of the codecs that <var>description</var> negotiates for sending, execute the following steps:
<ol>
<li>Locate the matching codec description in <var>transceiver</var>.{{RTCRtpTransceiver/[[Sender]]}}.{{RTCRtpSender/[[SendCodecs]]}}.</li>
<li>If the matching codec description is not found, abort these steps.</li>
<li>Set the "enabled" flag in the matching codec description to "true".</li>
</ol>
Set
<var>transceiver</var>.{{RTCRtpTransceiver/[[Sender]]}}.{{RTCRtpSender/[[SendCodecs]]}}
to the codecs that <var>description</var>
negotiates for sending and which the user
agent is currently capable of sending.
</p>
</li>
<li>
Expand Down Expand Up @@ -3757,7 +3751,8 @@ <h2>
<var>transceiver</var>.{{RTCRtpTransceiver/direction}}
is {{RTCRtpTransceiverDirection/"sendonly"}}
or {{RTCRtpTransceiverDirection/"sendrecv"}},
include all codecs in the <var>transceiver</var>'s {{RTCRtpTransceiver/[[Sender]]}}'s {{RTCRtpSender/[[SendCodecs]]}} for which the "enabled" flag is "true".
exclude any codecs not included in the
[=RTCRtpSender/list of implemented send codecs=] for
<var>kind</var>.
</p>
</li>
Expand All @@ -3767,7 +3762,9 @@ <h2>
<var>transceiver</var>.{{RTCRtpTransceiver/direction}}
is {{RTCRtpTransceiverDirection/"recvonly"}}
or {{RTCRtpTransceiverDirection/"sendrecv"}},
include all codecs in the <var>transceiver</var>'s {{RTCRtpTransceiver/[[Receiver]]}}'s {{RTCRtpReceiver/[[ReceiveCodecs]]}} for which the "enabled" flag is "true".
exclude any codecs not included in the
[=list of implemented receive codecs=] for
<var>kind</var>.
</p>
</li>
</ol>
Expand Down Expand Up @@ -8860,10 +8857,8 @@ <h3>
<li>
<p>
Let <var>sender</var> have a <dfn class="export" data-dfn-for="RTCRtpSender">[[\SendCodecs]]</dfn> internal
slot, representing a list of [=tuple=]s, each containing an {{RTCRtpCodecParameters}}
dictionary and an "enabled" boolean, and initialized to the
[=RTCRtpSender/list of implemented send codecs=], with the "enabled" flag
set in an implementation defined manner.
slot, representing a list of {{RTCRtpCodecParameters}}
dictionaries, and initialized to an empty list.
</p>
</li>
<li class="no-test-needed">
Expand Down Expand Up @@ -8979,15 +8974,6 @@ <h2>
dictionaries representing the most optimistic view of the codecs the user
agent supports for sending media of the given <var>kind</var> (video or audio).
</p>
<p class="note">
This conceptual list contains every combination of parameters that
the user agent is capable of processing. In practice, this would
be implemented as a piece of code that parses the parameters and
determines whether they are acceptable or not, but this is highly
codec dependent, so for the purpose of specification, we work with
a conceptual list containing all acceptable parameter combinations.
</p>

<p>
The <dfn>list of implemented header extensions for sending</dfn>, given
<var>kind</var>, is an [=implementation-defined=] list of
Expand Down Expand Up @@ -9273,9 +9259,8 @@ <h2>
</li>
<li data-tests=
"RTCRtpParameters-codecs.html,protocol/video-codecs.https.html">
{{RTCRtpParameters/codecs}} is set to the codecs from the
{{RTCRtpSender/[[SendCodecs]]}} internal slot where the
"enabled" flag is true.
{{RTCRtpParameters/codecs}} is set to the value of the
{{RTCRtpSender/[[SendCodecs]]}} internal slot.
</li>
<li data-tests="RTCRtpParameters-encodings.html">
{{RTCRtpParameters/rtcp}}.{{RTCRtcpParameters/cname}} is
Expand Down Expand Up @@ -10229,7 +10214,7 @@ <h3>
To <dfn class="abstract-op">create an RTCRtpReceiver</dfn> with a string,
<var>kind</var>, run the following steps:
</p>
<ol class=algorithm id="create-receiver-algo">
<ol class=algorithm>
<li class="no-test-needed">
<p>
Let <var>receiver</var> be a new {{RTCRtpReceiver}} object.
Expand Down Expand Up @@ -10310,11 +10295,9 @@ <h3>
</li>
<li id="rtcrtpreceiver-receivecodecs">
<p>
Let <var>receiver</var> have a <dfn class="export" data-dfn-for="RTCRtpReceiver">[[\ReceiveCodecs]]</dfn>
internal slot, representing a list of [=tuple=]s, each containing a {{RTCRtpCodecParameters}}
dictionaries, and initialized to an list containing all the codecs in the
<a>list of implemented receive codecs</a> for <var>kind</var>, and with the "enabled" flag
set in an implementation defined manner.
Let <var>receiver</var> have a <dfn data-dfn-for="RTCRtpReceiver">[[\ReceiveCodecs]]</dfn>
internal slot, representing a list of {{RTCRtpCodecParameters}}
dictionaries, and initialized to an empty list.
</p>
</li>
<li>
Expand Down Expand Up @@ -10546,14 +10529,6 @@ <h2>
the codecs the user agent supports for receiving media of the given
<var>kind</var> (video or audio).
</p>
<p class="note">
This conceptual list contains every combination of parameters that
the user agent is capable of processing. In practice, this would
be implemented as a piece of code that parses the parameters and
determines whether they are acceptable or not, but this is highly
codec dependent, so for the purpose of specification, we work with
a conceptual list containing all acceptable parameter combinations.
</p>
<p>
The <dfn>list of implemented header extensions for receiving</dfn>, given
<var>kind</var>, is an [=implementation-defined=] list of
Expand Down Expand Up @@ -10602,7 +10577,6 @@ <h2>
<li data-tests="RTCRtpReceiver-getParameters.html">
<p>
{{RTCRtpParameters/codecs}} is set to the value of the
"enabled" codecs from the
{{RTCRtpReceiver/[[ReceiveCodecs]]}} internal slot.
</p>
<div class="note">
Expand Down
Loading