summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 48cb6d7c: Merge "Fix short sound playback" into lmp-mr1-devMarco Nelissen2014-11-111-0/+4
|\
| * Merge "Fix short sound playback" into lmp-mr1-devMarco Nelissen2014-11-101-0/+4
| |\
| | * Fix short sound playbackMarco Nelissen2014-11-051-0/+4
* | | am 21efaad1: Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequ...Robert Shih2014-11-102-11/+18
|\ \ \ | |/ /
| * | Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs" in...Robert Shih2014-11-102-11/+18
| |\ \
| | * | GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUsRobert Shih2014-11-102-11/+18
* | | | am eb0827f3: am c5160b34: Merge "Remove the executable bit from source files"Glenn Kasten2014-11-1091-0/+0
|\ \ \ \
| * \ \ \ am c5160b34: Merge "Remove the executable bit from source files"Glenn Kasten2014-11-1091-0/+0
| |\ \ \ \
| | * | | | Remove the executable bit from source filesMartin Storsjo2014-11-0791-0/+0
| | * | | | Resolve conflictThe Android Open Source Project2014-11-06358-10568/+34032
| | |\ \ \ \
* | | \ \ \ \ am 53fea876: Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-dev...Robert Shih2014-11-101-0/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-devRobert Shih2014-11-101-0/+4
| |\ \ \ \ \ \
| | * | | | | | HTTPLiveSource: NULL check in getFormatRobert Shih2014-11-081-0/+4
| | | |_|_|/ / | | |/| | | |
* | | | | | | am b177468b: Merge "Improve AudioTrack recovery from mediaserver death" into ...Glenn Kasten2014-11-072-19/+31
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-devGlenn Kasten2014-11-072-19/+31
| |\ \ \ \ \ \
| | * | | | | | Improve AudioTrack recovery from mediaserver deathGlenn Kasten2014-11-052-19/+31
| | |/ / / / /
* | | | | | | am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailab...Dan Stoza2014-11-073-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-073-3/+3
| |\ \ \ \ \ \
| | * | | | | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-043-3/+3
* | | | | | | | am 7e88fac0: Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev au...Eric Laurent2014-11-071-15/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "AudioSystem: remove obsolete method." into lmp-mr1-devEric Laurent2014-11-071-15/+0
| |\ \ \ \ \ \ \
| | * | | | | | | AudioSystem: remove obsolete method.Eric Laurent2014-11-061-15/+0
* | | | | | | | | am 113adbbc: resolved conflicts for merge of bcf093bf to stage-aosp-masterNarayan Kamath2014-11-071-1/+13
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | resolved conflicts for merge of bcf093bf to stage-aosp-masterNarayan Kamath2014-11-071-1/+13
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Fix definining of ANDROID_SMP.Ian Rogers2014-11-061-1/+14
* | | | | | | | am d11895bc: am 62fe78b6: Merge "Fix memory leak" into lmp-mr1-devGlenn Kasten2014-11-071-3/+3
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge "Fix memory leak" into lmp-mr1-devGlenn Kasten2014-11-071-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Fix memory leakGlenn Kasten2014-11-061-3/+3
* | | | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / /