2016-10-27 20:05:35 -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
|
2016-10-27 20:05:35 -07: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.
|
|
|
|
|
*/
|
|
|
|
|
|
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 "Virtualizer_HAL"
|
|
|
|
|
|
|
|
|
|
#include "VirtualizerEffect.h"
|
2017-12-20 11:07:12 -08:00
|
|
|
|
2016-10-27 20:05:35 -07:00
|
|
|
#include <memory.h>
|
2020-12-10 18:47:51 -08:00
|
|
|
#include <stdlib.h>
|
2016-10-27 20:05:35 -07:00
|
|
|
|
2020-12-10 18:47:51 -08:00
|
|
|
#include <HidlUtils.h>
|
2016-11-30 13:45:34 -08:00
|
|
|
#include <android/log.h>
|
2017-12-14 18:50:12 -08:00
|
|
|
#include <system/audio_effects/effect_virtualizer.h>
|
2016-10-27 20:05:35 -07:00
|
|
|
|
2018-03-01 15:08:07 -08:00
|
|
|
#include "VersionUtils.h"
|
|
|
|
|
|
2016-10-27 20:05:35 -07:00
|
|
|
namespace android {
|
|
|
|
|
namespace hardware {
|
|
|
|
|
namespace audio {
|
|
|
|
|
namespace effect {
|
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 {
|
2016-10-27 20:05:35 -07:00
|
|
|
namespace implementation {
|
|
|
|
|
|
2022-01-15 01:15:12 +00:00
|
|
|
using ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION::implementation::HidlUtils;
|
2016-10-27 20:05:35 -07:00
|
|
|
|
2020-12-10 18:47:51 -08:00
|
|
|
VirtualizerEffect::VirtualizerEffect(effect_handle_t handle)
|
|
|
|
|
: mEffect(new Effect(false /*isInput*/, handle)) {}
|
2016-10-27 20:05:35 -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::effect::CPP_VERSION::IEffect follow.
|
2016-10-27 20:05:35 -07:00
|
|
|
Return<Result> VirtualizerEffect::init() {
|
|
|
|
|
return mEffect->init();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<Result> VirtualizerEffect::setConfig(
|
2017-12-14 18:50:12 -08:00
|
|
|
const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
|
|
|
|
|
const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<Result> VirtualizerEffect::reset() {
|
|
|
|
|
return mEffect->reset();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<Result> VirtualizerEffect::enable() {
|
|
|
|
|
return mEffect->enable();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<Result> VirtualizerEffect::disable() {
|
|
|
|
|
return mEffect->disable();
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-10 18:47:51 -08:00
|
|
|
#if MAJOR_VERSION <= 6
|
|
|
|
|
Return<Result> VirtualizerEffect::setAudioSource(AudioSource source) {
|
|
|
|
|
return mEffect->setAudioSource(source);
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-01 15:08:07 -08:00
|
|
|
Return<Result> VirtualizerEffect::setDevice(AudioDeviceBitfield device) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->setDevice(device);
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-10 18:47:51 -08:00
|
|
|
Return<Result> VirtualizerEffect::setInputDevice(AudioDeviceBitfield device) {
|
|
|
|
|
return mEffect->setInputDevice(device);
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
Return<Result> VirtualizerEffect::setAudioSource(const AudioSource& source) {
|
|
|
|
|
return mEffect->setAudioSource(source);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<Result> VirtualizerEffect::setDevice(const DeviceAddress& device) {
|
|
|
|
|
return mEffect->setDevice(device);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<Result> VirtualizerEffect::setInputDevice(const DeviceAddress& device) {
|
|
|
|
|
return mEffect->setInputDevice(device);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<void> VirtualizerEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,
|
|
|
|
|
setAndGetVolume_cb _hidl_cb) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->setAndGetVolume(volumes, _hidl_cb);
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<Result> VirtualizerEffect::volumeChangeNotification(const hidl_vec<uint32_t>& volumes) {
|
2017-01-19 12:38:39 -08:00
|
|
|
return mEffect->volumeChangeNotification(volumes);
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-27 20:05:35 -07:00
|
|
|
Return<Result> VirtualizerEffect::setAudioMode(AudioMode mode) {
|
|
|
|
|
return mEffect->setAudioMode(mode);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<Result> VirtualizerEffect::setConfigReverse(
|
2017-12-14 18:50:12 -08:00
|
|
|
const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
|
|
|
|
|
const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<void> VirtualizerEffect::getConfig(getConfig_cb _hidl_cb) {
|
|
|
|
|
return mEffect->getConfig(_hidl_cb);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<void> VirtualizerEffect::getConfigReverse(getConfigReverse_cb _hidl_cb) {
|
|
|
|
|
return mEffect->getConfigReverse(_hidl_cb);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<void> VirtualizerEffect::getSupportedAuxChannelsConfigs(
|
2017-12-14 18:50:12 -08:00
|
|
|
uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<void> VirtualizerEffect::getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) {
|
|
|
|
|
return mEffect->getAuxChannelsConfig(_hidl_cb);
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<Result> VirtualizerEffect::setAuxChannelsConfig(const EffectAuxChannelsConfig& config) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->setAuxChannelsConfig(config);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<Result> VirtualizerEffect::offload(const EffectOffloadParameter& param) {
|
|
|
|
|
return mEffect->offload(param);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<void> VirtualizerEffect::getDescriptor(getDescriptor_cb _hidl_cb) {
|
|
|
|
|
return mEffect->getDescriptor(_hidl_cb);
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<void> VirtualizerEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {
|
2017-01-04 16:33:55 -08:00
|
|
|
return mEffect->prepareForProcessing(_hidl_cb);
|
2016-10-27 20:05:35 -07:00
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<Result> VirtualizerEffect::setProcessBuffers(const AudioBuffer& inBuffer,
|
|
|
|
|
const AudioBuffer& outBuffer) {
|
2017-01-04 16:33:55 -08:00
|
|
|
return mEffect->setProcessBuffers(inBuffer, outBuffer);
|
2016-10-27 20:05:35 -07:00
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<void> VirtualizerEffect::command(uint32_t commandId, const hidl_vec<uint8_t>& data,
|
|
|
|
|
uint32_t resultMaxSize, command_cb _hidl_cb) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->command(commandId, data, resultMaxSize, _hidl_cb);
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<Result> VirtualizerEffect::setParameter(const hidl_vec<uint8_t>& parameter,
|
|
|
|
|
const hidl_vec<uint8_t>& value) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->setParameter(parameter, value);
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<void> VirtualizerEffect::getParameter(const hidl_vec<uint8_t>& parameter,
|
|
|
|
|
uint32_t valueMaxSize, getParameter_cb _hidl_cb) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Return<void> VirtualizerEffect::getSupportedConfigsForFeature(
|
2017-12-14 18:50:12 -08:00
|
|
|
uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
|
|
|
|
|
getSupportedConfigsForFeature_cb _hidl_cb) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<void> VirtualizerEffect::getCurrentConfigForFeature(uint32_t featureId, uint32_t configSize,
|
|
|
|
|
getCurrentConfigForFeature_cb _hidl_cb) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->getCurrentConfigForFeature(featureId, configSize, _hidl_cb);
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<Result> VirtualizerEffect::setCurrentConfigForFeature(uint32_t featureId,
|
|
|
|
|
const hidl_vec<uint8_t>& configData) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->setCurrentConfigForFeature(featureId, configData);
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-04 16:33:55 -08:00
|
|
|
Return<Result> VirtualizerEffect::close() {
|
|
|
|
|
return mEffect->close();
|
|
|
|
|
}
|
2016-10-27 20:05:35 -07:00
|
|
|
|
2019-02-22 14:28:26 -08:00
|
|
|
Return<void> VirtualizerEffect::debug(const hidl_handle& fd, const hidl_vec<hidl_string>& options) {
|
|
|
|
|
return mEffect->debug(fd, options);
|
|
|
|
|
}
|
|
|
|
|
|
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::effect::CPP_VERSION::IVirtualizerEffect follow.
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<bool> VirtualizerEffect::isStrengthSupported() {
|
2016-10-27 20:05:35 -07:00
|
|
|
bool halSupported = false;
|
|
|
|
|
mEffect->getParam(VIRTUALIZER_PARAM_STRENGTH_SUPPORTED, halSupported);
|
|
|
|
|
return halSupported;
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<Result> VirtualizerEffect::setStrength(uint16_t strength) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->setParam(VIRTUALIZER_PARAM_STRENGTH, strength);
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<void> VirtualizerEffect::getStrength(getStrength_cb _hidl_cb) {
|
2016-10-27 20:05:35 -07:00
|
|
|
return mEffect->getIntegerParam(VIRTUALIZER_PARAM_STRENGTH, _hidl_cb);
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-10 18:47:51 -08:00
|
|
|
Return<void> VirtualizerEffect::getVirtualSpeakerAngles(
|
|
|
|
|
#if MAJOR_VERSION <= 6
|
|
|
|
|
AudioChannelBitfield mask, AudioDevice device, getVirtualSpeakerAngles_cb _hidl_cb) {
|
|
|
|
|
audio_channel_mask_t halChannelMask = static_cast<audio_channel_mask_t>(mask);
|
|
|
|
|
audio_devices_t halDeviceType = static_cast<audio_devices_t>(device);
|
|
|
|
|
#else
|
|
|
|
|
const AudioChannelMask& mask, const DeviceAddress& device,
|
|
|
|
|
getVirtualSpeakerAngles_cb _hidl_cb) {
|
|
|
|
|
audio_channel_mask_t halChannelMask;
|
|
|
|
|
if (status_t status = HidlUtils::audioChannelMaskToHal(mask, &halChannelMask);
|
|
|
|
|
status != NO_ERROR) {
|
|
|
|
|
_hidl_cb(mEffect->analyzeStatus(__func__, "audioChannelMaskToHal",
|
|
|
|
|
Effect::sContextConversion, status),
|
|
|
|
|
SpeakerAngles{});
|
|
|
|
|
return Void();
|
|
|
|
|
}
|
|
|
|
|
audio_devices_t halDeviceType;
|
|
|
|
|
char halDeviceAddress[AUDIO_DEVICE_MAX_ADDRESS_LEN];
|
|
|
|
|
if (status_t status = HidlUtils::deviceAddressToHal(device, &halDeviceType, halDeviceAddress);
|
|
|
|
|
status != NO_ERROR) {
|
|
|
|
|
_hidl_cb(mEffect->analyzeStatus(__func__, "deviceAddressToHal", Effect::sContextConversion,
|
|
|
|
|
status),
|
|
|
|
|
SpeakerAngles{});
|
|
|
|
|
return Void();
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
uint32_t channelCount = audio_channel_count_from_out_mask(halChannelMask);
|
2016-10-27 20:05:35 -07:00
|
|
|
size_t halSpeakerAnglesSize = sizeof(int32_t) * 3 * channelCount;
|
2020-12-10 18:47:51 -08:00
|
|
|
uint32_t halParam[3] = {VIRTUALIZER_PARAM_VIRTUAL_SPEAKER_ANGLES, halChannelMask,
|
|
|
|
|
halDeviceType};
|
|
|
|
|
SpeakerAngles speakerAngles;
|
|
|
|
|
status_t status = NO_ERROR;
|
2016-10-27 20:05:35 -07:00
|
|
|
Result retval = mEffect->getParameterImpl(
|
2020-12-10 18:47:51 -08:00
|
|
|
sizeof(halParam), halParam, halSpeakerAnglesSize,
|
|
|
|
|
[&](uint32_t valueSize, const void* valueData) {
|
|
|
|
|
if (valueSize < halSpeakerAnglesSize) {
|
|
|
|
|
channelCount = valueSize / (sizeof(int32_t) * 3);
|
|
|
|
|
}
|
|
|
|
|
status = speakerAnglesFromHal(reinterpret_cast<const int32_t*>(valueData),
|
|
|
|
|
channelCount, speakerAngles);
|
|
|
|
|
});
|
|
|
|
|
if (retval == Result::OK) {
|
|
|
|
|
retval = mEffect->analyzeStatus(__func__, "speakerAnglesFromHal", "", status);
|
|
|
|
|
}
|
2016-10-27 20:05:35 -07:00
|
|
|
_hidl_cb(retval, speakerAngles);
|
|
|
|
|
return Void();
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-14 18:50:12 -08:00
|
|
|
Return<void> VirtualizerEffect::getVirtualizationMode(getVirtualizationMode_cb _hidl_cb) {
|
2016-10-27 20:05:35 -07:00
|
|
|
uint32_t halMode = 0;
|
|
|
|
|
Result retval = mEffect->getParam(VIRTUALIZER_PARAM_FORCE_VIRTUALIZATION_MODE, halMode);
|
2020-12-10 18:47:51 -08:00
|
|
|
#if MAJOR_VERSION <= 6
|
2016-10-27 20:05:35 -07:00
|
|
|
_hidl_cb(retval, AudioDevice(halMode));
|
2020-12-10 18:47:51 -08:00
|
|
|
#else
|
|
|
|
|
DeviceAddress device;
|
|
|
|
|
(void)HidlUtils::deviceAddressFromHal(static_cast<audio_devices_t>(halMode), nullptr, &device);
|
|
|
|
|
_hidl_cb(retval, device);
|
|
|
|
|
#endif
|
2016-10-27 20:05:35 -07:00
|
|
|
return Void();
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-10 18:47:51 -08:00
|
|
|
Return<Result> VirtualizerEffect::forceVirtualizationMode(
|
|
|
|
|
#if MAJOR_VERSION <= 6
|
|
|
|
|
AudioDevice device) {
|
|
|
|
|
audio_devices_t halDeviceType = static_cast<audio_devices_t>(device);
|
|
|
|
|
#else
|
|
|
|
|
const DeviceAddress& device) {
|
|
|
|
|
audio_devices_t halDeviceType;
|
|
|
|
|
char halDeviceAddress[AUDIO_DEVICE_MAX_ADDRESS_LEN];
|
|
|
|
|
(void)HidlUtils::deviceAddressToHal(device, &halDeviceType, halDeviceAddress);
|
|
|
|
|
#endif
|
|
|
|
|
return mEffect->setParam(VIRTUALIZER_PARAM_FORCE_VIRTUALIZATION_MODE, halDeviceType);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if MAJOR_VERSION <= 6
|
|
|
|
|
// static
|
|
|
|
|
status_t VirtualizerEffect::speakerAnglesFromHal(const int32_t* halAngles, uint32_t channelCount,
|
|
|
|
|
hidl_vec<SpeakerAngle>& speakerAngles) {
|
|
|
|
|
speakerAngles.resize(channelCount);
|
|
|
|
|
for (uint32_t i = 0; i < channelCount; ++i) {
|
|
|
|
|
speakerAngles[i].mask = AudioChannelBitfield(*halAngles++);
|
|
|
|
|
speakerAngles[i].azimuth = *halAngles++;
|
|
|
|
|
speakerAngles[i].elevation = *halAngles++;
|
|
|
|
|
}
|
|
|
|
|
return NO_ERROR;
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
static int compare_channels(const void* lhs, const void* rhs) {
|
|
|
|
|
return *(int32_t*)lhs - *(int32_t*)rhs;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// static
|
|
|
|
|
status_t VirtualizerEffect::speakerAnglesFromHal(const int32_t* halAngles, uint32_t channelCount,
|
|
|
|
|
SpeakerAngles& speakerAngles) {
|
|
|
|
|
speakerAngles.azimuth.resize(channelCount);
|
|
|
|
|
speakerAngles.elevation.resize(channelCount);
|
|
|
|
|
int32_t halAnglesSorted[channelCount * 3];
|
|
|
|
|
memcpy(halAnglesSorted, halAngles, sizeof(halAnglesSorted));
|
|
|
|
|
// Ensure that channels are ordered from LSb to MSb.
|
|
|
|
|
qsort(halAnglesSorted, channelCount, sizeof(int32_t) * 3, compare_channels);
|
|
|
|
|
audio_channel_mask_t halMask = AUDIO_CHANNEL_NONE;
|
|
|
|
|
int32_t* halAnglesPtr = halAnglesSorted;
|
|
|
|
|
for (uint32_t i = 0; i < channelCount; ++i) {
|
|
|
|
|
halMask = static_cast<audio_channel_mask_t>(halMask | *halAnglesPtr++);
|
|
|
|
|
speakerAngles.azimuth[i] = *halAnglesPtr++;
|
|
|
|
|
speakerAngles.elevation[i] = *halAnglesPtr++;
|
|
|
|
|
}
|
|
|
|
|
return HidlUtils::audioChannelMaskFromHal(halMask, false /*isInput*/, &speakerAngles.mask);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2017-12-14 18:50:12 -08: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
|
2016-10-27 20:05:35 -07:00
|
|
|
} // namespace effect
|
|
|
|
|
} // namespace audio
|
|
|
|
|
} // namespace hardware
|
|
|
|
|
} // namespace android
|