Backups/ViPERFX_RE
1
0
Fork 0
mirror of https://github.com/AndroidAudioMods/ViPERFX_RE.git synced 2025-06-08 02:29:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/foss' into foss

Browse Source
This commit is contained in:
Iscle 2025-04-03 00:23:59 +02:00
commit 2045d11a9e
6 changed files with 504 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
Android.bp Normal file
View File

@ -0,0 +1,115 @@
filegroup {
name: "v4aCommonFile",
srcs: [
// Main
"src/viper/ViPER.cpp",
"src/ViperContext.cpp",
// Effects
"src/viper/effects/AnalogX.cpp",
"src/viper/effects/ColorfulMusic.cpp",
"src/viper/effects/Convolver.cpp",
"src/viper/effects/Cure.cpp",
"src/viper/effects/DiffSurround.cpp",
"src/viper/effects/DynamicSystem.cpp",
"src/viper/effects/FETCompressor.cpp",
"src/viper/effects/IIRFilter.cpp",
"src/viper/effects/PlaybackGain.cpp",
"src/viper/effects/Reverberation.cpp",
"src/viper/effects/SoftwareLimiter.cpp",
"src/viper/effects/SpeakerCorrection.cpp",
"src/viper/effects/SpectrumExtend.cpp",
"src/viper/effects/TubeSimulator.cpp",
"src/viper/effects/VHE.cpp",
"src/viper/effects/ViPERBass.cpp",
"src/viper/effects/ViPERClarity.cpp",
"src/viper/effects/ViPERDDC.cpp",
// Utils
"src/viper/utils/AdaptiveBuffer.cpp",
"src/viper/utils/Biquad.cpp",
"src/viper/utils/CAllpassFilter.cpp",
"src/viper/utils/CCombFilter.cpp",
"src/viper/utils/CRevModel.cpp",
"src/viper/utils/Crossfeed.cpp",
"src/viper/utils/DepthSurround.cpp",
"src/viper/utils/DynamicBass.cpp",
"src/viper/utils/FIR.cpp",
"src/viper/utils/Harmonic.cpp",
"src/viper/utils/HiFi.cpp",
"src/viper/utils/HighShelf.cpp",
"src/viper/utils/IIR_1st.cpp",
"src/viper/utils/IIR_NOrder_BW_BP.cpp",
"src/viper/utils/IIR_NOrder_BW_LH.cpp",
"src/viper/utils/MinPhaseIIRCoeffs.cpp",
"src/viper/utils/MultiBiquad.cpp",
"src/viper/utils/NoiseSharpening.cpp",
"src/viper/utils/PassFilter.cpp",
"src/viper/utils/PConvSingle.cpp",
"src/viper/utils/PolesFilter.cpp",
"src/viper/utils/Polyphase.cpp",
"src/viper/utils/Stereo3DSurround.cpp",
"src/viper/utils/Subwoofer.cpp",
"src/viper/utils/TimeConstDelay.cpp",
"src/viper/utils/WaveBuffer.cpp",
],
}
cc_defaults {
name: "v4aDefaults",
srcs: [
":v4aCommonFile",
],
cflags: [
"-O3",
"-DNDEBUG",
"-DVIPER_VERSION=20240314",
"-DAOSP_SOONG_BUILD",
],
header_libs: [
"libhardware_headers",
],
lto: {
// TODO: full was removed in https://android-review.googlesource.com/c/platform/build/soong/+/2609595
thin: true,
},
}
cc_library_shared {
name: "libv4aidl_re",
vendor: true,
relative_install_path: "soundfx",
defaults: [
"aidlaudioeffectservice_defaults",
"v4aDefaults",
],
srcs: [
"src/ViPER4Aidl.cpp",
// AOSP
":effectCommonFile",
],
cflags: [
"-O3",
"-DNDEBUG",
"-DVIPER_VERSION=20240314",
"-DAOSP_SOONG_BUILD",
"-DBACKEND_NDK",
],
whole_static_libs: [
"libaudio_aidl_conversion_common_ndk",
"libstagefright_foundation",
],
}
cc_library_shared {
name: "libv4a_re",
vendor: true,
relative_install_path: "soundfx",
defaults: [
"v4aDefaults",
],
srcs: [
"src/ViPER4Android.cpp",
],
shared_libs: [
"liblog",
],
}

244
src/ViPER4Aidl.cpp Normal file
View File

@ -0,0 +1,244 @@
/*
* Copyright (C) 2022 The Android Open Source Project
* 2025 anonymix007
*
* 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.
*/
#include <algorithm>
#include <cstddef>
#define LOG_TAG "ViPER4Aidl"
#include <android-base/logging.h>
#include <aidl/android/hardware/audio/effect/DefaultExtension.h>
#include <fmq/AidlMessageQueue.h>
#include <media/AidlConversionNdk.h>
#include <system/audio_effects/effect_uuid.h>
#include "viper/constants.h"
#include "ViPER4Aidl.h"
using aidl::android::hardware::audio::effect::Descriptor;
using aidl::android::hardware::audio::effect::DefaultExtension;
using aidl::android::hardware::audio::effect::ViperAidl;
using aidl::android::hardware::audio::effect::getEffectImplUuidViper;
using aidl::android::hardware::audio::effect::getEffectTypeUuidViper;
using aidl::android::hardware::audio::effect::IEffect;
using aidl::android::hardware::audio::effect::State;
using aidl::android::hardware::audio::effect::VendorExtension;
using aidl::android::media::audio::common::AudioUuid;
extern "C" binder_exception_t createEffect(const AudioUuid* in_impl_uuid,
std::shared_ptr<IEffect>* instanceSpp) {
if (!in_impl_uuid || *in_impl_uuid != getEffectImplUuidViper()) {
LOG(ERROR) << __func__ << "uuid not supported";
return EX_ILLEGAL_ARGUMENT;
}
if (instanceSpp) {
*instanceSpp = ndk::SharedRefBase::make<ViperAidl>();
LOG(DEBUG) << __func__ << " instance " << instanceSpp->get() << " created";
return EX_NONE;
} else {
LOG(ERROR) << __func__ << " invalid input parameter!";
return EX_ILLEGAL_ARGUMENT;
}
}
extern "C" binder_exception_t queryEffect(const AudioUuid* in_impl_uuid, Descriptor* _aidl_return) {
if (!in_impl_uuid || *in_impl_uuid != getEffectImplUuidViper()) {
LOG(ERROR) << __func__ << "uuid not supported";
return EX_ILLEGAL_ARGUMENT;
}
*_aidl_return = ViperAidl::kDesc;
return EX_NONE;
}
namespace aidl::android::hardware::audio::effect {
const std::string ViperAidl::kEffectName = VIPER_NAME;
const Descriptor ViperAidl::kDesc = {.common = {.id = {.type = getEffectTypeUuidViper(),
.uuid = getEffectImplUuidViper()},
.flags = {.type = Flags::Type::INSERT,
.insert = Flags::Insert::LAST,
.volume = Flags::Volume::CTRL},
.name = ViperAidl::kEffectName,
.implementor = VIPER_AUTHORS}};
ndk::ScopedAStatus ViperAidl::getDescriptor(Descriptor* _aidl_return) {
LOG(DEBUG) << __func__ << kDesc.toString();
*_aidl_return = kDesc;
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus ViperAidl::setParameterSpecific(const Parameter::Specific& specific) {
LOG(DEBUG) << __func__ << ": " << specific.toString();
RETURN_IF(!mContext, EX_NULL_POINTER, "nullContext");
RETURN_IF(Parameter::Specific::vendorEffect != specific.getTag(), EX_ILLEGAL_ARGUMENT, "EffectNotSupported");
auto& vendorEffect = specific.get<Parameter::Specific::vendorEffect>();
std::optional<DefaultExtension> defaultExt;
RETURN_IF(STATUS_OK != vendorEffect.extension.getParcelable(&defaultExt), EX_ILLEGAL_ARGUMENT, "getParcelableFailed");
RETURN_IF(!defaultExt.has_value(), EX_ILLEGAL_ARGUMENT, "parcelableNull");
#ifdef AIDL_DEBUG
LOG(DEBUG) << __func__ << ": defaultExt: " << defaultExt->toString();
#endif
int32_t ret = 0;
uint32_t ret_size = sizeof(ret);
RETURN_IF(mContext->handleCommand(EFFECT_CMD_SET_PARAM, defaultExt->bytes.size(), defaultExt->bytes.data(), &ret_size, &ret) != 0, EX_ILLEGAL_ARGUMENT, "handleCommandFailed");
RETURN_IF(ret != 0, EX_ILLEGAL_ARGUMENT, "handleCommandInternalFailed");
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus ViperAidl::getParameterSpecific(const Parameter::Id& id,
Parameter::Specific* specific) {
LOG(DEBUG) << __func__ << ": " << specific->toString();
RETURN_IF(!mContext, EX_NULL_POINTER, "nullContext");
RETURN_IF(Parameter::Id::vendorEffectTag != id.getTag(), EX_ILLEGAL_ARGUMENT, "wrongIdTag");
auto extensionId = id.get<Parameter::Id::vendorEffectTag>();
std::optional<DefaultExtension> defaultIdExt;
RETURN_IF(STATUS_OK != extensionId.extension.getParcelable(&defaultIdExt), EX_ILLEGAL_ARGUMENT, "getIdParcelableFailed");
RETURN_IF(!defaultIdExt.has_value(), EX_ILLEGAL_ARGUMENT, "parcelableIdNull");
#ifdef AIDL_DEBUG
LOG(DEBUG) << __func__ << ": defaultIdExt: " << defaultIdExt->toString();
#endif
VendorExtension extension;
DefaultExtension defaultExt;
defaultExt.bytes.resize(sizeof(effect_param_t) + 2 * sizeof(int32_t));
uint32_t data_size = defaultExt.bytes.size();
RETURN_IF(mContext->handleCommand(EFFECT_CMD_GET_PARAM, defaultIdExt->bytes.size(), defaultIdExt->bytes.data(), &data_size, defaultExt.bytes.data()) != 0, EX_ILLEGAL_ARGUMENT, "handleCommandFailed");
assert(data_size <= defaultExt.bytes.size());
defaultExt.bytes.resize(data_size);
#ifdef AIDL_DEBUG
LOG(DEBUG) << __func__ << ": defaultExt: " << defaultExt.toString();
#endif
RETURN_IF(STATUS_OK != extension.extension.setParcelable(defaultExt), EX_ILLEGAL_ARGUMENT, "setParcelableFailed");
specific->set<Parameter::Specific::vendorEffect>(extension);
return ndk::ScopedAStatus::ok();
}
std::shared_ptr<EffectContext> ViperAidl::createContext(const Parameter::Common& common) {
if (mContext) {
LOG(DEBUG) << __func__ << " context already exists";
} else {
mContext = std::make_shared<ViperAidlContext>(1 /* statusFmqDepth */, common);
int32_t ret = 0;
uint32_t ret_size = sizeof(ret);
int32_t status = mContext->handleCommand(EFFECT_CMD_INIT, 0, NULL, &ret_size, &ret);
if (status < 0) {
LOG(ERROR) << __func__ << ": ViperContext::handleCommand failed: " << status;
mContext = nullptr;
return mContext;
}
if (ret < 0) {
LOG(ERROR) << __func__ << ": ViperContext::handleCommand failed (internal): " << ret;
mContext = nullptr;
return mContext;
}
ret = 0;
ret_size = sizeof(ret);
effect_config_t conf;
if (!aidl2legacy_ParameterCommon_effect_config_t(common, conf)) {
LOG(ERROR) << __func__ << ": JamesDSPAIDL::createContext: aidl2legacy_ParameterCommon_effect_config_t failed";
mContext = nullptr;
return mContext;
}
status = mContext->handleCommand(EFFECT_CMD_SET_CONFIG, sizeof(conf), &conf, &ret_size, &ret);
if (status < 0) {
LOG(ERROR) << __func__ << ": ViperContext::handleCommand failed: " << status;
mContext = nullptr;
return mContext;
}
if (ret < 0) {
LOG(ERROR) << __func__ << ": ViperContext::handleCommand failed (internal): " << ret;
mContext = nullptr;
return mContext;
}
}
return mContext;
}
ndk::ScopedAStatus ViperAidl::commandImpl(CommandId command) {
RETURN_IF(!mImplContext, EX_NULL_POINTER, "nullContext");
int32_t ret = 0;
uint32_t ret_size = sizeof(ret);
switch (command) {
case CommandId::START:
RETURN_IF(mContext->handleCommand(EFFECT_CMD_ENABLE, 0, NULL, &ret_size, &ret) != 0, EX_ILLEGAL_ARGUMENT, "handleCommandFailed");
RETURN_IF(ret != 0, EX_ILLEGAL_ARGUMENT, "handleCommandInternalFailed");
break;
case CommandId::STOP:
RETURN_IF(mContext->handleCommand(EFFECT_CMD_DISABLE, 0, NULL, &ret_size, &ret) != 0, EX_ILLEGAL_ARGUMENT, "handleCommandFailed");
RETURN_IF(ret != 0, EX_ILLEGAL_ARGUMENT, "handleCommandInternalFailed");
break;
case CommandId::RESET:
mImplContext->resetBuffer();
break;
default:
break;
}
return ndk::ScopedAStatus::ok();
}
RetCode ViperAidl::releaseContext() {
if (mContext) {
int32_t ret = 0;
uint32_t ret_size = sizeof(ret);
int32_t status = mContext->handleCommand(EFFECT_CMD_RESET, 0, NULL, &ret_size, &ret);
if (status < 0) {
LOG(ERROR) << __func__ << ": ViperContext::handleCommand failed: " << status;
return RetCode::ERROR_ILLEGAL_PARAMETER;
}
if (ret < 0) {
LOG(ERROR) << __func__ << ": ViperContext::handleCommand failed (internal): " << ret;
return RetCode::ERROR_ILLEGAL_PARAMETER;
}
mContext.reset();
}
return RetCode::SUCCESS;
}
// Processing method running in EffectWorker thread.
IEffect::Status ViperAidl::effectProcessImpl(float* in_, float* out_, int samples) {
size_t frames = static_cast<size_t>(samples) / 2;
audio_buffer_t in{frames, {in_}}, out{frames, {out_}};
#ifdef AIDL_DEBUG
LOG(DEBUG) << __func__ << " in " << in_ << " out " << out_ << " samples " << samples;
#endif
int32_t ret = mContext->process(&in, &out);
#ifdef AIDL_DEBUG
LOG(DEBUG) << __func__ << ": mContext->process: " << ret;
#endif
switch(ret) {
case 0:
return {STATUS_OK, samples, samples};
case -ENODATA:
return {STATUS_NOT_ENOUGH_DATA, 0, 0};
default:
return {STATUS_INVALID_OPERATION, 0, 0};
}
}
} // namespace aidl::android::hardware::audio::effect

128
src/ViPER4Aidl.h Normal file
View File

@ -0,0 +1,128 @@
/*
* Copyright (C) 2022 The Android Open Source Project
* 2025 anonymix007
*
* 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.
*/
#pragma once
#include <aidl/android/hardware/audio/effect/BnEffect.h>
#include <fmq/AidlMessageQueue.h>
#include <cstdlib>
#include <memory>
#include "effect-impl/EffectImpl.h"
#include "ViperContext.h"
namespace aidl::android::hardware::audio::effect {
static inline bool aidl2legacy_ParameterCommon_effect_config_t(const Parameter::Common& common, effect_config_t &conf) {
// FIXME: This shouldn't be false
auto tmp = ::aidl::android::aidl2legacy_AudioConfig_buffer_config_t(common.input, false);
if (tmp.ok()) {
conf.inputCfg = tmp.value();
} else {
return false;
}
tmp = ::aidl::android::aidl2legacy_AudioConfig_buffer_config_t(common.output, false);
if (tmp.ok()) {
conf.outputCfg = tmp.value();
} else {;
return false;
}
return true;
}
class ViperAidlContext final : public EffectContext, public ViperContext {
public:
ViperAidlContext(int statusDepth, const Parameter::Common& common)
: EffectContext(statusDepth, common),
ViperContext() {
LOG(DEBUG) << __func__;
}
RetCode setCommon(const Parameter::Common& common) override {
if (auto ret = EffectContext::setCommon(common); ret != RetCode::SUCCESS) {
return ret;
}
int32_t ret = 0;
uint32_t ret_size = sizeof(ret);
effect_config_t conf;
if (!aidl2legacy_ParameterCommon_effect_config_t(common, conf)) {
LOG(ERROR) << __func__ << ": ViperAidlContext::setCommon: aidl2legacy_ParameterCommon_effect_config_t failed";
return RetCode::ERROR_ILLEGAL_PARAMETER;
}
int32_t status = handleCommand(EFFECT_CMD_SET_CONFIG, sizeof(conf), &conf, &ret_size, &ret);
if (status < 0) {
LOG(ERROR) << __func__ << ": ViperAidlContext::handleCommand SET CONFIG failed: " << status;
return RetCode::ERROR_ILLEGAL_PARAMETER;
}
if (ret < 0) {
LOG(ERROR) << __func__ << ": ViperAidlContext::handleCommand SET CONFIG failed (internal): " << ret;
return RetCode::ERROR_ILLEGAL_PARAMETER;
}
return RetCode::SUCCESS;
}
};
class ViperAidl final : public EffectImpl {
public:
static const std::string kEffectName;
static const Capability kEqCap;
static const Descriptor kDesc;
ViperAidl() { LOG(DEBUG) << __func__; }
~ViperAidl() {
cleanUp();
LOG(DEBUG) << __func__;
}
ndk::ScopedAStatus getDescriptor(Descriptor* _aidl_return) override;
ndk::ScopedAStatus setParameterSpecific(const Parameter::Specific& specific)
REQUIRES(mImplMutex) override;
ndk::ScopedAStatus getParameterSpecific(const Parameter::Id& id, Parameter::Specific* specific)
REQUIRES(mImplMutex) override;
std::shared_ptr<EffectContext> createContext(const Parameter::Common& common)
REQUIRES(mImplMutex) override;
ndk::ScopedAStatus commandImpl(CommandId id) REQUIRES(mImplMutex);
RetCode releaseContext() REQUIRES(mImplMutex) override;
IEffect::Status effectProcessImpl(float* in, float* out, int samples)
REQUIRES(mImplMutex) override;
std::string getEffectName() override { return kEffectName; }
private:
std::shared_ptr<ViperAidlContext> mContext;
};
constexpr char kEffectImplUuidViper[] = "90380da3-8536-4744-a6a3-5731970e640f";
inline const AudioUuid& getEffectImplUuidViper() {
static const ::android::base::NoDestructor<AudioUuid> uuid(stringToUuid(kEffectImplUuidViper));
return *uuid;
}
constexpr char kEffectTypeUuidViper[] = "b9bc100c-26cd-42e6-acb6-cad8c3f778de";
inline const AudioUuid& getEffectTypeUuidViper() {
static const ::android::base::NoDestructor<AudioUuid> uuid(stringToUuid(kEffectTypeUuidViper));
return *uuid;
}
} // namespace aidl::android::hardware::audio::effect

10
src/ViPER4Android.cpp
View File

@ -1,6 +1,12 @@
#include <cstring>
#include "viper/ViPER.h"
#ifdef AOSP_SOONG_BUILD
#include <hardware/audio_effect.h>
#else
#include "essential.h"
#endif
#include "viper/ViPER.h"
#include "viper/constants.h"
#include "ViperContext.h"
@ -89,4 +95,4 @@ audio_effect_library_t AUDIO_EFFECT_LIBRARY_INFO_SYM = {
.release_effect = viperLibraryRelease,
.get_descriptor = viperLibraryGetDescriptor,
};
} // extern "C"
} // extern "C"

9
src/ViperContext.cpp
View File

@ -38,9 +38,9 @@ void ViperContext::copyBufferConfig(buffer_config_t *dest, buffer_config_t *src)
dest->accessMode = src->accessMode;
}
if (src->mask & EFFECT_CONFIG_PROVIDER) {
dest->bufferProvider = src->bufferProvider;
}
//if (src->mask & EFFECT_CONFIG_PROVIDER) {
// dest->bufferProvider = src->bufferProvider;
//}
dest->mask |= src->mask;
}
@ -86,6 +86,7 @@ void ViperContext::handleSetConfig(effect_config_t *newConfig) {
// return;
// }
// TODO: this is wrong (AUDIO_CHANNEL_IN_STEREO != AUDIO_CHANNEL_OUT_STEREO)
if (config.inputCfg.channels != config.outputCfg.channels) {
VIPER_LOGE("ViPER4Android disabled, reason [in.CH = %d, out.CH = %d]",
config.inputCfg.channels, config.outputCfg.channels);
@ -809,7 +810,7 @@ int32_t ViperContext::process(audio_buffer_t *inBuffer, audio_buffer_t *outBuffe
if (!enabled) {
return -ENODATA;
}
inBuffer = getBuffer(&config.inputCfg, inBuffer);
outBuffer = getBuffer(&config.outputCfg, outBuffer);
if (inBuffer == nullptr || outBuffer == nullptr ||

4
src/ViperContext.h
View File

@ -2,7 +2,11 @@
#include <vector>
#include <cstddef>
#ifdef AOSP_SOONG_BUILD
#include <system/audio_effect.h>
#else
#include "essential.h"
#endif
#include "viper/ViPER.h"
#include <string>