summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge "Use sp<> instead of raw pointer for FastMixer"Glenn Kasten2014-06-242-12/+10
|\ \ \ \
| * | | | Use sp<> instead of raw pointer for FastMixerGlenn Kasten2014-06-242-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids worry about the thread lifetime during tear-down. Bug: 15858655 Change-Id: I896d24317bd6f53a574645cdf4cd514eaa205dd5
* | | | | Merge "Camera: Clear ZSL buffer queue when jpeg size is changed"Zhijun He2014-06-231-0/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Camera: Clear ZSL buffer queue when jpeg size is changedZhijun He2014-06-231-0/+17
| |/ / / | | | | | | | | | | | | | | | | Bug: 15284653 Change-Id: I4778e8443945d918801102ba600874568bde12dc
* | | | Merge "Add test-mixer AudioMixer test program"Andy Hung2014-06-233-0/+458
|\ \ \ \ | |/ / / |/| | |
| * | | Add test-mixer AudioMixer test programAndy Hung2014-06-203-0/+458
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The shell script mixer_to_wav_tests.sh shows how to use test-mixer. Change-Id: Ia7f1a368972c9c33fadc96df4cb1fc8b22446c8c
* | | | Camera2: get stream configs by device verisonYin-Chia Yeh2014-06-209-82/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting from device version 3.2, the following tags: ANDROID_SCALER_AVAILABLE_FORMATS ANDROID_SCALER_AVAILABLE_JPEG_MIN_DURATIONS ANDROID_SCALER_AVAILABLE_JPEG_SIZES ANDROID_SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS ANDROID_SCALER_AVAILABLE_PROCESSED_SIZES ANDROID_SCALER_AVAILABLE_RAW_MIN_DURATIONS ANDROID_SCALER_AVAILABLE_RAW_SIZES are deprecated and replaced by: ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS Change-Id: Iadc34af0ea985a16a25759d7a9a3eb4845c486fd
* | | | Merge "Camera2: Fix lastFrameNumber counter in flush case"Yin-Chia Yeh2014-06-202-0/+26
|\ \ \ \
| * | | | Camera2: Fix lastFrameNumber counter in flush caseYin-Chia Yeh2014-06-202-0/+26
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Decrement the counter for those repeating requests never sent to device. Change-Id: I2064e51cb5d509d86dbde4a89e8157de33f574b0
* | | | Merge "Camera2/3: Don't release recording buffer when stream is active"Zhijun He2014-06-201-4/+7
|\ \ \ \
| * | | | Camera2/3: Don't release recording buffer when stream is activeZhijun He2014-06-181-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is dangerous to release all recording buffers when recording stream is actively sending buffer to encoder. This change only releases all buffers when recording stream is idle and recording stream is about to start. Bug: 15667833 Change-Id: Ia4a84cac84a2062c13333467c66698273ffb0e23
* | | | | libcameraservice: 64-bit compile warningsMark Salyzyn2014-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I168332a0d4699f6f5597d4883342aa7af7ed92c6
* | | | | audiopolicy: 64-bit compile warningsMark Salyzyn2014-06-201-9/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I71db11499c4b0c434df8144c633d42282f5823c2
* | | | | Merge "camera: Let #connectLegacy calls through with unspecified HAL version"Igor Murashkin2014-06-201-1/+8
|\ \ \ \ \
| * | | | | camera: Let #connectLegacy calls through with unspecified HAL versionIgor Murashkin2014-06-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the camera2 shim to open a camera1 device without turning the error codes into a RuntimeException. Change-Id: I08d9d1e30e72025c41bd54b702d7ae95b32257be
* | | | | | Merge "Extract out test utility functions from resampler_tests"Andy Hung2014-06-203-202/+322
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Extract out test utility functions from resampler_testsAndy Hung2014-06-183-202/+322
| | |/ / | |/| | | | | | | | | | | | | | | | | | These will be used for mixer tests later. Change-Id: I22b1c89857058cfb2450afe15e80d6c9306a31f1
* | | | cameraservice: Implement HAL1 and higher HAL API coexistenceZhijun He2014-06-194-27/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A higher hal version device like HAL3.2 can be opened as HAL1.0 device if HAL supports it. This only applies to camera API1. Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
* | | | AudioTrack: add support for compressed audioEric Laurent2014-06-194-16/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for compressed audio playback by use of an AudioTrack attached to a direct output thread. Bug: 9428304. Change-Id: I4a61be9cf0e31003ca85935d6e0ee38ca8192e03
* | | | Merge changes I0fef0584,I322b91faJean-Michel Trivi2014-06-185-2/+169
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * changes: AudioPolicyManager: return output for audio attributes AudioTrack construction with audio attributes
| * | | AudioPolicyManager: return output for audio attributesJean-Michel Trivi2014-06-185-2/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In AudioPolicyManager, support querying an output or playback strategy for audio attributes, instead of a stream type, In AudioTrack creation, use the output returned for the track's attributes. Change-Id: I0fef05845ba676404775e2e338c10e6a96237268
* | | | Merge "camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService"Igor Murashkin2014-06-172-23/+145
|\ \ \ \
| * | | | camera: Add #getLegacyParameters, #supportsCameraApi to ICameraServiceIgor Murashkin2014-06-172-23/+145
| | |/ / | |/| | | | | | | | | | Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
* | | | CameraService: Fix permissions check issuesEino-Ville Talvala2014-06-171-4/+5
|/ / / | | | | | | | | | | | | Bug: 15677063 Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
* | | am a3603693: Merge "Fix deadlock" into lmp-preview-devGlenn Kasten2014-06-161-5/+8
|\ \ \ | | | | | | | | | | | | | | | | * commit 'a3603693fb784d7e1a820ee4629a69730a0bb424': Fix deadlock