321 Commits

Author SHA1 Message Date
Eric Laurent
51bc3712bd am d285af56: am 956f7ba5: Workaround for issue 2229040: [Passion] Audio driver stuck when changing input routing while recording is active.
Merge commit 'd285af5636ac54b37da3b4048b17855ac9c32a42' into eclair-mr2-plus-aosp

* commit 'd285af5636ac54b37da3b4048b17855ac9c32a42':
  Workaround for issue 2229040: 	[Passion] Audio driver stuck when changing input routing while recording is active.
2009-11-11 17:28:49 -08:00
Eric Laurent
419618500a am 956f7ba5: Workaround for issue 2229040: [Passion] Audio driver stuck when changing input routing while recording is active.
Merge commit '956f7ba5ee0f087c91b5fefd2718dae30f8c1e29' into eclair-mr2

* commit '956f7ba5ee0f087c91b5fefd2718dae30f8c1e29':
  Workaround for issue 2229040: 	[Passion] Audio driver stuck when changing input routing while recording is active.
2009-11-11 17:16:05 -08:00
Eric Laurent
e210a8ccce 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>
2009-11-11 10:49:32 -08:00
Iliyan Malchev
e085b18294 am 8495e338: am d74adff0: Merge change I08516fe5 into eclair
Merge commit '8495e3383d78fab7b281dc8f1f1233e07cfea21b' into eclair-mr2-plus-aosp

* commit '8495e3383d78fab7b281dc8f1f1233e07cfea21b':
  libaudio-qsd8k: update a1026.h header and improve firmware-loading code
2009-11-10 18:12:21 -08:00
Iliyan Malchev
63100efee5 am d74adff0: Merge change I08516fe5 into eclair
Merge commit 'd74adff01615816857b075325ffa01eb8a58e854' into eclair-mr2

* commit 'd74adff01615816857b075325ffa01eb8a58e854':
  libaudio-qsd8k: update a1026.h header and improve firmware-loading code
2009-11-10 18:07:07 -08:00
Android (Google) Code Review
a6675bb910 Merge change I08516fe5 into eclair
* changes:
  libaudio-qsd8k: update a1026.h header and improve firmware-loading code
2009-11-10 15:20:02 -08:00
Eric Laurent
097d3433bf am 5fd5d902: am f06a9889: Merge change I108ada59 into eclair
Merge commit '5fd5d902775cbdb0e9498c6708b99316de8e3e17' into eclair-mr2-plus-aosp

* commit '5fd5d902775cbdb0e9498c6708b99316de8e3e17':
  Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
2009-11-09 22:45:23 -08:00
Eric Laurent
2dd94cf938 am f06a9889: Merge change I108ada59 into eclair
Merge commit 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89' into eclair-mr2

* commit 'f06a9889288034e9bd3e54fbae3bb48ad7bd3f89':
  Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
2009-11-09 22:42:16 -08:00
Android (Google) Code Review
05a1ef9930 Merge change I108ada59 into eclair
* changes:
  Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
2009-11-09 22:39:39 -08:00
Mathias Agopian
d6580e4a75 am 97772930: am b7f7f038: enable mdp debugging on error, also check for invalid inputs
Merge commit '977729303ce0a5609b3ddbd36e6801d8397ff5c4' into eclair-mr2-plus-aosp

* commit '977729303ce0a5609b3ddbd36e6801d8397ff5c4':
  enable mdp debugging on error, also check for invalid inputs
2009-11-09 20:21:46 -08:00
Mathias Agopian
8e72981f86 am b7f7f038: enable mdp debugging on error, also check for invalid inputs
Merge commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a' into eclair-mr2

* commit 'b7f7f038529135a5c21234ae89e4b87a1c56854a':
  enable mdp debugging on error, also check for invalid inputs
2009-11-09 20:19:58 -08:00
Mathias Agopian
9e8b8a119d enable mdp debugging on error, also check for invalid inputs 2009-11-09 20:15:50 -08:00
Jean-Michel Trivi
83dff8fae9 am 8d4f9726: am ba36d4fa: When configuring the A10026 for microphone input outside of a call, always use the A1026_xx_RECEIVER paths. This prevents the use of the A1026_xx_SPEAKER paths for voice reco modes for which the gain is too high.
Merge commit '8d4f9726fcf28989a8e6d6cce6b1ef8fa464a160' into eclair-mr2-plus-aosp

* commit '8d4f9726fcf28989a8e6d6cce6b1ef8fa464a160':
  When configuring the A10026 for microphone input outside of a call,
2009-11-09 16:25:48 -08:00
Jean-Michel Trivi
53121efd2a am 9bf3ce7d: am 63af0f3c: Use new acoustic parameters when recording in voice recognition mode or for camcorder mode.
Merge commit '9bf3ce7d445eb3fc4043bc59d6c1adc16f3f8f32' into eclair-mr2-plus-aosp

* commit '9bf3ce7d445eb3fc4043bc59d6c1adc16f3f8f32':
  Use new acoustic parameters when recording in voice recognition mode
2009-11-09 16:25:44 -08:00
Jean-Michel Trivi
b1ab17ff35 am ba36d4fa: When configuring the A10026 for microphone input outside of a call, always use the A1026_xx_RECEIVER paths. This prevents the use of the A1026_xx_SPEAKER paths for voice reco modes for which the gain is too high.
Merge commit 'ba36d4fa33072ef14183365fffd289762c26905e' into eclair-mr2

* commit 'ba36d4fa33072ef14183365fffd289762c26905e':
  When configuring the A10026 for microphone input outside of a call,
2009-11-09 16:16:41 -08:00
Jean-Michel Trivi
cbff02d902 am 63af0f3c: Use new acoustic parameters when recording in voice recognition mode or for camcorder mode.
Merge commit '63af0f3cbd387e97bcaca82d1e22787c224d6430' into eclair-mr2

* commit '63af0f3cbd387e97bcaca82d1e22787c224d6430':
  Use new acoustic parameters when recording in voice recognition mode
2009-11-09 16:16:38 -08:00
Iliyan Malchev
84abafaf65 libaudio-qsd8k: update a1026.h header and improve firmware-loading code
-- 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>
2009-11-09 16:06:57 -08:00
Eric Laurent
920fea9258 Fix issue 2226658: Audio path not updated when a headset is plugged or unplugged while recording.
Modified AudioPolicyManager::setDeviceConnectionState() so that the device on active audio input is updated when a device is connected or disconnected.
2009-11-09 11:57:59 -08:00
Jean-Michel Trivi
af1701fa98 When configuring the A10026 for microphone input outside of a call,
always use the A1026_xx_RECEIVER paths.
This prevents the use of the A1026_xx_SPEAKER paths for voice reco
modes for which the gain is too high.
2009-11-08 18:50:57 -08:00
Jean-Michel Trivi
2cf344031b Use new acoustic parameters when recording in voice recognition mode
or for camcorder mode.
2009-11-08 14:03:59 -08:00
Eric Laurent
9ee4a5ffff am 679e97fb: am 255bdedb: Fix issue 2243808: Audio input routing broken.
Merge commit '679e97fb32c2816bc8d978e8cb6b508b974db0c2' into eclair-mr2-plus-aosp

* commit '679e97fb32c2816bc8d978e8cb6b508b974db0c2':
  Fix issue 2243808: Audio input routing broken.
2009-11-06 08:48:27 -08:00
Eric Laurent
9f93f2655b am 255bdedb: Fix issue 2243808: Audio input routing broken.
Merge commit '255bdedb2d7ebf4b14690776ff652df1de97fe95' into eclair-mr2

* commit '255bdedb2d7ebf4b14690776ff652df1de97fe95':
  Fix issue 2243808: Audio input routing broken.
2009-11-06 08:28:17 -08:00
Eric Laurent
420a78df14 Fix issue 2243808: Audio input routing broken.
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.
2009-11-06 03:02:05 -08:00
Jean-Michel Trivi
8c3a625568 am 2bc9e006: am ee9fa1a5: Fix typo in AudioPolicyManager log for voice recognition mode. This fixes a build error when the log for AudioPolicyManager for QSD8K is enabled.
Merge commit '2bc9e0067f0e9ed7c40ebea98ead8e6962b32bc2' into eclair-mr2-plus-aosp

* commit '2bc9e0067f0e9ed7c40ebea98ead8e6962b32bc2':
  Fix typo in AudioPolicyManager log for voice recognition mode.
2009-11-05 20:37:59 -08:00
Jean-Michel Trivi
2e71954441 am ee9fa1a5: Fix typo in AudioPolicyManager log for voice recognition mode. This fixes a build error when the log for AudioPolicyManager for QSD8K is enabled.
Merge commit 'ee9fa1a5e85cb4a4bffea3bca901fa828f7012fb' into eclair-mr2

* commit 'ee9fa1a5e85cb4a4bffea3bca901fa828f7012fb':
  Fix typo in AudioPolicyManager log for voice recognition mode.
2009-11-05 20:27:38 -08:00
Eric Olsen
0967f4c9f0 am da6818d3: am dbef679f: Merge change Id27d9e35 into eclair
Merge commit 'da6818d3785571964bb5bdedf7afa18900deb9ea' into eclair-mr2-plus-aosp

* commit 'da6818d3785571964bb5bdedf7afa18900deb9ea':
  Update lights to support the change in parameters passed by the framework
2009-11-05 19:21:58 -08:00
Jean-Michel Trivi
b8ac5557c5 am 79ad38d0: am 4bcd5b16: Use new A1026 header to us 1026 presets that match the driver. Update record configuration to use those presets.
Merge commit '79ad38d0b62ad2abfc7bedcb07f478594ebd3b76' into eclair-mr2-plus-aosp

* commit '79ad38d0b62ad2abfc7bedcb07f478594ebd3b76':
  Use new A1026 header to us 1026 presets that match the driver.
2009-11-05 19:21:53 -08:00
Eric Olsen
6423acfc2b am dbef679f: Merge change Id27d9e35 into eclair
Merge commit 'dbef679fccd8d44881642564c54baafa41da6c55' into eclair-mr2

* commit 'dbef679fccd8d44881642564c54baafa41da6c55':
  Update lights to support the change in parameters passed by the framework
2009-11-05 19:10:05 -08:00
Jean-Michel Trivi
8ea88d0389 Fix typo in AudioPolicyManager log for voice recognition mode.
This fixes a build error when the log for AudioPolicyManager for
QSD8K is enabled.
2009-11-05 17:58:40 -08:00
Android (Google) Code Review
9059d84a60 Merge change Id27d9e35 into eclair
* changes:
  Update lights to support the change in parameters passed by the framework
2009-11-05 19:23:58 -05:00
Eric Olsen
1220be4e5e Update lights to support the change in parameters passed by the framework
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-05 15:32:32 -08:00
Jean-Michel Trivi
7fc84adfaa am 4bcd5b16: Use new A1026 header to us 1026 presets that match the driver. Update record configuration to use those presets.
Merge commit '4bcd5b16c66bc5c2bffe232f15f5cb83aea18318' into eclair-mr2

* commit '4bcd5b16c66bc5c2bffe232f15f5cb83aea18318':
  Use new A1026 header to us 1026 presets that match the driver.
2009-11-05 13:54:02 -08:00
Jean-Michel Trivi
c932adcc2c Use new A1026 header to us 1026 presets that match the driver.
Update record configuration to use those presets.
2009-11-05 12:44:31 -08:00
Jean-Michel Trivi
27f2b50720 am 5ad51e10: am 739de5f3: 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 i
Merge commit '5ad51e10042fff395ef1833562dc25ba843523f8' into eclair-mr2-plus-aosp

* commit '5ad51e10042fff395ef1833562dc25ba843523f8':
  Fix bug 2194140 Add support for the voice recognition mode.
2009-11-05 10:57:00 -08:00
Jean-Michel Trivi
86d444df00 am 739de5f3: 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
Merge commit '739de5f36523862a7caa15590bd6b680b6cd2854' into eclair-mr2

* commit '739de5f36523862a7caa15590bd6b680b6cd2854':
  Fix bug 2194140 Add support for the voice recognition mode.
2009-11-05 10:51:53 -08:00
Jean-Michel Trivi
f49a990555 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.
2009-11-05 10:32:48 -08:00
Eric Laurent
32d081e324 am 864c8583: am d1dc8c30: Fix issue: no audio after media_server process crash while in call.
Merge commit '864c8583342f1de9c2406835e891d8af98ffe073' into eclair-mr2-plus-aosp

* commit '864c8583342f1de9c2406835e891d8af98ffe073':
  Fix issue: no audio after media_server process crash while in call.
2009-11-05 01:31:44 -08:00
Eric Laurent
43163815b5 am d1dc8c30: Fix issue: no audio after media_server process crash while in call.
Merge commit 'd1dc8c30a969ec3539fc21b940789b2f23197756' into eclair-mr2

* commit 'd1dc8c30a969ec3539fc21b940789b2f23197756':
  Fix issue: no audio after media_server process crash while in call.
2009-11-05 01:27:02 -08:00
Eric Laurent
850c6e0214 Fix issue: no audio after media_server process crash while in call.
Reset audio ctl driver voice mode when AudioHardware is initialized in case media_server process crashed while in call.
2009-11-05 00:56:21 -08:00
Eric Laurent
f3b8e0062c am 69739a19: am 63e2c0ab: Log for issue 2203561.
Merge commit '69739a19dae87bfa81b7fda1504da58067485296' into eclair-mr2-plus-aosp

* commit '69739a19dae87bfa81b7fda1504da58067485296':
  Log for issue 2203561.
2009-11-03 10:43:39 -08:00
Eric Laurent
e16492bb26 am 63e2c0ab: Log for issue 2203561.
Merge commit '63e2c0ab3b3cfac68ed3832adfbf4e5a0b32ed8f' into eclair-mr2

* commit '63e2c0ab3b3cfac68ed3832adfbf4e5a0b32ed8f':
  Log for issue 2203561.
2009-11-03 10:33:07 -08:00
Eric Laurent
3262f5a8b3 Log for issue 2203561.
Added detailed dump for AudioPolicyManager when AudioPolicyService is dumped.
2009-11-03 09:18:39 -08:00
Jean-Michel Trivi
9a32bfa068 am 0199fcd0: am 10254cc3: HTC update: add attenuation to avoid distortion, and compensate in acoustic parameters.
Merge commit '0199fcd0fc04be3361b8843110594b87a0dfc4a9' into eclair-mr2-plus-aosp

* commit '0199fcd0fc04be3361b8843110594b87a0dfc4a9':
  HTC update: add attenuation to avoid distortion, and compensate in
2009-11-02 19:13:06 -08:00
Jean-Michel Trivi
4baa9f4a8a am 10254cc3: HTC update: add attenuation to avoid distortion, and compensate in acoustic parameters.
Merge commit '10254cc35f5cb7ebe2c7ef452815486cb8e92a33' into eclair-mr2

* commit '10254cc35f5cb7ebe2c7ef452815486cb8e92a33':
  HTC update: add attenuation to avoid distortion, and compensate in
2009-11-02 19:08:07 -08:00
Jean-Michel Trivi
541bf8c3ad HTC update: add attenuation to avoid distortion, and compensate in
acoustic parameters.
2009-11-02 15:01:45 -08:00
Eric Laurent
9107a70dbf am 37b1a748: am da9d5ab1: Fix issue 2194140: [Passion] Support Audience chip.
Merge commit '37b1a7483c2f5e27e662272aef6686ef7f718045' into eclair-mr2-plus-aosp

* commit '37b1a7483c2f5e27e662272aef6686ef7f718045':
  Fix issue 2194140: [Passion] Support Audience chip.
2009-11-02 12:51:11 -08:00
Eric Laurent
bec52c4fb9 am da9d5ab1: Fix issue 2194140: [Passion] Support Audience chip.
Merge commit 'da9d5ab10524c32d7949363a10fde1bec5fdf9fa' into eclair-mr2

* commit 'da9d5ab10524c32d7949363a10fde1bec5fdf9fa':
  Fix issue 2194140: [Passion] Support Audience chip.
2009-11-02 12:40:40 -08:00
Eric Laurent
0d43af11b7 am c5ae55eb: am 0f2f4d0a: Fix issue 2194140, Part 1.
Merge commit 'c5ae55eb3fa91197a860bb554151dd5f311145c4' into eclair-mr2-plus-aosp

* commit 'c5ae55eb3fa91197a860bb554151dd5f311145c4':
  Fix issue 2194140, Part 1.
2009-11-02 10:36:22 -08:00
Eric Laurent
0b6e4f3537 am 0f2f4d0a: Fix issue 2194140, Part 1.
Merge commit '0f2f4d0a60cf93a7a281e217408a4249715f5748' into eclair-mr2

* commit '0f2f4d0a60cf93a7a281e217408a4249715f5748':
  Fix issue 2194140, Part 1.
2009-11-02 10:31:53 -08:00
Eric Laurent
d861f3a7a3 Fix issue 2194140: [Passion] Support Audience chip.
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.
2009-11-02 05:26:06 -08:00