Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 20:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
94dea4096ccbe2bea15da38f9cf92766738526c7
hardware_interfaces/audio/core/all-versions/default/Device.cpp

554 lines
22 KiB
C++
Raw Normal View History

Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
/*
Audio HAL: Factorize V2 and V4 like libaudiohal Use the same technique developed for the simpler libaudiohal to factorize the audio HAL impl. Generated with script: set -euo pipefail cd hardware/interfaces/audio # Make 2.0 and 4.0 files mostly identical by removing all 2.0, V4.0... # and replacing it by CPP_VERSION and FILE_VERSION # This allow both implementation to be mostly identical, except for code difference # Also remove IncludeGuard.h as it will be included from compiler flag # Also update license to 2018 find -name *.cpp -o -name *h | grep -v -e service.cpp | xargs sed -Ei \ -e 's/(#.*)V[42]_0_(.*_H_?)$/\1\2/' \ -e 's/(LOG_TAG.*)[24]_0/\1/' \ -e '/#ifndef AUDIO_HAL_VERSION/,/#endif/d' \ -e '/^#.*def.*AUDIO_HAL_VERSION\b/d' \ -e's/V[42]_0/CPP_VERSION/' \ -e 's/(#include ).(android.*)[24].0(.*).$/\1PATH(\2FILE_VERSION\3)/' \ -e 's|(#include) .(.*)[24].0/(default/.*).$|\1 "\2\3"|' \ -e 's/\bAUDIO_HAL_VERSION\b/CPP_VERSION/' \ -e '/IncludeGuard.h/d' \ -e 's/(Copyright .C. 201)./\18/' # set MAJOR_VERSION instead of having a different macro for each version # this allow to do preprocessor arithmetic (eg: MAJOR_VERSION >= 4) for v in 2 4; do find -ipath '*/'$v'.0/*/Android.bp' | xargs sed -i -e '/cflags:/,/^$/d' -e '/vndk/{:a;/}/!{N;ba};d}' -e '$i\ cflags: [\ "-DMAJOR_VERSION='$v'",\ "-DMINOR_VERSION=0",\ "-include common/all-versions/VersionMacro.h",\ ]'; done # replace# ifdef VERSION_X by #if MAJOR_VERSION == X find -path *all-versions/*.h | xargs sed -Ei -e 's/def.*AUDIO_HAL_VERSION_([24])_0.*/ MAJOR_VERSION == \1/' \ -e 'T;s/ +/ /' # copy all-versions impl in each version impl find -path '*/[24].0/*.[hc]*' | grep -ve all-versions -e test | xargs -P99 -n4 sed -i -Ee '/include <.*all-versions.default/!b' \ -e 's#.*<#find -path */#' -e 's/>$/|xargs tail -n +16/' -e e # remove all-versions impl rm -r {core,effect}/all-versions/ # merge version impl into a single all-version for dir in core/*.0/vts/functional/*.0/ ;do dest=$(echo $dir | sed 's#/..0/#/all-versions/#') mkdir -p $dest mv -T $dir $dest done find -mindepth 3 -path '*/2.0/*' -a \( -name '*cpp' -o -name '*h' \) | grep -v 'all-versions' | sed -E 'h;s/2/4/g;H;s/4.0/all-versions/;s/4.0//;H;g;s/\n/ /g;'| xargs -P99 -L1 sh -c ' set -euo pipefail mkdir -p $(dirname $2); diff --old-group-format="#if MAJOR_VERSION == 2 %<#endif " \ --new-group-format="#if MAJOR_VERSION == 4 %>#endif " $0 $1 > $2 || true; rm $0 $1' # merge the X.0 Android.bp & OWNERS in the all-versions for dir in common effect core; do for sub in default vts/functional; do test -f $dir/2.0/$sub/Android.bp || continue awk 1 $dir/*.0/$sub/Android.bp >> $dir/all-versions/$sub/Android.bp # delete licenses except for the first one and add whitelines sed -i -e '/^}$/{N;/^}\n$/!s/\n/&\n/}' $dir/all-versions/$sub/Android.bp sed -i -e '1,17b;/^\/\//,/^$/{d}' $dir/all-versions/$sub/Android.bp done for sub in default vts; do test -d $dir/2.0/$sub || continue test -f $dir/2.0/$sub/OWNERS && awk 1 $dir/*.0/$sub/OWNERS | sort -u > $dir/all-versions/$sub/OWNERS || true rm -r $dir/*.0/$sub done done # delete all-versions-impl dependencies find -name 'Android.bp' | xargs sed -i -e '/all-versions-impl/d' # cleanup unused files rm common/all-versions/default/include/common/all-versions/default/HidlUtils* rm common/all-versions/util/include/common/all-versions/IncludeGuard.h find -depth -type d -empty -delete # Clamp consecutive number of empty lines to 2 find -name *.cpp -o -name *h | xargs sed -Ei ':a;/^\n*$/{N;ba};s/\n\n+/\n\n/' # transform #endif\n#if to #elif find -name *.cpp -o -name *h | xargs sed -i '/^#endif/{N;s/.*\n#if/#elif/}' # remove leftover include guard in cpp find -name *.cpp |xargs sed -Ei '/^#.*_H_?$/d' # apply clang-format find -name *cpp -o -name *h | xargs ../../../prebuilts/clang/host/linux-x86/clang-stable/bin/clang-format --style file -i # clang format breaks PATH(a/b) to PATH(a / b), remove the space surrounding / find -name *cpp -o -name *h | xargs sed -i "/#include PATH/s# / #/#g" Test: compile Bug: 118203066 Change-Id: I3692a444307afc5f71064fe0b9e6b8af3c9ff1dd Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-14 16:22:07 -08:00
* Copyright (C) 2018 The Android Open Source Project
Audio V4: Fix issues in the legacy wrapper raised by clang-format This patch only contains cosmetic reformatting imposed by clang-format. Bug: 38184704 Test: compile Change-Id: I57545f2b8de1e982028ef4794328741d91682e0c Signed-off-by: Kevin Rocard <krocard@google.com>
2017-12-14 18:50:12 -08:00
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
Audio HAL: Factorize V2 and V4 like libaudiohal Use the same technique developed for the simpler libaudiohal to factorize the audio HAL impl. Generated with script: set -euo pipefail cd hardware/interfaces/audio # Make 2.0 and 4.0 files mostly identical by removing all 2.0, V4.0... # and replacing it by CPP_VERSION and FILE_VERSION # This allow both implementation to be mostly identical, except for code difference # Also remove IncludeGuard.h as it will be included from compiler flag # Also update license to 2018 find -name *.cpp -o -name *h | grep -v -e service.cpp | xargs sed -Ei \ -e 's/(#.*)V[42]_0_(.*_H_?)$/\1\2/' \ -e 's/(LOG_TAG.*)[24]_0/\1/' \ -e '/#ifndef AUDIO_HAL_VERSION/,/#endif/d' \ -e '/^#.*def.*AUDIO_HAL_VERSION\b/d' \ -e's/V[42]_0/CPP_VERSION/' \ -e 's/(#include ).(android.*)[24].0(.*).$/\1PATH(\2FILE_VERSION\3)/' \ -e 's|(#include) .(.*)[24].0/(default/.*).$|\1 "\2\3"|' \ -e 's/\bAUDIO_HAL_VERSION\b/CPP_VERSION/' \ -e '/IncludeGuard.h/d' \ -e 's/(Copyright .C. 201)./\18/' # set MAJOR_VERSION instead of having a different macro for each version # this allow to do preprocessor arithmetic (eg: MAJOR_VERSION >= 4) for v in 2 4; do find -ipath '*/'$v'.0/*/Android.bp' | xargs sed -i -e '/cflags:/,/^$/d' -e '/vndk/{:a;/}/!{N;ba};d}' -e '$i\ cflags: [\ "-DMAJOR_VERSION='$v'",\ "-DMINOR_VERSION=0",\ "-include common/all-versions/VersionMacro.h",\ ]'; done # replace# ifdef VERSION_X by #if MAJOR_VERSION == X find -path *all-versions/*.h | xargs sed -Ei -e 's/def.*AUDIO_HAL_VERSION_([24])_0.*/ MAJOR_VERSION == \1/' \ -e 'T;s/ +/ /' # copy all-versions impl in each version impl find -path '*/[24].0/*.[hc]*' | grep -ve all-versions -e test | xargs -P99 -n4 sed -i -Ee '/include <.*all-versions.default/!b' \ -e 's#.*<#find -path */#' -e 's/>$/|xargs tail -n +16/' -e e # remove all-versions impl rm -r {core,effect}/all-versions/ # merge version impl into a single all-version for dir in core/*.0/vts/functional/*.0/ ;do dest=$(echo $dir | sed 's#/..0/#/all-versions/#') mkdir -p $dest mv -T $dir $dest done find -mindepth 3 -path '*/2.0/*' -a \( -name '*cpp' -o -name '*h' \) | grep -v 'all-versions' | sed -E 'h;s/2/4/g;H;s/4.0/all-versions/;s/4.0//;H;g;s/\n/ /g;'| xargs -P99 -L1 sh -c ' set -euo pipefail mkdir -p $(dirname $2); diff --old-group-format="#if MAJOR_VERSION == 2 %<#endif " \ --new-group-format="#if MAJOR_VERSION == 4 %>#endif " $0 $1 > $2 || true; rm $0 $1' # merge the X.0 Android.bp & OWNERS in the all-versions for dir in common effect core; do for sub in default vts/functional; do test -f $dir/2.0/$sub/Android.bp || continue awk 1 $dir/*.0/$sub/Android.bp >> $dir/all-versions/$sub/Android.bp # delete licenses except for the first one and add whitelines sed -i -e '/^}$/{N;/^}\n$/!s/\n/&\n/}' $dir/all-versions/$sub/Android.bp sed -i -e '1,17b;/^\/\//,/^$/{d}' $dir/all-versions/$sub/Android.bp done for sub in default vts; do test -d $dir/2.0/$sub || continue test -f $dir/2.0/$sub/OWNERS && awk 1 $dir/*.0/$sub/OWNERS | sort -u > $dir/all-versions/$sub/OWNERS || true rm -r $dir/*.0/$sub done done # delete all-versions-impl dependencies find -name 'Android.bp' | xargs sed -i -e '/all-versions-impl/d' # cleanup unused files rm common/all-versions/default/include/common/all-versions/default/HidlUtils* rm common/all-versions/util/include/common/all-versions/IncludeGuard.h find -depth -type d -empty -delete # Clamp consecutive number of empty lines to 2 find -name *.cpp -o -name *h | xargs sed -Ei ':a;/^\n*$/{N;ba};s/\n\n+/\n\n/' # transform #endif\n#if to #elif find -name *.cpp -o -name *h | xargs sed -i '/^#endif/{N;s/.*\n#if/#elif/}' # remove leftover include guard in cpp find -name *.cpp |xargs sed -Ei '/^#.*_H_?$/d' # apply clang-format find -name *cpp -o -name *h | xargs ../../../prebuilts/clang/host/linux-x86/clang-stable/bin/clang-format --style file -i # clang format breaks PATH(a/b) to PATH(a / b), remove the space surrounding / find -name *cpp -o -name *h | xargs sed -i "/#include PATH/s# / #/#g" Test: compile Bug: 118203066 Change-Id: I3692a444307afc5f71064fe0b9e6b8af3c9ff1dd Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-14 16:22:07 -08:00
#define LOG_TAG "DeviceHAL"
#include "core/default/Device.h"
Audio HAL: Add API to attach an effect to a device Add a method to IDevice interface allowing the attachement of an audio effect to an audio device. This is used when an audio effect is implemented below the HAL (e.g by an audio DSP) and is attached/enabled when a particular sink(e.g speaker) or source(e.g mic) device is selected. Bug: 136294538 Test: make Change-Id: I73d78c4f234fd80443a1cb3772c2d65457968652
2019-12-06 17:56:32 -08:00
#include "common/all-versions/default/EffectMap.h"
Audio HAL: Factorize V2 and V4 like libaudiohal Use the same technique developed for the simpler libaudiohal to factorize the audio HAL impl. Generated with script: set -euo pipefail cd hardware/interfaces/audio # Make 2.0 and 4.0 files mostly identical by removing all 2.0, V4.0... # and replacing it by CPP_VERSION and FILE_VERSION # This allow both implementation to be mostly identical, except for code difference # Also remove IncludeGuard.h as it will be included from compiler flag # Also update license to 2018 find -name *.cpp -o -name *h | grep -v -e service.cpp | xargs sed -Ei \ -e 's/(#.*)V[42]_0_(.*_H_?)$/\1\2/' \ -e 's/(LOG_TAG.*)[24]_0/\1/' \ -e '/#ifndef AUDIO_HAL_VERSION/,/#endif/d' \ -e '/^#.*def.*AUDIO_HAL_VERSION\b/d' \ -e's/V[42]_0/CPP_VERSION/' \ -e 's/(#include ).(android.*)[24].0(.*).$/\1PATH(\2FILE_VERSION\3)/' \ -e 's|(#include) .(.*)[24].0/(default/.*).$|\1 "\2\3"|' \ -e 's/\bAUDIO_HAL_VERSION\b/CPP_VERSION/' \ -e '/IncludeGuard.h/d' \ -e 's/(Copyright .C. 201)./\18/' # set MAJOR_VERSION instead of having a different macro for each version # this allow to do preprocessor arithmetic (eg: MAJOR_VERSION >= 4) for v in 2 4; do find -ipath '*/'$v'.0/*/Android.bp' | xargs sed -i -e '/cflags:/,/^$/d' -e '/vndk/{:a;/}/!{N;ba};d}' -e '$i\ cflags: [\ "-DMAJOR_VERSION='$v'",\ "-DMINOR_VERSION=0",\ "-include common/all-versions/VersionMacro.h",\ ]'; done # replace# ifdef VERSION_X by #if MAJOR_VERSION == X find -path *all-versions/*.h | xargs sed -Ei -e 's/def.*AUDIO_HAL_VERSION_([24])_0.*/ MAJOR_VERSION == \1/' \ -e 'T;s/ +/ /' # copy all-versions impl in each version impl find -path '*/[24].0/*.[hc]*' | grep -ve all-versions -e test | xargs -P99 -n4 sed -i -Ee '/include <.*all-versions.default/!b' \ -e 's#.*<#find -path */#' -e 's/>$/|xargs tail -n +16/' -e e # remove all-versions impl rm -r {core,effect}/all-versions/ # merge version impl into a single all-version for dir in core/*.0/vts/functional/*.0/ ;do dest=$(echo $dir | sed 's#/..0/#/all-versions/#') mkdir -p $dest mv -T $dir $dest done find -mindepth 3 -path '*/2.0/*' -a \( -name '*cpp' -o -name '*h' \) | grep -v 'all-versions' | sed -E 'h;s/2/4/g;H;s/4.0/all-versions/;s/4.0//;H;g;s/\n/ /g;'| xargs -P99 -L1 sh -c ' set -euo pipefail mkdir -p $(dirname $2); diff --old-group-format="#if MAJOR_VERSION == 2 %<#endif " \ --new-group-format="#if MAJOR_VERSION == 4 %>#endif " $0 $1 > $2 || true; rm $0 $1' # merge the X.0 Android.bp & OWNERS in the all-versions for dir in common effect core; do for sub in default vts/functional; do test -f $dir/2.0/$sub/Android.bp || continue awk 1 $dir/*.0/$sub/Android.bp >> $dir/all-versions/$sub/Android.bp # delete licenses except for the first one and add whitelines sed -i -e '/^}$/{N;/^}\n$/!s/\n/&\n/}' $dir/all-versions/$sub/Android.bp sed -i -e '1,17b;/^\/\//,/^$/{d}' $dir/all-versions/$sub/Android.bp done for sub in default vts; do test -d $dir/2.0/$sub || continue test -f $dir/2.0/$sub/OWNERS && awk 1 $dir/*.0/$sub/OWNERS | sort -u > $dir/all-versions/$sub/OWNERS || true rm -r $dir/*.0/$sub done done # delete all-versions-impl dependencies find -name 'Android.bp' | xargs sed -i -e '/all-versions-impl/d' # cleanup unused files rm common/all-versions/default/include/common/all-versions/default/HidlUtils* rm common/all-versions/util/include/common/all-versions/IncludeGuard.h find -depth -type d -empty -delete # Clamp consecutive number of empty lines to 2 find -name *.cpp -o -name *h | xargs sed -Ei ':a;/^\n*$/{N;ba};s/\n\n+/\n\n/' # transform #endif\n#if to #elif find -name *.cpp -o -name *h | xargs sed -i '/^#endif/{N;s/.*\n#if/#elif/}' # remove leftover include guard in cpp find -name *.cpp |xargs sed -Ei '/^#.*_H_?$/d' # apply clang-format find -name *cpp -o -name *h | xargs ../../../prebuilts/clang/host/linux-x86/clang-stable/bin/clang-format --style file -i # clang format breaks PATH(a/b) to PATH(a / b), remove the space surrounding / find -name *cpp -o -name *h | xargs sed -i "/#include PATH/s# / #/#g" Test: compile Bug: 118203066 Change-Id: I3692a444307afc5f71064fe0b9e6b8af3c9ff1dd Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-14 16:22:07 -08:00
#include "core/default/StreamIn.h"
#include "core/default/StreamOut.h"
#include "core/default/Util.h"
Audio V4: Make device default wrapper device independent Bug: 38184704 Test: compile Change-Id: I077d2d6176ba5d60c1994345b3164641ed5b4608 Signed-off-by: Kevin Rocard <krocard@google.com>
2017-12-18 10:05:35 -08:00
Audio HAL: fixes for issues discovered after client conversion Several issues addressed: -- added IDevice.supportsAudioPatches to query whether create/removeAudioPatch is actually supported by HAL; -- IStreamOutCallback proxy needs to be owned by IStreamOut implementation. In order for the client to reset the reference, added method IStreamOut.clearCallback; -- IDevice.open{Input|Output}Stream need to return a "suggested" audio config from HAL; -- code for converting between system/audio.h and HIDL data structures has been moved to android.hardware.audio.common@2.0-util library for reuse; -- added a workaround for the issue with QC effects HAL trying to write into the input parameters buffer, which is r/o by Binder design. Bug: 30222631 Change-Id: I64af24d79c12d6ac3b0f87d085a821913e29237b Test: tried using with WIP HIDL client on N5X
2016-11-16 16:30:17 -08:00
//#define LOG_NDEBUG 0
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
Audio HAL: Add API to attach an effect to a device Add a method to IDevice interface allowing the attachement of an audio effect to an audio device. This is used when an audio effect is implemented below the HAL (e.g by an audio DSP) and is attached/enabled when a particular sink(e.g speaker) or source(e.g mic) device is selected. Bug: 136294538 Test: make Change-Id: I73d78c4f234fd80443a1cb3772c2d65457968652
2019-12-06 17:56:32 -08:00
#include <inttypes.h>
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
#include <memory.h>
#include <string.h>
Audio V4: Fix issues in the legacy wrapper raised by clang-format This patch only contains cosmetic reformatting imposed by clang-format. Bug: 38184704 Test: compile Change-Id: I57545f2b8de1e982028ef4794328741d91682e0c Signed-off-by: Kevin Rocard <krocard@google.com>
2017-12-14 18:50:12 -08:00
#include <algorithm>
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
Update to use the correct logging library. Test: mma compiles Change-Id: Idb33dea5faaf1a5e54719c2a5a683d2d47e9b8e8
2016-11-30 13:45:34 -08:00
#include <android/log.h>
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
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 Merged-In: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
2021-01-15 19:05:04 +00:00
#include <HidlUtils.h>
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
namespace android {
namespace hardware {
namespace audio {
Audio HAL: Factorize V2 and V4 like libaudiohal Use the same technique developed for the simpler libaudiohal to factorize the audio HAL impl. Generated with script: set -euo pipefail cd hardware/interfaces/audio # Make 2.0 and 4.0 files mostly identical by removing all 2.0, V4.0... # and replacing it by CPP_VERSION and FILE_VERSION # This allow both implementation to be mostly identical, except for code difference # Also remove IncludeGuard.h as it will be included from compiler flag # Also update license to 2018 find -name *.cpp -o -name *h | grep -v -e service.cpp | xargs sed -Ei \ -e 's/(#.*)V[42]_0_(.*_H_?)$/\1\2/' \ -e 's/(LOG_TAG.*)[24]_0/\1/' \ -e '/#ifndef AUDIO_HAL_VERSION/,/#endif/d' \ -e '/^#.*def.*AUDIO_HAL_VERSION\b/d' \ -e's/V[42]_0/CPP_VERSION/' \ -e 's/(#include ).(android.*)[24].0(.*).$/\1PATH(\2FILE_VERSION\3)/' \ -e 's|(#include) .(.*)[24].0/(default/.*).$|\1 "\2\3"|' \ -e 's/\bAUDIO_HAL_VERSION\b/CPP_VERSION/' \ -e '/IncludeGuard.h/d' \ -e 's/(Copyright .C. 201)./\18/' # set MAJOR_VERSION instead of having a different macro for each version # this allow to do preprocessor arithmetic (eg: MAJOR_VERSION >= 4) for v in 2 4; do find -ipath '*/'$v'.0/*/Android.bp' | xargs sed -i -e '/cflags:/,/^$/d' -e '/vndk/{:a;/}/!{N;ba};d}' -e '$i\ cflags: [\ "-DMAJOR_VERSION='$v'",\ "-DMINOR_VERSION=0",\ "-include common/all-versions/VersionMacro.h",\ ]'; done # replace# ifdef VERSION_X by #if MAJOR_VERSION == X find -path *all-versions/*.h | xargs sed -Ei -e 's/def.*AUDIO_HAL_VERSION_([24])_0.*/ MAJOR_VERSION == \1/' \ -e 'T;s/ +/ /' # copy all-versions impl in each version impl find -path '*/[24].0/*.[hc]*' | grep -ve all-versions -e test | xargs -P99 -n4 sed -i -Ee '/include <.*all-versions.default/!b' \ -e 's#.*<#find -path */#' -e 's/>$/|xargs tail -n +16/' -e e # remove all-versions impl rm -r {core,effect}/all-versions/ # merge version impl into a single all-version for dir in core/*.0/vts/functional/*.0/ ;do dest=$(echo $dir | sed 's#/..0/#/all-versions/#') mkdir -p $dest mv -T $dir $dest done find -mindepth 3 -path '*/2.0/*' -a \( -name '*cpp' -o -name '*h' \) | grep -v 'all-versions' | sed -E 'h;s/2/4/g;H;s/4.0/all-versions/;s/4.0//;H;g;s/\n/ /g;'| xargs -P99 -L1 sh -c ' set -euo pipefail mkdir -p $(dirname $2); diff --old-group-format="#if MAJOR_VERSION == 2 %<#endif " \ --new-group-format="#if MAJOR_VERSION == 4 %>#endif " $0 $1 > $2 || true; rm $0 $1' # merge the X.0 Android.bp & OWNERS in the all-versions for dir in common effect core; do for sub in default vts/functional; do test -f $dir/2.0/$sub/Android.bp || continue awk 1 $dir/*.0/$sub/Android.bp >> $dir/all-versions/$sub/Android.bp # delete licenses except for the first one and add whitelines sed -i -e '/^}$/{N;/^}\n$/!s/\n/&\n/}' $dir/all-versions/$sub/Android.bp sed -i -e '1,17b;/^\/\//,/^$/{d}' $dir/all-versions/$sub/Android.bp done for sub in default vts; do test -d $dir/2.0/$sub || continue test -f $dir/2.0/$sub/OWNERS && awk 1 $dir/*.0/$sub/OWNERS | sort -u > $dir/all-versions/$sub/OWNERS || true rm -r $dir/*.0/$sub done done # delete all-versions-impl dependencies find -name 'Android.bp' | xargs sed -i -e '/all-versions-impl/d' # cleanup unused files rm common/all-versions/default/include/common/all-versions/default/HidlUtils* rm common/all-versions/util/include/common/all-versions/IncludeGuard.h find -depth -type d -empty -delete # Clamp consecutive number of empty lines to 2 find -name *.cpp -o -name *h | xargs sed -Ei ':a;/^\n*$/{N;ba};s/\n\n+/\n\n/' # transform #endif\n#if to #elif find -name *.cpp -o -name *h | xargs sed -i '/^#endif/{N;s/.*\n#if/#elif/}' # remove leftover include guard in cpp find -name *.cpp |xargs sed -Ei '/^#.*_H_?$/d' # apply clang-format find -name *cpp -o -name *h | xargs ../../../prebuilts/clang/host/linux-x86/clang-stable/bin/clang-format --style file -i # clang format breaks PATH(a/b) to PATH(a / b), remove the space surrounding / find -name *cpp -o -name *h | xargs sed -i "/#include PATH/s# / #/#g" Test: compile Bug: 118203066 Change-Id: I3692a444307afc5f71064fe0b9e6b8af3c9ff1dd Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-14 16:22:07 -08:00
namespace CPP_VERSION {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
namespace implementation {
Audio HAL: Simplify types updates for 'common' and 'audio' packages Instead of importing every single type individually ("using <type>"), import entire namespaces of ::android::hardware::audio::CPP_VERSION and ::android::hardware::audio::common::CPP_VERSION inside the "implementation" namespace in the default implementation. This simplifies modifying types, as it is not needed anymore to surround "using <type>" directives with #if MAJOR_VERSION ... Note that the contents of the namespaces are imported inside the "implementation" namespace, which reduces risks of name collision Also, fixed the namespace for HidlUtils--it needs to be in 'implementation'. Test: make Change-Id: I81bbb3074b5763717ae72e747a075fd46dc36d18
2018-12-11 16:36:53 -08:00
using ::android::hardware::audio::common::CPP_VERSION::implementation::HidlUtils;
Audio V6 wrapper: IDevice|IStream|IEffect.close releases HAL resource Fixed behavior of IStream|IEffect.close to release the underlying HAL resource synchronously. This is to avoid adding artificial delays in VTS that become totally unpractical in V6. Added clarification about expected client behavior for IStream|IEffect.close w.r.t. audio data transfer. Added IDevice.close method which releases HAL device resource. Updated VTS tests to remove delays in V6. Bug: 114451103 Bug: 141989952 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I439f0f923c091af2ab234d15ca847cfade341f25 Merged-In: I439f0f923c091af2ab234d15ca847cfade341f25
2019-11-14 13:57:15 -08:00
Device::Device(audio_hw_device_t* device) : mIsClosed(false), mDevice(device) {}
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
Device::~Device() {
Audio V6 wrapper: IDevice|IStream|IEffect.close releases HAL resource Fixed behavior of IStream|IEffect.close to release the underlying HAL resource synchronously. This is to avoid adding artificial delays in VTS that become totally unpractical in V6. Added clarification about expected client behavior for IStream|IEffect.close w.r.t. audio data transfer. Added IDevice.close method which releases HAL device resource. Updated VTS tests to remove delays in V6. Bug: 114451103 Bug: 141989952 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I439f0f923c091af2ab234d15ca847cfade341f25 Merged-In: I439f0f923c091af2ab234d15ca847cfade341f25
2019-11-14 13:57:15 -08:00
(void)doClose();
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
mDevice = nullptr;
}
Do not log error on open output/input stream negotiation The HAL has a negotiation mechanism where if an open output/input stream is made with unsupported parameters, it will return a valid config and UNSUPPORTED_PARAMETRS. This negotiation was confusingly logged as error. Test: "adb logcat -s DeviceHAL" show no error on successful playback/capture Change-Id: I5383cdcfdf8a0ca66768ffc106a1b651b9d8b2d1 Signed-off-by: Kevin Rocard <krocard@google.com>
2018-06-20 13:51:52 -07:00
Result Device::analyzeStatus(const char* funcName, int status,
const std::vector<int>& ignoreErrors) {
return util::analyzeStatus("Device", funcName, status, ignoreErrors);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
audiohal: Fix UAF of HAL devices in Stream objects Stream objects used to hold a pointer to underlying HAL device object which they didn't own. Since destruction of server side objects is asynchronous, it was possible that a Device object gets destroyed before Stream objects, making all the HAL device object pointer to become stale. Fixed by adding a strong reference to Device objects into Stream objects. Bug: 36702804 Change-Id: I3da3611afbb91d6fd6410ac5b8af2a2eebfa6dac Test: ran Loopback app and HAL VTS tests (cherry picked from commit 96d3573cda6f76bcbfc277e69d94914a565218d8)
2017-03-29 09:31:18 -07:00
void Device::closeInputStream(audio_stream_in_t* stream) {
mDevice->close_input_stream(mDevice, stream);
audio: Add check to IDevice.close for currently opened streams IDevice.close must not proceed if there are streams that are currently opened on this device. Bug: 114451103 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I61d81bc0333098c341d5d551bf59331e49fcf682
2019-11-20 15:17:08 -08:00
LOG_ALWAYS_FATAL_IF(mOpenedStreamsCount == 0, "mOpenedStreamsCount is already 0");
--mOpenedStreamsCount;
audiohal: Fix UAF of HAL devices in Stream objects Stream objects used to hold a pointer to underlying HAL device object which they didn't own. Since destruction of server side objects is asynchronous, it was possible that a Device object gets destroyed before Stream objects, making all the HAL device object pointer to become stale. Fixed by adding a strong reference to Device objects into Stream objects. Bug: 36702804 Change-Id: I3da3611afbb91d6fd6410ac5b8af2a2eebfa6dac Test: ran Loopback app and HAL VTS tests (cherry picked from commit 96d3573cda6f76bcbfc277e69d94914a565218d8)
2017-03-29 09:31:18 -07:00
}
void Device::closeOutputStream(audio_stream_out_t* stream) {
mDevice->close_output_stream(mDevice, stream);
audio: Add check to IDevice.close for currently opened streams IDevice.close must not proceed if there are streams that are currently opened on this device. Bug: 114451103 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I61d81bc0333098c341d5d551bf59331e49fcf682
2019-11-20 15:17:08 -08:00
LOG_ALWAYS_FATAL_IF(mOpenedStreamsCount == 0, "mOpenedStreamsCount is already 0");
--mOpenedStreamsCount;
audiohal: Fix UAF of HAL devices in Stream objects Stream objects used to hold a pointer to underlying HAL device object which they didn't own. Since destruction of server side objects is asynchronous, it was possible that a Device object gets destroyed before Stream objects, making all the HAL device object pointer to become stale. Fixed by adding a strong reference to Device objects into Stream objects. Bug: 36702804 Change-Id: I3da3611afbb91d6fd6410ac5b8af2a2eebfa6dac Test: ran Loopback app and HAL VTS tests (cherry picked from commit 96d3573cda6f76bcbfc277e69d94914a565218d8)
2017-03-29 09:31:18 -07:00
}
Revert "audiohal: Get rid of multiple inheritance in IDevice implementation" This reverts commit e4228e7aa683044e17e6592c9014b5d4691445e7. Further analysis of the bug has shown that the problem is not related to the use of multiple inheritance. Bug: 36225019 Change-Id: Icdcaf84061c0ecf29f891521bd961c3ee89f1cfc
2017-05-03 16:39:28 +00:00
char* Device::halGetParameters(const char* keys) {
return mDevice->get_parameters(mDevice, keys);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
Revert "audiohal: Get rid of multiple inheritance in IDevice implementation" This reverts commit e4228e7aa683044e17e6592c9014b5d4691445e7. Further analysis of the bug has shown that the problem is not related to the use of multiple inheritance. Bug: 36225019 Change-Id: Icdcaf84061c0ecf29f891521bd961c3ee89f1cfc
2017-05-03 16:39:28 +00:00
int Device::halSetParameters(const char* keysAndValues) {
return mDevice->set_parameters(mDevice, keysAndValues);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
Audio HAL: Factorize V2 and V4 like libaudiohal Use the same technique developed for the simpler libaudiohal to factorize the audio HAL impl. Generated with script: set -euo pipefail cd hardware/interfaces/audio # Make 2.0 and 4.0 files mostly identical by removing all 2.0, V4.0... # and replacing it by CPP_VERSION and FILE_VERSION # This allow both implementation to be mostly identical, except for code difference # Also remove IncludeGuard.h as it will be included from compiler flag # Also update license to 2018 find -name *.cpp -o -name *h | grep -v -e service.cpp | xargs sed -Ei \ -e 's/(#.*)V[42]_0_(.*_H_?)$/\1\2/' \ -e 's/(LOG_TAG.*)[24]_0/\1/' \ -e '/#ifndef AUDIO_HAL_VERSION/,/#endif/d' \ -e '/^#.*def.*AUDIO_HAL_VERSION\b/d' \ -e's/V[42]_0/CPP_VERSION/' \ -e 's/(#include ).(android.*)[24].0(.*).$/\1PATH(\2FILE_VERSION\3)/' \ -e 's|(#include) .(.*)[24].0/(default/.*).$|\1 "\2\3"|' \ -e 's/\bAUDIO_HAL_VERSION\b/CPP_VERSION/' \ -e '/IncludeGuard.h/d' \ -e 's/(Copyright .C. 201)./\18/' # set MAJOR_VERSION instead of having a different macro for each version # this allow to do preprocessor arithmetic (eg: MAJOR_VERSION >= 4) for v in 2 4; do find -ipath '*/'$v'.0/*/Android.bp' | xargs sed -i -e '/cflags:/,/^$/d' -e '/vndk/{:a;/}/!{N;ba};d}' -e '$i\ cflags: [\ "-DMAJOR_VERSION='$v'",\ "-DMINOR_VERSION=0",\ "-include common/all-versions/VersionMacro.h",\ ]'; done # replace# ifdef VERSION_X by #if MAJOR_VERSION == X find -path *all-versions/*.h | xargs sed -Ei -e 's/def.*AUDIO_HAL_VERSION_([24])_0.*/ MAJOR_VERSION == \1/' \ -e 'T;s/ +/ /' # copy all-versions impl in each version impl find -path '*/[24].0/*.[hc]*' | grep -ve all-versions -e test | xargs -P99 -n4 sed -i -Ee '/include <.*all-versions.default/!b' \ -e 's#.*<#find -path */#' -e 's/>$/|xargs tail -n +16/' -e e # remove all-versions impl rm -r {core,effect}/all-versions/ # merge version impl into a single all-version for dir in core/*.0/vts/functional/*.0/ ;do dest=$(echo $dir | sed 's#/..0/#/all-versions/#') mkdir -p $dest mv -T $dir $dest done find -mindepth 3 -path '*/2.0/*' -a \( -name '*cpp' -o -name '*h' \) | grep -v 'all-versions' | sed -E 'h;s/2/4/g;H;s/4.0/all-versions/;s/4.0//;H;g;s/\n/ /g;'| xargs -P99 -L1 sh -c ' set -euo pipefail mkdir -p $(dirname $2); diff --old-group-format="#if MAJOR_VERSION == 2 %<#endif " \ --new-group-format="#if MAJOR_VERSION == 4 %>#endif " $0 $1 > $2 || true; rm $0 $1' # merge the X.0 Android.bp & OWNERS in the all-versions for dir in common effect core; do for sub in default vts/functional; do test -f $dir/2.0/$sub/Android.bp || continue awk 1 $dir/*.0/$sub/Android.bp >> $dir/all-versions/$sub/Android.bp # delete licenses except for the first one and add whitelines sed -i -e '/^}$/{N;/^}\n$/!s/\n/&\n/}' $dir/all-versions/$sub/Android.bp sed -i -e '1,17b;/^\/\//,/^$/{d}' $dir/all-versions/$sub/Android.bp done for sub in default vts; do test -d $dir/2.0/$sub || continue test -f $dir/2.0/$sub/OWNERS && awk 1 $dir/*.0/$sub/OWNERS | sort -u > $dir/all-versions/$sub/OWNERS || true rm -r $dir/*.0/$sub done done # delete all-versions-impl dependencies find -name 'Android.bp' | xargs sed -i -e '/all-versions-impl/d' # cleanup unused files rm common/all-versions/default/include/common/all-versions/default/HidlUtils* rm common/all-versions/util/include/common/all-versions/IncludeGuard.h find -depth -type d -empty -delete # Clamp consecutive number of empty lines to 2 find -name *.cpp -o -name *h | xargs sed -Ei ':a;/^\n*$/{N;ba};s/\n\n+/\n\n/' # transform #endif\n#if to #elif find -name *.cpp -o -name *h | xargs sed -i '/^#endif/{N;s/.*\n#if/#elif/}' # remove leftover include guard in cpp find -name *.cpp |xargs sed -Ei '/^#.*_H_?$/d' # apply clang-format find -name *cpp -o -name *h | xargs ../../../prebuilts/clang/host/linux-x86/clang-stable/bin/clang-format --style file -i # clang format breaks PATH(a/b) to PATH(a / b), remove the space surrounding / find -name *cpp -o -name *h | xargs sed -i "/#include PATH/s# / #/#g" Test: compile Bug: 118203066 Change-Id: I3692a444307afc5f71064fe0b9e6b8af3c9ff1dd Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-14 16:22:07 -08:00
// Methods from ::android::hardware::audio::CPP_VERSION::IDevice follow.
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<Result> Device::initCheck() {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
return analyzeStatus("init_check", mDevice->init_check(mDevice));
}
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<Result> Device::setMasterVolume(float volume) {
Audio HAL: A volume/gain outside of [0,1] is an error Hals are supposed to received normalized volumes, between 0 and 1. Previously volumes outside [0,1] were clamp to this range. This clamping has the capability to hide bugs thus return an error if such volume is received. Test: vts-tradefed run vts --module VtsHalAudioV2_0Target Test: call/play music/record/video... Bug: 36311550 Change-Id: Ia4880bdff6111cbcdae6a4ebee921eddae141ee4 Signed-off-by: Kevin Rocard <krocard@google.com>
2017-05-08 17:08:11 -07:00
if (mDevice->set_master_volume == NULL) {
return Result::NOT_SUPPORTED;
}
if (!isGainNormalized(volume)) {
ALOGW("Can not set a master volume (%f) outside [0,1]", volume);
return Result::INVALID_ARGUMENTS;
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
audio: Ignore ENOSYS from optional legacy HAL methods Some methods of legacy HALs are optional. The legacy HAL can avoid implementing them either by setting the function entry in the interface table to NULL or by setting it to a stub function returning -ENOSYS. In the latter case the default implementation was spamming syslog with warnings. Specify that ENOSYS returned from optional legacy HAL methods must be ignored. Bug: 141989952 Test: check logcat Change-Id: Idbdff8d88e3303a0181cb5629ab82485148e6d8e
2019-12-11 15:50:51 -08:00
return analyzeStatus("set_master_volume", mDevice->set_master_volume(mDevice, volume),
{ENOSYS} /*ignore*/);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<void> Device::getMasterVolume(getMasterVolume_cb _hidl_cb) {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
Result retval(Result::NOT_SUPPORTED);
float volume = 0;
if (mDevice->get_master_volume != NULL) {
audio: Ignore ENOSYS from optional legacy HAL methods Some methods of legacy HALs are optional. The legacy HAL can avoid implementing them either by setting the function entry in the interface table to NULL or by setting it to a stub function returning -ENOSYS. In the latter case the default implementation was spamming syslog with warnings. Specify that ENOSYS returned from optional legacy HAL methods must be ignored. Bug: 141989952 Test: check logcat Change-Id: Idbdff8d88e3303a0181cb5629ab82485148e6d8e
2019-12-11 15:50:51 -08:00
retval = analyzeStatus("get_master_volume", mDevice->get_master_volume(mDevice, &volume),
{ENOSYS} /*ignore*/);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
_hidl_cb(retval, volume);
return Void();
}
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<Result> Device::setMicMute(bool mute) {
audio: Ignore ENOSYS from optional legacy HAL methods Some methods of legacy HALs are optional. The legacy HAL can avoid implementing them either by setting the function entry in the interface table to NULL or by setting it to a stub function returning -ENOSYS. In the latter case the default implementation was spamming syslog with warnings. Specify that ENOSYS returned from optional legacy HAL methods must be ignored. Bug: 141989952 Test: check logcat Change-Id: Idbdff8d88e3303a0181cb5629ab82485148e6d8e
2019-12-11 15:50:51 -08:00
return analyzeStatus("set_mic_mute", mDevice->set_mic_mute(mDevice, mute), {ENOSYS} /*ignore*/);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<void> Device::getMicMute(getMicMute_cb _hidl_cb) {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
bool mute = false;
audio: Ignore ENOSYS from optional legacy HAL methods Some methods of legacy HALs are optional. The legacy HAL can avoid implementing them either by setting the function entry in the interface table to NULL or by setting it to a stub function returning -ENOSYS. In the latter case the default implementation was spamming syslog with warnings. Specify that ENOSYS returned from optional legacy HAL methods must be ignored. Bug: 141989952 Test: check logcat Change-Id: Idbdff8d88e3303a0181cb5629ab82485148e6d8e
2019-12-11 15:50:51 -08:00
Result retval = analyzeStatus("get_mic_mute", mDevice->get_mic_mute(mDevice, &mute),
{ENOSYS} /*ignore*/);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
_hidl_cb(retval, mute);
return Void();
}
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<Result> Device::setMasterMute(bool mute) {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
Result retval(Result::NOT_SUPPORTED);
if (mDevice->set_master_mute != NULL) {
audio: Ignore ENOSYS from optional legacy HAL methods Some methods of legacy HALs are optional. The legacy HAL can avoid implementing them either by setting the function entry in the interface table to NULL or by setting it to a stub function returning -ENOSYS. In the latter case the default implementation was spamming syslog with warnings. Specify that ENOSYS returned from optional legacy HAL methods must be ignored. Bug: 141989952 Test: check logcat Change-Id: Idbdff8d88e3303a0181cb5629ab82485148e6d8e
2019-12-11 15:50:51 -08:00
retval = analyzeStatus("set_master_mute", mDevice->set_master_mute(mDevice, mute),
{ENOSYS} /*ignore*/);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
return retval;
}
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<void> Device::getMasterMute(getMasterMute_cb _hidl_cb) {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
Result retval(Result::NOT_SUPPORTED);
bool mute = false;
if (mDevice->get_master_mute != NULL) {
audio: Ignore ENOSYS from optional legacy HAL methods Some methods of legacy HALs are optional. The legacy HAL can avoid implementing them either by setting the function entry in the interface table to NULL or by setting it to a stub function returning -ENOSYS. In the latter case the default implementation was spamming syslog with warnings. Specify that ENOSYS returned from optional legacy HAL methods must be ignored. Bug: 141989952 Test: check logcat Change-Id: Idbdff8d88e3303a0181cb5629ab82485148e6d8e
2019-12-11 15:50:51 -08:00
retval = analyzeStatus("get_master_mute", mDevice->get_master_mute(mDevice, &mute),
{ENOSYS} /*ignore*/);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
_hidl_cb(retval, mute);
return Void();
}
Audio V4: Fix issues in the legacy wrapper raised by clang-format This patch only contains cosmetic reformatting imposed by clang-format. Bug: 38184704 Test: compile Change-Id: I57545f2b8de1e982028ef4794328741d91682e0c Signed-off-by: Kevin Rocard <krocard@google.com>
2017-12-14 18:50:12 -08:00
Return<void> Device::getInputBufferSize(const AudioConfig& config, getInputBufferSize_cb _hidl_cb) {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
audio_config_t halConfig;
Result retval(Result::INVALID_ARGUMENTS);
uint64_t bufferSize = 0;
Audio: Add VTS tests for invalid enum-strings, Part 1 Add tests that try passing invalid enum-string values to HAL methods taking enum-strings. Fix issues found in the default wrapper. Interface updates: - Update AudioConfig structure to indicate whether AudioOffloadInfo is specified. - Add return value to IStreamIn.updateSinkMetadata and IStreamOut.updateSourceMetadata to provide indication of invalid arguments. - Specify the behavior of IDevice.open{Input|Output}Stream in the case of invalid arguments vs. rejected config. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I6bd7be3869cc7a8d5d00506565bbf0b3a050b630
2020-12-17 15:01:54 -08:00
if (HidlUtils::audioConfigToHal(config, &halConfig) == NO_ERROR) {
size_t halBufferSize = mDevice->get_input_buffer_size(mDevice, &halConfig);
if (halBufferSize != 0) {
retval = Result::OK;
bufferSize = halBufferSize;
}
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
_hidl_cb(retval, bufferSize);
return Void();
}
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:41:11 -08:00
std::tuple<Result, sp<IStreamOut>> Device::openOutputStreamImpl(int32_t ioHandle,
const DeviceAddress& device,
const AudioConfig& config,
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
const AudioOutputFlags& flags,
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:41:11 -08:00
AudioConfig* suggestedConfig) {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
audio_config_t halConfig;
Audio: Add VTS tests for invalid enum-strings, Part 1 Add tests that try passing invalid enum-string values to HAL methods taking enum-strings. Fix issues found in the default wrapper. Interface updates: - Update AudioConfig structure to indicate whether AudioOffloadInfo is specified. - Add return value to IStreamIn.updateSinkMetadata and IStreamOut.updateSourceMetadata to provide indication of invalid arguments. - Specify the behavior of IDevice.open{Input|Output}Stream in the case of invalid arguments vs. rejected config. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I6bd7be3869cc7a8d5d00506565bbf0b3a050b630
2020-12-17 15:01:54 -08:00
if (HidlUtils::audioConfigToHal(config, &halConfig) != NO_ERROR) {
return {Result::INVALID_ARGUMENTS, nullptr};
}
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
audio_stream_out_t* halStream;
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
audio_devices_t halDevice;
char halDeviceAddress[AUDIO_DEVICE_MAX_ADDRESS_LEN];
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 Merged-In: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
2021-01-15 19:05:04 +00:00
if (CoreUtils::deviceAddressToHal(device, &halDevice, halDeviceAddress) != NO_ERROR) {
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
return {Result::INVALID_ARGUMENTS, nullptr};
}
audio_output_flags_t halFlags;
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 Merged-In: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
2021-01-15 19:05:04 +00:00
if (CoreUtils::audioOutputFlagsToHal(flags, &halFlags) != NO_ERROR) {
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
return {Result::INVALID_ARGUMENTS, nullptr};
}
ALOGV("open_output_stream handle: %d devices: %x flags: %#x "
"srate: %d format %#x channels %x address %s",
ioHandle, halDevice, halFlags, halConfig.sample_rate, halConfig.format,
halConfig.channel_mask, halDeviceAddress);
int status = mDevice->open_output_stream(mDevice, ioHandle, halDevice, halFlags, &halConfig,
&halStream, halDeviceAddress);
Audio HAL: fixes for issues discovered after client conversion Several issues addressed: -- added IDevice.supportsAudioPatches to query whether create/removeAudioPatch is actually supported by HAL; -- IStreamOutCallback proxy needs to be owned by IStreamOut implementation. In order for the client to reset the reference, added method IStreamOut.clearCallback; -- IDevice.open{Input|Output}Stream need to return a "suggested" audio config from HAL; -- code for converting between system/audio.h and HIDL data structures has been moved to android.hardware.audio.common@2.0-util library for reuse; -- added a workaround for the issue with QC effects HAL trying to write into the input parameters buffer, which is r/o by Binder design. Bug: 30222631 Change-Id: I64af24d79c12d6ac3b0f87d085a821913e29237b Test: tried using with WIP HIDL client on N5X
2016-11-16 16:30:17 -08:00
ALOGV("open_output_stream status %d stream %p", status, halStream);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
sp<IStreamOut> streamOut;
if (status == OK) {
audiohal: Fix UAF of HAL devices in Stream objects Stream objects used to hold a pointer to underlying HAL device object which they didn't own. Since destruction of server side objects is asynchronous, it was possible that a Device object gets destroyed before Stream objects, making all the HAL device object pointer to become stale. Fixed by adding a strong reference to Device objects into Stream objects. Bug: 36702804 Change-Id: I3da3611afbb91d6fd6410ac5b8af2a2eebfa6dac Test: ran Loopback app and HAL VTS tests (cherry picked from commit 96d3573cda6f76bcbfc277e69d94914a565218d8)
2017-03-29 09:31:18 -07:00
streamOut = new StreamOut(this, halStream);
audio: Add check to IDevice.close for currently opened streams IDevice.close must not proceed if there are streams that are currently opened on this device. Bug: 114451103 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I61d81bc0333098c341d5d551bf59331e49fcf682
2019-11-20 15:17:08 -08:00
++mOpenedStreamsCount;
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
status_t convertStatus =
HidlUtils::audioConfigFromHal(halConfig, false /*isInput*/, suggestedConfig);
audio hal: Update offload configuration Test: no regression with offloaded Play Music Bug: 133526565 Merged-In: Ie655a96503be5a4ad1660d4b2183b01e514452fd Change-Id: Ie655a96503be5a4ad1660d4b2183b01e514452fd (cherry picked from commit c91b679ac1ae75ac60a277be7d4a6f573e4c22bf)
2020-02-14 15:39:55 -08:00
ALOGW_IF(convertStatus != OK, "%s: suggested config with incompatible fields", __func__);
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:41:11 -08:00
return {analyzeStatus("open_output_stream", status, {EINVAL} /*ignore*/), streamOut};
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
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:41:11 -08:00
std::tuple<Result, sp<IStreamIn>> Device::openInputStreamImpl(
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
int32_t ioHandle, const DeviceAddress& device, const AudioConfig& config,
const AudioInputFlags& flags, AudioSource source, AudioConfig* suggestedConfig) {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
audio_config_t halConfig;
Audio: Add VTS tests for invalid enum-strings, Part 1 Add tests that try passing invalid enum-string values to HAL methods taking enum-strings. Fix issues found in the default wrapper. Interface updates: - Update AudioConfig structure to indicate whether AudioOffloadInfo is specified. - Add return value to IStreamIn.updateSinkMetadata and IStreamOut.updateSourceMetadata to provide indication of invalid arguments. - Specify the behavior of IDevice.open{Input|Output}Stream in the case of invalid arguments vs. rejected config. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I6bd7be3869cc7a8d5d00506565bbf0b3a050b630
2020-12-17 15:01:54 -08:00
if (HidlUtils::audioConfigToHal(config, &halConfig) != NO_ERROR) {
return {Result::INVALID_ARGUMENTS, nullptr};
}
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
audio_stream_in_t* halStream;
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
audio_devices_t halDevice;
char halDeviceAddress[AUDIO_DEVICE_MAX_ADDRESS_LEN];
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 Merged-In: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
2021-01-15 19:05:04 +00:00
if (CoreUtils::deviceAddressToHal(device, &halDevice, halDeviceAddress) != NO_ERROR) {
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
return {Result::INVALID_ARGUMENTS, nullptr};
}
audio_input_flags_t halFlags;
audio_source_t halSource;
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 Merged-In: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
2021-01-15 19:05:04 +00:00
if (CoreUtils::audioInputFlagsToHal(flags, &halFlags) != NO_ERROR ||
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
HidlUtils::audioSourceToHal(source, &halSource) != NO_ERROR) {
return {Result::INVALID_ARGUMENTS, nullptr};
}
ALOGV("open_input_stream handle: %d devices: %x flags: %#x "
"srate: %d format %#x channels %x address %s source %d",
ioHandle, halDevice, halFlags, halConfig.sample_rate, halConfig.format,
halConfig.channel_mask, halDeviceAddress, halSource);
int status = mDevice->open_input_stream(mDevice, ioHandle, halDevice, &halConfig, &halStream,
halFlags, halDeviceAddress, halSource);
Audio HAL: fixes for issues discovered after client conversion Several issues addressed: -- added IDevice.supportsAudioPatches to query whether create/removeAudioPatch is actually supported by HAL; -- IStreamOutCallback proxy needs to be owned by IStreamOut implementation. In order for the client to reset the reference, added method IStreamOut.clearCallback; -- IDevice.open{Input|Output}Stream need to return a "suggested" audio config from HAL; -- code for converting between system/audio.h and HIDL data structures has been moved to android.hardware.audio.common@2.0-util library for reuse; -- added a workaround for the issue with QC effects HAL trying to write into the input parameters buffer, which is r/o by Binder design. Bug: 30222631 Change-Id: I64af24d79c12d6ac3b0f87d085a821913e29237b Test: tried using with WIP HIDL client on N5X
2016-11-16 16:30:17 -08:00
ALOGV("open_input_stream status %d stream %p", status, halStream);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
sp<IStreamIn> streamIn;
if (status == OK) {
audiohal: Fix UAF of HAL devices in Stream objects Stream objects used to hold a pointer to underlying HAL device object which they didn't own. Since destruction of server side objects is asynchronous, it was possible that a Device object gets destroyed before Stream objects, making all the HAL device object pointer to become stale. Fixed by adding a strong reference to Device objects into Stream objects. Bug: 36702804 Change-Id: I3da3611afbb91d6fd6410ac5b8af2a2eebfa6dac Test: ran Loopback app and HAL VTS tests (cherry picked from commit 96d3573cda6f76bcbfc277e69d94914a565218d8)
2017-03-29 09:31:18 -07:00
streamIn = new StreamIn(this, halStream);
audio: Add check to IDevice.close for currently opened streams IDevice.close must not proceed if there are streams that are currently opened on this device. Bug: 114451103 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I61d81bc0333098c341d5d551bf59331e49fcf682
2019-11-20 15:17:08 -08:00
++mOpenedStreamsCount;
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
status_t convertStatus =
HidlUtils::audioConfigFromHal(halConfig, true /*isInput*/, suggestedConfig);
audio hal: Update offload configuration Test: no regression with offloaded Play Music Bug: 133526565 Merged-In: Ie655a96503be5a4ad1660d4b2183b01e514452fd Change-Id: Ie655a96503be5a4ad1660d4b2183b01e514452fd (cherry picked from commit c91b679ac1ae75ac60a277be7d4a6f573e4c22bf)
2020-02-14 15:39:55 -08:00
ALOGW_IF(convertStatus != OK, "%s: suggested config with incompatible fields", __func__);
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:41:11 -08:00
return {analyzeStatus("open_input_stream", status, {EINVAL} /*ignore*/), streamIn};
}
#if MAJOR_VERSION == 2
Return<void> Device::openOutputStream(int32_t ioHandle, const DeviceAddress& device,
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
const AudioConfig& config, AudioOutputFlags flags,
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:41:11 -08:00
openOutputStream_cb _hidl_cb) {
Audio HAL: fixes for issues discovered after client conversion Several issues addressed: -- added IDevice.supportsAudioPatches to query whether create/removeAudioPatch is actually supported by HAL; -- IStreamOutCallback proxy needs to be owned by IStreamOut implementation. In order for the client to reset the reference, added method IStreamOut.clearCallback; -- IDevice.open{Input|Output}Stream need to return a "suggested" audio config from HAL; -- code for converting between system/audio.h and HIDL data structures has been moved to android.hardware.audio.common@2.0-util library for reuse; -- added a workaround for the issue with QC effects HAL trying to write into the input parameters buffer, which is r/o by Binder design. Bug: 30222631 Change-Id: I64af24d79c12d6ac3b0f87d085a821913e29237b Test: tried using with WIP HIDL client on N5X
2016-11-16 16:30:17 -08:00
AudioConfig suggestedConfig;
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:41:11 -08:00
auto [result, streamOut] =
openOutputStreamImpl(ioHandle, device, config, flags, &suggestedConfig);
_hidl_cb(result, streamOut, suggestedConfig);
return Void();
}
Return<void> Device::openInputStream(int32_t ioHandle, const DeviceAddress& device,
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
const AudioConfig& config, AudioInputFlags flags,
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:41:11 -08:00
AudioSource source, openInputStream_cb _hidl_cb) {
AudioConfig suggestedConfig;
auto [result, streamIn] =
openInputStreamImpl(ioHandle, device, config, flags, source, &suggestedConfig);
_hidl_cb(result, streamIn, suggestedConfig);
return Void();
}
#elif MAJOR_VERSION >= 4
Return<void> Device::openOutputStream(int32_t ioHandle, const DeviceAddress& device,
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
const AudioConfig& config,
#if MAJOR_VERSION <= 6
AudioOutputFlags flags,
#else
const AudioOutputFlags& flags,
#endif
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:41:11 -08:00
const SourceMetadata& sourceMetadata,
openOutputStream_cb _hidl_cb) {
Audio: Add VTS tests for invalid enum-strings, Part 1 Add tests that try passing invalid enum-string values to HAL methods taking enum-strings. Fix issues found in the default wrapper. Interface updates: - Update AudioConfig structure to indicate whether AudioOffloadInfo is specified. - Add return value to IStreamIn.updateSinkMetadata and IStreamOut.updateSourceMetadata to provide indication of invalid arguments. - Specify the behavior of IDevice.open{Input|Output}Stream in the case of invalid arguments vs. rejected config. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I6bd7be3869cc7a8d5d00506565bbf0b3a050b630
2020-12-17 15:01:54 -08:00
#if MAJOR_VERSION <= 6
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 Merged-In: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
2021-01-15 19:05:04 +00:00
if (status_t status = CoreUtils::sourceMetadataToHal(sourceMetadata, nullptr);
status != NO_ERROR) {
Audio: Add VTS tests for invalid enum-strings, Part 1 Add tests that try passing invalid enum-string values to HAL methods taking enum-strings. Fix issues found in the default wrapper. Interface updates: - Update AudioConfig structure to indicate whether AudioOffloadInfo is specified. - Add return value to IStreamIn.updateSinkMetadata and IStreamOut.updateSourceMetadata to provide indication of invalid arguments. - Specify the behavior of IDevice.open{Input|Output}Stream in the case of invalid arguments vs. rejected config. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I6bd7be3869cc7a8d5d00506565bbf0b3a050b630
2020-12-17 15:01:54 -08:00
#else
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 Merged-In: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
2021-01-15 19:05:04 +00:00
if (status_t status = CoreUtils::sourceMetadataToHalV7(sourceMetadata,
false /*ignoreNonVendorTags*/, nullptr);
status != NO_ERROR) {
Audio: Add VTS tests for invalid enum-strings, Part 1 Add tests that try passing invalid enum-string values to HAL methods taking enum-strings. Fix issues found in the default wrapper. Interface updates: - Update AudioConfig structure to indicate whether AudioOffloadInfo is specified. - Add return value to IStreamIn.updateSinkMetadata and IStreamOut.updateSourceMetadata to provide indication of invalid arguments. - Specify the behavior of IDevice.open{Input|Output}Stream in the case of invalid arguments vs. rejected config. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I6bd7be3869cc7a8d5d00506565bbf0b3a050b630
2020-12-17 15:01:54 -08:00
#endif
_hidl_cb(analyzeStatus("sourceMetadataToHal", status), nullptr, AudioConfig{});
return Void();
}
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:41:11 -08:00
AudioConfig suggestedConfig;
auto [result, streamOut] =
openOutputStreamImpl(ioHandle, device, config, flags, &suggestedConfig);
if (streamOut) {
streamOut->updateSourceMetadata(sourceMetadata);
}
_hidl_cb(result, streamOut, suggestedConfig);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
return Void();
}
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
Return<void> Device::openInputStream(int32_t ioHandle, const DeviceAddress& device,
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
const AudioConfig& config,
#if MAJOR_VERSION <= 6
AudioInputFlags flags,
#else
const AudioInputFlags& flags,
#endif
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
const SinkMetadata& sinkMetadata,
openInputStream_cb _hidl_cb) {
if (sinkMetadata.tracks.size() == 0) {
// This should never happen, the framework must not create as stream
// if there is no client
ALOGE("openInputStream called without tracks connected");
Audio: Add VTS tests for invalid enum-strings, Part 1 Add tests that try passing invalid enum-string values to HAL methods taking enum-strings. Fix issues found in the default wrapper. Interface updates: - Update AudioConfig structure to indicate whether AudioOffloadInfo is specified. - Add return value to IStreamIn.updateSinkMetadata and IStreamOut.updateSourceMetadata to provide indication of invalid arguments. - Specify the behavior of IDevice.open{Input|Output}Stream in the case of invalid arguments vs. rejected config. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I6bd7be3869cc7a8d5d00506565bbf0b3a050b630
2020-12-17 15:01:54 -08:00
_hidl_cb(Result::INVALID_ARGUMENTS, nullptr, AudioConfig{});
return Void();
}
#if MAJOR_VERSION <= 6
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 Merged-In: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
2021-01-15 19:05:04 +00:00
if (status_t status = CoreUtils::sinkMetadataToHal(sinkMetadata, nullptr); status != NO_ERROR) {
Audio: Add VTS tests for invalid enum-strings, Part 1 Add tests that try passing invalid enum-string values to HAL methods taking enum-strings. Fix issues found in the default wrapper. Interface updates: - Update AudioConfig structure to indicate whether AudioOffloadInfo is specified. - Add return value to IStreamIn.updateSinkMetadata and IStreamOut.updateSourceMetadata to provide indication of invalid arguments. - Specify the behavior of IDevice.open{Input|Output}Stream in the case of invalid arguments vs. rejected config. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I6bd7be3869cc7a8d5d00506565bbf0b3a050b630
2020-12-17 15:01:54 -08:00
#else
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 Merged-In: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
2021-01-15 19:05:04 +00:00
if (status_t status = CoreUtils::sinkMetadataToHalV7(sinkMetadata,
false /*ignoreNonVendorTags*/, nullptr);
status != NO_ERROR) {
Audio: Add VTS tests for invalid enum-strings, Part 1 Add tests that try passing invalid enum-string values to HAL methods taking enum-strings. Fix issues found in the default wrapper. Interface updates: - Update AudioConfig structure to indicate whether AudioOffloadInfo is specified. - Add return value to IStreamIn.updateSinkMetadata and IStreamOut.updateSourceMetadata to provide indication of invalid arguments. - Specify the behavior of IDevice.open{Input|Output}Stream in the case of invalid arguments vs. rejected config. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I6bd7be3869cc7a8d5d00506565bbf0b3a050b630
2020-12-17 15:01:54 -08:00
#endif
_hidl_cb(analyzeStatus("sinkMetadataToHal", status), nullptr, AudioConfig{});
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
return Void();
}
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:41:11 -08:00
// Pick the first one as the main.
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
AudioSource source = sinkMetadata.tracks[0].source;
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:41:11 -08:00
AudioConfig suggestedConfig;
auto [result, streamIn] =
openInputStreamImpl(ioHandle, device, config, flags, source, &suggestedConfig);
if (streamIn) {
streamIn->updateSinkMetadata(sinkMetadata);
}
_hidl_cb(result, streamIn, suggestedConfig);
return Void();
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
}
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:41:11 -08:00
#endif /* MAJOR_VERSION */
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
Audio HAL: fixes for issues discovered after client conversion Several issues addressed: -- added IDevice.supportsAudioPatches to query whether create/removeAudioPatch is actually supported by HAL; -- IStreamOutCallback proxy needs to be owned by IStreamOut implementation. In order for the client to reset the reference, added method IStreamOut.clearCallback; -- IDevice.open{Input|Output}Stream need to return a "suggested" audio config from HAL; -- code for converting between system/audio.h and HIDL data structures has been moved to android.hardware.audio.common@2.0-util library for reuse; -- added a workaround for the issue with QC effects HAL trying to write into the input parameters buffer, which is r/o by Binder design. Bug: 30222631 Change-Id: I64af24d79c12d6ac3b0f87d085a821913e29237b Test: tried using with WIP HIDL client on N5X
2016-11-16 16:30:17 -08:00
Return<bool> Device::supportsAudioPatches() {
return version() >= AUDIO_DEVICE_API_VERSION_3_0;
}
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<void> Device::createAudioPatch(const hidl_vec<AudioPortConfig>& sources,
const hidl_vec<AudioPortConfig>& sinks,
createAudioPatch_cb _hidl_cb) {
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
auto [retval, patch] = createOrUpdateAudioPatch(AudioPatchHandle{}, sources, sinks);
audio: Add IDevice::updateAudioPatch method Add method 'updateAudioPatch' which should be used when an existing patch needs to be updated with new routing. Use of this method allows audio HAL to avoid disrupting audio stream while changing routing. Bug: 79248321 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I6c87f67fa4f2463ba9e8f0272a3232f5c9c55714
2019-12-11 12:36:26 -08:00
_hidl_cb(retval, patch);
return Void();
}
std::tuple<Result, AudioPatchHandle> Device::createOrUpdateAudioPatch(
AudioPatchHandle patch, const hidl_vec<AudioPortConfig>& sources,
const hidl_vec<AudioPortConfig>& sinks) {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
Result retval(Result::NOT_SUPPORTED);
if (version() >= AUDIO_DEVICE_API_VERSION_3_0) {
Audio: Add VTS tests for invalid enum-strings, Part 3 Add checks for rejection of invalid port configs. Fix the default implementation to pass the tests. Clarified that patch-related operations in IDevice are optional. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I08e85d4883938b4d8f3c411be9fb1bd597eea0c2
2021-01-11 17:59:10 -08:00
audio_patch_handle_t halPatch = static_cast<audio_patch_handle_t>(patch);
Implement a.h.audio.common@7.0-util module This includes a rewrite of HidlUtils for V7. A unit test is added for its conversion functions. Made necessary minor adjustments to the HAL V7 types. Also, fixed definition of 'audioFormatsList' to allow for vendor extensions. Bug: 142480271 Bug: 173647783 Test: m && atest android.hardware.audio.common@7.0-util_tests Change-Id: Ib883f1c246fce78c004846516699aa724d4b5d44 Merged-In: Ib883f1c246fce78c004846516699aa724d4b5d44
2020-10-29 13:08:05 -07:00
std::unique_ptr<audio_port_config[]> halSources;
Audio: Add VTS tests for invalid enum-strings, Part 3 Add checks for rejection of invalid port configs. Fix the default implementation to pass the tests. Clarified that patch-related operations in IDevice are optional. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I08e85d4883938b4d8f3c411be9fb1bd597eea0c2
2021-01-11 17:59:10 -08:00
if (status_t status = HidlUtils::audioPortConfigsToHal(sources, &halSources);
status != NO_ERROR) {
return {analyzeStatus("audioPortConfigsToHal;sources", status), patch};
}
Implement a.h.audio.common@7.0-util module This includes a rewrite of HidlUtils for V7. A unit test is added for its conversion functions. Made necessary minor adjustments to the HAL V7 types. Also, fixed definition of 'audioFormatsList' to allow for vendor extensions. Bug: 142480271 Bug: 173647783 Test: m && atest android.hardware.audio.common@7.0-util_tests Change-Id: Ib883f1c246fce78c004846516699aa724d4b5d44 Merged-In: Ib883f1c246fce78c004846516699aa724d4b5d44
2020-10-29 13:08:05 -07:00
std::unique_ptr<audio_port_config[]> halSinks;
Audio: Add VTS tests for invalid enum-strings, Part 3 Add checks for rejection of invalid port configs. Fix the default implementation to pass the tests. Clarified that patch-related operations in IDevice are optional. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I08e85d4883938b4d8f3c411be9fb1bd597eea0c2
2021-01-11 17:59:10 -08:00
if (status_t status = HidlUtils::audioPortConfigsToHal(sinks, &halSinks);
status != NO_ERROR) {
return {analyzeStatus("audioPortConfigsToHal;sinks", status), patch};
}
Audio V4: Fix issues in the legacy wrapper raised by clang-format This patch only contains cosmetic reformatting imposed by clang-format. Bug: 38184704 Test: compile Change-Id: I57545f2b8de1e982028ef4794328741d91682e0c Signed-off-by: Kevin Rocard <krocard@google.com>
2017-12-14 18:50:12 -08:00
retval = analyzeStatus("create_audio_patch",
mDevice->create_audio_patch(mDevice, sources.size(), &halSources[0],
sinks.size(), &halSinks[0], &halPatch));
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
if (retval == Result::OK) {
patch = static_cast<AudioPatchHandle>(halPatch);
}
}
audio: Add IDevice::updateAudioPatch method Add method 'updateAudioPatch' which should be used when an existing patch needs to be updated with new routing. Use of this method allows audio HAL to avoid disrupting audio stream while changing routing. Bug: 79248321 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I6c87f67fa4f2463ba9e8f0272a3232f5c9c55714
2019-12-11 12:36:26 -08:00
return {retval, patch};
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<Result> Device::releaseAudioPatch(int32_t patch) {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
if (version() >= AUDIO_DEVICE_API_VERSION_3_0) {
return analyzeStatus(
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
"release_audio_patch",
Audio V4: Fix issues in the legacy wrapper raised by clang-format This patch only contains cosmetic reformatting imposed by clang-format. Bug: 38184704 Test: compile Change-Id: I57545f2b8de1e982028ef4794328741d91682e0c Signed-off-by: Kevin Rocard <krocard@google.com>
2017-12-14 18:50:12 -08:00
mDevice->release_audio_patch(mDevice, static_cast<audio_patch_handle_t>(patch)));
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
return Result::NOT_SUPPORTED;
}
audio: Use get_audio_port_v7 in the default wrapper get_audio_port_v7 interface method was added in aosp/1518624 but wasn't used in the default wrapper due to the refactoring ongoing at that time. Fixing this omission. Bug: 160352965 Test: atest VtsHalAudioV7_0TargetTest Change-Id: I1e3594f30fe8fa319d0b5b4244531c9142870503 Merged-In: I1e3594f30fe8fa319d0b5b4244531c9142870503
2021-03-24 20:04:08 -07:00
template <typename HalPort>
Return<void> Device::getAudioPortImpl(const AudioPort& port, getAudioPort_cb _hidl_cb,
int (*halGetter)(audio_hw_device_t*, HalPort*),
const char* halGetterName) {
HalPort halPort;
if (status_t status = HidlUtils::audioPortToHal(port, &halPort); status != NO_ERROR) {
_hidl_cb(analyzeStatus("audioPortToHal", status), port);
return Void();
}
Result retval = analyzeStatus(halGetterName, halGetter(mDevice, &halPort));
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
AudioPort resultPort = port;
if (retval == Result::OK) {
audio: Use get_audio_port_v7 in the default wrapper get_audio_port_v7 interface method was added in aosp/1518624 but wasn't used in the default wrapper due to the refactoring ongoing at that time. Fixing this omission. Bug: 160352965 Test: atest VtsHalAudioV7_0TargetTest Change-Id: I1e3594f30fe8fa319d0b5b4244531c9142870503 Merged-In: I1e3594f30fe8fa319d0b5b4244531c9142870503
2021-03-24 20:04:08 -07:00
if (status_t status = HidlUtils::audioPortFromHal(halPort, &resultPort);
status != NO_ERROR) {
_hidl_cb(analyzeStatus("audioPortFromHal", status), port);
return Void();
}
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
_hidl_cb(retval, resultPort);
return Void();
}
audio: Use get_audio_port_v7 in the default wrapper get_audio_port_v7 interface method was added in aosp/1518624 but wasn't used in the default wrapper due to the refactoring ongoing at that time. Fixing this omission. Bug: 160352965 Test: atest VtsHalAudioV7_0TargetTest Change-Id: I1e3594f30fe8fa319d0b5b4244531c9142870503 Merged-In: I1e3594f30fe8fa319d0b5b4244531c9142870503
2021-03-24 20:04:08 -07:00
#if MAJOR_VERSION <= 6
Return<void> Device::getAudioPort(const AudioPort& port, getAudioPort_cb _hidl_cb) {
return getAudioPortImpl(port, _hidl_cb, mDevice->get_audio_port, "get_audio_port");
}
#else
Return<void> Device::getAudioPort(const AudioPort& port, getAudioPort_cb _hidl_cb) {
if (version() >= AUDIO_DEVICE_API_VERSION_3_2) {
// get_audio_port_v7 is mandatory if legacy HAL support this API version.
return getAudioPortImpl(port, _hidl_cb, mDevice->get_audio_port_v7, "get_audio_port_v7");
} else {
return getAudioPortImpl(port, _hidl_cb, mDevice->get_audio_port, "get_audio_port");
}
}
#endif
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<Result> Device::setAudioPortConfig(const AudioPortConfig& config) {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
if (version() >= AUDIO_DEVICE_API_VERSION_3_0) {
struct audio_port_config halPortConfig;
Audio: Add VTS tests for invalid enum-strings, Part 3 Add checks for rejection of invalid port configs. Fix the default implementation to pass the tests. Clarified that patch-related operations in IDevice are optional. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: atest VtsHalAudioV7_0TargetTest with side-loaded V7 default wrapper Change-Id: I08e85d4883938b4d8f3c411be9fb1bd597eea0c2
2021-01-11 17:59:10 -08:00
if (status_t status = HidlUtils::audioPortConfigToHal(config, &halPortConfig);
status != NO_ERROR) {
return analyzeStatus("audioPortConfigToHal", status);
}
Audio V4: Fix issues in the legacy wrapper raised by clang-format This patch only contains cosmetic reformatting imposed by clang-format. Bug: 38184704 Test: compile Change-Id: I57545f2b8de1e982028ef4794328741d91682e0c Signed-off-by: Kevin Rocard <krocard@google.com>
2017-12-14 18:50:12 -08:00
return analyzeStatus("set_audio_port_config",
mDevice->set_audio_port_config(mDevice, &halPortConfig));
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
return Result::NOT_SUPPORTED;
}
Audio HAL: Factorize V2 and V4 like libaudiohal Use the same technique developed for the simpler libaudiohal to factorize the audio HAL impl. Generated with script: set -euo pipefail cd hardware/interfaces/audio # Make 2.0 and 4.0 files mostly identical by removing all 2.0, V4.0... # and replacing it by CPP_VERSION and FILE_VERSION # This allow both implementation to be mostly identical, except for code difference # Also remove IncludeGuard.h as it will be included from compiler flag # Also update license to 2018 find -name *.cpp -o -name *h | grep -v -e service.cpp | xargs sed -Ei \ -e 's/(#.*)V[42]_0_(.*_H_?)$/\1\2/' \ -e 's/(LOG_TAG.*)[24]_0/\1/' \ -e '/#ifndef AUDIO_HAL_VERSION/,/#endif/d' \ -e '/^#.*def.*AUDIO_HAL_VERSION\b/d' \ -e's/V[42]_0/CPP_VERSION/' \ -e 's/(#include ).(android.*)[24].0(.*).$/\1PATH(\2FILE_VERSION\3)/' \ -e 's|(#include) .(.*)[24].0/(default/.*).$|\1 "\2\3"|' \ -e 's/\bAUDIO_HAL_VERSION\b/CPP_VERSION/' \ -e '/IncludeGuard.h/d' \ -e 's/(Copyright .C. 201)./\18/' # set MAJOR_VERSION instead of having a different macro for each version # this allow to do preprocessor arithmetic (eg: MAJOR_VERSION >= 4) for v in 2 4; do find -ipath '*/'$v'.0/*/Android.bp' | xargs sed -i -e '/cflags:/,/^$/d' -e '/vndk/{:a;/}/!{N;ba};d}' -e '$i\ cflags: [\ "-DMAJOR_VERSION='$v'",\ "-DMINOR_VERSION=0",\ "-include common/all-versions/VersionMacro.h",\ ]'; done # replace# ifdef VERSION_X by #if MAJOR_VERSION == X find -path *all-versions/*.h | xargs sed -Ei -e 's/def.*AUDIO_HAL_VERSION_([24])_0.*/ MAJOR_VERSION == \1/' \ -e 'T;s/ +/ /' # copy all-versions impl in each version impl find -path '*/[24].0/*.[hc]*' | grep -ve all-versions -e test | xargs -P99 -n4 sed -i -Ee '/include <.*all-versions.default/!b' \ -e 's#.*<#find -path */#' -e 's/>$/|xargs tail -n +16/' -e e # remove all-versions impl rm -r {core,effect}/all-versions/ # merge version impl into a single all-version for dir in core/*.0/vts/functional/*.0/ ;do dest=$(echo $dir | sed 's#/..0/#/all-versions/#') mkdir -p $dest mv -T $dir $dest done find -mindepth 3 -path '*/2.0/*' -a \( -name '*cpp' -o -name '*h' \) | grep -v 'all-versions' | sed -E 'h;s/2/4/g;H;s/4.0/all-versions/;s/4.0//;H;g;s/\n/ /g;'| xargs -P99 -L1 sh -c ' set -euo pipefail mkdir -p $(dirname $2); diff --old-group-format="#if MAJOR_VERSION == 2 %<#endif " \ --new-group-format="#if MAJOR_VERSION == 4 %>#endif " $0 $1 > $2 || true; rm $0 $1' # merge the X.0 Android.bp & OWNERS in the all-versions for dir in common effect core; do for sub in default vts/functional; do test -f $dir/2.0/$sub/Android.bp || continue awk 1 $dir/*.0/$sub/Android.bp >> $dir/all-versions/$sub/Android.bp # delete licenses except for the first one and add whitelines sed -i -e '/^}$/{N;/^}\n$/!s/\n/&\n/}' $dir/all-versions/$sub/Android.bp sed -i -e '1,17b;/^\/\//,/^$/{d}' $dir/all-versions/$sub/Android.bp done for sub in default vts; do test -d $dir/2.0/$sub || continue test -f $dir/2.0/$sub/OWNERS && awk 1 $dir/*.0/$sub/OWNERS | sort -u > $dir/all-versions/$sub/OWNERS || true rm -r $dir/*.0/$sub done done # delete all-versions-impl dependencies find -name 'Android.bp' | xargs sed -i -e '/all-versions-impl/d' # cleanup unused files rm common/all-versions/default/include/common/all-versions/default/HidlUtils* rm common/all-versions/util/include/common/all-versions/IncludeGuard.h find -depth -type d -empty -delete # Clamp consecutive number of empty lines to 2 find -name *.cpp -o -name *h | xargs sed -Ei ':a;/^\n*$/{N;ba};s/\n\n+/\n\n/' # transform #endif\n#if to #elif find -name *.cpp -o -name *h | xargs sed -i '/^#endif/{N;s/.*\n#if/#elif/}' # remove leftover include guard in cpp find -name *.cpp |xargs sed -Ei '/^#.*_H_?$/d' # apply clang-format find -name *cpp -o -name *h | xargs ../../../prebuilts/clang/host/linux-x86/clang-stable/bin/clang-format --style file -i # clang format breaks PATH(a/b) to PATH(a / b), remove the space surrounding / find -name *cpp -o -name *h | xargs sed -i "/#include PATH/s# / #/#g" Test: compile Bug: 118203066 Change-Id: I3692a444307afc5f71064fe0b9e6b8af3c9ff1dd Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-14 16:22:07 -08:00
#if MAJOR_VERSION == 2
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<AudioHwSync> Device::getHwAvSync() {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
int halHwAvSync;
Revert "audiohal: Get rid of multiple inheritance in IDevice implementation" This reverts commit e4228e7aa683044e17e6592c9014b5d4691445e7. Further analysis of the bug has shown that the problem is not related to the use of multiple inheritance. Bug: 36225019 Change-Id: Icdcaf84061c0ecf29f891521bd961c3ee89f1cfc
2017-05-03 16:39:28 +00:00
Result retval = getParam(AudioParameter::keyHwAvSync, &halHwAvSync);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
return retval == Result::OK ? halHwAvSync : AUDIO_HW_SYNC_INVALID;
}
Audio HAL V5: Introduce HAL V5, equal to V4 for now find -name 4.0 | xargs -I@ cp -r @ @/../5.0 find 5.0 */5.0 -type f | xargs sed -Ei 's/V4/V5/;s#(@|/)4.0#\15.0#' find -name *cpp -o -name *.h | xargs sed -i 's/VERSION == 4/VERSION >= 4/g' mv {4.1,5.0}/config/audio_policy_configuration.xsd Then a manual update to Android.bp to add V5 support. Then a manual update to service.cpp to add support for loading 5.0. If someone knows a way to avoid copying the .hal, it would be great. They will be 99% identical between V4 and V5. Bug: 118203066 Test: vts-tradefed run commandAndExit vts --module VtsHalAudioEffectV2_0Target vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target vts-tradefed run commandAndExit vts --module VtsHalAudioEffectV4_0Target vts-tradefed run commandAndExit vts --module VtsHalAudioV4_0Target Change-Id: If99a5645d19c9780019704ea4f51f8114d83ee8f Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-10 07:20:17 -08:00
#elif MAJOR_VERSION >= 4
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
Return<void> Device::getHwAvSync(getHwAvSync_cb _hidl_cb) {
int halHwAvSync;
Result retval = getParam(AudioParameter::keyHwAvSync, &halHwAvSync);
_hidl_cb(retval, halHwAvSync);
return Void();
}
#endif
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<Result> Device::setScreenState(bool turnedOn) {
Revert "audiohal: Get rid of multiple inheritance in IDevice implementation" This reverts commit e4228e7aa683044e17e6592c9014b5d4691445e7. Further analysis of the bug has shown that the problem is not related to the use of multiple inheritance. Bug: 36225019 Change-Id: Icdcaf84061c0ecf29f891521bd961c3ee89f1cfc
2017-05-03 16:39:28 +00:00
return setParam(AudioParameter::keyScreenState, turnedOn);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
Audio HAL: Factorize V2 and V4 like libaudiohal Use the same technique developed for the simpler libaudiohal to factorize the audio HAL impl. Generated with script: set -euo pipefail cd hardware/interfaces/audio # Make 2.0 and 4.0 files mostly identical by removing all 2.0, V4.0... # and replacing it by CPP_VERSION and FILE_VERSION # This allow both implementation to be mostly identical, except for code difference # Also remove IncludeGuard.h as it will be included from compiler flag # Also update license to 2018 find -name *.cpp -o -name *h | grep -v -e service.cpp | xargs sed -Ei \ -e 's/(#.*)V[42]_0_(.*_H_?)$/\1\2/' \ -e 's/(LOG_TAG.*)[24]_0/\1/' \ -e '/#ifndef AUDIO_HAL_VERSION/,/#endif/d' \ -e '/^#.*def.*AUDIO_HAL_VERSION\b/d' \ -e's/V[42]_0/CPP_VERSION/' \ -e 's/(#include ).(android.*)[24].0(.*).$/\1PATH(\2FILE_VERSION\3)/' \ -e 's|(#include) .(.*)[24].0/(default/.*).$|\1 "\2\3"|' \ -e 's/\bAUDIO_HAL_VERSION\b/CPP_VERSION/' \ -e '/IncludeGuard.h/d' \ -e 's/(Copyright .C. 201)./\18/' # set MAJOR_VERSION instead of having a different macro for each version # this allow to do preprocessor arithmetic (eg: MAJOR_VERSION >= 4) for v in 2 4; do find -ipath '*/'$v'.0/*/Android.bp' | xargs sed -i -e '/cflags:/,/^$/d' -e '/vndk/{:a;/}/!{N;ba};d}' -e '$i\ cflags: [\ "-DMAJOR_VERSION='$v'",\ "-DMINOR_VERSION=0",\ "-include common/all-versions/VersionMacro.h",\ ]'; done # replace# ifdef VERSION_X by #if MAJOR_VERSION == X find -path *all-versions/*.h | xargs sed -Ei -e 's/def.*AUDIO_HAL_VERSION_([24])_0.*/ MAJOR_VERSION == \1/' \ -e 'T;s/ +/ /' # copy all-versions impl in each version impl find -path '*/[24].0/*.[hc]*' | grep -ve all-versions -e test | xargs -P99 -n4 sed -i -Ee '/include <.*all-versions.default/!b' \ -e 's#.*<#find -path */#' -e 's/>$/|xargs tail -n +16/' -e e # remove all-versions impl rm -r {core,effect}/all-versions/ # merge version impl into a single all-version for dir in core/*.0/vts/functional/*.0/ ;do dest=$(echo $dir | sed 's#/..0/#/all-versions/#') mkdir -p $dest mv -T $dir $dest done find -mindepth 3 -path '*/2.0/*' -a \( -name '*cpp' -o -name '*h' \) | grep -v 'all-versions' | sed -E 'h;s/2/4/g;H;s/4.0/all-versions/;s/4.0//;H;g;s/\n/ /g;'| xargs -P99 -L1 sh -c ' set -euo pipefail mkdir -p $(dirname $2); diff --old-group-format="#if MAJOR_VERSION == 2 %<#endif " \ --new-group-format="#if MAJOR_VERSION == 4 %>#endif " $0 $1 > $2 || true; rm $0 $1' # merge the X.0 Android.bp & OWNERS in the all-versions for dir in common effect core; do for sub in default vts/functional; do test -f $dir/2.0/$sub/Android.bp || continue awk 1 $dir/*.0/$sub/Android.bp >> $dir/all-versions/$sub/Android.bp # delete licenses except for the first one and add whitelines sed -i -e '/^}$/{N;/^}\n$/!s/\n/&\n/}' $dir/all-versions/$sub/Android.bp sed -i -e '1,17b;/^\/\//,/^$/{d}' $dir/all-versions/$sub/Android.bp done for sub in default vts; do test -d $dir/2.0/$sub || continue test -f $dir/2.0/$sub/OWNERS && awk 1 $dir/*.0/$sub/OWNERS | sort -u > $dir/all-versions/$sub/OWNERS || true rm -r $dir/*.0/$sub done done # delete all-versions-impl dependencies find -name 'Android.bp' | xargs sed -i -e '/all-versions-impl/d' # cleanup unused files rm common/all-versions/default/include/common/all-versions/default/HidlUtils* rm common/all-versions/util/include/common/all-versions/IncludeGuard.h find -depth -type d -empty -delete # Clamp consecutive number of empty lines to 2 find -name *.cpp -o -name *h | xargs sed -Ei ':a;/^\n*$/{N;ba};s/\n\n+/\n\n/' # transform #endif\n#if to #elif find -name *.cpp -o -name *h | xargs sed -i '/^#endif/{N;s/.*\n#if/#elif/}' # remove leftover include guard in cpp find -name *.cpp |xargs sed -Ei '/^#.*_H_?$/d' # apply clang-format find -name *cpp -o -name *h | xargs ../../../prebuilts/clang/host/linux-x86/clang-stable/bin/clang-format --style file -i # clang format breaks PATH(a/b) to PATH(a / b), remove the space surrounding / find -name *cpp -o -name *h | xargs sed -i "/#include PATH/s# / #/#g" Test: compile Bug: 118203066 Change-Id: I3692a444307afc5f71064fe0b9e6b8af3c9ff1dd Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-14 16:22:07 -08:00
#if MAJOR_VERSION == 2
Audio V4: Fix issues in the legacy wrapper raised by clang-format This patch only contains cosmetic reformatting imposed by clang-format. Bug: 38184704 Test: compile Change-Id: I57545f2b8de1e982028ef4794328741d91682e0c Signed-off-by: Kevin Rocard <krocard@google.com>
2017-12-14 18:50:12 -08:00
Return<void> Device::getParameters(const hidl_vec<hidl_string>& keys, getParameters_cb _hidl_cb) {
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
getParametersImpl({}, keys, _hidl_cb);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
return Void();
}
Audio V4: Fix issues in the legacy wrapper raised by clang-format This patch only contains cosmetic reformatting imposed by clang-format. Bug: 38184704 Test: compile Change-Id: I57545f2b8de1e982028ef4794328741d91682e0c Signed-off-by: Kevin Rocard <krocard@google.com>
2017-12-14 18:50:12 -08:00
Return<Result> Device::setParameters(const hidl_vec<ParameterValue>& parameters) {
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
return setParametersImpl({} /* context */, parameters);
}
Audio HAL V5: Introduce HAL V5, equal to V4 for now find -name 4.0 | xargs -I@ cp -r @ @/../5.0 find 5.0 */5.0 -type f | xargs sed -Ei 's/V4/V5/;s#(@|/)4.0#\15.0#' find -name *cpp -o -name *.h | xargs sed -i 's/VERSION == 4/VERSION >= 4/g' mv {4.1,5.0}/config/audio_policy_configuration.xsd Then a manual update to Android.bp to add V5 support. Then a manual update to service.cpp to add support for loading 5.0. If someone knows a way to avoid copying the .hal, it would be great. They will be 99% identical between V4 and V5. Bug: 118203066 Test: vts-tradefed run commandAndExit vts --module VtsHalAudioEffectV2_0Target vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target vts-tradefed run commandAndExit vts --module VtsHalAudioEffectV4_0Target vts-tradefed run commandAndExit vts --module VtsHalAudioV4_0Target Change-Id: If99a5645d19c9780019704ea4f51f8114d83ee8f Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-10 07:20:17 -08:00
#elif MAJOR_VERSION >= 4
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
Return<void> Device::getParameters(const hidl_vec<ParameterValue>& context,
const hidl_vec<hidl_string>& keys, getParameters_cb _hidl_cb) {
getParametersImpl(context, keys, _hidl_cb);
return Void();
}
Return<Result> Device::setParameters(const hidl_vec<ParameterValue>& context,
const hidl_vec<ParameterValue>& parameters) {
return setParametersImpl(context, parameters);
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
}
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
#endif
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
Audio HAL: Factorize V2 and V4 like libaudiohal Use the same technique developed for the simpler libaudiohal to factorize the audio HAL impl. Generated with script: set -euo pipefail cd hardware/interfaces/audio # Make 2.0 and 4.0 files mostly identical by removing all 2.0, V4.0... # and replacing it by CPP_VERSION and FILE_VERSION # This allow both implementation to be mostly identical, except for code difference # Also remove IncludeGuard.h as it will be included from compiler flag # Also update license to 2018 find -name *.cpp -o -name *h | grep -v -e service.cpp | xargs sed -Ei \ -e 's/(#.*)V[42]_0_(.*_H_?)$/\1\2/' \ -e 's/(LOG_TAG.*)[24]_0/\1/' \ -e '/#ifndef AUDIO_HAL_VERSION/,/#endif/d' \ -e '/^#.*def.*AUDIO_HAL_VERSION\b/d' \ -e's/V[42]_0/CPP_VERSION/' \ -e 's/(#include ).(android.*)[24].0(.*).$/\1PATH(\2FILE_VERSION\3)/' \ -e 's|(#include) .(.*)[24].0/(default/.*).$|\1 "\2\3"|' \ -e 's/\bAUDIO_HAL_VERSION\b/CPP_VERSION/' \ -e '/IncludeGuard.h/d' \ -e 's/(Copyright .C. 201)./\18/' # set MAJOR_VERSION instead of having a different macro for each version # this allow to do preprocessor arithmetic (eg: MAJOR_VERSION >= 4) for v in 2 4; do find -ipath '*/'$v'.0/*/Android.bp' | xargs sed -i -e '/cflags:/,/^$/d' -e '/vndk/{:a;/}/!{N;ba};d}' -e '$i\ cflags: [\ "-DMAJOR_VERSION='$v'",\ "-DMINOR_VERSION=0",\ "-include common/all-versions/VersionMacro.h",\ ]'; done # replace# ifdef VERSION_X by #if MAJOR_VERSION == X find -path *all-versions/*.h | xargs sed -Ei -e 's/def.*AUDIO_HAL_VERSION_([24])_0.*/ MAJOR_VERSION == \1/' \ -e 'T;s/ +/ /' # copy all-versions impl in each version impl find -path '*/[24].0/*.[hc]*' | grep -ve all-versions -e test | xargs -P99 -n4 sed -i -Ee '/include <.*all-versions.default/!b' \ -e 's#.*<#find -path */#' -e 's/>$/|xargs tail -n +16/' -e e # remove all-versions impl rm -r {core,effect}/all-versions/ # merge version impl into a single all-version for dir in core/*.0/vts/functional/*.0/ ;do dest=$(echo $dir | sed 's#/..0/#/all-versions/#') mkdir -p $dest mv -T $dir $dest done find -mindepth 3 -path '*/2.0/*' -a \( -name '*cpp' -o -name '*h' \) | grep -v 'all-versions' | sed -E 'h;s/2/4/g;H;s/4.0/all-versions/;s/4.0//;H;g;s/\n/ /g;'| xargs -P99 -L1 sh -c ' set -euo pipefail mkdir -p $(dirname $2); diff --old-group-format="#if MAJOR_VERSION == 2 %<#endif " \ --new-group-format="#if MAJOR_VERSION == 4 %>#endif " $0 $1 > $2 || true; rm $0 $1' # merge the X.0 Android.bp & OWNERS in the all-versions for dir in common effect core; do for sub in default vts/functional; do test -f $dir/2.0/$sub/Android.bp || continue awk 1 $dir/*.0/$sub/Android.bp >> $dir/all-versions/$sub/Android.bp # delete licenses except for the first one and add whitelines sed -i -e '/^}$/{N;/^}\n$/!s/\n/&\n/}' $dir/all-versions/$sub/Android.bp sed -i -e '1,17b;/^\/\//,/^$/{d}' $dir/all-versions/$sub/Android.bp done for sub in default vts; do test -d $dir/2.0/$sub || continue test -f $dir/2.0/$sub/OWNERS && awk 1 $dir/*.0/$sub/OWNERS | sort -u > $dir/all-versions/$sub/OWNERS || true rm -r $dir/*.0/$sub done done # delete all-versions-impl dependencies find -name 'Android.bp' | xargs sed -i -e '/all-versions-impl/d' # cleanup unused files rm common/all-versions/default/include/common/all-versions/default/HidlUtils* rm common/all-versions/util/include/common/all-versions/IncludeGuard.h find -depth -type d -empty -delete # Clamp consecutive number of empty lines to 2 find -name *.cpp -o -name *h | xargs sed -Ei ':a;/^\n*$/{N;ba};s/\n\n+/\n\n/' # transform #endif\n#if to #elif find -name *.cpp -o -name *h | xargs sed -i '/^#endif/{N;s/.*\n#if/#elif/}' # remove leftover include guard in cpp find -name *.cpp |xargs sed -Ei '/^#.*_H_?$/d' # apply clang-format find -name *cpp -o -name *h | xargs ../../../prebuilts/clang/host/linux-x86/clang-stable/bin/clang-format --style file -i # clang format breaks PATH(a/b) to PATH(a / b), remove the space surrounding / find -name *cpp -o -name *h | xargs sed -i "/#include PATH/s# / #/#g" Test: compile Bug: 118203066 Change-Id: I3692a444307afc5f71064fe0b9e6b8af3c9ff1dd Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-14 16:22:07 -08:00
#if MAJOR_VERSION == 2
Audio HAL VTS: Fix style on modified files In order to avoid style inconsistency as well as non functional modification in following patches, fix the style of all files modified for the fix of the VTS tests. Patch generated with: $ clang-format -i --style file -- <file list> Bug: 36311550 Test: compile Change-Id: I53dbcdabf959a6100e34a2ee4d0f951d525049cb
2017-05-05 14:02:55 -07:00
Return<void> Device::debugDump(const hidl_handle& fd) {
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
return debug(fd, {});
}
#endif
Return<void> Device::debug(const hidl_handle& fd, const hidl_vec<hidl_string>& /* options */) {
audiohal: Fix handling of invalid arguments in 'debugDump' methods Add checks for validity of the passed in native handle. Bug: 37590777 Change-Id: If906f0086c3442819e1844cc521215d5b74af015 Test: VTS (cherry picked from commit 7bae6a0b635b142cfba9d4c4612e1e114f85b842)
2017-04-24 10:44:08 -07:00
if (fd.getNativeHandle() != nullptr && fd->numFds == 1) {
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
analyzeStatus("dump", mDevice->dump(mDevice, fd->data[0]));
}
return Void();
}
Audio HAL V5: Introduce HAL V5, equal to V4 for now find -name 4.0 | xargs -I@ cp -r @ @/../5.0 find 5.0 */5.0 -type f | xargs sed -Ei 's/V4/V5/;s#(@|/)4.0#\15.0#' find -name *cpp -o -name *.h | xargs sed -i 's/VERSION == 4/VERSION >= 4/g' mv {4.1,5.0}/config/audio_policy_configuration.xsd Then a manual update to Android.bp to add V5 support. Then a manual update to service.cpp to add support for loading 5.0. If someone knows a way to avoid copying the .hal, it would be great. They will be 99% identical between V4 and V5. Bug: 118203066 Test: vts-tradefed run commandAndExit vts --module VtsHalAudioEffectV2_0Target vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target vts-tradefed run commandAndExit vts --module VtsHalAudioEffectV4_0Target vts-tradefed run commandAndExit vts --module VtsHalAudioV4_0Target Change-Id: If99a5645d19c9780019704ea4f51f8114d83ee8f Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-10 07:20:17 -08:00
#if MAJOR_VERSION >= 4
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
Return<void> Device::getMicrophones(getMicrophones_cb _hidl_cb) {
Support query microphones information. Add conversions between hal and framework. Bug: 64038649 Bug: 75041465 Test: Manual Testing and Cts test Change-Id: I88a292f0509e09467750affbe84350ed82cdd500
2018-03-19 18:22:29 -07:00
Result retval = Result::NOT_SUPPORTED;
size_t actual_mics = AUDIO_MICROPHONE_MAX_COUNT;
audio_microphone_characteristic_t mic_array[AUDIO_MICROPHONE_MAX_COUNT];
hidl_vec<MicrophoneInfo> microphones;
if (mDevice->get_microphones != NULL &&
mDevice->get_microphones(mDevice, &mic_array[0], &actual_mics) == 0) {
microphones.resize(actual_mics);
for (size_t i = 0; i < actual_mics; ++i) {
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 Merged-In: I71a95cbe07fcc162dc6d74ff9665747a17ce5a80
2021-01-15 19:05:04 +00:00
(void)CoreUtils::microphoneInfoFromHal(mic_array[i], &microphones[i]);
Support query microphones information. Add conversions between hal and framework. Bug: 64038649 Bug: 75041465 Test: Manual Testing and Cts test Change-Id: I88a292f0509e09467750affbe84350ed82cdd500
2018-03-19 18:22:29 -07:00
}
retval = Result::OK;
}
_hidl_cb(retval, microphones);
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
return Void();
}
Return<Result> Device::setConnectedState(const DeviceAddress& address, bool connected) {
Fix the name of the constant for device [dis]connect parameter During the transition to Treble, "device connect" / "disconnect" parameter was erroneously attributed to audio streams. This issue got fixed in Audio HAL V4.0, but AudioParameter file was still using incorrect name for the constant. Test: make Change-Id: I18e1e3fccad3d41372f3c5c046af4f6ffd83328b Merged-In: I18e1e3fccad3d41372f3c5c046af4f6ffd83328b
2019-07-08 15:26:34 -07:00
auto key = connected ? AudioParameter::keyDeviceConnect : AudioParameter::keyDeviceDisconnect;
Audio V4: Implement the shim core 4.0 -> legacy All the new files added are a copy of the 2.0 ones, with just the version 2 that was changed to 4. Due to the rollback on the retrocompatiblity breakage, the split of implementation is not strictly needed any more. This makes the current split in .impl.h and double include unnecessary complicated. This will need to be factorized in a future patch. Bug: 38184704 Test: compile Change-Id: I0d699ade7558ed68125b300f8522e2767ae1ee37 Merged-In: I0d699ade7558ed68125b300f8522e2767ae1ee37 Cherry-picked from master Signed-off-by: Kevin Rocard <krocard@google.com>
2018-03-01 15:08:07 -08:00
return setParam(key, address);
}
#endif
Audio V6 wrapper: IDevice|IStream|IEffect.close releases HAL resource Fixed behavior of IStream|IEffect.close to release the underlying HAL resource synchronously. This is to avoid adding artificial delays in VTS that become totally unpractical in V6. Added clarification about expected client behavior for IStream|IEffect.close w.r.t. audio data transfer. Added IDevice.close method which releases HAL device resource. Updated VTS tests to remove delays in V6. Bug: 114451103 Bug: 141989952 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I439f0f923c091af2ab234d15ca847cfade341f25 Merged-In: I439f0f923c091af2ab234d15ca847cfade341f25
2019-11-14 13:57:15 -08:00
Result Device::doClose() {
audio: Add check to IDevice.close for currently opened streams IDevice.close must not proceed if there are streams that are currently opened on this device. Bug: 114451103 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I61d81bc0333098c341d5d551bf59331e49fcf682
2019-11-20 15:17:08 -08:00
if (mIsClosed || mOpenedStreamsCount != 0) return Result::INVALID_STATE;
Audio V6 wrapper: IDevice|IStream|IEffect.close releases HAL resource Fixed behavior of IStream|IEffect.close to release the underlying HAL resource synchronously. This is to avoid adding artificial delays in VTS that become totally unpractical in V6. Added clarification about expected client behavior for IStream|IEffect.close w.r.t. audio data transfer. Added IDevice.close method which releases HAL device resource. Updated VTS tests to remove delays in V6. Bug: 114451103 Bug: 141989952 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I439f0f923c091af2ab234d15ca847cfade341f25 Merged-In: I439f0f923c091af2ab234d15ca847cfade341f25
2019-11-14 13:57:15 -08:00
mIsClosed = true;
return analyzeStatus("close", audio_hw_device_close(mDevice));
}
#if MAJOR_VERSION >= 6
Return<Result> Device::close() {
return doClose();
}
Audio HAL: Add API to attach an effect to a device Add a method to IDevice interface allowing the attachement of an audio effect to an audio device. This is used when an audio effect is implemented below the HAL (e.g by an audio DSP) and is attached/enabled when a particular sink(e.g speaker) or source(e.g mic) device is selected. Bug: 136294538 Test: make Change-Id: I73d78c4f234fd80443a1cb3772c2d65457968652
2019-12-06 17:56:32 -08:00
Return<Result> Device::addDeviceEffect(AudioPortHandle device, uint64_t effectId) {
if (version() < AUDIO_DEVICE_API_VERSION_3_1 || mDevice->add_device_effect == nullptr) {
return Result::NOT_SUPPORTED;
}
effect_handle_t halEffect = EffectMap::getInstance().get(effectId);
if (halEffect != NULL) {
return analyzeStatus("add_device_effect",
mDevice->add_device_effect(
mDevice, static_cast<audio_port_handle_t>(device), halEffect));
} else {
ALOGW("%s Invalid effect ID passed from client: %" PRIu64 "", __func__, effectId);
return Result::INVALID_ARGUMENTS;
}
}
Return<Result> Device::removeDeviceEffect(AudioPortHandle device, uint64_t effectId) {
if (version() < AUDIO_DEVICE_API_VERSION_3_1 || mDevice->remove_device_effect == nullptr) {
return Result::NOT_SUPPORTED;
}
effect_handle_t halEffect = EffectMap::getInstance().get(effectId);
if (halEffect != NULL) {
return analyzeStatus("remove_device_effect",
mDevice->remove_device_effect(
mDevice, static_cast<audio_port_handle_t>(device), halEffect));
} else {
ALOGW("%s Invalid effect ID passed from client: %" PRIu64 "", __func__, effectId);
return Result::INVALID_ARGUMENTS;
}
}
audio: Add IDevice::updateAudioPatch method Add method 'updateAudioPatch' which should be used when an existing patch needs to be updated with new routing. Use of this method allows audio HAL to avoid disrupting audio stream while changing routing. Bug: 79248321 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I6c87f67fa4f2463ba9e8f0272a3232f5c9c55714
2019-12-11 12:36:26 -08:00
Return<void> Device::updateAudioPatch(int32_t previousPatch,
const hidl_vec<AudioPortConfig>& sources,
const hidl_vec<AudioPortConfig>& sinks,
createAudioPatch_cb _hidl_cb) {
audio: Update default wrapper to support V7 During this conversion, the functionality of the V7 wrapper hasn't been tested yet. This will be done in a separate CL that will also include required updates to the VTS tests. Since the changes were made to the code shared with pre-V7 versions, verified that V6 HAL didn't regress. Bug: 142480271 Test: atest VtsHalAudioV6_0TargetTest Test: m VtsHalAudioV7_0TargetTest Change-Id: I0e42fe1279912ffa78ce40c69f6aa2054e84d385 Merged-In: I0e42fe1279912ffa78ce40c69f6aa2054e84d385
2020-12-10 17:25:40 -08:00
if (previousPatch != static_cast<int32_t>(AudioPatchHandle{})) {
audio: Add IDevice::updateAudioPatch method Add method 'updateAudioPatch' which should be used when an existing patch needs to be updated with new routing. Use of this method allows audio HAL to avoid disrupting audio stream while changing routing. Bug: 79248321 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I6c87f67fa4f2463ba9e8f0272a3232f5c9c55714
2019-12-11 12:36:26 -08:00
auto [retval, patch] = createOrUpdateAudioPatch(previousPatch, sources, sinks);
_hidl_cb(retval, patch);
} else {
_hidl_cb(Result::INVALID_ARGUMENTS, previousPatch);
}
return Void();
}
Audio V6 wrapper: IDevice|IStream|IEffect.close releases HAL resource Fixed behavior of IStream|IEffect.close to release the underlying HAL resource synchronously. This is to avoid adding artificial delays in VTS that become totally unpractical in V6. Added clarification about expected client behavior for IStream|IEffect.close w.r.t. audio data transfer. Added IDevice.close method which releases HAL device resource. Updated VTS tests to remove delays in V6. Bug: 114451103 Bug: 141989952 Test: atest VtsHalAudioV6_0TargetTest Change-Id: I439f0f923c091af2ab234d15ca847cfade341f25 Merged-In: I439f0f923c091af2ab234d15ca847cfade341f25
2019-11-14 13:57:15 -08:00
#endif
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
} // namespace implementation
Audio HAL: Factorize V2 and V4 like libaudiohal Use the same technique developed for the simpler libaudiohal to factorize the audio HAL impl. Generated with script: set -euo pipefail cd hardware/interfaces/audio # Make 2.0 and 4.0 files mostly identical by removing all 2.0, V4.0... # and replacing it by CPP_VERSION and FILE_VERSION # This allow both implementation to be mostly identical, except for code difference # Also remove IncludeGuard.h as it will be included from compiler flag # Also update license to 2018 find -name *.cpp -o -name *h | grep -v -e service.cpp | xargs sed -Ei \ -e 's/(#.*)V[42]_0_(.*_H_?)$/\1\2/' \ -e 's/(LOG_TAG.*)[24]_0/\1/' \ -e '/#ifndef AUDIO_HAL_VERSION/,/#endif/d' \ -e '/^#.*def.*AUDIO_HAL_VERSION\b/d' \ -e's/V[42]_0/CPP_VERSION/' \ -e 's/(#include ).(android.*)[24].0(.*).$/\1PATH(\2FILE_VERSION\3)/' \ -e 's|(#include) .(.*)[24].0/(default/.*).$|\1 "\2\3"|' \ -e 's/\bAUDIO_HAL_VERSION\b/CPP_VERSION/' \ -e '/IncludeGuard.h/d' \ -e 's/(Copyright .C. 201)./\18/' # set MAJOR_VERSION instead of having a different macro for each version # this allow to do preprocessor arithmetic (eg: MAJOR_VERSION >= 4) for v in 2 4; do find -ipath '*/'$v'.0/*/Android.bp' | xargs sed -i -e '/cflags:/,/^$/d' -e '/vndk/{:a;/}/!{N;ba};d}' -e '$i\ cflags: [\ "-DMAJOR_VERSION='$v'",\ "-DMINOR_VERSION=0",\ "-include common/all-versions/VersionMacro.h",\ ]'; done # replace# ifdef VERSION_X by #if MAJOR_VERSION == X find -path *all-versions/*.h | xargs sed -Ei -e 's/def.*AUDIO_HAL_VERSION_([24])_0.*/ MAJOR_VERSION == \1/' \ -e 'T;s/ +/ /' # copy all-versions impl in each version impl find -path '*/[24].0/*.[hc]*' | grep -ve all-versions -e test | xargs -P99 -n4 sed -i -Ee '/include <.*all-versions.default/!b' \ -e 's#.*<#find -path */#' -e 's/>$/|xargs tail -n +16/' -e e # remove all-versions impl rm -r {core,effect}/all-versions/ # merge version impl into a single all-version for dir in core/*.0/vts/functional/*.0/ ;do dest=$(echo $dir | sed 's#/..0/#/all-versions/#') mkdir -p $dest mv -T $dir $dest done find -mindepth 3 -path '*/2.0/*' -a \( -name '*cpp' -o -name '*h' \) | grep -v 'all-versions' | sed -E 'h;s/2/4/g;H;s/4.0/all-versions/;s/4.0//;H;g;s/\n/ /g;'| xargs -P99 -L1 sh -c ' set -euo pipefail mkdir -p $(dirname $2); diff --old-group-format="#if MAJOR_VERSION == 2 %<#endif " \ --new-group-format="#if MAJOR_VERSION == 4 %>#endif " $0 $1 > $2 || true; rm $0 $1' # merge the X.0 Android.bp & OWNERS in the all-versions for dir in common effect core; do for sub in default vts/functional; do test -f $dir/2.0/$sub/Android.bp || continue awk 1 $dir/*.0/$sub/Android.bp >> $dir/all-versions/$sub/Android.bp # delete licenses except for the first one and add whitelines sed -i -e '/^}$/{N;/^}\n$/!s/\n/&\n/}' $dir/all-versions/$sub/Android.bp sed -i -e '1,17b;/^\/\//,/^$/{d}' $dir/all-versions/$sub/Android.bp done for sub in default vts; do test -d $dir/2.0/$sub || continue test -f $dir/2.0/$sub/OWNERS && awk 1 $dir/*.0/$sub/OWNERS | sort -u > $dir/all-versions/$sub/OWNERS || true rm -r $dir/*.0/$sub done done # delete all-versions-impl dependencies find -name 'Android.bp' | xargs sed -i -e '/all-versions-impl/d' # cleanup unused files rm common/all-versions/default/include/common/all-versions/default/HidlUtils* rm common/all-versions/util/include/common/all-versions/IncludeGuard.h find -depth -type d -empty -delete # Clamp consecutive number of empty lines to 2 find -name *.cpp -o -name *h | xargs sed -Ei ':a;/^\n*$/{N;ba};s/\n\n+/\n\n/' # transform #endif\n#if to #elif find -name *.cpp -o -name *h | xargs sed -i '/^#endif/{N;s/.*\n#if/#elif/}' # remove leftover include guard in cpp find -name *.cpp |xargs sed -Ei '/^#.*_H_?$/d' # apply clang-format find -name *cpp -o -name *h | xargs ../../../prebuilts/clang/host/linux-x86/clang-stable/bin/clang-format --style file -i # clang format breaks PATH(a/b) to PATH(a / b), remove the space surrounding / find -name *cpp -o -name *h | xargs sed -i "/#include PATH/s# / #/#g" Test: compile Bug: 118203066 Change-Id: I3692a444307afc5f71064fe0b9e6b8af3c9ff1dd Signed-off-by: Kevin Rocard <krocard@google.com>
2018-11-14 16:22:07 -08:00
} // namespace CPP_VERSION
Implement audio devices and streams HAL delegating to legacy HAL Changes made to the .hal definition: - introduce Effect ID returned by the IEffectsFactory that needs to be passed to IStream.{add|remove}Effect; otherwise it's impossible to retrieve the underlying HAL effect handle; - change "bus address" in DeviceAddress to "string" type; - fix signature of some methods w.r.t. returning Result; - remove unused "struct AudioPatch". Bug: 30222631 Test: make Change-Id: Icb51729ef57bb2a5b0b78609735e7481bc04f95c
2016-10-31 10:39:47 -07:00
} // namespace audio
} // namespace hardware
} // namespace android
Reference in New Issue Copy Permalink