summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am e276aef8: am 0cf16339: Merge "Fix preventing from heap overwrite in captur...Glenn Kasten2014-02-281-34/+35
|\
| * am 0cf16339: Merge "Fix preventing from heap overwrite in capture command"Glenn Kasten2014-02-281-34/+35
| |\
| | * Merge "Fix preventing from heap overwrite in capture command"Glenn Kasten2014-02-281-34/+35
| | |\
| | | * Fix preventing from heap overwrite in capture commandRyszard Grzesica2014-02-201-34/+35
* | | | Fix type of AudioTrack/AudioRecord parameter frameCountGlenn Kasten2014-02-286-26/+12
* | | | Fix type of AudioTrack/AudioRecord parameter notificationFramesGlenn Kasten2014-02-283-11/+11
* | | | Merge "Don't crash on remote read error, just return"Marco Nelissen2014-02-271-1/+4
|\ \ \ \
| * | | | Don't crash on remote read error, just returnMarco Nelissen2014-02-271-1/+4
* | | | | Fix includes to no longer pull in Skia includes directories.Derek Sollenberger2014-02-273-3/+0
* | | | | am d4c6052d: am 096d72a3: Merge "AArch64: Correction for LP64"Narayan Kamath2014-02-271-5/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 096d72a3: Merge "AArch64: Correction for LP64"Narayan Kamath2014-02-271-5/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | AArch64: Correction for LP64Marcus Oakland2014-02-261-5/+5
* | | | | Merge "initialize encoder at start() time for camera source"Chong Zhang2014-02-272-5/+18
|\ \ \ \ \
| * | | | | initialize encoder at start() time for camera sourceChong Zhang2014-02-262-5/+18
* | | | | | Simplify error handling after track creationGlenn Kasten2014-02-252-2/+6
* | | | | | Move initialize of mInput to match AudioTrackGlenn Kasten2014-02-251-3/+3
* | | | | | Update comments to match AudioTrackGlenn Kasten2014-02-251-1/+3
* | | | | | Move initialization of mRefreshRemaining to match AudioTrackGlenn Kasten2014-02-251-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 "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-251-17/+10
|\ \ \ \ \ \ \
| * | | | | | | Simplify and cleanup error handling in AudioRecord::getMinFrameCountGlenn Kasten2014-02-251-17/+10
* | | | | | | | 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
* | | | | | | LiveSession refactor: reverted loop indice change.Robert Shih2014-02-241-2/+1
* | | | | | | 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-242-0/+25
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add method to get redirected UriMarco Nelissen2014-02-212-0/+25
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "support for time lapse/slow motion when using SURFACE source"Chong Zhang2014-02-226-12/+114
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | support for time lapse/slow motion when using SURFACE sourceChong Zhang2014-02-146-12/+114
* | | | | | | Merge "LiveSession refactor"Robert Shih2014-02-214-139/+93
|\ \ \ \ \ \ \
| * | | | | | | LiveSession refactorRobert Shih2014-02-204-139/+93
* | | | | | | | resolved conflicts for merge of aa0390b7 to masterMarco Nelissen2014-02-202-4/+13
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |