summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge "Simplify and cleanup error handling in AudioRecord::getMinFrameCount"Glenn Kasten2014-02-252-17/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Simplify and cleanup error handling in AudioRecord::getMinFrameCountGlenn Kasten2014-02-252-17/+11
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge "Add log at entry to set() in AudioTrack and AudioRecord"Glenn Kasten2014-02-252-3/+10
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Add log at entry to set() in AudioTrack and AudioRecordGlenn Kasten2014-02-242-3/+10
| |/ / / / / / / /
* | | | | | | | | Merge "Advance read pointer before failing"Marco Nelissen2014-02-241-22/+47
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Advance read pointer before failingMarco Nelissen2014-02-241-22/+47
* | | | | | | | | Merge "The -O option now takes a CSV instead of a single value"Glenn Kasten2014-02-241-12/+81
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | The -O option now takes a CSV instead of a single valueGlenn Kasten2014-02-211-12/+81
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge "LiveSession refactor: reverted loop indice change."Robert Shih2014-02-241-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | LiveSession refactor: reverted loop indice change.Robert Shih2014-02-241-2/+1
* | | | | | | | | | Merge "camera2: Fix race with stream deletion during disconnect."Ruben Brunk2014-02-241-6/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | camera2: Fix race with stream deletion during disconnect.Ruben Brunk2013-12-051-6/+8
* | | | | | | | | | Merge "NuPlayer side support for seamless format switch."Robert Shih2014-02-243-1/+74
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | NuPlayer side support for seamless format switch.Robert Shih2014-02-243-1/+74
* | | | | | | | | | | Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback"Robert Shih2014-02-242-7/+157
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | stagefright: use CODECS field in EXT-X_STREAM-INF as fallbackRobert Shih2014-01-292-7/+157
* | | | | | | | | | | Merge "Add method to get redirected Uri"Marco Nelissen2014-02-243-0/+26
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add method to get redirected UriMarco Nelissen2014-02-213-0/+26
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "support for time lapse/slow motion when using SURFACE source"Chong Zhang2014-02-228-12/+118
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | support for time lapse/slow motion when using SURFACE sourceChong Zhang2014-02-148-12/+118
* | | | | | | | | | | Merge "Account for unreleased frames when predicting resampler needs"Glenn Kasten2014-02-221-20/+28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Account for unreleased frames when predicting resampler needsGlenn Kasten2014-02-211-20/+28
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Make tee sink work again"Glenn Kasten2014-02-212-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Make tee sink work againGlenn Kasten2014-02-212-2/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge "LiveSession refactor"Robert Shih2014-02-214-139/+93
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | LiveSession refactorRobert Shih2014-02-204-139/+93
* | | | | | | | | | | Merge "audioflinger: fix race condition in SyncEvent callback"Eric Laurent2014-02-213-7/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | audioflinger: fix race condition in SyncEvent callbackEric Laurent2014-02-203-7/+10
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | resolved conflicts for merge of aa0390b7 to masterMarco Nelissen2014-02-202-4/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | am 4ee5d2b9: Merge "LiveSession: Use the actual, possibly redirected url as b...Marco Nelissen2014-02-202-4/+13
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"Marco Nelissen2014-02-202-4/+13
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-01-102-4/+13
* | | | | | | | | | Allow specifying frames per call to resample()Glenn Kasten2014-02-191-3/+15
* | | | | | | | | | Merge "Fix resampler to allow output of single frame"Andy Hung2014-02-195-6/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix resampler to allow output of single frameAndy Hung2014-02-195-6/+38
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge "fix codec buffer leak in error handling when timestamp goes backward"Chong Zhang2014-02-191-7/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-02-141-7/+7
* | | | | | | | | | Merge "Handle recording failure more gracefully."Ruben Brunk2014-02-192-9/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle recording failure more gracefully.Ruben Brunk2014-02-182-9/+20
* | | | | | | | | | | Expand support for fragmented mp4Marco Nelissen2014-02-191-12/+27
* | | | | | | | | | | Merge "Fix crash when seeking fragmented mp4 files"Marco Nelissen2014-02-191-10/+17
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix crash when seeking fragmented mp4 filesMarco Nelissen2014-02-181-10/+17
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Simplify and remove old comment"Glenn Kasten2014-02-181-3/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Simplify and remove old commentGlenn Kasten2014-02-181-3/+1
* | | | | | | | | | | Multi-client recording continuedGlenn Kasten2014-02-183-47/+46
* | | | | | | | | | | Move handleSyncStartEvent and clearSyncStartEvent to RecordTrackGlenn Kasten2014-02-184-34/+33
* | | | | | | | | | | Add _l suffix to readInputParameters/OutputParametersGlenn Kasten2014-02-183-17/+17
* | | | | | | | | | | Multi-client recordingGlenn Kasten2014-02-186-319/+411
|/ / / / / / / / / /
* | | | | | | | | | Merge "Move StateQueueInstantiations to libinstantssq"Glenn Kasten2014-02-182-10/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move StateQueueInstantiations to libinstantssqGlenn Kasten2014-02-182-10/+19