Mercurial > audlegacy-plugins
changeset 3006:169f6ee38cad
Defining C functions in headers is awkward, move to the one C file that actually uses it.
| author | Tony Vroon <chainsaw@gentoo.org> |
|---|---|
| date | Wed, 08 Apr 2009 22:30:45 +0100 |
| parents | 3d6a2732f26a |
| children | 7a7060caef14 |
| files | src/aac/libfaad2/bits.h src/aac/libfaad2/decoder.c src/aac/libfaad2/rvlc.c |
| diffstat | 3 files changed, 22 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aac/libfaad2/bits.h Wed Apr 08 22:16:01 2009 +0100 +++ b/src/aac/libfaad2/bits.h Wed Apr 08 22:30:45 2009 +0100 @@ -266,25 +266,6 @@ } } -static /*INLINE*/ uint32_t faad_getbits_rev(bitfile *ld, uint32_t n - DEBUGDEC) -{ - uint32_t ret; - - if (n == 0) - return 0; - - ret = faad_showbits_rev(ld, n); - faad_flushbits_rev(ld, n); - -#ifdef ANALYSIS - if (print) - fprintf(stdout, "%4d %2d bits, val: %4d, variable: %d %s\n", dbg_count++, n, ret, var, dbg); -#endif - - return ret; -} - #ifdef DRM /* CRC lookup table for G8 polynome in DRM standard */ static const uint8_t crc_table_G8[256] = {
--- a/src/aac/libfaad2/decoder.c Wed Apr 08 22:16:01 2009 +0100 +++ b/src/aac/libfaad2/decoder.c Wed Apr 08 22:30:45 2009 +0100 @@ -209,7 +209,7 @@ return 0; } - +#if 0 static int latmCheck(latm_header *latm, bitfile *ld) { uint32_t good=0, bad=0, bits, m; @@ -233,7 +233,7 @@ return (good>0); } - +#endif long NEAACDECAPI NeAACDecInit(NeAACDecHandle hpDecoder, unsigned char *buffer, @@ -839,7 +839,9 @@ uint32_t bitsconsumed; uint16_t frame_len; void *sample_buffer; +#if 0 uint32_t startbit=0, endbit=0, payload_bits=0; +#endif #ifdef PROFILE int64_t count = faad_get_ts();
--- a/src/aac/libfaad2/rvlc.c Wed Apr 08 22:16:01 2009 +0100 +++ b/src/aac/libfaad2/rvlc.c Wed Apr 08 22:30:45 2009 +0100 @@ -70,6 +70,24 @@ int8_t direction); static int8_t rvlc_huffman_esc(bitfile *ld_esc, int8_t direction); +static /*INLINE*/ uint32_t faad_getbits_rev(bitfile *ld, uint32_t n + DEBUGDEC) +{ + uint32_t ret; + + if (n == 0) + return 0; + + ret = faad_showbits_rev(ld, n); + faad_flushbits_rev(ld, n); + +#ifdef ANALYSIS + if (print) + fprintf(stdout, "%4d %2d bits, val: %4d, variable: %d %s\n", dbg_count++, n, ret, var, dbg); +#endif + + return ret; +} uint8_t rvlc_scale_factor_data(ic_stream *ics, bitfile *ld) {