summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Use audio_format_t consistently"Glenn Kasten2012-01-128-36/+36
|\
| * Use audio_format_t consistentlyGlenn Kasten2012-01-058-36/+36
* | Merge "MediaScanner: Disable bulk insert for settings"Marco Nelissen2012-01-121-21/+33
|\ \
| * | MediaScanner: Disable bulk insert for settingsSungsoo Lim2012-01-111-21/+33
* | | 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-111-2/+2
|\ \ \
| * | | Fix bug in JetPlayer::loadFromFileGlenn Kasten2012-01-101-2/+2
| |/ /
* | | Merge "Simplify range check for audio_mode_t"Glenn Kasten2012-01-111-1/+1
|\ \ \
| * | | Simplify range check for audio_mode_tGlenn Kasten2012-01-101-1/+1
| |/ /
* | | am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped play...Eric Laurent2012-01-111-0/+4
|\ \ \
| * | | stagefright: limit audio gap for looped playbackEric Laurent2012-01-091-0/+4
* | | | Merge "Declare IAudioTrack methods in binder opcode order"Glenn Kasten2012-01-111-12/+12
|\ \ \ \
| * | | | Declare IAudioTrack methods in binder opcode orderGlenn Kasten2012-01-061-12/+12
| | |_|/ | |/| |
* | | | 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 "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE"Steve Block2012-01-101-1/+1
|\ \ \
| * | | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGESteve Block2012-01-091-1/+1
* | | | Fix buildGlenn Kasten2012-01-091-4/+3
|/ / /
* | | Audio Java doc comment typos and minor changesGlenn Kasten2012-01-094-29/+35
* | | Merge "Fix race conditions related to ringer mode"Glenn Kasten2012-01-091-35/+54
|\ \ \
| * | | Fix race conditions related to ringer modeGlenn Kasten2011-12-131-35/+54
* | | | Merge "Clean up AudioTrack::mActive and stopped()"Glenn Kasten2012-01-091-15/+18
|\ \ \ \
| * | | | Clean up AudioTrack::mActive and stopped()Glenn Kasten2012-01-051-15/+18
| | |/ / | |/| |
* | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-08102-754/+754
* | | | Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE"Steve Block2012-01-0654-188/+188
|\ \ \ \
| * | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-0654-188/+188
* | | | | Merge "Also accept non-parenthesized genre numbers"Marco Nelissen2012-01-061-6/+46
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Also accept non-parenthesized genre numbersMarco Nelissen2012-01-051-6/+46
| |/ / /
* | | | Merge "ThumbnailUtils: To fix misuse of FileInputStream."Marco Nelissen2012-01-051-1/+12
|\ \ \ \
| * | | | ThumbnailUtils: To fix misuse of FileInputStream.Dongwon Kang2012-01-051-1/+12
* | | | | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-0545-147/+147
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-0445-147/+147
| |/ / /
* | | | Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"Glenn Kasten2012-01-057-39/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Use the standard CC_LIKELY and CC_UNLIKELY macrosGlenn Kasten2012-01-057-39/+30
* | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-0315-48/+48
|/ / /
* | | AudioService: simplified handler messages.Eric Laurent2011-12-201-45/+66
* | | Merge "audio effects: rename configure command"Eric Laurent2011-12-197-75/+263
|\ \ \
| * | | audio effects: rename configure commandEric Laurent2011-12-197-75/+263
* | | | 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 "Extract out audio DSP code to utility library"Glenn Kasten2011-12-161-0/+1
|\ \ \ \ \
| * | | | | Extract out audio DSP code to utility libraryGlenn Kasten2011-12-161-0/+1
| | |_|/ / | |/| | |
* | | | | am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage...Dave Burke2011-12-151-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
* | | | 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-142-26/+25
|\ \ \
| * | | Fix indentation and whitespaceGlenn Kasten2011-12-142-26/+25
| |/ /