summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* warnings be gone.Andreas Huber2014-02-111-1/+1
* 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
* | | | | Merge "Change StagefrightRecorder to use MediaCodec"Chong Zhang2014-02-064-1/+138
|\ \ \ \ \
| * | | | | Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-054-1/+138
* | | | | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-063-11/+0
|\ \ \ \ \ \
| * | | | | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-053-11/+0
| |/ / / / /
* | | | | | Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack"Glenn Kasten2014-02-051-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add AudioRecord::mReqFrameCount similar to AudioTrackGlenn Kasten2014-02-051-1/+5
| |/ / / /
* | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-0513-9/+210
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-0413-9/+210
* | | | | Change Format_Invalid from enum to global constGlenn Kasten2014-02-031-3/+2
* | | | | Merge "Use const NBAIO_Format& in parameter lists"Glenn Kasten2014-02-034-11/+11
|\ \ \ \ \
| * | | | | Use const NBAIO_Format& in parameter listsGlenn Kasten2014-01-314-11/+11
| |/ / / /
* | | | | Merge "Added support to query ACodec whether adaptive playback is enabled."Robert Shih2014-02-031-0/+3
|\ \ \ \ \
| * | | | | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-01-291-0/+3
* | | | | | am af1aa00e: am c4eef29a: Merge "fix deadlock issues that arise when there ar...Eric Laurent2014-02-031-24/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am c4eef29a: Merge "fix deadlock issues that arise when there are simultaneou...Eric Laurent2014-02-031-24/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | fix deadlock issues that arise when there are simultaneousjpadmana2014-01-311-24/+0
* | | | | Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-032-6/+18
|\ \ \ \ \
| * | | | | Replace size_t in shared memory by uint32_tGlenn Kasten2014-01-282-6/+18
| | |_|_|/ | |/| | |
* | | | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-01-302-0/+2
|/ / / /
* | | | Remove the redundant parameters from createTrack_l()Glenn Kasten2014-01-241-7/+1
* | | | Refactor code related to I/O handles to reduce chance for leaksGlenn Kasten2014-01-242-8/+5
* | | | Merge "Replace control block frameCount_ by explicit in/out parameter"Glenn Kasten2014-01-242-7/+3
|\ \ \ \
| * | | | Replace control block frameCount_ by explicit in/out parameterGlenn Kasten2013-12-202-7/+3
* | | | | Merge "Use uint32_t sequence numbers for IAudioRecord"Glenn Kasten2014-01-171-1/+1
|\ \ \ \ \
| * | | | | Use uint32_t sequence numbers for IAudioRecordGlenn Kasten2014-01-161-1/+1
* | | | | | Merge "Document the reference count rules for I/O handles"Glenn Kasten2014-01-172-0/+15
|\ \ \ \ \ \
| * | | | | | Document the reference count rules for I/O handlesGlenn Kasten2014-01-162-0/+15
* | | | | | | Merge "Make copy of audio_offload_info_t for future use"Glenn Kasten2014-01-171-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Make copy of audio_offload_info_t for future useGlenn Kasten2014-01-161-0/+3
* | | | | | | am 6146f60c: am 319c5640: am 07a017d3: Merge "Added support for ID3v2 meta da...Marco Nelissen2014-01-171-0/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-171-0/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-161-0/+2
* | | | | | | Merge "Move up initialization of mFormat, mStreamType, and mSharedBuffer earl...Glenn Kasten2014-01-171-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |