summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* New VHQ resamplerGlenn Kasten2012-11-272-0/+298
Squashed commit of the following: commit 12b6952da9f25e94d06dd7185bce255924e7e791 Author: Mathias Agopian <mathias@google.com> Date: Mon Nov 19 15:27:26 2012 -0800 fix a typo in SINC resampler that prevented tracks to be mixed we were always erasing the current mix instead of mixing into it. Change-Id: Ib229245f9e5a0d384f1727640a59e9f0469211a2 commit 0019ce082df430278f14ab922e900ce33b64897d Author: Dave Bort <dbort@google.com> Date: Tue Nov 13 01:30:32 2007 -0800 Rename "TARGET" to "MODULE" in the build system. Part one of the grand renaming. API_CHANGE: Third parties may need to update their makefiles. Any variables with "LOCAL" and "TARGET" in their names should now use "MODULE" instead of "TARGET"; e.g., LOCAL_MODULE, LOCAL_MODULE_TAGS. PRESUBMIT=passed OCL=39840 Change-Id: Ica9a7937d3d9552ab84db46ac6eea8a290e404fe Signed-off-by: Glenn Kasten <gkasten@google.com> commit f01adc0cef0e39e75c76d9195ac26a94cac0a100 Author: Glenn Kasten <gkasten@google.com> Date: Wed Nov 14 08:32:08 2012 -0800 Fix build warnings Change-Id: Ic43bcca166a529a6431711b05a7fa21849b6a38b commit 9bb031a565c753a03d9c9397edea318947d80528 Author: Mathias Agopian <mathias@google.com> Date: Sat Nov 10 04:44:30 2012 -0800 more optimizations... calculate the offsets from the phase differently, this happens to reduce the register pressure in the main loop, which in turns allows the compiler to generate much better code (doesn't need to spill a lot of stuff on the stack). this gives another 15% performance increase Change-Id: I2ce3479dd48b9e6941adb80e6d443d6e14d64d96 commit 5a951598f31217b8cd2babd0720c9608ee17291a Author: Mathias Agopian <mathias@google.com> Date: Sat Nov 10 03:26:39 2012 -0800 refactor code to improve neon code we want to make sure we don't transfer data from the neon unit to the arm register file, as this can be quite slow. instead we do all the calculation on the neon side and write the result directly to main memory. Change-Id: Ibb56664d3ab03098ae2798b75e2b6927ac900187 commit b381ee9e83bc9fd18986e79c7809841514ed590e Author: Mathias Agopian <mathias@google.com> Date: Sun Nov 4 15:16:13 2012 -0800 NEON optimized SINC resampler this currently gives us a 60% to 80% boost depending on the quality level selected. Change-Id: I7db385007e811ed7bffe5fd3403b44e300894f5b commit bea077354210242ea193a50b0dbab0fedab25df3 Author: Mathias Agopian <mathias@google.com> Date: Mon Nov 5 01:51:37 2012 -0800 minor cleanups Change-Id: Ia12ee4fb59e90221761bec85e6450db29197591f commit 8f4ed7decbe161a5ff38200b218f5216d80aba46 Author: Mathias Agopian <mathias@google.com> Date: Sun Nov 4 18:49:14 2012 -0800 improve resample test - handle stereo input - input file can now be ommited, in this case a linear chirp will be used automatically - better usage information Change-Id: I5d62a6c26a9054a1c1a517a065b4df5a2cdcda22 commit 5fcd634ea6cb4df27c495abe20f5f9b8ff55d128 Author: Mathias Agopian <mathias@google.com> Date: Sun Nov 4 02:03:49 2012 -0800 change how we store the FIR coefficients The coefficient table is now transposed and shows much better its polyphase nature: we now have a FIR per line, each line corresponding to a phase. This doesn't change at all the results produced by the filter, but allows us to make slightly better use of the data cache and improves performance a bit (although not as much as I thought it would). The main benefit is that it is the first step before we can make much larger optimizations (like using NEON). Change-Id: Iebf7695825dcbd41f25861efcaefbaa3365ecb43 commit d652231abf4c7e2ea1fc89caae730cec1f7259a1 Author: Mathias Agopian <mathias@google.com> Date: Sat Nov 3 23:37:53 2012 -0700 improve SINC resampler performance The improvement is about 60% by just tweaking a few things to help the compiler generate better code. It turns out that inlining too much stuff manually was hurting us. Change-Id: I8068f0f75051f95ac600e50ce552572dd1e8c304 commit 9dc68ef5b94c700c4ee68790e8cbb334c90a538d Author: Mathias Agopian <mathias@google.com> Date: Thu Nov 1 21:03:46 2012 -0700 new coefficients for the vhq resampler previous coefficients were provided by a 3rd party and didn't have a way to re-generate them. we're now using the 'fir' utility. the performance of the filter is virtually identical, except for the down-sampling case which seems slightly better now: It looks like both the previous and new coefficients are generating some sort of clipping for full-scale signals in the down-sampling case (although the new ones seem better), the reason for that is unknown (see bug: 7453062) Also updated the HQ coefficients for the down-samplers, previous ones were a little bit too conservative -- the new ones push the cut-off frequency up by about 1 KHz. Change-Id: I54a827b5c707c7cc41268ed01283758dce1d7647 commit 38e0b8560a6fc1b7124e22e0e09a84a285182f8e Author: Mathias Agopian <mathias@google.com> Date: Tue Oct 30 13:51:44 2012 -0700 fix SINC resampler on non ARM architectures make sure the C version of the code generates the same output than the ARM assemply version. Change-Id: Ide218785c35d02598b2d7278e646b1b178148698 commit a1878128b182696ba508569b4d211d0dfae92463 Author: Mathias Agopian <mathias@google.com> Date: Tue Oct 30 12:49:07 2012 -0700 fix another issue with generating FIR coefficients the impulse response of a low-pass is 2*f*sinc(2*pi*f*k), we were missing the 2*f scale factor. This explains why we were seeing clipping and had to manually scale the filter down. Change-Id: I86d0bb82ecdd99681c8ba5a8112a8257bf6f0186 commit 1a0fb993430acc9f601e6c538305bc407c20ac5d Author: Mathias Agopian <mathias@google.com> Date: Mon Oct 29 17:13:20 2012 -0700 fir a typo that caused up-sampling coefficiens to be wrong up-sample coefficient were generated with a cut-off frequency of 24KHz intead of ~20KHz, which caused more aliasing in the audible band. also increased the attenuation to 1.3 dB on both up and down sampling coefficient to avoid clipping. Change-Id: Ie8aeecf1429190541b656810c6716b6aae5ece2e commit 9520ad6862bd682ad075a9d9e3e94ada9f6e58b6 Author: Mathias Agopian <mathias@google.com> Date: Mon Oct 29 17:13:16 2012 -0700 test-resample: clip instead of overflowing Change-Id: I550e5a59e51c11e1095ca338222b094f92b96878 commit ba36656300f250f7f1fdeb75149749344260e6cb Author: Mathias Agopian <mathias@google.com> Date: Sun Oct 21 01:01:38 2012 -0700 a test app for the resamplers Change-Id: I66852d90d384f1d9e77b51ad1a1ebdbaf61d0607 commit 056a08b9bfd33cf27228c992adc8293a56b01be8 Author: Mathias Agopian <mathias@google.com> Date: Fri Oct 26 14:11:01 2012 -0700 reenable the cubic resampler cubic resampler was disabled because it hadn't been qualified, however after I did some tests, it does improve significantly the sound quality over the order-1 resampler, even if it is still quite bad. also HIGH_QUALITY resampler was partially disabled, it's now fully enabled. It's a big improvement over the cubic resampler in terms of aliasing noise (it's not as good in the pass-band). Change-Id: I70e3658c255896588642697be9eb594ff4ec0f8b commit 8c0241d3ff50ae85167f69b3bd369244894cfa44 Author: Mathias Agopian <mathias@google.com> Date: Fri Oct 26 13:48:42 2012 -0700 improve SINC resampler coefficients - we increase the interpolation precision from 4 to 7 bits this doesn't increase CPU power required, it only increases the size of the filter table but significantly reduces the noise introduced by the quantization of the impulse response. - the parameters of the filter are set such that aliasing is rejected at 80 dB below 20 KHz. Because we don't use a lot of coefficient (to save compute power), there are quite a bit of attenuation in the pass-band: starting at 9KHz for the down-sampler (48 to 44.1), and starting at 13 KHz for the up-sampler (44.1 to 48) -- the transition band is about 15 KHz. Change-Id: I855548d2aab8a0fb0d2a2da3a364b6842d7d3838 commit 69e7dab2192adc1f780464146810629ebd01b145 Author: Pixelflinger <mathias.agopian@gmail.com> Date: Thu Oct 25 19:43:49 2012 -0700 improve fir tool: cleanup, better default, bug fixes - all parameters can be changed on the command-line - added float output - added debug option - added an option to generate a polyphase filter coefficients - added an attenuation option in dBFS - added a lot of comments and references - fixed kaiser window parameter also the default should generate a filter with 80 dB rejection (of the 24 KHz aliasing) above 20 KHz and a 15 KHz transition band around ~20 KHz (for 48 KHz sampling rate). It's not very good but corresponds to the current code. commit 8347499d105a50257c18e9dac652e750b06428b1 Author: Glenn Kasten <gkasten@google.com> Date: Mon Oct 22 17:09:27 2012 -0700 Increase allowed number of VHQ resamplers to 3 Bug: 7378660 Change-Id: I69e33ca2eb4bb9bd38e2c63df62cd1130d68baf6 commit f91cf3cad7f5c4d52614271c89ab468741c5d24c Author: Mathias Agopian <mathias@google.com> Date: Sun Oct 21 03:04:05 2012 -0700 Fix a typo that caused the high quality resampler to produce garbage the problem is that if libaudio_resampler is present, it is those coefficients that will always be selected, but the correct meta-data. Bug: 7385994 Change-Id: Ieebeb37b4dfb62a1a051bc29fae2ce056dbc6621 commit e158a9e4262a174c59469a205658bc3ca4078234 Author: Dan Bornstein <danfuzz@google.com> Date: Fri Oct 3 10:34:57 2008 -0700 Manually merge change #111620 from tc3 to mainline, to keep the automerger from choking on it. p4 sync p4 integrate -r -b android_to_tc3 //...@111620,111620 p4 resolve -a p4 resolve # resolve a couple merge travesties PRESUBMIT=passed BUG=1399648 TBR=edheyl OCL=111902 Change-Id: I854b01553dd92bbf9c864f5a9bd51a3d665f0ac2 Signed-off-by: Glenn Kasten <gkasten@google.com> commit b9f3c26032be7a6ea01a10d93d94826f449e68ab Author: Dave Bort <dbort@google.com> Date: Fri Jan 18 14:51:05 2008 -0800 Rename "Makefile" to "Android.mk" throughout the tree. For <http://b/issue?id=960416>. I've tested this as much as I can, but 1500 open files = easy to mess things up. Please let me know if there's a problem rather than rolling back this change. PRESUBMIT=passed BUG=960416 TBR=joeo OCL=46537 Change-Id: I5a404caf0f398a7afa7ae7abaf2f2a1c6ab490eb Signed-off-by: Glenn Kasten <gkasten@google.com> commit 0c22a9a44c4103483fba1d944acf1354c5eb1617 Author: Mathias Agopian <mathias@google.com> Date: Mon Oct 29 23:44:25 2007 -0700 Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now. Change-Id: I50ac7e6c6702a427fa36ab6d976c507155057507 Signed-off-by: Glenn Kasten <gkasten@google.com> commit b85e41487983ad085b859acf8251e7e54480308a Author: Mathias Agopian <mathias@google.com> Date: Mon Oct 29 04:34:36 2007 -0700 A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time. Change-Id: I80eb5185e13ebdb907e0b85c49ba1272c23d60ec Signed-off-by: Glenn Kasten <gkasten@google.com> commit ba3949ef17cac2ba71cc3096c413782a49c922e5 Author: Mathias Agopian <mathias@google.com> Date: Thu Aug 23 21:01:28 2007 -0700 fix a few small typos in the FIR computation Change-Id: I6e56b514fe520f30f7487f85c64ea5d2a7c19b40 Signed-off-by: Glenn Kasten <gkasten@google.com> commit 7474bfa7de2604021963794dddfe44985648db6a Author: Mathias Agopian <mathias@google.com> Date: Thu Aug 23 03:16:02 2007 -0700 This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler. Change-Id: I99be2505139b8e0e7647200e1647509d4f7e6067 Signed-off-by: Glenn Kasten <gkasten@google.com> Bug: 7577965 Change-Id: I2c84a9283a1668723bad83e1a119c849c88c3e6b