mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-25 05:11:49 +00:00
update flac to 1.4.1
This commit is contained in:
parent
67a4e3efd1
commit
3db3604720
7 changed files with 50 additions and 25 deletions
12
deps/flac/include/FLAC/callback.h
vendored
12
deps/flac/include/FLAC/callback.h
vendored
|
@ -168,12 +168,12 @@ typedef int (*FLAC__IOCallback_Close) (FLAC__IOHandle handle);
|
||||||
* a data source is not seekable by setting the \a seek field to \c NULL.
|
* a data source is not seekable by setting the \a seek field to \c NULL.
|
||||||
*/
|
*/
|
||||||
typedef struct {
|
typedef struct {
|
||||||
FLAC__IOCallback_Read read;
|
FLAC__IOCallback_Read read; /**< See FLAC__IOCallbacks */
|
||||||
FLAC__IOCallback_Write write;
|
FLAC__IOCallback_Write write; /**< See FLAC__IOCallbacks */
|
||||||
FLAC__IOCallback_Seek seek;
|
FLAC__IOCallback_Seek seek; /**< See FLAC__IOCallbacks */
|
||||||
FLAC__IOCallback_Tell tell;
|
FLAC__IOCallback_Tell tell; /**< See FLAC__IOCallbacks */
|
||||||
FLAC__IOCallback_Eof eof;
|
FLAC__IOCallback_Eof eof; /**< See FLAC__IOCallbacks */
|
||||||
FLAC__IOCallback_Close close;
|
FLAC__IOCallback_Close close; /**< See FLAC__IOCallbacks */
|
||||||
} FLAC__IOCallbacks;
|
} FLAC__IOCallbacks;
|
||||||
|
|
||||||
/* \} */
|
/* \} */
|
||||||
|
|
17
deps/flac/include/FLAC/export.h
vendored
17
deps/flac/include/FLAC/export.h
vendored
|
@ -49,13 +49,24 @@
|
||||||
* This module contains \#defines and symbols for exporting function
|
* This module contains \#defines and symbols for exporting function
|
||||||
* calls, and providing version information and compiled-in features.
|
* calls, and providing version information and compiled-in features.
|
||||||
*
|
*
|
||||||
* If you are compiling with MSVC and will link to the static library
|
* If you are compiling for Windows (with Visual Studio or MinGW for
|
||||||
* (libFLAC.lib) you should define FLAC__NO_DLL in your project to
|
* example) and will link to the static library (libFLAC++.lib) you
|
||||||
* make sure the symbols are exported properly.
|
* should define FLAC__NO_DLL in your project to make sure the symbols
|
||||||
|
* are exported properly.
|
||||||
*
|
*
|
||||||
* \{
|
* \{
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/** This \#define is used internally in libFLAC and its headers to make
|
||||||
|
* sure the correct symbols are exported when working with shared
|
||||||
|
* libraries. On Windows, this \#define is set to __declspec(dllexport)
|
||||||
|
* when compiling libFLAC into a library and to __declspec(dllimport)
|
||||||
|
* when the headers are used to link to that DLL. On non-Windows systems
|
||||||
|
* it is used to set symbol visibility.
|
||||||
|
*
|
||||||
|
* Because of this, the define FLAC__NO_DLL must be defined when linking
|
||||||
|
* to libFLAC statically or linking will fail.
|
||||||
|
*/
|
||||||
/* This has grown quite complicated. FLAC__NO_DLL is used by MSVC sln
|
/* This has grown quite complicated. FLAC__NO_DLL is used by MSVC sln
|
||||||
* files and CMake, which build either static or shared. autotools can
|
* files and CMake, which build either static or shared. autotools can
|
||||||
* build static, shared or **both**. Therefore, DLL_EXPORT, which is set
|
* build static, shared or **both**. Therefore, DLL_EXPORT, which is set
|
||||||
|
|
3
deps/flac/include/FLAC/format.h
vendored
3
deps/flac/include/FLAC/format.h
vendored
|
@ -120,8 +120,7 @@ extern "C" {
|
||||||
#define FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE (32u)
|
#define FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE (32u)
|
||||||
|
|
||||||
/** The maximum sample rate permitted by the format. The value is
|
/** The maximum sample rate permitted by the format. The value is
|
||||||
* ((2 ^ 16) - 1) * 10; see <A HREF="../format.html">FLAC format</A>
|
* ((2 ^ 20) - 1)
|
||||||
* as to why.
|
|
||||||
*/
|
*/
|
||||||
#define FLAC__MAX_SAMPLE_RATE (1048575u)
|
#define FLAC__MAX_SAMPLE_RATE (1048575u)
|
||||||
|
|
||||||
|
|
39
deps/flac/include/FLAC/stream_encoder.h
vendored
39
deps/flac/include/FLAC/stream_encoder.h
vendored
|
@ -311,8 +311,7 @@ typedef enum {
|
||||||
|
|
||||||
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE,
|
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE,
|
||||||
/**< The encoder has an invalid setting for bits-per-sample.
|
/**< The encoder has an invalid setting for bits-per-sample.
|
||||||
* FLAC supports 4-32 bps but the reference encoder currently supports
|
* FLAC supports 4-32 bps.
|
||||||
* only up to 24 bps.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE,
|
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE,
|
||||||
|
@ -843,15 +842,15 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *en
|
||||||
* <td>max residual partition order</td>
|
* <td>max residual partition order</td>
|
||||||
* <td>rice parameter search dist</td>
|
* <td>rice parameter search dist</td>
|
||||||
* </tr>
|
* </tr>
|
||||||
* <tr> <td><b>0</b></td> <td>false</td> <td>false</td> <td>tukey(0.5)<td> <td>0</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>3</td> <td>0</td> </tr>
|
* <tr> <td><b>0</b></td> <td>false</td> <td>false</td> <td>tukey(0.5)</td> <td>0</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>3</td> <td>0</td> </tr>
|
||||||
* <tr> <td><b>1</b></td> <td>true</td> <td>true</td> <td>tukey(0.5)<td> <td>0</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>3</td> <td>0</td> </tr>
|
* <tr> <td><b>1</b></td> <td>true</td> <td>true</td> <td>tukey(0.5)</td> <td>0</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>3</td> <td>0</td> </tr>
|
||||||
* <tr> <td><b>2</b></td> <td>true</td> <td>false</td> <td>tukey(0.5)<td> <td>0</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>3</td> <td>0</td> </tr>
|
* <tr> <td><b>2</b></td> <td>true</td> <td>false</td> <td>tukey(0.5)</td> <td>0</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>3</td> <td>0</td> </tr>
|
||||||
* <tr> <td><b>3</b></td> <td>false</td> <td>false</td> <td>tukey(0.5)<td> <td>6</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>4</td> <td>0</td> </tr>
|
* <tr> <td><b>3</b></td> <td>false</td> <td>false</td> <td>tukey(0.5)</td> <td>6</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>4</td> <td>0</td> </tr>
|
||||||
* <tr> <td><b>4</b></td> <td>true</td> <td>true</td> <td>tukey(0.5)<td> <td>8</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>4</td> <td>0</td> </tr>
|
* <tr> <td><b>4</b></td> <td>true</td> <td>true</td> <td>tukey(0.5)</td> <td>8</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>4</td> <td>0</td> </tr>
|
||||||
* <tr> <td><b>5</b></td> <td>true</td> <td>false</td> <td>tukey(0.5)<td> <td>8</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>5</td> <td>0</td> </tr>
|
* <tr> <td><b>5</b></td> <td>true</td> <td>false</td> <td>tukey(0.5)</td> <td>8</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>5</td> <td>0</td> </tr>
|
||||||
* <tr> <td><b>6</b></td> <td>true</td> <td>false</td> <td>tukey(0.5);partial_tukey(2)<td> <td>8</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>6</td> <td>0</td> </tr>
|
* <tr> <td><b>6</b></td> <td>true</td> <td>false</td> <td>subdivide_tukey(2)</td> <td>8</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>6</td> <td>0</td> </tr>
|
||||||
* <tr> <td><b>7</b></td> <td>true</td> <td>false</td> <td>tukey(0.5);partial_tukey(2)<td> <td>12</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>6</td> <td>0</td> </tr>
|
* <tr> <td><b>7</b></td> <td>true</td> <td>false</td> <td>subdivide_tukey(2)</td> <td>12</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>6</td> <td>0</td> </tr>
|
||||||
* <tr> <td><b>8</b></td> <td>true</td> <td>false</td> <td>tukey(0.5);partial_tukey(2);punchout_tukey(3)</td> <td>12</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>6</td> <td>0</td> </tr>
|
* <tr> <td><b>8</b></td> <td>true</td> <td>false</td> <td>subdivide_tukey(2)</td> <td>12</td> <td>0</td> <td>false</td> <td>false</td> <td>false</td> <td>0</td> <td>6</td> <td>0</td> </tr>
|
||||||
* </table>
|
* </table>
|
||||||
*
|
*
|
||||||
* \default \c 5
|
* \default \c 5
|
||||||
|
@ -921,7 +920,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE
|
||||||
* \c blackman, \c blackman_harris_4term_92db, \c connes, \c flattop,
|
* \c blackman, \c blackman_harris_4term_92db, \c connes, \c flattop,
|
||||||
* \c gauss(STDDEV), \c hamming, \c hann, \c kaiser_bessel, \c nuttall,
|
* \c gauss(STDDEV), \c hamming, \c hann, \c kaiser_bessel, \c nuttall,
|
||||||
* \c rectangle, \c triangle, \c tukey(P), \c partial_tukey(n[/ov[/P]]),
|
* \c rectangle, \c triangle, \c tukey(P), \c partial_tukey(n[/ov[/P]]),
|
||||||
* \c punchout_tukey(n[/ov[/P]]), \c welch.
|
* \c punchout_tukey(n[/ov[/P]]), \c subdivide_tukey(n[/P]), \c welch.
|
||||||
*
|
*
|
||||||
* For \c gauss(STDDEV), STDDEV specifies the standard deviation
|
* For \c gauss(STDDEV), STDDEV specifies the standard deviation
|
||||||
* (0<STDDEV<=0.5).
|
* (0<STDDEV<=0.5).
|
||||||
|
@ -948,6 +947,20 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE
|
||||||
* and partial_tukey(3/0.3/0.5) are all valid. ov should be smaller than 1
|
* and partial_tukey(3/0.3/0.5) are all valid. ov should be smaller than 1
|
||||||
* and can be negative.
|
* and can be negative.
|
||||||
*
|
*
|
||||||
|
* subdivide_tukey(n) is a more efficient reimplementation of
|
||||||
|
* partial_tukey and punchout_tukey taken together, recycling as much data
|
||||||
|
* as possible. It combines all possible non-redundant partial_tukey(n)
|
||||||
|
* and punchout_tukey(n) up to the n specified. Specifying
|
||||||
|
* subdivide_tukey(3) is equivalent to specifying tukey, partial_tukey(2),
|
||||||
|
* partial_tukey(3) and punchout_tukey(3), specifying subdivide_tukey(5)
|
||||||
|
* equivalently adds partial_tukey(4), punchout_tukey(4), partial_tukey(5)
|
||||||
|
* and punchout_tukey(5). To be able to reuse data as much as possible,
|
||||||
|
* the tukey taper is taken equal for all windows, and the P specified is
|
||||||
|
* applied for the smallest used window. In other words,
|
||||||
|
* subdivide_tukey(2/0.5) results in a taper equal to that of tukey(0.25)
|
||||||
|
* and subdivide_tukey(5) in a taper equal to that of tukey(0.1). The
|
||||||
|
* default P for subdivide_tukey when none is specified is 0.5.
|
||||||
|
*
|
||||||
* Example specifications are \c "blackman" or
|
* Example specifications are \c "blackman" or
|
||||||
* \c "hann;triangle;tukey(0.5);tukey(0.25);tukey(0.125)"
|
* \c "hann;triangle;tukey(0.5);tukey(0.25);tukey(0.125)"
|
||||||
*
|
*
|
||||||
|
@ -963,6 +976,8 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE
|
||||||
* floating point array in which to store the window. Also note that the
|
* floating point array in which to store the window. Also note that the
|
||||||
* values of P, STDDEV and ov are locale-specific, so if the comma
|
* values of P, STDDEV and ov are locale-specific, so if the comma
|
||||||
* separator specified by the locale is a comma, a comma should be used.
|
* separator specified by the locale is a comma, a comma should be used.
|
||||||
|
* A locale-independent way is to specify using scientific notation,
|
||||||
|
* e.g. 5e-1 instad of 0.5 or 0,5.
|
||||||
*
|
*
|
||||||
* \default \c "tukey(0.5)"
|
* \default \c "tukey(0.5)"
|
||||||
* \param encoder An encoder instance to set.
|
* \param encoder An encoder instance to set.
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
||||||
# The variable CVF_VERSION must be set before calling configure_file().
|
# The variable CVF_VERSION must be set before calling configure_file().
|
||||||
|
|
||||||
set(PACKAGE_VERSION "1.4.0")
|
set(PACKAGE_VERSION "1.4.1")
|
||||||
|
|
||||||
if (PACKAGE_FIND_VERSION_RANGE)
|
if (PACKAGE_FIND_VERSION_RANGE)
|
||||||
# Package version must be in the requested version range
|
# Package version must be in the requested version range
|
||||||
|
|
BIN
deps/flac/lib/libFLAC.a
vendored
BIN
deps/flac/lib/libFLAC.a
vendored
Binary file not shown.
2
deps/flac/lib/pkgconfig/flac.pc
vendored
2
deps/flac/lib/pkgconfig/flac.pc
vendored
|
@ -5,7 +5,7 @@ includedir=${prefix}/include
|
||||||
|
|
||||||
Name: FLAC
|
Name: FLAC
|
||||||
Description: Free Lossless Audio Codec Library
|
Description: Free Lossless Audio Codec Library
|
||||||
Version: 1.4.0
|
Version: 1.4.1
|
||||||
Requires.private: ogg
|
Requires.private: ogg
|
||||||
Libs: -L${libdir} -lFLAC
|
Libs: -L${libdir} -lFLAC
|
||||||
Libs.private: -lm
|
Libs.private: -lm
|
||||||
|
|
Loading…
Reference in a new issue