Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | initialize encoder at start() time for camera source | Chong Zhang | 2014-02-26 | 2 | -5/+18 |
* | Merge "Update mReqFrameCount at same point in AudioTrack and AudioRecord" | Glenn Kasten | 2014-02-25 | 1 | -5/+5 |
|\ | |||||
| * | Update mReqFrameCount at same point in AudioTrack and AudioRecord | Glenn Kasten | 2014-02-24 | 1 | -5/+5 |
* | | am ed773ea8: am 8fc4d57d: Merge "Avoid a building error" | Glenn Kasten | 2014-02-25 | 1 | -1/+3 |
|\ \ | |||||
| * \ | am 8fc4d57d: Merge "Avoid a building error" | Glenn Kasten | 2014-02-25 | 1 | -1/+3 |
| |\ \ | |||||
| | * \ | Merge "Avoid a building error" | Glenn Kasten | 2014-02-25 | 1 | -1/+3 |
| | |\ \ | |||||
| | | * | | Avoid a building error | Chih-Wei Huang | 2013-01-10 | 1 | -1/+3 |
* | | | | | Merge "Fix 1:1 dynamic resampler rate setting" | Andy Hung | 2014-02-25 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Fix 1:1 dynamic resampler rate setting | Andy Hung | 2014-02-19 | 1 | -0/+4 |
* | | | | | | Merge "Permit AudioRecord to support non-linear formats in future" | Glenn Kasten | 2014-02-25 | 1 | -2/+5 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Permit AudioRecord to support non-linear formats in future | Glenn Kasten | 2014-02-24 | 1 | -2/+5 |
* | | | | | | Merge "Simplify and cleanup error handling in AudioRecord::getMinFrameCount" | Glenn Kasten | 2014-02-25 | 2 | -17/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Simplify and cleanup error handling in AudioRecord::getMinFrameCount | Glenn Kasten | 2014-02-25 | 2 | -17/+11 |
* | | | | | | | Merge "Add log at entry to set() in AudioTrack and AudioRecord" | Glenn Kasten | 2014-02-25 | 2 | -3/+10 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Add log at entry to set() in AudioTrack and AudioRecord | Glenn Kasten | 2014-02-24 | 2 | -3/+10 |
| |/ / / / / | |||||
* | | | | | | Merge "Advance read pointer before failing" | Marco Nelissen | 2014-02-24 | 1 | -22/+47 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Advance read pointer before failing | Marco Nelissen | 2014-02-24 | 1 | -22/+47 |
* | | | | | | | Merge "The -O option now takes a CSV instead of a single value" | Glenn Kasten | 2014-02-24 | 1 | -12/+81 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | The -O option now takes a CSV instead of a single value | Glenn Kasten | 2014-02-21 | 1 | -12/+81 |
* | | | | | | | | Merge "LiveSession refactor: reverted loop indice change." | Robert Shih | 2014-02-24 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | LiveSession refactor: reverted loop indice change. | Robert Shih | 2014-02-24 | 1 | -2/+1 |
* | | | | | | | | | Merge "camera2: Fix race with stream deletion during disconnect." | Ruben Brunk | 2014-02-24 | 1 | -6/+8 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | camera2: Fix race with stream deletion during disconnect. | Ruben Brunk | 2013-12-05 | 1 | -6/+8 |
* | | | | | | | | | Merge "NuPlayer side support for seamless format switch." | Robert Shih | 2014-02-24 | 3 | -1/+74 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | NuPlayer side support for seamless format switch. | Robert Shih | 2014-02-24 | 3 | -1/+74 |
* | | | | | | | | | | Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" | Robert Shih | 2014-02-24 | 2 | -7/+157 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | stagefright: use CODECS field in EXT-X_STREAM-INF as fallback | Robert Shih | 2014-01-29 | 2 | -7/+157 |
* | | | | | | | | | | Merge "Add method to get redirected Uri" | Marco Nelissen | 2014-02-24 | 3 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add method to get redirected Uri | Marco Nelissen | 2014-02-21 | 3 | -0/+26 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "support for time lapse/slow motion when using SURFACE source" | Chong Zhang | 2014-02-22 | 8 | -12/+118 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | support for time lapse/slow motion when using SURFACE source | Chong Zhang | 2014-02-14 | 8 | -12/+118 |
* | | | | | | | | | | Merge "Account for unreleased frames when predicting resampler needs" | Glenn Kasten | 2014-02-22 | 1 | -20/+28 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Account for unreleased frames when predicting resampler needs | Glenn Kasten | 2014-02-21 | 1 | -20/+28 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge "Make tee sink work again" | Glenn Kasten | 2014-02-21 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Make tee sink work again | Glenn Kasten | 2014-02-21 | 2 | -2/+3 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge "LiveSession refactor" | Robert Shih | 2014-02-21 | 4 | -139/+93 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | LiveSession refactor | Robert Shih | 2014-02-20 | 4 | -139/+93 |
* | | | | | | | | | | Merge "audioflinger: fix race condition in SyncEvent callback" | Eric Laurent | 2014-02-21 | 3 | -7/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | audioflinger: fix race condition in SyncEvent callback | Eric Laurent | 2014-02-20 | 3 | -7/+10 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | resolved conflicts for merge of aa0390b7 to master | Marco Nelissen | 2014-02-20 | 2 | -4/+13 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | am 4ee5d2b9: Merge "LiveSession: Use the actual, possibly redirected url as b... | Marco Nelissen | 2014-02-20 | 2 | -4/+13 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U" | Marco Nelissen | 2014-02-20 | 2 | -4/+13 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | LiveSession: Use the actual, possibly redirected url as base in the M3U | Martin Storsjo | 2014-01-10 | 2 | -4/+13 |
* | | | | | | | | | | Allow specifying frames per call to resample() | Glenn Kasten | 2014-02-19 | 1 | -3/+15 |
* | | | | | | | | | | Merge "Fix resampler to allow output of single frame" | Andy Hung | 2014-02-19 | 5 | -6/+38 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix resampler to allow output of single frame | Andy Hung | 2014-02-19 | 5 | -6/+38 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge "fix codec buffer leak in error handling when timestamp goes backward" | Chong Zhang | 2014-02-19 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | fix codec buffer leak in error handling when timestamp goes backward | Chong Zhang | 2014-02-14 | 1 | -7/+7 |
* | | | | | | | | | | Merge "Handle recording failure more gracefully." | Ruben Brunk | 2014-02-19 | 2 | -9/+20 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Handle recording failure more gracefully. | Ruben Brunk | 2014-02-18 | 2 | -9/+20 |