diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2021-01-15 19:05:04 +0000 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@google.com> | 2021-02-02 18:17:26 +0000 |
| commit | 5ec48c2d4d7a8ccdea489ad4b34a7cf75480ffcc (patch) | |
| tree | e1458ca90fba3abd0f427da2f65fc0d52ecc5d35 /audio/common/all-versions/default/HidlUtils.h | |
| parent | 4f5cb710b92fd58338630e2f54f03cac0468b3f8 (diff) | |
audio: Create libraries for data types in core and effect
Add 'CoreUtils' library similar to 'HidlUtils' for the types
specific to the core HAL. Add 'EffectUtils' library similar to
'HidlUtils' for the types specific to the effects HAL. Move into
them and de-duplicate code previously scattered across the
default HAL implementation and libaudiohal. Add unit tests.
Removed 'AUDIO_{INPUT|OUTPUT}_FLAG_NONE' from the list of
values in the XSD file to avoid additional complexity due to
equivalence of this value to an empty list of flags.
Bug: 142480271
Test: m android.hardware.audio@X.0-impl
Test: m android.hardware.audio.effect@X.0-impl
Test: atest android.hardware.audio@7.0-util_tests
Test: atest android.hardware.audio.common@7.0-util_tests
Test: atest android.hardware.audio.effect@7.0-util_tests
Change-Id: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
Diffstat (limited to 'audio/common/all-versions/default/HidlUtils.h')
| -rw-r--r-- | audio/common/all-versions/default/HidlUtils.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/audio/common/all-versions/default/HidlUtils.h b/audio/common/all-versions/default/HidlUtils.h index cc4fbf2f15..22b7152f99 100644 --- a/audio/common/all-versions/default/HidlUtils.h +++ b/audio/common/all-versions/default/HidlUtils.h @@ -20,6 +20,8 @@ #include PATH(android/hardware/audio/common/FILE_VERSION/types.h) #include <memory> +#include <string> +#include <vector> #include <system/audio.h> @@ -118,8 +120,12 @@ struct HidlUtils { AudioStreamType* streamType); static status_t audioStreamTypeToHal(const AudioStreamType& streamType, audio_stream_type_t* halStreamType); - static status_t audioTagsFromHal(const char* halTags, hidl_vec<AudioTag>* tags); + static status_t audioTagsFromHal(const std::vector<std::string>& strTags, + hidl_vec<AudioTag>* tags); static status_t audioTagsToHal(const hidl_vec<AudioTag>& tags, char* halTags); + static hidl_vec<AudioTag> filterOutNonVendorTags(const hidl_vec<AudioTag>& tags); + static std::vector<std::string> filterOutNonVendorTags(const std::vector<std::string>& tags); + static std::vector<std::string> splitAudioTags(const char* halTags); private: static status_t audioIndexChannelMaskFromHal(audio_channel_mask_t halChannelMask, |