Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE | Steve Block | 2012-01-06 | 5 | -73/+73 |
* | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" | Steve Block | 2012-01-05 | 4 | -9/+9 |
|\ | |||||
| * | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE | Steve Block | 2012-01-04 | 4 | -9/+9 |
* | | Merge "Remove the notion of "active track" from mixer" | Glenn Kasten | 2012-01-05 | 3 | -81/+89 |
|\ \ | |||||
| * | | Remove the notion of "active track" from mixer | Glenn Kasten | 2011-12-20 | 3 | -81/+89 |
* | | | Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" | Glenn Kasten | 2012-01-05 | 4 | -45/+36 |
|\ \ \ | |||||
| * | | | Use the standard CC_LIKELY and CC_UNLIKELY macros | Glenn Kasten | 2012-01-05 | 4 | -45/+36 |
* | | | | resolved conflicts for merge of 1a4b9939 to master | 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 | 6 | -17/+17 |
| |/ / |/| | | |||||
* | | | 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 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | audio effects: rename configure command | Eric Laurent | 2011-12-19 | 1 | -1/+1 |
* | | | | 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 |
|/ / / / | |||||
* | | | | 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 |
| |/ / / | |||||
* | | | | 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 indentation and whitespace" | Glenn Kasten | 2011-12-14 | 2 | -54/+53 |
|\ \ \ | |||||
| * | | | Fix indentation and whitespace | Glenn Kasten | 2011-12-14 | 2 | -54/+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 | 2 | -4/+4 |
|\ \ \ | |||||
| * | | | Audio C++ comments | Glenn Kasten | 2011-12-14 | 2 | -4/+4 |
| |/ / | |||||
* | | | Merge "Use const char correctly in AudioFlinger" | Glenn Kasten | 2011-12-14 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | Use const char correctly in AudioFlinger | Glenn Kasten | 2011-12-14 | 1 | -3/+3 |
| |/ / | |||||
* | | | Merge "Use units after all times" | Glenn Kasten | 2011-12-14 | 1 | -10/+12 |
|\ \ \ | |||||
| * | | | Use units after all times | Glenn Kasten | 2011-12-14 | 1 | -10/+12 |
| |/ / | |||||
* | | | Merge "Remove redundant clear()" | Glenn Kasten | 2011-12-14 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | Remove redundant clear() | Glenn Kasten | 2011-12-14 | 1 | -1/+0 |
| |/ / | |||||
* | | | Fix includes | Glenn Kasten | 2011-12-14 | 2 | -3/+1 |
|/ / | |||||
* | | am 5433e25f: am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" ... | Eric Laurent | 2011-12-05 | 2 | -8/+14 |
|\ \ | |/ | |||||
| * | audioflinger: fix audio skipping over A2DP | Eric Laurent | 2011-12-05 | 2 | -8/+14 |
* | | Merge "Add camera focus move callback." | Wu-cheng Li | 2011-11-29 | 1 | -1/+1 |
|\ \ | |||||
| * | | Add camera focus move callback. | Wu-cheng Li | 2011-11-29 | 1 | -1/+1 |
* | | | am f6422f5f: am 20398fac: Merge "audioflinger: reduce sleep time to avoid und... | Eric Laurent | 2011-11-23 | 1 | -1/+23 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | audioflinger: reduce sleep time to avoid underrun | Eric Laurent | 2011-11-22 | 1 | -1/+23 |