summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Assign blame for playback wakelocks.Marco Nelissen2013-10-254-14/+33
* am de5f7cd6: am be567be3: Merge "Check for NULL buffer in repeat-latest" into...Andy McFadden2013-10-241-0/+17
|\
| * am be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-devAndy McFadden2013-10-241-0/+17
| |\
| | * Merge "Check for NULL buffer in repeat-latest" into klp-devAndy McFadden2013-10-241-0/+17
| | |\
| | | * Check for NULL buffer in repeat-latestAndy McFadden2013-10-231-0/+17
* | | | am 57c1f758: am f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into...Vineeta Srivastava2013-10-241-2/+2
|\ \ \ \ | |/ / /
| * | | am f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-devVineeta Srivastava2013-10-231-2/+2
| |\ \ \ | | |/ /
| | * | Merge "Fix kAutoRampDurationUs overflow issue" into klp-devVineeta Srivastava2013-10-231-2/+2
| | |\ \ | | | |/ | | |/|
| | | * Fix kAutoRampDurationUs overflow issueVineeta Srivastava2013-10-181-2/+2
* | | | am c20636f7: am e7329bd5: am d5255d1d: Merge "If dlopen("libwvm.so") fails, l...Elliott Hughes2013-10-231-1/+1
|\ \ \ \ | |/ / /
| * | | am e7329bd5: am d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason...Elliott Hughes2013-10-231-1/+1
| |\ \ \
| | * \ \ am d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."Elliott Hughes2013-10-231-1/+1
| | |\ \ \
| | | * | | If dlopen("libwvm.so") fails, log the reason why.Elliott Hughes2013-10-231-1/+1
* | | | | | am 173f0125: am 9857473f: am 0f4b0d23: Merge "libeffects: do not use GNU old-...Nick Kralevich2013-10-205-35/+35
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 9857473f: am 0f4b0d23: Merge "libeffects: do not use GNU old-style field d...Nick Kralevich2013-10-205-35/+35
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"Nick Kralevich2013-10-205-35/+35
| | |\ \ \ \ | | | |/ / /
| | | * | | libeffects: do not use GNU old-style field designatorssynergydev2013-10-195-35/+35
* | | | | | 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 694d0295: am 6fa20187: Make sure we get to discover that the cache is suff...Andreas Huber2013-10-171-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 6fa20187: Make sure we get to discover that the cache is sufficiently full...Andreas Huber2013-10-171-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Make sure we get to discover that the cache is sufficiently full againAndreas Huber2013-10-171-1/+1
* | | | | 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
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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 ace8947d: am d5766875: AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-161-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d5766875: AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-161-0/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-151-0/+6
| | |/ / /
* | | | | 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
* | | | | am 9e8d612c: am aab5b08c: AwesomePlayer: do not send events when paused.Eric Laurent2013-10-082-1/+13
|\ \ \ \ \ | |/ / / /
| * | | | am aab5b08c: AwesomePlayer: do not send events when paused.Eric Laurent2013-10-082-1/+13
| |\ \ \ \ | | |/ / /
| | * | | AwesomePlayer: do not send events when paused.Eric Laurent2013-10-082-1/+13
* | | | | 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 9e53ab09: am da0926af: Merge "TimedEventQueue takes a wake lock" into klp-devEric Laurent2013-10-043-3/+99
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am da0926af: Merge "TimedEventQueue takes a wake lock" into klp-devEric Laurent2013-10-043-3/+99
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "TimedEventQueue takes a wake lock" into klp-devEric Laurent2013-10-043-3/+99
| | |\ \ \ \ \
| | | * | | | | TimedEventQueue takes a wake lockEric Laurent2013-10-043-3/+99