summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am ffd5cdbd: Merge "audio policy: add support for ro.audio.media_deep_buffer"...Eric Laurent2014-10-102-1/+13
|\
| * Merge "audio policy: add support for ro.audio.media_deep_buffer" into lmp-devEric Laurent2014-10-102-1/+13
| |\
| | * audio policy: add support for ro.audio.media_deep_bufferEric Laurent2014-10-102-1/+13
* | | am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat...Chong Zhang2014-10-101-0/+21
|\ \ \ | |/ /
| * | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-101-0/+21
| |\ \ | | |/ | |/|
| | * handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-091-0/+21
* | | am f5ada6ed: audio policy: move intializations to onFirstRef()Eric Laurent2014-10-102-0/+7
|\ \ \ | |/ /
| * | audio policy: move intializations to onFirstRef()Eric Laurent2014-10-102-0/+7
* | | am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into ...Lajos Molnar2014-10-101-9/+15
|\ \ \ | |/ /
| * | Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-devLajos Molnar2014-10-101-9/+15
| |\ \
| | * | MediaCodec: fix onError and onInputBufferAvailableLajos Molnar2014-10-091-9/+15
* | | | am 185a295d: Merge "NuPlayerRenderer: adjust anchor time correctly for video ...Wei Jia2014-10-102-1/+19
|\ \ \ \ | |/ / /
| * | | Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." i...Wei Jia2014-10-102-1/+19
| |\ \ \ | | |/ / | |/| |
| | * | NuPlayerRenderer: adjust anchor time correctly for video only case.Wei Jia2014-10-092-1/+19
* | | | am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-devMarco Nelissen2014-10-091-1/+4
|\ \ \ \ | |/ / /
| * | | Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-devMarco Nelissen2014-10-091-1/+4
| |\ \ \
| | * | | Fix VideoFrame class layout for 64/32 bitMarco Nelissen2014-10-091-1/+4
* | | | | 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 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 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 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 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 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 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 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 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 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
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | NuPlayer: add audioDecoderStillNeeded.Ronghua Wu2014-10-032-3/+10
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am 57c27c55: am dc28fa7e: Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |