summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Expand)AuthorAgeFilesLines
...
| | * Remove MediaPlayerService::decode()Marco Nelissen2015-01-266-1251/+0
| * | 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
* | | Merge "Allow AUDIO_FORMAT_PCM_8_BIT AudioTrack buffers"Andy Hung2015-01-151-46/+15
|\ \ \
| * | | Allow AUDIO_FORMAT_PCM_8_BIT AudioTrack buffersAndy Hung2015-01-141-46/+15
* | | | Merge "Fix cumulative error in setPositionNotificationPeriod"Andy Hung2015-01-141-2/+3
|\ \ \ \ | |/ / /
| * | | Fix cumulative error in setPositionNotificationPeriodAndy Hung2015-01-071-2/+3
* | | | Merge "Move roundup from frameworks/av to system/media"Glenn Kasten2015-01-121-2/+0
|\ \ \ \
| * | | | Move roundup from frameworks/av to system/mediaGlenn Kasten2015-01-071-2/+0
* | | | | Merge "Event driven wake for AudioTrackThread notification changes"Andy Hung2015-01-072-3/+38
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Event driven wake for AudioTrackThread notification changesAndy Hung2015-01-062-3/+38
* | | | | Merge "Improve AudioTrack EVENT_LOOP_END and EVENT_BUFFER_END accuracy"Andy Hung2015-01-071-11/+40
|\ \ \ \ \ | |/ / / /
| * | | | Improve AudioTrack EVENT_LOOP_END and EVENT_BUFFER_END accuracyAndy Hung2015-01-061-11/+40
* | | | | Merge "Fix loop and position restoration in static AudioTracks"Andy Hung2015-01-072-46/+74
|\ \ \ \ \ | |/ / / /
| * | | | Fix loop and position restoration in static AudioTracksAndy Hung2015-01-062-46/+74
* | | | | Merge "Fix loop and position setting in static AudioTracks"Andy Hung2015-01-072-61/+140
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Fix loop and position setting in static AudioTracksAndy Hung2015-01-052-61/+140
* | | | am bb2e3e9d: am fb5d35c0: am 7ae3dfab: Merge "fix record from default input s...Eric Laurent2015-01-071-4/+0
|\ \ \ \ | | |/ / | |/| |
| * | | 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
* | | | | SoundPool: Do not stop AudioTrack on EVENT_NEW_IAUDIOTRACKAndy Hung2015-01-061-3/+4
| |_|/ / |/| | |
* | | | am 991aa3a7: am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL ...Narayan Kamath2015-01-051-2/+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
* | | | Cleanup annoying whitespace that causes red markersGlenn Kasten2015-01-021-1/+1
* | | | Merge "Flowchart for handling of AudioTrack client paused"Glenn Kasten2014-12-302-0/+75
|\ \ \ \
| * | | | Flowchart for handling of AudioTrack client pausedGlenn Kasten2014-12-302-0/+75
* | | | | Line length 100Glenn Kasten2014-12-306-24/+39
|/ / / /
* | | | Fix 64 bit compiler warnings in AudioTrackSharedAndy Hung2014-12-221-3/+3
* | | | am af318e28: am 0b87c0d9: am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-221-0/+1
|\ \ \ \ | |/ / /
| * | | 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
* | | | | | Merge "Remove explicit instantiation of SingleStateQueue"Andy Hung2014-12-223-145/+0
|\ \ \ \ \ \
| * | | | | | Remove explicit instantiation of SingleStateQueueAndy Hung2014-12-193-145/+0
* | | | | | | Replace MidiFile player with a Midi extractorMarco Nelissen2014-12-181-0/+14
* | | | | | | am 85aca658: am d33712d7: am 145cf5d8: Merge "audioflinger: implement pause/r...Eric Laurent2014-12-171-0/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
* | | | | | | Use callbacks for Midi I/OMarco Nelissen2014-12-163-21/+82
| |_|/ / / / |/| | | | |
* | | | | | 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