summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | |/ / /
| * | | 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 bb2c8147: am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue ava...Chong Zhang2014-10-041-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 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 6b95616b: am 57c27c55: am dc28fa7e: Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
|\ \ \ \ | |/ / /
| * | | am 57c27c55: am dc28fa7e: Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
| |\ \ \ | | |/ / | |/| |
| | * | Add missing #includesBernhard Rosenkraenzer2014-09-274-2/+7
* | | | am 9236887a: am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if set...Lajos Molnar2014-10-031-2/+8
|\ \ \ \ | |/ / /
| * | | mediarecorder: set level if setting default profileLajos Molnar2014-10-021-2/+8
* | | | am f973c881: resolved conflicts for merge of 55fc6a77 to lmp-mr1-dev-plus-aospLajos Molnar2014-10-021-0/+65
|\ \ \ \ | |/ / /
| * | | stagefright: move math templates into AUtils.hLajos Molnar2014-10-011-0/+65
* | | | am bc6b959b: am 52cb10c4: am d0b9efe7: Merge "add AAC audio decoder params fo...Chong Zhang2014-10-021-1/+2
|\ \ \ \ | |/ / /
| * | | 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