summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Fix build. Missing vendor_tag header.Ruben Brunk2014-01-171-0/+1
* 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
|/ / / / / / /
* | | | | | | am 081559cc: am 514ac2ba: am e311b15c: Merge "Fix c++11 narrowing"Nick Kralevich2014-01-111-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | am e311b15c: Merge "Fix c++11 narrowing"Nick Kralevich2014-01-101-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Fix c++11 narrowing"Nick Kralevich2014-01-111-1/+1
| | |\ \ \ \
| | | * | | | Fix c++11 narrowingsynergydev2013-10-251-1/+1
* | | | | | | am 9dfe2ae1: am 586dda1d: am 5ca94d2f: Merge "HLS: Fixed rounding error with ...Marco Nelissen2014-01-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
| | |\ \ \ \ \
| | | * | | | | HLS: Fixed rounding error with decimal segment durationOscar Rydhé2013-12-191-1/+1
| | | | |_|_|/ | | | |/| | |
* | | | | | | Merge "Cleanup AudioTrack::getMinFrameCount error handling"Glenn Kasten2014-01-091-9/+17
|\ \ \ \ \ \ \
| * | | | | | | Cleanup AudioTrack::getMinFrameCount error handlingGlenn Kasten2014-01-081-9/+17
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Cleanup AudioSystem::getInputBufferSize error handling and caching"Glenn Kasten2014-01-091-4/+10
|\ \ \ \ \ \ \
| * | | | | | | Cleanup AudioSystem::getInputBufferSize error handling and cachingGlenn Kasten2014-01-081-4/+10
| |/ / / / / /
* | | | | | | Merge "Cleanup error handling in AudioSystem get methods"Glenn Kasten2014-01-091-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Cleanup error handling in AudioSystem get methodsGlenn Kasten2014-01-081-0/+10
| |/ / / / / /
* | | | | | | Support more channel configurations in MPEG4ExtractorJean-Michel Trivi2014-01-081-1/+158
|/ / / / / /
* | | | | | Update AAC decoder wrapper to latest FDK API for output channel countJean-Michel Trivi2013-12-271-2/+5
* | | | | | am 42d89e5d: am b904d53f: am 8115f4b2: Merge "stagefright: do not offload LD-...Eric Laurent2013-12-212-0/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-202-0/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | stagefright: do not offload LD-AAC decodingEric Laurent2013-12-212-0/+14
* | | | | | am 5f7483eb: am 5a086733: am 1777ed30: Merge "stagefright: fix offloading HE-...Eric Laurent2013-12-211-17/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."Eric Laurent2013-12-201-17/+23
| |\ \ \ \ \ | | |/ / / /
| | * | | | stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2013-12-191-17/+23
| | |/ / /
* | | | | Merge "Fix some (but not all) unused parameter warnings"Glenn Kasten2013-12-207-15/+15
|\ \ \ \ \