summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move fixed_fft to system/media/audio_utilsGlenn Kasten2012-01-173-168/+5
* Merge "Use audio_mode_t consistently"Glenn Kasten2012-01-1710-24/+24
|\
| * Use audio_mode_t consistentlyGlenn Kasten2012-01-1210-24/+24
* | Rename Visualizer::mLockGlenn Kasten2012-01-172-5/+5
* | Check stream type in AudioFlinger::createTrackGlenn Kasten2012-01-173-10/+14
* | Merge "Fix locking for mMasterVolume and mMute"Glenn Kasten2012-01-172-4/+15
|\ \
| * | Fix locking for mMasterVolume and mMuteGlenn Kasten2012-01-132-4/+15
* | | Merge "Use size_t for frame size"Glenn Kasten2012-01-177-14/+20
|\ \ \
| * | | Use size_t for frame sizeGlenn Kasten2012-01-137-14/+20
* | | | Merge "Use audio_stream_type_t consistently"Glenn Kasten2012-01-1722-128/+131
|\ \ \ \
| * | | | Use audio_stream_type_t consistentlyGlenn Kasten2012-01-1322-128/+131
| | |/ / | |/| |
* | | | Merge "AudioTrack and AudioFlinger send level cleanup"Glenn Kasten2012-01-173-7/+28
|\ \ \ \
| * | | | AudioTrack and AudioFlinger send level cleanupGlenn Kasten2012-01-133-7/+28
| |/ / /
* | | | Merge "media/mtp: Add missing LOCAL_C_INCLUDES"David 'Digit' Turner2012-01-131-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | media/mtp: Add missing LOCAL_C_INCLUDESDavid 'Digit' Turner2012-01-131-0/+3
* | | | am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Re...Jean-Baptiste Queru2012-01-13133-5071/+5071
|\ \ \ \ | |_|/ / |/| | |
| * | | am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing...Jean-Baptiste Queru2012-01-13133-5071/+5071
| |\ \ \
| | * \ \ am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"Jean-Baptiste Queru2012-01-13133-5071/+5071
| | |\ \ \
| | | * | | stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2012-01-12133-5071/+5071
* | | | | | Merge "Separate sniffing from session initialization"James Dong2012-01-1227-79/+231
|\ \ \ \ \ \
| * | | | | | Separate sniffing from session initializationJames Dong2012-01-1227-79/+231
| | |_|_|/ / | |/| | | |
* | | | | | Merge "Use audio_format_t consistently"Glenn Kasten2012-01-1210-44/+46
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Use audio_format_t consistentlyGlenn Kasten2012-01-0510-44/+46
* | | | | | am ce77af47: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-120-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-120-0/+0
| |\ \ \ \
| | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-110-0/+0
| | |\ \ \ \
* | | | | | | libmedia new can't fail on AndroidGlenn Kasten2012-01-116-28/+1
* | | | | | | Merge "Fix race in AudioSystem::getInputBufferSize"Glenn Kasten2012-01-111-9/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix race in AudioSystem::getInputBufferSizeGlenn Kasten2012-01-101-9/+14
* | | | | | | | Merge "Fix bug in JetPlayer::loadFromFile"Glenn Kasten2012-01-112-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug in JetPlayer::loadFromFileGlenn Kasten2012-01-102-3/+3
| |/ / / / / / /
* | | | | | | | Merge "Simplify range check for audio_mode_t"Glenn Kasten2012-01-113-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify range check for audio_mode_tGlenn Kasten2012-01-103-3/+3
| |/ / / / / / /
* | | | | | | | am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped play...Eric Laurent2012-01-111-0/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ic...Eric Laurent2012-01-111-0/+4
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | stagefright: limit audio gap for looped playbackEric Laurent2012-01-091-0/+4
* | | | | | | | Merge "Use correct type for hardware call state"Glenn Kasten2012-01-112-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Use correct type for hardware call stateGlenn Kasten2012-01-062-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "Declare IAudioTrack methods in binder opcode order"Glenn Kasten2012-01-112-14/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Declare IAudioTrack methods in binder opcode orderGlenn Kasten2012-01-062-14/+15
| |/ / / / / / /
* | | | | | | | Merge "Use consistent style of & reference for AutoMutex"Glenn Kasten2012-01-111-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Use consistent style of & reference for AutoMutexGlenn Kasten2012-01-061-3/+3
| |/ / / / / / /
* | | | | | | | Merge "Fix missing tag in mediaserver ServiceManager: log"Glenn Kasten2012-01-111-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix missing tag in mediaserver ServiceManager: logGlenn Kasten2012-01-061-0/+2
| |/ / / / / / /
* | | | | | | | Merge "AudioFlinger new can't fail"Glenn Kasten2012-01-111-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | AudioFlinger new can't failGlenn Kasten2012-01-061-2/+1
| |/ / / / / / /
* | | | | | | | Merge "Fix build warning"Glenn Kasten2012-01-111-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix build warningGlenn Kasten2012-01-061-1/+1
| |/ / / / / /
* | | | | | | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGESteve Block2012-01-094-7/+7
* | | | | | | Merge "By convention const goes before the type specifier"Glenn Kasten2012-01-095-23/+24
|\ \ \ \ \ \ \