ref: e15e362170fe00bacf915a433bb2fb1c72a24a66
parent: 68f18feb28bcf5be1f7ae3610851e8b52105b36a
author: Timothy B. Terriberry <[email protected]>
date: Sat Jul 13 09:47:19 EDT 2013
API documentation updates. - Provide an Overview section which describes some of the general design decisions of the libopusfile API. - Explicitly state that we always decode at 48 kHz. - Make it clearer that we always apply the header gain. - Document the automatic soft-clipping support. - Document that stream open failure does not close the source. - Other minor fixes. Thanks to tangobravo and siriusbtx for asking the questions which prompted this update.
--- a/include/opusfile.h
+++ b/include/opusfile.h
@@ -49,9 +49,56 @@
Several additional sections are not tied to the main API.
- \ref stream_callbacks
- \ref header_info
- - \ref error_codes*/
+ - \ref error_codes
+ \section Overview
+ The <tt>libopusfile</tt> API always decodes files to 48 kHz.
+ The original sample rate is not preserved by the lossy compression, though
+ it is stored in the header to allow you to resample to it after decoding
+ (the <tt>libopusfile</tt> API does not currently provide a resampler,
+ but the
+ <a href="http://www.speex.org/docs/manual/speex-manual/node7.html#SECTION00760000000000000000">the
+ Speex resampler</a> is a good choice if you need one).
+ In general, if you are playing back the audio, you should leave it at
+ 48 kHz, provided your audio hardware supports it.
+ When decoding to a file, it may be worth resampling back to the original
+ sample rate, so as not to surprise users who might not expect the sample
+ rate to change after encoding to Opus and decoding.
+
+ Opus files can contain anywhere from 1 to 255 channels of audio.
+ The channel mappings for up to 8 channels are the same as the
+ <a href="http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9">Vorbis
+ mappings</a>.
+ A special stereo API can convert everything to 2 channels, making it simple
+ to support multichannel files in a application which only has stereo
+ output.
+ Although the <tt>libopusfile</tt> ABI provides support for the theoretical
+ maximum number of channels, the current implementation does not support
+ files with more than 8 channels, as they do not have well-defined channel
+ mappings.
+
+ Like all Ogg files, Opus files may be "chained".
+ That is, multiple Opus files may be combined into a single, longer file just
+ by concatenating the original files.
+ This is commonly done in internet radio streaming, as it allows the title
+ and artist to be updated each time the song changes, since each link in the
+ chain includes its own set of metadata.
+
+ <tt>libopusfile</tt> fully supports chained files.
+ It will decode the first Opus stream found in each link of a chained file
+ (ignoring any other streams that might be concurrently multiplexed with it,
+ such as a video stream).
+
+ The channel count can also change between links, but if your application is
+ not prepared to deal with this, it can use the stereo API to ensure the
+ audio from all links will always get decoded into a common format.
+ Since <tt>libopusfile</tt> always decodes to 48 kHz, you do not have to
+ worry about the sample rate changing between links (as was possible with
+ Vorbis).
+ This makes application support for chained files with <tt>libopusfile</tt>
+ very easy.*/
+
# if defined(__cplusplus)
extern "C" {# endif
@@ -182,8 +229,9 @@
opus_uint32 input_sample_rate;
/**The gain to apply to the decoded output, in dB, as a Q8 value in the range
-32768...32767.
- The decoder will automatically scale the output by
- pow(10,output_gain/(20.0*256)).*/
+ The <tt>libopusfile</tt> API will automatically apply this gain to the
+ decoded output before returning it, scaling it by
+ <code>pow(10,output_gain/(20.0*256))</code>.*/
int output_gain;
/**The channel mapping family, in the range 0...255.
Channel mapping family 0 covers mono or stereo in a single stream.
@@ -841,7 +889,11 @@
<dd>The first or last timestamp in a link failed
basic validity checks.</dd>
</dl>
- \return A freshly opened \c OggOpusFile, or <code>NULL</code> on error.*/
+ \return A freshly opened \c OggOpusFile, or <code>NULL</code> on error.
+ <tt>libopusfile</tt> does <em>not</em> take ownership of the source
+ if the call fails.
+ The calling application is responsible for closing the source if
+ this call returns an error.*/
OP_WARN_UNUSED_RESULT OggOpusFile *op_open_callbacks(void *_source,
const OpusFileCallbacks *_cb,const unsigned char *_initial_data,
size_t _initial_bytes,int *_error) OP_ARG_NONNULL(2);
@@ -974,7 +1026,11 @@
the failure code.
See op_open_callbacks() for a full list of failure
codes.
- \return A partially opened \c OggOpusFile, or <code>NULL</code> on error.*/
+ \return A partially opened \c OggOpusFile, or <code>NULL</code> on error.
+ <tt>libopusfile</tt> does <em>not</em> take ownership of the source
+ if the call fails.
+ The calling application is responsible for closing the source if
+ this call returns an error.*/
OP_WARN_UNUSED_RESULT OggOpusFile *op_test_callbacks(void *_source,
const OpusFileCallbacks *_cb,const unsigned char *_initial_data,
size_t _initial_bytes,int *_error) OP_ARG_NONNULL(2);
@@ -1303,11 +1359,12 @@
clipping and other issues which might be avoided entirely if, e.g., you
scale down the volume at some other stage.
However, if you intend to direct consume 16-bit samples, the conversion in
- <tt>libopusfile</tt> provides noise-shaping dithering API.
+ <tt>libopusfile</tt> provides noise-shaping dithering and, if compiled
+ against <tt>libopus</tt> 1.1 or later, soft-clipping prevention.
<tt>libopusfile</tt> can also be configured at compile time to use the
fixed-point <tt>libopus</tt> API.
- If so, the floating-point API may also be disabled.
+ If so, <tt>libopusfile</tt>'s floating-point API may also be disabled.
In that configuration, nothing in <tt>libopusfile</tt> will use any
floating-point operations, to simplify support on devices without an
adequate FPU.
@@ -1329,7 +1386,7 @@
<em>per channel</em>.
This is done because
<ol>
- <li>The channel count cannot be known a prior (reading more samples might
+ <li>The channel count cannot be known a priori (reading more samples might
advance us into the next link, with a different channel count), so
\a _buf_size cannot also be in units of samples per channel,</li>
<li>Returning the samples per channel matches the <code>libopus</code> API
@@ -1346,8 +1403,8 @@
</ol>
\param _of The \c OggOpusFile from which to read.
\param[out] _pcm A buffer in which to store the output PCM samples, as
- signed native-endian 16-bit values with a nominal
- range of <code>[-32768,32767)</code>.
+ signed native-endian 16-bit values at 48 kHz
+ with a nominal range of <code>[-32768,32767)</code>.
Multiple channels are interleaved using the
<a href="http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9">Vorbis
channel ordering</a>.
@@ -1411,7 +1468,7 @@
can be stored in \a _pcm, the return value is the number of samples
<em>per channel</em>.
<ol>
- <li>The channel count cannot be known a prior (reading more samples might
+ <li>The channel count cannot be known a priori (reading more samples might
advance us into the next link, with a different channel count), so
\a _buf_size cannot also be in units of samples per channel,</li>
<li>Returning the samples per channel matches the <code>libopus</code> API
@@ -1428,7 +1485,7 @@
</ol>
\param _of The \c OggOpusFile from which to read.
\param[out] _pcm A buffer in which to store the output PCM samples as
- signed floats with a nominal range of
+ signed floats at 48 kHz with a nominal range of
<code>[-1.0,1.0]</code>.
Multiple channels are interleaved using the
<a href="http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9">Vorbis
@@ -1497,8 +1554,8 @@
op_read().
\param _of The \c OggOpusFile from which to read.
\param[out] _pcm A buffer in which to store the output PCM samples, as
- signed native-endian 16-bit values with a nominal
- range of <code>[-32768,32767)</code>.
+ signed native-endian 16-bit values at 48 kHz
+ with a nominal range of <code>[-32768,32767)</code>.
The left and right channels are interleaved in the
buffer.
This must have room for at least \a _buf_size values.
@@ -1558,7 +1615,7 @@
op_read_float().
\param _of The \c OggOpusFile from which to read.
\param[out] _pcm A buffer in which to store the output PCM samples, as
- signed floats with a nominal range of
+ signed floats at 48 kHz with a nominal range of
<code>[-1.0,1.0]</code>.
The left and right channels are interleaved in the
buffer.