summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge "Stagefright: added WebM muxer."Robert Shih2014-03-101-2/+4
|\
| * Stagefright: added WebM muxer.Robert Shih2014-03-061-2/+4
* | Miscellaneous cleanup for NBAIOGlenn Kasten2014-03-071-1/+2
* | NBAIO::Format_from_SR_C requires audio_format_t parameterGlenn Kasten2014-03-071-3/+2
* | Merge "Remove Format_frameBitShift()"Glenn Kasten2014-03-072-7/+0
|\ \
| * | Remove Format_frameBitShift()Glenn Kasten2014-03-062-7/+0
* | | Merge "Split mPacked into 4 separate fields"Glenn Kasten2014-03-061-1/+4
|\ \ \ | |/ /
| * | Split mPacked into 4 separate fieldsGlenn Kasten2014-03-061-1/+4
* | | Merge "Add format parameter to Format_from_SR_C"Glenn Kasten2014-03-061-2/+4
|\ \ \ | |/ /
| * | Add format parameter to Format_from_SR_CGlenn Kasten2014-03-061-2/+4
* | | Merge "Use mFrameSize instead of mBitShift"Glenn Kasten2014-03-062-2/+2
|\ \ \ | |/ /
| * | Use mFrameSize instead of mBitShiftGlenn Kasten2014-03-062-2/+2
* | | Merge "AudioTrack: When paused, return cached playback position"Eric Laurent2014-03-061-0/+1
|\ \ \ | |/ / |/| |
| * | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-061-0/+1
| |/
* | Add mFrameSize but do not remove mFrameBitShift yetGlenn Kasten2014-03-062-1/+4
|/
* Merge "Opus Matroska support in OpenMax"Lajos Molnar2014-03-042-0/+4
|\
| * Opus Matroska support in OpenMaxVignesh Venkatasubramanian2014-03-032-0/+4
* | Rename setStreamOutput to invalidateStreamGlenn Kasten2014-02-281-1/+1
* | Fix type of AudioTrack/AudioRecord parameter frameCountGlenn Kasten2014-02-282-5/+5
* | Fix type of AudioTrack/AudioRecord parameter notificationFramesGlenn Kasten2014-02-282-5/+5
* | Merge "Simplify and cleanup error handling in AudioRecord::getMinFrameCount"Glenn Kasten2014-02-251-0/+1
|\ \
| * | Simplify and cleanup error handling in AudioRecord::getMinFrameCountGlenn Kasten2014-02-251-0/+1
* | | Merge "Add method to get redirected Uri"Marco Nelissen2014-02-241-0/+1
|\ \ \ | |/ / |/| |
| * | Add method to get redirected UriMarco Nelissen2014-02-211-0/+1
| |/
* | Merge "support for time lapse/slow motion when using SURFACE source"Chong Zhang2014-02-222-0/+4
|\ \ | |/ |/|
| * support for time lapse/slow motion when using SURFACE sourceChong Zhang2014-02-142-0/+4
* | Merge "Handle recording failure more gracefully."Ruben Brunk2014-02-191-1/+1
|\ \
| * | Handle recording failure more gracefully.Ruben Brunk2014-02-181-1/+1
* | | Add private method NBLog::Reader::dumpLine()Glenn Kasten2014-02-181-0/+6
* | | Merge "Track pid for each session"Marco Nelissen2014-02-133-7/+11
|\ \ \ | |/ / |/| |
| * | Track pid for each sessionMarco Nelissen2014-02-113-7/+11
| |/
* | Merge "warnings be gone."Andreas Huber2014-02-111-1/+1
|\ \
| * | warnings be gone.Andreas Huber2014-02-111-1/+1
| |/
* | Support "data:" URIs again in mediaplayer...Andreas Huber2014-02-111-0/+49
|/
* resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-112-3/+3
|\
| * am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-02-112-4/+4
| |\
| | * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-112-4/+4
| * | am dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-041-0/+2
| |\ \
| | * | [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-031-0/+2
| * | | am 90903383: [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-042-0/+3
| |\ \ \ | | |/ /
| | * | [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-032-0/+3
* | | | Fix clang warnings in AudioFlingerGlenn Kasten2014-02-103-3/+3
* | | | Merge "Change Format_frameBitShift() API for non-power-of-2 sizes"Glenn Kasten2014-02-071-1/+2
|\ \ \ \
| * | | | Change Format_frameBitShift() API for non-power-of-2 sizesGlenn Kasten2014-02-031-1/+2
* | | | | Merge "Add FIXMEs about audio_format_t assumption"Glenn Kasten2014-02-071-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Add FIXMEs about audio_format_t assumptionGlenn Kasten2014-02-031-0/+1
* | | | | Merge "Change NBAIO_Format from typedef to struct"Glenn Kasten2014-02-071-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | Change NBAIO_Format from typedef to structGlenn Kasten2014-02-031-1/+4
* | | | | Merge "Add Format_isValid() and Format_isEqual() to NBAIO"Glenn Kasten2014-02-071-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Add Format_isValid() and Format_isEqual() to NBAIOGlenn Kasten2014-02-031-0/+6