summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | am 5239bad2: am b177468b: Merge "Improve AudioTrack recovery from ↵Glenn Kasten2014-11-071-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mediaserver death" into lmp-mr1-dev automerge: e662cd5 * commit '5239bad27472b9ae42be924a98850683e5e70476': Improve AudioTrack recovery from mediaserver death
| * | | | | | | am b177468b: Merge "Improve AudioTrack recovery from mediaserver death" into ↵Glenn Kasten2014-11-071-1/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: e662cd5 * commit 'b177468bb1647c79ba48cd0a172cf3306b31ad69': Improve AudioTrack recovery from mediaserver death
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix race condition in handling of binder death notifications. AudioSystem has a mixture of APIs for both ordinary app clients, and the AudioFlinger and AudioPolicy services within mediaserver. Due to this mix of uses, it is possible for there to be "surprising" sequences of calls on the call stack. Previously, we used a single mutex for all global variables, but this caused a deadlock. To avoid the deadlock, we unlocked the mutex during the critical sequence of calls. But this was a a crucial place where it should have stayed locked; see Change-Id I315c1c5066f62b05e1c13b04fae1272b5fbce977 Now we use separate mutexes for the AudioFlinger, AudioPolicy, and audio port related global variables. This allows us to correctly hold each mutex throughout the atomic region, even when AudioFlinger calls AudioPolicy via AudioSystem, or vice-versa. 2. AudioSystem::clearAudioConfigCache now clears the IAudioFlinger reference. 3. Make AudioSystem::get_audio_policy_service more like get_audio_flinger. Bug: 18242291 Change-Id: I9761443d8337df5bf66d4ca2316a9fd0bd11be94
* | | | | | | | | am f8d051fe: am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to ↵Dan Stoza2014-11-072-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onFrameAvailable" into lmp-mr1-dev * commit 'f8d051fee37b1a0734e4142072d3053fed8df161': Add a BufferItem parameter to onFrameAvailable
| * | | | | | | | am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to ↵Dan Stoza2014-11-072-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onFrameAvailable" into lmp-mr1-dev * commit '034d674721029e3b7e34fe30ee31814c521b62bf': Add a BufferItem parameter to onFrameAvailable
| | * | | | | | | 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
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passes the BufferItem for the queued buffer to the onFrameAvailable callback so the consumer can track the BufferQueue's contents. Bug: 18111837 Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
* | | | | | | | | am caf27abc: am 7e88fac0: Merge "AudioSystem: remove obsolete method." into ↵Eric Laurent2014-11-071-2/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: c339a92 * commit 'caf27abc62e15abc628c04183d3188728fe98990': AudioSystem: remove obsolete method.
| * | | | | | | | am 7e88fac0: Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev ↵Eric Laurent2014-11-071-2/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: c339a92 * commit '7e88fac080e3bb1cdc95667f82727ea6c19fb173': AudioSystem: remove obsolete method.
| | * | | | | | | AudioSystem: remove obsolete method.Eric Laurent2014-11-061-2/+0
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18067208. Change-Id: I9bbf9088485f5162c765ca504d9b784b956234c6
* | | | | | | | am 6e0da022: am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto ↵Jeff Tinker2014-11-061-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugin on format change" into lmp-mr1-dev * commit '6e0da0226503ddea118d43962a76fa2fa56bad1e': Pass resolution to Crypto plugin on format change
| * | | | | | | am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format ↵Jeff Tinker2014-11-061-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change" into lmp-mr1-dev * commit 'e0e8223c10e051b73fdcbed4fc67a69df2655c56': Pass resolution to Crypto plugin on format change
| | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56cd557ce3525fe625db8c312d2557d3c8b51101 related-to-bug: 16034599
* | | | | | | | | am a4dd2e19: am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop ↵Jeff Tinker2014-11-061-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods" into lmp-mr1-dev * commit 'a4dd2e19f917f25b3eee36f499b126dc115e5446': Add missing secure stop methods
| * | | | | | | | am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into ↵Jeff Tinker2014-11-061-1/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe': Add missing secure stop methods
| | * | | | | | | 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
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18053197 b/18076411 Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
* | | | | | | | am 5fa013ea: am 7e31774e: am 74adca9a: IAudioPolicyService: bound array size ↵Eric Laurent2014-11-051-2/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in queryDefaultPreProcessing * commit '5fa013ea79066ec47589f38f94f557d021bd56eb': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| * | | | | | | am 7e31774e: am 74adca9a: IAudioPolicyService: bound array size in ↵Eric Laurent2014-11-051-2/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queryDefaultPreProcessing * commit '7e31774e7195bc0479e1a09b2ef8a114e893598f': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | * | | | | | IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-051-2/+7
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18226810. Change-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124
* | | | | | | am eb9ee3c0: do not hold mNotifyLock when calling MediaPlayer::notify ↵Chong Zhang2014-10-281-2/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: df2592b automerge: ff41266 * commit 'eb9ee3c08f3e397a726395f8658a087fb659e780': do not hold mNotifyLock when calling MediaPlayer::notify
| * | | | | | do not hold mNotifyLock when calling MediaPlayer::notify automerge: df2592bChong Zhang2014-10-281-2/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: ff41266 * commit 'ff412661240d6ad34800512cb60841f8b0700107': do not hold mNotifyLock when calling MediaPlayer::notify
| | * | | | | do not hold mNotifyLock when calling MediaPlayer::notifyChong Zhang2014-10-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:18120688 Change-Id: Ia66dcfc3fd2d67d1ceba9808d21e0120cc8691d6
* | | | | | | am 11f437a6: am edcff417: am 42aae0c4: am f04e8b5e: am 25842048: Merge ↵Lajos Molnar2014-10-221-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "stagefright: try to free codec instance if MediaCodec.release hangs" into lmp-dev * commit '11f437a6665167d8aee6db59df6e4753aa190bf7': stagefright: try to free codec instance if MediaCodec.release hangs
| * | | | | | am edcff417: am 42aae0c4: am f04e8b5e: am 25842048: Merge "stagefright: try ↵Lajos Molnar2014-10-221-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to free codec instance if MediaCodec.release hangs" into lmp-dev * commit 'edcff417bbb2e76245b559e7c9a8b98c2a60e102': stagefright: try to free codec instance if MediaCodec.release hangs
| | * | | | | Merge "stagefright: try to free codec instance if MediaCodec.release hangs" ↵Lajos Molnar2014-10-221-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| | | * | | | | stagefright: try to free codec instance if MediaCodec.release hangsLajos Molnar2014-10-211-0/+1
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Bug: 18033275 Change-Id: If86cd26566d7b75941976f37829bbec619800778
* | | | | | | am ccaf667e: am ffe39811: am 8274b049: am cd3fc4e3: am 6ce19d24: Merge ↵Lajos Molnar2014-10-221-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Stagefright: MediaCodec: shutdown allocated codec on error" into lmp-dev * commit 'ccaf667eb6e96a28caedb0d4f776b1ff9c4aed10': Stagefright: MediaCodec: shutdown allocated codec on error
| * | | | | | am ffe39811: am 8274b049: am cd3fc4e3: am 6ce19d24: Merge "Stagefright: ↵Lajos Molnar2014-10-221-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodec: shutdown allocated codec on error" into lmp-dev * commit 'ffe398116e5049e80ac818dbc621f06fe0196038': Stagefright: MediaCodec: shutdown allocated codec on error
| | * | | | | Stagefright: MediaCodec: shutdown allocated codec on errorPraveen Chavan2014-10-211-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If MediaCodec sees a fatal error and transitions to UNINITIALIZED state, The codec may still be alive (with an exception of 'mediaserver-died' error). Handle Shutdown of the codec during release(). Bug: 17784012 Bug: 18033275 Change-Id: I891e036499d9b440a57f77fb735a5ba4da9a6e43
* | | | | | am 3d54bda8: am bd15f216: am feea7c3b: am af238382: Merge "Fix VideoFrame ↵Marco Nelissen2014-10-101-1/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class layout for 64/32 bit" into lmp-dev * commit '3d54bda88e5c0e251c93367c81a316859cc17c1e': Fix VideoFrame class layout for 64/32 bit
| * | | | | am bd15f216: am feea7c3b: am af238382: Merge "Fix VideoFrame class layout ↵Marco Nelissen2014-10-101-1/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for 64/32 bit" into lmp-dev * commit 'bd15f216197c1866f0a20d7a4af3eabb9edf6261': Fix VideoFrame class layout for 64/32 bit
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This structure is passed between 64 and 32 bit processes via shared memory, so ensure it's the same size, and that the members we care about are in the same place. Bug: 17569156 Change-Id: Id776bc825af1fbf43a6dd3407cca064f6d932902
* | | | | | Check for duplicate uuids when parsing audio_effects.confMarco Nelissen2014-10-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uuids need to be unique, and things don't work properly when they're not. Also fix/enhance/extend the dumpEffectDescriptor() method, and include a list of effects in audioflinger dumpsys. Change-Id: I3dfbc5ed0f7272c7809e337f2929212ece047ee4
* | | | | | am 9d06b802: am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate ↵Rachad2014-10-071-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output buffers for tunneled playback" into lmp-dev * commit '9d06b8026d551c24527d6f72f134046d94068c46': stagefright: do not allocate output buffers for tunneled playback
| * | | | | am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers ↵Rachad2014-10-071-0/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for tunneled playback" into lmp-dev * commit '42fc04ff4db20f2de12834818a73778ec9ede052': stagefright: do not allocate output buffers for tunneled playback
| | * | | | Merge "stagefright: do not allocate output buffers for tunneled playback" ↵Rachad2014-10-071-0/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | into lmp-dev
| | | * | | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allocate native window buffers for tunneled video playback codecs. Bug: 17112525 Change-Id: I262d8030a9df6188938fde5d62ebce8faf7dba1f
* | | | | | am bb2c8147: am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue ↵Chong Zhang2014-10-041-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available buffers from MediaCodec" into lmp-dev * commit 'bb2c8147452144a19f45bc2e58f1885cec40b8dc': MediaRecorder: only dequeue available buffers from MediaCodec
| * | | | | am dfc2a8f8: am f0011d49: Merge "MediaRecorder: only dequeue available ↵Chong Zhang2014-10-041-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers from MediaCodec" into lmp-dev * commit 'dfc2a8f8a7d5062ecb2af4b940e54c3ce52795e3': MediaRecorder: only dequeue available buffers from MediaCodec
| | * | | | MediaRecorder: only dequeue available buffers from MediaCodecChong Zhang2014-10-031-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Bug: 17514968 Change-Id: If232f92d163deb2440b927315c69e0c4d51ca290
* | | | | am 6b95616b: am 57c27c55: am dc28fa7e: Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '6b95616b21c449d9332430fe9500ade56924a3a1': Add missing #includes
| * | | | am 57c27c55: am dc28fa7e: Merge "Add missing #includes"Dan Albert2014-10-044-2/+7
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| * commit '57c27c55006f0137a8ad5a87ec62eb89084dcdc6': Add missing #includes
| | * | Add missing #includesBernhard Rosenkraenzer2014-09-274-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some header files in stagefright try to use DISALLOW_EVIL_CONSTRUCTORS (and even DISALLOW_IMPLICIT_CONSTRUCTORS, which isn't defined anywhere in stagefright) without including the proper header. With clang, this results in a build failure - with gcc, it results in DISALLOW_EVIL_CONSTRUCTORS/DISALLOW_IMPLICIT_CONSTRUCTORS not doing what they were intended to do, instead appearing as a method in the DWARF debug sections of files using the headers. Change-Id: Ie4e99affe98ed8fb1bfcf5ec604c19dcd5311c62 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | am 9236887a: am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if ↵Lajos Molnar2014-10-031-2/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | setting default profile" into lmp-dev * commit '9236887ac5dfa526d1a90dd5e0a3c3095f443e70': mediarecorder: set level if setting default profile
| * | | mediarecorder: set level if setting default profileLajos Molnar2014-10-021-2/+8
| | | | | | | | | | | | | | | | | | | | Bug: 17676461 Change-Id: If01ccd09935945d330de0842be95c3544951b6b9
* | | | am f973c881: resolved conflicts for merge of 55fc6a77 to lmp-mr1-dev-plus-aospLajos Molnar2014-10-021-0/+65
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f973c881e3f3c1cbb91e4eb0e65f57bb23ed5758': stagefright: move math templates into AUtils.h
generated by cgit v1.1 at 2024-05-28 11:32:04 +0000