summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update dynamic resampler buffer fetching"Andy Hung2014-05-291-6/+16
|\
| * Update dynamic resampler buffer fetchingAndy Hung2014-05-281-6/+16
| | | | | | | | | | | | | | | | | | Make the criteria tight for fetching to avoid storing excessive frame data internal to the resampler. This should reduce jitter in frame delivery computation. Bug: 14962343 Change-Id: I7adaf714d11c272696ccdbf218bda994c7217477
* | Merge "Add audio policy support for A2DP sink"Mike Lockwood2014-05-281-0/+7
|\ \
| * | Add audio policy support for A2DP sinkMike Lockwood2014-05-281-0/+7
| |/ | | | | | | Change-Id: Ifcad9c1d4bdb79668e03a31d843ec46670dd0bd8
* | Merge "IAudioPolicyService interface extension for patch panel"Eric Laurent2014-05-283-0/+90
|\ \
| * | IAudioPolicyService interface extension for patch panelEric Laurent2014-05-273-0/+90
| | | | | | | | | | | | Change-Id: I0a62e5416edc41c3a0e816275085ab18a23066f1
* | | Merge "audioflinger: first patch panel implementation."Eric Laurent2014-05-2813-285/+1312
|\ \ \ | |/ /
| * | audioflinger: first patch panel implementation.Eric Laurent2014-05-2713-285/+1312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new PatchPanel subclass to AudioFlinger to handle audio ports and audio patches configuration and connection. The first implementation does not add new functionnality. AudioPolicyManager uses patch panel interface to control device routing. AudioFlinger: - Added PatchPanel class. The first implementation does not add new functionnality. PatchPanel handles routing commands for audio HAL after 3.0 or converts to setParameters for audio HALs before 3.0. - Added config events to ThreadBase to control synchronized audio patch connection. AudioPolicyManager: - Use PatchPanel API to control device selection isntead of setParameters. - New base class AudioPort common to audio device descriptors and input output stream profiles. This class is RefBase and groups attributes common to audio ports. - Use same device selection flow for input as for outputs: getNewInputDevice -> getDeviceForInptusiource -> setInputDevice Change-Id: Idaa5a883b19a45816651c58cac697640dc717cd9
* | | Merge "IAudioFlinger interface extension for patch panel"Eric Laurent2014-05-281-0/+38
|\ \ \ | |/ /
| * | IAudioFlinger interface extension for patch panelEric Laurent2014-05-271-0/+38
| | | | | | | | | | | | Change-Id: Iaabe0a7e315d5725e00a74a6ed40339b98f20330
* | | Merge "Allow kFastTrackMultiplier to be specified per device"Glenn Kasten2014-05-271-1/+31
|\ \ \
| * | | Allow kFastTrackMultiplier to be specified per deviceGlenn Kasten2014-05-271-1/+31
| | | | | | | | | | | | | | | | Change-Id: I4eaaaf038df720cec4f5d9221d1b632970f9e3dd
* | | | Merge "Rename mixBuffer to mMixerBuffer in FastMixer"Andy Hung2014-05-272-20/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Rename mixBuffer to mMixerBuffer in FastMixerAndy Hung2014-05-232-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Likewise mixBufferState becomes mMixerBufferState. This harmonizes with the naming in AF::MixerThread. Change-Id: I1255d7c07cc2c6ee925d7430925236d2bd163122
* | | | Merge "Add multiple format capability to AudioMixer"Andy Hung2014-05-273-30/+217
|\ \ \ \ | |/ / /
| * | | Add multiple format capability to AudioMixerAndy Hung2014-05-233-30/+217
| | | | | | | | | | | | | | | | | | | | Change-Id: I04ac1cafd90b6ed652f8d51888ad07576678f0bc Signed-off-by: Andy Hung <hunga@google.com>
* | | | Merge "audioflinger: fix deadlock upon AudioRecord creation error"Eric Laurent2014-05-271-5/+18
|\ \ \ \ | |_|/ / |/| | |
| * | | audioflinger: fix deadlock upon AudioRecord creation errorEric Laurent2014-05-261-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioFlinger:openRecord() should not hold mClientLock when releasing the local reference on AudioRecord as the destructor will also lock mClientLock. Same fix for AudioFlinger::createTrack(). Also make sure that AudioFlinger::createEffect() holds mClientLock when clearing local reference to the Client in case of error. Regression introduced by 021cf9634ab09c0753a40b7c9ef4ba603be5c3da Bug: 15118096. Change-Id: Ie961c398c8e0460bca9b95e2ee4ce6859316c275
* | | | Merge "Move validation of frameCount from set to openRecord_l"Glenn Kasten2014-05-271-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Move validation of frameCount from set to openRecord_lGlenn Kasten2014-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This move is needed because frameCount is validated on server side for fast tracks (as should be done for normal tracks too). Change-Id: I6d99e80869fd90fab373cf60ef348c01f075fbca
* | | | Merge "Add format parameter to getTrackName() and track_t"Andy Hung2014-05-238-16/+37
|\ \ \ \ | | |/ / | |/| |
| * | | Add format parameter to getTrackName() and track_tAndy Hung2014-05-198-16/+37
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia152a839014e235fbfb656104c15d7c1b456d02e Signed-off-by: Andy Hung <hunga@google.com>
* | | | Merge "audio policy: enable use of new AudioPolicyManager"Eric Laurent2014-05-231-3/+0
|\ \ \ \
| * | | | audio policy: enable use of new AudioPolicyManagerEric Laurent2014-05-221-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not define USE_LEGACY_AUDIO_POLICY by default. By default, all devices will now use the new audio policy implementation in AudioPolicyManager.cpp To continue using the legacy audio policy implemented by AudioPolicyManagerBase in libhardware_legacy a device should define USE_LEGACY_AUDIO_POLICY in its makefile. Change-Id: I7b8cac3cbb24b11105ba6233501c7212f5985727
* | | | | Merge "Allow track buffer "allocation" to be from pipe"Glenn Kasten2014-05-233-6/+27
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Allow track buffer "allocation" to be from pipeGlenn Kasten2014-05-223-6/+27
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib9ac170f8e8b7746b3588157a56cbee3b753a1cb
* | | | | am 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off ↵Elliott Hughes2014-05-231-1/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | <sys/atomics.h>." * commit '79262cfc14a9d8b5aa29d43e84ea91eedb9492ba': Move frameworks/av off <sys/atomics.h>.
| * | | | am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0': Move frameworks/av off <sys/atomics.h>.
| | * | | | Move frameworks/av off <sys/atomics.h>.Elliott Hughes2014-05-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14903517 Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb
* | | | | | audioflinger: test min HAL version instead of currentEric Laurent2014-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibce2353b4390329b4c1a453e829178e3986c25a7
* | | | | | resolved conflicts for merge of f285c91e to masterElliott Hughes2014-05-227-79/+78
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65
| * | | | am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-227-38/+38
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd551633916d3677da4dda10aba6837bdc6803ee0': Move frameworks/av from fdprintf to POSIX dprintf.
| | * | | Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-227-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11156955 Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
| * | | | am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."Elliott Hughes2014-05-221-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '85e6e87c41bba51729cee8958a5c30157c8dc674': Restore accidentally-removed NULL timeout.
| | * | | Restore accidentally-removed NULL timeout.Elliott Hughes2014-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I933c80fea50950243f109acf8d6350013aaa811f
* | | | | Merge "camera2: Update CameraService for HAL1 shim."Ruben Brunk2014-05-225-89/+295
|\ \ \ \ \
| * | | | | camera2: Update CameraService for HAL1 shim.Ruben Brunk2014-05-215-89/+295
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the camera service to handle shim connections. Changes include: - Adds begin/end configure binder calls. - Adds cache for shim client static camera metadata. - Implements basic getCameraCharacteristic functionality for shim clients. Bug: 15116722 Bug: 15117269 Change-Id: I510c5888ca15f8e7d3b8ed1680ff1c7f8f514744
* | | | | resolved conflicts for merge of c0bf836f to masterElliott Hughes2014-05-214-13/+11
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: I5cf238fa56d6fff443b212870cf9dd7f1110e7da
| * | | | am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-224-8/+8
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '3b6da6bfb50a1c0324fb4c87326d3a477944d5fe': Move frameworks/av off private API.
| | * | | Move frameworks/av off private API.Elliott Hughes2014-05-214-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11156955 Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
* | | | | resolved conflicts for merge of b1080917 to masterElliott Hughes2014-05-212-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Iabbe3e95e29f28461ff722b550e8a9f35bd2528f
| * | | | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-222-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd084206d5a4a5364211af46e4201311933e83bfc': Move frameworks/av off __futex_syscall3.
| | * | | Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-212-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11156955 Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
* | | | | Merge "audio policy: split audio policy library"Eric Laurent2014-05-221-4/+33
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | audio policy: split audio policy libraryEric Laurent2014-05-211-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split audio policy library into a service part and a policy part. This will allow OEMs to customize the policy part: - libaudiopolicyservice for the service. - libaudiopolicymanager for the policy. Two build options can be defined in device make file to select the policy library: - USE_LEGACY_AUDIO_POLICY = 1: this will use the legacy policy in hardware/libhardware_legacy implemented by AudioPolicyManagerBase class. This policy is loaded as a harware module and exposes the audio policy HAL defined in include/hardware/audio_policy.h and is in a library called audio_policy.XXX.so (e.g audio_policy.default.so) The legacy HAL will not be updated with new features. If USE_LEGACY_AUDIO_POLICY is not defined, the policy is implemented by a class named AudioPolicyManager exposing an interface defined in AudioPolicyInterface.h. The corresponding library is libaudiopolicymanager.so. New features will be added only to AudioPolicyInterface.h The default implementation is provided here in file AudioPolicyManager.cpp OEMs wanting to cutomize the policy can implement the AudioPolicyManager class and provide the libaudiopolicymanager.so library. In this case the device make file should define: - USE_CUSTOM_AUDIO_POLICY = 1 For now, USE_LEGACY_AUDIO_POLICY = 1 is forced in audio policy service make file. This will be removed when the new audio policy is enabled. Change-Id: I066799dacc9b182b468a43d48ff7798c9109a414
* | | | | Merge "audio policy: add new audio devices"Eric Laurent2014-05-201-0/+12
|\ \ \ \ \
| * | | | | audio policy: add new audio devicesEric Laurent2014-05-191-0/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add entries for new audio devices to string to enum table used for audio_policy.conf file parsing. Change-Id: Ica04c34af037d890a343af0b9eeb2ff0e5c86b02
* | | | | Merge "Update AudioMixer::getTrackName to save channelMask"Andy Hung2014-05-202-12/+9
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Update AudioMixer::getTrackName to save channelMaskAndy Hung2014-05-162-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4fb4abbff1b05bdd0f6e21b5f5f4c3f2a57ae28d Signed-off-by: Andy Hung <hunga@google.com>
* | | | | Merge "Use new channel count functions for audio masks"Andy Hung2014-05-194-10/+14
|\ \ \ \ \ | |/ / / /