summaryrefslogtreecommitdiffstats
path: root/variablespeed
Commit message (Collapse)AuthorAgeFilesLines
* am 53691ed1: am 3696df84: am 552866a9: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-5/+0
|\ | | | | | | | | * commit '53691ed19b435c307ea0febd2be8e4dd77c43743': Remove unused LOCAL_LDLIBS.
| * am 3696df84: am 552866a9: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-071-5/+0
| |\ | | | | | | | | | | | | * commit '3696df848aa7c574f913c97c3bf415b634934048': Remove unused LOCAL_LDLIBS.
| | * am 552866a9: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-071-5/+0
| | |\ | | | | | | | | | | | | | | | | * commit '552866a940b27ca5b199846201650c61adc7e466': Remove unused LOCAL_LDLIBS.
| | | * Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-5/+0
| | |/ | |/| | | | | | | Change-Id: Ib380f4b91df6a01e666c9b9eef2d93d93c043fc0
| | * am 56bab444: Merge "AArch64: Fix GetChannelCount() declaration."Narayan Kamath2014-03-072-2/+2
| | |\ | | |/ | |/| | | | | | | * commit '56bab444c3bc89bb63aac728f549bd3261d01f6f': AArch64: Fix GetChannelCount() declaration.
| | * am 9ddd5eeb: Merge "AArch64: Minor JNI type changes"Narayan Kamath2014-03-071-8/+8
| | |\ | | | | | | | | | | | | | | | | * commit '9ddd5eebd43aeaeb2e5b366b497e7576ca5c3ef9': AArch64: Minor JNI type changes
| | * | Fix AudioEngine to allow re-initialization - DO NOT MERGEJay Shrauner2014-03-066-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add AudioEngine::CompareAndSetEngine and change VariableSpeed::initializeEngine to use this method so it only initializes a new engine once rather than asserting on subsequent calls. Change AudioEngine::DeleteEngine so it ignores repeated calls instead of asserting. Add VariableSpeed::isReadyToPlay so callers can detect when the audio library has been properly initialized. Bug:11511992 Change-Id: I4517cb2ab4c186da43dffc7dbc2a9ad49000059f (cherry picked from commit 8502b724a9fdc104e7b4a3aba1641e101b4c7be9)
* | | | Fix AudioEngine to allow re-initializationJay Shrauner2014-03-056-9/+33
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add AudioEngine::CompareAndSetEngine and change VariableSpeed::initializeEngine to use this method so it only initializes a new engine once rather than asserting on subsequent calls. Change AudioEngine::DeleteEngine so it ignores repeated calls instead of asserting. Add VariableSpeed::isReadyToPlay so callers can detect when the audio library has been properly initialized. Bug:11511992 Change-Id: I4517cb2ab4c186da43dffc7dbc2a9ad49000059f
* | | Merge "AArch64: Fix GetChannelCount() declaration."Narayan Kamath2014-02-142-2/+2
|\ \ \ | |_|/ |/| |
| * | AArch64: Fix GetChannelCount() declaration.Ashok Bhat2014-02-122-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | Two fixes [x] GetChannelCount() return type is size_t in the declaration and SLuint32 in the definition. It should be SLuint32 in both places. [x] CreateAndRealizeAudioPlayer has a size_t parameter channelCount. This should should be SLuint32 as the actual parameter is SLuint32. Change-Id: I64666e1cc6930bf0ea500974609305d6afb476bc Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* / AArch64: Minor JNI type changesAshok Bhat2014-02-121-8/+8
|/ | | | | Change-Id: I7c95da3b242c8276ae32ca152fdf7c4532cc42aa Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* Add liblogYing Wang2013-04-091-0/+1
| | | | | Bug: 8580410 Change-Id: I64962c4175c8bb6e98cdd39efd3982d55082c66d
* Initialize requested interfaces arrayGlenn Kasten2012-07-031-2/+2
| | | | | Bug: 6768181 Change-Id: Ic8ca44594aea8a0e50740fe69270464ccdd7da6c
* Fix buildGlenn Kasten2012-03-261-1/+1
| | | | Change-Id: I998b4503bbc6b8ce2149e6801548749a54b237b2
* Fix playback in variable speed audio.Hugo Hudson2011-09-091-7/+2
| | | | | | | | | | | | | - Recent changes to system/media broke variable speed playback. - Traced to http://go/android-cl/132098 which presumed that variable speed playback wasn't using the renamed sample rate field, but we had our own copy of the field (it wasn't previously available in the api). - This cl also fixes the TODO by removing our own copy of the fields, and using instead the defines from the OpenSL android api directly. Bug: 5282965 Change-Id: I58033e9299d26d6a05259e4d50708d27fc3fa7e1
* Enables detailed logging during variable speed playback.Flavio Lerda2011-09-051-2/+18
| | | | | | | | | | | | | | | | | | | This commit adds support for dynamically enabling logging in the variable speed library if log.tag.VariableSpeed is set. After this change, you can enable logging by running: adb shell setprop log.tag.VariableSpeed 1 Logging will be disabled after reboot or after running: adb shell setprop log.tag.VariableSpeed "" The logging in the library is quite verbose, so we do not want to enable it by default. Bug: 5253004 Change-Id: I3addde5552093eb0c4926b67245d578a7da0fb7a
* Allows selecting the audio stream used for playback.Flavio Lerda2011-09-018-15/+77
| | | | | | | | Adds setAudioStreamType() to the MediaPlayerProxy interface and implements it in the variable speed player. Bug: 5240848 Change-Id: I1bb9fdbee7aa6113c5d5d5a8000e9794800fad9f
* Fix the audio stutter during playback.Hugo Hudson2011-08-271-3/+3
| | | | | | | | - Was using the base pointer from callback context when I meant to be using the 'current position' pointer. Bug: 5114126 Change-Id: Ie9baded973672cd8ac7ffe0f16f1bdf22c8f1030
* Fix a rare crash.Hugo Hudson2011-08-102-2/+55
| | | | | | | | | | | | | | | | | | - Crash could be reproduced by seeking to the very end of a voicemail, playing the voicemail to see the ui reset to beginning, then increasing rate. - Reason was that during playback, insufficient data has been read to read the sample rate and channels, and in that situation the increase rate requires constructing the time scaler, which in turn requires a valid sample rate and channels. - Added a test to prove that the bug exists, and to prove the fix which is to ignore the rate change call when sample rate and channels not known. - Also added another unit test in the process to verify that it's safe to call set rate at any point during the life cycle of the player. Bug: 5140693 Change-Id: I474e5769f2b72762348534e4d06104af247e8726
* Prove that there's an issue with media player audio.Hugo Hudson2011-08-094-1/+13
| | | | | | | | | | | | | | | | | | - File format of files downloaded from GoogleVoice: MPEG ADTS, layer III, v2.5, 32 kbps, 8 kHz, Monaural - If we seek in that file before beginning playback, there is a very obvious triple/quadruple stutter. - This adds a unit test that plays such a file after seeking, which clearly demonstratest the stutter on my variable speed library. - This same test can be used to demonstrate the stutter with the regular MediaPlayer. Other: - Also adds the correct ADD_VOICEMAIL permission, which was renamed earlier. Bug: 5114126 Change-Id: I3dfaf7686c879076d9949047d91875010b6d8b52
* Playback now handles any sample rate and channel combo.Hugo Hudson2011-07-297-336/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main stuff - Delayed construction of audio player until after sample rate and channels have been read from the first callback. - Removed all sample rate and channels from outward facing api. - Remove pause playing and prefetch duration and sample rate hacky code. - Fixes handling of any sample rate by removing switch statement. - Fixes a HORRIBLE bug introduced in last cl where I was creating the callback context on the stack inside a method call, and using it a pointer to it long after the object had been erased from the stack. [worse yet: it still mostly worked fine!] Other - Fixes an obvious failure case of all tests - duh - I was calling setUp() before setting the executor properly, so they were giving NPEs. - Correct calculation of totalDuration now done on first decode callback. - This will let us remove MediaPlayer from prepare() in follow up. - Initializing the engine outside of the PlaybackRunnable, is cleaner. - Adds static methods for reading duration and position, again so that follow up can have accurate get current position rather than best guess. - Buffers in use for decoding also not created until first decode callback. - Introduces some wicked-cool OpenSL macro to log api calls, make the api calls and check the result value. Bug: 5048252 Bug: 5048257 Change-Id: I60705fa6c6ab29a35740f22bef76450e8c1d25a2
* Adds tests for Variable Speed code.Hugo Hudson2011-07-2515-87/+999
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test changes: - Adds many, many test cases against a MediaPlayerProxy, checking that it behaves to the contract of a MediaPlayer. - Adds the RealMediaPlayer class to check a real MediaPlayer. - Adds the VariableSpeed class, to check a VariableSpeed instance against the same contract as the MediaPlayer. - Adds an Android.mk for the unit tests. - Adds also an AndroidManifest.xml for the unit tests. - Adds some test asset media files (3gpp file and mp3 file). Required for the test changes: - Adds a DynamicProxy class to adapt a MediaPlayer as a MediaPlayerProxy class, i.e. to test the implementation of MediaPlayerProxy, required to avoid writing an adapter. - Adds a couple of listeners, OnErrorListener and OnCompletionListener, that can be waited for synchronously in unit tests. Improvements as a result of the tests: - During the testing, fixes the case where we weren't throwing IllegalStateException if asked for the duration on released player. - Refactored the create engine, create and realize output mix, create and realize audio player, get play interfaces and callbacks, all separated into their own static methods. - This allows me to create the audio player during the main while loop actually after the decoding has begun rather than before starting. This work is a precursor to using the decoder's report on sample rate and channels as the input to these methods. - slSampleRate and slOutputChannels no longer computed in the constructor, but computed when needed in the construction and realization of the audio player. Other changes: - Remove some overly verbose logs on getDuration() and getCurrentPosition(). - Adding the decoder interface to the callback. - Extract metadata from decoder method now takes the metadata interface, so this will be usable from the decoder callack in a follow up. - Temporarily stop getting the metadata out of the decoder, I'm going to be doing it on the decoding callback instead. - Renames the comment in AndroidManifest.xml to describe the correct invocation to run the common tests. Bug: 5048252 Bug: 5048257 Change-Id: Icdc18b19ef89c9924f73128b70aa4696b4e727c5
* Initial check-in of variable speed playback library.Hugo Hudson2011-07-1522-0/+3198
Contains an implementation of time-domain audio scaler, for pitch-invariant speed up and slow-down of audio. Contains wrapper library using OpenSLES to pump audio from encoded stream (mp3 file etc) through audio decoder then through time scaler and out to media player. This is written as a jni library with jni hooks to allow driving of this from the Java side. The other part of this cl is the Java wrapper. There is a new interface MediaPlayerProxy, containing a subset of the methods found on the MediaPlayer. The VariableSpeed class provides a concrete implementation of this interface adapting to the jni code. Change-Id: I518d8bf703488628c00730241a08ebfb67588ca6
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 15:34:11 +0000