summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | am 07634f1f: am cbf9e91a: am 1e8a57c2: Merge "Avoid jumps to faulty position ...Marco Nelissen2014-01-151-1/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
| | |\ \ \ \ \
| | | * | | | | Avoid jumps to faulty position after seeksRoger1 Jonsson2013-12-181-1/+4
| | | | |_|_|/ | | | |/| | |
* | | | | | | Merge "Document AudioTrack mFrameCount and mReqFrameCount better"Glenn Kasten2014-01-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Document AudioTrack mFrameCount and mReqFrameCount betterGlenn Kasten2014-01-101-1/+1
* | | | | | | | Merge "Fix error handling in AudioSystem::getOutputForEffect"Glenn Kasten2014-01-151-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Fix error handling in AudioSystem::getOutputForEffectGlenn Kasten2014-01-091-1/+2
* | | | | | | | Merge "Use AUDIO_SESSION_ALLOCATE instead of 0"Glenn Kasten2014-01-152-6/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Use AUDIO_SESSION_ALLOCATE instead of 0Glenn Kasten2013-12-202-6/+6
* | | | | | | | Document locking rules for mFlags, and fix discrepanciesGlenn Kasten2014-01-141-9/+16
* | | | | | | | Merge "Fix race in AudioTrack::getParameters()"Glenn Kasten2014-01-141-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix race in AudioTrack::getParameters()Glenn Kasten2014-01-131-2/+3
* | | | | | | | | Merge "Improve error logging for getOutputSamplingRate"Glenn Kasten2014-01-141-5/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve error logging for getOutputSamplingRateGlenn Kasten2014-01-131-5/+7
| |/ / / / / / / /
* | | | | | | | | Fix race condition in AudioRecord::pause followed by startGlenn Kasten2014-01-131-7/+8
|/ / / / / / / /