summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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 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 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 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 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 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 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 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 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
| |/
* | 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 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 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 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
* | | am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers ...Rachad2014-10-071-0/+2
|\ \ \ | |/ /
| * | Merge "stagefright: do not allocate output buffers for tunneled playback" int...Rachad2014-10-071-0/+2
| |\ \
| | * | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-281-0/+2
* | | | am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue available buffer...Chong Zhang2014-10-041-1/+1
|\ \ \ \ | |/ / /
| * | | MediaRecorder: only dequeue available buffers from MediaCodecChong Zhang2014-10-031-1/+1
| | |/ | |/|
* | | am 57c27c55: am dc28fa7e: Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
|\ \ \ | |/ / |/| |
| * | Add missing #includesBernhard Rosenkraenzer2014-09-274-2/+7
* | | mediarecorder: set level if setting default profileLajos Molnar2014-10-021-2/+8
* | | stagefright: move math templates into AUtils.hLajos Molnar2014-10-011-0/+65
* | | Merge "add AAC audio decoder params for PCM limiter enable" into lmp-devChong Zhang2014-10-011-1/+2
|\ \ \
| * | | add AAC audio decoder params for PCM limiter enableChong Zhang2014-10-011-1/+2
* | | | GenericSource: support disconnect before NuCachedSource2 is createdRobert Shih2014-10-011-1/+5
* | | | audio: fix stream type for accessibility usageEric Laurent2014-09-252-0/+4
|/ / /
* | | Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" in...Andy Hung2014-09-221-1/+1
|\ \ \
| * | | MediaCodec: Fix deallocated pointer reference when calling reset()Andy Hung2014-09-221-1/+1