summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Expand)AuthorAgeFilesLines
* am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-131-0/+14
|\
| * Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-081-0/+14
* | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-083-21/+82
|\ \ | |/
| * Use callbacks for Midi I/OMarco Nelissen2015-01-083-21/+82
* | am fb5d35c0: am 7ae3dfab: Merge "fix record from default input source" into l...Eric Laurent2015-01-071-4/+0
|\ \
| * | fix record from default input sourceEric Laurent2015-01-061-4/+0
* | | am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-051-2/+0
|\ \ \ | | |/ | |/|
| * | Remove hardcoded ICU & OpenSSL include paths.Narayan Kamath2015-01-051-2/+0
* | | am 0b87c0d9: am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-221-0/+1
|\ \ \ | |/ /
| * | Merge "Fix double close."Marco Nelissen2014-12-221-0/+1
| |\ \
| | * | Fix double close.Bao Haojun2014-05-171-0/+1
| * | | Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
| |\ \ \
| | * | | Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-081-0/+2
* | | | | am d33712d7: am 145cf5d8: Merge "audioflinger: implement pause/resume for dir...Eric Laurent2014-12-171-0/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | audioflinger: implement pause/resume for direct outputsEric Laurent2014-12-161-0/+5
* | | | | Merge commit 'f5a968a0' into mmGlenn Kasten2014-12-102-1/+59
|\ \ \ \ \ | |/ / / /
| * | | | audio policy: binder calls for dynamic audio policy mixesEric Laurent2014-12-092-1/+59
* | | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ...Eric Laurent2014-12-103-1/+125
|\ \ \ \ \ | |/ / / /
| * | | | audio policy: add support for custom mixesEric Laurent2014-12-093-1/+125
* | | | | am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-091-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-081-0/+2
| * | | | Track volume should be maintained even if track is restoredseunghak.han2014-12-051-1/+5
* | | | | am bde85d05: am 5458756a: Merge "Track volume should be maintained even if tr...Glenn Kasten2014-12-021-1/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Track volume should be maintained even if track is restoredseunghak.han2014-12-011-1/+5
| | |/ / | |/| |
* | | | am 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead of...Eric Laurent2014-11-274-39/+75
|\ \ \ \ | | |/ / | |/| |
| * | | AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-254-39/+75
* | | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy...Eric Laurent2014-11-264-223/+128
|\ \ \ \ | |/ / /
| * | | Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-devEric Laurent2014-11-264-223/+128
| |\ \ \
| | * | | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-254-223/+128
* | | | | am 1e18795a: am d325005e: Merge "Fix AudioTrack loop mode to play audio from ...Andy Hung2014-11-262-4/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix AudioTrack loop mode to play audio from buffer start" into lmp-mr1...Andy Hung2014-11-252-4/+9
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix AudioTrack loop mode to play audio from buffer startAndy Hung2014-11-242-4/+9
* | | | | am 1a475921: am 223fd5c9: audio: new routing strategies and stream typesEric Laurent2014-11-261-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | audio: new routing strategies and stream typesEric Laurent2014-11-211-1/+1
| |/ / /
* | | | am f8c2d166: am a7cf01da: Merge "Fix missing loop count for static tracks." i...Glenn Kasten2014-11-211-22/+38
|\ \ \ \ | |/ / /
| * | | Merge "Fix missing loop count for static tracks." into lmp-mr1-devGlenn Kasten2014-11-201-22/+38
| |\ \ \
| | * | | Fix missing loop count for static tracks.Andy Hung2014-11-181-22/+38
* | | | | am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr...Eric Laurent2014-11-211-43/+58
|\ \ \ \ \ | |/ / / /
| * | | | AudioSystem: fix cross deadlockEric Laurent2014-11-201-43/+58
* | | | | am cd370c79: am de14fae7: Merge "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
| |\ \ \ \
| | * | | | Use standard syntax to initialize fields.Chih-Hung Hsieh2014-11-141-712/+712
* | | | | | am 4fd641be: am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" int...Eric Laurent2014-11-191-37/+47
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-devEric Laurent2014-11-191-37/+47
| |\ \ \ \ \
| | * | | | | AudioSystem: Add mutex for output cacheEric Laurent2014-11-191-37/+47
* | | | | | | am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent routing to A2DP...Eric Laurent2014-11-181-0/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | audio policy: do not prevent routing to A2DP when suspended.Eric Laurent2014-11-171-0/+5
| |/ / / / /
* | | | | | am 26d92768: am 34c55e3e: Merge "No need to #include atomic-inline.h if you h...Elliott Hughes2014-11-171-1/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | No need to #include atomic-inline.h if you have atomic.h.Elliott Hughes2014-11-171-1/+0
* | | | | | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-171-12/+0
|\ \ \ \ \ \ | |/ / / / /
generated by cgit v1.1 at 2024-06-10 12:04:55 +0000