summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* camera2: Set orientation flags for hardware composer.Ruben Brunk2014-07-141-84/+2
| | | | | Bug: 15116722 Change-Id: I3fcc9aea38afcbd665f86c511a9929fe9a6a3a8f
* Merge "audiopolicy: remove debug log in AudioPolicyEffects.cpp"Eric Laurent2014-07-111-1/+1
|\
| * audiopolicy: remove debug log in AudioPolicyEffects.cppEric Laurent2014-07-111-1/+1
| | | | | | | | Change-Id: Ia037807a91d6649c3f47baccf8c107df496e934e
* | audio policy: add rules to select audio parametersEric Laurent2014-07-113-31/+176
|/ | | | | | | | | | Added rules to select most appropriate sampling rate, format and channel mask from an input or output profile. Moved mFlags from IOProfile to its base class AudioPort. Removed bogus mChannelMask member in DeviceDescriptor class. Improveed dump of dynamic parameters in AudioPort. Change-Id: Ic09d320386002a8bafee4a28db00b1001a386678
* stagefright: Pass audio aac sub formats in offloadinfoaarti jadhav-gaikwad2014-07-112-7/+26
| | | | | | | | Pass audio aac sub formats in offloadinfo according to aac profile. Audio HAL can take decision about offload using DSP capabilities Change-Id: If269a3654b5d2b09c183212b0646ef03e06f2d8f
* Merge "Return negotiated format with HAL in AudioFlinger"Andy Hung2014-07-102-5/+11
|\
| * Return negotiated format with HAL in AudioFlingerAndy Hung2014-07-102-5/+11
| | | | | | | | | | | | | | | | Fixes an issue caused by extended precision and the FastMixer when the format to the FastMixer was returned instead of the HAL format. Change-Id: I2be9d55d5c87d82e46b5200b07fcdd986ebde08a
* | Revamp HDMI-CEC system audio mode integration with audio service.Jungshik Jang2014-07-101-21/+5
|/ | | | | | | | | | | | | | | | | | | | In previous change we use setForceUse(FORCE_MEDIA, XXX) method in order to set specific audio output type, such as LINE, HDMI_ARC, and SPDIF. But it turns out that it conflicts with bluetooth a2dp which uses the same setForceUse(FORCE_MEDIA, yyy). This change is based on several conditions. 1. When other non-speaker devices are on, prevent system audio from turing on. 2. In order to keep track of other devices' connectivity and to turn off system audio if other device like bluetooth or headphone preempts current output, register OnAudioPortChangeListner to audio manager. 3. All possible system audio outputs can be merged with other outputs without priority. Change-Id: Ic5ccc80f9b48fb77433c347de7969837c69e58c1
* Merge "Add floating point volume handling to AudioMixer"Andy Hung2014-07-0813-114/+291
|\
| * Add floating point volume handling to AudioMixerAndy Hung2014-07-0813-114/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use floating point volume in AudioMixer mixing when floating point input is used with the new mixer engine. AudioResampler is updated to take floating point volume to match. Both legacy integer and floating point mixer engines work. For now, integer volume is used when the new mixer engine runs in integer input mode, for backward compatibility with the legacy mixer. The new mixer engine will generally run in floating point input mode. When the legacy path is removed, the integer volumes will be removed. Change-Id: I79e80c292ae7c8b8bdd0aa371a1b2c3a1b618290
* | Merge "Enable extended precision PCM output in AudioFlinger"Andy Hung2014-07-091-1/+1
|\ \
| * | Enable extended precision PCM output in AudioFlingerAndy Hung2014-07-081-1/+1
| | | | | | | | | | | | Change-Id: I7c0907c7b2369681975d8ea0192b722d7ed7a867
* | | Merge "Revise speaker volume curve for media on devices with speaker DRC"Jean-Michel Trivi2014-07-091-1/+1
|\ \ \ | |_|/ |/| |
| * | Revise speaker volume curve for media on devices with speaker DRCJean-Michel Trivi2014-07-091-1/+1
| | | | | | | | | | | | | | | | | | Bug 15318604 Change-Id: I14b451e2d8d4439fe286dd98c45d09b9dadbb4f6
* | | Merge "audio policy: add new input audio device"Terry Heo2014-07-021-0/+1
|\ \ \
| * | | audio policy: add new input audio deviceTerry Heo2014-07-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add entry for AUDIO_DEVICE_IN_LOOPBACK to string to enum table. Bug: 15437484 Change-Id: I552df0969c745bdf66ff9e5d7bd864ef9e3f438d
* | | | sound trigger: update HALEric Laurent2014-07-081-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New start_recognition() prototype with recognition configuration structure. New recognition event format. Bug: 12378680. Change-Id: I57b430eb076e6baa58118a0ed45ce4afaacb998c
* | | | Merge "Replace int bitDepth with audio_format_t in Resampler"Andy Hung2014-07-0711-59/+54
|\ \ \ \
| * | | | Replace int bitDepth with audio_format_t in ResamplerAndy Hung2014-07-0711-59/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mBitDepth from class (not used). Replace with audio_format_t in factory method to distinguish between float and pcm 16-bit. Change-Id: I166860796c68285077ef4458d8758d19b82523f9
* | | | | Camera3: Add capture intent for ZSL captureZhijun He2014-07-084-10/+56
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Also fix the warning condition in input buffer return path. Change-Id: I90e9edc1db9f1de87bc8936000b00c3306160c71
* | | | Merge "av: native_window_set_buffers_geometry is deprecated."Eino-Ville Talvala2014-07-061-2/+7
|\ \ \ \
| * | | | av: native_window_set_buffers_geometry is deprecated.Pierre Couillaud2014-07-071-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native_window_set_buffers_geometry is deprecated, but __set_buffers_geometry is still used for device1 camera support. replace deprecated call with its equivalent combination of native_window_set_buffers_dimensions and native_window_set_buffers_format. Change-Id: I4940367dcae6049451508bfdfc11c16907ec1afc Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
* | | | | Camera3: only return input buffer when it is sent in requestZhijun He2014-07-072-19/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to WAR the case where HAL sends non-NULL input_buffer in capture result even capture framework doesn't send input buffer in the request. It's very likely the input_buffer is uninitialized, and we shouldn't use it. Log a warning for such case as well. Bug: 16115675 Bug: 16117312 Change-Id: Ib299b45fbfe084059a9f546ded239c8094b039e2
* | | | | Merge "IAudioFlinger::openRecord now suggests notificationFrames"Glenn Kasten2014-07-024-1/+6
|\ \ \ \ \
| * | | | | IAudioFlinger::openRecord now suggests notificationFramesGlenn Kasten2014-07-034-1/+6
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: I08885cc381d03c522a23289e74f0e1ed46563863
* | | | | audio: deprecate audio_stream_frame_size()Eric Laurent2014-07-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15000850. Change-Id: I955a6efa620b8f70fa5193c7853cbe88e879c9c3
* | | | | Merge "Remove obsolete IAudioFlinger::channelCount()"Glenn Kasten2014-07-023-13/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove obsolete IAudioFlinger::channelCount()Glenn Kasten2014-06-023-13/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie623edae2e795f9155f1f452fe4e6c7217a4a4c8
* | | | | Merge "Add and enable multichannel for audio resampler"Andy Hung2014-07-024-56/+130
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Add and enable multichannel for audio resamplerAndy Hung2014-07-024-56/+130
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2b86fb73d70abc4c456f7567270a888086b301d4 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | Merge "Add force usage and category for System Audio Control."Jungshik Jang2014-07-021-1/+26
|\ \ \ \ \
| * | | | | Add force usage and category for System Audio Control.Jungshik Jang2014-07-021-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System Audio Control in HDMI-CEC delegate audio control to audio receiver. When system audio control is selected in audio settings as audio output it should select one of ARC, SPDIF, and LINE as audio output. Whenever user select System Audio as audio output, audio setting should call setForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM_AUDIO, AUDIO_POLICY_FORCE_XXX); and if other output is selected it should call setForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM_AUDIO, AUDIO_POLICY_FORCE_NONE); Change-Id: I1c237ee9291a4e0acf01a86aff3176edce5c14e0
* | | | | | Merge "Add multichannel to audio resample processing"Andy Hung2014-07-021-62/+146
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Add multichannel to audio resample processingAndy Hung2014-07-021-62/+146
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Change-Id: If6bfbf74000520713f9ba19488a475fc2eefc271 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | Merge "Camera3: fix ZSL processor3 issues"Zhijun He2014-07-027-38/+109
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Camera3: fix ZSL processor3 issuesZhijun He2014-07-027-38/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Return input buffer in capture result. Per hal3.2 spec, we should return the input buffer in process capture result rather than immediately after process capture request. - Make the depths of mZslQueue and mFrameList the same. It doesn't make sense mFrameList depth is larger than mZslQueue depth. - Set the depths of mZslQueue and mFrameList based on pipelineMaxDepth. - Clear result queue while clearing zsl buffer queue. - Hook up camera3 buffer listener with ZslProcessor3, make sure that adding the same listener multiple times has no effect. - Remove flush call in pushToReprocess, it is a guaranteed deadlock once camera3 buffer listener is hooked up. Change-Id: I285155ab4241e827145855d628f8e98b881c01d5
* | | | | Merge "frameworks: av: services: audiopolicy: Added AudioPolicyEffects"Eric Laurent2014-07-017-530/+883
|\ \ \ \ \
| * | | | | frameworks: av: services: audiopolicy: Added AudioPolicyEffectsbryant_liu2014-07-017-530/+883
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Manage pre- and postprocessing effects defined in audio_effects.conf Change-Id: Idea1478e3d434f8ff66907adb3c77663db78d583
* | | | | Add new AudioMixer processing hooksAndy Hung2014-06-303-45/+761
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds new process and thread hooks for multi-format handling. It is enabled by setting kUseNewMixer = true. Change-Id: I262a3d2e4411f8cef7370a497b77a34eb55f1f86
* | | | Merge "Add enabling variable for extended precision audio"Andy Hung2014-06-263-10/+43
|\ \ \ \ | |/ / / |/| | |
| * | | Add enabling variable for extended precision audioAndy Hung2014-06-253-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set AudioFlinger::kEnableExtendedPrecision = true to enable extended precision. Enabling will be required for devices (such as USB) which report 24 bit or 32 bit sink formats. Change-Id: I0dc1d7a4f7607086d7b536ea0e43aef0e696f2ee
* | | | Camera API1/2: don't register the same listener multiple timesGaurav Batra2014-06-282-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FrameProcessorBase allows register the same metadata result listener multiple times with the same range IDs, which causes the same metadata result is delivered multiple times for the same listener. This is problematic as client like ZslProcessor's updateStream is called multiple times between captures, and each updateStream calls registerListener unconditionally. The the ZSL metadata result queue will be flooded with same metadata result multiple times and the number of same result will keep growing until the queue is full. Change-Id: I2ff7808e5dce61068a7111e7fbbce2aba95198cd
* | | | Merge "Camera1: Don't send partial results to ZSL clients"Zhijun He2014-06-268-14/+25
|\ \ \ \
| * | | | Camera1: Don't send partial results to ZSL clientsZhijun He2014-06-278-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ZSL clients expect each received result as a complete result, and send back to HAL as a reprocess capture request. CaptureSequencer client assumes results to be non-partial too, it need look into some metadata that may not be present in partial results. Change-Id: Id716913fd6e1c914726abd6610fddf91141783c2
* | | | | Merge "Enabling USB Device and Android Device Vol inc/dec functionality for ↵Paul McLean2014-06-261-3/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | USB Audio Output"
| * | | | Enabling USB Device and Android Device Vol inc/dec functionality for USB ↵Paul McLean2014-06-261-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Audio Output Bug: 13747844 Change-Id: Ied5bb44f63a4e7183c52f8111e9a389b60ffe75f
* | | | | Merge "cameraservice: Deprecate triggerId tags"Yin-Chia Yeh2014-06-253-28/+42
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | cameraservice: Deprecate triggerId tagsYin-Chia Yeh2014-06-243-28/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following two tags are deprecated from HAL 3.2: ANDROID_CONTROL_AF_TRIGGER_ID ANDROID_CONTROL_AE_PRECAPTURE_ID Trigger IDs are now internal to camera service. Change-Id: Iaebd62ecb0905a811fa37fe7850e0221c38a0006
* | | | | Merge "audio policy: fix several issues on routing APIs."Eric Laurent2014-06-251-12/+30
|\ \ \ \ \
| * | | | | audio policy: fix several issues on routing APIs.Eric Laurent2014-06-241-12/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not list duplicated outputs in listAudioPorts(): duplicated outputs are not valid sources for audio patches. Also add asserts to make sure that an audio port with no valid profile is never used by audio routing APIs. - Fix typos causing the wrong device type to be used when creating an audio patch. - Fix error in building config mask in toAudioPortConfig(). Change-Id: I4505891dbed2c2fa92804d45505c3c2deb921f3e