Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename Visualizer::mLock | Glenn Kasten | 2012-01-17 | 2 | -5/+5 |
* | Check stream type in AudioFlinger::createTrack | Glenn Kasten | 2012-01-17 | 3 | -10/+14 |
* | Merge "Fix locking for mMasterVolume and mMute" | Glenn Kasten | 2012-01-17 | 2 | -4/+15 |
|\ | |||||
| * | Fix locking for mMasterVolume and mMute | Glenn Kasten | 2012-01-13 | 2 | -4/+15 |
* | | Merge "Use size_t for frame size" | Glenn Kasten | 2012-01-17 | 7 | -14/+20 |
|\ \ | |||||
| * | | Use size_t for frame size | Glenn Kasten | 2012-01-13 | 7 | -14/+20 |
* | | | Merge "Use audio_stream_type_t consistently" | Glenn Kasten | 2012-01-17 | 22 | -128/+131 |
|\ \ \ | |||||
| * | | | Use audio_stream_type_t consistently | Glenn Kasten | 2012-01-13 | 22 | -128/+131 |
| | |/ | |/| | |||||
* | | | Merge "AudioTrack and AudioFlinger send level cleanup" | Glenn Kasten | 2012-01-17 | 3 | -7/+28 |
|\ \ \ | |||||
| * | | | AudioTrack and AudioFlinger send level cleanup | Glenn Kasten | 2012-01-13 | 3 | -7/+28 |
| |/ / | |||||
* | | | Merge "media/mtp: Add missing LOCAL_C_INCLUDES" | David 'Digit' Turner | 2012-01-13 | 1 | -0/+3 |
|\ \ \ | |_|/ |/| | | |||||
| * | | media/mtp: Add missing LOCAL_C_INCLUDES | David 'Digit' Turner | 2012-01-13 | 1 | -0/+3 |
* | | | am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Re... | Jean-Baptiste Queru | 2012-01-13 | 133 | -5071/+5071 |
|\ \ \ | |_|/ |/| | | |||||
| * | | am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing... | Jean-Baptiste Queru | 2012-01-13 | 133 | -5071/+5071 |
| |\ \ | |||||
| | * \ | am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" | Jean-Baptiste Queru | 2012-01-13 | 133 | -5071/+5071 |
| | |\ \ | |||||
| | | * | | stagefright aacenc/amrwbenc: Remove trailing whitespace | Mans Rullgard | 2012-01-12 | 133 | -5071/+5071 |
* | | | | | Merge "Separate sniffing from session initialization" | James Dong | 2012-01-12 | 27 | -79/+231 |
|\ \ \ \ \ | |||||
| * | | | | | Separate sniffing from session initialization | James Dong | 2012-01-12 | 27 | -79/+231 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge "Use audio_format_t consistently" | Glenn Kasten | 2012-01-12 | 10 | -44/+46 |
|\ \ \ \ \ | |||||
| * | | | | | Use audio_format_t consistently | Glenn Kasten | 2012-01-05 | 10 | -44/+46 |
* | | | | | | am ce77af47: Reconcile with ics-mr1-release | The Android Open Source Project | 2012-01-12 | 0 | -0/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2012-01-12 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2012-01-11 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
* | | | | | | | libmedia new can't fail on Android | Glenn Kasten | 2012-01-11 | 6 | -28/+1 |
* | | | | | | | Merge "Fix race in AudioSystem::getInputBufferSize" | Glenn Kasten | 2012-01-11 | 1 | -9/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix race in AudioSystem::getInputBufferSize | Glenn Kasten | 2012-01-10 | 1 | -9/+14 |
* | | | | | | | | Merge "Fix bug in JetPlayer::loadFromFile" | Glenn Kasten | 2012-01-11 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix bug in JetPlayer::loadFromFile | Glenn Kasten | 2012-01-10 | 2 | -3/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "Simplify range check for audio_mode_t" | Glenn Kasten | 2012-01-11 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Simplify range check for audio_mode_t | Glenn Kasten | 2012-01-10 | 3 | -3/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped play... | Eric Laurent | 2012-01-11 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ic... | Eric Laurent | 2012-01-11 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | stagefright: limit audio gap for looped playback | Eric Laurent | 2012-01-09 | 1 | -0/+4 |
* | | | | | | | | Merge "Use correct type for hardware call state" | Glenn Kasten | 2012-01-11 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use correct type for hardware call state | Glenn Kasten | 2012-01-06 | 2 | -2/+2 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge "Declare IAudioTrack methods in binder opcode order" | Glenn Kasten | 2012-01-11 | 2 | -14/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Declare IAudioTrack methods in binder opcode order | Glenn Kasten | 2012-01-06 | 2 | -14/+15 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "Use consistent style of & reference for AutoMutex" | Glenn Kasten | 2012-01-11 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use consistent style of & reference for AutoMutex | Glenn Kasten | 2012-01-06 | 1 | -3/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "Fix missing tag in mediaserver ServiceManager: log" | Glenn Kasten | 2012-01-11 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix missing tag in mediaserver ServiceManager: log | Glenn Kasten | 2012-01-06 | 1 | -0/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "AudioFlinger new can't fail" | Glenn Kasten | 2012-01-11 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | AudioFlinger new can't fail | Glenn Kasten | 2012-01-06 | 1 | -2/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge "Fix build warning" | Glenn Kasten | 2012-01-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Fix build warning | Glenn Kasten | 2012-01-06 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE | Steve Block | 2012-01-09 | 4 | -7/+7 |
* | | | | | | | Merge "By convention const goes before the type specifier" | Glenn Kasten | 2012-01-09 | 5 | -23/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | By convention const goes before the type specifier | Glenn Kasten | 2012-01-06 | 5 | -23/+24 |
| |/ / / / / / | |||||
* | | | | | | | Use cached reference to media.player service | Glenn Kasten | 2012-01-09 | 1 | -5/+4 |
* | | | | | | | Merge "Replace loop by __builtin_ctz" | Glenn Kasten | 2012-01-09 | 1 | -9/+4 |
|\ \ \ \ \ \ \ |