summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am 61280541: am 390ef843: am f20c4356: Merge "AudioRecord: use audio attribut...Eric Laurent2014-11-273-13/+18
|\
| * am 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead of...Eric Laurent2014-11-273-13/+18
| |\
| | * AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-253-13/+18
* | | am 121143d5: am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForA...Eric Laurent2014-11-264-21/+83
|\ \ \ | |/ /
| * | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy...Eric Laurent2014-11-264-21/+83
| |\ \ | | |/
| | * audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-254-21/+83
* | | am f8c2d166: am a7cf01da: Merge "Fix missing loop count for static tracks." i...Glenn Kasten2014-11-211-1/+8
|\ \ \ | |/ /
| * | am f8c2d166: am a7cf01da: Merge "Fix missing loop count for static tracks." i...Glenn Kasten2014-11-211-1/+8
| |\ \ | | |/
| | * Merge "Fix missing loop count for static tracks." into lmp-mr1-devGlenn Kasten2014-11-201-1/+8
| | |\
| | | * Fix missing loop count for static tracks.Andy Hung2014-11-181-1/+8
* | | | am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr...Eric Laurent2014-11-211-2/+2
|\ \ \ \ | |/ / /
| * | | am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr...Eric Laurent2014-11-211-2/+2
| |\ \ \ | | |/ /
| | * | AudioSystem: fix cross deadlockEric Laurent2014-11-201-2/+2
* | | | am d0e12a16: am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-201-4/+5
|\ \ \ \ | |/ / /
| * | | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-201-4/+5
| |\ \ \
| | * | | C++11 compatibility.Dan Albert2014-11-201-4/+5
* | | | | am 57426fc6: am 4fd641be: am bbda5ce4: Merge "AudioSystem: Add mutex for outp...Eric Laurent2014-11-191-4/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 4fd641be: am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" int...Eric Laurent2014-11-191-4/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | AudioSystem: Add mutex for output cacheEric Laurent2014-11-191-4/+5
* | | | | am 8c5ee61a: am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-171-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-171-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-171-1/+1
| | * | | am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-devMarco Nelissen2014-10-091-1/+4
| | |\ \ \
| | * \ \ \ am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ...Rachad2014-10-071-0/+2
| | |\ \ \ \
| | * \ \ \ \ am 57c27c55: am dc28fa7e: Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
| | |\ \ \ \ \
* | | \ \ \ \ \ 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
| |\ \ \ \ \ \ \ | | |/ / / / / /