Commit graph

901 commits

Author SHA1 Message Date
Eric Laurent
1ecadc5852 am 758289be: Merge "audio policy: fix gapless playback when effects enabled" into klp-dev
* commit '758289be1f05457db5dd4d29020cabd81efe66bb':
  audio policy: fix gapless playback when effects enabled
2013-10-29 18:24:59 -07:00
Eric Laurent
758289be1f Merge "audio policy: fix gapless playback when effects enabled" into klp-dev 2013-10-30 01:17:47 +00:00
Ed Heyl
8b5937a930 am c0ff7762: merge in klp-release (no-op)
* commit 'c0ff7762509131a5a95ee258fa6da881a23100a6':
  audio: fix remote submix sampling rates
2013-10-16 18:01:58 -07:00
Ed Heyl
c0ff776250 merge in klp-release (no-op) 2013-10-16 17:43:55 -07:00
Eric Laurent
000bb51ca5 audio policy: fix gapless playback when effects enabled
Do not allow offloading if one non offloadable effect is enabled. This prevents from
creating an offloaded track and tearing it down immediately after start when audioflinger
detects there is an active non offloadable effect.
Not doing so breaks gapless playback because AwesomePlayer will always be able to open
an offloaded track which will not be compatible with the previous PCM track and
Audiosink::open() will not recycle it.

Bug: 11181933.
Change-Id: I6d163806849d9093b9ec701ba8e8c1ccb658e3c8
2013-10-14 11:15:39 -07:00
The Android Automerger
9640dd4ee5 merge in klp-release history after reset to klp-dev 2013-10-08 06:00:52 -07:00
Eric Laurent
1fae049503 am b40b96a7: audio policy: fix direct output selection
* commit 'b40b96a78537d63d801af7e706764c68acf8f182':
  audio policy: fix direct output selection
2013-10-07 11:39:14 -07:00
Eric Laurent
b40b96a785 audio policy: fix direct output selection
commit a527ffd broke the selection of an available
direct output profile in getProfileForDirectOutput().
getProfileForDirectOutput() should check for direct output profiles
regardless of the flags provided to getOutput().

Bug: 11051912.
Change-Id: I4a84734331bfed03d6024ea1c2e8776c27d0b28f
2013-10-07 10:10:44 -07:00
The Android Automerger
44c34c3c39 merge in klp-release history after reset to klp-dev 2013-10-06 06:01:34 -07:00
Dmitry Shmidt
c6bb3b5e1e wifi: Remove obsolete update_ctrl_interface() call
Change-Id: Ib57a87ae1ef5953b1ddcf43974b07f091f298e74
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-10-04 15:49:11 -07:00
Dmitry Shmidt
a34c7d2c13 Merge "wifi: Sync with wpa_supplicant commit 5605286" 2013-10-04 19:02:05 +00:00
Dmitry Shmidt
77aa9a6dfb wifi: Sync with wpa_supplicant commit 5605286
Change-Id: I43713275612f612e9d73ad555cac30e056b3c85a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-10-04 11:04:45 -07:00
Eric Laurent
87e28f7b35 audio policy: fix DTMF tones volume while in call
When voice call stream volume is at 0, DTMF are not heard at all.
DTMF volume should follow the behavior of voice call volume which
is never completely muted.

Bug: 10932676.
Change-Id: Iaf0e33284be75b00516a837907e66be3123e5331
2013-10-03 18:02:16 -07:00
The Android Automerger
a43de4744e merge in klp-release history after reset to klp-dev 2013-10-02 06:01:21 -07:00
Eric Laurent
727fef1b1a remove audio HAL warning when inserting a headset
A valid offload info structure must be provided when
opening an offload output stream in checkOutputsForDevice()
upon headset insertion.

Bug: 8174034.
Change-Id: Id800a206536e5ce979febf89747a51db581c53b6
2013-09-30 19:20:15 -07:00
Eric Laurent
bb19858afc audio: fix remote submix sampling rates
Only list 48000 Hz in supported sampling rates for remote submix
output and input stream profiles to avoid mismatch betwen playback
and capture.

Bug: 10900252.
Change-Id: Id96e914caeb42e8f4aa5fe4e55e19156cdd67b58
2013-09-26 15:04:15 -07:00
Eric Laurent
962a0a4d75 audio: fix remote submix sampling rates
Only list 48000 Hz in supported sampling rates for remote submix
output and input stream profiles to avoid mismatch betwen playback
and capture.

Bug: 10900252.
Change-Id: Id96e914caeb42e8f4aa5fe4e55e19156cdd67b58
2013-09-26 11:28:36 -07:00
Eric Laurent
45c763947b audio policy: add support for audio effect offload
Add rules to select the appropriate output for global
effects.
Move global effects if needed when an offloaded output is
created or released.

Bug: 8174034.

Change-Id: I0bbd8e9f8aa717f672462dd74ba0d01eaef1fda7
2013-09-17 11:27:45 -07:00
Eric Laurent
f665c200f1 Merge "AudioPolicyManageBase changes to enable HOTWORD audio source" into klp-dev 2013-09-12 00:15:04 +00:00
Eric Laurent
fc9b2457ce AudioPolicyManageBase changes to enable HOTWORD audio source
- This change enables HOTWORD audio source to be preempted by any other
  audio source

Bug: 10640877.

Change-Id:  I6f7acbe95a6521306db70ad73260d2ba7b38b940
2013-09-09 15:43:35 -07:00
Eric Laurent
8c3b7b67ac audio policy: extend min duration for offload
Extend minimun duration of offloaded audio content
to 1 minute to avoid offloading short clips like
TTS generated files.

Bug: 8174034.
Change-Id: Ied21557c300af4b27d99388e069576e36804087f
2013-09-09 13:24:05 -07:00
Eric Laurent
4e57a1d497 audio policy: remove verbose logging.
Change-Id: I268935bd8f7e58f90c698c098686a04681b43887
2013-08-30 15:47:52 -07:00
Eric Laurent
41b150b659 audio policy: disable audio offloading with video
Do not enable offloading of audio decompression when
playing video.

Change-Id: I6ee8b59370219f5ef810a99a27ba4a1cf222b55b
2013-08-30 15:36:55 -07:00
Chong Zhang
fe97ee4b99 audio policy: allow virtual input even if there are active inputs
Bug: 10460751

Change-Id: Ic6fcd14162e9c6e03366d887063321e21fcf14cd
2013-08-24 16:45:36 -07:00
Jeff Brown
b96b2839f4 Automatically enable/disable remote submix when input started.
When recording from the audio submix begins, enable the remote
audio submit output device.  When it ends, disable it.

Bug: 10265163
Change-Id: Ia0dc2e20623bb834d06561469ce856688991243b
2013-08-19 15:47:33 -07:00
Vinit Deshapnde
0f330488af Use a single socket to communicate with supplicant
This helps to preapre for future updates from external sources.

Bug: 9298955

Change-Id: I4c63ad5fc1ea3564aab38cfce955de19bad75c0c
(cherry picked from commit 759cc323cb586192d591a815b0fb9d839536fcd6)
2013-08-08 18:31:38 +00:00
Richard Fitzgerald
a527ffd3c2 Code changes for audio offload support
- Share existing offload output if compatible instead of
  creating a new one. Hardware has limited number of
  offload channels (possible only 1) so we must use as
  few as possible

- Changes to routing handling for offloaded outputs

Change-Id: I11111d8f504828595bd8dbf66444cbd1202e7192
Signed-off-by: Eric Laurent <elaurent@google.com>
2013-07-24 18:39:05 -07:00
The Android Open Source Project
cb2388428a am 4c7db154: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '4c7db154564031237df705641f27d504d4ae3f11':
  audio policy: apply default device volume
2013-07-16 11:20:54 -07:00
The Android Open Source Project
4c7db15456 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I44d1b4bc2d06e2ec3d7837693a1880d7e6cf1774
2013-07-16 11:19:23 -07:00
Eric Laurent
cb93edf084 audio policy: apply default device volume
Make sure that we apply default device volume to
active outputs in case no specific volume for selected
device is received afterward.

Bug: 9760269.
Change-Id: I216de40396e1075e77493c97e8b192cd3a31d546
2013-07-15 21:04:24 -07:00
Eric Laurent
ae57fbe12a am 8e7e4254: am e92d6238: audio policy: apply default device volume
* commit '8e7e42547116b1d5f49118ba41946b2906ad3936':
  audio policy: apply default device volume
2013-07-15 17:26:21 -07:00
Eric Laurent
8e7e425471 am e92d6238: audio policy: apply default device volume
* commit 'e92d623811f3fd3e7cc5e5dd8bc93c0c0a8fdf50':
  audio policy: apply default device volume
2013-07-15 17:23:36 -07:00
Eric Laurent
e92d623811 audio policy: apply default device volume
Make sure that we apply default device volume to
active outputs in case no specific volume for selected
device is received afterward.

Bug: 9760269.
Change-Id: I216de40396e1075e77493c97e8b192cd3a31d546
2013-07-15 15:41:08 -07:00
Dmitry Shmidt
41d40cfaa6 wifi: Sync with wpa_supplicant commit 1075b29
Change-Id: I502a925054c13f3ceb43445e1c4703427ed4ca7f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-07-12 10:10:40 -07:00
Glenn Kasten
6fd6f41c11 Include header files used by this header
Change-Id: I36c6f580c698706b961150978e2124f9235eab12
2013-07-02 14:08:21 -07:00
Richard Fitzgerald
b4d07b97d2 Add audio policy API changes for audio offload
Changes to the API of audio policy for audio offload support:
- Add isOffloadSupported() function
- Add OUTPUT_FLAG_OFFLOAD
- Extend AudioOutputDescriptor to include a sharing count for direct outputs
- Pass audio_offload_info_t when opening output streams

Change-Id: I5ad26418fdb286eb7ae299d586dd1fd525d48ab9
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
2013-06-27 17:16:25 -07:00
Colin Cross
324157de1a am 248c9aa9: am 2769ce79: Merge "Use accessor to read property serial numbers"
* commit '248c9aa92c8f3e2f33a0e8a02436ea366266495f':
  Use accessor to read property serial numbers
2013-06-17 18:33:50 -07:00
Colin Cross
248c9aa92c am 2769ce79: Merge "Use accessor to read property serial numbers"
* commit '2769ce79def80023e454708deec176e3259dc586':
  Use accessor to read property serial numbers
2013-06-17 18:21:38 -07:00
Colin Cross
2769ce79de Merge "Use accessor to read property serial numbers" 2013-06-18 01:11:57 +00:00
Colin Cross
28429ee0d7 Use accessor to read property serial numbers
Hide the implementation of the property structures by using
an accessor.

(cherry picked from commit 14c02f245e)

Change-Id: Id86ff99d8430fa73bbc745aaa0ff2b7713ca7885
2013-06-17 16:58:58 -07:00
Colin Cross
14c02f245e Use accessor to read property serial numbers
Hide the implementation of the property structures by using
an accessor.

Change-Id: Ic604935882f6085e3d082baa651bad9bafe0a54a
2013-06-14 15:04:54 -07:00
Dmitry Shmidt
8ab86c7865 wifi: Move common file from wpa_supplicant_lib
Change-Id: I902f864da4317fd637fbc31036133c49a8ae0724
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-06-06 16:51:59 -07:00
Dmitry Shmidt
c15ccf4d05 wifi: Skip adding interface prefix if exists
Bug: 9313188

Change-Id: I63784493c84ac4ffcc9810a7798b1c0de1b0f68b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-06-06 10:45:48 -07:00
Dmitry Shmidt
ec0576034b wifi: Use global control socket
Change-Id: I11e4438ec0b36575e1b5a563ac4da57303d028c7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-06-03 17:57:30 -07:00
Dmitry Shmidt
77cc5e2925 wifi: Add command buffer length parameter to wifi_command()
Change-Id: I832bc51279e0fb7d3002298f87a35b816b666ad5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-05-30 10:49:15 -07:00
Dmitry Shmidt
de9abffc38 wifi: Use wpa_ctrl_cleanup() function from wpa_supplicant
Change-Id: I24af9ec380e138f24864cd9359c6901b8b29e5ee
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-05-22 16:47:40 -07:00
Eric Laurent
a6c2f12ce8 am 66707435: audio policy: fix device selection in startInput()
* commit '66707435156d8d99d795271a7bd54943065b4c2d':
  audio policy: fix device selection in startInput()
2013-05-21 08:55:38 -07:00
Eric Laurent
6670743515 audio policy: fix device selection in startInput()
Check again input device selection when capture starts in case
conditions have changed since the input stream was opened.

This is related to but does not fix issue 8761558. It makes the
selection of BT SCO device consistent.

Bug: 8761558
Change-Id: I386b638e9c3238711e16fb848449af561624359e
2013-05-17 14:11:27 -07:00
Irfan Sheriff
c85cf2f9b2 am a776ffd2: Rewrite an invalid config file
* commit 'a776ffd243bbd02948ebefd43f4ac2690ebb11e6':
  Rewrite an invalid config file
2013-04-12 16:09:04 -07:00
Irfan Sheriff
a776ffd243 Rewrite an invalid config file
We saw a case of config file being corrupted. Add a mechanism to
recover from this when wifi is toggled off and on.

Bug: 8569820
Change-Id: If2baceb065838d2adb5cde61772d25a05455fc90
2013-04-12 15:47:39 -07:00