summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/libflac/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libflac/include')
-rw-r--r--src/lib/libflac/include/flac++/decoder.h78
-rw-r--r--src/lib/libflac/include/flac++/encoder.h84
-rw-r--r--src/lib/libflac/include/flac++/metadata.h526
-rw-r--r--src/lib/libflac/include/flac/format.h88
-rw-r--r--src/lib/libflac/include/flac/metadata.h26
-rw-r--r--src/lib/libflac/include/flac/stream_decoder.h48
-rw-r--r--src/lib/libflac/include/flac/stream_encoder.h50
-rw-r--r--src/lib/libflac/include/private/fixed.h48
-rw-r--r--src/lib/libflac/include/private/float.h22
-rw-r--r--src/lib/libflac/include/private/lpc.h172
-rw-r--r--src/lib/libflac/include/private/window.h12
11 files changed, 577 insertions, 577 deletions
diff --git a/src/lib/libflac/include/flac++/decoder.h b/src/lib/libflac/include/flac++/decoder.h
index b00a917a6e0..223602fa434 100644
--- a/src/lib/libflac/include/flac++/decoder.h
+++ b/src/lib/libflac/include/flac++/decoder.h
@@ -78,28 +78,28 @@ namespace FLAC {
namespace Decoder {
/** \ingroup flacpp_decoder
- * \brief
- * This class wraps the ::FLAC__StreamDecoder. If you are
- * decoding from a file, FLAC::Decoder::File may be more
- * convenient.
- *
- * The usage of this class is similar to FLAC__StreamDecoder,
- * except instead of providing callbacks to
- * FLAC__stream_decoder_init*_stream(), you will inherit from this
- * class and override the virtual callback functions with your
- * own implementations, then call init() or init_ogg(). The rest
- * of the calls work the same as in the C layer.
- *
- * Only the read, write, and error callbacks are mandatory. The
- * others are optional; this class provides default
- * implementations that do nothing. In order for seeking to work
- * you must overide seek_callback(), tell_callback(),
- * length_callback(), and eof_callback().
- */
+ * \brief
+ * This class wraps the ::FLAC__StreamDecoder. If you are
+ * decoding from a file, FLAC::Decoder::File may be more
+ * convenient.
+ *
+ * The usage of this class is similar to FLAC__StreamDecoder,
+ * except instead of providing callbacks to
+ * FLAC__stream_decoder_init*_stream(), you will inherit from this
+ * class and override the virtual callback functions with your
+ * own implementations, then call init() or init_ogg(). The rest
+ * of the calls work the same as in the C layer.
+ *
+ * Only the read, write, and error callbacks are mandatory. The
+ * others are optional; this class provides default
+ * implementations that do nothing. In order for seeking to work
+ * you must overide seek_callback(), tell_callback(),
+ * length_callback(), and eof_callback().
+ */
class FLACPP_API Stream {
public:
/** This class is a wrapper around FLAC__StreamDecoderState.
- */
+ */
class FLACPP_API State {
public:
inline State(::FLAC__StreamDecoderState state): state_(state) { }
@@ -115,8 +115,8 @@ namespace FLAC {
//@{
/** Call after construction to check the that the object was created
- * successfully. If not, use get_state() to find out why not.
- */
+ * successfully. If not, use get_state() to find out why not.
+ */
virtual bool is_valid() const;
inline operator bool() const { return is_valid(); } ///< See is_valid()
//@}
@@ -201,24 +201,24 @@ namespace FLAC {
};
/** \ingroup flacpp_decoder
- * \brief
- * This class wraps the ::FLAC__StreamDecoder. If you are
- * not decoding from a file, you may need to use
- * FLAC::Decoder::Stream.
- *
- * The usage of this class is similar to FLAC__StreamDecoder,
- * except instead of providing callbacks to
- * FLAC__stream_decoder_init*_FILE() or
- * FLAC__stream_decoder_init*_file(), you will inherit from this
- * class and override the virtual callback functions with your
- * own implementations, then call init() or init_off(). The rest
- * of the calls work the same as in the C layer.
- *
- * Only the write, and error callbacks from FLAC::Decoder::Stream
- * are mandatory. The others are optional; this class provides
- * full working implementations for all other callbacks and
- * supports seeking.
- */
+ * \brief
+ * This class wraps the ::FLAC__StreamDecoder. If you are
+ * not decoding from a file, you may need to use
+ * FLAC::Decoder::Stream.
+ *
+ * The usage of this class is similar to FLAC__StreamDecoder,
+ * except instead of providing callbacks to
+ * FLAC__stream_decoder_init*_FILE() or
+ * FLAC__stream_decoder_init*_file(), you will inherit from this
+ * class and override the virtual callback functions with your
+ * own implementations, then call init() or init_off(). The rest
+ * of the calls work the same as in the C layer.
+ *
+ * Only the write, and error callbacks from FLAC::Decoder::Stream
+ * are mandatory. The others are optional; this class provides
+ * full working implementations for all other callbacks and
+ * supports seeking.
+ */
class FLACPP_API File: public Stream {
public:
File();
diff --git a/src/lib/libflac/include/flac++/encoder.h b/src/lib/libflac/include/flac++/encoder.h
index d16d889d870..c89be19cfb6 100644
--- a/src/lib/libflac/include/flac++/encoder.h
+++ b/src/lib/libflac/include/flac++/encoder.h
@@ -79,29 +79,29 @@ namespace FLAC {
namespace Encoder {
/** \ingroup flacpp_encoder
- * \brief
- * This class wraps the ::FLAC__StreamEncoder. If you are
- * encoding to a file, FLAC::Encoder::File may be more
- * convenient.
- *
- * The usage of this class is similar to FLAC__StreamEncoder,
- * except instead of providing callbacks to
- * FLAC__stream_encoder_init*_stream(), you will inherit from this
- * class and override the virtual callback functions with your
- * own implementations, then call init() or init_ogg(). The rest of
- * the calls work the same as in the C layer.
- *
- * Only the write callback is mandatory. The others are
- * optional; this class provides default implementations that do
- * nothing. In order for some STREAMINFO and SEEKTABLE data to
- * be written properly, you must overide seek_callback() and
- * tell_callback(); see FLAC__stream_encoder_init_stream() as to
- * why.
- */
+ * \brief
+ * This class wraps the ::FLAC__StreamEncoder. If you are
+ * encoding to a file, FLAC::Encoder::File may be more
+ * convenient.
+ *
+ * The usage of this class is similar to FLAC__StreamEncoder,
+ * except instead of providing callbacks to
+ * FLAC__stream_encoder_init*_stream(), you will inherit from this
+ * class and override the virtual callback functions with your
+ * own implementations, then call init() or init_ogg(). The rest of
+ * the calls work the same as in the C layer.
+ *
+ * Only the write callback is mandatory. The others are
+ * optional; this class provides default implementations that do
+ * nothing. In order for some STREAMINFO and SEEKTABLE data to
+ * be written properly, you must overide seek_callback() and
+ * tell_callback(); see FLAC__stream_encoder_init_stream() as to
+ * why.
+ */
class FLACPP_API Stream {
public:
/** This class is a wrapper around FLAC__StreamEncoderState.
- */
+ */
class FLACPP_API State {
public:
inline State(::FLAC__StreamEncoderState state): state_(state) { }
@@ -117,9 +117,9 @@ namespace FLAC {
//@{
/** Call after construction to check the that the object was created
- * successfully. If not, use get_state() to find out why not.
- *
- */
+ * successfully. If not, use get_state() to find out why not.
+ *
+ */
virtual bool is_valid() const;
inline operator bool() const { return is_valid(); } ///< See is_valid()
//@}
@@ -210,25 +210,25 @@ namespace FLAC {
};
/** \ingroup flacpp_encoder
- * \brief
- * This class wraps the ::FLAC__StreamEncoder. If you are
- * not encoding to a file, you may need to use
- * FLAC::Encoder::Stream.
- *
- * The usage of this class is similar to FLAC__StreamEncoder,
- * except instead of providing callbacks to
- * FLAC__stream_encoder_init*_FILE() or
- * FLAC__stream_encoder_init*_file(), you will inherit from this
- * class and override the virtual callback functions with your
- * own implementations, then call init() or init_ogg(). The rest
- * of the calls work the same as in the C layer.
- *
- * There are no mandatory callbacks; all the callbacks from
- * FLAC::Encoder::Stream are implemented here fully and support
- * full post-encode STREAMINFO and SEEKTABLE updating. There is
- * only an optional progress callback which you may override to
- * get periodic reports on the progress of the encode.
- */
+ * \brief
+ * This class wraps the ::FLAC__StreamEncoder. If you are
+ * not encoding to a file, you may need to use
+ * FLAC::Encoder::Stream.
+ *
+ * The usage of this class is similar to FLAC__StreamEncoder,
+ * except instead of providing callbacks to
+ * FLAC__stream_encoder_init*_FILE() or
+ * FLAC__stream_encoder_init*_file(), you will inherit from this
+ * class and override the virtual callback functions with your
+ * own implementations, then call init() or init_ogg(). The rest
+ * of the calls work the same as in the C layer.
+ *
+ * There are no mandatory callbacks; all the callbacks from
+ * FLAC::Encoder::Stream are implemented here fully and support
+ * full post-encode STREAMINFO and SEEKTABLE updating. There is
+ * only an optional progress callback which you may override to
+ * get periodic reports on the progress of the encode.
+ */
class FLACPP_API File: public Stream {
public:
File();
diff --git a/src/lib/libflac/include/flac++/metadata.h b/src/lib/libflac/include/flac++/metadata.h
index ba3bd385512..6e04f550d4e 100644
--- a/src/lib/libflac/include/flac++/metadata.h
+++ b/src/lib/libflac/include/flac++/metadata.h
@@ -81,51 +81,51 @@ namespace FLAC {
// ============================================================
/** \defgroup flacpp_metadata_object FLAC++/metadata.h: metadata object classes
- * \ingroup flacpp_metadata
- *
- * This module contains classes representing FLAC metadata
- * blocks in memory.
- *
- * The behavior closely mimics the C layer interface; be
- * sure to read the detailed description of the
- * \link flac_metadata_object C metadata object module \endlink.
- *
- * Any time a metadata object is constructed or assigned, you
- * should check is_valid() to make sure the underlying
- * ::FLAC__StreamMetadata object was able to be created.
- *
- * \warning
- * When the get_*() methods of any metadata object method
- * return you a const pointer, DO NOT disobey and write into it.
- * Always use the set_*() methods.
- *
- * \{
- */
+ * \ingroup flacpp_metadata
+ *
+ * This module contains classes representing FLAC metadata
+ * blocks in memory.
+ *
+ * The behavior closely mimics the C layer interface; be
+ * sure to read the detailed description of the
+ * \link flac_metadata_object C metadata object module \endlink.
+ *
+ * Any time a metadata object is constructed or assigned, you
+ * should check is_valid() to make sure the underlying
+ * ::FLAC__StreamMetadata object was able to be created.
+ *
+ * \warning
+ * When the get_*() methods of any metadata object method
+ * return you a const pointer, DO NOT disobey and write into it.
+ * Always use the set_*() methods.
+ *
+ * \{
+ */
/** Base class for all metadata block types.
- * See the \link flacpp_metadata_object overview \endlink for more.
- */
+ * See the \link flacpp_metadata_object overview \endlink for more.
+ */
class FLACPP_API Prototype {
protected:
//@{
/** Constructs a copy of the given object. This form
- * always performs a deep copy.
- */
+ * always performs a deep copy.
+ */
Prototype(const Prototype &);
Prototype(const ::FLAC__StreamMetadata &);
Prototype(const ::FLAC__StreamMetadata *);
//@}
/** Constructs an object with copy control. When \a copy
- * is \c true, behaves identically to
- * FLAC::Metadata::Prototype::Prototype(const ::FLAC__StreamMetadata *object).
- * When \a copy is \c false, the instance takes ownership of
- * the pointer and the ::FLAC__StreamMetadata object will
- * be freed by the destructor.
- *
- * \assert
- * \code object != NULL \endcode
- */
+ * is \c true, behaves identically to
+ * FLAC::Metadata::Prototype::Prototype(const ::FLAC__StreamMetadata *object).
+ * When \a copy is \c false, the instance takes ownership of
+ * the pointer and the ::FLAC__StreamMetadata object will
+ * be freed by the destructor.
+ *
+ * \assert
+ * \code object != NULL \endcode
+ */
Prototype(::FLAC__StreamMetadata *object, bool copy);
//@{
@@ -136,23 +136,23 @@ namespace FLAC {
//@}
/** Assigns an object with copy control. See
- * Prototype(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype(::FLAC__StreamMetadata *object, bool copy).
+ */
Prototype &assign_object(::FLAC__StreamMetadata *object, bool copy);
/** Deletes the underlying ::FLAC__StreamMetadata object.
- */
+ */
virtual void clear();
::FLAC__StreamMetadata *object_;
public:
/** Deletes the underlying ::FLAC__StreamMetadata object.
- */
+ */
virtual ~Prototype();
//@{
/** Check for equality, performing a deep compare by following pointers.
- */
+ */
inline bool operator==(const Prototype &) const;
inline bool operator==(const ::FLAC__StreamMetadata &) const;
inline bool operator==(const ::FLAC__StreamMetadata *) const;
@@ -169,52 +169,52 @@ namespace FLAC {
friend class Iterator;
/** Returns \c true if the object was correctly constructed
- * (i.e. the underlying ::FLAC__StreamMetadata object was
- * properly allocated), else \c false.
- */
+ * (i.e. the underlying ::FLAC__StreamMetadata object was
+ * properly allocated), else \c false.
+ */
inline bool is_valid() const;
/** Returns \c true if this block is the last block in a
- * stream, else \c false.
- *
- * \assert
- * \code is_valid() \endcode
- */
+ * stream, else \c false.
+ *
+ * \assert
+ * \code is_valid() \endcode
+ */
bool get_is_last() const;
/** Returns the type of the block.
- *
- * \assert
- * \code is_valid() \endcode
- */
+ *
+ * \assert
+ * \code is_valid() \endcode
+ */
::FLAC__MetadataType get_type() const;
/** Returns the stream length of the metadata block.
- *
- * \note
- * The length does not include the metadata block header,
- * per spec.
- *
- * \assert
- * \code is_valid() \endcode
- */
+ *
+ * \note
+ * The length does not include the metadata block header,
+ * per spec.
+ *
+ * \assert
+ * \code is_valid() \endcode
+ */
unsigned get_length() const;
/** Sets the "is_last" flag for the block. When using the iterators
- * it is not necessary to set this flag; they will do it for you.
- *
- * \assert
- * \code is_valid() \endcode
- */
+ * it is not necessary to set this flag; they will do it for you.
+ *
+ * \assert
+ * \code is_valid() \endcode
+ */
void set_is_last(bool);
/** Returns a pointer to the underlying ::FLAC__StreamMetadata
- * object. This can be useful for plugging any holes between
- * the C++ and C interfaces.
- *
- * \assert
- * \code is_valid() \endcode
- */
+ * object. This can be useful for plugging any holes between
+ * the C++ and C interfaces.
+ *
+ * \assert
+ * \code is_valid() \endcode
+ */
inline operator const ::FLAC__StreamMetadata *() const;
private:
/** Private and undefined so you can't use it. */
@@ -264,25 +264,25 @@ namespace FLAC {
/** STREAMINFO metadata block.
- * See the \link flacpp_metadata_object overview \endlink for more,
- * and the <A HREF="../format.html#metadata_block_streaminfo">format specification</A>.
- */
+ * See the \link flacpp_metadata_object overview \endlink for more,
+ * and the <A HREF="../format.html#metadata_block_streaminfo">format specification</A>.
+ */
class FLACPP_API StreamInfo : public Prototype {
public:
StreamInfo();
//@{
/** Constructs a copy of the given object. This form
- * always performs a deep copy.
- */
+ * always performs a deep copy.
+ */
inline StreamInfo(const StreamInfo &object): Prototype(object) { }
inline StreamInfo(const ::FLAC__StreamMetadata &object): Prototype(object) { }
inline StreamInfo(const ::FLAC__StreamMetadata *object): Prototype(object) { }
//@}
/** Constructs an object with copy control. See
- * Prototype(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype(::FLAC__StreamMetadata *object, bool copy).
+ */
inline StreamInfo(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
~StreamInfo();
@@ -295,8 +295,8 @@ namespace FLAC {
//@}
/** Assigns an object with copy control. See
- * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
inline StreamInfo &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
//@{
@@ -338,25 +338,25 @@ namespace FLAC {
};
/** PADDING metadata block.
- * See the \link flacpp_metadata_object overview \endlink for more,
- * and the <A HREF="../format.html#metadata_block_padding">format specification</A>.
- */
+ * See the \link flacpp_metadata_object overview \endlink for more,
+ * and the <A HREF="../format.html#metadata_block_padding">format specification</A>.
+ */
class FLACPP_API Padding : public Prototype {
public:
Padding();
//@{
/** Constructs a copy of the given object. This form
- * always performs a deep copy.
- */
+ * always performs a deep copy.
+ */
inline Padding(const Padding &object): Prototype(object) { }
inline Padding(const ::FLAC__StreamMetadata &object): Prototype(object) { }
inline Padding(const ::FLAC__StreamMetadata *object): Prototype(object) { }
//@}
/** Constructs an object with copy control. See
- * Prototype(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype(::FLAC__StreamMetadata *object, bool copy).
+ */
inline Padding(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
~Padding();
@@ -369,8 +369,8 @@ namespace FLAC {
//@}
/** Assigns an object with copy control. See
- * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
inline Padding &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
//@{
@@ -391,25 +391,25 @@ namespace FLAC {
};
/** APPLICATION metadata block.
- * See the \link flacpp_metadata_object overview \endlink for more,
- * and the <A HREF="../format.html#metadata_block_application">format specification</A>.
- */
+ * See the \link flacpp_metadata_object overview \endlink for more,
+ * and the <A HREF="../format.html#metadata_block_application">format specification</A>.
+ */
class FLACPP_API Application : public Prototype {
public:
Application();
//
//@{
/** Constructs a copy of the given object. This form
- * always performs a deep copy.
- */
+ * always performs a deep copy.
+ */
inline Application(const Application &object): Prototype(object) { }
inline Application(const ::FLAC__StreamMetadata &object): Prototype(object) { }
inline Application(const ::FLAC__StreamMetadata *object): Prototype(object) { }
//@}
/** Constructs an object with copy control. See
- * Prototype(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype(::FLAC__StreamMetadata *object, bool copy).
+ */
inline Application(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
~Application();
@@ -422,8 +422,8 @@ namespace FLAC {
//@}
/** Assigns an object with copy control. See
- * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
inline Application &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
//@{
@@ -450,25 +450,25 @@ namespace FLAC {
};
/** SEEKTABLE metadata block.
- * See the \link flacpp_metadata_object overview \endlink for more,
- * and the <A HREF="../format.html#metadata_block_seektable">format specification</A>.
- */
+ * See the \link flacpp_metadata_object overview \endlink for more,
+ * and the <A HREF="../format.html#metadata_block_seektable">format specification</A>.
+ */
class FLACPP_API SeekTable : public Prototype {
public:
SeekTable();
//@{
/** Constructs a copy of the given object. This form
- * always performs a deep copy.
- */
+ * always performs a deep copy.
+ */
inline SeekTable(const SeekTable &object): Prototype(object) { }
inline SeekTable(const ::FLAC__StreamMetadata &object): Prototype(object) { }
inline SeekTable(const ::FLAC__StreamMetadata *object): Prototype(object) { }
//@}
/** Constructs an object with copy control. See
- * Prototype(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype(::FLAC__StreamMetadata *object, bool copy).
+ */
inline SeekTable(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
~SeekTable();
@@ -481,8 +481,8 @@ namespace FLAC {
//@}
/** Assigns an object with copy control. See
- * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
inline SeekTable &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
//@{
@@ -516,40 +516,40 @@ namespace FLAC {
};
/** VORBIS_COMMENT metadata block.
- * See the \link flacpp_metadata_object overview \endlink for more,
- * and the <A HREF="../format.html#metadata_block_vorbis_comment">format specification</A>.
- */
+ * See the \link flacpp_metadata_object overview \endlink for more,
+ * and the <A HREF="../format.html#metadata_block_vorbis_comment">format specification</A>.
+ */
class FLACPP_API VorbisComment : public Prototype {
public:
/** Convenience class for encapsulating Vorbis comment
- * entries. An entry is a vendor string or a comment
- * field. In the case of a vendor string, the field
- * name is undefined; only the field value is relevant.
- *
- * A \a field as used in the methods refers to an
- * entire 'NAME=VALUE' string; for convenience the
- * string is NUL-terminated. A length field is
- * required in the unlikely event that the value
- * contains contain embedded NULs.
- *
- * A \a field_name is what is on the left side of the
- * first '=' in the \a field. By definition it is ASCII
- * and so is NUL-terminated and does not require a
- * length to describe it. \a field_name is undefined
- * for a vendor string entry.
- *
- * A \a field_value is what is on the right side of the
- * first '=' in the \a field. By definition, this may
- * contain embedded NULs and so a \a field_value_length
- * is required to describe it. However in practice,
- * embedded NULs are not known to be used, so it is
- * generally safe to treat field values as NUL-
- * terminated UTF-8 strings.
- *
- * Always check is_valid() after the constructor or operator=
- * to make sure memory was properly allocated and that the
- * Entry conforms to the Vorbis comment specification.
- */
+ * entries. An entry is a vendor string or a comment
+ * field. In the case of a vendor string, the field
+ * name is undefined; only the field value is relevant.
+ *
+ * A \a field as used in the methods refers to an
+ * entire 'NAME=VALUE' string; for convenience the
+ * string is NUL-terminated. A length field is
+ * required in the unlikely event that the value
+ * contains contain embedded NULs.
+ *
+ * A \a field_name is what is on the left side of the
+ * first '=' in the \a field. By definition it is ASCII
+ * and so is NUL-terminated and does not require a
+ * length to describe it. \a field_name is undefined
+ * for a vendor string entry.
+ *
+ * A \a field_value is what is on the right side of the
+ * first '=' in the \a field. By definition, this may
+ * contain embedded NULs and so a \a field_value_length
+ * is required to describe it. However in practice,
+ * embedded NULs are not known to be used, so it is
+ * generally safe to treat field values as NUL-
+ * terminated UTF-8 strings.
+ *
+ * Always check is_valid() after the constructor or operator=
+ * to make sure memory was properly allocated and that the
+ * Entry conforms to the Vorbis comment specification.
+ */
class FLACPP_API Entry {
public:
Entry();
@@ -607,16 +607,16 @@ namespace FLAC {
//@{
/** Constructs a copy of the given object. This form
- * always performs a deep copy.
- */
+ * always performs a deep copy.
+ */
inline VorbisComment(const VorbisComment &object): Prototype(object) { }
inline VorbisComment(const ::FLAC__StreamMetadata &object): Prototype(object) { }
inline VorbisComment(const ::FLAC__StreamMetadata *object): Prototype(object) { }
//@}
/** Constructs an object with copy control. See
- * Prototype(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype(::FLAC__StreamMetadata *object, bool copy).
+ */
inline VorbisComment(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
~VorbisComment();
@@ -629,8 +629,8 @@ namespace FLAC {
//@}
/** Assigns an object with copy control. See
- * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
inline VorbisComment &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
//@{
@@ -668,17 +668,17 @@ namespace FLAC {
};
/** CUESHEET metadata block.
- * See the \link flacpp_metadata_object overview \endlink for more,
- * and the <A HREF="../format.html#metadata_block_cuesheet">format specification</A>.
- */
+ * See the \link flacpp_metadata_object overview \endlink for more,
+ * and the <A HREF="../format.html#metadata_block_cuesheet">format specification</A>.
+ */
class FLACPP_API CueSheet : public Prototype {
public:
/** Convenience class for encapsulating a cue sheet
- * track.
- *
- * Always check is_valid() after the constructor or operator=
- * to make sure memory was properly allocated.
- */
+ * track.
+ *
+ * Always check is_valid() after the constructor or operator=
+ * to make sure memory was properly allocated.
+ */
class FLACPP_API Track {
protected:
::FLAC__StreamMetadata_CueSheet_Track *object_;
@@ -710,7 +710,7 @@ namespace FLAC {
void set_type(unsigned value);
inline void set_pre_emphasis(bool value) { object_->pre_emphasis = value? 1 : 0; }
- void set_index(unsigned i, const ::FLAC__StreamMetadata_CueSheet_Index &index);
+ void set_index(unsigned i, const ::FLAC__StreamMetadata_CueSheet_Index &index);
//@@@ It's awkward but to insert/delete index points
//@@@ you must use the routines in the CueSheet class.
};
@@ -719,16 +719,16 @@ namespace FLAC {
//@{
/** Constructs a copy of the given object. This form
- * always performs a deep copy.
- */
+ * always performs a deep copy.
+ */
inline CueSheet(const CueSheet &object): Prototype(object) { }
inline CueSheet(const ::FLAC__StreamMetadata &object): Prototype(object) { }
inline CueSheet(const ::FLAC__StreamMetadata *object): Prototype(object) { }
//@}
/** Constructs an object with copy control. See
- * Prototype(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype(::FLAC__StreamMetadata *object, bool copy).
+ */
inline CueSheet(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
~CueSheet();
@@ -741,8 +741,8 @@ namespace FLAC {
//@}
/** Assigns an object with copy control. See
- * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
inline CueSheet &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
//@{
@@ -795,25 +795,25 @@ namespace FLAC {
};
/** PICTURE metadata block.
- * See the \link flacpp_metadata_object overview \endlink for more,
- * and the <A HREF="../format.html#metadata_block_picture">format specification</A>.
- */
+ * See the \link flacpp_metadata_object overview \endlink for more,
+ * and the <A HREF="../format.html#metadata_block_picture">format specification</A>.
+ */
class FLACPP_API Picture : public Prototype {
public:
Picture();
//@{
/** Constructs a copy of the given object. This form
- * always performs a deep copy.
- */
+ * always performs a deep copy.
+ */
inline Picture(const Picture &object): Prototype(object) { }
inline Picture(const ::FLAC__StreamMetadata &object): Prototype(object) { }
inline Picture(const ::FLAC__StreamMetadata *object): Prototype(object) { }
//@}
/** Constructs an object with copy control. See
- * Prototype(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype(::FLAC__StreamMetadata *object, bool copy).
+ */
inline Picture(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
~Picture();
@@ -826,8 +826,8 @@ namespace FLAC {
//@}
/** Assigns an object with copy control. See
- * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
inline Picture &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
//@{
@@ -872,27 +872,27 @@ namespace FLAC {
};
/** Opaque metadata block for storing unknown types.
- * This should not be used unless you know what you are doing;
- * it is currently used only internally to support forward
- * compatibility of metadata blocks.
- * See the \link flacpp_metadata_object overview \endlink for more,
- */
+ * This should not be used unless you know what you are doing;
+ * it is currently used only internally to support forward
+ * compatibility of metadata blocks.
+ * See the \link flacpp_metadata_object overview \endlink for more,
+ */
class FLACPP_API Unknown : public Prototype {
public:
Unknown();
//
//@{
/** Constructs a copy of the given object. This form
- * always performs a deep copy.
- */
+ * always performs a deep copy.
+ */
inline Unknown(const Unknown &object): Prototype(object) { }
inline Unknown(const ::FLAC__StreamMetadata &object): Prototype(object) { }
inline Unknown(const ::FLAC__StreamMetadata *object): Prototype(object) { }
//@}
/** Constructs an object with copy control. See
- * Prototype(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype(::FLAC__StreamMetadata *object, bool copy).
+ */
inline Unknown(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
~Unknown();
@@ -905,8 +905,8 @@ namespace FLAC {
//@}
/** Assigns an object with copy control. See
- * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
- */
+ * Prototype::assign_object(::FLAC__StreamMetadata *object, bool copy).
+ */
inline Unknown &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
//@{
@@ -934,16 +934,16 @@ namespace FLAC {
/** \defgroup flacpp_metadata_level0 FLAC++/metadata.h: metadata level 0 interface
- * \ingroup flacpp_metadata
- *
- * \brief
- * Level 0 metadata iterators.
- *
- * See the \link flac_metadata_level0 C layer equivalent \endlink
- * for more.
- *
- * \{
- */
+ * \ingroup flacpp_metadata
+ *
+ * \brief
+ * Level 0 metadata iterators.
+ *
+ * See the \link flac_metadata_level0 C layer equivalent \endlink
+ * for more.
+ *
+ * \{
+ */
FLACPP_API bool get_streaminfo(const char *filename, StreamInfo &streaminfo); ///< See FLAC__metadata_get_streaminfo().
@@ -960,43 +960,43 @@ namespace FLAC {
/** \defgroup flacpp_metadata_level1 FLAC++/metadata.h: metadata level 1 interface
- * \ingroup flacpp_metadata
- *
- * \brief
- * Level 1 metadata iterator.
- *
- * The flow through the iterator in the C++ layer is similar
- * to the C layer:
- * - Create a SimpleIterator instance
- * - Check SimpleIterator::is_valid()
- * - Call SimpleIterator::init() and check the return
- * - Traverse and/or edit. Edits are written to file
- * immediately.
- * - Destroy the SimpleIterator instance
- *
- * The ownership of pointers in the C++ layer follows that in
- * the C layer, i.e.
- * - The objects returned by get_block() are yours to
- * modify, but changes are not reflected in the FLAC file
- * until you call set_block(). The objects are also
- * yours to delete; they are not automatically deleted
- * when passed to set_block() or insert_block_after().
- *
- * See the \link flac_metadata_level1 C layer equivalent \endlink
- * for more.
- *
- * \{
- */
+ * \ingroup flacpp_metadata
+ *
+ * \brief
+ * Level 1 metadata iterator.
+ *
+ * The flow through the iterator in the C++ layer is similar
+ * to the C layer:
+ * - Create a SimpleIterator instance
+ * - Check SimpleIterator::is_valid()
+ * - Call SimpleIterator::init() and check the return
+ * - Traverse and/or edit. Edits are written to file
+ * immediately.
+ * - Destroy the SimpleIterator instance
+ *
+ * The ownership of pointers in the C++ layer follows that in
+ * the C layer, i.e.
+ * - The objects returned by get_block() are yours to
+ * modify, but changes are not reflected in the FLAC file
+ * until you call set_block(). The objects are also
+ * yours to delete; they are not automatically deleted
+ * when passed to set_block() or insert_block_after().
+ *
+ * See the \link flac_metadata_level1 C layer equivalent \endlink
+ * for more.
+ *
+ * \{
+ */
/** This class is a wrapper around the FLAC__metadata_simple_iterator
- * structures and methods; see the
- * \link flacpp_metadata_level1 usage guide \endlink and
- * ::FLAC__Metadata_SimpleIterator.
- */
+ * structures and methods; see the
+ * \link flacpp_metadata_level1 usage guide \endlink and
+ * ::FLAC__Metadata_SimpleIterator.
+ */
class FLACPP_API SimpleIterator {
public:
/** This class is a wrapper around FLAC__Metadata_SimpleIteratorStatus.
- */
+ */
class FLACPP_API Status {
public:
inline Status(::FLAC__Metadata_SimpleIteratorStatus status): status_(status) { }
@@ -1038,51 +1038,51 @@ namespace FLAC {
/** \defgroup flacpp_metadata_level2 FLAC++/metadata.h: metadata level 2 interface
- * \ingroup flacpp_metadata
- *
- * \brief
- * Level 2 metadata iterator.
- *
- * The flow through the iterator in the C++ layer is similar
- * to the C layer:
- * - Create a Chain instance
- * - Check Chain::is_valid()
- * - Call Chain::read() and check the return
- * - Traverse and/or edit with an Iterator or with
- * Chain::merge_padding() or Chain::sort_padding()
- * - Write changes back to FLAC file with Chain::write()
- * - Destroy the Chain instance
- *
- * The ownership of pointers in the C++ layer is slightly
- * different than in the C layer, i.e.
- * - The objects returned by Iterator::get_block() are NOT
- * owned by the iterator and should be deleted by the
- * caller when finished, BUT, when you modify the block,
- * it will directly edit what's in the chain and you do
- * not need to call Iterator::set_block(). However the
- * changes will not be reflected in the FLAC file until
- * the chain is written with Chain::write().
- * - When you pass an object to Iterator::set_block(),
- * Iterator::insert_block_before(), or
- * Iterator::insert_block_after(), the iterator takes
- * ownership of the block and it will be deleted by the
- * chain.
- *
- * See the \link flac_metadata_level2 C layer equivalent \endlink
- * for more.
- *
- * \{
- */
+ * \ingroup flacpp_metadata
+ *
+ * \brief
+ * Level 2 metadata iterator.
+ *
+ * The flow through the iterator in the C++ layer is similar
+ * to the C layer:
+ * - Create a Chain instance
+ * - Check Chain::is_valid()
+ * - Call Chain::read() and check the return
+ * - Traverse and/or edit with an Iterator or with
+ * Chain::merge_padding() or Chain::sort_padding()
+ * - Write changes back to FLAC file with Chain::write()
+ * - Destroy the Chain instance
+ *
+ * The ownership of pointers in the C++ layer is slightly
+ * different than in the C layer, i.e.
+ * - The objects returned by Iterator::get_block() are NOT
+ * owned by the iterator and should be deleted by the
+ * caller when finished, BUT, when you modify the block,
+ * it will directly edit what's in the chain and you do
+ * not need to call Iterator::set_block(). However the
+ * changes will not be reflected in the FLAC file until
+ * the chain is written with Chain::write().
+ * - When you pass an object to Iterator::set_block(),
+ * Iterator::insert_block_before(), or
+ * Iterator::insert_block_after(), the iterator takes
+ * ownership of the block and it will be deleted by the
+ * chain.
+ *
+ * See the \link flac_metadata_level2 C layer equivalent \endlink
+ * for more.
+ *
+ * \{
+ */
/** This class is a wrapper around the FLAC__metadata_chain
- * structures and methods; see the
- * \link flacpp_metadata_level2 usage guide \endlink and
- * ::FLAC__Metadata_Chain.
- */
+ * structures and methods; see the
+ * \link flacpp_metadata_level2 usage guide \endlink and
+ * ::FLAC__Metadata_Chain.
+ */
class FLACPP_API Chain {
public:
/** This class is a wrapper around FLAC__Metadata_ChainStatus.
- */
+ */
class FLACPP_API Status {
public:
inline Status(::FLAC__Metadata_ChainStatus status): status_(status) { }
@@ -1119,10 +1119,10 @@ namespace FLAC {
};
/** This class is a wrapper around the FLAC__metadata_iterator
- * structures and methods; see the
- * \link flacpp_metadata_level2 usage guide \endlink and
- * ::FLAC__Metadata_Iterator.
- */
+ * structures and methods; see the
+ * \link flacpp_metadata_level2 usage guide \endlink and
+ * ::FLAC__Metadata_Iterator.
+ */
class FLACPP_API Iterator {
public:
Iterator();
diff --git a/src/lib/libflac/include/flac/format.h b/src/lib/libflac/include/flac/format.h
index 77e2d0130e5..a48e95c5e4d 100644
--- a/src/lib/libflac/include/flac/format.h
+++ b/src/lib/libflac/include/flac/format.h
@@ -84,8 +84,8 @@ extern "C" {
/*
- Most of the values described in this file are defined by the FLAC
- format specification. There is nothing to tune here.
+ Most of the values described in this file are defined by the FLAC
+ format specification. There is nothing to tune here.
*/
/** The largest legal metadata type code. */
@@ -193,11 +193,11 @@ extern FLAC_API const unsigned FLAC__STREAM_SYNC_LEN; /* = 32 bits */
typedef enum {
FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE = 0,
/**< Residual is coded by partitioning into contexts, each with it's own
- * 4-bit Rice parameter. */
+ * 4-bit Rice parameter. */
FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2 = 1
/**< Residual is coded by partitioning into contexts, each with it's own
- * 5-bit Rice parameter. */
+ * 5-bit Rice parameter. */
} FLAC__EntropyCodingMethodType;
/** Maps a FLAC__EntropyCodingMethodType to a C string.
@@ -217,14 +217,14 @@ typedef struct {
unsigned *raw_bits;
/**< Widths for escape-coded partitions. Will be non-zero for escaped
- * partitions and zero for unescaped partitions.
- */
+ * partitions and zero for unescaped partitions.
+ */
unsigned capacity_by_order;
/**< The capacity of the \a parameters and \a raw_bits arrays
- * specified as an order, i.e. the number of array elements
- * allocated is 2 ^ \a capacity_by_order.
- */
+ * specified as an order, i.e. the number of array elements
+ * allocated is 2 ^ \a capacity_by_order.
+ */
} FLAC__EntropyCodingMethod_PartitionedRiceContents;
/** Header for a Rice partitioned residual. (c.f. <A HREF="../format.html#partitioned_rice">format specification</A>)
@@ -425,21 +425,21 @@ typedef struct {
FLAC__FrameNumberType number_type;
/**< The numbering scheme used for the frame. As a convenience, the
- * decoder will always convert a frame number to a sample number because
- * the rules are complex. */
+ * decoder will always convert a frame number to a sample number because
+ * the rules are complex. */
union {
FLAC__uint32 frame_number;
FLAC__uint64 sample_number;
} number;
/**< The frame number or sample number of first sample in frame;
- * use the \a number_type value to determine which to use. */
+ * use the \a number_type value to determine which to use. */
FLAC__uint8 crc;
/**< CRC-8 (polynomial = x^8 + x^2 + x^1 + x^0, initialized with 0)
- * of the raw frame header bytes, meaning everything before the CRC byte
- * including the sync code.
- */
+ * of the raw frame header bytes, meaning everything before the CRC byte
+ * including the sync code.
+ */
} FLAC__FrameHeader;
extern FLAC_API const unsigned FLAC__FRAME_HEADER_SYNC; /**< == 0x3ffe; the frame header sync code */
@@ -459,9 +459,9 @@ extern FLAC_API const unsigned FLAC__FRAME_HEADER_CRC_LEN; /**< == 8 (bits) */
typedef struct {
FLAC__uint16 crc;
/**< CRC-16 (polynomial = x^16 + x^15 + x^2 + x^0, initialized with
- * 0) of the bytes before the crc, back to and including the frame header
- * sync code.
- */
+ * 0) of the bytes before the crc, back to and including the frame header
+ * sync code.
+ */
} FLAC__FrameFooter;
extern FLAC_API const unsigned FLAC__FRAME_FOOTER_CRC_LEN; /**< == 16 (bits) */
@@ -551,9 +551,9 @@ extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN; /**<
typedef struct {
int dummy;
/**< Conceptually this is an empty struct since we don't store the
- * padding bytes. Empty structs are not allowed by some C compilers,
- * hence the dummy.
- */
+ * padding bytes. Empty structs are not allowed by some C compilers,
+ * hence the dummy.
+ */
} FLAC__StreamMetadata_Padding;
@@ -574,7 +574,7 @@ typedef struct {
FLAC__uint64 stream_offset;
/**< The offset, in bytes, of the target frame with respect to
- * beginning of the first frame. */
+ * beginning of the first frame. */
unsigned frame_samples;
/**< The number of samples in the target frame. */
@@ -644,8 +644,8 @@ extern FLAC_API const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS
typedef struct {
FLAC__uint64 offset;
/**< Offset in samples, relative to the track offset, of the index
- * point.
- */
+ * point.
+ */
FLAC__byte number;
/**< The index point number. */
@@ -700,9 +700,9 @@ extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_
typedef struct {
char media_catalog_number[129];
/**< Media catalog number, in ASCII printable characters 0x20-0x7e. In
- * general, the media catalog number may be 0 to 128 bytes long; any
- * unused characters should be right-padded with NUL characters.
- */
+ * general, the media catalog number may be 0 to 128 bytes long; any
+ * unused characters should be right-padded with NUL characters.
+ */
FLAC__uint64 lead_in;
/**< The number of lead-in samples. */
@@ -769,21 +769,21 @@ typedef struct {
char *mime_type;
/**< Picture data's MIME type, in ASCII printable characters
- * 0x20-0x7e, NUL terminated. For best compatibility with players,
- * use picture data of MIME type \c image/jpeg or \c image/png. A
- * MIME type of '-->' is also allowed, in which case the picture
- * data should be a complete URL. In file storage, the MIME type is
- * stored as a 32-bit length followed by the ASCII string with no NUL
- * terminator, but is converted to a plain C string in this structure
- * for convenience.
- */
+ * 0x20-0x7e, NUL terminated. For best compatibility with players,
+ * use picture data of MIME type \c image/jpeg or \c image/png. A
+ * MIME type of '-->' is also allowed, in which case the picture
+ * data should be a complete URL. In file storage, the MIME type is
+ * stored as a 32-bit length followed by the ASCII string with no NUL
+ * terminator, but is converted to a plain C string in this structure
+ * for convenience.
+ */
FLAC__byte *description;
/**< Picture's description in UTF-8, NUL terminated. In file storage,
- * the description is stored as a 32-bit length followed by the UTF-8
- * string with no NUL terminator, but is converted to a plain C string
- * in this structure for convenience.
- */
+ * the description is stored as a 32-bit length followed by the UTF-8
+ * string with no NUL terminator, but is converted to a plain C string
+ * in this structure for convenience.
+ */
FLAC__uint32 width;
/**< Picture's width in pixels. */
@@ -796,8 +796,8 @@ typedef struct {
FLAC__uint32 colors;
/**< For indexed palettes (like GIF), picture's number of colors (the
- * number of palette entries), or \c 0 for non-indexed (i.e. 2^depth).
- */
+ * number of palette entries), or \c 0 for non-indexed (i.e. 2^depth).
+ */
FLAC__uint32 data_length;
/**< Length of binary picture data in bytes. */
@@ -831,8 +831,8 @@ typedef struct {
typedef struct {
FLAC__MetadataType type;
/**< The type of the metadata block; used determine which member of the
- * \a data union to dereference. If type >= FLAC__METADATA_TYPE_UNDEFINED
- * then \a data.unknown must be used. */
+ * \a data union to dereference. If type >= FLAC__METADATA_TYPE_UNDEFINED
+ * then \a data.unknown must be used. */
FLAC__bool is_last;
/**< \c true if this metadata block is the last, else \a false */
@@ -851,7 +851,7 @@ typedef struct {
FLAC__StreamMetadata_Unknown unknown;
} data;
/**< Polymorphic block data; use the \a type value to determine which
- * to use. */
+ * to use. */
} FLAC__StreamMetadata;
extern FLAC_API const unsigned FLAC__STREAM_METADATA_IS_LAST_LEN; /**< == 1 (bit) */
diff --git a/src/lib/libflac/include/flac/metadata.h b/src/lib/libflac/include/flac/metadata.h
index fff90b0bafd..6453b748e99 100644
--- a/src/lib/libflac/include/flac/metadata.h
+++ b/src/lib/libflac/include/flac/metadata.h
@@ -762,22 +762,22 @@ typedef enum {
FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH,
/**< FLAC__metadata_chain_write() was called on a chain read by
- * FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(),
- * or
- * FLAC__metadata_chain_write_with_callbacks()/FLAC__metadata_chain_write_with_callbacks_and_tempfile()
- * was called on a chain read by
- * FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg().
- * Matching read/write methods must always be used. */
+ * FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(),
+ * or
+ * FLAC__metadata_chain_write_with_callbacks()/FLAC__metadata_chain_write_with_callbacks_and_tempfile()
+ * was called on a chain read by
+ * FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg().
+ * Matching read/write methods must always be used. */
FLAC__METADATA_CHAIN_STATUS_WRONG_WRITE_CALL
/**< FLAC__metadata_chain_write_with_callbacks() was called when the
- * chain write requires a tempfile; use
- * FLAC__metadata_chain_write_with_callbacks_and_tempfile() instead.
- * Or, FLAC__metadata_chain_write_with_callbacks_and_tempfile() was
- * called when the chain write does not require a tempfile; use
- * FLAC__metadata_chain_write_with_callbacks() instead.
- * Always check FLAC__metadata_chain_check_if_tempfile_needed()
- * before writing via callbacks. */
+ * chain write requires a tempfile; use
+ * FLAC__metadata_chain_write_with_callbacks_and_tempfile() instead.
+ * Or, FLAC__metadata_chain_write_with_callbacks_and_tempfile() was
+ * called when the chain write does not require a tempfile; use
+ * FLAC__metadata_chain_write_with_callbacks() instead.
+ * Always check FLAC__metadata_chain_check_if_tempfile_needed()
+ * before writing via callbacks. */
} FLAC__Metadata_ChainStatus;
diff --git a/src/lib/libflac/include/flac/stream_decoder.h b/src/lib/libflac/include/flac/stream_decoder.h
index 9ac159474af..8c2dc51bfb4 100644
--- a/src/lib/libflac/include/flac/stream_decoder.h
+++ b/src/lib/libflac/include/flac/stream_decoder.h
@@ -208,8 +208,8 @@ typedef enum {
FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC,
/**< The decoder is ready to or is in the process of searching for the
- * frame sync code.
- */
+ * frame sync code.
+ */
FLAC__STREAM_DECODER_READ_FRAME,
/**< The decoder is ready to or is in the process of reading a frame. */
@@ -222,23 +222,23 @@ typedef enum {
FLAC__STREAM_DECODER_SEEK_ERROR,
/**< An error occurred while seeking. The decoder must be flushed
- * with FLAC__stream_decoder_flush() or reset with
- * FLAC__stream_decoder_reset() before decoding can continue.
- */
+ * with FLAC__stream_decoder_flush() or reset with
+ * FLAC__stream_decoder_reset() before decoding can continue.
+ */
FLAC__STREAM_DECODER_ABORTED,
/**< The decoder was aborted by the read callback. */
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR,
/**< An error occurred allocating memory. The decoder is in an invalid
- * state and can no longer be used.
- */
+ * state and can no longer be used.
+ */
FLAC__STREAM_DECODER_UNINITIALIZED
/**< The decoder is in the uninitialized state; one of the
- * FLAC__stream_decoder_init_*() functions must be called before samples
- * can be processed.
- */
+ * FLAC__stream_decoder_init_*() functions must be called before samples
+ * can be processed.
+ */
} FLAC__StreamDecoderState;
@@ -259,8 +259,8 @@ typedef enum {
FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER,
/**< The library was not compiled with support for the given container
- * format.
- */
+ * format.
+ */
FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS,
/**< A required callback was not supplied. */
@@ -270,13 +270,13 @@ typedef enum {
FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE,
/**< fopen() failed in FLAC__stream_decoder_init_file() or
- * FLAC__stream_decoder_init_ogg_file(). */
+ * FLAC__stream_decoder_init_ogg_file(). */
FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED
/**< FLAC__stream_decoder_init_*() was called when the decoder was
- * already initialized, usually because
- * FLAC__stream_decoder_finish() was not called.
- */
+ * already initialized, usually because
+ * FLAC__stream_decoder_finish() was not called.
+ */
} FLAC__StreamDecoderInitStatus;
@@ -297,14 +297,14 @@ typedef enum {
FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM,
/**< The read was attempted while at the end of the stream. Note that
- * the client must only return this value when the read callback was
- * called when already at the end of the stream. Otherwise, if the read
- * itself moves to the end of the stream, the client should still return
- * the data and \c FLAC__STREAM_DECODER_READ_STATUS_CONTINUE, and then on
- * the next read callback it should return
- * \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM with a byte count
- * of \c 0.
- */
+ * the client must only return this value when the read callback was
+ * called when already at the end of the stream. Otherwise, if the read
+ * itself moves to the end of the stream, the client should still return
+ * the data and \c FLAC__STREAM_DECODER_READ_STATUS_CONTINUE, and then on
+ * the next read callback it should return
+ * \c FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM with a byte count
+ * of \c 0.
+ */
FLAC__STREAM_DECODER_READ_STATUS_ABORT
/**< An unrecoverable error occurred. The decoder will return from the process call. */
diff --git a/src/lib/libflac/include/flac/stream_encoder.h b/src/lib/libflac/include/flac/stream_encoder.h
index dbbbb23ee11..0f609a15ba0 100644
--- a/src/lib/libflac/include/flac/stream_encoder.h
+++ b/src/lib/libflac/include/flac/stream_encoder.h
@@ -244,35 +244,35 @@ typedef enum {
FLAC__STREAM_ENCODER_UNINITIALIZED,
/**< The encoder is in the uninitialized state; one of the
- * FLAC__stream_encoder_init_*() functions must be called before samples
- * can be processed.
- */
+ * FLAC__stream_encoder_init_*() functions must be called before samples
+ * can be processed.
+ */
FLAC__STREAM_ENCODER_OGG_ERROR,
/**< An error occurred in the underlying Ogg layer. */
FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR,
/**< An error occurred in the underlying verify stream decoder;
- * check FLAC__stream_encoder_get_verify_decoder_state().
- */
+ * check FLAC__stream_encoder_get_verify_decoder_state().
+ */
FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA,
/**< The verify decoder detected a mismatch between the original
- * audio signal and the decoded audio signal.
- */
+ * audio signal and the decoded audio signal.
+ */
FLAC__STREAM_ENCODER_CLIENT_ERROR,
/**< One of the callbacks returned a fatal error. */
FLAC__STREAM_ENCODER_IO_ERROR,
/**< An I/O error occurred while opening/reading/writing a file.
- * Check \c errno.
- */
+ * Check \c errno.
+ */
FLAC__STREAM_ENCODER_FRAMING_ERROR,
/**< An error occurred while writing the stream; usually, the
- * write_callback returned an error.
- */
+ * write_callback returned an error.
+ */
FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR
/**< Memory allocation failed. */
@@ -299,8 +299,8 @@ typedef enum {
FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER,
/**< The library was not compiled with support for the given container
- * format.
- */
+ * format.
+ */
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS,
/**< A required callback was not supplied. */
@@ -310,9 +310,9 @@ typedef enum {
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE,
/**< The encoder has an invalid setting for bits-per-sample.
- * FLAC supports 4-32 bps but the reference encoder currently supports
- * only up to 24 bps.
- */
+ * FLAC supports 4-32 bps but the reference encoder currently supports
+ * only up to 24 bps.
+ */
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE,
/**< The encoder has an invalid setting for the input sample rate. */
@@ -334,18 +334,18 @@ typedef enum {
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA,
/**< The metadata input to the encoder is invalid, in one of the following ways:
- * - FLAC__stream_encoder_set_metadata() was called with a null pointer but a block count > 0
- * - One of the metadata blocks contains an undefined type
- * - It contains an illegal CUESHEET as checked by FLAC__format_cuesheet_is_legal()
- * - It contains an illegal SEEKTABLE as checked by FLAC__format_seektable_is_legal()
- * - It contains more than one SEEKTABLE block or more than one VORBIS_COMMENT block
- */
+ * - FLAC__stream_encoder_set_metadata() was called with a null pointer but a block count > 0
+ * - One of the metadata blocks contains an undefined type
+ * - It contains an illegal CUESHEET as checked by FLAC__format_cuesheet_is_legal()
+ * - It contains an illegal SEEKTABLE as checked by FLAC__format_seektable_is_legal()
+ * - It contains more than one SEEKTABLE block or more than one VORBIS_COMMENT block
+ */
FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED
/**< FLAC__stream_encoder_init_*() was called when the encoder was
- * already initialized, usually because
- * FLAC__stream_encoder_finish() was not called.
- */
+ * already initialized, usually because
+ * FLAC__stream_encoder_finish() was not called.
+ */
} FLAC__StreamEncoderInitStatus;
diff --git a/src/lib/libflac/include/private/fixed.h b/src/lib/libflac/include/private/fixed.h
index 85abf1d5374..34f8b728317 100644
--- a/src/lib/libflac/include/private/fixed.h
+++ b/src/lib/libflac/include/private/fixed.h
@@ -40,16 +40,16 @@
#include "flac/format.h"
/*
- * FLAC__fixed_compute_best_predictor()
- * --------------------------------------------------------------------
- * Compute the best fixed predictor and the expected bits-per-sample
+ * FLAC__fixed_compute_best_predictor()
+ * --------------------------------------------------------------------
+ * Compute the best fixed predictor and the expected bits-per-sample
* of the residual signal for each order. The _wide() version uses
* 64-bit integers which is statistically necessary when bits-per-
* sample + log2(blocksize) > 30
*
- * IN data[0,data_len-1]
- * IN data_len
- * OUT residual_bits_per_sample[0,FLAC__MAX_FIXED_ORDER]
+ * IN data[0,data_len-1]
+ * IN data_len
+ * OUT residual_bits_per_sample[0,FLAC__MAX_FIXED_ORDER]
*/
#ifndef FLAC__INTEGER_ONLY_LIBRARY
unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]);
@@ -67,30 +67,30 @@ unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsig
#endif
/*
- * FLAC__fixed_compute_residual()
- * --------------------------------------------------------------------
- * Compute the residual signal obtained from sutracting the predicted
- * signal from the original.
+ * FLAC__fixed_compute_residual()
+ * --------------------------------------------------------------------
+ * Compute the residual signal obtained from sutracting the predicted
+ * signal from the original.
*
- * IN data[-order,data_len-1] original signal (NOTE THE INDICES!)
- * IN data_len length of original signal
- * IN order <= FLAC__MAX_FIXED_ORDER fixed-predictor order
- * OUT residual[0,data_len-1] residual signal
+ * IN data[-order,data_len-1] original signal (NOTE THE INDICES!)
+ * IN data_len length of original signal
+ * IN order <= FLAC__MAX_FIXED_ORDER fixed-predictor order
+ * OUT residual[0,data_len-1] residual signal
*/
void FLAC__fixed_compute_residual(const FLAC__int32 data[], unsigned data_len, unsigned order, FLAC__int32 residual[]);
/*
- * FLAC__fixed_restore_signal()
- * --------------------------------------------------------------------
- * Restore the original signal by summing the residual and the
- * predictor.
+ * FLAC__fixed_restore_signal()
+ * --------------------------------------------------------------------
+ * Restore the original signal by summing the residual and the
+ * predictor.
*
- * IN residual[0,data_len-1] residual signal
- * IN data_len length of original signal
- * IN order <= FLAC__MAX_FIXED_ORDER fixed-predictor order
- * *** IMPORTANT: the caller must pass in the historical samples:
- * IN data[-order,-1] previously-reconstructed historical samples
- * OUT data[0,data_len-1] original signal
+ * IN residual[0,data_len-1] residual signal
+ * IN data_len length of original signal
+ * IN order <= FLAC__MAX_FIXED_ORDER fixed-predictor order
+ * *** IMPORTANT: the caller must pass in the historical samples:
+ * IN data[-order,-1] previously-reconstructed historical samples
+ * OUT data[0,data_len-1] original signal
*/
void FLAC__fixed_restore_signal(const FLAC__int32 residual[], unsigned data_len, unsigned order, FLAC__int32 data[]);
diff --git a/src/lib/libflac/include/private/float.h b/src/lib/libflac/include/private/float.h
index 75b99503bf3..e6dca74caad 100644
--- a/src/lib/libflac/include/private/float.h
+++ b/src/lib/libflac/include/private/float.h
@@ -74,21 +74,21 @@ extern const FLAC__fixedpoint FLAC__FP_E;
#define FLAC__fixedpoint_div(x, y) ( (FLAC__fixedpoint) ( ( ((FLAC__int64)(x)<<32) / (FLAC__int64)(y) ) >> 16 ) )
/*
- * FLAC__fixedpoint_log2()
- * --------------------------------------------------------------------
- * Returns the base-2 logarithm of the fixed-point number 'x' using an
- * algorithm by Knuth for x >= 1.0
+ * FLAC__fixedpoint_log2()
+ * --------------------------------------------------------------------
+ * Returns the base-2 logarithm of the fixed-point number 'x' using an
+ * algorithm by Knuth for x >= 1.0
*
- * 'fracbits' is the number of fractional bits of 'x'. 'fracbits' must
- * be < 32 and evenly divisible by 4 (0 is OK but not very precise).
+ * 'fracbits' is the number of fractional bits of 'x'. 'fracbits' must
+ * be < 32 and evenly divisible by 4 (0 is OK but not very precise).
*
- * 'precision' roughly limits the number of iterations that are done;
- * use (unsigned)(-1) for maximum precision.
+ * 'precision' roughly limits the number of iterations that are done;
+ * use (unsigned)(-1) for maximum precision.
*
- * If 'x' is less than one -- that is, x < (1<<fracbits) -- then this
- * function will punt and return 0.
+ * If 'x' is less than one -- that is, x < (1<<fracbits) -- then this
+ * function will punt and return 0.
*
- * The return value will also have 'fracbits' fractional bits.
+ * The return value will also have 'fracbits' fractional bits.
*/
FLAC__uint32 FLAC__fixedpoint_log2(FLAC__uint32 x, unsigned fracbits, unsigned precision);
diff --git a/src/lib/libflac/include/private/lpc.h b/src/lib/libflac/include/private/lpc.h
index 5eb91f7d988..eda5c491935 100644
--- a/src/lib/libflac/include/private/lpc.h
+++ b/src/lib/libflac/include/private/lpc.h
@@ -42,29 +42,29 @@
#ifndef FLAC__INTEGER_ONLY_LIBRARY
/*
- * FLAC__lpc_window_data()
- * --------------------------------------------------------------------
- * Applies the given window to the data.
+ * FLAC__lpc_window_data()
+ * --------------------------------------------------------------------
+ * Applies the given window to the data.
* OPT: asm implementation
*
- * IN in[0,data_len-1]
- * IN window[0,data_len-1]
- * OUT out[0,lag-1]
- * IN data_len
+ * IN in[0,data_len-1]
+ * IN window[0,data_len-1]
+ * OUT out[0,lag-1]
+ * IN data_len
*/
void FLAC__lpc_window_data(const FLAC__int32 in[], const FLAC__real window[], FLAC__real out[], unsigned data_len);
/*
- * FLAC__lpc_compute_autocorrelation()
- * --------------------------------------------------------------------
- * Compute the autocorrelation for lags between 0 and lag-1.
- * Assumes data[] outside of [0,data_len-1] == 0.
- * Asserts that lag > 0.
+ * FLAC__lpc_compute_autocorrelation()
+ * --------------------------------------------------------------------
+ * Compute the autocorrelation for lags between 0 and lag-1.
+ * Assumes data[] outside of [0,data_len-1] == 0.
+ * Asserts that lag > 0.
*
- * IN data[0,data_len-1]
- * IN data_len
- * IN 0 < lag <= data_len
- * OUT autoc[0,lag-1]
+ * IN data[0,data_len-1]
+ * IN data_len
+ * IN 0 < lag <= data_len
+ * OUT autoc[0,lag-1]
*/
void FLAC__lpc_compute_autocorrelation(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]);
#ifndef FLAC__NO_ASM
@@ -80,44 +80,44 @@ void FLAC__lpc_compute_autocorrelation_asm_ia32_3dnow(const FLAC__real data[], u
#endif
/*
- * FLAC__lpc_compute_lp_coefficients()
- * --------------------------------------------------------------------
- * Computes LP coefficients for orders 1..max_order.
- * Do not call if autoc[0] == 0.0. This means the signal is zero
- * and there is no point in calculating a predictor.
+ * FLAC__lpc_compute_lp_coefficients()
+ * --------------------------------------------------------------------
+ * Computes LP coefficients for orders 1..max_order.
+ * Do not call if autoc[0] == 0.0. This means the signal is zero
+ * and there is no point in calculating a predictor.
*
- * IN autoc[0,max_order] autocorrelation values
- * IN 0 < max_order <= FLAC__MAX_LPC_ORDER max LP order to compute
- * OUT lp_coeff[0,max_order-1][0,max_order-1] LP coefficients for each order
- * *** IMPORTANT:
- * *** lp_coeff[0,max_order-1][max_order,FLAC__MAX_LPC_ORDER-1] are untouched
- * OUT error[0,max_order-1] error for each order (more
- * specifically, the variance of
- * the error signal times # of
- * samples in the signal)
+ * IN autoc[0,max_order] autocorrelation values
+ * IN 0 < max_order <= FLAC__MAX_LPC_ORDER max LP order to compute
+ * OUT lp_coeff[0,max_order-1][0,max_order-1] LP coefficients for each order
+ * *** IMPORTANT:
+ * *** lp_coeff[0,max_order-1][max_order,FLAC__MAX_LPC_ORDER-1] are untouched
+ * OUT error[0,max_order-1] error for each order (more
+ * specifically, the variance of
+ * the error signal times # of
+ * samples in the signal)
*
- * Example: if max_order is 9, the LP coefficients for order 9 will be
- * in lp_coeff[8][0,8], the LP coefficients for order 8 will be
- * in lp_coeff[7][0,7], etc.
+ * Example: if max_order is 9, the LP coefficients for order 9 will be
+ * in lp_coeff[8][0,8], the LP coefficients for order 8 will be
+ * in lp_coeff[7][0,7], etc.
*/
void FLAC__lpc_compute_lp_coefficients(const FLAC__real autoc[], unsigned *max_order, FLAC__real lp_coeff[][FLAC__MAX_LPC_ORDER], FLAC__double error[]);
/*
- * FLAC__lpc_quantize_coefficients()
- * --------------------------------------------------------------------
- * Quantizes the LP coefficients. NOTE: precision + bits_per_sample
- * must be less than 32 (sizeof(FLAC__int32)*8).
+ * FLAC__lpc_quantize_coefficients()
+ * --------------------------------------------------------------------
+ * Quantizes the LP coefficients. NOTE: precision + bits_per_sample
+ * must be less than 32 (sizeof(FLAC__int32)*8).
*
- * IN lp_coeff[0,order-1] LP coefficients
- * IN order LP order
- * IN FLAC__MIN_QLP_COEFF_PRECISION < precision
- * desired precision (in bits, including sign
- * bit) of largest coefficient
- * OUT qlp_coeff[0,order-1] quantized coefficients
- * OUT shift # of bits to shift right to get approximated
- * LP coefficients. NOTE: could be negative.
- * RETURN 0 => quantization OK
- * 1 => coefficients require too much shifting for *shift to
+ * IN lp_coeff[0,order-1] LP coefficients
+ * IN order LP order
+ * IN FLAC__MIN_QLP_COEFF_PRECISION < precision
+ * desired precision (in bits, including sign
+ * bit) of largest coefficient
+ * OUT qlp_coeff[0,order-1] quantized coefficients
+ * OUT shift # of bits to shift right to get approximated
+ * LP coefficients. NOTE: could be negative.
+ * RETURN 0 => quantization OK
+ * 1 => coefficients require too much shifting for *shift to
* fit in the LPC subframe header. 'shift' is unset.
* 2 => coefficients are all zero, which is bad. 'shift' is
* unset.
@@ -125,17 +125,17 @@ void FLAC__lpc_compute_lp_coefficients(const FLAC__real autoc[], unsigned *max_o
int FLAC__lpc_quantize_coefficients(const FLAC__real lp_coeff[], unsigned order, unsigned precision, FLAC__int32 qlp_coeff[], int *shift);
/*
- * FLAC__lpc_compute_residual_from_qlp_coefficients()
- * --------------------------------------------------------------------
- * Compute the residual signal obtained from sutracting the predicted
- * signal from the original.
+ * FLAC__lpc_compute_residual_from_qlp_coefficients()
+ * --------------------------------------------------------------------
+ * Compute the residual signal obtained from sutracting the predicted
+ * signal from the original.
*
- * IN data[-order,data_len-1] original signal (NOTE THE INDICES!)
- * IN data_len length of original signal
- * IN qlp_coeff[0,order-1] quantized LP coefficients
- * IN order > 0 LP order
- * IN lp_quantization quantization of LP coefficients in bits
- * OUT residual[0,data_len-1] residual signal
+ * IN data[-order,data_len-1] original signal (NOTE THE INDICES!)
+ * IN data_len length of original signal
+ * IN qlp_coeff[0,order-1] quantized LP coefficients
+ * IN order > 0 LP order
+ * IN lp_quantization quantization of LP coefficients in bits
+ * OUT residual[0,data_len-1] residual signal
*/
void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]);
@@ -151,19 +151,19 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx(const FLAC__i
#endif /* !defined FLAC__INTEGER_ONLY_LIBRARY */
/*
- * FLAC__lpc_restore_signal()
- * --------------------------------------------------------------------
- * Restore the original signal by summing the residual and the
- * predictor.
+ * FLAC__lpc_restore_signal()
+ * --------------------------------------------------------------------
+ * Restore the original signal by summing the residual and the
+ * predictor.
*
- * IN residual[0,data_len-1] residual signal
- * IN data_len length of original signal
- * IN qlp_coeff[0,order-1] quantized LP coefficients
- * IN order > 0 LP order
- * IN lp_quantization quantization of LP coefficients in bits
- * *** IMPORTANT: the caller must pass in the historical samples:
- * IN data[-order,-1] previously-reconstructed historical samples
- * OUT data[0,data_len-1] original signal
+ * IN residual[0,data_len-1] residual signal
+ * IN data_len length of original signal
+ * IN qlp_coeff[0,order-1] quantized LP coefficients
+ * IN order > 0 LP order
+ * IN lp_quantization quantization of LP coefficients in bits
+ * *** IMPORTANT: the caller must pass in the historical samples:
+ * IN data[-order,-1] previously-reconstructed historical samples
+ * OUT data[0,data_len-1] original signal
*/
void FLAC__lpc_restore_signal(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
@@ -182,30 +182,30 @@ void FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8(const FLAC__int32 residu
#ifndef FLAC__INTEGER_ONLY_LIBRARY
/*
- * FLAC__lpc_compute_expected_bits_per_residual_sample()
- * --------------------------------------------------------------------
- * Compute the expected number of bits per residual signal sample
- * based on the LP error (which is related to the residual variance).
+ * FLAC__lpc_compute_expected_bits_per_residual_sample()
+ * --------------------------------------------------------------------
+ * Compute the expected number of bits per residual signal sample
+ * based on the LP error (which is related to the residual variance).
*
- * IN lpc_error >= 0.0 error returned from calculating LP coefficients
- * IN total_samples > 0 # of samples in residual signal
- * RETURN expected bits per sample
+ * IN lpc_error >= 0.0 error returned from calculating LP coefficients
+ * IN total_samples > 0 # of samples in residual signal
+ * RETURN expected bits per sample
*/
FLAC__double FLAC__lpc_compute_expected_bits_per_residual_sample(FLAC__double lpc_error, unsigned total_samples);
FLAC__double FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(FLAC__double lpc_error, FLAC__double error_scale);
/*
- * FLAC__lpc_compute_best_order()
- * --------------------------------------------------------------------
- * Compute the best order from the array of signal errors returned
- * during coefficient computation.
+ * FLAC__lpc_compute_best_order()
+ * --------------------------------------------------------------------
+ * Compute the best order from the array of signal errors returned
+ * during coefficient computation.
*
- * IN lpc_error[0,max_order-1] >= 0.0 error returned from calculating LP coefficients
- * IN max_order > 0 max LP order
- * IN total_samples > 0 # of samples in residual signal
- * IN overhead_bits_per_order # of bits overhead for each increased LP order
- * (includes warmup sample size and quantized LP coefficient)
- * RETURN [1,max_order] best order
+ * IN lpc_error[0,max_order-1] >= 0.0 error returned from calculating LP coefficients
+ * IN max_order > 0 max LP order
+ * IN total_samples > 0 # of samples in residual signal
+ * IN overhead_bits_per_order # of bits overhead for each increased LP order
+ * (includes warmup sample size and quantized LP coefficient)
+ * RETURN [1,max_order] best order
*/
unsigned FLAC__lpc_compute_best_order(const FLAC__double lpc_error[], unsigned max_order, unsigned total_samples, unsigned overhead_bits_per_order);
diff --git a/src/lib/libflac/include/private/window.h b/src/lib/libflac/include/private/window.h
index e063b4636df..dbb2a73f52a 100644
--- a/src/lib/libflac/include/private/window.h
+++ b/src/lib/libflac/include/private/window.h
@@ -42,13 +42,13 @@
#ifndef FLAC__INTEGER_ONLY_LIBRARY
/*
- * FLAC__window_*()
- * --------------------------------------------------------------------
- * Calculates window coefficients according to different apodization
- * functions.
+ * FLAC__window_*()
+ * --------------------------------------------------------------------
+ * Calculates window coefficients according to different apodization
+ * functions.
*
- * OUT window[0,L-1]
- * IN L (number of points in window)
+ * OUT window[0,L-1]
+ * IN L (number of points in window)
*/
void FLAC__window_bartlett(FLAC__real *window, const FLAC__int32 L);
void FLAC__window_bartlett_hann(FLAC__real *window, const FLAC__int32 L);