summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am 9ac0177d: am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateFor...Eric Laurent2014-11-141-2/+0
|\
| * am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ...Eric Laurent2014-11-141-2/+0
| |\
| | * Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-devEric Laurent2014-11-141-2/+0
| | |\
| | | * remove AudioSystem::getOutputSamplingRateForAttr()Eric Laurent2014-11-121-2/+0
* | | | am 102b17b8: am 41907c44: am cede28e2: Merge "stagefright: add runtime debug ...Lajos Molnar2014-11-142-0/+66
|\ \ \ \ | |/ / /
| * | | am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" into...Lajos Molnar2014-11-142-0/+66
| |\ \ \ | | |/ /
| | * | Merge "stagefright: add runtime debug support" into lmp-mr1-devLajos Molnar2014-11-142-0/+66
| | |\ \
| | | * | stagefright: add runtime debug supportLajos Molnar2014-11-122-0/+66
| | | |/
* | | | am b6c785ee: am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in ...Chong Zhang2014-11-141-4/+0
|\ \ \ \ | |/ / /
| * | | am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode fo...Chong Zhang2014-11-141-4/+0
| |\ \ \ | | |/ /
| | * | Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-devChong Zhang2014-11-131-4/+0
| | |\ \ | | | |/ | | |/|
| | | * Stagefright: use MediaCodec in async mode for recordingPraveen Chavan2014-11-121-4/+0
* | | | am 5239bad2: am b177468b: Merge "Improve AudioTrack recovery from mediaserver...Glenn Kasten2014-11-071-1/+4
|\ \ \ \ | |/ / /
| * | | am b177468b: Merge "Improve AudioTrack recovery from mediaserver death" into ...Glenn Kasten2014-11-071-1/+4
| |\ \ \ | | |/ /
| | * | Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-devGlenn Kasten2014-11-071-1/+4
| | |\ \
| | | * | Improve AudioTrack recovery from mediaserver deathGlenn Kasten2014-11-051-1/+4
* | | | | am f8d051fe: am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to o...Dan Stoza2014-11-072-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailab...Dan Stoza2014-11-072-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-072-2/+2
| | |\ \ \
| | | * | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-042-2/+2
| | | |/ /
* | | | | am caf27abc: am 7e88fac0: Merge "AudioSystem: remove obsolete method." into l...Eric Laurent2014-11-071-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 7e88fac0: Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev au...Eric Laurent2014-11-071-2/+0
| |\ \ \ \ | | |/ / /
| | * | | AudioSystem: remove obsolete method.Eric Laurent2014-11-061-2/+0
| | | |/ | | |/|
* | | | am 6e0da022: am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugi...Jeff Tinker2014-11-061-1/+2
|\ \ \ \ | |/ / /
| * | | am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format c...Jeff Tinker2014-11-061-1/+2
| |\ \ \ | | |/ /
| | * | Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-devJeff Tinker2014-11-061-1/+2
| | |\ \
| | | * | Pass resolution to Crypto plugin on format changeJeff Tinker2014-11-031-1/+2
* | | | | am a4dd2e19: am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods...Jeff Tinker2014-11-061-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into lmp-mr...Jeff Tinker2014-11-061-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add missing secure stop methods" into lmp-mr1-devJeff Tinker2014-11-061-1/+2
| | |\ \ \ | | | |/ /
| | | * | Add missing secure stop methodsJeff Tinker2014-10-311-1/+2
| | | |/
* | | | am 5fa013ea: am 7e31774e: am 74adca9a: IAudioPolicyService: bound array size ...Eric Laurent2014-11-051-2/+7
|\ \ \ \ | |/ / /
| * | | am 7e31774e: am 74adca9a: IAudioPolicyService: bound array size in queryDefau...Eric Laurent2014-11-051-2/+7
| |\ \ \ | | |/ /
| | * | IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-051-2/+7
| | |/
* | | am eb9ee3c0: do not hold mNotifyLock when calling MediaPlayer::notify automer...Chong Zhang2014-10-281-2/+9
|\ \ \ | |/ /
| * | do not hold mNotifyLock when calling MediaPlayer::notify automerge: df2592bChong Zhang2014-10-281-2/+9
| |\ \ | | |/
| | * do not hold mNotifyLock when calling MediaPlayer::notifyChong Zhang2014-10-271-2/+9
* | | am 11f437a6: am edcff417: am 42aae0c4: am f04e8b5e: am 25842048: Merge "stage...Lajos Molnar2014-10-221-0/+1
|\ \ \ | |/ /
| * | am edcff417: am 42aae0c4: am f04e8b5e: am 25842048: Merge "stagefright: try t...Lajos Molnar2014-10-221-0/+1
| |\ \ | | |/
| | * Merge "stagefright: try to free codec instance if MediaCodec.release hangs" i...Lajos Molnar2014-10-221-0/+1
| | |\
| | | * stagefright: try to free codec instance if MediaCodec.release hangsLajos Molnar2014-10-211-0/+1
* | | | am ccaf667e: am ffe39811: am 8274b049: am cd3fc4e3: am 6ce19d24: Merge "Stage...Lajos Molnar2014-10-221-0/+1
|\ \ \ \ | |/ / /
| * | | am ffe39811: am 8274b049: am cd3fc4e3: am 6ce19d24: Merge "Stagefright: Media...Lajos Molnar2014-10-221-0/+1
| |\ \ \ | | |/ /
| | * | Stagefright: MediaCodec: shutdown allocated codec on errorPraveen Chavan2014-10-211-0/+1
| | |/
* | | am 3d54bda8: am bd15f216: am feea7c3b: am af238382: Merge "Fix VideoFrame cla...Marco Nelissen2014-10-101-1/+4
|\ \ \ | |/ /
| * | am bd15f216: am feea7c3b: am af238382: Merge "Fix VideoFrame class layout for...Marco Nelissen2014-10-101-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
* | | | Check for duplicate uuids when parsing audio_effects.confMarco Nelissen2014-10-081-0/+2
* | | | am 9d06b802: am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate ou...Rachad2014-10-071-0/+2
|\ \ \ \ | |/ / /