summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/fra...Steve Kondik2013-02-121-0/+6
|\
| * Logging to investigate a crashGlenn Kasten2012-12-071-0/+6
* | Squashed commit of updates from CodeAuroraMingming Yin2013-02-061-0/+4
|/
* Integrate improved coefficient sinc resampler: VHQGlenn Kasten2012-10-041-1/+13
* Communicate audio session ID to downmixerJean-Michel Trivi2012-09-101-2/+3
* am ff4c64d6: am c64a1787: Merge "Fix initialization of audio mixer track reso...Jean-Baptiste Queru2012-08-101-1/+5
|\
| * Fix initialization of audio mixer track resources for MIPS.Paul Lind2012-08-011-1/+5
* | Use audio_channel_mask_t more placesGlenn Kasten2012-07-101-1/+1
|/
* Fix multichannel downmix pause bug on video playerJean-Michel Trivi2012-04-181-20/+51
* Configure the resampler with the correct channel count when downmixingJean-Michel Trivi2012-04-181-2/+5
* AudioMixer new cmd: remove sample rate converterGlenn Kasten2012-04-161-10/+10
* AudioMixer: fix crash in destructorEric Laurent2012-04-161-0/+1
* AudioMixer uses downmix effect for multichannel contentJean-Michel Trivi2012-04-091-4/+217
* AudioMixer default track parametersGlenn Kasten2012-04-011-23/+33
* Merge "AudioMixer can be configured for fewer max tracks"Glenn Kasten2012-03-211-3/+6
|\
| * AudioMixer can be configured for fewer max tracksGlenn Kasten2012-03-201-3/+6
* | Merge "Update comments"Glenn Kasten2012-03-211-0/+4
|\ \
| * | Update commentsGlenn Kasten2012-03-191-0/+4
| |/
* | WhitespaceGlenn Kasten2012-03-191-1/+1
|/
* Clean up assertion checksGlenn Kasten2012-03-121-21/+18
* AudioBufferProvider comments and cleanupGlenn Kasten2012-02-241-2/+2
* Remove bit fields to improve performanceGlenn Kasten2012-02-171-1/+2
* Simplify codeGlenn Kasten2012-02-171-4/+4
* Upintegrate Audio Flinger changes from ICS_AAHJohn Grossman2012-02-161-16/+45
* Update commentsGlenn Kasten2012-02-141-1/+6
* Merge "AudioFlinger methods const and inline"Glenn Kasten2012-02-081-23/+2
|\
| * AudioFlinger methods const and inlineGlenn Kasten2012-02-031-23/+2
* | Use bool instead of intGlenn Kasten2012-02-031-17/+17
|/
* Use NULL not 0 for raw pointersGlenn Kasten2012-02-031-2/+2
* Constructor initialization and const fieldsGlenn Kasten2012-02-031-3/+5
* Unconditional deleteGlenn Kasten2012-01-271-3/+1
* Merge "Fix build warning"Glenn Kasten2012-01-111-1/+1
|\
| * Fix build warningGlenn Kasten2012-01-061-1/+1
* | Merge "By convention const goes before the type specifier"Glenn Kasten2012-01-091-10/+11
|\ \
| * | By convention const goes before the type specifierGlenn Kasten2012-01-061-10/+11
| |/
* | Merge "Replace loop by __builtin_ctz"Glenn Kasten2012-01-091-9/+4
|\ \
| * | Replace loop by __builtin_ctzGlenn Kasten2012-01-051-9/+4
| |/
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-1/+1
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-1/+1
* | Merge "Remove the notion of "active track" from mixer"Glenn Kasten2012-01-051-61/+63
|\ \ | |/ |/|
| * Remove the notion of "active track" from mixerGlenn Kasten2011-12-201-61/+63
* | Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"Glenn Kasten2012-01-051-18/+19
|\ \
| * | Use the standard CC_LIKELY and CC_UNLIKELY macrosGlenn Kasten2012-01-051-18/+19
* | | resolved conflicts for merge of 1a4b9939 to masterEric Laurent2012-01-041-0/+17
|\ \ \
| * | | audioflinger: fix clicks on 48kHz audio.Eric Laurent2011-12-221-0/+17
* | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-031-5/+5
| |/ / |/| |
* | | Merge "Remove dead code"Glenn Kasten2011-12-201-0/+2
|\ \ \ | |_|/ |/| |
| * | Remove dead codeGlenn Kasten2011-12-191-1/+2
* | | Merge "Use constants for 2 and 32"Glenn Kasten2011-12-161-3/+3
|\ \ \
| * | | Use constants for 2 and 32Glenn Kasten2011-12-161-3/+3