summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue discontinity signal...Wei Jia2014-11-079-57/+55
|\
| * Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resul...Wei Jia2014-11-069-57/+55
| |\
| | * AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted fro...Wei Jia2014-11-069-57/+55
* | | am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format c...Jeff Tinker2014-11-064-1/+41
|\ \ \ | |/ /
| * | Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-devJeff Tinker2014-11-064-1/+41
| |\ \
| | * | Pass resolution to Crypto plugin on format changeJeff Tinker2014-11-034-1/+41
* | | | am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into lmp-mr...Jeff Tinker2014-11-063-2/+71
|\ \ \ \ | |/ / /
| * | | Merge "Add missing secure stop methods" into lmp-mr1-devJeff Tinker2014-11-063-2/+71
| |\ \ \ | | |/ /
| | * | Add missing secure stop methodsJeff Tinker2014-10-313-2/+71
* | | | am 7e31774e: am 74adca9a: IAudioPolicyService: bound array size in queryDefau...Eric Laurent2014-11-051-3/+6
|\ \ \ \ | |/ / /
| * | | IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-051-3/+6
* | | | am 5ae9280b: Merge "audio: fix talkback why alarm is playing" into lmp-mr1-de...Eric Laurent2014-11-041-4/+11
|\ \ \ \ | |/ / /
| * | | Merge "audio: fix talkback why alarm is playing" into lmp-mr1-devEric Laurent2014-11-041-4/+11
| |\ \ \ | | |_|/ | |/| |
| | * | audio: fix talkback why alarm is playingEric Laurent2014-11-031-4/+11
* | | | am 7957cf09: am d9cfeb44: Support speaker routing for FLAG_BEACONJean-Michel Trivi2014-11-011-2/+10
|\ \ \ \ | |/ / /
| * | | Support speaker routing for FLAG_BEACONJean-Michel Trivi2014-10-311-2/+10
* | | | am b0163c6d: AudioTrack::flush() will no longer flush later data automerge: 2...Glenn Kasten2014-10-311-5/+22
|\ \ \ \ | |/ / /
| * | | AudioTrack::flush() will no longer flush later dataGlenn Kasten2014-10-301-5/+22
| |/ /
* | | am b2147445: am 7011ee31: Merge "NuPlayer: reduce offload pause teardown time...Eric Laurent2014-10-312-2/+2
|\ \ \ | |/ /
| * | Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-devEric Laurent2014-10-292-2/+2
| |\ \
| | * | NuPlayer: reduce offload pause teardown timeout.Eric Laurent2014-10-292-2/+2
* | | | am 97d84d7f: am cde2b722: Merge "NuPlayer: merge start() and resume()." into ...Wei Jia2014-10-313-105/+103
|\ \ \ \ | |/ / /
| * | | Merge "NuPlayer: merge start() and resume()." into lmp-mr1-devWei Jia2014-10-293-105/+103
| |\ \ \ | | |_|/ | |/| |
| | * | NuPlayer: merge start() and resume().Wei Jia2014-10-283-105/+103
| | |/
* | | am 0d277600: am eac3f36c: Merge "fix deep buffer logic in NuPlayer." into lmp...Eric Laurent2014-10-302-7/+8
|\ \ \ | |/ /
| * | Merge "fix deep buffer logic in NuPlayer." into lmp-mr1-devEric Laurent2014-10-282-7/+8
| |\ \
| | * | fix deep buffer logic in NuPlayer.Eric Laurent2014-10-282-7/+8
| | |/
* | | am 447326d2: am aac745f2: Merge "libmedia: ensure mCaptureThread exit within ...Glenn Kasten2014-10-301-7/+12
|\ \ \ | |/ /
| * | Merge "libmedia: ensure mCaptureThread exit within Visualizer destructor" int...Glenn Kasten2014-10-281-7/+12
| |\ \ | | |/ | |/|
| | * libmedia: ensure mCaptureThread exit within Visualizer destructorHaynes Mathew George2014-10-281-7/+12
* | | am 841daebc: am 686a0c4d: Merge "MTP Device: Parse USB3 descriptor for MTP in...Mike Lockwood2014-10-291-0/+9
|\ \ \
| * \ \ 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
| |\ \ \ \ \
| * \ \ \ \ \ am eecb7805: NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-212-36/+48
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring trac...Andy Hung2014-10-171-1/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "move audio sink open/close to NuPlayerRenderer" into lmp-devChong Zhang2014-10-174-123/+223
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 8a8f2fdc: 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
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 1375ac6d: Merge "NuPlayer: query current position from NuPlayerRenderer." ...Lajos Molnar2014-10-146-225/+194
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 2edda09a to lmp-dev-plus-aospLajos Molnar2014-10-1410-362/+454
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 512e9792: stagefright: support passing GraphicBuffer in metadata bufferLajos Molnar2014-10-144-21/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e760de61: Merge "NuPlayerDriver: request seek notification when prepare*()...Wei Jia2014-10-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat...Chong Zhang2014-10-132-1/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7225187b: Merge "ACodec: process deferred messages when entering Loaded st...Wei Jia2014-10-131-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPo...Guang Zhu2014-10-131-21/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat...Chong Zhang2014-10-101-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into ...Lajos Molnar2014-10-101-9/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \