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

Jump to bottom

Mark keySystemAccess as default to null and optional and robustness properties as no longer defaulting. #107

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Mark keySystemAccess as default to null and optional and robustness properties as no longer defaulting. #107

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
51b4b61
Mark keySystemAccess as default to null and optional and robustness p…
mounirlamouri Nov 23, 2018
a4a918a
Rebase and fix merge conflicts.
markafoltz Sep 17, 2024
ea4c3a9
Update for current robustness property name
markafoltz Sep 18, 2024
93a3e3f
Make video steps consistent with audio steps
markafoltz Sep 24, 2024
77be28e
Merge branch 'main' into mc-api-small-changes
markafoltz Oct 9, 2024
06b4ed0
Update per feedback from @xhwang-chromium
markafoltz Oct 9, 2024
bf33e48
Delete whitespace
markafoltz Oct 9, 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
21 changes: 11 additions & 10 deletions index.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ spec: mimesniff; urlPrefix: https://mimesniff.spec.whatwg.org/#
<ul>
<li><dfn for='MediaDecodingType' enum-value>file</dfn> is used to
represent a configuration that is meant to be used for playback of
media sources other than {{MediaSource/MediaSource}} as defined in
media sources other than {{MediaSource/MediaSource}} as defined in
[[media-source]] and {{RTCPeerConnection}} as defined in [[webrtc]]. </li>
<li><dfn for='MediaDecodingType' enum-value>media-source</dfn> is used
to represent a configuration that is meant to be used for playback of
Expand Down Expand Up @@ -719,7 +719,7 @@ spec: mimesniff; urlPrefix: https://mimesniff.spec.whatwg.org/#

<xmp class='idl'>
dictionary MediaCapabilitiesDecodingInfo : MediaCapabilitiesInfo {
required MediaKeySystemAccess keySystemAccess;
required MediaKeySystemAccess? keySystemAccess;
MediaDecodingConfiguration configuration;
};
</xmp>
Expand Down Expand Up @@ -947,17 +947,15 @@ spec: mimesniff; urlPrefix: https://mimesniff.spec.whatwg.org/#
single {{MediaKeySystemMediaCapability}}, initialized as
follows:
<ol>
<li>
Set the {{MediaKeySystemMediaCapability/contentType}} attribute to
<code>config.audio.contentType</code>.
</li>
<li>
If <code>config.keySystemConfiguration.audio</code>
[=map/exists=]:
<ol>
<li>
Set the {{MediaKeySystemMediaCapability/robustness}} attribute to <code>
config.keySystemConfiguration.audio.robustness</code>.
If <code>config.keySystemConfiguration.audio.robustness</code>
[=map/exists=] and is not <code>null</code>, set the
{{MediaKeySystemMediaCapability/robustness}} attribute to
<code>config.keySystemConfiguration.audio.robustness</code>.
</li>
<li>
Set the {{MediaKeySystemMediaCapability/encryptionScheme}} attribute to <code>
Expand All @@ -980,8 +978,11 @@ spec: mimesniff; urlPrefix: https://mimesniff.spec.whatwg.org/#
If <code>config.keySystemConfiguration.video</code> [=map/exists=]:
<ol>
<li>
Set the {{MediaKeySystemMediaCapability/robustness}} attribute to <code>
config.keySystemConfiguration.video.robustness</code>.
If
<code>config.keySystemConfiguration.video.robustness</code>
[=map/exists=] and is not <code>null</code>, set the
{{MediaKeySystemMediaCapability/robustness}} attribute to
<code>config.keySystemConfiguration.video.robustness</code>.
</li>
<li>
Set the {{MediaKeySystemMediaCapability/encryptionScheme}} attribute to <code>
Expand Down
Loading