zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2024-11-27 22:22:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

update flac to 1.3.3

Browse source
This commit is contained in:
alexey.lysiuk 2019-10-28 22:29:14 +02:00
parent e2f2f3c0cf
commit 9d5bc0b38e
9 changed files with 189 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flac/include/FLAC/all.h
View file

@ -321,7 +321,7 @@
* *
* The \a bytes parameter to FLAC__StreamDecoderReadCallback, * The \a bytes parameter to FLAC__StreamDecoderReadCallback,
* FLAC__StreamEncoderReadCallback, and FLAC__StreamEncoderWriteCallback * FLAC__StreamEncoderReadCallback, and FLAC__StreamEncoderWriteCallback
* is now \c size_t instead of \c unsigned. * is now \c size_t instead of \c uint32_t.
*/ */
/** \defgroup porting_1_1_3_to_1_1_4 Porting from FLAC 1.1.3 to 1.1.4 /** \defgroup porting_1_1_3_to_1_1_4 Porting from FLAC 1.1.3 to 1.1.4

2
flac/include/FLAC/assert.h
View file

@ -34,7 +34,7 @@
#define FLAC__ASSERT_H #define FLAC__ASSERT_H
/* we need this since some compilers (like MSVC) leave assert()s on release code (and we don't want to use their ASSERT) */ /* we need this since some compilers (like MSVC) leave assert()s on release code (and we don't want to use their ASSERT) */
#ifdef DEBUG #ifndef NDEBUG
#include <assert.h> #include <assert.h>
#define FLAC__ASSERT(x) assert(x) #define FLAC__ASSERT(x) assert(x)
#define FLAC__ASSERT_DECLARATION(x) x #define FLAC__ASSERT_DECLARATION(x) x

2
flac/include/FLAC/callback.h
View file

@ -165,7 +165,7 @@ typedef int (*FLAC__IOCallback_Close) (FLAC__IOHandle handle);
* required may be set to NULL. * required may be set to NULL.
* *
* If the seek requirement for an interface is optional, you can signify that * If the seek requirement for an interface is optional, you can signify that
* a data sorce 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;

202
flac/include/FLAC/format.h
View file

@ -173,10 +173,10 @@ extern FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4]; /* = "fLaC" */
/** The 32-bit integer big-endian representation of the beginning of /** The 32-bit integer big-endian representation of the beginning of
* a FLAC stream. * a FLAC stream.
*/ */
extern FLAC_API const unsigned FLAC__STREAM_SYNC; /* = 0x664C6143 */ extern FLAC_API const uint32_t FLAC__STREAM_SYNC; /* = 0x664C6143 */
/** The length of the FLAC signature in bits. */ /** The length of the FLAC signature in bits. */
extern FLAC_API const unsigned FLAC__STREAM_SYNC_LEN; /* = 32 bits */ extern FLAC_API const uint32_t FLAC__STREAM_SYNC_LEN; /* = 32 bits */
/** The length of the FLAC signature in bytes. */ /** The length of the FLAC signature in bytes. */
#define FLAC__STREAM_SYNC_LENGTH (4u) #define FLAC__STREAM_SYNC_LENGTH (4u)
@ -213,15 +213,15 @@ extern FLAC_API const char * const FLAC__EntropyCodingMethodTypeString[];
*/ */
typedef struct { typedef struct {
unsigned *parameters; uint32_t *parameters;
/**< The Rice parameters for each context. */ /**< The Rice parameters for each context. */
unsigned *raw_bits; uint32_t *raw_bits;
/**< Widths for escape-coded partitions. Will be non-zero for escaped /**< 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; uint32_t capacity_by_order;
/**< The capacity of the \a parameters and \a raw_bits arrays /**< The capacity of the \a parameters and \a raw_bits arrays
* specified as an order, i.e. the number of array elements * specified as an order, i.e. the number of array elements
* allocated is 2 ^ \a capacity_by_order. * allocated is 2 ^ \a capacity_by_order.
@ -232,7 +232,7 @@ typedef struct {
*/ */
typedef struct { typedef struct {
unsigned order; uint32_t order;
/**< The partition order, i.e. # of contexts = 2 ^ \a order. */ /**< The partition order, i.e. # of contexts = 2 ^ \a order. */
const FLAC__EntropyCodingMethod_PartitionedRiceContents *contents; const FLAC__EntropyCodingMethod_PartitionedRiceContents *contents;
@ -240,14 +240,14 @@ typedef struct {
} FLAC__EntropyCodingMethod_PartitionedRice; } FLAC__EntropyCodingMethod_PartitionedRice;
extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN; /**< == 4 (bits) */ extern FLAC_API const uint32_t FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN; /**< == 4 (bits) */
extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN; /**< == 4 (bits) */ extern FLAC_API const uint32_t FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN; /**< == 4 (bits) */
extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN; /**< == 5 (bits) */ extern FLAC_API const uint32_t FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN; /**< == 5 (bits) */
extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN; /**< == 5 (bits) */ extern FLAC_API const uint32_t FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN; /**< == 5 (bits) */
extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER; extern FLAC_API const uint32_t FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER;
/**< == (1<<FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN)-1 */ /**< == (1<<FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN)-1 */
extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER; extern FLAC_API const uint32_t FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER;
/**< == (1<<FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN)-1 */ /**< == (1<<FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN)-1 */
/** Header for the entropy coding method. (c.f. <A HREF="../format.html#residual">format specification</A>) /** Header for the entropy coding method. (c.f. <A HREF="../format.html#residual">format specification</A>)
@ -259,7 +259,7 @@ typedef struct {
} data; } data;
} FLAC__EntropyCodingMethod; } FLAC__EntropyCodingMethod;
extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_TYPE_LEN; /**< == 2 (bits) */ extern FLAC_API const uint32_t FLAC__ENTROPY_CODING_METHOD_TYPE_LEN; /**< == 2 (bits) */
/*****************************************************************************/ /*****************************************************************************/
@ -299,7 +299,7 @@ typedef struct {
FLAC__EntropyCodingMethod entropy_coding_method; FLAC__EntropyCodingMethod entropy_coding_method;
/**< The residual coding method. */ /**< The residual coding method. */
unsigned order; uint32_t order;
/**< The polynomial order. */ /**< The polynomial order. */
FLAC__int32 warmup[FLAC__MAX_FIXED_ORDER]; FLAC__int32 warmup[FLAC__MAX_FIXED_ORDER];
@ -316,10 +316,10 @@ typedef struct {
FLAC__EntropyCodingMethod entropy_coding_method; FLAC__EntropyCodingMethod entropy_coding_method;
/**< The residual coding method. */ /**< The residual coding method. */
unsigned order; uint32_t order;
/**< The FIR order. */ /**< The FIR order. */
unsigned qlp_coeff_precision; uint32_t qlp_coeff_precision;
/**< Quantized FIR filter coefficient precision in bits. */ /**< Quantized FIR filter coefficient precision in bits. */
int quantization_level; int quantization_level;
@ -335,8 +335,8 @@ typedef struct {
/**< The residual signal, length == (blocksize minus order) samples. */ /**< The residual signal, length == (blocksize minus order) samples. */
} FLAC__Subframe_LPC; } FLAC__Subframe_LPC;
extern FLAC_API const unsigned FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN; /**< == 4 (bits) */ extern FLAC_API const uint32_t FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN; /**< == 4 (bits) */
extern FLAC_API const unsigned FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN; /**< == 5 (bits) */ extern FLAC_API const uint32_t FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN; /**< == 5 (bits) */
/** FLAC subframe structure. (c.f. <A HREF="../format.html#subframe">format specification</A>) /** FLAC subframe structure. (c.f. <A HREF="../format.html#subframe">format specification</A>)
@ -349,7 +349,7 @@ typedef struct {
FLAC__Subframe_LPC lpc; FLAC__Subframe_LPC lpc;
FLAC__Subframe_Verbatim verbatim; FLAC__Subframe_Verbatim verbatim;
} data; } data;
unsigned wasted_bits; uint32_t wasted_bits;
} FLAC__Subframe; } FLAC__Subframe;
/** == 1 (bit) /** == 1 (bit)
@ -359,14 +359,14 @@ typedef struct {
* mandatory value of \c 0 but in the future may take on the value \c 0 or \c 1 * mandatory value of \c 0 but in the future may take on the value \c 0 or \c 1
* to mean something else. * to mean something else.
*/ */
extern FLAC_API const unsigned FLAC__SUBFRAME_ZERO_PAD_LEN; extern FLAC_API const uint32_t FLAC__SUBFRAME_ZERO_PAD_LEN;
extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_LEN; /**< == 6 (bits) */ extern FLAC_API const uint32_t FLAC__SUBFRAME_TYPE_LEN; /**< == 6 (bits) */
extern FLAC_API const unsigned FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN; /**< == 1 (bit) */ extern FLAC_API const uint32_t FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN; /**< == 1 (bit) */
extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK; /**< = 0x00 */ extern FLAC_API const uint32_t FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK; /**< = 0x00 */
extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK; /**< = 0x02 */ extern FLAC_API const uint32_t FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK; /**< = 0x02 */
extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK; /**< = 0x10 */ extern FLAC_API const uint32_t FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK; /**< = 0x10 */
extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK; /**< = 0x40 */ extern FLAC_API const uint32_t FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK; /**< = 0x40 */
/*****************************************************************************/ /*****************************************************************************/
@ -409,19 +409,19 @@ extern FLAC_API const char * const FLAC__FrameNumberTypeString[];
/** FLAC frame header structure. (c.f. <A HREF="../format.html#frame_header">format specification</A>) /** FLAC frame header structure. (c.f. <A HREF="../format.html#frame_header">format specification</A>)
*/ */
typedef struct { typedef struct {
unsigned blocksize; uint32_t blocksize;
/**< The number of samples per subframe. */ /**< The number of samples per subframe. */
unsigned sample_rate; uint32_t sample_rate;
/**< The sample rate in Hz. */ /**< The sample rate in Hz. */
unsigned channels; uint32_t channels;
/**< The number of channels (== number of subframes). */ /**< The number of channels (== number of subframes). */
FLAC__ChannelAssignment channel_assignment; FLAC__ChannelAssignment channel_assignment;
/**< The channel assignment for the frame. */ /**< The channel assignment for the frame. */
unsigned bits_per_sample; uint32_t bits_per_sample;
/**< The sample resolution. */ /**< The sample resolution. */
FLAC__FrameNumberType number_type; FLAC__FrameNumberType number_type;
@ -443,16 +443,16 @@ typedef struct {
*/ */
} FLAC__FrameHeader; } FLAC__FrameHeader;
extern FLAC_API const unsigned FLAC__FRAME_HEADER_SYNC; /**< == 0x3ffe; the frame header sync code */ extern FLAC_API const uint32_t FLAC__FRAME_HEADER_SYNC; /**< == 0x3ffe; the frame header sync code */
extern FLAC_API const unsigned FLAC__FRAME_HEADER_SYNC_LEN; /**< == 14 (bits) */ extern FLAC_API const uint32_t FLAC__FRAME_HEADER_SYNC_LEN; /**< == 14 (bits) */
extern FLAC_API const unsigned FLAC__FRAME_HEADER_RESERVED_LEN; /**< == 1 (bits) */ extern FLAC_API const uint32_t FLAC__FRAME_HEADER_RESERVED_LEN; /**< == 1 (bits) */
extern FLAC_API const unsigned FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN; /**< == 1 (bits) */ extern FLAC_API const uint32_t FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN; /**< == 1 (bits) */
extern FLAC_API const unsigned FLAC__FRAME_HEADER_BLOCK_SIZE_LEN; /**< == 4 (bits) */ extern FLAC_API const uint32_t FLAC__FRAME_HEADER_BLOCK_SIZE_LEN; /**< == 4 (bits) */
extern FLAC_API const unsigned FLAC__FRAME_HEADER_SAMPLE_RATE_LEN; /**< == 4 (bits) */ extern FLAC_API const uint32_t FLAC__FRAME_HEADER_SAMPLE_RATE_LEN; /**< == 4 (bits) */
extern FLAC_API const unsigned FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN; /**< == 4 (bits) */ extern FLAC_API const uint32_t FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN; /**< == 4 (bits) */
extern FLAC_API const unsigned FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN; /**< == 3 (bits) */ extern FLAC_API const uint32_t FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN; /**< == 3 (bits) */
extern FLAC_API const unsigned FLAC__FRAME_HEADER_ZERO_PAD_LEN; /**< == 1 (bit) */ extern FLAC_API const uint32_t FLAC__FRAME_HEADER_ZERO_PAD_LEN; /**< == 1 (bit) */
extern FLAC_API const unsigned FLAC__FRAME_HEADER_CRC_LEN; /**< == 8 (bits) */ extern FLAC_API const uint32_t FLAC__FRAME_HEADER_CRC_LEN; /**< == 8 (bits) */
/** FLAC frame footer structure. (c.f. <A HREF="../format.html#frame_footer">format specification</A>) /** FLAC frame footer structure. (c.f. <A HREF="../format.html#frame_footer">format specification</A>)
@ -465,7 +465,7 @@ typedef struct {
*/ */
} FLAC__FrameFooter; } FLAC__FrameFooter;
extern FLAC_API const unsigned FLAC__FRAME_FOOTER_CRC_LEN; /**< == 16 (bits) */ extern FLAC_API const uint32_t FLAC__FRAME_FOOTER_CRC_LEN; /**< == 16 (bits) */
/** FLAC frame structure. (c.f. <A HREF="../format.html#frame">format specification</A>) /** FLAC frame structure. (c.f. <A HREF="../format.html#frame">format specification</A>)
@ -527,24 +527,24 @@ extern FLAC_API const char * const FLAC__MetadataTypeString[];
/** FLAC STREAMINFO structure. (c.f. <A HREF="../format.html#metadata_block_streaminfo">format specification</A>) /** FLAC STREAMINFO structure. (c.f. <A HREF="../format.html#metadata_block_streaminfo">format specification</A>)
*/ */
typedef struct { typedef struct {
unsigned min_blocksize, max_blocksize; uint32_t min_blocksize, max_blocksize;
unsigned min_framesize, max_framesize; uint32_t min_framesize, max_framesize;
unsigned sample_rate; uint32_t sample_rate;
unsigned channels; uint32_t channels;
unsigned bits_per_sample; uint32_t bits_per_sample;
FLAC__uint64 total_samples; FLAC__uint64 total_samples;
FLAC__byte md5sum[16]; FLAC__byte md5sum[16];
} FLAC__StreamMetadata_StreamInfo; } FLAC__StreamMetadata_StreamInfo;
extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN; /**< == 16 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN; /**< == 16 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN; /**< == 16 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN; /**< == 16 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN; /**< == 24 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN; /**< == 24 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN; /**< == 24 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN; /**< == 24 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN; /**< == 20 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN; /**< == 20 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN; /**< == 3 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN; /**< == 3 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN; /**< == 5 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN; /**< == 5 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN; /**< == 36 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN; /**< == 36 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN; /**< == 128 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN; /**< == 128 (bits) */
/** The total stream length of the STREAMINFO block in bytes. */ /** The total stream length of the STREAMINFO block in bytes. */
#define FLAC__STREAM_METADATA_STREAMINFO_LENGTH (34u) #define FLAC__STREAM_METADATA_STREAMINFO_LENGTH (34u)
@ -567,7 +567,7 @@ typedef struct {
FLAC__byte *data; FLAC__byte *data;
} FLAC__StreamMetadata_Application; } FLAC__StreamMetadata_Application;
extern FLAC_API const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN; /**< == 32 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_APPLICATION_ID_LEN; /**< == 32 (bits) */
/** SeekPoint structure used in SEEKTABLE blocks. (c.f. <A HREF="../format.html#seekpoint">format specification</A>) /** SeekPoint structure used in SEEKTABLE blocks. (c.f. <A HREF="../format.html#seekpoint">format specification</A>)
*/ */
@ -579,13 +579,13 @@ typedef struct {
/**< The offset, in bytes, of the target frame with respect to /**< The offset, in bytes, of the target frame with respect to
* beginning of the first frame. */ * beginning of the first frame. */
unsigned frame_samples; uint32_t frame_samples;
/**< The number of samples in the target frame. */ /**< The number of samples in the target frame. */
} FLAC__StreamMetadata_SeekPoint; } FLAC__StreamMetadata_SeekPoint;
extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN; /**< == 64 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN; /**< == 64 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN; /**< == 64 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN; /**< == 64 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN; /**< == 16 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN; /**< == 16 (bits) */
/** The total stream length of a seek point in bytes. */ /** The total stream length of a seek point in bytes. */
#define FLAC__STREAM_METADATA_SEEKPOINT_LENGTH (18u) #define FLAC__STREAM_METADATA_SEEKPOINT_LENGTH (18u)
@ -610,7 +610,7 @@ extern FLAC_API const FLAC__uint64 FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER;
* present in a stream. * present in a stream.
*/ */
typedef struct { typedef struct {
unsigned num_points; uint32_t num_points;
FLAC__StreamMetadata_SeekPoint *points; FLAC__StreamMetadata_SeekPoint *points;
} FLAC__StreamMetadata_SeekTable; } FLAC__StreamMetadata_SeekTable;
@ -626,7 +626,7 @@ typedef struct {
FLAC__byte *entry; FLAC__byte *entry;
} FLAC__StreamMetadata_VorbisComment_Entry; } FLAC__StreamMetadata_VorbisComment_Entry;
extern FLAC_API const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN; /**< == 32 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN; /**< == 32 (bits) */
/** FLAC VORBIS_COMMENT structure. (c.f. <A HREF="../format.html#metadata_block_vorbis_comment">format specification</A>) /** FLAC VORBIS_COMMENT structure. (c.f. <A HREF="../format.html#metadata_block_vorbis_comment">format specification</A>)
@ -637,7 +637,7 @@ typedef struct {
FLAC__StreamMetadata_VorbisComment_Entry *comments; FLAC__StreamMetadata_VorbisComment_Entry *comments;
} FLAC__StreamMetadata_VorbisComment; } FLAC__StreamMetadata_VorbisComment;
extern FLAC_API const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN; /**< == 32 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN; /**< == 32 (bits) */
/** FLAC CUESHEET track index structure. (See the /** FLAC CUESHEET track index structure. (See the
@ -654,9 +654,9 @@ typedef struct {
/**< The index point number. */ /**< The index point number. */
} FLAC__StreamMetadata_CueSheet_Index; } FLAC__StreamMetadata_CueSheet_Index;
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN; /**< == 64 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN; /**< == 64 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN; /**< == 8 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN; /**< == 8 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN; /**< == 3*8 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN; /**< == 3*8 (bits) */
/** FLAC CUESHEET track structure. (See the /** FLAC CUESHEET track structure. (See the
@ -673,10 +673,10 @@ typedef struct {
char isrc[13]; char isrc[13];
/**< Track ISRC. This is a 12-digit alphanumeric code plus a trailing \c NUL byte */ /**< Track ISRC. This is a 12-digit alphanumeric code plus a trailing \c NUL byte */
unsigned type:1; uint32_t type:1;
/**< The track type: 0 for audio, 1 for non-audio. */ /**< The track type: 0 for audio, 1 for non-audio. */
unsigned pre_emphasis:1; uint32_t pre_emphasis:1;
/**< The pre-emphasis flag: 0 for no pre-emphasis, 1 for pre-emphasis. */ /**< The pre-emphasis flag: 0 for no pre-emphasis, 1 for pre-emphasis. */
FLAC__byte num_indices; FLAC__byte num_indices;
@ -687,13 +687,13 @@ typedef struct {
} FLAC__StreamMetadata_CueSheet_Track; } FLAC__StreamMetadata_CueSheet_Track;
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN; /**< == 64 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN; /**< == 64 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN; /**< == 8 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN; /**< == 8 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN; /**< == 12*8 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN; /**< == 12*8 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN; /**< == 1 (bit) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN; /**< == 1 (bit) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN; /**< == 1 (bit) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN; /**< == 1 (bit) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN; /**< == 6+13*8 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN; /**< == 6+13*8 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN; /**< == 8 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN; /**< == 8 (bits) */
/** FLAC CUESHEET structure. (See the /** FLAC CUESHEET structure. (See the
@ -713,7 +713,7 @@ typedef struct {
FLAC__bool is_cd; FLAC__bool is_cd;
/**< \c true if CUESHEET corresponds to a Compact Disc, else \c false. */ /**< \c true if CUESHEET corresponds to a Compact Disc, else \c false. */
unsigned num_tracks; uint32_t num_tracks;
/**< The number of tracks. */ /**< The number of tracks. */
FLAC__StreamMetadata_CueSheet_Track *tracks; FLAC__StreamMetadata_CueSheet_Track *tracks;
@ -721,11 +721,11 @@ typedef struct {
} FLAC__StreamMetadata_CueSheet; } FLAC__StreamMetadata_CueSheet;
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN; /**< == 128*8 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN; /**< == 128*8 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN; /**< == 64 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN; /**< == 64 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN; /**< == 1 (bit) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN; /**< == 1 (bit) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN; /**< == 7+258*8 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN; /**< == 7+258*8 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN; /**< == 8 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN; /**< == 8 (bits) */
/** An enumeration of the PICTURE types (see FLAC__StreamMetadataPicture and id3 v2.4 APIC tag). */ /** An enumeration of the PICTURE types (see FLAC__StreamMetadataPicture and id3 v2.4 APIC tag). */
@ -810,14 +810,14 @@ typedef struct {
} FLAC__StreamMetadata_Picture; } FLAC__StreamMetadata_Picture;
extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_TYPE_LEN; /**< == 32 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_PICTURE_TYPE_LEN; /**< == 32 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN; /**< == 32 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN; /**< == 32 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN; /**< == 32 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN; /**< == 32 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN; /**< == 32 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN; /**< == 32 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN; /**< == 32 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN; /**< == 32 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN; /**< == 32 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN; /**< == 32 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_COLORS_LEN; /**< == 32 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_PICTURE_COLORS_LEN; /**< == 32 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN; /**< == 32 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN; /**< == 32 (bits) */
/** Structure that is used when a metadata block of unknown type is loaded. /** Structure that is used when a metadata block of unknown type is loaded.
@ -840,7 +840,7 @@ typedef struct {
FLAC__bool is_last; FLAC__bool is_last;
/**< \c true if this metadata block is the last, else \a false */ /**< \c true if this metadata block is the last, else \a false */
unsigned length; uint32_t length;
/**< Length, in bytes, of the block data as it appears in the stream. */ /**< Length, in bytes, of the block data as it appears in the stream. */
union { union {
@ -857,9 +857,9 @@ typedef struct {
* to use. */ * to use. */
} FLAC__StreamMetadata; } FLAC__StreamMetadata;
extern FLAC_API const unsigned FLAC__STREAM_METADATA_IS_LAST_LEN; /**< == 1 (bit) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_IS_LAST_LEN; /**< == 1 (bit) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_TYPE_LEN; /**< == 7 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_TYPE_LEN; /**< == 7 (bits) */
extern FLAC_API const unsigned FLAC__STREAM_METADATA_LENGTH_LEN; /**< == 24 (bits) */ extern FLAC_API const uint32_t FLAC__STREAM_METADATA_LENGTH_LEN; /**< == 24 (bits) */
/** The total stream length of a metadata block header in bytes. */ /** The total stream length of a metadata block header in bytes. */
#define FLAC__STREAM_METADATA_HEADER_LENGTH (4u) #define FLAC__STREAM_METADATA_HEADER_LENGTH (4u)
@ -880,7 +880,7 @@ extern FLAC_API const unsigned FLAC__STREAM_METADATA_LENGTH_LEN; /**< == 24 (bit
* \c true if the given sample rate conforms to the specification, else * \c true if the given sample rate conforms to the specification, else
* \c false. * \c false.
*/ */
FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate); FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(uint32_t sample_rate);
/** Tests that a blocksize at the given sample rate is valid for the FLAC /** Tests that a blocksize at the given sample rate is valid for the FLAC
* subset. * subset.
@ -892,7 +892,7 @@ FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate);
* \c true if the given blocksize conforms to the specification for the * \c true if the given blocksize conforms to the specification for the
* subset at the given sample rate, else \c false. * subset at the given sample rate, else \c false.
*/ */
FLAC_API FLAC__bool FLAC__format_blocksize_is_subset(unsigned blocksize, unsigned sample_rate); FLAC_API FLAC__bool FLAC__format_blocksize_is_subset(uint32_t blocksize, uint32_t sample_rate);
/** Tests that a sample rate is valid for the FLAC subset. The subset rules /** Tests that a sample rate is valid for the FLAC subset. The subset rules
* for valid sample rates are slightly more complex since the rate has to * for valid sample rates are slightly more complex since the rate has to
@ -903,7 +903,7 @@ FLAC_API FLAC__bool FLAC__format_blocksize_is_subset(unsigned blocksize, unsigne
* \c true if the given sample rate conforms to the specification for the * \c true if the given sample rate conforms to the specification for the
* subset, else \c false. * subset, else \c false.
*/ */
FLAC_API FLAC__bool FLAC__format_sample_rate_is_subset(unsigned sample_rate); FLAC_API FLAC__bool FLAC__format_sample_rate_is_subset(uint32_t sample_rate);
/** Check a Vorbis comment entry name to see if it conforms to the Vorbis /** Check a Vorbis comment entry name to see if it conforms to the Vorbis
* comment specification. * comment specification.
@ -926,14 +926,14 @@ FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_name_is_legal(const char *n
* *
* \param value A string to be checked. * \param value A string to be checked.
* \param length A the length of \a value in bytes. May be * \param length A the length of \a value in bytes. May be
* \c (unsigned)(-1) to indicate that \a value is a plain * \c (uint32_t)(-1) to indicate that \a value is a plain
* UTF-8 NUL-terminated string. * UTF-8 NUL-terminated string.
* \assert * \assert
* \code value != NULL \endcode * \code value != NULL \endcode
* \retval FLAC__bool * \retval FLAC__bool
* \c false if entry name is illegal, else \c true. * \c false if entry name is illegal, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal(const FLAC__byte *value, unsigned length); FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal(const FLAC__byte *value, uint32_t length);
/** Check a Vorbis comment entry to see if it conforms to the Vorbis /** Check a Vorbis comment entry to see if it conforms to the Vorbis
* comment specification. * comment specification.
@ -950,7 +950,7 @@ FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal(const FLAC__
* \retval FLAC__bool * \retval FLAC__bool
* \c false if entry name is illegal, else \c true. * \c false if entry name is illegal, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_is_legal(const FLAC__byte *entry, unsigned length); FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_is_legal(const FLAC__byte *entry, uint32_t length);
/** Check a seek table to see if it conforms to the FLAC specification. /** Check a seek table to see if it conforms to the FLAC specification.
* See the format specification for limits on the contents of the * See the format specification for limits on the contents of the
@ -973,10 +973,10 @@ FLAC_API FLAC__bool FLAC__format_seektable_is_legal(const FLAC__StreamMetadata_S
* \param seek_table A pointer to a seek table to be sorted. * \param seek_table A pointer to a seek table to be sorted.
* \assert * \assert
* \code seek_table != NULL \endcode * \code seek_table != NULL \endcode
* \retval unsigned * \retval uint32_t
* The number of duplicate seek points converted into placeholders. * The number of duplicate seek points converted into placeholders.
*/ */
FLAC_API unsigned FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *seek_table); FLAC_API uint32_t FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *seek_table);
/** Check a cue sheet to see if it conforms to the FLAC specification. /** Check a cue sheet to see if it conforms to the FLAC specification.
* See the format specification for limits on the contents of the * See the format specification for limits on the contents of the

64
flac/include/FLAC/metadata.h
View file

@ -93,7 +93,7 @@
* Efficient means the whole file is rewritten at most one time, and only * Efficient means the whole file is rewritten at most one time, and only
* when necessary. Level 1 is not efficient only in the case that you * when necessary. Level 1 is not efficient only in the case that you
* cause more than one metadata block to grow or shrink beyond what can * cause more than one metadata block to grow or shrink beyond what can
* be accomodated by padding. In this case you should probably use level * be accommodated by padding. In this case you should probably use level
* 2, which allows you to edit all the metadata for a file in memory and * 2, which allows you to edit all the metadata for a file in memory and
* write it out all at once. * write it out all at once.
* *
@ -217,13 +217,13 @@ FLAC_API FLAC__bool FLAC__metadata_get_cuesheet(const char *filename, FLAC__Stre
* matched exactly. Use \c NULL to mean "any * matched exactly. Use \c NULL to mean "any
* description". * description".
* \param max_width The maximum width in pixels desired. Use * \param max_width The maximum width in pixels desired. Use
* \c (unsigned)(-1) to mean "any width". * \c (uint32_t)(-1) to mean "any width".
* \param max_height The maximum height in pixels desired. Use * \param max_height The maximum height in pixels desired. Use
* \c (unsigned)(-1) to mean "any height". * \c (uint32_t)(-1) to mean "any height".
* \param max_depth The maximum color depth in bits-per-pixel desired. * \param max_depth The maximum color depth in bits-per-pixel desired.
* Use \c (unsigned)(-1) to mean "any depth". * Use \c (uint32_t)(-1) to mean "any depth".
* \param max_colors The maximum number of colors desired. Use * \param max_colors The maximum number of colors desired. Use
* \c (unsigned)(-1) to mean "any number of colors". * \c (uint32_t)(-1) to mean "any number of colors".
* \assert * \assert
* \code filename != NULL \endcode * \code filename != NULL \endcode
* \code picture != NULL \endcode * \code picture != NULL \endcode
@ -234,7 +234,7 @@ FLAC_API FLAC__bool FLAC__metadata_get_cuesheet(const char *filename, FLAC__Stre
* error, a file decoder error, or the file contained no PICTURE * error, a file decoder error, or the file contained no PICTURE
* block, and \a *picture will be set to \c NULL. * block, and \a *picture will be set to \c NULL.
*/ */
FLAC_API FLAC__bool FLAC__metadata_get_picture(const char *filename, FLAC__StreamMetadata **picture, FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors); FLAC_API FLAC__bool FLAC__metadata_get_picture(const char *filename, FLAC__StreamMetadata **picture, FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, uint32_t max_width, uint32_t max_height, uint32_t max_depth, uint32_t max_colors);
/* \} */ /* \} */
@ -497,13 +497,13 @@ FLAC_API FLAC__MetadataType FLAC__metadata_simple_iterator_get_block_type(const
* \code iterator != NULL \endcode * \code iterator != NULL \endcode
* \a iterator has been successfully initialized with * \a iterator has been successfully initialized with
* FLAC__metadata_simple_iterator_init() * FLAC__metadata_simple_iterator_init()
* \retval unsigned * \retval uint32_t
* The length of the metadata block at the current iterator position. * The length of the metadata block at the current iterator position.
* The is same length as that in the * The is same length as that in the
* <a href="http://xiph.org/flac/format.html#metadata_block_header">metadata block header</a>, * <a href="http://xiph.org/flac/format.html#metadata_block_header">metadata block header</a>,
* i.e. the length of the metadata body that follows the header. * i.e. the length of the metadata body that follows the header.
*/ */
FLAC_API unsigned FLAC__metadata_simple_iterator_get_block_length(const FLAC__Metadata_SimpleIterator *iterator); FLAC_API uint32_t FLAC__metadata_simple_iterator_get_block_length(const FLAC__Metadata_SimpleIterator *iterator);
/** Get the application ID of the \c APPLICATION block at the current /** Get the application ID of the \c APPLICATION block at the current
* position. This avoids reading the actual block data which can save * position. This avoids reading the actual block data which can save
@ -1373,7 +1373,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_is_equal(const FLAC__StreamMetadata *b
* \retval FLAC__bool * \retval FLAC__bool
* \c false if \a copy is \c true and malloc() fails, else \c true. * \c false if \a copy is \c true and malloc() fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_application_set_data(FLAC__StreamMetadata *object, FLAC__byte *data, unsigned length, FLAC__bool copy); FLAC_API FLAC__bool FLAC__metadata_object_application_set_data(FLAC__StreamMetadata *object, FLAC__byte *data, uint32_t length, FLAC__bool copy);
/** Resize the seekpoint array. /** Resize the seekpoint array.
* *
@ -1390,7 +1390,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_application_set_data(FLAC__StreamMetad
* \retval FLAC__bool * \retval FLAC__bool
* \c false if memory allocation error, else \c true. * \c false if memory allocation error, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_seektable_resize_points(FLAC__StreamMetadata *object, unsigned new_num_points); FLAC_API FLAC__bool FLAC__metadata_object_seektable_resize_points(FLAC__StreamMetadata *object, uint32_t new_num_points);
/** Set a seekpoint in a seektable. /** Set a seekpoint in a seektable.
* *
@ -1402,7 +1402,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_seektable_resize_points(FLAC__StreamMe
* \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode * \code object->type == FLAC__METADATA_TYPE_SEEKTABLE \endcode
* \code object->data.seek_table.num_points > point_num \endcode * \code object->data.seek_table.num_points > point_num \endcode
*/ */
FLAC_API void FLAC__metadata_object_seektable_set_point(FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point); FLAC_API void FLAC__metadata_object_seektable_set_point(FLAC__StreamMetadata *object, uint32_t point_num, FLAC__StreamMetadata_SeekPoint point);
/** Insert a seekpoint into a seektable. /** Insert a seekpoint into a seektable.
* *
@ -1416,7 +1416,7 @@ FLAC_API void FLAC__metadata_object_seektable_set_point(FLAC__StreamMetadata *ob
* \retval FLAC__bool * \retval FLAC__bool
* \c false if memory allocation error, else \c true. * \c false if memory allocation error, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_seektable_insert_point(FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point); FLAC_API FLAC__bool FLAC__metadata_object_seektable_insert_point(FLAC__StreamMetadata *object, uint32_t point_num, FLAC__StreamMetadata_SeekPoint point);
/** Delete a seekpoint from a seektable. /** Delete a seekpoint from a seektable.
* *
@ -1429,7 +1429,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_seektable_insert_point(FLAC__StreamMet
* \retval FLAC__bool * \retval FLAC__bool
* \c false if memory allocation error, else \c true. * \c false if memory allocation error, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_seektable_delete_point(FLAC__StreamMetadata *object, unsigned point_num); FLAC_API FLAC__bool FLAC__metadata_object_seektable_delete_point(FLAC__StreamMetadata *object, uint32_t point_num);
/** Check a seektable to see if it conforms to the FLAC specification. /** Check a seektable to see if it conforms to the FLAC specification.
* See the format specification for limits on the contents of the * See the format specification for limits on the contents of the
@ -1459,7 +1459,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_seektable_is_legal(const FLAC__StreamM
* \retval FLAC__bool * \retval FLAC__bool
* \c false if memory allocation fails, else \c true. * \c false if memory allocation fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_placeholders(FLAC__StreamMetadata *object, unsigned num); FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_placeholders(FLAC__StreamMetadata *object, uint32_t num);
/** Append a specific seek point template to the end of a seek table. /** Append a specific seek point template to the end of a seek table.
* *
@ -1494,7 +1494,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_point(FLAC__
* \retval FLAC__bool * \retval FLAC__bool
* \c false if memory allocation fails, else \c true. * \c false if memory allocation fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_points(FLAC__StreamMetadata *object, FLAC__uint64 sample_numbers[], unsigned num); FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_points(FLAC__StreamMetadata *object, FLAC__uint64 sample_numbers[], uint32_t num);
/** Append a set of evenly-spaced seek point templates to the end of a /** Append a set of evenly-spaced seek point templates to the end of a
* seek table. * seek table.
@ -1516,7 +1516,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_points(FLAC_
* \retval FLAC__bool * \retval FLAC__bool
* \c false if memory allocation fails, else \c true. * \c false if memory allocation fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points(FLAC__StreamMetadata *object, unsigned num, FLAC__uint64 total_samples); FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points(FLAC__StreamMetadata *object, uint32_t num, FLAC__uint64 total_samples);
/** Append a set of evenly-spaced seek point templates to the end of a /** Append a set of evenly-spaced seek point templates to the end of a
* seek table. * seek table.
@ -1544,7 +1544,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_point
* \retval FLAC__bool * \retval FLAC__bool
* \c false if memory allocation fails, else \c true. * \c false if memory allocation fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points_by_samples(FLAC__StreamMetadata *object, unsigned samples, FLAC__uint64 total_samples); FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points_by_samples(FLAC__StreamMetadata *object, uint32_t samples, FLAC__uint64 total_samples);
/** Sort a seek table's seek points according to the format specification, /** Sort a seek table's seek points according to the format specification,
* removing duplicates. * removing duplicates.
@ -1603,7 +1603,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_vendor_string(FLAC__
* \retval FLAC__bool * \retval FLAC__bool
* \c false if memory allocation fails, else \c true. * \c false if memory allocation fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments(FLAC__StreamMetadata *object, unsigned new_num_comments); FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments(FLAC__StreamMetadata *object, uint32_t new_num_comments);
/** Sets a comment in a VORBIS_COMMENT block. /** Sets a comment in a VORBIS_COMMENT block.
* *
@ -1630,7 +1630,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments(FLAC__St
* \c false if memory allocation fails or \a entry does not comply with the * \c false if memory allocation fails or \a entry does not comply with the
* Vorbis comment specification, else \c true. * Vorbis comment specification, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy); FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_comment(FLAC__StreamMetadata *object, uint32_t comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
/** Insert a comment in a VORBIS_COMMENT block at the given index. /** Insert a comment in a VORBIS_COMMENT block at the given index.
* *
@ -1660,7 +1660,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_comment(FLAC__Stream
* \c false if memory allocation fails or \a entry does not comply with the * \c false if memory allocation fails or \a entry does not comply with the
* Vorbis comment specification, else \c true. * Vorbis comment specification, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_insert_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy); FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_insert_comment(FLAC__StreamMetadata *object, uint32_t comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
/** Appends a comment to a VORBIS_COMMENT block. /** Appends a comment to a VORBIS_COMMENT block.
* *
@ -1733,7 +1733,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_replace_comment(FLAC__St
* \retval FLAC__bool * \retval FLAC__bool
* \c false if realloc() fails, else \c true. * \c false if realloc() fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment(FLAC__StreamMetadata *object, unsigned comment_num); FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment(FLAC__StreamMetadata *object, uint32_t comment_num);
/** Creates a Vorbis comment entry from NUL-terminated name and value strings. /** Creates a Vorbis comment entry from NUL-terminated name and value strings.
* *
@ -1789,7 +1789,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair
* \retval FLAC__bool * \retval FLAC__bool
* \c true if the field names match, else \c false * \c true if the field names match, else \c false
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length); FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, uint32_t field_name_length);
/** Find a Vorbis comment with the given field name. /** Find a Vorbis comment with the given field name.
* *
@ -1808,7 +1808,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC
* The offset in the comment array of the first comment whose field * The offset in the comment array of the first comment whose field
* name matches \a field_name, or \c -1 if no match was found. * name matches \a field_name, or \c -1 if no match was found.
*/ */
FLAC_API int FLAC__metadata_object_vorbiscomment_find_entry_from(const FLAC__StreamMetadata *object, unsigned offset, const char *field_name); FLAC_API int FLAC__metadata_object_vorbiscomment_find_entry_from(const FLAC__StreamMetadata *object, uint32_t offset, const char *field_name);
/** Remove first Vorbis comment matching the given field name. /** Remove first Vorbis comment matching the given field name.
* *
@ -1886,7 +1886,7 @@ FLAC_API void FLAC__metadata_object_cuesheet_track_delete(FLAC__StreamMetadata_C
* \retval FLAC__bool * \retval FLAC__bool
* \c false if memory allocation error, else \c true. * \c false if memory allocation error, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices(FLAC__StreamMetadata *object, unsigned track_num, unsigned new_num_indices); FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices(FLAC__StreamMetadata *object, uint32_t track_num, uint32_t new_num_indices);
/** Insert an index point in a CUESHEET track at the given index. /** Insert an index point in a CUESHEET track at the given index.
* *
@ -1909,7 +1909,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices(FLAC__St
* \retval FLAC__bool * \retval FLAC__bool
* \c false if realloc() fails, else \c true. * \c false if realloc() fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index); FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_index(FLAC__StreamMetadata *object, uint32_t track_num, uint32_t index_num, FLAC__StreamMetadata_CueSheet_Index index);
/** Insert a blank index point in a CUESHEET track at the given index. /** Insert a blank index point in a CUESHEET track at the given index.
* *
@ -1933,7 +1933,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_index(FLAC__Stre
* \retval FLAC__bool * \retval FLAC__bool
* \c false if realloc() fails, else \c true. * \c false if realloc() fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num); FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index(FLAC__StreamMetadata *object, uint32_t track_num, uint32_t index_num);
/** Delete an index point in a CUESHEET track at the given index. /** Delete an index point in a CUESHEET track at the given index.
* *
@ -1952,7 +1952,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index(FLAC
* \retval FLAC__bool * \retval FLAC__bool
* \c false if realloc() fails, else \c true. * \c false if realloc() fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num); FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index(FLAC__StreamMetadata *object, uint32_t track_num, uint32_t index_num);
/** Resize the track array. /** Resize the track array.
* *
@ -1969,7 +1969,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index(FLAC__Stre
* \retval FLAC__bool * \retval FLAC__bool
* \c false if memory allocation error, else \c true. * \c false if memory allocation error, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks(FLAC__StreamMetadata *object, unsigned new_num_tracks); FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks(FLAC__StreamMetadata *object, uint32_t new_num_tracks);
/** Sets a track in a CUESHEET block. /** Sets a track in a CUESHEET block.
* *
@ -1991,7 +1991,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks(FLAC__StreamMet
* \retval FLAC__bool * \retval FLAC__bool
* \c false if \a copy is \c true and malloc() fails, else \c true. * \c false if \a copy is \c true and malloc() fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_set_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy); FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_set_track(FLAC__StreamMetadata *object, uint32_t track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy);
/** Insert a track in a CUESHEET block at the given index. /** Insert a track in a CUESHEET block at the given index.
* *
@ -2014,7 +2014,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_set_track(FLAC__StreamMetadat
* \retval FLAC__bool * \retval FLAC__bool
* \c false if \a copy is \c true and malloc() fails, else \c true. * \c false if \a copy is \c true and malloc() fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy); FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_track(FLAC__StreamMetadata *object, uint32_t track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy);
/** Insert a blank track in a CUESHEET block at the given index. /** Insert a blank track in a CUESHEET block at the given index.
* *
@ -2033,7 +2033,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_track(FLAC__StreamMeta
* \retval FLAC__bool * \retval FLAC__bool
* \c false if \a copy is \c true and malloc() fails, else \c true. * \c false if \a copy is \c true and malloc() fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_blank_track(FLAC__StreamMetadata *object, unsigned track_num); FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_blank_track(FLAC__StreamMetadata *object, uint32_t track_num);
/** Delete a track in a CUESHEET block at the given index. /** Delete a track in a CUESHEET block at the given index.
* *
@ -2048,7 +2048,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_blank_track(FLAC__Stre
* \retval FLAC__bool * \retval FLAC__bool
* \c false if realloc() fails, else \c true. * \c false if realloc() fails, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_delete_track(FLAC__StreamMetadata *object, unsigned track_num); FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_delete_track(FLAC__StreamMetadata *object, uint32_t track_num);
/** Check a cue sheet to see if it conforms to the FLAC specification. /** Check a cue sheet to see if it conforms to the FLAC specification.
* See the format specification for limits on the contents of the * See the format specification for limits on the contents of the

9
flac/include/FLAC/ordinals.h
View file

@ -39,12 +39,11 @@
* the 1999 ISO C Standard header file <stdint.h>. * the 1999 ISO C Standard header file <stdint.h>.
*/ */
typedef __int8 FLAC__int8; typedef signed __int8 FLAC__int8;
typedef signed __int16 FLAC__int16;
typedef signed __int32 FLAC__int32;
typedef signed __int64 FLAC__int64;
typedef unsigned __int8 FLAC__uint8; typedef unsigned __int8 FLAC__uint8;
typedef __int16 FLAC__int16;
typedef __int32 FLAC__int32;
typedef __int64 FLAC__int64;
typedef unsigned __int16 FLAC__uint16; typedef unsigned __int16 FLAC__uint16;
typedef unsigned __int32 FLAC__uint32; typedef unsigned __int32 FLAC__uint32;
typedef unsigned __int64 FLAC__uint64; typedef unsigned __int64 FLAC__uint64;

25
flac/include/FLAC/stream_decoder.h
View file

@ -920,7 +920,7 @@ FLAC_API FLAC__bool FLAC__stream_decoder_get_md5_checking(const FLAC__StreamDeco
* \param decoder A decoder instance to query. * \param decoder A decoder instance to query.
* \assert * \assert
* \code decoder != NULL \endcode * \code decoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See above. * See above.
*/ */
FLAC_API FLAC__uint64 FLAC__stream_decoder_get_total_samples(const FLAC__StreamDecoder *decoder); FLAC_API FLAC__uint64 FLAC__stream_decoder_get_total_samples(const FLAC__StreamDecoder *decoder);
@ -932,10 +932,10 @@ FLAC_API FLAC__uint64 FLAC__stream_decoder_get_total_samples(const FLAC__StreamD
* \param decoder A decoder instance to query. * \param decoder A decoder instance to query.
* \assert * \assert
* \code decoder != NULL \endcode * \code decoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See above. * See above.
*/ */
FLAC_API unsigned FLAC__stream_decoder_get_channels(const FLAC__StreamDecoder *decoder); FLAC_API uint32_t FLAC__stream_decoder_get_channels(const FLAC__StreamDecoder *decoder);
/** Get the current channel assignment in the stream being decoded. /** Get the current channel assignment in the stream being decoded.
* Will only be valid after decoding has started and will contain the * Will only be valid after decoding has started and will contain the
@ -956,10 +956,10 @@ FLAC_API FLAC__ChannelAssignment FLAC__stream_decoder_get_channel_assignment(con
* \param decoder A decoder instance to query. * \param decoder A decoder instance to query.
* \assert * \assert
* \code decoder != NULL \endcode * \code decoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See above. * See above.
*/ */
FLAC_API unsigned FLAC__stream_decoder_get_bits_per_sample(const FLAC__StreamDecoder *decoder); FLAC_API uint32_t FLAC__stream_decoder_get_bits_per_sample(const FLAC__StreamDecoder *decoder);
/** Get the current sample rate in Hz of the stream being decoded. /** Get the current sample rate in Hz of the stream being decoded.
* Will only be valid after decoding has started and will contain the * Will only be valid after decoding has started and will contain the
@ -968,10 +968,10 @@ FLAC_API unsigned FLAC__stream_decoder_get_bits_per_sample(const FLAC__StreamDec
* \param decoder A decoder instance to query. * \param decoder A decoder instance to query.
* \assert * \assert
* \code decoder != NULL \endcode * \code decoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See above. * See above.
*/ */
FLAC_API unsigned FLAC__stream_decoder_get_sample_rate(const FLAC__StreamDecoder *decoder); FLAC_API uint32_t FLAC__stream_decoder_get_sample_rate(const FLAC__StreamDecoder *decoder);
/** Get the current blocksize of the stream being decoded. /** Get the current blocksize of the stream being decoded.
* Will only be valid after decoding has started and will contain the * Will only be valid after decoding has started and will contain the
@ -980,10 +980,10 @@ FLAC_API unsigned FLAC__stream_decoder_get_sample_rate(const FLAC__StreamDecoder
* \param decoder A decoder instance to query. * \param decoder A decoder instance to query.
* \assert * \assert
* \code decoder != NULL \endcode * \code decoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See above. * See above.
*/ */
FLAC_API unsigned FLAC__stream_decoder_get_blocksize(const FLAC__StreamDecoder *decoder); FLAC_API uint32_t FLAC__stream_decoder_get_blocksize(const FLAC__StreamDecoder *decoder);
/** Returns the decoder's current read position within the stream. /** Returns the decoder's current read position within the stream.
* The position is the byte offset from the start of the stream. * The position is the byte offset from the start of the stream.
@ -1184,7 +1184,7 @@ FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_stream(
* Unless \a file is \c stdin, it will be closed * Unless \a file is \c stdin, it will be closed
* when FLAC__stream_decoder_finish() is called. * when FLAC__stream_decoder_finish() is called.
* Note however that seeking will not work when * Note however that seeking will not work when
* decoding from \c stdout since it is not seekable. * decoding from \c stdin since it is not seekable.
* \param write_callback See FLAC__StreamDecoderWriteCallback. This * \param write_callback See FLAC__StreamDecoderWriteCallback. This
* pointer must not be \c NULL. * pointer must not be \c NULL.
* \param metadata_callback See FLAC__StreamDecoderMetadataCallback. This * \param metadata_callback See FLAC__StreamDecoderMetadataCallback. This
@ -1234,7 +1234,7 @@ FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_FILE(
* Unless \a file is \c stdin, it will be closed * Unless \a file is \c stdin, it will be closed
* when FLAC__stream_decoder_finish() is called. * when FLAC__stream_decoder_finish() is called.
* Note however that seeking will not work when * Note however that seeking will not work when
* decoding from \c stdout since it is not seekable. * decoding from \c stdin since it is not seekable.
* \param write_callback See FLAC__StreamDecoderWriteCallback. This * \param write_callback See FLAC__StreamDecoderWriteCallback. This
* pointer must not be \c NULL. * pointer must not be \c NULL.
* \param metadata_callback See FLAC__StreamDecoderMetadataCallback. This * \param metadata_callback See FLAC__StreamDecoderMetadataCallback. This
@ -1403,8 +1403,7 @@ FLAC_API FLAC__bool FLAC__stream_decoder_flush(FLAC__StreamDecoder *decoder);
* and is not seekable (i.e. no seek callback was provided or the seek * and is not seekable (i.e. no seek callback was provided or the seek
* callback returns \c FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED), it * callback returns \c FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED), it
* is the duty of the client to start feeding data from the beginning of * is the duty of the client to start feeding data from the beginning of
* the stream on the next FLAC__stream_decoder_process() or * the stream on the next FLAC__stream_decoder_process_*() call.
* FLAC__stream_decoder_process_interleaved() call.
* *
* \param decoder A decoder instance. * \param decoder A decoder instance.
* \assert * \assert

74
flac/include/FLAC/stream_encoder.h
View file

@ -554,7 +554,7 @@ typedef FLAC__StreamEncoderReadStatus (*FLAC__StreamEncoderReadCallback)(const F
* \retval FLAC__StreamEncoderWriteStatus * \retval FLAC__StreamEncoderWriteStatus
* The callee's return status. * The callee's return status.
*/ */
typedef FLAC__StreamEncoderWriteStatus (*FLAC__StreamEncoderWriteCallback)(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data); typedef FLAC__StreamEncoderWriteStatus (*FLAC__StreamEncoderWriteCallback)(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, uint32_t samples, uint32_t current_frame, void *client_data);
/** Signature for the seek callback. /** Signature for the seek callback.
* *
@ -675,7 +675,7 @@ typedef void (*FLAC__StreamEncoderMetadataCallback)(const FLAC__StreamEncoder *e
* \param client_data The callee's client data set through * \param client_data The callee's client data set through
* FLAC__stream_encoder_init_*(). * FLAC__stream_encoder_init_*().
*/ */
typedef void (*FLAC__StreamEncoderProgressCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data); typedef void (*FLAC__StreamEncoderProgressCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, uint32_t frames_written, uint32_t total_frames_estimate, void *client_data);
/*********************************************************************** /***********************************************************************
@ -771,7 +771,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_streamable_subset(FLAC__StreamEncod
* \retval FLAC__bool * \retval FLAC__bool
* \c false if the encoder is already initialized, else \c true. * \c false if the encoder is already initialized, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_set_channels(FLAC__StreamEncoder *encoder, unsigned value); FLAC_API FLAC__bool FLAC__stream_encoder_set_channels(FLAC__StreamEncoder *encoder, uint32_t value);
/** Set the sample resolution of the input to be encoded. /** Set the sample resolution of the input to be encoded.
* *
@ -787,7 +787,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_channels(FLAC__StreamEncoder *encod
* \retval FLAC__bool * \retval FLAC__bool
* \c false if the encoder is already initialized, else \c true. * \c false if the encoder is already initialized, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_set_bits_per_sample(FLAC__StreamEncoder *encoder, unsigned value); FLAC_API FLAC__bool FLAC__stream_encoder_set_bits_per_sample(FLAC__StreamEncoder *encoder, uint32_t value);
/** Set the sample rate (in Hz) of the input to be encoded. /** Set the sample rate (in Hz) of the input to be encoded.
* *
@ -799,7 +799,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_bits_per_sample(FLAC__StreamEncoder
* \retval FLAC__bool * \retval FLAC__bool
* \c false if the encoder is already initialized, else \c true. * \c false if the encoder is already initialized, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *encoder, unsigned value); FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *encoder, uint32_t value);
/** Set the compression level /** Set the compression level
* *
@ -862,7 +862,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *en
* \retval FLAC__bool * \retval FLAC__bool
* \c false if the encoder is already initialized, else \c true. * \c false if the encoder is already initialized, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_set_compression_level(FLAC__StreamEncoder *encoder, unsigned value); FLAC_API FLAC__bool FLAC__stream_encoder_set_compression_level(FLAC__StreamEncoder *encoder, uint32_t value);
/** Set the blocksize to use while encoding. /** Set the blocksize to use while encoding.
* *
@ -877,13 +877,13 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_compression_level(FLAC__StreamEncod
* \retval FLAC__bool * \retval FLAC__bool
* \c false if the encoder is already initialized, else \c true. * \c false if the encoder is already initialized, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_set_blocksize(FLAC__StreamEncoder *encoder, unsigned value); FLAC_API FLAC__bool FLAC__stream_encoder_set_blocksize(FLAC__StreamEncoder *encoder, uint32_t value);
/** Set to \c true to enable mid-side encoding on stereo input. The /** Set to \c true to enable mid-side encoding on stereo input. The
* number of channels must be 2 for this to have any effect. Set to * number of channels must be 2 for this to have any effect. Set to
* \c false to use only independent channel coding. * \c false to use only independent channel coding.
* *
* \default \c false * \default \c true
* \param encoder An encoder instance to set. * \param encoder An encoder instance to set.
* \param value Flag value (see above). * \param value Flag value (see above).
* \assert * \assert
@ -977,7 +977,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_apodization(FLAC__StreamEncoder *en
/** Set the maximum LPC order, or \c 0 to use only the fixed predictors. /** Set the maximum LPC order, or \c 0 to use only the fixed predictors.
* *
* \default \c 0 * \default \c 8
* \param encoder An encoder instance to set. * \param encoder An encoder instance to set.
* \param value See above. * \param value See above.
* \assert * \assert
@ -985,7 +985,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_apodization(FLAC__StreamEncoder *en
* \retval FLAC__bool * \retval FLAC__bool
* \c false if the encoder is already initialized, else \c true. * \c false if the encoder is already initialized, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_set_max_lpc_order(FLAC__StreamEncoder *encoder, unsigned value); FLAC_API FLAC__bool FLAC__stream_encoder_set_max_lpc_order(FLAC__StreamEncoder *encoder, uint32_t value);
/** Set the precision, in bits, of the quantized linear predictor /** Set the precision, in bits, of the quantized linear predictor
* coefficients, or \c 0 to let the encoder select it based on the * coefficients, or \c 0 to let the encoder select it based on the
@ -1003,7 +1003,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_max_lpc_order(FLAC__StreamEncoder *
* \retval FLAC__bool * \retval FLAC__bool
* \c false if the encoder is already initialized, else \c true. * \c false if the encoder is already initialized, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_set_qlp_coeff_precision(FLAC__StreamEncoder *encoder, unsigned value); FLAC_API FLAC__bool FLAC__stream_encoder_set_qlp_coeff_precision(FLAC__StreamEncoder *encoder, uint32_t value);
/** Set to \c false to use only the specified quantized linear predictor /** Set to \c false to use only the specified quantized linear predictor
* coefficient precision, or \c true to search neighboring precision * coefficient precision, or \c true to search neighboring precision
@ -1066,7 +1066,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_do_exhaustive_model_search(FLAC__St
* \retval FLAC__bool * \retval FLAC__bool
* \c false if the encoder is already initialized, else \c true. * \c false if the encoder is already initialized, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_set_min_residual_partition_order(FLAC__StreamEncoder *encoder, unsigned value); FLAC_API FLAC__bool FLAC__stream_encoder_set_min_residual_partition_order(FLAC__StreamEncoder *encoder, uint32_t value);
/** Set the maximum partition order to search when coding the residual. /** Set the maximum partition order to search when coding the residual.
* This is used in tandem with * This is used in tandem with
@ -1081,7 +1081,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_min_residual_partition_order(FLAC__
* all orders, using the mean of each context for its Rice parameter, * all orders, using the mean of each context for its Rice parameter,
* and use the best. * and use the best.
* *
* \default \c 0 * \default \c 5
* \param encoder An encoder instance to set. * \param encoder An encoder instance to set.
* \param value See above. * \param value See above.
* \assert * \assert
@ -1089,7 +1089,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_min_residual_partition_order(FLAC__
* \retval FLAC__bool * \retval FLAC__bool
* \c false if the encoder is already initialized, else \c true. * \c false if the encoder is already initialized, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_set_max_residual_partition_order(FLAC__StreamEncoder *encoder, unsigned value); FLAC_API FLAC__bool FLAC__stream_encoder_set_max_residual_partition_order(FLAC__StreamEncoder *encoder, uint32_t value);
/** Deprecated. Setting this value has no effect. /** Deprecated. Setting this value has no effect.
* *
@ -1101,7 +1101,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_max_residual_partition_order(FLAC__
* \retval FLAC__bool * \retval FLAC__bool
* \c false if the encoder is already initialized, else \c true. * \c false if the encoder is already initialized, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_set_rice_parameter_search_dist(FLAC__StreamEncoder *encoder, unsigned value); FLAC_API FLAC__bool FLAC__stream_encoder_set_rice_parameter_search_dist(FLAC__StreamEncoder *encoder, uint32_t value);
/** Set an estimate of the total samples that will be encoded. /** Set an estimate of the total samples that will be encoded.
* This is merely an estimate and may be set to \c 0 if unknown. * This is merely an estimate and may be set to \c 0 if unknown.
@ -1200,7 +1200,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_total_samples_estimate(FLAC__Stream
* \c false if the encoder is already initialized, or if * \c false if the encoder is already initialized, or if
* \a num_blocks > 65535 if encoding to Ogg FLAC, else \c true. * \a num_blocks > 65535 if encoding to Ogg FLAC, else \c true.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_set_metadata(FLAC__StreamEncoder *encoder, FLAC__StreamMetadata **metadata, unsigned num_blocks); FLAC_API FLAC__bool FLAC__stream_encoder_set_metadata(FLAC__StreamEncoder *encoder, FLAC__StreamMetadata **metadata, uint32_t num_blocks);
/** Get the current encoder state. /** Get the current encoder state.
* *
@ -1254,7 +1254,7 @@ FLAC_API const char *FLAC__stream_encoder_get_resolved_state_string(const FLAC__
* \assert * \assert
* \code encoder != NULL \endcode * \code encoder != NULL \endcode
*/ */
FLAC_API void FLAC__stream_encoder_get_verify_decoder_error_stats(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got); FLAC_API void FLAC__stream_encoder_get_verify_decoder_error_stats(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_sample, uint32_t *frame_number, uint32_t *channel, uint32_t *sample, FLAC__int32 *expected, FLAC__int32 *got);
/** Get the "verify" flag. /** Get the "verify" flag.
* *
@ -1281,40 +1281,40 @@ FLAC_API FLAC__bool FLAC__stream_encoder_get_streamable_subset(const FLAC__Strea
* \param encoder An encoder instance to query. * \param encoder An encoder instance to query.
* \assert * \assert
* \code encoder != NULL \endcode * \code encoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See FLAC__stream_encoder_set_channels(). * See FLAC__stream_encoder_set_channels().
*/ */
FLAC_API unsigned FLAC__stream_encoder_get_channels(const FLAC__StreamEncoder *encoder); FLAC_API uint32_t FLAC__stream_encoder_get_channels(const FLAC__StreamEncoder *encoder);
/** Get the input sample resolution setting. /** Get the input sample resolution setting.
* *
* \param encoder An encoder instance to query. * \param encoder An encoder instance to query.
* \assert * \assert
* \code encoder != NULL \endcode * \code encoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See FLAC__stream_encoder_set_bits_per_sample(). * See FLAC__stream_encoder_set_bits_per_sample().
*/ */
FLAC_API unsigned FLAC__stream_encoder_get_bits_per_sample(const FLAC__StreamEncoder *encoder); FLAC_API uint32_t FLAC__stream_encoder_get_bits_per_sample(const FLAC__StreamEncoder *encoder);
/** Get the input sample rate setting. /** Get the input sample rate setting.
* *
* \param encoder An encoder instance to query. * \param encoder An encoder instance to query.
* \assert * \assert
* \code encoder != NULL \endcode * \code encoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See FLAC__stream_encoder_set_sample_rate(). * See FLAC__stream_encoder_set_sample_rate().
*/ */
FLAC_API unsigned FLAC__stream_encoder_get_sample_rate(const FLAC__StreamEncoder *encoder); FLAC_API uint32_t FLAC__stream_encoder_get_sample_rate(const FLAC__StreamEncoder *encoder);
/** Get the blocksize setting. /** Get the blocksize setting.
* *
* \param encoder An encoder instance to query. * \param encoder An encoder instance to query.
* \assert * \assert
* \code encoder != NULL \endcode * \code encoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See FLAC__stream_encoder_set_blocksize(). * See FLAC__stream_encoder_set_blocksize().
*/ */
FLAC_API unsigned FLAC__stream_encoder_get_blocksize(const FLAC__StreamEncoder *encoder); FLAC_API uint32_t FLAC__stream_encoder_get_blocksize(const FLAC__StreamEncoder *encoder);
/** Get the "mid/side stereo coding" flag. /** Get the "mid/side stereo coding" flag.
* *
@ -1341,20 +1341,20 @@ FLAC_API FLAC__bool FLAC__stream_encoder_get_loose_mid_side_stereo(const FLAC__S
* \param encoder An encoder instance to query. * \param encoder An encoder instance to query.
* \assert * \assert
* \code encoder != NULL \endcode * \code encoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See FLAC__stream_encoder_set_max_lpc_order(). * See FLAC__stream_encoder_set_max_lpc_order().
*/ */
FLAC_API unsigned FLAC__stream_encoder_get_max_lpc_order(const FLAC__StreamEncoder *encoder); FLAC_API uint32_t FLAC__stream_encoder_get_max_lpc_order(const FLAC__StreamEncoder *encoder);
/** Get the quantized linear predictor coefficient precision setting. /** Get the quantized linear predictor coefficient precision setting.
* *
* \param encoder An encoder instance to query. * \param encoder An encoder instance to query.
* \assert * \assert
* \code encoder != NULL \endcode * \code encoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See FLAC__stream_encoder_set_qlp_coeff_precision(). * See FLAC__stream_encoder_set_qlp_coeff_precision().
*/ */
FLAC_API unsigned FLAC__stream_encoder_get_qlp_coeff_precision(const FLAC__StreamEncoder *encoder); FLAC_API uint32_t FLAC__stream_encoder_get_qlp_coeff_precision(const FLAC__StreamEncoder *encoder);
/** Get the qlp coefficient precision search flag. /** Get the qlp coefficient precision search flag.
* *
@ -1391,30 +1391,30 @@ FLAC_API FLAC__bool FLAC__stream_encoder_get_do_exhaustive_model_search(const FL
* \param encoder An encoder instance to query. * \param encoder An encoder instance to query.
* \assert * \assert
* \code encoder != NULL \endcode * \code encoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See FLAC__stream_encoder_set_min_residual_partition_order(). * See FLAC__stream_encoder_set_min_residual_partition_order().
*/ */
FLAC_API unsigned FLAC__stream_encoder_get_min_residual_partition_order(const FLAC__StreamEncoder *encoder); FLAC_API uint32_t FLAC__stream_encoder_get_min_residual_partition_order(const FLAC__StreamEncoder *encoder);
/** Get maximum residual partition order setting. /** Get maximum residual partition order setting.
* *
* \param encoder An encoder instance to query. * \param encoder An encoder instance to query.
* \assert * \assert
* \code encoder != NULL \endcode * \code encoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See FLAC__stream_encoder_set_max_residual_partition_order(). * See FLAC__stream_encoder_set_max_residual_partition_order().
*/ */
FLAC_API unsigned FLAC__stream_encoder_get_max_residual_partition_order(const FLAC__StreamEncoder *encoder); FLAC_API uint32_t FLAC__stream_encoder_get_max_residual_partition_order(const FLAC__StreamEncoder *encoder);
/** Get the Rice parameter search distance setting. /** Get the Rice parameter search distance setting.
* *
* \param encoder An encoder instance to query. * \param encoder An encoder instance to query.
* \assert * \assert
* \code encoder != NULL \endcode * \code encoder != NULL \endcode
* \retval unsigned * \retval uint32_t
* See FLAC__stream_encoder_set_rice_parameter_search_dist(). * See FLAC__stream_encoder_set_rice_parameter_search_dist().
*/ */
FLAC_API unsigned FLAC__stream_encoder_get_rice_parameter_search_dist(const FLAC__StreamEncoder *encoder); FLAC_API uint32_t FLAC__stream_encoder_get_rice_parameter_search_dist(const FLAC__StreamEncoder *encoder);
/** Get the previously set estimate of the total samples to be encoded. /** Get the previously set estimate of the total samples to be encoded.
* The encoder merely mimics back the value given to * The encoder merely mimics back the value given to
@ -1747,7 +1747,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_finish(FLAC__StreamEncoder *encoder);
* encoder state with FLAC__stream_encoder_get_state() to see what * encoder state with FLAC__stream_encoder_get_state() to see what
* went wrong. * went wrong.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_process(FLAC__StreamEncoder *encoder, const FLAC__int32 * const buffer[], unsigned samples); FLAC_API FLAC__bool FLAC__stream_encoder_process(FLAC__StreamEncoder *encoder, const FLAC__int32 * const buffer[], uint32_t samples);
/** Submit data for encoding. /** Submit data for encoding.
* This version allows you to supply the input data where the channels * This version allows you to supply the input data where the channels
@ -1779,7 +1779,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_process(FLAC__StreamEncoder *encoder, c
* encoder state with FLAC__stream_encoder_get_state() to see what * encoder state with FLAC__stream_encoder_get_state() to see what
* went wrong. * went wrong.
*/ */
FLAC_API FLAC__bool FLAC__stream_encoder_process_interleaved(FLAC__StreamEncoder *encoder, const FLAC__int32 buffer[], unsigned samples); FLAC_API FLAC__bool FLAC__stream_encoder_process_interleaved(FLAC__StreamEncoder *encoder, const FLAC__int32 buffer[], uint32_t samples);
/* \} */ /* \} */

BIN
flac/lib/libFLAC.a
View file

Binary file not shown.