summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Check for duplicate uuids when parsing audio_effects.confMarco Nelissen2014-10-083-24/+88
* am d8713103: am 58202e1d: am ce26e9d1: Merge "AudioTrack: fix AudioTrackThrea...Eric Laurent2014-10-081-0/+3
|\
| * am 58202e1d: am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon ...Eric Laurent2014-10-081-0/+3
| |\
| | * am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lm...Eric Laurent2014-10-081-0/+3
| | |\
| | | * Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-devEric Laurent2014-10-081-0/+3
| | | |\
| | | | * AudioTrack: fix AudioTrackThread crash upon exitEric Laurent2014-10-071-0/+3
* | | | | am 4fe73b54: am ac4d8b31: am 6ade0417: Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
|\ \ \ \ \ | |/ / / /
| * | | | am ac4d8b31: am 6ade0417: Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
| |\ \ \ \
| | * \ \ \ am 6ade0417: Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
| | |\ \ \ \
| | | * \ \ \ Merge "Remove dead code."Chih-Hung Hsieh2014-10-071-8/+0
| | | |\ \ \ \
| | | | * | | | Remove dead code.Chih-Hung Hsieh2014-10-071-8/+0
| | | |/ / / /
* | | | | | | am 8e12cdf9: am 7c6977c4: am 07811789: Merge "audio policy: fix build with US...Eric Laurent2014-10-072-2/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7c6977c4: am 07811789: Merge "audio policy: fix build with USE_LEGACY_AUDI...Eric Laurent2014-10-072-2/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am 07811789: Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" int...Eric Laurent2014-10-072-2/+3
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" into lmp-devEric Laurent2014-10-072-2/+3
| | | |\ \ \ \
| | | | * | | | audio policy: fix build with USE_LEGACY_AUDIO_POLICYEric Laurent2014-10-072-2/+3
* | | | | | | | am ddb78caa: am 8610f49c: am 5bee844f: Merge "audio policy: fix lockup during...Eric Laurent2014-10-075-115/+186
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 8610f49c: am 5bee844f: Merge "audio policy: fix lockup during mediaserver ...Eric Laurent2014-10-075-115/+186
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 5bee844f: Merge "audio policy: fix lockup during mediaserver restart" into...Eric Laurent2014-10-075-115/+186
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "audio policy: fix lockup during mediaserver restart" into lmp-devEric Laurent2014-10-075-115/+186
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | audio policy: fix lockup during mediaserver restartEric Laurent2014-10-075-115/+186
| | | | | |_|/ | | | | |/| |
* | | | | | | am 9da6c242: am 595a5c70: am 73d0a798: Merge "NuPlayer: wait for renderer flu...Andy Hung2014-10-073-52/+64
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 595a5c70: am 73d0a798: Merge "NuPlayer: wait for renderer flush before dec...Andy Hung2014-10-073-52/+64
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 73d0a798: Merge "NuPlayer: wait for renderer flush before decoder shutdown...Andy Hung2014-10-073-52/+64
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-devAndy Hung2014-10-073-52/+64
| | | |\ \ \ \
| | | | * | | | NuPlayer: wait for renderer flush before decoder shutdownAndy Hung2014-10-063-52/+64
* | | | | | | | am 2d097456: am a130edc3: am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a130edc3: am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| | | |\ \ \ \ \
| | | | * | | | | Recover from errorsMarco Nelissen2014-10-061-5/+14
* | | | | | | | | am 9d06b802: am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate ou...Rachad2014-10-072-1/+30
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers ...Rachad2014-10-072-1/+30
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ...Rachad2014-10-072-1/+30
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "stagefright: do not allocate output buffers for tunneled playback" int...Rachad2014-10-072-1/+30
| | | |\ \ \ \ \ \
| | | | * | | | | | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-282-1/+30
* | | | | | | | | | am 2d15fb26: am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local ...Chih-Hung Hsieh2014-10-071-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-061-0/+3
| | | |/ / / / / / /
* | | | | | | | | | am 0fe4c176: am 1318a608: am e48b90d6: Merge "StageFrightRecorder: Enable met...Chong Zhang2014-10-061-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 1318a608: am e48b90d6: Merge "StageFrightRecorder: Enable meta-data mode f...Chong Zhang2014-10-061-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | am e48b90d6: Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardwa...Chong Zhang2014-10-061-0/+1
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." ...Chong Zhang2014-10-061-0/+1
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | | * | | | | | StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.Praveen Chavan2014-10-061-0/+1
* | | | | | | | | | am 5769ed50: am 658937e7: am c4da004d: Merge "NuPlayer: add audioDecoderStill...Ronghua Wu2014-10-062-3/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 658937e7: am c4da004d: Merge "NuPlayer: add audioDecoderStillNeeded." into...Ronghua Wu2014-10-062-3/+10
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am c4da004d: Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-devRonghua Wu2014-10-062-3/+10
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-devRonghua Wu2014-10-062-3/+10
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |