Skip to content

Commit 95f037c

Browse files
committed
Removed 'valid media MIME type' and reference mimesniff
See #511
1 parent 6f6f781 commit 95f037c

File tree

1 file changed

+25
-28
lines changed

1 file changed

+25
-28
lines changed

encrypted-media-respec.html

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
},
6464
},
6565

66-
xref: ["dom", "html", "infra", "webaudio"]
66+
xref: ["dom", "html", "infra", "mimesniff", "webaudio"]
6767
};
6868
</script>
6969
<link rel="stylesheet" href="eme.css">
@@ -1021,22 +1021,6 @@ <h2>
10211021
multiple independent profiles for a single account.
10221022
</p>
10231023
</dd>
1024-
<dt>
1025-
<dfn>Valid Media MIME Type</dfn>
1026-
</dt>
1027-
<dd>
1028-
<p>
1029-
A valid media MIME type is a media <a data-cite="html#mime-types">MIME type</a> that is
1030-
also a [=valid MIME type string=] [[mimesniff]]. When a MIME type includes parameters,
1031-
such as `"codecs"` [[RFC6381]], such parameters MUST also be valid per the relevant
1032-
specification.
1033-
</p>
1034-
<p>
1035-
When used with the features defined in this specification, MIME type strings SHOULD
1036-
explicitly specify codecs and codec constraints (e.g., per [[RFC6381]]) unless these
1037-
are normatively implied by the container.
1038-
</p>
1039-
</dd>
10401024
</dl>
10411025
</section>
10421026
<section>
@@ -1928,14 +1912,20 @@ <h5>
19281912
</li><!-- Invalid input. -->
19291913
<li>
19301914
<p>
1931-
If <var>content type</var> is not a [=valid media MIME type=] or is
1932-
unrecognized, continue to the next iteration.
1915+
Let <var>mimeType</var> be the result of running <a>parse a MIME type</a>
1916+
with <var>content type</var>.
19331917
</p>
19341918
</li>
19351919
<li>
19361920
<p>
1937-
Let <var>container</var> be the container type specified by <var>content
1938-
type</var>.
1921+
If <var>mimeType</var> is <code>failure</code> or is unrecognized,
1922+
continue to the next iteration.
1923+
</p>
1924+
</li>
1925+
<li>
1926+
<p>
1927+
Let <var>container</var> be the container type specified by
1928+
<var>mimeType</var>.
19391929
</p>
19401930
</li>
19411931
<li>
@@ -1951,13 +1941,14 @@ <h5>
19511941
</li>
19521942
<li>
19531943
<p>
1954-
Let <var>parameters</var> be the RFC 6381 [[RFC6381]] parameters, if any,
1955-
specified by <var>content type</var>.
1944+
Let <var>parameters</var> be the "codecs" and "profiles" RFC 6381 [[RFC6381]]
1945+
parameters, if any, of <var>mimeType</var>.
19561946
</p>
19571947
</li>
19581948
<li>
19591949
<p>
19601950
If the user agent does not recognize one or more <var>parameters</var>,
1951+
or if any parameters are not valid per the relevant specification,
19611952
continue to the next iteration.
19621953
</p>
19631954
</li>
@@ -1998,11 +1989,12 @@ <h5>
19981989
</li>
19991990
<li>
20001991
<p>
2001-
If <var>content type</var> is not strictly an <var>audio/video type</var>,
1992+
If <var>mimeType</var> is not strictly an <var>audio/video type</var>,
20021993
continue to the next iteration.
20031994
</p>
20041995
<p class="note">
2005-
For example, if <var>audio/video type</var> is Video and the top-level type
1996+
For example, if <var>audio/video type</var> is Video and <var>mimeType</var>'s
1997+
<var>type</var>
20061998
is not "video" or <var>media types</var> contains non-video codecs.
20071999
</p>
20082000
</li>
@@ -2483,8 +2475,13 @@ <h2>
24832475
</dt>
24842476
<dd>
24852477
<p>
2486-
The type of the <a data-cite="html#media-resource">media resource</a>. Its value
2487-
must be a [=valid media MIME type=]. The empty string is invalid.
2478+
The <a data-cite="html#mime-types">MIME type</a> of the
2479+
<a data-cite="html#media-resource">media resource</a>.
2480+
</p>
2481+
<p class="note">
2482+
Applications SHOULD ensure that the MIME type explicitly specifies codecs
2483+
and codec constraints (e.g., per [[RFC6381]]) unless these are normatively
2484+
implied by the container.
24882485
</p>
24892486
</dd>
24902487
<dt>
@@ -2619,7 +2616,7 @@ <h2>
26192616
The returned object is a non-strict subset (plus any implied defaults) of the first
26202617
satisfiable {{MediaKeySystemConfiguration}} configuration passed to the
26212618
{{Navigator/requestMediaKeySystemAccess()}} call that returned the promise that was
2622-
resolved with this object. It does not contain values capabilities not specified in
2619+
resolved with this object. It does not contain values for capabilities not specified in
26232620
that single configuration (other than implied defaults) and thus may not reflect all
26242621
capabilities of the [=Key System=] implementation. All values in the configuration
26252622
may be used in any combination. Members of type {{MediaKeysRequirement}} reflect

0 commit comments

Comments
 (0)