361 Commits

Author SHA1 Message Date
Eric Laurent
9657f9387e am 04e3b469: am 679e97fb: am 255bdedb: Fix issue 2243808: Audio input routing broken.
Merge commit '04e3b4696297b59a5fb13409d8a51b7447fd8cf5'

* commit '04e3b4696297b59a5fb13409d8a51b7447fd8cf5':
  Fix issue 2243808: Audio input routing broken.
2009-11-06 08:57:50 -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
ffe1375add am c59618f9: 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 'c59618f9d5f0ba671f9e7b5445e2dd43083aeced'

* commit 'c59618f9d5f0ba671f9e7b5445e2dd43083aeced':
  Fix typo in AudioPolicyManager log for voice recognition mode.
2009-11-05 20:47:43 -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
2dcd0d7e3f am 59a10928: am da6818d3: am dbef679f: Merge change Id27d9e35 into eclair
Merge commit '59a10928801282ca6aeb195a0d9c8228136fd62a'

* commit '59a10928801282ca6aeb195a0d9c8228136fd62a':
  Update lights to support the change in parameters passed by the framework
2009-11-05 19:31:21 -08:00
Jean-Michel Trivi
8da4c9c3ed am af0348b9: 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 'af0348b94bcf190f73eec870f2d0106ba45e5fa2'

* commit 'af0348b94bcf190f73eec870f2d0106ba45e5fa2':
  Use new A1026 header to us 1026 presets that match the driver.
2009-11-05 19:31:16 -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
7ea5cf56fa am 0fbfe19a: 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
Merge commit '0fbfe19a2035fbb11f7acc5cf18a4c8881f849f1'

* commit '0fbfe19a2035fbb11f7acc5cf18a4c8881f849f1':
  Fix bug 2194140 Add support for the voice recognition mode.
2009-11-05 11:03:06 -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
7c602389e5 am 32ee7f60: am 864c8583: am d1dc8c30: Fix issue: no audio after media_server process crash while in call.
Merge commit '32ee7f600f4f6babdc08034caca3827ca28e1a48'

* commit '32ee7f600f4f6babdc08034caca3827ca28e1a48':
  Fix issue: no audio after media_server process crash while in call.
2009-11-05 01:37:04 -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
6cc87a5335 am d07a9442: am 69739a19: am 63e2c0ab: Log for issue 2203561.
Merge commit 'd07a94426aa9a6341bf1744d7b97afe5330448a1'

* commit 'd07a94426aa9a6341bf1744d7b97afe5330448a1':
  Log for issue 2203561.
2009-11-03 10:48:43 -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
39019b2e6d am 8cc29e78: am 0199fcd0: am 10254cc3: HTC update: add attenuation to avoid distortion, and compensate in acoustic parameters.
Merge commit '8cc29e785722bc73b9c27fc6e3369aa777c879a8'

* commit '8cc29e785722bc73b9c27fc6e3369aa777c879a8':
  HTC update: add attenuation to avoid distortion, and compensate in
2009-11-02 19:18:21 -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
6e111f0fcc am bd4731ab: am 37b1a748: am da9d5ab1: Fix issue 2194140: [Passion] Support Audience chip.
Merge commit 'bd4731ab2a9dda560e454f6981c05dcb9991141e'

* commit 'bd4731ab2a9dda560e454f6981c05dcb9991141e':
  Fix issue 2194140: [Passion] Support Audience chip.
2009-11-02 12:57:52 -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
8ee0bbf7dd am 72b357c4: am c5ae55eb: am 0f2f4d0a: Fix issue 2194140, Part 1.
Merge commit '72b357c4eb1f99c01b38e5cdb1afa52b339648a8'

* commit '72b357c4eb1f99c01b38e5cdb1afa52b339648a8':
  Fix issue 2194140, Part 1.
2009-11-02 10:42:21 -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
Mathias Agopian
7fbe8c04e4 am e3c65ac1: am f4a09d74: am 87ea1dfa: fix[2222341] Soft reset while going back from camcorder settings
Merge commit 'e3c65ac1403b0221c69b4f1c5023b781a5ca4cad'

* commit 'e3c65ac1403b0221c69b4f1c5023b781a5ca4cad':
  fix[2222341] Soft reset while going back from camcorder settings
2009-11-01 21:55:12 -08:00
Eric Laurent
6bb9f88291 Fix issue 2194140, Part 1.
Submitted on behalf of HK Chen <hk_chen@htc.com>

1) implement ACDB dynamic update for 1) audio playback, 2) audio recording, 3) BT headsets.
2) implement A1026 hard reset recovery mechanism
2009-10-31 00:51:56 -07:00
Mathias Agopian
0b88fd2ee3 am f4a09d74: am 87ea1dfa: fix[2222341] Soft reset while going back from camcorder settings
Merge commit 'f4a09d7449ffd2480d2d3d9fcc6744d4b8dcaa66' into eclair-mr2-plus-aosp

* commit 'f4a09d7449ffd2480d2d3d9fcc6744d4b8dcaa66':
  fix[2222341] Soft reset while going back from camcorder settings
2009-10-30 15:10:26 -07:00
Mathias Agopian
3e756c25d5 am 87ea1dfa: fix[2222341] Soft reset while going back from camcorder settings
Merge commit '87ea1dfa60cf130fafdbab8e94cb2ce9ff8d0975' into eclair-mr2

* commit '87ea1dfa60cf130fafdbab8e94cb2ce9ff8d0975':
  fix[2222341] Soft reset while going back from camcorder settings
2009-10-30 15:02:10 -07:00
Mathias Agopian
b73f40535f 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.
2009-10-30 14:52:52 -07:00
Patrick Scott
fd2e048d2c am d9b1ab0b: am 7930a644: Merge change I5d43ba27 into eclair-mr2
Merge commit 'd9b1ab0b564fea713db053d3acbf98f5e4506276'

* commit 'd9b1ab0b564fea713db053d3acbf98f5e4506276':
  Remove calls to dump_l.
2009-10-30 05:35:49 -07:00
Patrick Scott
cb53be231e am 7930a644: Merge change I5d43ba27 into eclair-mr2
Merge commit '7930a644d5accac458193650ba5e1241299d048d' into eclair-mr2-plus-aosp

* commit '7930a644d5accac458193650ba5e1241299d048d':
  Remove calls to dump_l.
2009-10-30 05:30:30 -07:00
Android (Google) Code Review
d79323d3f0 Merge change I5d43ba27 into eclair-mr2
* changes:
  Remove calls to dump_l.
2009-10-30 08:23:03 -04:00
Jean-Michel Trivi
0672624153 am ba1d8944: am 467b9983: am e26fd757: Fix bug 2210203 where Music volume is reduced after reducing in-call volume. This is the combination of two issues: - on QSD8K, the voice volume affects all streams, even when not in call. This is fixed by setting the voice volu
Merge commit 'ba1d894484e8063378df9957163858cdc8d3e1d6'

* commit 'ba1d894484e8063378df9957163858cdc8d3e1d6':
  Fix bug 2210203 where Music volume is reduced after reducing in-call volume.
2009-10-29 20:20:59 -07:00
Jean-Michel Trivi
9fccf28bc0 am 467b9983: am e26fd757: Fix bug 2210203 where Music volume is reduced after reducing in-call volume. This is the combination of two issues: - on QSD8K, the voice volume affects all streams, even when not in call. This is fixed by setting the voice volume to unity g
Merge commit '467b99831bbcfdb42edf7794409095ee8bc84c71' into eclair-mr2-plus-aosp

* commit '467b99831bbcfdb42edf7794409095ee8bc84c71':
  Fix bug 2210203 where Music volume is reduced after reducing in-call volume.
2009-10-29 20:00:46 -07:00