summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* move audio policy service to a separate libraryEric Laurent2014-03-116-3/+47
* M3UParser: trim spaces when parsing comma separated codecs.Robert Shih2014-03-101-0/+1
* Merge "Add mEffectBuffer to AudioFlinger"Andy Hung2014-03-102-21/+110
|\
| * Add mEffectBuffer to AudioFlingerAndy Hung2014-03-102-21/+110
* | Merge "Fix build warnings in fir"Glenn Kasten2014-03-101-19/+19
|\ \
| * | Fix build warnings in firGlenn Kasten2014-03-101-19/+19
* | | Merge "MPEG4Writer: replace timestamp asserts in threadEntry w err return."Robert Shih2014-03-101-10/+42
|\ \ \
| * | | MPEG4Writer: replace timestamp asserts in threadEntry w err return.Robert Shih2014-02-241-10/+42
* | | | Merge "Stagefright: added WebM muxer."Robert Shih2014-03-1016-6/+2284
|\ \ \ \
| * | | | Stagefright: added WebM muxer.Robert Shih2014-03-0616-6/+2284
* | | | | Fix freeze on pauseMarco Nelissen2014-03-101-1/+1
| |_|/ / |/| | |
* | | | am 3a20f9af: am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return...Eric Laurent2014-03-080-0/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playb...Eric Laurent2014-03-082-3/+23
| |\ \ \
| | * \ \ am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"...Eric Laurent2014-03-082-3/+23
| | |\ \ \
| | | * \ \ Merge "AudioTrack: When paused, return cached playback position" into klp-devEric Laurent2014-03-082-3/+23
| | | |\ \ \
| | | | * | | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-062-3/+23
* | | | | | | Merge "httplive: clear access units before returning from seekTo."Robert Shih2014-03-084-15/+42
|\ \ \ \ \ \ \
| * | | | | | | httplive: clear access units before returning from seekTo.Robert Shih2014-03-074-15/+42
* | | | | | | | am 77a85ebe: am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end ...Glenn Kasten2014-03-070-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race"...Glenn Kasten2014-03-071-17/+15
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-071-17/+15
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-071-17/+15
| | | |\ \ \ \ \
| | | | * | | | | Simplify AudioTrack stream end and fix raceGlenn Kasten2014-03-071-17/+15
* | | | | | | | | am ed043625: am 4293011d: am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-070-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 4293011d: am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| | | |/ / / / /
* | | | | | | | am 4106cdf1: am 03729fbe: am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 fi...Marco Nelissen2014-03-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 03729fbe: am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-devMarco Nelissen2014-03-070-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-devMarco Nelissen2014-03-070-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Fix SIGABRT when playing mp4 file" into klp-devMarco Nelissen2014-03-071-0/+6
| | | |\ \ \ \ \
| | | | * | | | | Fix SIGABRT when playing mp4 fileMarco Nelissen2014-03-061-0/+6
* | | | | | | | | Merge "Miscellaneous cleanup for NBAIO"Glenn Kasten2014-03-072-11/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Miscellaneous cleanup for NBAIOGlenn Kasten2014-03-072-11/+2
* | | | | | | | | | am 9219bfc4: am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for A...Narayan Kamath2014-03-072-4/+7
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-072-4/+7
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-072-4/+7
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Check for ARCH_ARM_HAVE_NEON flag only for ARM archAshok Bhat2014-03-032-4/+7
* | | | | | | | | | | | am 3a46b975: am a9b82160: Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am a9b82160: Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | LP64 fixes for media/libeffectsAshok Bhat2014-02-2014-61/+62
* | | | | | | | | | | | | Merge "NBAIO::Format_from_SR_C requires audio_format_t parameter"Glenn Kasten2014-03-074-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | NBAIO::Format_from_SR_C requires audio_format_t parameterGlenn Kasten2014-03-074-6/+5
* | | | | | | | | | | | | am 31a98ad0: (-s ours) resolved conflicts for merge of 8d1caa02 to klp-modula...Narayan Kamath2014-03-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aospNarayan Kamath2014-03-079-252/+853
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d,...Lajos Molnar2014-03-0712-266/+893
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp...Lajos Molnar2014-03-0712-266/+893
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-03-062-4/+13
| | | | * | | | | | | | | | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-03-061-12/+22