summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am e760de61: Merge "NuPlayerDriver: request seek notification when prepare*()...Wei Jia2014-10-131-2/+2
|\
| * Merge "NuPlayerDriver: request seek notification when prepare*() is called in...Wei Jia2014-10-131-2/+2
| |\
| | * NuPlayerDriver: request seek notification when prepare*() is called in STOPPE...Wei Jia2014-10-131-2/+2
* | | am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat...Chong Zhang2014-10-132-1/+34
|\ \ \ | |/ /
| * | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-132-1/+34
| |\ \
| | * | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-132-1/+34
* | | | am 7225187b: Merge "ACodec: process deferred messages when entering Loaded st...Wei Jia2014-10-131-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "ACodec: process deferred messages when entering Loaded state." into lm...Wei Jia2014-10-131-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | ACodec: process deferred messages when entering Loaded state.Wei Jia2014-10-101-0/+2
| | |/
* | | am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPo...Guang Zhu2014-10-131-21/+0
|\ \ \ | |/ /
| * | Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" in...Guang Zhu2014-10-131-21/+0
| |\ \
| | * | Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"Guang Zhu2014-10-131-21/+0
* | | | 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 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 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 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-071-1/+28
|\ \ \ \ \ | |/ / / /
| * | | | Merge "stagefright: do not allocate output buffers for tunneled playback" int...Rachad2014-10-071-1/+28
| |\ \ \ \
| | * | | | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-281-1/+28
* | | | | | 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
| |\ \ \ \ \ \
| | * | | | | | 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 f0011d49: Merge "MediaRecorder: only dequeue available buffers from MediaC...Chong Zhang2014-10-041-5/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into lm...Chong Zhang2014-10-041-5/+14
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | MediaRecorder: only dequeue available buffers from MediaCodecChong Zhang2014-10-031-5/+14
| | |/ / / /
* | | | | | am af1a4dc9: Merge "NuPlayer: don\'t restart AudioSink when torn down due to ...Ronghua Wu2014-10-033-5/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "NuPlayer: don't restart AudioSink when torn down due to pause timeout....Ronghua Wu2014-10-033-5/+21
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | NuPlayer: don't restart AudioSink when torn down due to pause timeout.Ronghua Wu2014-10-033-5/+21
* | | | | | am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW decoder...Ronghua Wu2014-10-032-3/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-devRonghua Wu2014-10-032-3/+11
| |\ \ \ \ \