Commit Graph

288 Commits

Author SHA1 Message Date
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
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
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
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
Jean-Michel Trivi
b9352d71f8 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 gain whenever
Merge commit 'e26fd7576c0c0963ac7e11c249db8f56a8c08a92' into eclair-mr2

* commit 'e26fd7576c0c0963ac7e11c249db8f56a8c08a92':
  Fix bug 2210203 where Music volume is reduced after reducing in-call volume.
2009-10-29 19:27:55 -07:00
Patrick Scott
4705b7db85 Remove calls to dump_l.
This fails to compile without NDEBUG and the log statement is accomplishing the
same thing.
2009-10-29 08:35:22 -04:00
Dave Sparks
05d8b7709c am 6eb47e20: am 5d89308f: Add wakelock to audio HAL. Bug 2218158.
Merge commit '6eb47e20d76678b265a9d8e7dd0cf2fe4fbf6253' into eclair-mr2-plus-aosp

* commit '6eb47e20d76678b265a9d8e7dd0cf2fe4fbf6253':
  Add wakelock to audio HAL. Bug 2218158.
2009-10-29 01:47:45 -07:00
Dave Sparks
7755f2900f am 5d89308f: Add wakelock to audio HAL. Bug 2218158.
Merge commit '5d89308f2e1252eff2743bf823bf558dbb0de2fa' into eclair-mr2

* commit '5d89308f2e1252eff2743bf823bf558dbb0de2fa':
  Add wakelock to audio HAL. Bug 2218158.
2009-10-29 01:24:25 -07:00
Jean-Michel Trivi
b8dba8904e 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 gain whenever
 exiting a call.
- another related issue was that when entering a call with no audio
 playing, the in-call volume would be at its max. This is due to
the audio driver resetting the gain to unity when creating a new
output. AudioPolicyManager::setPhoneState() would sometimes fail
to force the reset of the audio volumes when entering a call, causing
the driver to use the unity gain, not the in-call volume set by the
user. This is fixed by testing whether is call is starting or ending
independently from the logic to determine the new ouput device.
2009-10-28 17:24:53 -07:00
Eric Laurent
f3c6967b17 am 88316f70: am 0bf3ac2c: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '88316f709083652c4aa9eca6f64631c0ec77fb07' into eclair-mr2-plus-aosp

* commit '88316f709083652c4aa9eca6f64631c0ec77fb07':
  do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
2009-10-28 10:42:53 -07:00
Eric Laurent
c21ca94f0f am 0bf3ac2c: (-s ours) do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Merge commit '0bf3ac2c797fc9e1a327f867d69bbb0b54a68ffa' into eclair-mr2

* commit '0bf3ac2c797fc9e1a327f867d69bbb0b54a68ffa':
  do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
2009-10-28 10:26:39 -07:00
Dave Sparks
61e76b47a1 Add wakelock to audio HAL. Bug 2218158.
Applications are supposed to hold a wakelock. However, since 1.0,
the audio driver and/or HAL has held a partial wakelock. That means
that many apps will be broken if we don't hold a wakelock while
audio is playing. This patch holds a wakelock while the audio
driver is open and releases it when it goes to standby mode.
2009-10-27 16:27:04 -07:00
Eric Laurent
52af604c93 do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Bluetooth A2DP suspend-resume improvements.

This change will reduce the occurence rate of A2DP sink suspend resume failures observed in issues 2184627, 2181005 and possibly 2189628.

Suspend A2DP output when phone state is not NORMAL and not only when it is RINGTONE.
Update A2DP suspend state when an A2DP or SCO device is connected or disconnected while phone state is not NORMAL.
2009-10-26 09:07:41 -07:00
Eric Laurent
401d78acc4 am a8eaa9a3: am 7eda9410: Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit 'a8eaa9a397383b776b5b65dc479502e70d567dcf' into eclair-mr2-plus-aosp

* commit 'a8eaa9a397383b776b5b65dc479502e70d567dcf':
  Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
2009-10-24 01:51:00 -07:00
Eric Laurent
2e01134db8 am 7eda9410: Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit '7eda9410e218b2f2ff3f776897fbc1b679b6132d' into eclair-mr2

* commit '7eda9410e218b2f2ff3f776897fbc1b679b6132d':
  Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
2009-10-24 01:39:05 -07:00
Eric Laurent
7996f999be Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Modified checkAndSetVolume() method to adjust VOICE_CALL, BLUETOOTH_SCO and DTMF stream volumes to match audio hardware behavior (never 0).
Also do the following adjustments on stream volumes:
- VOICE_CALL:
	if in call, force software volume to max to avoid applying the volume twice (software mixer + audio hardware)
	send setVoiceVolume() to set in call volume in audio hardware
- BLUETOOTH_SCO:
	send setVoiceVolume() with max value because volume is applied by BT headset and should not be also applied by audio hardware.
- DTMF:
	if in call and not using the BT SCO device, force software volume to max to avoid applying the volume twice (software mixer + audio hardware)
2009-10-21 08:19:36 -07:00
Eric Laurent
b4638d0d98 am 6d14e709: Bluetooth A2DP suspend-resume improvements.
Merge commit '6d14e709e58488a67332fbeb0dd872ac18a19c17' into eclair-mr2-plus-aosp

* commit '6d14e709e58488a67332fbeb0dd872ac18a19c17':
  Bluetooth A2DP suspend-resume improvements.
2009-10-20 00:43:13 -07:00
HK Chen
1aa59df4b9 am 3cb88645: qsd8k: fix set_mic_mute() in AudioHardware.
Merge commit '3cb8864598e72c04859f410bb03f242cf3965dbe' into eclair-mr2-plus-aosp

* commit '3cb8864598e72c04859f410bb03f242cf3965dbe':
  qsd8k: fix set_mic_mute() in AudioHardware.
2009-10-20 00:43:11 -07:00
Eric Laurent
45fc65f5e1 Bluetooth A2DP suspend-resume improvements.
This change will reduce the occurence rate of A2DP sink suspend resume failures observed in issues 2184627, 2181005 and possibly 2189628.

Suspend A2DP output when phone state is not NORMAL and not only when it is RINGTONE.
Update A2DP suspend state when an A2DP or SCO device is connected or disconnected while phone state is not NORMAL.
2009-10-16 10:19:01 -07:00
HK Chen
b5075dd3df qsd8k: fix set_mic_mute() in AudioHardware.
Signed-off-by: Brian Swetland <swetland@google.com>
2009-10-15 01:23:48 -07:00
Eric Laurent
dd3deeed9d am ba8101e9: Merge change I34a989e8 into eclair
Merge commit 'ba8101e944ec0ffea2b89739667d3ce731d6e818' into eclair-plus-aosp

* commit 'ba8101e944ec0ffea2b89739667d3ce731d6e818':
  Fix issue 2172934: AudioHardware for msm7k: some file descriptor tests must be fixed.
2009-10-12 09:48:13 -07:00
Android (Google) Code Review
7c65dd73a3 Merge change I34a989e8 into eclair
* changes:
  Fix issue 2172934: AudioHardware for msm7k: some file descriptor tests must be fixed.
2009-10-12 12:42:51 -04:00
Jean-Michel Trivi
f91bd47a25 am 195d08b5: Fix bug 2172716. Align AudioPolicyManager code in msm7k/libaudio and msm7k/libaudio-qsd8k
Merge commit '195d08b5a1d93025464f7347280f182e5da7fda7' into eclair-plus-aosp

* commit '195d08b5a1d93025464f7347280f182e5da7fda7':
  Fix bug 2172716. Align AudioPolicyManager code in msm7k/libaudio and msm7k/libaudio-qsd8k
2009-10-12 09:03:37 -07:00
Eric Laurent
0933f47098 Fix issue 2172934: AudioHardware for msm7k: some file descriptor tests must be fixed. 2009-10-09 18:18:47 -07:00
Jean-Michel Trivi
fcc698f9b4 Fix bug 2172716. Align AudioPolicyManager code in msm7k/libaudio and msm7k/libaudio-qsd8k 2009-10-09 16:58:34 -07:00
Dima Zavin
7567fe11a4 am a6537357: gralloc-qsd8k: Call glFinish on composition complete.
Merge commit 'a653735759df4b8338475d79044c6494b238e681' into eclair-plus-aosp

* commit 'a653735759df4b8338475d79044c6494b238e681':
  gralloc-qsd8k: Call glFinish on composition complete.
2009-10-08 01:20:12 -07:00
Dima Zavin
ef7776257a gralloc-qsd8k: Call glFinish on composition complete.
Change-Id: I09c8287bcaf89f3f8bcaa4108631641a0fcc397b
Signed-off-by: Dima Zavin <dima@android.com>
2009-10-08 01:13:51 -07:00
Eric Laurent
33575214c1 am ee997372: Fix issue 2146459:AudioPolicyManager: notification and ringtone streams can remain muted.
Merge commit 'ee997372b7d4aea4966d0c27cbd11fe43de31197' into eclair-plus-aosp

* commit 'ee997372b7d4aea4966d0c27cbd11fe43de31197':
  Fix issue 2146459:AudioPolicyManager: notification and ringtone streams can remain muted.
2009-09-29 15:13:18 -07:00
Eric Laurent
addb2c56fc Fix issue 2146459:AudioPolicyManager: notification and ringtone streams can remain muted.
The fix consists in adding a parameter to handleIncallSonification() indicating that it is called from setPhoneState() in which case the stream mute or unmute is called as many times as there are active tracks on the output.

Also change the time when handleIncallSonification() is called in setPhoneState() to make sure that both mPhoneSate and the selected device are coherent with the IN_CALL state when the fucntion is called.
2009-09-29 15:04:46 -07:00
HK Chen
c4bc52ded6 am 7161d052: Fix get_snd_dev() in AudioHardware.
Merge commit '7161d052ce69228825bd5deca3bfa4a213a99f06' into eclair-plus-aosp

* commit '7161d052ce69228825bd5deca3bfa4a213a99f06':
  Fix get_snd_dev() in AudioHardware.
2009-09-28 16:18:53 -07:00