summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f4431278: am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-125-6/+5
|\
| * am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-125-6/+5
| |\
| | * Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-125-6/+5
| | |\
| | | * Remove streaming URI from default logsDavid Williams2014-03-105-6/+5
| | |/
* | | am 708601d0: (-s ours) am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete...Zhijun He2014-03-120-0/+0
|\ \ \ | |/ /
| * | am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ...Zhijun He2014-03-111-0/+16
| |\ \
| | * \ am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...Zhijun He2014-03-111-0/+16
| | |\ \
| | | * | DO NOT MERGE: Camera: delete preview callback when preview size is changedZhijun He2014-03-101-0/+16
* | | | | Merge "MTP: Add support for device property changed events"Mike Lockwood2014-03-123-2/+9
|\ \ \ \ \
| * | | | | MTP: Add support for device property changed eventsMike Lockwood2014-03-113-2/+9
* | | | | | Merge "Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListeners"Jesse Hall2014-03-114-0/+18
|\ \ \ \ \ \
| * | | | | | Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListenersJesse Hall2014-03-074-0/+18
* | | | | | | Merge "LiveSession: fix incorrect stream key (subtitle"s")"Robert Shih2014-03-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | LiveSession: fix incorrect stream key (subtitle"s")Robert Shih2014-03-101-1/+1
* | | | | | | | Merge "Convert AudioFlinger mSinkBuffer to flexible format"Andy Hung2014-03-112-22/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Convert AudioFlinger mSinkBuffer to flexible formatAndy Hung2014-03-102-22/+41
* | | | | | | | | Merge "AudioTrack non-blocking write"Jean-Michel Trivi2014-03-112-3/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | AudioTrack non-blocking writeJean-Michel Trivi2014-03-032-3/+7
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \