Commit 5fa2dcee authored by Ralph Giles's avatar Ralph Giles

oggopus: further cleanup in response to review.

parent 68c54857
...@@ -550,7 +550,7 @@ If the point 80 ms prior to the seek target comes before the initial PCM ...@@ -550,7 +550,7 @@ If the point 80 ms prior to the seek target comes before the initial PCM
<section anchor="headers" title="Header Packets"> <section anchor="headers" title="Header Packets">
<t> <t>
An Opus stream contains exactly two mandatory header packets: An Ogg Opus logical stream contains exactly two mandatory header packets:
an identification header and a comment header. an identification header and a comment header.
</t> </t>
...@@ -733,7 +733,8 @@ The details are described in <xref target="channel_mapping"/>. ...@@ -733,7 +733,8 @@ The details are described in <xref target="channel_mapping"/>.
</t> </t>
<t>Channel Mapping Table: <t>Channel Mapping Table:
This table defines the mapping from encoded streams to output channels. This table defines the mapping from encoded streams to output channels.
It is omitted when the channel mapping family is 0, but REQUIRED otherwise. It MUST be omitted when the channel mapping family is 0, but is
REQUIRED otherwise.
Its contents are specified in <xref target="channel_mapping"/>. Its contents are specified in <xref target="channel_mapping"/>.
</t> </t>
</list> </list>
...@@ -741,7 +742,8 @@ Its contents are specified in <xref target="channel_mapping"/>. ...@@ -741,7 +742,8 @@ Its contents are specified in <xref target="channel_mapping"/>.
<t> <t>
All fields in the ID headers are REQUIRED, except for the channel mapping All fields in the ID headers are REQUIRED, except for the channel mapping
table, which is omitted when the channel mapping family is 0. table, which MUST be omitted when the channel mapping family is 0, but
is REQUIRED otherwise.
Implementations SHOULD reject ID headers which do not contain enough data for Implementations SHOULD reject ID headers which do not contain enough data for
these fields, even if they contain a valid Magic Signature. these fields, even if they contain a valid Magic Signature.
Future versions of this specification, even backwards-compatible versions, Future versions of this specification, even backwards-compatible versions,
...@@ -898,8 +900,8 @@ The ordering is different from the one used by the ...@@ -898,8 +900,8 @@ The ordering is different from the one used by the
FLAC <xref target="flac"/> formats, FLAC <xref target="flac"/> formats,
so correct ordering requires permutation of the output channels when decoding so correct ordering requires permutation of the output channels when decoding
to or encoding from those formats. to or encoding from those formats.
'LFE' here refers to a Low Frequency Effects, often mapped to a subwoofer 'LFE' here refers to a Low Frequency Effects channel, often mapped to a
with no particular spatial position. subwoofer with no particular spatial position.
Implementations SHOULD identify 'side' or 'rear' speaker locations with Implementations SHOULD identify 'side' or 'rear' speaker locations with
'surround' and 'back' as appropriate when interfacing with audio formats 'surround' and 'back' as appropriate when interfacing with audio formats
or systems which prefer that terminology. or systems which prefer that terminology.
...@@ -1437,11 +1439,12 @@ For best results, this implementation requires that prediction be explicitly ...@@ -1437,11 +1439,12 @@ For best results, this implementation requires that prediction be explicitly
<t> <t>
A brief summary of major implementations of this draft is available A brief summary of major implementations of this draft is available
at <eref target="https://wiki.xiph.org/OggOpusImplementation"/>, at <eref target="https://wiki.xiph.org/OggOpusImplementation"/>,
along with their status. along with their status.
</t> </t>
<t> <t>
[Note to RFC Editor: please remove this entire section before [Note to RFC Editor: please remove this entire section before
final publication per <xref target="RFC6982"/>.] final publication per <xref target="RFC6982"/>, along with
its references.]
</t> </t>
</section> </section>
...@@ -1456,8 +1459,9 @@ Malicious payloads MUST NOT cause the decoder to overrun its allocated memory ...@@ -1456,8 +1459,9 @@ Malicious payloads MUST NOT cause the decoder to overrun its allocated memory
or to take an excessive amount of resources to decode. or to take an excessive amount of resources to decode.
Although problems in encoders are typically rarer, the same applies to the Although problems in encoders are typically rarer, the same applies to the
encoder. encoder.
Malicious audio streams MUST NOT cause the encoder to misbehave because this Malicious audio streams MUST NOT cause the encoder to overrun its allocated
would allow an attacker to attack transcoding gateways. memory or consume excessive resources because this would allow an attacker
to attack transcoding gateways.
</t> </t>
<t> <t>
...@@ -1480,7 +1484,8 @@ The RECOMMENDED mime-type for Ogg Opus files is "audio/ogg". ...@@ -1480,7 +1484,8 @@ The RECOMMENDED mime-type for Ogg Opus files is "audio/ogg".
<figure> <figure>
<preamble> <preamble>
If more specificity is desired, one MAY indicate the presence of Opus streams If more specificity is desired, one MAY indicate the presence of Opus streams
using the codecs parameter defined in <xref target="RFC6381"/>, e.g., using the codecs parameter defined in <xref target="RFC6381"/> and
<xref target="RFC5334"/>, e.g.,
</preamble> </preamble>
<artwork align="center"><![CDATA[ <artwork align="center"><![CDATA[
audio/ogg; codecs=opus audio/ogg; codecs=opus
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment