Skip to content

Commit 9e44ebd

Browse files
chrisnchrisn
authored
Update registries to use W3C Registry Track (#524)
* Update registries to use W3C Registry Track * Registry edits - Use lower-case "must" to avoid ReSpec warnings - Use ED document type, as DRY is applied when publishing to /TR * Update regsitry entries - Remove custom JavaScript - Use latest ReSpec script - Add Conformance sections - Update links to term definitions - Export definitions from the EME spec: - Decryption key ID - Initialization Data Encountered - Encrypted Block Encountered * Move export definitions
1 parent 0bc7d34 commit 9e44ebd

File tree

8 files changed

+141
-333
lines changed

8 files changed

+141
-333
lines changed

‎encrypted-media-respec.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ <h2>Definitions</h2>
289289
<p class="note">For example, a key is not usable for decryption if its license has expired. Even if its license has not expired, a key is not usable for decryption if other conditions (e.g., output protection) for its use are not currently satisfied.</p>
290290
</dd>
291291

292-
<dt id="decryption-key-id">Key ID</dt>
292+
<dt id="decryption-key-id"><dfn class="export" data-lt="Decryption key ID">Key ID</dfn></dt>
293293
<dd>
294294
<p>A <a href="#decryption-key">key</a> is associated with a key ID that is a sequence of octets and which uniquely identifies the key.
295295
The container specifies the ID of the key that can decrypt a block or set of blocks within the <a def-id="media-data"></a>.
@@ -332,7 +332,7 @@ <h2>Definitions</h2>
332332

333333
<p>
334334
The format of the initialization data depends upon the type of container, and containers MAY support more than one format
335-
of initialization data. The <dfn id="initialization-data-type">Initialization Data Type</dfn> is a string that indicates the
335+
of initialization data. The <dfn class="export" id="initialization-data-type">Initialization Data Type</dfn> is a string that indicates the
336336
format of the accompanying Initialization Data. Initialization Data Type strings are always matched case-sensitively. It is
337337
RECOMMENDED that Initialization Data Type strings are lower-case ASCII strings.
338338
</p>
@@ -3027,7 +3027,7 @@ <h4>Media Data May Contain Encrypted Blocks</h4>
30273027
</section>
30283028

30293029
<section id="initdata-encountered">
3030-
<h4>Initialization Data Encountered</h4>
3030+
<h4><dfn class="export">Initialization Data Encountered</dfn></h4>
30313031
<p>
30323032
The Initialization Data Encountered algorithm queues an <a def-id="encrypted"></a> event for <a def-id="initialization-data"></a> encounterd in the <a def-id="media-data"></a>.
30333033
Requests to run this algorithm include a target <a def-id="htmlmediaelement"></a> object.
@@ -3061,7 +3061,7 @@ <h4>Initialization Data Encountered</h4>
30613061
</section>
30623062

30633063
<section id="encrypted-block-encountered">
3064-
<h4>Encrypted Block Encountered</h4>
3064+
<h4><dfn class="export">Encrypted Block Encountered</dfn></h4>
30653065
<p>
30663066
The Encrypted Block Encountered algorithm queues a block of encrypted media data for decryption and attempts to decrypt if possible.
30673067
Requests to run this algorithm include a target <a def-id="htmlmediaelement"></a> object.

‎format-registry/initdata/cenc-respec.html

Lines changed: 20 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
55
<title>"cenc" Initialization Data Format</title>
6-
<script src="https://www.w3.org/Tools/respec/respec-w3c-common" class="remove"></script>
7-
<script src="../../encrypted-media.js" class="remove"></script>
6+
<script src="https://www.w3.org/Tools/respec/respec-w3c" class="remove"></script>
87
<script class="remove">
98
var respecConfig = {
109
// specification status (e.g. WD, LCWD, NOTE, etc.). If in doubt use ED.
@@ -16,11 +15,6 @@
1615
// if there a publicly available Editor's Draft, this is the link
1716
edDraftURI: "https://w3c.github.io/encrypted-media/format-registry/initdata/cenc.html",
1817

19-
// if this is a LCWD, uncomment and set the end of its review period
20-
// lcEnd: "2009-08-05",
21-
22-
// editors, add as many as you like
23-
// only "name" is required
2418
editors: [
2519
{ name: "Joey Parrish", w3cid: "105371",
2620
company: "Google Inc.", companyURL: "https://www.google.com/" },
@@ -39,21 +33,8 @@
3933
company: "Microsoft Corporation", companyURL: "https://www.microsoft.com/" },
4034
],
4135

42-
otherLinks: [
43-
{ key: "Repository", href: "https://github.com/w3c/encrypted-media/" },
44-
],
45-
46-
emeDefGroupName: "cenc-format",
47-
emeUnusedGroupNameExcludeList: [
48-
"encrypted-media",
49-
"eme-references-from-registry",
50-
],
51-
52-
// name of the WG
53-
wg: "Media Working Group",
54-
55-
// URI of the public WG page
56-
wgURI: "https://www.w3.org/media-wg/",
36+
group: "media",
37+
github: "w3c/encrypted-media",
5738

5839
// name (without the @w3c.org) of the public mailing to which comments are due
5940
wgPublicList: "public-media-wg",
@@ -65,22 +46,6 @@
6546
// Team Contact.
6647
wgPatentURI: "https://www.w3.org/2004/01/pp-impl/115198/status",
6748

68-
noIDLIn: true,
69-
70-
scheme: "https",
71-
72-
// Empty definitions for objects declared in the document are here to
73-
// prevent error messages from being displayed for references to these objects.
74-
definitionMap: {},
75-
76-
preProcess: [ encryptedMediaPreProcessor ],
77-
78-
// Empty definitions for objects declared in the document are here to
79-
// prevent error messages from being displayed for references to these objects.
80-
definitionMap: {},
81-
82-
postProcess: [ encryptedMediaPostProcessor ],
83-
8449
localBiblio: {
8550
"CENC": {
8651
title: "ISO/IEC 23001-7:2016, Information technology — MPEG systems technologies — Part 7: Common encryption in ISO base media file format files",
@@ -89,6 +54,8 @@
8954
publisher: "ISO/IEC",
9055
},
9156
},
57+
58+
xref: ["encrypted-media"]
9259
};
9360
</script>
9461
<!-- script to register bugs -->
@@ -102,33 +69,34 @@
10269
<body>
10370
<!-- TODO: Use styles for ISO boxes like the MSE registry. -->
10471
<section id="abstract">
105-
<p>This specification defines the <code>"cenc"</code> <a def-id="initialization-data"></a> format for use with the <a def-id="eme-spec"></a> [[!ENCRYPTED-MEDIA]].
106-
This format is commonly used with the <a def-id="stream-registry-mp4"></a> [[EME-STREAM-REGISTRY]].
72+
<p>This specification defines the <code>"cenc"</code> [=initialization data=] format for use with the [[[ENCRYPTED-MEDIA]]] [[ENCRYPTED-MEDIA]].
73+
This format is commonly used with the [[[EME-STREAM-MP4]]] [[EME-STREAM-REGISTRY]].
10774
</p>
10875
<p>This specification also defines a common SystemID and PSSH box format for use with Encrypted Media Extensions.</p>
109-
<p class="note">This format's <a def-id="initialization-data-type"></a> string <code>"cenc"</code> refers to the [[CENC]] spec that defines the PSSH boxes that comprise the format.
76+
<p class="note">This format's [=initialization data type=] string <code>"cenc"</code> refers to the [[CENC]] spec that defines the PSSH boxes that comprise the format.
11077
It does not relate to or imply a stream format, including the use of the 'cenc' protection scheme.
111-
Stream formats are indicated by the content types as defined in <a def-id="stream-registry"></a> [[EME-STREAM-REGISTRY]].
78+
Stream formats are indicated by the content types as defined in the [[[EME-STREAM-REGISTRY]]] [[EME-STREAM-REGISTRY]].
79+
</p>
11280
</section>
11381

11482
<section id="sotd">
11583
</section>
11684

11785
<section id="format">
11886
<h2>Format</h2>
119-
<p>The format is one or more concatenated Protection System Specific Header ('pssh') boxes [[!CENC]], each for a unique SystemID.
87+
<p>The format is one or more concatenated Protection System Specific Header ('pssh') boxes [[CENC]], each for a unique SystemID.
12088
One of the concatenated 'pssh' boxes SHOULD use the <a href="#common-system">Common SystemID and PSSH Box Format</a>.
12189
</p>
12290

123-
<p class="note">[[!CENC]] also specifies storage of a 'pssh' box base64-encoded in an XML element of the form <code>&lt;cenc:pssh (base64 'pssh')&gt;</code>.
91+
<p class="note">[[CENC]] also specifies storage of a 'pssh' box base64-encoded in an XML element of the form <code>&lt;cenc:pssh (base64 'pssh')&gt;</code>.
12492
For example, [[MPEGDASH]] manifests may provide 'pssh' boxes in this format, each contained in a ContentProtection Descriptor element identified by a SystemID.
12593
These 'pssh' boxes may be decoded and concatenated by an application to provide equivalent Initialization Data to that stored in movie or movie fragment boxes.
12694
</p>
12795
</section>
12896

12997
<section id="processing">
13098
<h2>Processing</h2>
131-
<p>When such Initialization Data is provided by the application, an implementation (the user agent and/or CDM) MUST :</p>
99+
<p>When such Initialization Data is provided by the application, an implementation (the user agent and/or CDM) MUST:</p>
132100
<ol>
133101
<li><p>Examine the series of 'pssh' boxes to find the <em>first</em> 'pssh' box that the CDM instance supports. This includes checking the SystemID, box version, and system-specific values.</p></li>
134102
<li><p>If no such supported box is found, the provided data SHALL be considered "not supported by the CDM."</p></li>
@@ -137,7 +105,7 @@ <h2>Processing</h2>
137105

138106
<section id="clear-key">
139107
<h3>Use with Clear Key</h3>
140-
<p>When Initialization data is provided with <var>initDataType</var> <code>"cenc"</code>, <a def-id="clear-key"></a> implementations MUST look for and use the PSSH box with the <a href="#common-system">Common SystemID</a>.</p>
108+
<p>When Initialization data is provided with <var>initDataType</var> <code>"cenc"</code>, <a data-cite="encrypted-media#clear-key">Clear Key</a> implementations MUST look for and use the PSSH box with the <a href="#common-system">Common SystemID</a>.</p>
141109
</section>
142110

143111
<section id="common-system">
@@ -149,19 +117,19 @@ <h2>Common SystemID and PSSH Box Format</h2>
149117
Use of this SystemID is RECOMMENDED for applications, packagers, and implementors.
150118
Use of other SystemIDs with the Encrypted Media Extensions APIs is discouraged.
151119
'pssh' box(es) for this SystemID SHOULD be included in all new or repackaged content so that the content can be used with any compliant Key System.
152-
For existing content, applications may alternatively obtain a 'pssh' box containing this SystemID or another Initialization Data Type (e.g., <a def-id="initdata-registry-keyids"></a> [[EME-STREAM-REGISTRY]]) from another source.
120+
For existing content, applications may alternatively obtain a 'pssh' box containing this SystemID or another Initialization Data Type (e.g., [[[EME-INITDATA-KEYIDS]]] [[EME-STREAM-REGISTRY]]) from another source.
153121
</p>
154122
<p class="note">Implementations MAY support other SystemIDs for backwards compatibility with existing streams.</p>
155123

156124
<section id="common-system-definition">
157125
<h3>Definition</h3>
158126
<p>The SystemID is <code>1077efec-c0b2-4d02-ace3-3c1e52e2fb4b</code>.</p>
159-
<p>The PSSH box format is as follows. It follows version 1 of the 'pssh' box as defined in [[!CENC]].</p>
127+
<p>The PSSH box format is as follows. It follows version 1 of the 'pssh' box as defined in [[CENC]].</p>
160128
<dl>
161129
<dt>version</dt>
162130
<dd><code>1</code></dd>
163131
<dt>KID and KID_count</dt>
164-
<dd>The <a def-id="key-id"></a>(s) represented by the PSSH box. For example, those key ID(s) used by the Movie ('moov') or Movie Fragment ('moof').</dd>
132+
<dd>The [=Decryption key ID|key ID=](s) represented by the PSSH box. For example, those key ID(s) used by the Movie ('moov') or Movie Fragment ('moof').</dd>
165133
<dt>Data and DataSize</dt>
166134
<dd>Reserved for future use. DataSize SHALL be set to <code>0</code> when constructing this box. When processing, if dataSize is non-zero the Data field SHALL be ignored.</dd>
167135
</dl>
@@ -184,6 +152,9 @@ <h2>Example</h2>
184152
];
185153
</pre>
186154
</section>
155+
</section>
187156

157+
<section id="conformance">
158+
</section>
188159
</body>
189160
</html>

‎format-registry/initdata/index-respec.html

Lines changed: 23 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
55
<title>Encrypted Media Extensions Initialization Data Format Registry</title>
6-
<script src="https://www.w3.org/Tools/respec/respec-w3c-common" class="remove"></script>
7-
<script src="../../encrypted-media.js" class="remove"></script>
6+
<script src="https://www.w3.org/Tools/respec/respec-w3c" class="remove"></script>
87
<script class="remove">
98
var respecConfig = {
109
// specification status (e.g. WD, LCWD, NOTE, etc.). If in doubt use ED.
@@ -16,11 +15,6 @@
1615
// if there a publicly available Editor's Draft, this is the link
1716
edDraftURI: "https://w3c.github.io/encrypted-media/format-registry/initdata/",
1817

19-
// if this is a LCWD, uncomment and set the end of its review period
20-
// lcEnd: "2009-08-05",
21-
22-
// editors, add as many as you like
23-
// only "name" is required
2418
editors: [
2519
{ name: "Joey Parrish", w3cid: "105371",
2620
company: "Google Inc.", companyURL: "https://www.google.com/" },
@@ -39,21 +33,8 @@
3933
company: "Microsoft Corporation", companyURL: "https://www.microsoft.com/" },
4034
],
4135

42-
otherLinks: [
43-
{ key: "Repository", href: "https://github.com/w3c/encrypted-media/" },
44-
],
45-
46-
emeDefGroupName: "format-registry",
47-
emeUnusedGroupNameExcludeList: [
48-
"encrypted-media",
49-
"eme-references-from-registry",
50-
],
51-
52-
// name of the WG
53-
wg: "Media Working Group",
54-
55-
// URI of the public WG page
56-
wgURI: "https://www.w3.org/media-wg/",
36+
group: "media",
37+
github: "w3c/encrypted-media",
5738

5839
// name (without the @w3c.org) of the public mailing to which comments are due
5940
wgPublicList: "public-media-wg",
@@ -65,21 +46,7 @@
6546
// Team Contact.
6647
wgPatentURI: "https://www.w3.org/2004/01/pp-impl/115198/status",
6748

68-
noIDLIn: true,
69-
70-
scheme: "https",
71-
72-
// Empty definitions for objects declared in the document are here to
73-
// prevent error messages from being displayed for references to these objects.
74-
definitionMap: {},
75-
76-
preProcess: [ encryptedMediaPreProcessor ],
77-
78-
// Empty definitions for objects declared in the document are here to
79-
// prevent error messages from being displayed for references to these objects.
80-
definitionMap: {},
81-
82-
postProcess: [ encryptedMediaPostProcessor ],
49+
xref: ["html", "encrypted-media"]
8350
};
8451
</script>
8552
<!-- script to register bugs -->
@@ -100,11 +67,12 @@
10067
<body>
10168

10269
<section id="abstract">
103-
<p>This specification defines the <a def-id="initialization-data"></a> formats for use with the <a def-id="eme-spec"></a> [[!ENCRYPTED-MEDIA]].</p>
70+
<p>This specification defines the [=initialization data=] formats for use with the [[[ENCRYPTED-MEDIA]]] [[ENCRYPTED-MEDIA]].</p>
10471

105-
<p>Some formats may be extracted from <a def-id="media-data"></a> [[HTML5]] as defined in the <a def-id="stream-registry"></a> [[EME-STREAM-REGISTRY]].
72+
<p>Some formats may be extracted from [=HTMLMediaElement/media data=] as defined in the [[[EME-STREAM-REGISTRY]]] [[EME-STREAM-REGISTRY]].
10673
All may be provided separately, such as via a manifest or other application data.
10774
</p>
75+
<p>This registry is non-normative.</p>
10876
</section>
10977

11078
<section id="sotd">
@@ -113,15 +81,15 @@
11381
<section id="purpose">
11482
<h2>Purpose</h2>
11583
<p>This registry is intended to enhance interoperability among implementations and users of encrypted media streams with the
116-
<a def-id="eme-spec"></a> (EME) specification [[!ENCRYPTED-MEDIA]]. In particular, this registry provides the means (1) to identify
84+
[[[ENCRYPTED-MEDIA]]] (EME) specification [[ENCRYPTED-MEDIA]]. In particular, this registry provides the means (1) to identify
11785
and avoid collisions among initialization data type strings, and (2) to disclose information about initialization data formats accepted by EME
11886
implementations to promote interoperability.
11987
</section>
12088

12189
<section id="organization">
12290
<h2>Organization</h2>
123-
<p>The registry maintains a mapping between <a def-id="initialization-data-type"></a> strings and format specifications, which describe the structure and semantics of initialization data.
124-
The strings are those used for <code>initDataType</code> values provided by and to <a def-id="eme-spec"></a> [[!ENCRYPTED-MEDIA]] APIs.
91+
<p>The registry maintains a mapping between [=initialization data type=] strings and format specifications, which describe the structure and semantics of initialization data.
92+
The strings are those used for <code>initDataType</code> values provided by and to [[[ENCRYPTED-MEDIA]]] [[ENCRYPTED-MEDIA]] APIs.
12593
</p>
12694
<p>This registry is not intended to include any information on whether a format is encumbered by intellectual property claims. Implementors and users
12795
are advised to seek appropriate legal counsel in this matter if they intend to implement or use a specific format.</p>
@@ -130,18 +98,23 @@ <h2>Organization</h2>
13098
<section id="entry-requirements">
13199
<h2>Registration Entry Requirements</h2>
132100
<ol>
133-
<li><p>Each entry must include a unique <a def-id="initialization-data-type"></a> string.</p></li>
101+
<li><p>Each entry must include a unique [=initialization data type=] string.</p></li>
134102
<li>
135103
<p>Each entry must include a link that references a publicly available specification.
136-
It is RECOMMENDED that such a specification be made available without cost (other than reasonable shipping and handling if not available by online means).
104+
It is recommended that such a specification be made available without cost (other than reasonable shipping and handling if not available by online means).
137105
</p>
138106
</li>
139107
<li>
140-
<p>Candidate entries must be announced on <a href="mailto:public-media-wg@w3.org">public-media-wg@w3.org</a>(<a href="mailto:public-media-wg-request@w3.org">subscribe</a>,
141-
<a href="https://lists.w3.org/Archives/Public/public-media-wg/">archives</a>) so they can be discussed and evaluated for compliance before being added to the registry.
108+
<p>Candidate entries must be announced by filing an issue in the
109+
<a href="https://github.com/w3c/encrypted-media/issues/">Encrypted Media Extensions GitHub issue tracker</a>
110+
so they can be discussed and evaluated for compliance before being added to
111+
the registry.
142112
</p>
143113
</li>
144-
<li><p>Per the <a def-id="eme-spec"></a> specification, entries MUST be fully specified and support common formats such that instances of the format can be processed in a fully specified and compatible way.</p></li>
114+
<li><p>Per the [[[ENCRYPTED-MEDIA]]] specification, entries must be fully specified and support common formats such that instances of the format can be processed in a fully specified and compatible way.</p></li>
115+
<li>
116+
<p>Existing entries cannot be deleted or deprecated.</p>
117+
</li>
145118
</ol>
146119
</section>
147120

@@ -159,19 +132,19 @@ <h2>Registry</h2>
159132
<td>
160133
cenc
161134
</td>
162-
<td><a def-id='initdata-registry-cenc'></a> [[!EME-INITDATA-CENC]]</td>
135+
<td>[[[EME-INITDATA-CENC]]] [[EME-INITDATA-CENC]]</td>
163136
</tr>
164137
<tr>
165138
<td>
166139
keyids
167140
</td>
168-
<td><a def-id="initdata-registry-keyids"></a> [[!EME-INITDATA-KEYIDS]]</td>
141+
<td>[[[EME-INITDATA-KEYIDS]]] [[EME-INITDATA-KEYIDS]]</td>
169142
</tr>
170143
<tr>
171144
<td>
172145
webm
173146
</td>
174-
<td><a def-id="initdata-registry-webm"></a> [[!EME-INITDATA-WEBM]]</td>
147+
<td>[[[EME-INITDATA-WEBM]]] [[EME-INITDATA-WEBM]]</td>
175148
</tr>
176149
</tbody>
177150
</table>

0 commit comments

Comments
 (0)