summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 1375ac6d: Merge "NuPlayer: query current position from NuPlayerRenderer." ...Lajos Molnar2014-10-146-225/+194
|\
| * Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-devLajos Molnar2014-10-146-225/+194
| |\
| | * NuPlayer: query current position from NuPlayerRenderer.Ronghua Wu2014-10-136-225/+194
* | | resolved conflicts for merge of 2edda09a to lmp-dev-plus-aospLajos Molnar2014-10-1410-362/+454
|\ \ \ | |/ /
| * | stagefright: fix surface input handling of software encodersLajos Molnar2014-10-1310-349/+456
* | | am 512e9792: stagefright: support passing GraphicBuffer in metadata bufferLajos Molnar2014-10-144-21/+75
|\ \ \ | |/ /
| * | stagefright: support passing GraphicBuffer in metadata bufferLajos Molnar2014-10-134-21/+75
* | | 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 9286354c: Merge "Revert "audio policy: add support for ro.audio.media_deep...Dave Burke2014-10-122-13/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" int...Dave Burke2014-10-122-13/+1
| |\ \ \ \
| | * | | | Revert "audio policy: add support for ro.audio.media_deep_buffer"Vineeta Srivastava2014-10-112-13/+1
* | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / /
generated by cgit v1.1 at 2024-06-27 13:43:05 +0000