summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Use new channel count functions for audio masksAndy Hung2014-05-164-10/+14
| | | | | Change-Id: Ia658ab4b6320d19fdb50f123c930918724ff0ef3 Signed-off-by: Andy Hung <hunga@google.com>
* Merge "Pull up mFlags and isFastTrack from Track to TrackBase"Glenn Kasten2014-05-145-10/+12
|\
| * Pull up mFlags and isFastTrack from Track to TrackBaseGlenn Kasten2014-05-135-10/+12
| | | | | | | | Change-Id: I6bd48292310be4e05758a11f617f50585904422d
* | Merge "Explicitly include Configuration.h"Glenn Kasten2014-05-132-0/+3
|\ \ | |/
| * Explicitly include Configuration.hGlenn Kasten2014-05-132-0/+3
| | | | | | | | | | | | | | | | Must include Configuration.h in any source file with #ifdef or #if that depends on Configuration.h. This avoid inconsistencies that could result in subtle bugs. Change-Id: I99fdf19d56e7c73de4e7d672b937336b932a2a00
* | Merge "Fix memory corruption if increaseSamplingN is not called"Glenn Kasten2014-05-131-1/+1
|\ \ | |/
| * Fix memory corruption if increaseSamplingN is not calledGlenn Kasten2014-05-131-1/+1
| | | | | | | | Change-Id: Icbf9aaf68c25ba3330ceb79167bd776cf0342d0d
* | AudioFlinger: add specific mutex for client listsEric Laurent2014-05-136-92/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | Add a specific mutex to protect access to mClients and mNotificationClients lists. This avoids locking the main AudioFlinger mutex from inside thread loops and allows not to worry about cross deadlocks when sending a config event with status reply while keeping the ThreadBase or AudioFlinger mutex locked. As a way of consequence, remove notification client list passed to processConfigEvents_l() and audioConfigChanged() as the list can now be accessed by locking client mutex only. Change-Id: I228022204b6709a8bb60cc96d9514a6ffe59b62e
* | Merge "audiopolicy: refactor audio command threads"Eric Laurent2014-05-122-118/+83
|\ \
| * | audiopolicy: refactor audio command threadsEric Laurent2014-05-122-118/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use strong pointers for command data to avoid transfering ownership of the object to receiver thread. This avoids waiting for the command acknowlegement to proceed with next command on server side. - Use a separate mutex for each command condition. - Factor in duplicated code to send commands. Change-Id: Ib0526e7c4fa64a71ad4015f477c6361727c6f40a
* | | am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry ↵Eino-Ville Talvala2014-05-121-0/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | count before reading it" * commit '7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0': camera: check Intent entry count before reading it
| * | am f02f06c4: Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| |\ \ | | | | | | | | | | | | | | | | * commit 'f02f06c422a58ddaca49d14f21a196eaa435d07b': camera: check Intent entry count before reading it
| | * \ Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| | |\ \
| | | * | camera: check Intent entry count before reading itYuvraj Pasi2014-05-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case when find() returns empty entry, blindly reading the entry will cause segfault Change-Id: Ib5be7fd855c409ba3b45f0d43e15237367172817
* | | | | Explicitly ignore return value of __futex_syscall3Glenn Kasten2014-05-091-2/+2
| |_|_|/ |/| | | | | | | | | | | Change-Id: Ic65f257bfc4a0eff7bdd3c44fab68a3f17e2bd08
* | | | Merge "Remove obsolete IAudioRecord::getCblk()"Glenn Kasten2014-05-092-5/+0
|\ \ \ \
| * | | | Remove obsolete IAudioRecord::getCblk()Glenn Kasten2014-05-092-5/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id20b5efd765b9796b0e391610e06dc928a829ebf
* | | | | Merge "audioflinger: refactor thread config events"Eric Laurent2014-05-094-384/+436
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | audioflinger: refactor thread config eventsEric Laurent2014-05-094-384/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge config events and set parameters messaging mechanism. - setting parameters now uses the config event mechanism - config event now allow to wait for a condition and synchronize caller binder thread with execution thread and return an execution status. - simplify locking mechanism to avoid unlocking the thread mutex while processing events. Change-Id: Ia49cb3e617abec4bacb6c1f9a8cb304c4ed3902e
* | | | | IAudioFlinger::openRecord returns IMemory(s)Glenn Kasten2014-05-096-12/+47
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | openRecord() now explicitly returns the control block and data buffer as separate IMemory references. If the IMemory for data buffer is 0, this means it immediately follows the control block. Change-Id: Ic098f88f0e037f8fbe30006689e18cacacf09d06
* | | | audio policy: fix mute delay when setting output deviceEric Laurent2014-05-081-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The duration of the temporary mute applied on each output when switching device must be more than twice the actual delay we wait for the mute to be effective at the output. Otherwise some outputs with short latencies will be unmuted before the device switch is actually executed. This change makes sure that we take the maximum wait time into account when requesting the delayed unmuting of each output. Change-Id: Id92c201b47786082a44b6a5c1c8015273835a42e
* | | | Merge "Add a per-thread heap that is read-only to clients"Glenn Kasten2014-05-082-0/+19
|\ \ \ \
| * | | | Add a per-thread heap that is read-only to clientsGlenn Kasten2014-05-072-0/+19
| | | | | | | | | | | | | | | | | | | | Change-Id: I401263566ca20fbfb565689c8fa99458d3b283b2
* | | | | Merge "audio policy: cleanup AudioPolicyService destructor"Eric Laurent2014-05-081-3/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | audio policy: cleanup AudioPolicyService destructorEric Laurent2014-05-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to clear strong pointers in the destuctor. Add explicit exit() command to mOutputCommandThread. Change-Id: I60bb248fe6a20bfd8a55358ef139692b93df0238
* | | | | Merge "Fix a couple of fast capture typo bugs"Glenn Kasten2014-05-071-2/+2
|\ \ \ \ \
| * | | | | Fix a couple of fast capture typo bugsGlenn Kasten2014-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioRecord constructor was not passing flags through to set(). Server-side check was using wrong kind of channel mask. Change-Id: Ifaa880ec323771e9fd168262be05f3e539f53390
* | | | | | audio policy: fix typo in AudioPolicyManager constructorEric Laurent2014-05-071-6/+6
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cut/paste error in new AudioPolicyManager constructor causing the same index variable to be reused in nested for loops. Change-Id: Id57ff19bf6dd8974486b07c8252029e377df2747
* | | | | Merge "audio policy: update from libhardware_legacy"Eric Laurent2014-05-072-108/+349
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | audio policy: update from libhardware_legacyEric Laurent2014-05-062-108/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge changes made to AudioPolicyManagerBase in libhardware_legacy since it was forked here: fd61179 Update policy handling for USB inputs c7b6e3c audio: allow compiling for 64-bit c26f454 Initial implementation of USB Audio output. a7b1bc9 Audio policy is 32-bit only 26101ad audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable Change-Id: I22bc883c20603a6598c6ee3ded636e9cc4d9ec03
* | | | | Merge "Camera3: fix missing string in logging code"Zhijun He2014-05-061-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Camera3: fix missing string in logging codeZhijun He2014-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I15da6bb8b586b4641837f42d2145530fb45dd0bd
* | | | | am 71171988: am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering ↵Eric Laurent2014-05-062-10/+27
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | commands in insertCommand_l()" * commit '711719885d7563068579abf347c366cf6bc906f5': Fix memory leak when filtering commands in insertCommand_l()
| * | | | am 8fb04d47: Merge "Fix memory leak when filtering commands in ↵Eric Laurent2014-05-062-10/+27
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | insertCommand_l()" * commit '8fb04d474ed9e0d1302ae223ee76fafbe5fb41a3': Fix memory leak when filtering commands in insertCommand_l()
| | * | | Merge "Fix memory leak when filtering commands in insertCommand_l()"Eric Laurent2014-05-062-10/+27
| | |\ \ \
| | | * | | Fix memory leak when filtering commands in insertCommand_l()Jesper Tragardh2014-04-112-10/+27
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When AudioPolicyService::AudioCommandThread::insertCommand_l filters a command from the queue, the AudioCommand* is removed from the vector mAudioCommands by calling mAudioCommands.removeAt(). This will destroy the pointer and compact the vector, but not delete the AudioCommand object. This patch adds code to delete a filtered out AudioCommand and its data object mParam. However, mParam was void* and deleting a void pointer is undefined behavior according to the C++ standard. Therefore, the data classes are modified to inherit from an abstract base class with a virtual destructor. The deletion of non-filtered commands in AudioPolicyService::AudioCommandThread::threadLoop() was already correct, as each case casts mParam to the proper type before deleting. This also fixes AOSP issue 36370. Change-Id: I2b63838aff3608132aa496f964a929f78c4b6267
| * | | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-297-102/+217
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS ↵Igor Murashkin2014-03-252-44/+121
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | single/range values * commit '0370be96e33ea0c8fb4069e704deccce43b7403c': DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
| | * \ \ \ am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit '4f53fe74051026e6635ba5bdbed4f1898cb66028': CameraService: deadlock fix
| | * | | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aospColin Cross2014-03-2120-70/+80
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I19e1a26bd0226119c4fe2920bf6a09aaeff315d9
| | * \ \ \ \ am 36817364: Merge "Add libaudioresampler"Glenn Kasten2014-03-191-11/+18
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36817364738d4c45adc3e448fbec02a9611bfeda': Add libaudioresampler
| | * \ \ \ \ \ am 77658a06: Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '77658a069c81a0d5b4a1b81443b470a3ea64cab0': AudioPolicyService: malloc/delete pair
| | * \ \ \ \ \ \ am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bd3e2e03f3ab686c52982a9e50cae853128172cf': camera2: Fix segfault when using null availability listener
| | * \ \ \ \ \ \ \ am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-143-0/+4
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9': mediaserver and associated services are 32-bit only
| | * \ \ \ \ \ \ \ \ am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ↵Zhijun He2014-03-101-0/+16
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is changed * commit 'bc69c8ba9a8fc881603669205a56d0ca1b572a95': DO NOT MERGE: Camera: delete preview callback when preview size is changed
| | * \ \ \ \ \ \ \ \ \ am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a11111f9135c98cf4247bbd1a61d7df3053e549e': DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
| | * \ \ \ \ \ \ \ \ \ \ am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-0717-58/+73
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01': Make frameworks/av 64-bit compatible
| | * \ \ \ \ \ \ \ \ \ \ \ am 5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in ↵Glenn Kasten2014-03-074-26/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast tracks" * commit '5930e8ebdacf3a59c13eef11fd03658ba58b443e': AudioFlinger: Remove code for supporting resampling in fast tracks
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ↵Glenn Kasten2014-03-072-5/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is required" * commit '4361749d74113069aafb0620a1189404205c58d0': AudioTrack: Never try to use the fast path if resampling is required
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-03-071-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd66cd743525cc049033caa3e81cbdf74c72a4556': audioflinger: conform inline ASM to UAL
generated by cgit v1.1 at 2024-05-04 06:13:41 +0000