summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Merge "Clear effect buffer before sending to chain" into lmp-devMarco Nelissen2014-10-201-4/+3
| | |\ \ \
| | | * | | Clear effect buffer before sending to chainMarco Nelissen2014-10-171-4/+3
| * | | | | 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
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ 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 4b21635d: am b6dcdbf4: (-s ours) Revert "audio: prevent larger than requir...Chris Elliott2014-10-160-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am b6dcdbf4: (-s ours) Revert "audio: prevent larger than required sleeps - D...Chris Elliott2014-10-160-0/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE"Chris Elliott2014-10-161-21/+1
| * | | | | | | | | am a2d4a6da: audio policy: Fix for voice call audio lossHaynes Mathew George2014-10-161-0/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | audio policy: Fix for voice call audio lossHaynes Mathew George2014-10-151-0/+20
| * | | | | | | | | am 05c0d7d7: am 620208dc: (-s ours) audio: prevent larger than required sleep...Chris Elliott2014-10-150-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 620208dc: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGEChris Elliott2014-10-150-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | audio: prevent larger than required sleeps - DO NOT MERGEChris Elliott2014-10-151-1/+21
| * | | | | | | | | am 54599682: am 2feb18dd: (-s ours) Revert "audio: prevent larger than requir...Chris Elliott2014-10-150-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 2feb18dd: (-s ours) Revert "audio: prevent larger than required sleeps - D...Chris Elliott2014-10-150-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | / / / | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE"Chris Elliott2014-10-151-21/+1
| * | | | | | | | am 9d2189ff: Merge "Camera2Client: avoid two consecutive sets of configure_st...Zhijun He2014-10-141-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" ...Zhijun He2014-10-141-0/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Camera2Client: avoid two consecutive sets of configure_streams callsZhijun He2014-10-141-0/+4
| * | | | | | | | | am 95740336: am 8c0417c1: (-s ours) audio: prevent larger than required sleep...Haynes Mathew George2014-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 8c0417c1: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGEHaynes Mathew George2014-10-140-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | audio: prevent larger than required sleeps - DO NOT MERGEHaynes Mathew George2014-10-141-1/+21
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /