summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use the standard CC_LIKELY and CC_UNLIKELY macrosGlenn Kasten2012-01-0511-84/+66
* am 21cb1290: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-200-0/+0
|\
| * Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-200-0/+0
| |\
| | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-160-0/+0
| | |\
* | | \ Merge "Remove dead code"Glenn Kasten2011-12-202-5/+4
|\ \ \ \
| * | | | Remove dead codeGlenn Kasten2011-12-192-6/+4
* | | | | Merge "audio effects: rename configure command"Eric Laurent2011-12-198-76/+264
|\ \ \ \ \
| * | | | | audio effects: rename configure commandEric Laurent2011-12-198-76/+264
* | | | | | Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test fa...Hong Teng2011-12-161-0/+7
|\ \ \ \ \ \
| * | | | | | Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed.Hong Teng2011-12-161-0/+7
* | | | | | | Merge "Use constants for 2 and 32"Glenn Kasten2011-12-162-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Use constants for 2 and 32Glenn Kasten2011-12-162-8/+8
* | | | | | | | Merge "Extract out audio DSP code to utility library"Glenn Kasten2011-12-164-117/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Extract out audio DSP code to utility libraryGlenn Kasten2011-12-164-117/+10
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Use switch in AudioMixer::setParameter"Glenn Kasten2011-12-162-36/+49
|\ \ \ \ \ \ \
| * | | | | | | Use switch in AudioMixer::setParameterGlenn Kasten2011-12-162-36/+49
* | | | | | | | deleteTrackName now asserts on bad input parameterGlenn Kasten2011-12-161-17/+16
|/ / / / / / /
* | | | | | | am 57ea96a4: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-160-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-151-3/+1
| | * | | | | SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-140-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge "setActiveTrack and setBufferProvider can't fail"Glenn Kasten2011-12-162-10/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | setActiveTrack and setBufferProvider can't failGlenn Kasten2011-12-152-10/+9
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "Simplify enable/disable mixing"Glenn Kasten2011-12-163-30/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify enable/disable mixingGlenn Kasten2011-12-153-30/+15
| |/ / / / / / /
* | | | | | | | am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage...Dave Burke2011-12-151-1/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ic...Dave Burke2011-12-151-1/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
| | | |/ / / | | |/| | |
* | | | | | Merge "Improve resistance to leaks for ConfigEvent"Glenn Kasten2011-12-152-8/+7
|\ \ \ \ \ \
| * | | | | | Improve resistance to leaks for ConfigEventGlenn Kasten2011-12-152-8/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge "Use NULL not 0 for pointers"Glenn Kasten2011-12-153-29/+29
|\ \ \ \ \ \
| * | | | | | Use NULL not 0 for pointersGlenn Kasten2011-12-153-29/+29
| |/ / / / /
* | | | | | Merge "Fix build error when verbose logging is enabled"Glenn Kasten2011-12-151-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix build error when verbose logging is enabledGlenn Kasten2011-12-151-1/+1
| |/ / / /
* | | | | Merge "Fix indentation and whitespace"Glenn Kasten2011-12-143-55/+53
|\ \ \ \ \
| * | | | | Fix indentation and whitespaceGlenn Kasten2011-12-143-55/+53
| |/ / / /
* | | | | Merge "Improve AudioFlinger error logging"Glenn Kasten2011-12-141-3/+8
|\ \ \ \ \
| * | | | | Improve AudioFlinger error loggingGlenn Kasten2011-12-141-3/+8
| |/ / / /
* | | | | Merge "AudioMixer uninitialized simple fields"Glenn Kasten2011-12-141-0/+6
|\ \ \ \ \
| * | | | | AudioMixer uninitialized simple fieldsGlenn Kasten2011-12-141-0/+6
| |/ / / /
* | | | | Merge "Audio C++ comments"Glenn Kasten2011-12-146-63/+59
|\ \ \ \ \
| * | | | | Audio C++ commentsGlenn Kasten2011-12-146-63/+59
| |/ / / /
* | | | | am b14436d0: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-140-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-140-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Revert the following patches because they may lead to power regression becaus...James Dong2011-12-147-84/+27
* | | | | Merge "Remove unnecessary this->"Glenn Kasten2011-12-141-15/+15
|\ \ \ \ \
| * | | | | Remove unnecessary this->Glenn Kasten2011-12-141-15/+15
| | |_|/ / | |/| | |
* | | | | Merge "Use const char correctly in AudioFlinger"Glenn Kasten2011-12-141-3/+3
|\ \ \ \ \