diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2019-12-03 16:55:57 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-03 16:55:57 -0800 |
| commit | a80bc46baea2fb8d247ef9a754159afad18d489a (patch) | |
| tree | 4f054de2ae15b4fbf3eb50a4b17dab9352801a6d | |
| parent | 61f69e105f612ed49dfdc317d0915b3789321a1a (diff) | |
| parent | bff764d944c1bd6d5d834027bd22dff303fcb309 (diff) | |
Merge "audio VTS: Fix parametrization for compressed formats"
am: bff764d944
Change-Id: I6c7d2dd527497f979aaad15d3bf4d5411c1bbf80
| -rw-r--r-- | audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp b/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp index 22e60be380..2afbbb8fc4 100644 --- a/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp +++ b/audio/core/all-versions/vts/functional/6.0/AudioPrimaryHidlHalTest.cpp @@ -83,7 +83,6 @@ const std::vector<DeviceConfigParameter>& getOutputDeviceConfigParameters() { for (auto& config : configs) { // Some combinations of flags declared in the config file require special // treatment. - bool special = false; if (flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) { config.offloadInfo.sampleRateHz = config.sampleRateHz; config.offloadInfo.channelMask = config.channelMask; @@ -94,22 +93,13 @@ const std::vector<DeviceConfigParameter>& getOutputDeviceConfigParameters() { config.offloadInfo.bitWidth = 16; config.offloadInfo.bufferSize = 256; // arbitrary value config.offloadInfo.usage = AudioUsage::MEDIA; - result.emplace_back( - device, config, - AudioOutputFlag(AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD)); - special = true; - } - if ((flags & AUDIO_OUTPUT_FLAG_DIRECT) && - !(flags & - (AUDIO_OUTPUT_FLAG_HW_AV_SYNC | AUDIO_OUTPUT_FLAG_MMAP_NOIRQ))) { result.emplace_back(device, config, - AudioOutputFlag(AUDIO_OUTPUT_FLAG_DIRECT)); - special = true; - } - if (flags & AUDIO_OUTPUT_FLAG_PRIMARY) { // ignore the flag - flags &= ~AUDIO_OUTPUT_FLAG_PRIMARY; - } - if (!special) { + AudioOutputFlag(AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD | + AUDIO_OUTPUT_FLAG_DIRECT)); + } else { + if (flags & AUDIO_OUTPUT_FLAG_PRIMARY) { // ignore the flag + flags &= ~AUDIO_OUTPUT_FLAG_PRIMARY; + } result.emplace_back(device, config, AudioOutputFlag(flags)); } } |