summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 686a0c4d: Merge "MTP Device: Parse USB3 descriptor for MTP initor;"Mike Lockwood2014-10-291-0/+9
|\
| * Merge "MTP Device: Parse USB3 descriptor for MTP initor;"Mike Lockwood2014-10-291-0/+9
| |\
| | * MTP Device: Parse USB3 descriptor for MTP initor;Bo Huang2014-09-261-0/+9
* | | am d5923409: mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-212-1/+43
|\ \ \
| * | | mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-202-1/+43
* | | | am eecb7805: NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-212-36/+48
|\ \ \ \ | |/ / /
| * | | NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-202-36/+48
* | | | am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring trac...Andy Hung2014-10-171-1/+4
|\ \ \ \ | |/ / /
| * | | Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-devAndy Hung2014-10-171-1/+4
| |\ \ \
| | * | | Fix AudioTrack retrograde getPosition when restoring tracksAndy Hung2014-10-171-1/+4
* | | | | Merge "move audio sink open/close to NuPlayerRenderer" into lmp-devChong Zhang2014-10-174-123/+223
|\ \ \ \ \ | |/ / / /
| * | | | Merge "move audio sink open/close to NuPlayerRenderer" into lmp-devChong Zhang2014-10-174-123/+223
| |\ \ \ \
| | * | | | move audio sink open/close to NuPlayerRendererChong Zhang2014-10-164-123/+223
| | |/ / /
* | | | | am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
|\ \ \ \ \
| * \ \ \ \ am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-161-0/+2
* | | | | | am c40da54b: Merge "Fix freed memory references" into lmp-devLajos Molnar2014-10-161-3/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Fix freed memory references" into lmp-devLajos Molnar2014-10-161-3/+8
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix freed memory referencesMarco Nelissen2014-10-161-3/+8
* | | | | | am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
| |\ \ \ \ \
| | * | | | | ACodec: only check crop rect on output portLajos Molnar2014-10-071-2/+10
* | | | | | | 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 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
| | | |/ / / / | | |/| | | |