summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-113-9/+9
|\
| * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-113-10/+10
* | Fix build after merge from AOSPGlenn Kasten2014-02-101-8/+4
* | am 4e12dade: am 4361749d: Merge "AudioTrack: Never try to use the fast path i...Glenn Kasten2014-02-101-0/+6
|\ \ | |/
| * AudioTrack: Never try to use the fast path if resampling is requiredMartin Storsjo2014-01-311-0/+6
* | Merge "Use printf format %#x for audio_format_t in logs"Glenn Kasten2014-02-103-7/+7
|\ \
| * | Use printf format %#x for audio_format_t in logsGlenn Kasten2014-02-073-7/+7
* | | Merge "Fix warnings about unused parameters"Glenn Kasten2014-02-071-7/+13
|\ \ \
| * | | Fix warnings about unused parametersGlenn Kasten2014-02-071-7/+13
| |/ /
* | | Fix whitespaceGlenn Kasten2014-02-072-13/+26
|/ /
* | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-062-49/+0
|\ \
| * | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-052-49/+0
* | | Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack"Glenn Kasten2014-02-051-7/+16
|\ \ \ | |/ / |/| |
| * | Add AudioRecord::mReqFrameCount similar to AudioTrackGlenn Kasten2014-02-051-7/+16
* | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-059-16/+303
|\ \ \ | |/ / |/| |
| * | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-049-16/+303
* | | Merge "Fix unused parameter warnings in audio"Glenn Kasten2014-02-043-4/+4
|\ \ \
| * | | Fix unused parameter warnings in audioGlenn Kasten2014-02-033-4/+4
| |/ /
* | | Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-031-6/+13
|\ \ \ | |/ / |/| |
| * | Replace size_t in shared memory by uint32_tGlenn Kasten2014-01-281-6/+13
* | | AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-01-272-2/+2
|/ /
* | am 9f875b27: am 8ba3192f: am d0e7e801: Merge "Do partial reads in MemoryLeakT...Eric Laurent2014-01-271-3/+11
|\ \ | |/
| * Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
| * AudioTrack: fix position callback after restoreEric Laurent2013-12-171-1/+0
| * update offloaded audio track sampling rateEric Laurent2013-12-171-0/+13
* | Remove the redundant parameters from createTrack_l()Glenn Kasten2014-01-241-62/+41
* | Refactor code related to I/O handles to reduce chance for leaksGlenn Kasten2014-01-242-45/+67
* | Merge "Replace control block frameCount_ by explicit in/out parameter"Glenn Kasten2014-01-244-11/+30
|\ \
| * | Replace control block frameCount_ by explicit in/out parameterGlenn Kasten2013-12-204-11/+30
* | | 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 "Make copy of audio_offload_info_t for future use"Glenn Kasten2014-01-171-0/+10
|\ \ \ \
| * | | | Make copy of audio_offload_info_t for future useGlenn Kasten2014-01-161-0/+10
* | | | | Merge "Move up initialization of mFormat, mStreamType, and mSharedBuffer earl...Glenn Kasten2014-01-171-3/+7
|\ \ \ \ \ | |/ / / /
| * | | | Move up initialization of mFormat, mStreamType, and mSharedBuffer earlierGlenn Kasten2014-01-161-3/+7
* | | | | Merge "Cleanup createTrack error handling"Glenn Kasten2014-01-172-1/+18
|\ \ \ \ \ | |/ / / /
| * | | | Cleanup createTrack error handlingGlenn Kasten2014-01-162-1/+18
| |/ / /
* | | | Merge "Remove dead code in AudioTrack::processAudioBuffer"Glenn Kasten2014-01-171-1/+0
|\ \ \ \
| * | | | Remove dead code in AudioTrack::processAudioBufferGlenn Kasten2014-01-161-1/+0
| |/ / /
* | | | Merge "Cleanup loop termination logic in AudioRecord::obtainBuffer()"Glenn Kasten2014-01-171-0/+3
|\ \ \ \
| * | | | Cleanup loop termination logic in AudioRecord::obtainBuffer()Glenn Kasten2014-01-161-0/+3
| |/ / /
* | | | Merge "Improve logs in AudioTrack::getMinFrameCount"Glenn Kasten2014-01-171-0/+6
|\ \ \ \
| * | | | Improve logs in AudioTrack::getMinFrameCountGlenn Kasten2014-01-161-0/+6
| |/ / /
* | | | Merge "AudioRecord: fix unwanted overrun when restarting"Glenn Kasten2014-01-171-0/+3
|\ \ \ \
| * | | | AudioRecord: fix unwanted overrun when restartingGlenn Kasten2014-01-161-0/+3
| |/ / /
* | | | Merge "AudioRecord::getInputFramesLost() cleanup"Glenn Kasten2014-01-173-7/+10
|\ \ \ \
| * | | | AudioRecord::getInputFramesLost() cleanupGlenn Kasten2014-01-143-7/+10
* | | | | Merge "Unify comments between AudioTrack and AudioRecord"Glenn Kasten2014-01-172-5/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Unify comments between AudioTrack and AudioRecordGlenn Kasten2014-01-142-5/+8
* | | | | Merge "Document AudioTrack mFrameCount and mReqFrameCount better"Glenn Kasten2014-01-151-1/+1
|\ \ \ \ \