Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am f4431278: am 19afb386: Merge "Remove streaming URI from default logs" | Marco Nelissen | 2014-03-12 | 5 | -6/+5 |
|\ | |||||
| * | am 19afb386: Merge "Remove streaming URI from default logs" | Marco Nelissen | 2014-03-12 | 5 | -6/+5 |
| |\ | |||||
| | * | Merge "Remove streaming URI from default logs" | Marco Nelissen | 2014-03-12 | 5 | -6/+5 |
| | |\ | |||||
| | | * | Remove streaming URI from default logs | David Williams | 2014-03-10 | 5 | -6/+5 |
| | |/ | |||||
* | | | am 708601d0: (-s ours) am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete... | Zhijun He | 2014-03-12 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ... | Zhijun He | 2014-03-11 | 1 | -0/+16 |
| |\ \ | |||||
| | * \ | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ... | Zhijun He | 2014-03-11 | 1 | -0/+16 |
| | |\ \ | |||||
| | | * | | DO NOT MERGE: Camera: delete preview callback when preview size is changed | Zhijun He | 2014-03-10 | 1 | -0/+16 |
* | | | | | Merge "MTP: Add support for device property changed events" | Mike Lockwood | 2014-03-12 | 3 | -2/+9 |
|\ \ \ \ \ | |||||
| * | | | | | MTP: Add support for device property changed events | Mike Lockwood | 2014-03-11 | 3 | -2/+9 |
* | | | | | | Merge "Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListeners" | Jesse Hall | 2014-03-11 | 4 | -0/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListeners | Jesse Hall | 2014-03-07 | 4 | -0/+18 |
* | | | | | | | Merge "LiveSession: fix incorrect stream key (subtitle"s")" | Robert Shih | 2014-03-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | LiveSession: fix incorrect stream key (subtitle"s") | Robert Shih | 2014-03-10 | 1 | -1/+1 |
* | | | | | | | | Merge "Convert AudioFlinger mSinkBuffer to flexible format" | Andy Hung | 2014-03-11 | 2 | -22/+41 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Convert AudioFlinger mSinkBuffer to flexible format | Andy Hung | 2014-03-10 | 2 | -22/+41 |
* | | | | | | | | | Merge "AudioTrack non-blocking write" | Jean-Michel Trivi | 2014-03-11 | 2 | -3/+7 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | AudioTrack non-blocking write | Jean-Michel Trivi | 2014-03-03 | 2 | -3/+7 |
* | | | | | | | | | M3UParser: trim spaces when parsing comma separated codecs. | Robert Shih | 2014-03-10 | 1 | -0/+1 |
* | | | | | | | | | Merge "Add mEffectBuffer to AudioFlinger" | Andy Hung | 2014-03-10 | 2 | -21/+110 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Add mEffectBuffer to AudioFlinger | Andy Hung | 2014-03-10 | 2 | -21/+110 |
* | | | | | | | | | Merge "Fix build warnings in fir" | Glenn Kasten | 2014-03-10 | 1 | -19/+19 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix build warnings in fir | Glenn Kasten | 2014-03-10 | 1 | -19/+19 |
* | | | | | | | | | | Merge "MPEG4Writer: replace timestamp asserts in threadEntry w err return." | Robert Shih | 2014-03-10 | 1 | -10/+42 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | MPEG4Writer: replace timestamp asserts in threadEntry w err return. | Robert Shih | 2014-02-24 | 1 | -10/+42 |
* | | | | | | | | | | | Merge "Stagefright: added WebM muxer." | Robert Shih | 2014-03-10 | 16 | -6/+2284 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Stagefright: added WebM muxer. | Robert Shih | 2014-03-06 | 16 | -6/+2284 |
* | | | | | | | | | | | | Fix freeze on pause | Marco Nelissen | 2014-03-10 | 1 | -1/+1 |
| |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | am 3a20f9af: am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return... | Eric Laurent | 2014-03-08 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playb... | Eric Laurent | 2014-03-08 | 2 | -3/+23 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| | * | | | | | | | | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"... | Eric Laurent | 2014-03-08 | 2 | -3/+23 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | |||||
| | | * | | | | | | | Merge "AudioTrack: When paused, return cached playback position" into klp-dev | Eric Laurent | 2014-03-08 | 2 | -3/+23 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | AudioTrack: When paused, return cached playback position | Haynes Mathew George | 2014-03-06 | 2 | -3/+23 |
* | | | | | | | | | | | Merge "httplive: clear access units before returning from seekTo." | Robert Shih | 2014-03-08 | 4 | -15/+42 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | httplive: clear access units before returning from seekTo. | Robert Shih | 2014-03-07 | 4 | -15/+42 |
* | | | | | | | | | | | | am 77a85ebe: am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end ... | Glenn Kasten | 2014-03-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race"... | Glenn Kasten | 2014-03-07 | 1 | -17/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev | Glenn Kasten | 2014-03-07 | 1 | -17/+15 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Merge "Simplify AudioTrack stream end and fix race" into klp-dev | Glenn Kasten | 2014-03-07 | 1 | -17/+15 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Simplify AudioTrack stream end and fix race | Glenn Kasten | 2014-03-07 | 1 | -17/+15 |
* | | | | | | | | | | | | | am ed043625: am 4293011d: am 5874615f: Allow for larger codec private data | Marco Nelissen | 2014-03-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | am 4293011d: am 5874615f: Allow for larger codec private data | Marco Nelissen | 2014-03-07 | 1 | -30/+50 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am 5874615f: Allow for larger codec private data | Marco Nelissen | 2014-03-07 | 1 | -30/+50 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Allow for larger codec private data | Marco Nelissen | 2014-03-07 | 1 | -30/+50 |
| | | |/ / / / / / / / | |||||
* | | | | | | | | | | | am 4106cdf1: am 03729fbe: am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 fi... | Marco Nelissen | 2014-03-07 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 03729fbe: am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-dev | Marco Nelissen | 2014-03-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-dev | Marco Nelissen | 2014-03-07 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Merge "Fix SIGABRT when playing mp4 file" into klp-dev | Marco Nelissen | 2014-03-07 | 1 | -0/+6 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Fix SIGABRT when playing mp4 file | Marco Nelissen | 2014-03-06 | 1 | -0/+6 |
* | | | | | | | | | | | | Merge "Miscellaneous cleanup for NBAIO" | Glenn Kasten | 2014-03-07 | 2 | -11/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ |