Builds 3 versions with aosp build system

Author: iscle

Android.bp

@@ -5,6 +5,9 @@ cc_defaults {
         // Main
         "src/viper/ViPER.cpp",
         "src/ViperContext.cpp",
+        "src/ViPER4Aidl.cpp",
+        "src/ViPER4Android.cpp",
+        "src/EffectThread.cpp",
         // Effects
         "src/viper/effects/AnalogX.cpp",
         "src/viper/effects/ColorfulMusic.cpp",
@@ -60,29 +63,66 @@ cc_defaults {
         "-DVIPER_VERSION=20240314",
 
         "-Wno-unused-parameter",
+        "-DBACKEND_NDK",
     ],
     cppflags: [
         "-Wno-unused-parameter",
     ],
     shared_libs: [
+        "libaudioaidlcommon",
+        "libaudioutils",
+        "libbase",
+        "libbinder_ndk",
+        "libcutils",
+        "libfmq",
         "liblog",
+        "libutils",
     ],
     header_libs: [
         "libaudioeffects",
         "libaudioutils_headers",
+        "libaudioaidl_headers",
+        "libaudio_system_headers",
+        "libsystem_headers",
     ],
     relative_install_path: "soundfx",
 }
 
 cc_library_shared {
-    name: "libv4a_re",
+    name: "libv4a_re-V1",
     defaults: [
-        "aidlaudioeffectservice_defaults",
         "v4a_defaults",
     ],
-    srcs: [
-        ":effectCommonFile",
-        "src/ViPER4Aidl.cpp",
-        "src/ViPER4Android.cpp",
+    shared_libs: [
+        "android.hardware.audio.effect-V1-ndk",
+    ],
+    cflags: [
+        "-DVIPER_AIDL_VERSION=1",
+    ],
+}
+
+cc_library_shared {
+    name: "libv4a_re-V2",
+    defaults: [
+        "v4a_defaults",
+    ],
+    shared_libs: [
+        "android.hardware.audio.effect-V2-ndk",
+    ],
+    cflags: [
+        "-DVIPER_AIDL_VERSION=2",
+    ],
+}
+
+cc_library_shared {
+    name: "libv4a_re-V3",
+    defaults: [
+        "v4a_defaults",
+    ],
+    shared_libs: [
+        "android.hardware.audio.effect-V3-ndk",
+    ],
+    cflags: [
+        "-DVIPER_AIDL_VERSION=3",
     ],
 }

src/EffectThread.cpp

@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * 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 <cstddef>
+#include <memory>
+
+#define LOG_TAG "AHAL_EffectThread"
+#include <android-base/logging.h>
+#include <pthread.h>
+#include <sys/resource.h>
+
+#include "effect-impl/EffectThread.h"
+#include "effect-impl/EffectTypes.h"
+
+namespace aidl::android::hardware::audio::effect {
+
+EffectThread::~EffectThread() {
+    destroyThread();
+}
+
+RetCode EffectThread::createThread(const std::string& name, int priority) {
+    if (mThread.joinable()) {
+        LOG(WARNING) << mName << __func__ << " thread already created, no-op";
+        return RetCode::SUCCESS;
+    }
+
+    mName = name;
+    mPriority = priority;
+    {
+        std::lock_guard lg(mThreadMutex);
+        mStop = true;
+        mExit = false;
+    }
+
+    mThread = std::thread(&EffectThread::threadLoop, this);
+    LOG(VERBOSE) << mName << __func__ << " priority " << mPriority << " done";
+    return RetCode::SUCCESS;
+}
+
+RetCode EffectThread::destroyThread() {
+    {
+        std::lock_guard lg(mThreadMutex);
+        mStop = mExit = true;
+    }
+
+    mCv.notify_one();
+    if (mThread.joinable()) {
+        mThread.join();
+    }
+
+    LOG(VERBOSE) << mName << __func__;
+    return RetCode::SUCCESS;
+}
+
+RetCode EffectThread::startThread() {
+    {
+        std::lock_guard lg(mThreadMutex);
+        if (mDraining) {
+            mDraining = false;
+        } else {
+            mStop = false;
+        }
+        mCv.notify_one();
+    }
+
+    LOG(VERBOSE) << mName << __func__;
+    return RetCode::SUCCESS;
+}
+
+RetCode EffectThread::stopThread() {
+    {
+        std::lock_guard lg(mThreadMutex);
+        mStop = true;
+        mCv.notify_one();
+    }
+
+    LOG(VERBOSE) << mName << __func__;
+    return RetCode::SUCCESS;
+}
+
+RetCode EffectThread::startDraining() {
+    std::lock_guard lg(mThreadMutex);
+    mDraining = true;
+    mCv.notify_one();
+
+    LOG(VERBOSE) << mName << __func__;
+    return RetCode::SUCCESS;
+}
+
+RetCode EffectThread::finishDraining() {
+    std::lock_guard lg(mThreadMutex);
+    mDraining = false;
+    mStop = true;
+    mCv.notify_one();
+
+    LOG(VERBOSE) << mName << __func__;
+    return RetCode::SUCCESS;
+}
+
+void EffectThread::threadLoop() {
+    pthread_setname_np(pthread_self(), mName.substr(0, kMaxTaskNameLen - 1).c_str());
+    setpriority(PRIO_PROCESS, 0, mPriority);
+    while (true) {
+        {
+            std::unique_lock l(mThreadMutex);
+            ::android::base::ScopedLockAssertion lock_assertion(mThreadMutex);
+            mCv.wait(l, [&]() REQUIRES(mThreadMutex) { return mExit || !mStop; });
+            if (mExit) {
+                LOG(VERBOSE) << mName << " threadLoop EXIT!";
+                return;
+            }
+        }
+        process();
+    }
+}
+
+}  // namespace aidl::android::hardware::audio::effect