summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "AudioTrack: fix obtainBuffer timeout calculation"Eric Laurent2014-01-282-2/+2
|\
| * AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-01-272-2/+2
* | am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MO...Colin Cross2014-01-287-9/+9
|\ \ | |/ |/|
| * am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_...Colin Cross2014-01-287-9/+9
| |\
| | * frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-277-9/+9
* | | am 1ae4b6ce: am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when ...Eric Laurent2014-01-271-5/+7
|\ \ \ | |/ /
| * | am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
| |\ \ | | |/
| | * Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
| | |\
| | | * Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
* | | | am 9f875b27: am 8ba3192f: am d0e7e801: Merge "Do partial reads in MemoryLeakT...Eric Laurent2014-01-271-3/+11
|\ \ \ \ | |/ / /
| * | | am d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
| |\ \ \ | | |/ /
| | * | Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
| | |/
* | | 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 "Fix build. Missing vendor_tag header."Ruben Brunk2014-01-171-0/+1
|\ \ \ \
| * | | | Fix build. Missing vendor_tag header.Ruben Brunk2014-01-171-0/+1
* | | | | 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
* | | | | | am 4f8bb114: am 1526c2e1: am 96a7b5a9: Merge "Long mp3 metadata displays as c...Marco Nelissen2014-01-173-18/+26
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am 96a7b5a9: Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
| | |\ \ \ \
| | | * | | | Long mp3 metadata displays as corrupted file after transferYin Liu2013-12-203-18/+26
* | | | | | | 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
* | | | | | | | am 6146f60c: am 319c5640: am 07a017d3: Merge "Added support for ID3v2 meta da...Marco Nelissen2014-01-175-9/+89
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-175-9/+89
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-175-9/+89
| | |\ \ \ \ \ \
| | | * | | | | | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-165-9/+89
* | | | | | | | | am fea77cb3: am fd0daeb3: am 4cc47940: Merge "Fix compile error in NuPlayerRe...Marco Nelissen2014-01-171-1/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Fix compile error in NuPlayerRenderer debug printOscar Rydhé2014-01-031-1/+3
* | | | | | | | | 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-174-8/+11
|\ \ \ \ \ \ \
| * | | | | | | AudioRecord::getInputFramesLost() cleanupGlenn Kasten2014-01-144-8/+11
* | | | | | | | Merge "Unify comments between AudioTrack and AudioRecord"Glenn Kasten2014-01-172-5/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Unify comments between AudioTrack and AudioRecordGlenn Kasten2014-01-142-5/+8