summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | 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
* | | | | | | | 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-191-8/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle recording failure more gracefully.Ruben Brunk2014-02-181-8/+19
* | | | | | | | | 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 recordingGlenn Kasten2014-02-181-1/+3
|/ / / / / / / / /
* | | | | | | | | Merge "Move StateQueueInstantiations to libinstantssq"Glenn Kasten2014-02-182-10/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move StateQueueInstantiations to libinstantssqGlenn Kasten2014-02-182-10/+19
* | | | | | | | | | Merge "Fix bug with not reporting lost bytes"Glenn Kasten2014-02-181-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix bug with not reporting lost bytesGlenn Kasten2014-02-181-2/+2
* | | | | | | | | | Merge "Add private method NBLog::Reader::dumpLine()"Glenn Kasten2014-02-181-37/+43
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /