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

Improve endswapping (especially purge ntohl).

Browse Source
This commit is contained in:
Erik de Castro Lopo
2012-02-04 22:06:23 +11:00
parent a3f43aaa7c
commit a5d1d4f0c5
4 changed files with 58 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/libFLAC/bitwriter.c
View File

@@ -33,27 +33,13 @@
# include <config.h>
#endif
#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy(), memset() */
#ifdef _MSC_VER
# include <winsock.h> /* for ntohl() */
# if _MSC_VER >= 1310
# include <winsock2.h> /* for ntohl(), sometimes it is not in winsock.h */
# endif
#elif defined FLAC__SYS_DARWIN
# include <machine/endian.h> /* for ntohl() */
#elif defined __MINGW32__
# include <winsock.h> /* for ntohl() */
#else
# include <netinet/in.h> /* for ntohl() */
#endif
#if 0 /* UNUSED */
#include "private/bitmath.h"
#endif
#include <stdlib.h>
#include <string.h>
#include "private/bitwriter.h"
#include "private/crc.h"
#include "FLAC/assert.h"
#include "share/alloc.h"
#include "share/endswap.h"
/* Things should be fastest when this matches the machine word size */
/* WATCHOUT: if you change this you must also change the following #defines down to SWAP_BE_WORD_TO_HOST below to match */
@@ -66,11 +52,7 @@ typedef FLAC__uint32 bwword;
#if WORDS_BIGENDIAN
#define SWAP_BE_WORD_TO_HOST(x) (x)
#else
#ifdef _MSC_VER
#define SWAP_BE_WORD_TO_HOST(x) local_swap32_(x)
#else
#define SWAP_BE_WORD_TO_HOST(x) ntohl(x)
#endif
#define SWAP_BE_WORD_TO_HOST(x) ENDSWAP_INT(x)
#endif
/*
@@ -110,15 +92,6 @@ struct FLAC__BitWriter {
unsigned bits; /* # of used bits in accum */
};
#ifdef _MSC_VER
/* OPT: an MSVC built-in would be better */
static _inline FLAC__uint32 local_swap32_(FLAC__uint32 x)
{
x = ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF);
return (x>>16) | (x<<16);
}
#endif
/* * WATCHOUT: The current implementation only grows the buffer. */
static FLAC__bool bitwriter_grow_(FLAC__BitWriter *bw, unsigned bits_to_add)
{