Commit graph

428 commits

Author SHA1 Message Date
Eric Laurent
6afb500f07 am d22bb8f4: am 672e9ace: Merge "audio policy: tune voice/video chat volumes" into jb-mr1-dev
* commit 'd22bb8f46c5e3699949c7c54cc61e994979cd6e9':
  audio policy: tune voice/video chat volumes
2012-10-18 11:02:02 -07:00
Eric Laurent
d22bb8f46c am 672e9ace: Merge "audio policy: tune voice/video chat volumes" into jb-mr1-dev
* commit '672e9ace42a3f7d4f93460efc79ebd444786a5eb':
  audio policy: tune voice/video chat volumes
2012-10-18 10:59:59 -07:00
Eric Laurent
672e9ace42 Merge "audio policy: tune voice/video chat volumes" into jb-mr1-dev 2012-10-18 10:54:45 -07:00
SathishKumar Mani
764b8324f6 am 8ec910e0: am 77268631: audio policy: update output delayMs in setPhoneState
* commit '8ec910e02008177844169c423c2aec42046440b7':
  audio policy: update output delayMs in setPhoneState
2012-10-17 10:28:53 -07:00
SathishKumar Mani
8ec910e020 am 77268631: audio policy: update output delayMs in setPhoneState
* commit '772686310a3bc44d93591349e174a60360a3d30d':
  audio policy: update output delayMs in setPhoneState
2012-10-17 10:26:23 -07:00
Eric Laurent
0d6490a58b audio policy: tune voice/video chat volumes
Add new volume curves for VOICE_CALL stream type
to improve voice/video chat volume on speakers.

Bug 7346643.

Change-Id: Ib282a97570d2234deec6b58391bdfc45846d9cc0
2012-10-17 10:22:29 -07:00
SathishKumar Mani
772686310a audio policy: update output delayMs in setPhoneState
- Issue: When call is connected in HDMI while playing music,
  Playback is routed to phone shortly
- Cause: delayMs is not updated correctly, and no delay is
  set when setOutputDevice is called
- Fix: update delayMs with biggest mOutput latency and mute
  STRATEGY_MEDIA on all outputs

Bug: 7268860
Change-Id: I12b75443a29ab8485314bd0cbfe5ee4789be5c29
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-17 10:20:37 -07:00
Eric Laurent
d7d4f579fb am d6745071: am aac67317: Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-dev
* commit 'd6745071c1237bbc6f341d8a1df3ca33038869de':
  audio policy: do not route in call audio to HDMI
2012-10-16 17:20:08 -07:00
Eric Laurent
d6745071c1 am aac67317: Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-dev
* commit 'aac673172cd61cd862228a8d41a8f3e7d1e016fd':
  audio policy: do not route in call audio to HDMI
2012-10-16 17:17:14 -07:00
Marco Nelissen
427a464ba3 am d4165152: am 85ad78f2: Initialize mStrategyMutedByDevice
* commit 'd41651524bb3d2b9aceec253c0a2e2c5033fee2b':
  Initialize mStrategyMutedByDevice
2012-10-16 17:16:37 -07:00
Marco Nelissen
d41651524b am 85ad78f2: Initialize mStrategyMutedByDevice
* commit '85ad78f27ca032e90af0f2100659d12c16322c76':
  Initialize mStrategyMutedByDevice
2012-10-16 17:13:42 -07:00
Eric Laurent
aac673172c Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-dev 2012-10-16 17:12:44 -07:00
Marco Nelissen
85ad78f27c Initialize mStrategyMutedByDevice
Valgrind found this

Change-Id: I24c640c2b0b6cac129c23bfc18828aff005ec952
2012-10-16 15:00:37 -07:00
Eric Laurent
b52f373bd5 audio policy: do not route in call audio to HDMI
In call audio shuold not be routed to HDMI, S/PDIF or USB
by default as most platform do not support it.

Bug 7339490.

Change-Id: Iac4803f3fbde0c321fc7b37ab7ba34af6a16b4aa
2012-10-16 14:59:36 -07:00
Jean-Michel Trivi
189cafac51 am a1084207: am b707cf22: Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev
* commit 'a1084207a76773319d46cfc1ea7376245b0dd1f3':
  Remote audio submix always has priority for media, only plays media
2012-10-15 20:25:56 -07:00
Jean-Michel Trivi
a1084207a7 am b707cf22: Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev
* commit 'b707cf22cf700e28f54c58cba8eeb38538735510':
  Remote audio submix always has priority for media, only plays media
2012-10-15 20:18:03 -07:00
Jean-Michel Trivi
b707cf22cf Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev 2012-10-15 16:26:15 -07:00
The Android Open Source Project
ef1f949dd1 am 8280f934: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '8280f93403bfd5d5e24ebfb969f22e2e5d36f85e':
2012-10-15 07:43:17 -07:00
The Android Open Source Project
8280f93403 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I0ae4d2e710b5380f13fea6f62352842679ed248b
2012-10-15 07:39:15 -07:00
The Android Automerger
90dbdf26e6 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 16:34:35 -07:00
The Android Automerger
71a635dd58 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 16:32:49 -07:00
Irfan Sheriff
15260347b8 am 605ca505: am c4c58b24: Merge "Fix native crash" into jb-mr1-dev
* commit '605ca505f43f4e21f6caed855d0c761b8bc2f6d1':
  Fix native crash
2012-10-12 12:03:45 -07:00
Irfan Sheriff
605ca505f4 am c4c58b24: Merge "Fix native crash" into jb-mr1-dev
* commit 'c4c58b249e02c944f05107398f1d32e3c41e28d1':
  Fix native crash
2012-10-12 12:02:04 -07:00
Irfan Sheriff
c4c58b249e Merge "Fix native crash" into jb-mr1-dev 2012-10-12 11:58:02 -07:00
The Android Open Source Project
8998cc4836 am 0e448d32: (-s ours) Reconcile with jb-mr1-factory-release - do not merge
* commit '0e448d3233af3c1cd9b12b38e9c5c88f57c5944f':
2012-10-12 07:33:40 -07:00
The Android Open Source Project
0e448d3233 Reconcile with jb-mr1-factory-release - do not merge
Change-Id: Id7a41d6b5c55960694407d194c496766eaefb5d2
2012-10-12 07:31:19 -07:00
Jean-Michel Trivi
31363a9cb9 Remote audio submix always has priority for media, only plays media
Don't use force use mechanism for remote audio submix routing.

Prevent streams of strategy sonification to be played over
 remote audio submix (e.g. WFD) and HDMI

Bug 7318180

Change-Id: Ic5c87d3c568873dffea9002cf87ecf42b403cde6
2012-10-11 19:18:40 -07:00
Irfan Sheriff
897f6dd642 Fix native crash
Bug: 6404766
Change-Id: I8d2199fe2f4d48840a237b1ec2d085fe40c06517
2012-10-11 11:03:12 -07:00
The Android Automerger
38b12d816c merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-11 08:19:21 -07:00
The Android Open Source Project
df69e57835 am d612ec14: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'd612ec14226d082d246d8448637d15888733a8b9':
2012-10-11 08:08:26 -07:00
The Android Open Source Project
d612ec1422 Reconcile with jb-mr1-release - do not merge
Change-Id: Ibad2e367e7b86df59e5be5c5db6f2165f07fadb9
2012-10-11 08:05:21 -07:00
The Android Automerger
21da7124da merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 07:03:54 -07:00
Jean-Michel Trivi
fb41cd524a am f1761254: am abc55c69: AudioPolicyManager supports querying active record sources
* commit 'f1761254147f61f503d0de1627d9c06b40ef861f':
  AudioPolicyManager supports querying active record sources
2012-10-10 17:23:23 -07:00
Jean-Michel Trivi
f176125414 am abc55c69: AudioPolicyManager supports querying active record sources
* commit 'abc55c698301e05a80d7f9394c75abca0b307602':
  AudioPolicyManager supports querying active record sources
2012-10-10 16:36:08 -07:00
Jean-Michel Trivi
abc55c6983 AudioPolicyManager supports querying active record sources
Add support for querying whether there is currently a recording
  underway from the specified audio source.

Bug 7314859

Change-Id: I8894845b176241134870af5df2bebc5ef27e4de4
2012-10-10 15:19:35 -07:00
The Android Open Source Project
aa111d77bf am 87ed1979: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '87ed1979a2429a465e931ff303d9d53cf93a32ae':
2012-10-10 09:47:57 -07:00
The Android Open Source Project
87ed1979a2 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I7ba72441de3b5c1aa8264e079a2808450036380a
2012-10-10 09:45:02 -07:00
The Android Automerger
2a8ce83c7e merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-10 08:55:57 -07:00
The Android Automerger
26aa410080 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 06:59:31 -07:00
The Android Automerger
5f429f8477 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-09 16:07:23 -07:00
Eric Laurent
738207def5 audio policy: add forced uses for system
The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is
now controlled by AudioService by means of new forced use type
AUDIO_POLICY_FORCE_FOR_SYSTEM with config
AUDIO_POLICY_FORCE_SYSTEM_ENFORCED.

Property ro.camera.sound.forced is not used anymore.

Bug 7032634.

Change-Id: I742b0eebbe6b013f61d199846454a06411b52bc8
2012-10-08 15:59:36 -07:00
Mathias Agopian
3aabb260ce fix a typo in uevent_next_eventi
Bug: 7114973
Change-Id: I15a4c714b59aeb1d02db00517d70b5f0e5ab22c2
2012-10-01 14:53:18 -07:00
Eric Laurent
76e97d3950 audio policy: force device update if disconnected
Force the new device selection to be applied when a device is disconnected
even if none is select. This is to indicate to the audio HAL that current
device selection is not valid anymore even if no new device is selected because
no audio track is active.

Bug 7141149.

Change-Id: Iade02fb53a4cc2051fce9da07870c5391396b696
2012-09-26 18:54:57 -07:00
Eric Laurent
be13d2ebd0 audio policy: fix crash when closing HDMI output
When a direct output is closed, the vector containing
the previously opened outputs must also be updated.

Bug 7157451.

Change-Id: I575b1f4928cf7527a4a98632fdec7600664a1e1c
2012-09-25 16:52:22 -07:00
Jean-Baptiste Queru
c0ab77364b am e0232039: Merge "Restore the ability to use ctrl_interface directory"
* commit 'e0232039e0a59f7ef4fc67dad178387b2d5fffba':
  Restore the ability to use ctrl_interface directory
2012-09-20 16:17:28 -07:00
Jean-Baptiste Queru
e0232039e0 Merge "Restore the ability to use ctrl_interface directory" 2012-09-20 15:51:37 -07:00
Jean-Michel Trivi
6d3a115c09 Support audio recording while remote submix is active
When evaluating if an audio record is active, do not count inputs
 opened on "virtual" devices, such as remote submix, as active.

Change-Id: If19c321cf673e3bdf4c3f81e73c163190df7c21e
2012-09-18 12:21:14 -07:00
Eric Laurent
ed8f62d4fa audio: new audio devices enums
Changes for new audio devices enums:
- legacy audio HAL wrapper provides conversion between new and
old device enums. It exposes a rev 2.0 audio device API to the
audio framework and allow legacy implementation to use old device enums.
- AudioPolicyManager: use standard enum value for no device (0).

Change-Id: I855d72291d672cdd8a6641bedb228634a54b7d9d
2012-09-07 10:34:46 -07:00
Jean-Michel Trivi
48387b28c8 Update Audio Policy Manager for remote submix
Define a new forced mode to route media to remote submix.
Update media routing rules according to mode.
Modify device connection management for remote submix.

Note that this CL doesn't implement changes to not prevent audio
 recording when WFD is on, as audio recording is currently limited
 to one input.

Change-Id: I458fe1802705da2d091ff82e536dc3e7f092f291
2012-09-07 09:46:53 -07:00
Eric Laurent
17a73c3394 audio policy: fix ringtone volume on headphones
When limiting ringtone volume because headphones are connected
and music is playing, the volume was not limited against the right
music volume. The is because the device used for music (headphone)
is not the same as the one used for ringtone (headphone + speaker).

Bug 6816207.

Change-Id: I3342be1789a1b7c58705812335b788f030bc6d76
2012-09-05 18:13:06 -07:00