diff options
| author | Steve Kondik <shade@chemlab.org> | 2014-07-25 05:33:22 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-07-25 05:33:22 -0700 |
| commit | a05c01b7806ce0ff2b110ad36dbfe5727cb8cd4f (patch) | |
| tree | a5d0d048e3976331e7001ed2eea256c67dc10b2a /libFLAC/bitmath.c | |
| parent | d3c04b5f963ef86e1aeb74656151f175aefa4c48 (diff) | |
| download | android_external_flac-a05c01b7806ce0ff2b110ad36dbfe5727cb8cd4f.tar.gz android_external_flac-a05c01b7806ce0ff2b110ad36dbfe5727cb8cd4f.tar.bz2 android_external_flac-a05c01b7806ce0ff2b110ad36dbfe5727cb8cd4f.zip | |
Upgrade to libFLAC 1.3.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0
Change-Id: Ibd991640b7c85a96f4d1a43381acd199a6d197fd
Diffstat (limited to 'libFLAC/bitmath.c')
| -rw-r--r-- | libFLAC/bitmath.c | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/libFLAC/bitmath.c b/libFLAC/bitmath.c index 27e25f0..e6b1f5e 100644 --- a/libFLAC/bitmath.c +++ b/libFLAC/bitmath.c @@ -1,5 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson + * Copyright (C) 2001-2009 Josh Coalson + * Copyright (C) 2011-2013 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -36,46 +37,6 @@ #include "private/bitmath.h" #include "FLAC/assert.h" -/* An example of what FLAC__bitmath_ilog2() computes: - * - * ilog2( 0) = assertion failure - * ilog2( 1) = 0 - * ilog2( 2) = 1 - * ilog2( 3) = 1 - * ilog2( 4) = 2 - * ilog2( 5) = 2 - * ilog2( 6) = 2 - * ilog2( 7) = 2 - * ilog2( 8) = 3 - * ilog2( 9) = 3 - * ilog2(10) = 3 - * ilog2(11) = 3 - * ilog2(12) = 3 - * ilog2(13) = 3 - * ilog2(14) = 3 - * ilog2(15) = 3 - * ilog2(16) = 4 - * ilog2(17) = 4 - * ilog2(18) = 4 - */ -unsigned FLAC__bitmath_ilog2(FLAC__uint32 v) -{ - unsigned l = 0; - FLAC__ASSERT(v > 0); - while(v >>= 1) - l++; - return l; -} - -unsigned FLAC__bitmath_ilog2_wide(FLAC__uint64 v) -{ - unsigned l = 0; - FLAC__ASSERT(v > 0); - while(v >>= 1) - l++; - return l; -} - /* An example of what FLAC__bitmath_silog2() computes: * * silog2(-10) = 5 |