Commit graph

711 commits

Author SHA1 Message Date
Mikhail Naganov
0637e1339b audio: Make 'surroundSound' element optional
This element makes sense only for TV platforms. The deserializer
treats it as optional. Update the schema to match this.

Bug: 116356348
Test: xmllint --noout --xinclude --schema \
      hardware/interfaces/audio/5.0/config/audio_policy_configuration.xsd \
      frameworks/av/services/audiopolicy/config/audio_policy_configuration.xml

Change-Id: I822c3ff10a6becc859d3d44fd58ef2ebcd3d40b1
2019-03-06 12:28:15 -08:00
Steven Moreland
7f4e21adda Merge "Update makefies: no 'types'" am: 4ee5ec1469 am: bab622f6a6
am: 7224bc9bcf

Change-Id: I434939e0770afa436c532a945542fce30a71ef7d
2019-03-04 16:05:59 -08:00
Steven Moreland
a878aee9ab Update makefies: no 'types'
Bug: 123976090
Test: N/A
Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
2019-03-04 11:27:17 -08:00
Mikhail Naganov
0d7a65f71d Merge "audio: Add support for dumping info from effect HAL modules" 2019-02-27 17:01:34 +00:00
Kevin Rocard
c3a712bef4 Audio HAL: add address documentation am: 3cdb31ee57 am: 6420797904
am: 7e2aa9b955

Change-Id: I205bd30ffa969b090d507ea5791b0413bc0e4ff4
2019-02-26 09:18:58 -08:00
Kevin Rocard
3cdb31ee57 Audio HAL: add address documentation
Test: compile
Change-Id: I108d512cf3381c5b87c76d152252050d309e46a6
Signed-off-by: Kevin Rocard <krocard@google.com>
2019-02-26 09:00:23 -08:00
Steven Moreland
63bf69427b Make audio HAL consistent.
Bug: 124459302
Test: hidl-gen -Lcheck ...
Change-Id: I319fb00ef3a2da3944094228d4801bd9f88c16bb
Merged-In: Ie125d9bb014ee747ce56a59feaca577ab2d9e96c
2019-02-26 09:00:14 -08:00
Eric Laurent
bfb49a5cb0 Revert "Revert "Fix audio VTS build""
This reverts commit 6735fea712.

Test: make.
2019-02-22 18:18:55 -08:00
Eric Laurent
6735fea712 Revert "Fix audio VTS build"
This reverts commit 22ab6f2feb.

Bug; 125937703
Test: make

Change-Id: Iead87b0e1b8078262d7e370b050c2a75dbcda387
2019-02-22 17:47:20 -08:00
Mikhail Naganov
fa02144f8d audio: Add support for dumping info from effect HAL modules
The implementation uses IBase::debug() method which can write
debugging info into the provided file descriptor (same model
as used for devices and streams).

Bug: 69939533
Test: adb shell dumpsys media.audio_flinger
Change-Id: I7876fd43a7066c0f081ea2ca0b3b4b37bbdf8e6c
2019-02-22 14:30:56 -08:00
Eric Laurent
22ab6f2feb Fix audio VTS build
Update AudioPrimaryHidlHalTest to reflect changes in AudioPolicyConfig
class.

Test: make
Change-Id: Iab5cb85ff8e79fb5387d5e8ad2f85748342e80fa
2019-02-22 10:24:42 -08:00
TreeHugger Robot
71bb1d6ea1 Merge "Change class and variable names" 2019-02-15 04:53:54 +00:00
Eric Laurent
955b94e1d5 [Master port]audio: add new audio formats
This patch ports a change to the HAL interfaces done in master in
order to have the same Audio common HAL interface in both AOSP and master.
This is needed as the Bluetooth HAL uses the audio common HAL and needs
to be frozen in the same state in both AOSP and MASTER.

Add audio format for LHDC Bluetooth codec.
Also add missing audio sources and devices in xsd.

Bug: 124247199
Bug: 120395342
Test: make
Change-Id: Ib55c7d351074d8ef75747bcb1195e1ce15ed8b20
Merged-In: Ib55c7d351074d8ef75747bcb1195e1ce15ed8b20
2019-02-15 01:52:02 +00:00
Eric Laurent
36274db4e5 [Master port]audio: add new audio formats
This patch ports a change to the HAL interfaces done in master in
order to have the same Audio common HAL interface in both AOSP and master.
This is needed as the Bluetooth HAL uses the audio common HAL and needs
to be frozen in the same state in both AOSP and MASTER.

Add AAC_LATM*, CELT and APTX_ADAPTIVE to the list
of audio formats.

Bug: 124247199
Bug: 123082414
Test: make
Change-Id: Id75e1f5016929d5a67e777774aaa892df6f91e78
Merged-In: Id75e1f5016929d5a67e777774aaa892df6f91e78
2019-02-15 01:51:45 +00:00
Eric Laurent
c32a993999 [Master port]Add new audio sources for audio capture
This patch ports a change to the HAL interfaces done in master in
order to have the same Audio common HAL interface in both AOSP and master.
This is needed as the Bluetooth HAL uses the audio common HAL and needs
to be frozen in the same state in both AOSP and MASTER.

This commit adds the following audio capture sources:
- AUDIO_SOURCE_VOICE_PERFORMANCE: for real time live performances like Karaoke.
- AUDIO_SOURCE_ECHO_REFERENCE: for capturing the reference signal to suppress by an echo
canceller. Protected by privileged permission CAPTURE_AUDIO_OUTPUT.

Also added device AUDIO_DEVICE_IN_ECHO_REFERENCE selected when the requested
capture source is AUDIO_SOURCE_ECHO_REFERENCE.

Bug: 124247199
Bug: 118203066
Test: CTS tests for audio capture
Change-Id: Ia93550b278733ae9cc5cda731b014421002fde35
Merged-In: Ia93550b278733ae9cc5cda731b014421002fde35
2019-02-15 01:51:23 +00:00
Mikhail Naganov
9c140b452a [Master port] Audio HAL: Add optional Destination to SinkMetadata
This patch ports a change to the HAL interfaces done in master in
order to have the same Audio common HAL interface in both AOSP and master.
This is needed as the Bluetooth HAL uses the audio common HAL and needs
to be frozen in the same state in both AOSP and MASTER.

Currently this is used to indicate the output device
when the input stream is from an intermediate processing
module like MSD.

Bug: 124247199
Bug: 120859615
Test: make
Change-Id: I60bac5c24a263ab0b8965e9dbf9514445e88c270
Merged-In: I60bac5c24a263ab0b8965e9dbf9514445e88c270
2019-02-15 01:50:58 +00:00
jiabin
d42361e3d1 [Master port] Add haptic channel mask.
This patch ports a change to the HAL interfaces done in master in
order to have the same Audio common HAL interface in both AOSP and master.
This is needed as the Bluetooth HAL uses the audio common HAL and needs
to be frozen in the same state in both AOSP and MASTER.

Bug: 111454766
Bug: 124247199
Test: build
Change-Id: I00c28aa02473ce83b0d9b404b5cf33410c73a2c8
Merged-In: I00c28aa02473ce83b0d9b404b5cf33410c73a2c8
2019-02-15 01:50:28 +00:00
Steven Moreland
f8a47b7f01 Update makefiles.
Bug: 123976090
Test: N/A
Change-Id: I5fb6c126a090a3fe0fa4829ea9224564133dc1ae
2019-02-11 21:14:16 -08:00
Sundong Ahn
4001118df8 Change class and variable names
The rule to generate class and variable names is changed.
So update api names according to this rule.

Test: make update-api && make checkapi
Bug: 123777669
Change-Id: I5ba41679c863d8f57e9c43821b311ca09e9b4ea2
2019-02-11 15:00:43 +09:00
Cheney Ni
3899315c00 Merge "Register Bluetooth Audio Hal v2 within Audio HAL" am: f7b6c73725 am: 6cef9b0a49
am: 1c9ef33a17

Change-Id: I1868f8093259855c2331231678dc71f3f2522735
2019-02-06 19:14:51 -08:00
Treehugger Robot
f7b6c73725 Merge "Register Bluetooth Audio Hal v2 within Audio HAL" 2019-02-07 02:51:28 +00:00
Cheney Ni
4f6882ff4b Register Bluetooth Audio Hal v2 within Audio HAL
Register Bluetooth Audio Hal v2 by Audio HAL service so Bluetooth stack
can fetch the service interface as well.

Bug: 111519504
Test: manual

Change-Id: I3ac8c0472c58dd4d8a9b1ad8408313b80282cc85
2019-02-06 23:30:26 +00:00
Steven Moreland
941f105b60 Update makefiles.
Some of these are out of date.

Bug: N/A
Test: N/A
Change-Id: Ibf87fad9981d4e430a0bf797feadbb0bede232fc
2019-02-05 13:14:26 -08:00
Victor Chang
58062e0d41 Remove the dependency on ICU
Static libxml2 no longer requires ICU4C. Remove
the depedency from the build file.

Bug: 121468463
Test: vts-tradefed run vts -m VtsHalAudioEffectV4_0Target
Test: vts-tradefed run vts -m VtsHalAudioV4_0Target
Merged-In: Ib843fb1071a634f25e27e5291b00d11852ac08a9
Change-Id: Ib843fb1071a634f25e27e5291b00d11852ac08a9
2019-01-31 14:05:15 +00:00
Victor Chang
811024860a Remove the dependency on ICU
Static libxml2 no longer requires ICU4C. Remove
the depedency from the build file.

Bug: 121468463
Test: Treehugger
Change-Id: Ib843fb1071a634f25e27e5291b00d11852ac08a9
2019-01-31 13:59:10 +00:00
TreeHugger Robot
39b29ac05b Merge "VTS test for MicrophoneDirection API (HAL V 5.0)" 2019-01-30 21:14:42 +00:00
Paul McLean
0f1c40ce46 VTS test for MicrophoneDirection API (HAL V 5.0)
Bug: 121201996
Test: atest VtsHalAudioV5_0TargetTest

Change-Id: Icf8a054b50568f51a49b74f15de64232d1dc1c39
2019-01-30 11:17:00 -07:00
Jasmine Cha
4aa0f07420 Effects: add new effect volume flag
Add new effect flag to monitor requested volume from
audio framework.

Bug: 123251705
Test: on/off equalizer on spotify/google music
      switch songs with equalizer

Change-Id: Id89f6921923e7d55fa06c52579357fcd2f1c1fd0
Signed-off-by: Jasmine Cha <chajasmine@google.com>
2019-01-28 07:07:39 +00:00
Eric Laurent
f2b77b0705 audio: add new audio formats
Add audio format for LHDC Bluetooth codec.
Also add missing audio sources and devices in xsd.

Bug: 120395342
Test: make
Change-Id: Ib55c7d351074d8ef75747bcb1195e1ce15ed8b20
2019-01-22 15:45:05 -08:00
Eric Laurent
1f702cac1f audio: add new audio formats
Add AAC_LATM*, CELT and APTX_ADAPTIVE to the list
of audio formats.

Bug: 123082414
Test: make
Change-Id: Id75e1f5016929d5a67e777774aaa892df6f91e78
2019-01-22 15:31:00 -08:00
Eric Laurent
a9ccf13d9b Merge "audio vts: update with new audio policy class" 2019-01-21 18:49:03 +00:00
Eric Laurent
7f877d427f audio vts: update with new audio policy class
Bug: 111812273
Test: make
Change-Id: I2daae7401269d2fff59f0ecf69a45b62873ef1a1
2019-01-19 14:53:55 -08:00
Tor Norbye
c9ea9f66de Update signature files to the new format
The new format is described in tools/metalava/FORMAT.md.

Fixes: 116589402 Switch signature files over to the v2 format
Fixes: 112626813 Drop "synchronized" modifier from the signature format
Fixes: 122358225 Omit overriding methods that only differ in final [...]
Fixes: 73088715 API Review: Need doclava to output nullability
Fixes: 79739773 API Review: Metalava enforcing constants are constant
Exempt-From-Owner-Approval: Large-scale tooling change
Test: make sdk, make update-api, make checkapi
Change-Id: I2943d9a65c24e7ca8fb9ae9b69f7edf06173f467
2019-01-18 22:09:18 -08:00
Tor Norbye
0074475ccf Update signature files to the new format
The new format is described in tools/metalava/FORMAT.md.

Fixes: 116589402 Switch signature files over to the v2 format
Fixes: 112626813 Drop "synchronized" modifier from the signature format
Fixes: 122358225 Omit overriding methods that only differ in final [...]
Fixes: 73088715 API Review: Need doclava to output nullability
Fixes: 79739773 API Review: Metalava enforcing constants are constant
Exempt-From-Owner-Approval: Large-scale tooling change
Test: make sdk, make update-api, make checkapi
Change-Id: I767f9fb2941789615c9513072a381e79a5654373
Merged-In: I2943d9a65c24e7ca8fb9ae9b69f7edf06173f467
2019-01-18 22:08:52 -08:00
TreeHugger Robot
1a6565607c Merge "audio: Add 'encodedFormats' field to 'devicePort'" 2019-01-19 00:14:29 +00:00
Mikhail Naganov
ee6772e138 audio: Add 'encodedFormats' field to 'devicePort'
This is used to specify the list of codecs that the device
supports.

Bug: 120860184
Test: xmllint --noout --xinclude --schema \
      hardware/interfaces/audio/5.0/config/audio_policy_configuration.xsd \
      frameworks/av/services/audiopolicy/config/audio_policy_configuration*.xml

Change-Id: Ifb80afed7947dc2332a8188defa86db98851188e
2019-01-18 11:13:38 -08:00
Michael Dooley
58828095fb Merge "Enabling sound trigger V2_2" 2019-01-18 04:00:39 +00:00
Paul Mclean
559f16e1b6 Merge "Adding Audio HAL V5: Direction API" 2019-01-17 21:34:35 +00:00
mike dooley
2f0da26cd5 Enabling sound trigger V2_2
V2_2 has the same functionality as V2_1 except it adds one new
api, getModelState.

Note: V2_1 will be removed in a subsequent cl.

Test: built android and tested using SoundTriggerTestApp

Bug: 70206501
Change-Id: Ia1567bfc988482195b89b8d6a0901d51e870bfbf
2019-01-17 20:49:38 +01:00
Paul McLean
d983fe2a86 Adding Audio HAL V5: Direction API
Bug: 119137468
Test: Testbed App

Change-Id: Ief74abab49b68ac13e0433f5fe29dd25379c7aec
2019-01-16 21:00:05 -07:00
Eric Laurent
20b0e102b0 Merge "add new audio sources for audio capture" 2019-01-16 23:58:05 +00:00
Eric Laurent
ff08074227 add new audio sources for audio capture
This commit adds the following audio capture sources:
- AUDIO_SOURCE_VOICE_PERFORMANCE: for real time live performances like Karaoke.
- AUDIO_SOURCE_ECHO_REFERENCE: for capturing the reference signal to suppress by an echo
canceller. Protected by privileged permission CAPTURE_AUDIO_OUTPUT.

Also added device AUDIO_DEVICE_IN_ECHO_REFERENCE selected when the requested
capture source is AUDIO_SOURCE_ECHO_REFERENCE.

Bug: 118203066
Test: CTS tests for audio capture
Change-Id: Ia93550b278733ae9cc5cda731b014421002fde35
2019-01-16 09:54:45 -08:00
TreeHugger Robot
09ade87318 Merge "Add audio_effects_conf" 2019-01-16 04:32:30 +00:00
Mikhail Naganov
5404a00739 audio: Update source / sink metadata after opening stream
Since open input / output stream functions in legacy audio
HAL API do not have parameters for source / sink metadata,
make a call to update metadata right after opening a stream
in the default implementation.

Bug: 120859615
Test: audio still works
Change-Id: Ie81f861a024261a1f13fb6aa23976a92658e679c
2019-01-15 13:46:33 -08:00
Victor Chang
fdd3300306 Add libandroidicu as static lib in the VtsHalAudio
libxml2 now depends on libandroidicu.
Add the same dependency into the VTS.

TODO: b/121468463 to remove ICU from VtsHalAudio

Bug: 117094880
Test: m checkbuild
Merged-In: I105e7ad1517ecf8780adfb730650e1ad82f65857
Change-Id: I105e7ad1517ecf8780adfb730650e1ad82f65857
2019-01-08 19:40:59 +00:00
Sundong Ahn
1fce092b90 Add audio_effects_conf
This module is for API check of java file generated from
audio_effects_conf.xsd.

Bug: 80453829
Test: m -j && make update-api && make check-api
Change-Id: I0be0176a1d63db0ccc8c4bb38705a76a0070c981
2019-01-08 12:04:24 +09:00
Victor Chang
2c12b89651 Add libandroidicu as static lib in the VtsHalAudio
VtsHalAudio statically links libxml2.
libxml2 depends on libandroidicu now,
and it should statically links libandroidicu as well.

TODO: b/121468463 to remove ICU from VtsHalAudio

Bug: 117094880
Test: m checkbuild
Change-Id: I105e7ad1517ecf8780adfb730650e1ad82f65857
2019-01-02 17:01:20 +00:00
Mikhail Naganov
1503a98940 Audio HAL: Add optional Destination to SinkMetadata
Currently this is used to indicate the output device
when the input stream is from an intermediate processing
module like MSD.

Bug: 120859615
Test: make
Change-Id: I60bac5c24a263ab0b8965e9dbf9514445e88c270
2018-12-19 16:12:39 -08:00
Mikhail Naganov
00a44c0fc2 Audio HAL: More generalization for types imports
Complement imports of audio::CPP_VERSION with audio::common::CPP_VERSION
for core.

Import namespaces in VTS tests.

Remove "using namespace" from .cpp files where there
are already imports in the .h file.

Test: try moving types between audio/types.hal and common/types.hal.
Change-Id: I49c2e2466c8175f2516c2273f5c26d125afd4801
2018-12-14 16:34:28 -08:00
TreeHugger Robot
57efd5bd0d Merge "Audio HAL: Simplify types updates for 'common' and 'effect' packages" 2018-12-13 22:14:59 +00:00