summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am e0a76795: am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_...Ying Wang2014-02-261-1/+2
|\
| * am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"Ying Wang2014-02-261-1/+2
| |\
| | * Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"Ying Wang2014-02-261-1/+2
| | |\
| | | * Use multilib-friendly LOCAL_MODULE_RELATIVE_PATHYing Wang2014-02-261-1/+2
| | |/
* | | Merge "mAudioRecord is always non-0 if set() is successful"Glenn Kasten2014-02-251-4/+4
|\ \ \
| * | | mAudioRecord is always non-0 if set() is successfulGlenn Kasten2014-02-241-4/+4
* | | | Merge "Unify comments and whitespace between AudioTrack and AudioRecord"Glenn Kasten2014-02-252-1/+5
|\ \ \ \ | |/ / /
| * | | Unify comments and whitespace between AudioTrack and AudioRecordGlenn Kasten2014-02-242-1/+5
* | | | Merge "Update channel fields at same place in AudioTrack and AudioRecord"Glenn Kasten2014-02-251-4/+3
|\ \ \ \ | |/ / /
| * | | Update channel fields at same place in AudioTrack and AudioRecordGlenn Kasten2014-02-241-4/+3
* | | | Merge "Update mReqFrameCount at same point in AudioTrack and AudioRecord"Glenn Kasten2014-02-251-5/+5
|\ \ \ \ | |/ / /
| * | | Update mReqFrameCount at same point in AudioTrack and AudioRecordGlenn Kasten2014-02-241-5/+5
* | | | am ed773ea8: am 8fc4d57d: Merge "Avoid a building error"Glenn Kasten2014-02-251-1/+3
|\ \ \ \ | | |/ / | |/| |
| * | | am 8fc4d57d: Merge "Avoid a building error"Glenn Kasten2014-02-251-1/+3
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Avoid a building error"Glenn Kasten2014-02-251-1/+3
| | |\ \
| | | * | Avoid a building errorChih-Wei Huang2013-01-101-1/+3
* | | | | Merge "Fix 1:1 dynamic resampler rate setting"Andy Hung2014-02-251-0/+4
|\ \ \ \ \
| * | | | | Fix 1:1 dynamic resampler rate settingAndy Hung2014-02-191-0/+4
* | | | | | Merge "Permit AudioRecord to support non-linear formats in future"Glenn Kasten2014-02-251-2/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Permit AudioRecord to support non-linear formats in futureGlenn Kasten2014-02-241-2/+5
* | | | | | 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
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |