summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 081559cc: am 514ac2ba: am e311b15c: Merge "Fix c++11 narrowing"Nick Kralevich2014-01-114-8/+8
|\
| * am 514ac2ba: am e311b15c: Merge "Fix c++11 narrowing"Nick Kralevich2014-01-114-8/+8
| |\
| | * am e311b15c: Merge "Fix c++11 narrowing"Nick Kralevich2014-01-104-8/+8
| | |\
| | | * Merge "Fix c++11 narrowing"Nick Kralevich2014-01-114-8/+8
| | | |\
| | | | * Fix c++11 narrowingsynergydev2013-10-254-8/+8
* | | | | Merge "Improve dynamic audio resampler filter generation"Andy Hung2014-01-104-90/+586
|\ \ \ \ \
| * | | | | Improve dynamic audio resampler filter generationAndy Hung2014-01-084-90/+586
* | | | | | am 0ba9f9b0: am d8d45edf: am 61540b5f: Merge "Frameworks: AudioFlinger: Fix e...Glenn Kasten2014-01-101-0/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am d8d45edf: am 61540b5f: Merge "Frameworks: AudioFlinger: Fix effects memory...Glenn Kasten2014-01-101-0/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 61540b5f: Merge "Frameworks: AudioFlinger: Fix effects memory leak"Glenn Kasten2014-01-101-0/+8
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Frameworks: AudioFlinger: Fix effects memory leak"Glenn Kasten2014-01-101-0/+8
| | | |\ \ \
| | | | * | | Frameworks: AudioFlinger: Fix effects memory leakYu Yezhong2013-10-151-0/+8
* | | | | | | am 9dfe2ae1: am 586dda1d: am 5ca94d2f: Merge "HLS: Fixed rounding error with ...Marco Nelissen2014-01-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 586dda1d: am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segme...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-092-9/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Cleanup AudioTrack::getMinFrameCount error handlingGlenn Kasten2014-01-082-9/+19
* | | | | | | | | 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-092-0/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Cleanup error handling in AudioSystem get methodsGlenn Kasten2014-01-082-0/+12
| |/ / / / / / /
* | | | | | | | audioflinger: update track ready conditionHaynes Mathew George2014-01-081-1/+1
* | | | | | | | Merge "Support more channel configurations in MPEG4Extractor"Jean-Michel Trivi2014-01-081-1/+158
|\ \ \ \ \ \ \ \
| * | | | | | | | Support more channel configurations in MPEG4ExtractorJean-Michel Trivi2014-01-081-1/+158
* | | | | | | | | am f41d9bc9: am f60cfa7f: am 99044adc: Merge "Change M4OSA_ERR_CREATE to retu...Narayan Kamath2014-01-081-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | am f60cfa7f: am 99044adc: Merge "Change M4OSA_ERR_CREATE to return unsigned i...Narayan Kamath2014-01-081-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 99044adc: Merge "Change M4OSA_ERR_CREATE to return unsigned integer."Narayan Kamath2014-01-081-1/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge "Change M4OSA_ERR_CREATE to return unsigned integer."Narayan Kamath2014-01-081-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Change M4OSA_ERR_CREATE to return unsigned integer.Ashok Bhat2014-01-021-1/+1
| | | |/ / / / /
* | | | | | | | Merge "Remove unnecessary defaults for parameters in AudioSystem"Glenn Kasten2014-01-081-11/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary defaults for parameters in AudioSystemGlenn Kasten2013-12-191-11/+11
* | | | | | | | | Provide raw H.264 output from screenrecordAndy McFadden2014-01-072-39/+116
* | | | | | | | | Merge "audioflinger: fix static track end detection"Eric Laurent2014-01-071-9/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | audioflinger: fix static track end detectionEric Laurent2013-12-201-9/+2
* | | | | | | | | | Merge "Update AAC decoder wrapper to latest FDK API for output channel count"Jean-Michel Trivi2014-01-061-2/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Update AAC decoder wrapper to latest FDK API for output channel countJean-Michel Trivi2013-12-271-2/+5
* | | | | | | | | | Fix for Change 396851Andy Hung2013-12-301-1/+1
* | | | | | | | | | Merge "Audio resampler update to add S16 filters"Andy Hung2013-12-3011-62/+2660
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Audio resampler update to add S16 filtersAndy Hung2013-12-2711-62/+2660
* | | | | | | | | | Merge "Camera2 API: fix front facing camera flip issue"Zhijun He2013-12-261-17/+47
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Camera2 API: fix front facing camera flip issueZhijun He2013-12-261-17/+47
* | | | | | | | | | am 42d89e5d: am b904d53f: am 8115f4b2: Merge "stagefright: do not offload LD-...Eric Laurent2013-12-213-0/+15
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | am b904d53f: am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-213-0/+15
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-203-0/+15
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-213-0/+15
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | stagefright: do not offload LD-AAC decodingEric Laurent2013-12-213-0/+15
| | | |/ / / / / / /
* | | | | | | | | | am 5f7483eb: am 5a086733: am 1777ed30: Merge "stagefright: fix offloading HE-...Eric Laurent2013-12-211-17/+23
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 5a086733: am 1777ed30: Merge "stagefright: fix offloading HE-AAC sampling ...Eric Laurent2013-12-211-17/+23
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /