claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

unify inlining method in prep for inline tests

Browse Source
This commit is contained in:
Josh Coalson
2007-03-12 05:08:21 +00:00
parent 10a6840138
commit 14b184cced
5 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugin_common/dither.c
View File

@@ -32,19 +32,17 @@
#endif
#define max(a,b) ((a)>(b)?(a):(b))
#if defined _MSC_VER
#define FLAC__INLINE __inline
#else
#define FLAC__INLINE
#ifndef FLaC__INLINE
#define FLaC__INLINE
#endif
/* 32-bit pseudo-random number generator
*
* @@@ According to Miroslav, this one is poor quality, the one from the
* @@@ original replaygain code is much better
*/
static FLAC__INLINE FLAC__uint32 prng(FLAC__uint32 state)
static FLaC__INLINE FLAC__uint32 prng(FLAC__uint32 state)
{
return (state * 0x0019660dL + 0x3c6ef35fL) & 0xffffffffL;
}
@@ -56,7 +54,7 @@ typedef struct {
FLAC__int32 random;
} dither_state;
static FLAC__INLINE FLAC__int32 linear_dither(unsigned source_bps, unsigned target_bps, FLAC__int32 sample, dither_state *dither, const FLAC__int32 MIN, const FLAC__int32 MAX)
static FLaC__INLINE FLAC__int32 linear_dither(unsigned source_bps, unsigned target_bps, FLAC__int32 sample, dither_state *dither, const FLAC__int32 MIN, const FLAC__int32 MAX)
{
unsigned scalebits;
FLAC__int32 output, mask, random;

14
src/plugin_common/tags.c
View File

@@ -28,8 +28,12 @@
#include "FLAC/assert.h"
#include "FLAC/metadata.h"
#ifndef FLaC__INLINE
#define FLaC__INLINE
#endif
static __inline unsigned local__wide_strlen(const FLAC__uint16 *s)
static FLaC__INLINE unsigned local__wide_strlen(const FLAC__uint16 *s)
{
unsigned n = 0;
while(*s++)
@@ -43,7 +47,7 @@ static __inline unsigned local__wide_strlen(const FLAC__uint16 *s)
* and a more clear explanation at the end of this section:
* http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
*/
static __inline unsigned local__utf8len(const FLAC__byte *utf8)
static FLaC__INLINE unsigned local__utf8len(const FLAC__byte *utf8)
{
FLAC__ASSERT(0 != utf8);
if ((utf8[0] & 0x80) == 0) {
@@ -85,7 +89,7 @@ static __inline unsigned local__utf8len(const FLAC__byte *utf8)
}
static __inline unsigned local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
static FLaC__INLINE unsigned local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
{
const unsigned len = local__utf8len(utf8);
@@ -140,7 +144,7 @@ static FLAC__uint16 *local__convert_utf8_to_ucs2(const char *src, unsigned lengt
return out;
}
static __inline unsigned local__ucs2len(FLAC__uint16 ucs2)
static FLaC__INLINE unsigned local__ucs2len(FLAC__uint16 ucs2)
{
if (ucs2 < 0x0080)
return 1;
@@ -150,7 +154,7 @@ static __inline unsigned local__ucs2len(FLAC__uint16 ucs2)
return 3;
}
static __inline unsigned local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
static FLaC__INLINE unsigned local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
{
if (ucs2 < 0x080) {
utf8[0] = (FLAC__byte)ucs2;