Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix missing tag in mediaserver ServiceManager: log | Glenn Kasten | 2012-01-06 | 1 | -0/+2 |
* | Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" | Glenn Kasten | 2012-01-05 | 11 | -84/+66 |
|\ | |||||
| * | Use the standard CC_LIKELY and CC_UNLIKELY macros | Glenn Kasten | 2012-01-05 | 11 | -84/+66 |
* | | resolved conflicts for merge of 1a4b9939 to master | Eric Laurent | 2012-01-04 | 4 | -1/+30 |
|\ \ | |||||
| * \ | am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1 | Eric Laurent | 2012-01-04 | 4 | -1/+30 |
| |\ \ | |||||
| | * | | audioflinger: fix clicks on 48kHz audio. | Eric Laurent | 2011-12-22 | 4 | -1/+30 |
* | | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE | Steve Block | 2012-01-03 | 22 | -91/+91 |
| |_|/ |/| | | |||||
* | | | am 21cb1290: Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-20 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-20 | 0 | -0/+0 |
| |\ \ | |||||
| | * \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-12-16 | 0 | -0/+0 |
| | |\ \ | | | |/ | | |/| | |||||
* | | | | Merge "Remove dead code" | Glenn Kasten | 2011-12-20 | 2 | -5/+4 |
|\ \ \ \ | |||||
| * | | | | Remove dead code | Glenn Kasten | 2011-12-19 | 2 | -6/+4 |
* | | | | | Merge "audio effects: rename configure command" | Eric Laurent | 2011-12-19 | 8 | -76/+264 |
|\ \ \ \ \ | |||||
| * | | | | | audio effects: rename configure command | Eric Laurent | 2011-12-19 | 8 | -76/+264 |
* | | | | | | Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test fa... | Hong Teng | 2011-12-16 | 1 | -0/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed. | Hong Teng | 2011-12-16 | 1 | -0/+7 |
* | | | | | | | Merge "Use constants for 2 and 32" | Glenn Kasten | 2011-12-16 | 2 | -8/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use constants for 2 and 32 | Glenn Kasten | 2011-12-16 | 2 | -8/+8 |
* | | | | | | | | Merge "Extract out audio DSP code to utility library" | Glenn Kasten | 2011-12-16 | 4 | -117/+10 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Extract out audio DSP code to utility library | Glenn Kasten | 2011-12-16 | 4 | -117/+10 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge "Use switch in AudioMixer::setParameter" | Glenn Kasten | 2011-12-16 | 2 | -36/+49 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use switch in AudioMixer::setParameter | Glenn Kasten | 2011-12-16 | 2 | -36/+49 |
* | | | | | | | | deleteTrackName now asserts on bad input parameter | Glenn Kasten | 2011-12-16 | 1 | -17/+16 |
|/ / / / / / / | |||||
* | | | | | | | am 57ea96a4: Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-16 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-12-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | SurfaceMediaSource: use the HW_TEXTURE usage bit | Jamie Gennis | 2011-12-15 | 1 | -1/+3 |
| | * | | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-12-15 | 1 | -3/+1 |
| | * | | | | | SurfaceMediaSource: use the HW_TEXTURE usage bit | Jamie Gennis | 2011-12-15 | 1 | -1/+3 |
| | * | | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-12-14 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
* | | \ \ \ \ \ | Merge "setActiveTrack and setBufferProvider can't fail" | Glenn Kasten | 2011-12-16 | 2 | -10/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | setActiveTrack and setBufferProvider can't fail | Glenn Kasten | 2011-12-15 | 2 | -10/+9 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge "Simplify enable/disable mixing" | Glenn Kasten | 2011-12-16 | 3 | -30/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Simplify enable/disable mixing | Glenn Kasten | 2011-12-15 | 3 | -30/+15 |
| |/ / / / / / / | |||||
* | | | | | | | | am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage... | Dave Burke | 2011-12-15 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ic... | Dave Burke | 2011-12-15 | 1 | -1/+3 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | SurfaceMediaSource: use the HW_TEXTURE usage bit | Jamie Gennis | 2011-12-15 | 1 | -1/+3 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | Merge "Improve resistance to leaks for ConfigEvent" | Glenn Kasten | 2011-12-15 | 2 | -8/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Improve resistance to leaks for ConfigEvent | Glenn Kasten | 2011-12-15 | 2 | -8/+7 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge "Use NULL not 0 for pointers" | Glenn Kasten | 2011-12-15 | 3 | -29/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use NULL not 0 for pointers | Glenn Kasten | 2011-12-15 | 3 | -29/+29 |
| |/ / / / / | |||||
* | | | | | | Merge "Fix build error when verbose logging is enabled" | Glenn Kasten | 2011-12-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fix build error when verbose logging is enabled | Glenn Kasten | 2011-12-15 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge "Fix indentation and whitespace" | Glenn Kasten | 2011-12-14 | 3 | -55/+53 |
|\ \ \ \ \ | |||||
| * | | | | | Fix indentation and whitespace | Glenn Kasten | 2011-12-14 | 3 | -55/+53 |
| |/ / / / | |||||
* | | | | | Merge "Improve AudioFlinger error logging" | Glenn Kasten | 2011-12-14 | 1 | -3/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Improve AudioFlinger error logging | Glenn Kasten | 2011-12-14 | 1 | -3/+8 |
| |/ / / / | |||||
* | | | | | Merge "AudioMixer uninitialized simple fields" | Glenn Kasten | 2011-12-14 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | AudioMixer uninitialized simple fields | Glenn Kasten | 2011-12-14 | 1 | -0/+6 |
| |/ / / / | |||||
* | | | | | Merge "Audio C++ comments" | Glenn Kasten | 2011-12-14 | 6 | -63/+59 |
|\ \ \ \ \ | |||||
| * | | | | | Audio C++ comments | Glenn Kasten | 2011-12-14 | 6 | -63/+59 |
| |/ / / / |