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

Update references to EME terms #225

Merged
merged 1 commit into from
Aug 8, 2024
Merged

Update references to EME terms #225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
90 changes: 33 additions & 57 deletions index.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,32 +38,6 @@ spec: mediastream-recording; urlPrefix: https://www.w3.org/TR/mediastream-record

spec: mimesniff; urlPrefix: https://mimesniff.spec.whatwg.org/#
type: dfn; text: valid mime type; url: valid-mime-type

spec: encrypted-media; for: EME; urlPrefix: https://www.w3.org/TR/encrypted-media/#
type: attribute
text: keySystem; url: dom-mediakeysystemaccess-keysystem
text: initDataTypes; url: dom-mediakeysystemconfiguration-initdatatypes
text: robustness; url: dom-mediakeysystemmediacapability-robustness
text: distinctiveIdentifier; url: dom-mediakeysystemconfiguration-distinctiveidentifier
text: persistentState; url: dom-mediakeysystemconfiguration-persistentstate
text: sessionTypes; url: dom-mediakeysystemconfiguration-sessiontypes
type: dfn
text: encrypted media
text: Key System; url: key-system
text: Get Supported Configuration; url: get-supported-configuration
type: interface
text: MediaKeySystemAccess; url: mediakeysystemaccess-interface
text: MediaKeys; url: mediakeys-interface
text: MediaKeySystemConfiguration; url: mediakeysystemconfiguration-dictionary
text: requestMediaKeySystemAccess(); url: navigator-extension:-requestmediakeysystemaccess()
text: MediaKeySystemMediaCapability; url: mediakeysystemmediacapability-dictionary
text: MediaKeysRequirement; url: dom-mediakeysrequirement
text: audioCapabilities; url: dom-mediakeysystemconfiguration-audiocapabilities
text: contentType; url: dom-mediakeysystemmediacapability-contenttype

spec: encrypted-media-draft; for: EME; urlPrefix: https://w3c.github.io/encrypted-media/#
type: attribute
text: encryptionScheme; url: dom-mediakeysystemmediacapability-encryptionscheme
</pre>

<pre class='biblio'>
Expand Down Expand Up @@ -662,34 +636,34 @@ spec: encrypted-media-draft; for: EME; urlPrefix: https://w3c.github.io/encrypte
This dictionary refers to a number of types defined by
[[ENCRYPTED-MEDIA]] (EME). Sequences of EME types are
flattened to a single value whenever the intent of the sequence was to
have {{EME/requestMediaKeySystemAccess()}} choose a subset it supports.
have {{Navigator/requestMediaKeySystemAccess()}} choose a subset it supports.
With MediaCapabilities, callers provide the sequence across multiple
calls, ultimately letting the caller choose which configuration to use.
</p>

<p>
The <dfn for='MediaCapabilitiesKeySystemConfiguration' dict-member>keySystem</dfn>
member represents a {{EME/keySystem}} name as described in
member represents a {{MediaKeySystemAccess/keySystem}} name as described in
[[!ENCRYPTED-MEDIA]].
</p>
<p>
The <dfn for='MediaCapabilitiesKeySystemConfiguration' dict-member>initDataType</dfn>
member represents a single value from the {{EME/initDataTypes}} sequence
member represents a single value from the {{MediaKeySystemConfiguration/initDataTypes}} sequence
described in [[!ENCRYPTED-MEDIA]].
</p>
<p>
The <dfn for='MediaCapabilitiesKeySystemConfiguration' dict-member>distinctiveIdentifier</dfn>
member represents a {{EME/distinctiveIdentifier}} requirement as
member represents a {{MediaKeySystemConfiguration/distinctiveIdentifier}} requirement as
described in [[!ENCRYPTED-MEDIA]].
</p>
<p>
The <dfn for='MediaCapabilitiesKeySystemConfiguration' dict-member>persistentState</dfn>
member represents a {{EME/persistentState}} requirement as described in
member represents a {{MediaKeySystemConfiguration/persistentState}} requirement as described in
[[!ENCRYPTED-MEDIA]].
</p>
<p>
The <dfn for='MediaCapabilitiesKeySystemConfiguration' dict-member>sessionTypes</dfn>
member represents a sequence of required {{EME/sessionTypes}} as
member represents a sequence of required {{MediaKeySystemConfiguration/sessionTypes}} as
described in [[!ENCRYPTED-MEDIA]].
</p>
<p>
Expand All @@ -716,12 +690,14 @@ spec: encrypted-media-draft; for: EME; urlPrefix: https://w3c.github.io/encrypte

<p>
The <dfn for='KeySystemTrackConfiguration' dict-member>robustness</dfn>
member represents a {{EME/robustness}} level as described in [[!ENCRYPTED-MEDIA]].
member represents a {{MediaKeySystemMediaCapability/robustness}} level
as described in [[!ENCRYPTED-MEDIA]].
</p>

<p>
The <dfn for='KeySystemTrackConfiguration' dict-member>encryptionScheme</dfn>
member represents an {{EME/encryptionScheme}} as described in [[!ENCRYPTED-MEDIA-DRAFT]].
member represents an {{MediaKeySystemMediaCapability/encryptionScheme}}
as described in [[!ENCRYPTED-MEDIA-DRAFT]].
</p>
</section>

Expand Down Expand Up @@ -773,15 +749,15 @@ spec: encrypted-media-draft; for: EME; urlPrefix: https://w3c.github.io/encrypte
<p>
A {{MediaCapabilitiesDecodingInfo}} has associated
<dfn dict-member for=MediaCapabilitiesDecodingInfo>keySystemAccess</dfn>
which is a {{EME/MediaKeySystemAccess}} or <code>null</code> as
which is a {{MediaKeySystemAccess}} or <code>null</code> as
appropriate.
</p>

<p class='note'>
If the encrypted decoding configuration is supported, the
resulting {{MediaCapabilitiesInfo}} will include a
{{EME/MediaKeySystemAccess}}. Authors may use this to create
{{EME/MediaKeys}} and setup encrypted playback.
{{MediaKeySystemAccess}}. Authors may use this to create
{{MediaKeys}} and setup encrypted playback.
</p>

<p>
Expand Down Expand Up @@ -922,13 +898,13 @@ spec: encrypted-media-draft; for: EME; urlPrefix: https://w3c.github.io/encrypte
<p>
Given a {{MediaDecodingConfiguration}} <var>config</var> where
{{keySystemConfiguration}} [=map/exists=], this algorithm returns a
{{EME/MediaKeySystemAccess}} or <code>null</code> as appropriate. The
{{MediaKeySystemAccess}} or <code>null</code> as appropriate. The
following steps are run:
<ol>
<li>
If the {{keySystem}} member of
<code>config.keySystemConfiguration</code> is not one of the
<a for='EME'>Key Systems</a> supported by the user agent, return
[=Key Systems=] supported by the user agent, return
<code>null</code>. String comparison is case-sensitive.
</li>
<li>
Expand All @@ -941,45 +917,45 @@ spec: encrypted-media-draft; for: EME; urlPrefix: https://w3c.github.io/encrypte

<li>
Let <var>emeConfiguration</var> be a new
{{EME/MediaKeySystemConfiguration}}, and initialize it as follows:
{{MediaKeySystemConfiguration}}, and initialize it as follows:
</li>
<ol>
<li>
Set the {{EME/initDataTypes}} attribute to a sequence containing
Set the {{MediaKeySystemConfiguration/initDataTypes}} attribute to a sequence containing
<code>config.keySystemConfiguration.initDataType</code>.
</li>
<li>
Set the {{EME/distinctiveIdentifier}} attribute to
Set the {{MediaKeySystemConfiguration/distinctiveIdentifier}} attribute to
<code>config.keySystemConfiguration.distinctiveIdentifier</code>.
</li>
<li>
Set the {{EME/persistentState}} attribute to
Set the {{MediaKeySystemConfiguration/persistentState}} attribute to
<code>config.keySystemConfiguration.peristentState</code>.
</li>
<li>
Set the {{EME/sessionTypes}} attribute to
Set the {{MediaKeySystemConfiguration/sessionTypes}} attribute to
<code>config.keySystemConfiguration.sessionTypes</code>.
</li>
<li>
If {{MediaConfiguration/audio}} [=map/exists=] in <var>config</var>, set the
{{EME/audioCapabilities}} attribute to a sequence containing a
single {{EME/MediaKeySystemMediaCapability}}, initialized as
{{MediaKeySystemConfiguration/audioCapabilities}} attribute to a sequence containing a
single {{MediaKeySystemMediaCapability}}, initialized as
follows:
<ol>
<li>
Set the {{EME/contentType}} attribute to
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 {{EME/robustness}} attribute to <code>
Set the {{MediaKeySystemMediaCapability/robustness}} attribute to <code>
config.keySystemConfiguration.audio.robustness</code>.
</li>
<li>
Set the {{EME/encryptionScheme}} attribute to <code>
Set the {{MediaKeySystemMediaCapability/encryptionScheme}} attribute to <code>
config.keySystemConfiguration.audio.encryptionScheme</code>.
</li>
</ol>
Expand All @@ -989,21 +965,21 @@ spec: encrypted-media-draft; for: EME; urlPrefix: https://w3c.github.io/encrypte
<li>
If {{MediaConfiguration/video}} [=map/exists=] in <var>config</var>, set the
videoCapabilities attribute to a sequence containing a single
{{EME/MediaKeySystemMediaCapability}}, initialized as follows:
{{MediaKeySystemMediaCapability}}, initialized as follows:
<ol>
<li>
Set the {{EME/contentType}} attribute to
Set the {{MediaKeySystemMediaCapability/contentType}} attribute to
<code>config.video.contentType</code>.
</li>
<li>
If <code>config.keySystemConfiguration.video</code> [=map/exists=]:
<ol>
<li>
Set the {{EME/robustness}} attribute to <code>
Set the {{MediaKeySystemMediaCapability/robustness}} attribute to <code>
config.keySystemConfiguration.video.robustness</code>.
</li>
<li>
Set the {{EME/encryptionScheme}} attribute to <code>
Set the {{MediaKeySystemMediaCapability/encryptionScheme}} attribute to <code>
config.keySystemConfiguration.video.encryptionScheme</code>.
</li>
</ol>
Expand All @@ -1013,7 +989,7 @@ spec: encrypted-media-draft; for: EME; urlPrefix: https://w3c.github.io/encrypte
</ol>
<li>
Let <var>supported configuration</var> be the result of
executing the <a for='EME'>Get Supported Configuration</a>
executing the [=Get Supported Configuration=]
algorithm on <var>implementation</var>,
<var>emeConfiguration</var>, and <var>origin</var>.
</li>
Expand All @@ -1023,11 +999,11 @@ spec: encrypted-media-draft; for: EME; urlPrefix: https://w3c.github.io/encrypte
these steps.
</li>
<li>
Let <var>access</var> be a new {{EME/MediaKeySystemAccess}}
Let <var>access</var> be a new {{MediaKeySystemAccess}}
object, and initialize it as follows:
<ol>
<li>
Set the {{EME/keySystem}} attribute to
Set the {{MediaKeySystemAccess/keySystem}} attribute to
<code>emeConfiguration.keySystem</code>.
</li>
<li>
Expand Down Expand Up @@ -1117,7 +1093,7 @@ spec: encrypted-media-draft; for: EME; urlPrefix: https://w3c.github.io/encrypte
Note, calling {{decodingInfo()}} with a {{keySystemConfiguration}} present
may have user-visible effects, including requests for user consent. Such
calls should only be made when the author intends to create and use a
{{EME/MediaKeys}} object with the provided configuration.
{{MediaKeys}} object with the provided configuration.
</p>

<p>
Expand Down
Loading