summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Split mPacked into 4 separate fieldsGlenn Kasten2014-03-061-70/+15
* Add format parameter to Format_from_SR_CGlenn Kasten2014-03-061-1/+2
* Use mFrameSize instead of mBitShiftGlenn Kasten2014-03-068-18/+18
* Add mFrameSize but do not remove mFrameBitShift yetGlenn Kasten2014-03-063-1/+4
* Merge "PlaylistFetcher: fix infinite loop when parsing ADTS."Robert Shih2014-03-051-0/+12
|\
| * PlaylistFetcher: fix infinite loop when parsing ADTS.Robert Shih2014-03-041-0/+12
* | stagefright: SoftOpus: add explicit include filesLajos Molnar2014-03-031-11/+14
|/
* Merge "Opus Matroska support in OpenMax"Lajos Molnar2014-03-0413-2/+689
|\
| * Opus Matroska support in OpenMaxVignesh Venkatasubramanian2014-03-0313-2/+689
* | Merge "Initial HLS seamless switch implementation."Robert Shih2014-03-014-48/+541
|\ \
| * | Initial HLS seamless switch implementation.Robert Shih2014-02-284-48/+541
* | | Merge "Make openRecord_l more like createTrack_l for fast tracks: part 3"Glenn Kasten2014-03-011-7/+12
|\ \ \
| * | | Make openRecord_l more like createTrack_l for fast tracks: part 3Glenn Kasten2014-02-281-7/+12
* | | | Merge "Fix race condition in AwesomePlayer"Marco Nelissen2014-02-281-2/+4
|\ \ \ \
| * | | | Fix race condition in AwesomePlayerMarco Nelissen2014-02-281-2/+4
* | | | | Merge "Make openRecord_l more like createTrack_l for fast tracks: part 2"Glenn Kasten2014-02-281-10/+11
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Make openRecord_l more like createTrack_l for fast tracks: part 2Glenn Kasten2014-02-281-10/+11
* | | | | Rename setStreamOutput to invalidateStreamGlenn Kasten2014-02-281-8/+6
|/ / / /
* | | | Merge "Make openRecord_l more like createTrack_l for fast tracks: part 1"Glenn Kasten2014-02-282-11/+23
|\ \ \ \
| * | | | Make openRecord_l more like createTrack_l for fast tracks: part 1Glenn Kasten2014-02-272-11/+23
* | | | | 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