summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Expand)AuthorAgeFilesLines
* am 66b17e9d: Merge commit \'f5a968a0\' into mmGlenn Kasten2014-12-102-1/+59
|\
| * 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 b279f5ad: am c49d9cda: am 2dda40d6: Merge "audio policy: add support for c...Eric Laurent2014-12-103-1/+125
|\ \ \ | |/ /
| * | 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
* | | Remove filename based writer constructorsMarco Nelissen2014-12-102-44/+0
|/ /
* | 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
|\ \ \ \ \ | |/ / / /
| * | | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-2/+0
* | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-1719-60/+60
|\ \ \ \ \
| * \ \ \ \ am 9b77083e: Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-1719-60/+60
| |\ \ \ \ \ | | |/ / / /
| | * | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1719-60/+60
| | | |/ / | | |/| |
| | * | | Resolve conflictThe Android Open Source Project2014-11-0636-2010/+5622
| | |\ \ \
* | | \ \ \ am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ...Eric Laurent2014-11-142-28/+15
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | remove AudioSystem::getOutputSamplingRateForAttr()Eric Laurent2014-11-122-28/+15
| | |_|_|/ | |/| | |
* | | | | am b177468b: Merge "Improve AudioTrack recovery from mediaserver death" into ...Glenn Kasten2014-11-072-19/+31
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-devGlenn Kasten2014-11-072-19/+31
| |\ \ \ \
| | * | | | Improve AudioTrack recovery from mediaserver deathGlenn Kasten2014-11-052-19/+31
* | | | | | am 7e88fac0: Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev au...Eric Laurent2014-11-071-15/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "AudioSystem: remove obsolete method." into lmp-mr1-devEric Laurent2014-11-071-15/+0
| |\ \ \ \ \
generated by cgit v1.1 at 2024-05-12 19:21:27 +0000