550 Commits

Author SHA1 Message Date
Eric Laurent
c62f1c7484 resolved conflicts for merge of a9642a5c to master 2010-02-05 04:41:50 -08:00
Eric Laurent
1823b21524 am 17b4d724: Fix issue: 2413494: [Passion-c] Add TTY support.
Merge commit '17b4d724c2d8f3b70ae94ab523f584940d1c175a' into eclair-plus-aosp

* commit '17b4d724c2d8f3b70ae94ab523f584940d1c175a':
  Fix issue: 2413494: [Passion-c] Add TTY support.
2010-02-04 09:34:37 -08:00
Eric Laurent
99f813b469 Fix merge error in previous commit 457a471ec2d74eb2f4f6723be0797155aed22fa1. 2010-02-04 04:27:35 -08:00
Eric Laurent
0cef292e23 Fix issue: 2413494: [Passion-c] Add TTY support.
AudioHardware receives TTY mode selection from HeadsetObserver by means of the setParameters() method.
Whenever the audio mode is MODE_IN_CALL and a headset is connected, the sound device selection
is modified by TTY mode in order to select TTY full, VCO ot HCO oudio routes and a1026 configuations accordingly.
2010-02-03 23:35:06 -08:00
Iliyan Malchev
7c63be3a8f resolved conflicts for merge of 85ce45e2 to master
Merge commit '85ce45e2' into manualmerge

Conflicts:
	libaudio-qsd8k/AudioHardware.cpp
	libaudio-qsd8k/AudioHardware.h

Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-02-03 14:53:19 -08:00
Iliyan Malchev
52c16eb522 am f92ef8fe: libaudio-qsd8k: updates for passionc
Merge commit 'f92ef8fe452d3f8742d3aa680d1a443f571f028d' into eclair-plus-aosp

* commit 'f92ef8fe452d3f8742d3aa680d1a443f571f028d':
  libaudio-qsd8k: updates for passionc
2010-02-03 14:16:53 -08:00
Iliyan Malchev
cdbc47e396 am 97e4ee03: am 9ab0b5b1: libaudio-qsd8k: fix a1026.h kernel header include
Merge commit '97e4ee03851bc8635d8d4a42e656ebb0f9e943d7'

* commit '97e4ee03851bc8635d8d4a42e656ebb0f9e943d7':
  libaudio-qsd8k: fix a1026.h kernel header include
2010-02-02 14:23:27 -08:00
Iliyan Malchev
cb2ec0c1f0 am 9ab0b5b1: libaudio-qsd8k: fix a1026.h kernel header include
Merge commit '9ab0b5b1f3244f261fcda2ead8fcdd5fe5d714b6' into eclair-plus-aosp

* commit '9ab0b5b1f3244f261fcda2ead8fcdd5fe5d714b6':
  libaudio-qsd8k: fix a1026.h kernel header include
2010-02-02 14:19:01 -08:00
Iliyan Malchev
2b2d936767 libaudio-qsd8k: updates for passionc
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-02-02 13:46:58 -08:00
Iliyan Malchev
abb2ce35f7 libaudio-qsd8k: fix a1026.h kernel header include
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-02-02 12:27:15 -08:00
Eric Laurent
7f8c5c273e Fix issue 2410159: Camcorder: audio capture is sometimes silent when a wired headset is plugged on Passion.
This change fixes two issues:

1 There is a problem with the mutex mA1026Lock protecting access to Audience chip configuration. The mutex is always locked
after the driver is opened and unlocked before the driver is closed. There is a risk that the driver is closed by an instance
of doAudience_A1026_Control() ready to exit while it had already been tested as opened by another instance of doAudience_A1026_Control()
entering and waiting for mA1026Lock to be released. This is what happens when a record is starting and that at the same time the output routing
is changed because the record jingle is playing.
The fix consists in locking mA1026Lock before opening the driver and unlocking it after closing the driver.

2 There is a problem on both 7k and 8k with the way doRouting() handles the routing requests for inputs and outputs. Current implementation
of doRouting() has a parameter indicating if the requestest comes from an input or from an output. The input device is only considered if the
request comes from this particular input. This creates a problem when the input is already active and a routing request is received on an output.
In this case, the new device is chosen as if no record was active resulting in potential change in input routing and a1026 configuration.

The fix consists in checking if at least one input is active when entering doRouting() and always take its device selection into account.
If no input is active, the device selected for the output is used.

For 8k platform, also call doRouting() instead of doAudience_A1026_Control() when record is started or stopped to make sure that all audio path and
accoustic parameters are properly selected and not only the A1026 configuraiton applied.
2010-02-02 02:22:34 -08:00
Eric Laurent
6a373ebdde Fix issue 2285561: New AudioFlinger and audio driver API needed for A/V sync
Added getRenderPosition() API to AudioHardwareInterface to retreive number of audio frames
written by DSP to DAC.

This API is not yet implemented on 7k and 8k kernel drivers.
2010-01-26 18:33:20 -08:00
Eric Laurent
c94e8021b6 am 3a76d8b9: am c42d5b9b: Fix issue 2378103: Bluetooth car kit partly handled by Passion AudioHardware implementation.
Merge commit '3a76d8b93bb14a718ec7558fbfdbbbe62f24cce8'

* commit '3a76d8b93bb14a718ec7558fbfdbbbe62f24cce8':
  Fix issue 2378103: Bluetooth car kit partly handled by Passion AudioHardware implementation.
2010-01-22 12:36:41 -08:00
Eric Laurent
ad59e38e18 am 8be22faf: am 3964d4ed: Fix issue 2199233: ERD16 Incall volume with headset is crazy loud / volume buttons have no effect
Merge commit '8be22fafb8e4703940dae3a196771b1b3a2f3dcb'

* commit '8be22fafb8e4703940dae3a196771b1b3a2f3dcb':
  Fix issue 2199233: ERD16 Incall volume with headset is crazy loud / volume buttons have no effect
2010-01-22 12:01:01 -08:00
Mathias Agopian
e9f20b8bb1 Merge "part of fix for [2363506] [Sapphire] Video playback broken" 2010-01-20 13:44:47 -08:00
Mathias Agopian
fd92f42c39 part of fix for [2363506] [Sapphire] Video playback broken
make sure to reject incompatible buffers in special function
  GRALLOC_MODULE_PERFORM_CREATE_HANDLE_FROM_BUFFER

we use ioctl(PMEM_GET_SIZE) to validate that the given buffer is indeed
a pmem buffer.
2010-01-20 13:22:35 -08:00
Eric Laurent
dd67a94c48 am c42d5b9b: Fix issue 2378103: Bluetooth car kit partly handled by Passion AudioHardware implementation.
Merge commit 'c42d5b9bd789034e4e10679b24a7bd38e68f4556' into eclair-plus-aosp

* commit 'c42d5b9bd789034e4e10679b24a7bd38e68f4556':
  Fix issue 2378103: Bluetooth car kit partly handled by Passion AudioHardware implementation.
2010-01-20 10:06:46 -08:00
Eric Laurent
6ea73d4d15 Merge "Create base class for audio policy manager." 2010-01-20 10:03:54 -08:00
Eric Laurent
28d83cacec Fix issue 2378103: Bluetooth car kit partly handled by Passion AudioHardware implementation.
libaudio: handle audio path SND_DEVICE_CARKIT.
Submitted on behalf of HK Chen <HK_Chen@htc.com>

Added missing code from HK patch in A1026 configuration.
2010-01-20 07:35:43 -08:00
Eric Laurent
584b80dbed am 3964d4ed: Fix issue 2199233: ERD16 Incall volume with headset is crazy loud / volume buttons have no effect
Merge commit '3964d4ed448b00791bc1b574913be24f44b45f0f' into eclair-plus-aosp

* commit '3964d4ed448b00791bc1b574913be24f44b45f0f':
  Fix issue 2199233: ERD16 Incall volume with headset is crazy loud / volume buttons have no effect
2010-01-19 19:59:31 -08:00
Eric Laurent
feb072009b Fix issue 2199233: ERD16 Incall volume with headset is crazy loud / volume buttons have no effect
A regression was introduced by commit 372b6255604d1c54d31e79f1ea31472fe5bc8956 fixing issue 2336461:
 voice call volume still needs to be updated when entering IN_CALL mode.
2010-01-18 11:25:47 -08:00
Jean-Michel Trivi
15d4830e82 am f8bb5674: am a73c739f: Patch from HTC: fine-tuned acoustic parameters for car-dock wasn\'t loaded correctly.
Merge commit 'f8bb5674bf8d7c4890a021b01bab4f0a0aaa661c'

* commit 'f8bb5674bf8d7c4890a021b01bab4f0a0aaa661c':
  Patch from HTC: fine-tuned acoustic parameters for car-dock wasn't loaded correctly.
2010-01-13 16:40:47 -08:00
Jean-Michel Trivi
9a3a36b091 am a73c739f: Patch from HTC: fine-tuned acoustic parameters for car-dock wasn\'t loaded correctly.
Merge commit 'a73c739fbc7641c4d81960328aced549ef3f5c0b' into eclair-plus-aosp

* commit 'a73c739fbc7641c4d81960328aced549ef3f5c0b':
  Patch from HTC: fine-tuned acoustic parameters for car-dock wasn't loaded correctly.
2010-01-13 16:37:48 -08:00
Jean-Michel Trivi
54c67204c7 Patch from HTC: fine-tuned acoustic parameters for car-dock wasn't loaded correctly. 2010-01-13 16:11:52 -08:00
Eric Laurent
94cd0af537 Create base class for audio policy manager.
First implementations of audio policy manager in Eclair branch have shown that most code is common to all platforms.
Creating AudioPolicyManagerBase base class will improve code maintainability and readability.
2010-01-13 14:23:26 -08:00
Eric Laurent
1ec76adf9f am cc10c5e9: am 372b6255: Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
Merge commit 'cc10c5e9e10a04e9cb7d0f24027105f0d399ba1f'

* commit 'cc10c5e9e10a04e9cb7d0f24027105f0d399ba1f':
  Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
2010-01-11 13:51:39 -08:00
Eric Laurent
1e4eb98d7f am 372b6255: Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
Merge commit '372b6255604d1c54d31e79f1ea31472fe5bc8956' into eclair-plus-aosp

* commit '372b6255604d1c54d31e79f1ea31472fe5bc8956':
  Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
2010-01-11 12:26:18 -08:00
Joe Onorato
c75e97e555 less log spew 2010-01-07 21:48:55 -05:00
Eric Laurent
ad9454a375 Fix issue 2336461: [Passion] one issue about in-call downlink volume degration.
This change reverts modifications made earlier on software voice volume control in audio policy manager.
These modifications are not needed anymore and are partly responsible of this issue now that voice volume is controlled by audio DSP.
2009-12-23 02:40:46 -08:00
Eric Laurent
7308a49a36 am 54e025fb: am 7500eded: Fix issues 2333450 and 2333559:
Merge commit '54e025fbc43420fae17d7bb56407fab74c4945b7'

* commit '54e025fbc43420fae17d7bb56407fab74c4945b7':
  Fix issues 2333450 and 2333559:
2009-12-22 23:46:21 -08:00
Eric Laurent
1d3e56aaa2 am 7500eded: Fix issues 2333450 and 2333559:
Merge commit '7500eded35ce173525d7fc1e8172679188d3b33a' into eclair-plus-aosp

* commit '7500eded35ce173525d7fc1e8172679188d3b33a':
  Fix issues 2333450 and 2333559:
2009-12-22 23:42:05 -08:00
Eric Laurent
747fe9dee4 Fix issues 2333450 and 2333559:
Add new config values for usage AudioSystem::FOR_DOCK in setForceUse() to differenciate car and desk docks.
For the desk dock, the sonification strategy will use the phone speaker only as there is no guaranty that
a device is connected to the dock's output jack.
For the car dock, the sonification strategy will use the A2DP output as before.
2009-12-17 10:25:47 -08:00
Android (Google) Code Review
208afbe3e2 Merge change If41d4088
* changes:
  simplify the lock/unlock hooks of msm7k gralloc
2009-12-16 14:31:00 -08:00
Jean-Michel Trivi
c6c0cca71c am eb3af645: am 9ffa8682: Use the media.enable1026 system property to indicate whether the dual microphone noise suppression should be used during a phone call in handset mode. The disabling is performed by using the same A1026 settings as those used in Voice Recognit
Merge commit 'eb3af645781d858eea3bccfe193411e23474e11d'

* commit 'eb3af645781d858eea3bccfe193411e23474e11d':
  Use the media.enable1026 system property to indicate whether the
2009-12-16 13:06:12 -08:00
Jean-Michel Trivi
b188c2ad08 am 9ffa8682: Use the media.enable1026 system property to indicate whether the dual microphone noise suppression should be used during a phone call in handset mode. The disabling is performed by using the same A1026 settings as those used in Voice Recognition when not
Merge commit '9ffa86825c57c8bf82669b438bd0e8feb865d4b7' into eclair-plus-aosp

* commit '9ffa86825c57c8bf82669b438bd0e8feb865d4b7':
  Use the media.enable1026 system property to indicate whether the
2009-12-16 13:02:43 -08:00
Jean-Michel Trivi
44f3cda621 Use the media.enable1026 system property to indicate whether the
dual microphone noise suppression should be used during a phone call
in handset mode. The disabling is performed by using the same A1026
settings as those used in Voice Recognition when not using the
Noise Suppression algorithm. This mode uses the exact same input
and gains as the incall receiver mode (A1026_PATH_INCALL_RECEIVER)
A new mode (A1026_PATH_INCALL_NO_NS_RECEIVER) is defined for code
clarity.
2009-12-15 20:43:36 -08:00
Mathias Agopian
e72eb0c833 simplify the lock/unlock hooks of msm7k gralloc
this gralloc module is only used on msm7k and doesn't need
synchronization in lock/unlock because we don't allow EGLImageKHR
with the GPU renderer on this platform.

hopefully this will remove some of the confusion about how gralloc
should be implemented.
2009-12-15 17:19:46 -08:00
Android Git Automerger
83db4d97be Merge commit 'goog/eclair-plus-aosp' 2009-12-15 00:44:45 -08:00
Eric Laurent
b2128ff471 am 6a5d84a3: am 82f9e100: am e0042598: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit '6a5d84a36d894b4ac24d51b592e20d842397e0f1'

* commit '6a5d84a36d894b4ac24d51b592e20d842397e0f1':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 15:29:45 -08:00
Eric Laurent
458014e402 am 82f9e100: am e0042598: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit '82f9e10095156bbfdd208216c286304ea0dad260' into eclair-mr2-plus-aosp

* commit '82f9e10095156bbfdd208216c286304ea0dad260':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 12:08:16 -08:00
Eric Laurent
6b84c7deaf am e0042598: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8' into eclair-mr2

* commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 10:51:38 -08:00
Eric Laurent
0c8b243d33 am e0042598: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8' into eclair-plus-aosp

* commit 'e0042598585e4ad8b74561c00511bf85c9bf88f8':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 10:51:37 -08:00
Eric Laurent
c7e6a92679 Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
This correction in AudioPolicyManager does not directly fix the issue but a potential problem identified when working on the resolution.
The problem is that audio output path is not updated immediately when a headset is unplugged if music or notifications are active. This is however not observable because:
- music is paused by music app when the headset is unplugged, and correct path is re-established when music is resumed.
- ringtones and notifications are playing on both headset and speaker and are still audible on speaker when the headset is unplugged even if
the actual output path is not changed to speaker only.

There could be an impact on applications using MUSIC stream and not reacting to Intent AudioManager.ACTION_AUDIO_BECOMING_NOISY though.
2009-12-14 02:56:04 -08:00
Dima Zavin
a08cfad71d am 57d3b368: am 6a6befc0: am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '57d3b3680a6d37ffe04e1f24be25b4907bcbaa20'

* commit '57d3b3680a6d37ffe04e1f24be25b4907bcbaa20':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-10 23:45:13 -08:00
Dima Zavin
3365529b73 am 6a6befc0: am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '6a6befc0430820ab5d837694f1b71b63c34f8b14' into eclair-mr2-plus-aosp

* commit '6a6befc0430820ab5d837694f1b71b63c34f8b14':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-10 18:08:20 -08:00
Dima Zavin
8533232290 am 2754389d: gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
Merge commit '2754389d0e7638b3065ecb3c965b1f262d2205ed' into eclair-mr2

* commit '2754389d0e7638b3065ecb3c965b1f262d2205ed':
  gralloc-qsd8k: make sure that we never try to allocatio 0 bytes
2009-12-10 17:56:59 -08:00
Jean-Michel Trivi
cc95936aec am 39098205: am 259ede35: am 9df12adc: Merge change I667fff6d into eclair
Merge commit '3909820584e35b696f8387bda4313fb417cd8ab0'

* commit '3909820584e35b696f8387bda4313fb417cd8ab0':
  Fix bug 2111240 When docked to a BT dock, give priority to wired
2009-12-10 17:15:33 -08:00
Mathias Agopian
fe59112b7b am 96a46011: am 8efc64ae: am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit '96a460114cfb663789c6990e56a17325bea1ecda'

* commit '96a460114cfb663789c6990e56a17325bea1ecda':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-10 17:15:30 -08:00
Jean-Michel Trivi
dfa9174e19 am 259ede35: am 9df12adc: Merge change I667fff6d into eclair
Merge commit '259ede35b4d8d50d0394624780733e4c061fbe7e' into eclair-mr2-plus-aosp

* commit '259ede35b4d8d50d0394624780733e4c061fbe7e':
  Fix bug 2111240 When docked to a BT dock, give priority to wired
2009-12-10 16:58:42 -08:00
Mathias Agopian
d36a65ee14 am 8efc64ae: am f7e40a33: improve cache behavior of gralloc allocations on qsd8k
Merge commit '8efc64aec14e80e7dff8eb4e7708195c6d693ec8' into eclair-mr2-plus-aosp

* commit '8efc64aec14e80e7dff8eb4e7708195c6d693ec8':
  improve cache behavior of gralloc allocations on qsd8k
2009-12-10 16:58:39 -08:00