summaryrefslogtreecommitdiffstats
path: root/services/audioflinger
Commit message (Expand)AuthorAgeFilesLines
* am 7b2b2675: am 67c93ad7: am f1b12df3: Merge "Trigger error only when a templ...Chih-Hung Hsieh2014-12-121-6/+3
|\
| * am 67c93ad7: am f1b12df3: Merge "Trigger error only when a template is instan...Chih-Hung Hsieh2014-12-121-6/+3
| |\
| | * Trigger error only when a template is instantiated.Chih-Hung Hsieh2014-12-111-6/+3
* | | am 2592184c: am 6baa8fe7: am 94a92c69: Merge "[audio][audioflinger] Consume a...Phil Burk2014-12-111-2/+7
|\ \ \ | |/ /
| * | am 6baa8fe7: am 94a92c69: Merge "[audio][audioflinger] Consume all frames whe...Phil Burk2014-12-111-2/+7
| |\ \
| | * \ Merge "[audio][audioflinger] Consume all frames when a DirectThread is done."...Phil Burk2014-12-111-2/+7
| | |\ \
| | | * | [audio][audioflinger] Consume all frames when a DirectThread is done.Phil Burk2014-12-101-2/+7
* | | | | am b279f5ad: am c49d9cda: am 2dda40d6: Merge "audio policy: add support for c...Eric Laurent2014-12-101-1/+7
|\ \ \ \ \ | |/ / / /
| * | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ...Eric Laurent2014-12-101-1/+7
| |\ \ \ \ | | |/ / /
| | * | | audio policy: add support for custom mixesEric Laurent2014-12-091-1/+7
| | |/ /
* | | | am 900f6535: am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload thr...Andy Hung2014-12-091-1/+2
|\ \ \ \ | |/ / /
| * | | am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload thread is not in...Andy Hung2014-12-081-1/+2
| |\ \ \ | | |/ /
| | * | Fix getTimestamp if offload thread is not initialized.Andy Hung2014-12-031-1/+2
* | | | am 0ed71389: am eb05bacc: am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is...Elliott Hughes2014-12-031-4/+1
|\ \ \ \ | |/ / /
| * | | am eb05bacc: am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true ...Elliott Hughes2014-12-031-4/+1
| |\ \ \ | | | |/ | | |/|
| | * | __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.Elliott Hughes2014-12-021-4/+1
* | | | am 121143d5: am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForA...Eric Laurent2014-11-262-5/+9
|\ \ \ \ | |/ / /
| * | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy...Eric Laurent2014-11-262-5/+9
| |\ \ \ | | | |/ | | |/|
| | * | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-252-5/+9
* | | | am 72215491: am 1a475921: am 223fd5c9: audio: new routing strategies and stre...Eric Laurent2014-11-265-18/+40
|\ \ \ \ | |/ / /
| * | | am 1a475921: am 223fd5c9: audio: new routing strategies and stream typesEric Laurent2014-11-265-18/+40
| |\ \ \ | | |/ /
| | * | audio: new routing strategies and stream typesEric Laurent2014-11-215-18/+40
| * | | am d48f1b68: am f50db74f: Merge "Fix format conversion in DuplicatingThread" ...Glenn Kasten2014-11-211-8/+8
| |\ \ \ | | |/ /
* | | | am c63c0973: am f50db74f: Merge "Fix format conversion in DuplicatingThread" ...Glenn Kasten2014-11-211-8/+8
|\ \ \ \
| * \ \ \ am f50db74f: Merge "Fix format conversion in DuplicatingThread" into lmp-mr1-devGlenn Kasten2014-11-211-8/+8
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Fix format conversion in DuplicatingThreadHaynes Mathew George2014-11-201-8/+8
* | | | am d0e12a16: am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-204-12/+16
|\ \ \ \ | |/ / /
| * | | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-204-12/+16
| |\ \ \ | | | |/ | | |/|
| | * | C++11 compatibility.Dan Albert2014-11-204-12/+16
* | | | Merge "Fix AudioMixer floating interaction with downmixer"Andy Hung2014-11-194-56/+136
|\ \ \ \
| * | | | Fix AudioMixer floating interaction with downmixerAndy Hung2014-11-074-56/+136
* | | | | Merge "Move AudioMixer buffer provider preparation into track"Andy Hung2014-11-192-74/+66
|\ \ \ \ \ | |/ / / /
| * | | | Move AudioMixer buffer provider preparation into trackAndy Hung2014-11-072-74/+66
* | | | | am 640228b8: am 9b323821: am e4044209: Merge "Disable clang++ due to compiler...Chih-Hung Hsieh2014-11-192-0/+12
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 9b323821: am e4044209: Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-192-0/+12
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-182-0/+12
| | |\ \ \
| | | * | | Disable clang++ due to compiler error.Chih-Hung Hsieh2014-11-142-0/+12
* | | | | | am a248703b: am a3e2c146: am 4d0a5985: Merge "Prevent stopped audio tracks fr...Andy Hung2014-11-181-8/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a3e2c146: am 4d0a5985: Merge "Prevent stopped audio tracks from mixing dat...Andy Hung2014-11-181-8/+9
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Prevent stopped audio tracks from mixing dataAndy Hung2014-11-171-8/+9
* | | | | | am f1b0c671: am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-a...Elliott Hughes2014-11-171-7/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-171-7/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-7/+0
| * | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-172-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-172-2/+2
| | | |/ / | | |/| |
* | | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-142-2/+2
* | | | | Merge "Include normal output track buffer depth in systrace"Glenn Kasten2014-11-141-0/+21
|\ \ \ \ \
| * | | | | Include normal output track buffer depth in systraceGlenn Kasten2014-11-101-0/+21
* | | | | | am 9226e7c5: am 2f702c9b: am 43e10bb7: Merge "Move to libc++."Dan Albert2014-11-111-14/+3
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am 2f702c9b: am 43e10bb7: Merge "Move to libc++."Dan Albert2014-11-111-14/+3
| |\ \ \ \ | | |/ / /