summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Expand)AuthorAgeFilesLines
* Assign blame for playback wakelocks.Marco Nelissen2013-10-252-6/+19
* am 77177fa2: am 95c03858: Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-181-3/+7
|\
| * am 95c03858: Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-181-3/+7
| |\
| | * Allow releaseBuffer after flushGlenn Kasten2013-10-181-3/+7
* | | am b2059ff3: am f8f15b05: Merge "Fix race condition in AudioTrack::pause foll...Glenn Kasten2013-10-161-7/+8
|\ \ \ | |/ /
| * | am f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start...Glenn Kasten2013-10-161-7/+8
| |\ \ | | |/
| | * Merge "Fix race condition in AudioTrack::pause followed by start" into klp-devGlenn Kasten2013-10-171-7/+8
| | |\
| | | * Fix race condition in AudioTrack::pause followed by startGlenn Kasten2013-10-161-7/+8
* | | | am 7f8c3973: am 120a8847: Merge "AudioTrack: fix head position after restore"...Eric Laurent2013-10-162-1/+24
|\ \ \ \ | |/ / /
| * | | am 120a8847: Merge "AudioTrack: fix head position after restore" into klp-devEric Laurent2013-10-162-1/+24
| |\ \ \ | | |/ /
| | * | AudioTrack: fix head position after restoreEric Laurent2013-10-162-1/+24
| | |/
* | | am b930056e: am b3cb72a1: SoundPool: handle new audio track eventEric Laurent2013-10-141-2/+7
|\ \ \ | |/ /
| * | am b3cb72a1: SoundPool: handle new audio track eventEric Laurent2013-10-131-2/+7
| |\ \ | | |/
| | * SoundPool: handle new audio track eventEric Laurent2013-10-121-2/+7
* | | Merge "Fix AudioTrack pause followed by stop"Glenn Kasten2013-10-071-2/+1
|\ \ \
| * | | Fix AudioTrack pause followed by stopGlenn Kasten2013-09-291-2/+1
* | | | resolved conflicts for merge of 9a7d11f0 to masterGlenn Kasten2013-10-072-2/+19
|\ \ \ \ | | |/ / | |/| |
| * | | am fee4ce33: Merge "Cleanup openRecord error handling" into klp-devGlenn Kasten2013-10-072-2/+19
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Cleanup openRecord error handling" into klp-devGlenn Kasten2013-10-072-2/+19
| | |\ \
| | | * | Cleanup openRecord error handlingGlenn Kasten2013-09-242-2/+19
* | | | | am aa50cc78: am 56ce7260: IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-041-0/+34
|\ \ \ \ \ | |/ / / /
| * | | | am 56ce7260: IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-031-0/+34
| |\ \ \ \ | | |/ / /
| | * | | IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-031-0/+34
* | | | | am 3424d6e1: am 1adf20ce: Merge "fix volume and effect enable delay on offloa...Eric Laurent2013-10-012-0/+15
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am 1adf20ce: Merge "fix volume and effect enable delay on offloaded tracks" i...Eric Laurent2013-10-012-0/+15
| |\ \ \ | | |/ /
| | * | fix volume and effect enable delay on offloaded tracksEric Laurent2013-09-302-0/+15
* | | | am 8ee02943: am 1c7f35d1: Merge "soundpool: allocate shared memory heap by cl...Eric Laurent2013-09-244-53/+111
|\ \ \ \ | |/ / /
| * | | am 1c7f35d1: Merge "soundpool: allocate shared memory heap by client" into kl...Eric Laurent2013-09-244-53/+111
| |\ \ \ | | |/ /
| | * | soundpool: allocate shared memory heap by clientEric Laurent2013-09-244-53/+111
| | |/
* | | am c7b2f9dc: am 402dfba6: Merge "Add support for level measurements in Visual...Jean-Michel Trivi2013-09-241-0/+68
|\ \ \ | |/ /
| * | am 402dfba6: Merge "Add support for level measurements in Visualizer" into kl...Jean-Michel Trivi2013-09-231-0/+68
| |\ \ | | |/
| | * Merge "Add support for level measurements in Visualizer" into klp-devJean-Michel Trivi2013-09-231-0/+68
| | |\
| | | * Add support for level measurements in VisualizerJean-Michel Trivi2013-09-231-0/+68
* | | | am 3f079bb9: am 1d2536f4: Merge "AudioTrack: fix music resume" into klp-devEric Laurent2013-09-242-4/+6
|\ \ \ \ | |/ / /
| * | | am 1d2536f4: Merge "AudioTrack: fix music resume" into klp-devEric Laurent2013-09-232-4/+6
| |\ \ \ | | |/ /
| | * | AudioTrack: fix music resumeEric Laurent2013-09-232-4/+6
| | |/
* | | am e97d1ba9: am 4b701cc0: Merge "Revert "Workaround slow AudioTrack destructi...Glenn Kasten2013-09-201-23/+0
|\ \ \ | |/ /
| * | am 4b701cc0: Merge "Revert "Workaround slow AudioTrack destruction"" into klp...Glenn Kasten2013-09-201-23/+0
| |\ \ | | |/
| | * Merge "Revert "Workaround slow AudioTrack destruction"" into klp-devGlenn Kasten2013-09-201-23/+0
| | |\
| | | * Revert "Workaround slow AudioTrack destruction"Glenn Kasten2013-09-201-23/+0
* | | | am f2c643c8: am 3b3cfcfa: Merge "Fix slow AudioTrack and AudioRecord destruct...Glenn Kasten2013-09-202-48/+59
|\ \ \ \ | |/ / /
| * | | am 3b3cfcfa: Merge "Fix slow AudioTrack and AudioRecord destruction" into klp...Glenn Kasten2013-09-202-48/+59
| |\ \ \ | | |/ /
| | * | Fix slow AudioTrack and AudioRecord destructionGlenn Kasten2013-09-202-48/+59
| | |/
* | | am 88e0f302: am feb6d27b: Merge "Workaround slow AudioTrack destruction" into...Glenn Kasten2013-09-191-0/+23
|\ \ \ | |/ /
| * | am feb6d27b: Merge "Workaround slow AudioTrack destruction" into klp-devGlenn Kasten2013-09-191-0/+23
| |\ \ | | |/
| | * Workaround slow AudioTrack destructionGlenn Kasten2013-09-181-0/+23
* | | am 684e0ae8: am 9a98b6de: Merge "Partial fix for SoundPool not terminating" i...Glenn Kasten2013-09-181-2/+2
|\ \ \ | |/ /
| * | am 9a98b6de: Merge "Partial fix for SoundPool not terminating" into klp-devGlenn Kasten2013-09-181-2/+2
| |\ \ | | |/
| | * Partial fix for SoundPool not terminatingGlenn Kasten2013-09-181-2/+2
* | | am 11454092: am 18f86140: Merge "Fix underruns when fast track denied due to ...Glenn Kasten2013-09-172-37/+37
|\ \ \ | |/ /