summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | am 0d843fdc: (-s ours) Merge "Fix typos, remove callback functions - do not m...Marco Nelissen2014-06-040-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Fix typos, remove callback functions - do not merge" into lmp-preview-devMarco Nelissen2014-06-048-20/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix typos, remove callback functions - do not mergeMarco Nelissen2014-06-038-20/+11
| | |/ / / / / / / /
* | | | | | | | | | am 61378ccb: Merge "DNG: Add additional TIFF/EP tag definitions." into lmp-pr...Ruben Brunk2014-06-040-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Merge "DNG: Add additional TIFF/EP tag definitions." into lmp-preview-devRuben Brunk2014-06-031-0/+48
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | DNG: Add additional TIFF/EP tag definitions.Ruben Brunk2014-06-021-0/+48
* | | | | | | | | DNG: Add additional TIFF/EP tag definitions.Ruben Brunk2014-06-041-0/+48
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | am b6af7c63: am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
| | |\ \ \ \ \ \
| | | * | | | | | Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
* | | | | | | | | Merge "Change parameter type for volume to float in AudioMixer"Andy Hung2014-06-024-46/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change parameter type for volume to float in AudioMixerAndy Hung2014-05-304-46/+41
* | | | | | | | | | Merge "Rename UNITY_GAIN to UNITY_GAIN_INT in AudioMixer"Andy Hung2014-06-023-8/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Rename UNITY_GAIN to UNITY_GAIN_INT in AudioMixerAndy Hung2014-05-303-8/+8
* | | | | | | | | | Merge "Use of fast capture by normal capture"Glenn Kasten2014-06-025-24/+317
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use of fast capture by normal captureGlenn Kasten2014-06-025-24/+317
* | | | | | | | | | | Merge "Refactor setVolumeRampVariables in AudioMixer"Andy Hung2014-06-021-30/+42
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| / / / / / / / / / | |/ / / / / / / / /
| * | | | | | | | | Refactor setVolumeRampVariables in AudioMixerAndy Hung2014-05-301-30/+42
* | | | | | | | | | Add mPrimaryOutputSampleRateGlenn Kasten2014-06-022-1/+7
* | | | | | | | | | am 62aaabb3: audio policy: fix unitialized hw module in audio portEric Laurent2014-06-022-1/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | audio policy: fix unitialized hw module in audio portEric Laurent2014-06-022-1/+4
* | | | | | | | | | Merge "MPEG4Extractor: guard against missing stbl."Robert Shih2014-06-021-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | MPEG4Extractor: guard against missing stbl.Robert Shih2014-05-191-1/+2
* | | | | | | | | | | Merge "Fix floating point output from mixer"Andy Hung2014-06-021-6/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix floating point output from mixerAndy Hung2014-05-301-6/+7
* | | | | | | | | | Merge "Disable verbose logging"Marco Nelissen2014-06-026-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Disable verbose loggingMarco Nelissen2014-05-306-6/+6
* | | | | | | | | | | Merge "Start adding FastCapture based on FastThread WIP"Glenn Kasten2014-06-016-1/+385
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Start adding FastCapture based on FastThread WIPGlenn Kasten2014-05-226-1/+385
* | | | | | | | | | | | am e1715a46: audio policy: add audio port gain controlEric Laurent2014-05-316-8/+176
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | audio policy: add audio port gain controlEric Laurent2014-05-306-8/+176
* | | | | | | | | | | | am 1afeecb8: audio policy: parse device descriptors in config fileEric Laurent2014-05-313-194/+561
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | audio policy: parse device descriptors in config fileEric Laurent2014-05-293-194/+561
* | | | | | | | | | | | resolved conflicts for merge of b52c152d to masterEric Laurent2014-05-3012-4/+407
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | audio policy: add routing update client interfaceEric Laurent2014-05-2912-4/+407
* | | | | | | | | | | | am 0289d545: am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | libcpustats: Turn on -WerrorMark Salyzyn2014-05-302-3/+4
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am 6a94d69d: audio policy: implement routing controlEric Laurent2014-05-305-96/+836
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | / / / / / / | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | audio policy: implement routing controlEric Laurent2014-05-295-96/+836
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge "Add multiple format capability to FastMixer"Andy Hung2014-05-303-6/+60
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add multiple format capability to FastMixerAndy Hung2014-05-293-6/+60
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "handle in and out audio device connection separately"Eric Laurent2014-05-301-9/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | handle in and out audio device connection separatelyEric Laurent2014-05-291-9/+1
* | | | | | | | | | | | Merge "Avoid resetting BufferProviders in mixer unnecessarily"Andy Hung2014-05-291-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Avoid resetting BufferProviders in mixer unnecessarilyAndy Hung2014-05-291-0/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "AAC decoder: compensate limiter delay"Jean-Michel Trivi2014-05-295-218/+973
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |