| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | am 8c0417c1: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE | Haynes Mathew George | 2014-10-14 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | ||||||
| | | | * | | | | | | audio: prevent larger than required sleeps - DO NOT MERGE | Haynes Mathew George | 2014-10-14 | 1 | -1/+21 | |
| | * | | | | | | | | am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-dev | Lajos Molnar | 2014-10-14 | 1 | -2/+10 | |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | | * | | | | | | | Merge "ACodec: only check crop rect on output port" into lmp-dev | Lajos Molnar | 2014-10-14 | 1 | -2/+10 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | ACodec: only check crop rect on output port | Lajos Molnar | 2014-10-07 | 1 | -2/+10 | |
| | * | | | | | | | | | am 1375ac6d: Merge "NuPlayer: query current position from NuPlayerRenderer." ... | Lajos Molnar | 2014-10-14 | 6 | -225/+194 | |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-dev | Lajos Molnar | 2014-10-14 | 6 | -225/+194 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | NuPlayer: query current position from NuPlayerRenderer. | Ronghua Wu | 2014-10-13 | 6 | -225/+194 | |
| | * | | | | | | | | | | resolved conflicts for merge of 2edda09a to lmp-dev-plus-aosp | Lajos Molnar | 2014-10-14 | 10 | -362/+454 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | stagefright: fix surface input handling of software encoders | Lajos Molnar | 2014-10-13 | 10 | -349/+456 | |
| | * | | | | | | | | | | am 512e9792: stagefright: support passing GraphicBuffer in metadata buffer | Lajos Molnar | 2014-10-14 | 4 | -21/+75 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | stagefright: support passing GraphicBuffer in metadata buffer | Lajos Molnar | 2014-10-13 | 4 | -21/+75 | |
| | * | | | | | | | | | | am e760de61: Merge "NuPlayerDriver: request seek notification when prepare*()... | Wei Jia | 2014-10-13 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | Merge "NuPlayerDriver: request seek notification when prepare*() is called in... | Wei Jia | 2014-10-13 | 1 | -2/+2 | |
| | | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||||
| | | | * | | | | | | | | NuPlayerDriver: request seek notification when prepare*() is called in STOPPE... | Wei Jia | 2014-10-13 | 1 | -2/+2 | |
| | * | | | | | | | | | | am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat... | Chong Zhang | 2014-10-13 | 2 | -1/+34 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev | Chong Zhang | 2014-10-13 | 2 | -1/+34 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat | Chong Zhang | 2014-10-13 | 2 | -1/+34 | |
| | | | | |_|_|_|/ / / / | | | |/| | | | | | | | ||||||
| | * | | | | | | | | | | am 7225187b: Merge "ACodec: process deferred messages when entering Loaded st... | Wei Jia | 2014-10-13 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | Merge "ACodec: process deferred messages when entering Loaded state." into lm... | Wei Jia | 2014-10-13 | 1 | -0/+2 | |
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | | | * | | | | | | | | ACodec: process deferred messages when entering Loaded state. | Wei Jia | 2014-10-10 | 1 | -0/+2 | |
| | | | |/ / / / / / / | ||||||
| | * | | | | | | | | | am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPo... | Guang Zhu | 2014-10-13 | 1 | -21/+0 | |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" in... | Guang Zhu | 2014-10-13 | 1 | -21/+0 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" | Guang Zhu | 2014-10-13 | 1 | -21/+0 | |
| | * | | | | | | | | | | am 9286354c: Merge "Revert "audio policy: add support for ro.audio.media_deep... | Dave Burke | 2014-10-12 | 2 | -13/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | Merge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" int... | Dave Burke | 2014-10-12 | 2 | -13/+1 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | Revert "audio policy: add support for ro.audio.media_deep_buffer" | Vineeta Srivastava | 2014-10-11 | 2 | -13/+1 | |
| | * | | | | | | | | | | | am ffd5cdbd: Merge "audio policy: add support for ro.audio.media_deep_buffer"... | Eric Laurent | 2014-10-10 | 2 | -1/+13 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | Merge "audio policy: add support for ro.audio.media_deep_buffer" into lmp-dev | Eric Laurent | 2014-10-10 | 2 | -1/+13 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| | | | * | | | | | | | | | audio policy: add support for ro.audio.media_deep_buffer | Eric Laurent | 2014-10-10 | 2 | -1/+13 | |
| | * | | | | | | | | | | | am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat... | Chong Zhang | 2014-10-10 | 1 | -0/+21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev | Chong Zhang | 2014-10-10 | 1 | -0/+21 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| / / / / / / / / | | | |/ / / / / / / / | ||||||
| | | | * | | | | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat | Chong Zhang | 2014-10-09 | 1 | -0/+21 | |
| | * | | | | | | | | | | am f5ada6ed: audio policy: move intializations to onFirstRef() | Eric Laurent | 2014-10-10 | 2 | -0/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | audio policy: move intializations to onFirstRef() | Eric Laurent | 2014-10-10 | 2 | -0/+7 | |
| | | | |_|/ / / / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | | am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into ... | Lajos Molnar | 2014-10-10 | 1 | -9/+15 | |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-dev | Lajos Molnar | 2014-10-10 | 1 | -9/+15 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | MediaCodec: fix onError and onInputBufferAvailable | Lajos Molnar | 2014-10-09 | 1 | -9/+15 | |
| | * | | | | | | | | | | am 185a295d: Merge "NuPlayerRenderer: adjust anchor time correctly for video ... | Wei Jia | 2014-10-10 | 2 | -1/+19 | |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." i... | Wei Jia | 2014-10-10 | 2 | -1/+19 | |
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| | | | * | | | | | | | | NuPlayerRenderer: adjust anchor time correctly for video only case. | Wei Jia | 2014-10-09 | 2 | -1/+19 | |
| | | | | |/ / / / / / | | | |/| | | | | | | ||||||
| | * | | | | | | | | | am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev | Marco Nelissen | 2014-10-09 | 1 | -1/+4 | |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev | Marco Nelissen | 2014-10-09 | 1 | -1/+4 | |
| | | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
| | | | * | | | | | | | Fix VideoFrame class layout for 64/32 bit | Marco Nelissen | 2014-10-09 | 1 | -1/+4 | |
| | * | | | | | | | | | am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lm... | Eric Laurent | 2014-10-08 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-dev | Eric Laurent | 2014-10-08 | 1 | -0/+3 | |
| | | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
| | | | * | | | | | | | AudioTrack: fix AudioTrackThread crash upon exit | Eric Laurent | 2014-10-07 | 1 | -0/+3 | |
| | * | | | | | | | | | am ac4d8b31: am 6ade0417: Merge "Remove dead code." | Chih-Hung Hsieh | 2014-10-07 | 1 | -8/+0 | |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | ||||||
| | | * | | | | | | | | am 6ade0417: Merge "Remove dead code." | Chih-Hung Hsieh | 2014-10-07 | 1 | -8/+0 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | * | \ \ \ \ \ \ \ \ | am 07811789: Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" int... | Eric Laurent | 2014-10-07 | 2 | -2/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||||
