Merge commit '58cf88a5a91d82ae2fb3e23365eaa4524a9cd089' into eclair-mr2
* commit '58cf88a5a91d82ae2fb3e23365eaa4524a9cd089':
Patch from HTC related to use of camcorder with wired headset plugged in:
- libaudio: incorrect ACDB setting was used when starting to record
with wired headset.
- libaudio: remove unnecessary audio path switch when camcorder is started
with wired headset.
Submitted on behalf of HK Chen <hk_chen@htc.com>
Merge commit '979de023050ebe82680c665259fc833b0a17d3f5' into eclair-mr2
* commit '979de023050ebe82680c665259fc833b0a17d3f5':
Fix issue 2245963: incoming call rings in ringtone-volume level through a wired headset is while listening to music.
to fix issue 2229040. This workaround is considered no longer useful
by HTC since the changes in the A1026 configuration.
Removing workaround on behalf of HK Chen (HTC).
When the ringtone is not looped (non factory ringtone), a new AudioTrack is started every time the ringtone is repeated. The second time the track is started, the condition that triggers volume limitation is not true any more as music has been stopped for more than SONIFICATION_HEADSET_MUSIC_DELAY seconds and ringtone volume is not limited.
The fix consists in checking the condition (music playing or stopped for less than SONIFICATION_HEADSET_MUSIC_DELAY) when entering ringtone mode and latch it until we exit ringtone mode.
Merge commit '072b5f0df424b2a0c50cdb7b605d3a749dcac7cf' into eclair-mr2
* commit '072b5f0df424b2a0c50cdb7b605d3a749dcac7cf':
should help [2223746] qsd8k MDP locks up, logs show copyBits failed (Connection timed out) in Passion camera zoom level 1
Merge commit '956f7ba5ee0f087c91b5fefd2718dae30f8c1e29' into eclair-mr2
* commit '956f7ba5ee0f087c91b5fefd2718dae30f8c1e29':
Workaround for issue 2229040: [Passion] Audio driver stuck when changing input routing while recording is active.
This change avoids the audio driver lockup when changing audio input path configuration. It does not solve the root cause in audio driver or dsp.
When applied lockups observed in the folling use cases are eliminated:
- use back mic for camcorder recording (issue 2194140)
- switch input device when headset is plugged in or out during record (issue 2226658).
Also removes warnings.
Submitted on behalf of H.K Chen <hk_chen@htc.com>
Merge commit 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89' into eclair-mr2
* commit 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89':
Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
Merge commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a' into eclair-mr2
* commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a':
enable mdp debugging on error, also check for invalid inputs
Merge commit 'ba36d4fa33072ef14183365fffd289762c26905e' into eclair-mr2
* commit 'ba36d4fa33072ef14183365fffd289762c26905e':
When configuring the A10026 for microphone input outside of a call,
Merge commit '63af0f3cbd387e97bcaca82d1e22787c224d6430' into eclair-mr2
* commit '63af0f3cbd387e97bcaca82d1e22787c224d6430':
Use new acoustic parameters when recording in voice recognition mode
-- new a1026.h kernel header that contains just the user-space API and is
sanitized through bionic/libc/kernel/tools/clean_header.py
-- AudioHardware.cpp:
-- replace vr_mode with vr_mode_enabled, and use 0 and 1 instead of
A1026_VR_MODE_DISABLED/ENABLED, which is not defined in the kernel
header;
-- in doA1026_init(), replace a fread() of 1 byte with a read that as
much as possible from the firmware file in as few as possible passes
before we call into the kernel
-- Replace the size of the on-stack f/w buffer with A1026_MAX_FW_SIZE,
which now comes from the kernel header
-- Fix up some signed-unsigned comparison warnings on mBluetoothIdTx
Signed-off-by: Iliyan Malchev <malchev@google.com>
Modified AudioPolicyManager::setDeviceConnectionState() so that the device on active audio input is updated when a device is connected or disconnected.
The wrong key was used when removing the voice recognition mode from parameters list after handling it in AudioStreamInMSM72xx::setParameters() causing the set routing parameter to be removed and ignored.
Merge commit 'dbef679fccd8d44881642564c54baafa41da6c55' into eclair-mr2
* commit 'dbef679fccd8d44881642564c54baafa41da6c55':
Update lights to support the change in parameters passed by the framework
Merge commit '4bcd5b16c66bc5c2bffe232f15f5cb83aea18318' into eclair-mr2
* commit '4bcd5b16c66bc5c2bffe232f15f5cb83aea18318':
Use new A1026 header to us 1026 presets that match the driver.
Merge commit '739de5f36523862a7caa15590bd6b680b6cd2854' into eclair-mr2
* commit '739de5f36523862a7caa15590bd6b680b6cd2854':
Fix bug 2194140 Add support for the voice recognition mode.
The voice recognition mode is enabled when using the
AUDIO_SOURCE_VOICE_RECOGNITION audio recording source. The intended
behavior is to use the same microphone input as the default input,
but to configure the A1026 chip in the special mode tuned for
voice recognition, for the matching input. For testing purposes,
two settings will be available for each input, the choice of which
one is used will be dependent on the vr_uses_ns property.
The availability of the voice rec mode is dependent on the enable1026
system property.
Note that the final A1026 configuration modes are not used yet
(not available) but the ones to use are specified in the comments
of the AudioHardware::doAudience_A1026_Control() function at line
952 of AudioHardware.cpp for instance.
Upon availability of other presets, the enable1026 property could
be used to disable or enable even more of the 1026 features.
Merge commit 'd1dc8c30a969ec3539fc21b940789b2f23197756' into eclair-mr2
* commit 'd1dc8c30a969ec3539fc21b940789b2f23197756':
Fix issue: no audio after media_server process crash while in call.
Merge commit '10254cc35f5cb7ebe2c7ef452815486cb8e92a33' into eclair-mr2
* commit '10254cc35f5cb7ebe2c7ef452815486cb8e92a33':
HTC update: add attenuation to avoid distortion, and compensate in
AudioHardware QSD8k:
- Add setParameters comment to control noise suppression states via new IOCTL A1026_SET_NS_STATE implemented in a1026 driver.
- Add support for new input device DEVICE_IN_BACK_MIC.
AudioPolicyManager:
- Add support for audio source AUDIO_SOURCE_CAMCORDER.
Merge commit '87ea1dfa60cf130fafdbab8e94cb2ce9ff8d0975' into eclair-mr2
* commit '87ea1dfa60cf130fafdbab8e94cb2ce9ff8d0975':
fix[2222341] Soft reset while going back from camcorder settings
add a way to convert a mapped "pushbuffer" buffer to a gralloc handle
which then can be safely used by surfaceflinger
also make sure to not send empty rectangles to the MDP.
Merge commit 'e26fd7576c0c0963ac7e11c249db8f56a8c08a92' into eclair-mr2
* commit 'e26fd7576c0c0963ac7e11c249db8f56a8c08a92':
Fix bug 2210203 where Music volume is reduced after reducing in-call volume.
