summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Rename Visualizer::mLockGlenn Kasten2012-01-171-4/+4
* Merge "Use size_t for frame size"Glenn Kasten2012-01-172-4/+4
|\
| * Use size_t for frame sizeGlenn Kasten2012-01-132-4/+4
* | Merge "Use audio_stream_type_t consistently"Glenn Kasten2012-01-1710-57/+57
|\ \
| * | Use audio_stream_type_t consistentlyGlenn Kasten2012-01-1310-57/+57
* | | Merge "AudioTrack and AudioFlinger send level cleanup"Glenn Kasten2012-01-171-5/+5
|\ \ \
| * | | AudioTrack and AudioFlinger send level cleanupGlenn Kasten2012-01-131-5/+5
| |/ /
* | | 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
| |\ \
| | * | stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2012-01-12133-5071/+5071
* | | | Merge "Separate sniffing from session initialization"James Dong2012-01-1211-32/+82
|\ \ \ \
| * | | | Separate sniffing from session initializationJames Dong2012-01-1211-32/+82
| | |_|/ | |/| |
* | | | Merge "Use audio_format_t consistently"Glenn Kasten2012-01-126-32/+32
|\ \ \ \ | |/ / / |/| | |
| * | | Use audio_format_t consistentlyGlenn Kasten2012-01-056-32/+32
* | | | 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
| |/ /
* | | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGESteve Block2012-01-091-1/+1
* | | 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-0888-579/+579
* | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-0649-178/+178
* | | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-0542-144/+144
|\ \ \ | |/ / |/| |
| * | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-0442-144/+144
* | | 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-0312-42/+42
|/ /
* | 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
* | | | 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-141-1/+0
|\ \ \
| * | | Fix indentation and whitespaceGlenn Kasten2011-12-141-1/+0
| |/ /
* | | Merge "Audio C++ comments"Glenn Kasten2011-12-141-1/+1
|\ \ \