Improve log header and fix some includes

Author: iscle

CMakeLists.txt

@@ -1,18 +1,10 @@
 cmake_minimum_required(VERSION 3.16.3)
-set(CMAKE_CXX_COMPILER_VERSION 20)
 
-# NDK Settings
-#add_compile_definitions(ANDROID_ABI=arm64-v8a)
-#add_compile_definitions(ANDROID_ABI=armeabi-v7a)
-#add_compile_definitions(ANDROID_ARM_NEON=true)
-#add_compile_definitions(ANDROID_PLATFORM=android-24)
+set(CMAKE_CXX_STANDARD 20)
 
 project("ViPER4Android")
 add_compile_definitions(VIPER_VERSION=20240314)
 
-# FFTS
-#add_subdirectory(src/viper/ffts)
-
 # ViPERFX
 include_directories(src/include)
 
@@ -70,16 +62,9 @@ set(FILES
         src/viper/utils/TimeConstDelay.cpp
         src/viper/utils/WaveBuffer.cpp)
 
-add_library(
-        # Sets the name of the library.
-        v4a_re
-
-        # Sets the library as a shared library.
-        SHARED
-
-        # Provides a relative path to your source file(s).
+add_library(v4a_re SHARED
         ${FILES})
 
-target_link_libraries(v4a_re log) # kissfft)
+target_link_libraries(v4a_re log)
 target_compile_options(v4a_re PRIVATE -flto -O3 -DNDEBUG)
 #target_compile_options(v4afx_r PRIVATE -O2 -DNDEBUG -Wall -Wsign-conversion -Wno-unused-result -Wno-unneeded-internal-declaration -fstrict-aliasing -fvisibility=hidden -Wextra -Wno-unused-parameter)

src/ViPER4Aidl.cpp

@@ -26,7 +26,7 @@
 #include <media/AidlConversionNdk.h>
 #include <system/audio_effects/effect_uuid.h>
 
-#include "viper/constants.h"
+#include <constants.h>
 #include "ViPER4Aidl.h"
 
 using aidl::android::hardware::audio::effect::Descriptor;

src/ViPER4Android.cpp

@@ -3,11 +3,11 @@
 #ifdef AOSP_SOONG_BUILD
 #include <hardware/audio_effect.h>
 #else
-#include "essential.h"
+#include <essential.h>
 #endif
 
 #include "viper/ViPER.h"
-#include "viper/constants.h"
+#include <constants.h>
 #include "ViperContext.h"
 
 extern "C" {

src/ViperContext.cpp

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

src/ViperContext.h

@@ -6,7 +6,7 @@
 #include <cerrno>
 #endif
 
-#include "../log.h" // TODO: Remove this dependency
+#include <log.h> // TODO: Remove this dependency
 
 enum class Architecture : uint8_t {
     UNKNOWN = 0,

src/viper/constants.h src/include/constants.hsrc/viper/constants.h renamed to src/include/constants.h

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013 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.
+ */
+
+#pragma once
+
+#include <android/log.h>
+
+#ifndef LOG_TAG
+#define LOG_TAG "ViPER4Android"
+#endif
+
+#ifndef LOG_NDEBUG
+#ifdef NDEBUG
+#define LOG_NDEBUG 1
+#else
+#define LOG_NDEBUG 0
+#endif
+#endif
+
+
+/*
+ * Basic log message macros intended to emulate the behavior of log/log.h
+ * in system core.  This should be dependent only on ndk exposed logging
+ * functionality.
+ */
+
+#ifndef ALOG
+#define ALOG(priority, tag, ...) \
+    __android_log_print(ANDROID_##priority, tag, __VA_ARGS__)
+#endif
+
+#ifndef ALOGV
+#if LOG_NDEBUG
+#define ALOGV(...)   ((void)0)
+#else
+#define ALOGV(...) ((void)ALOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__))
+#endif
+#endif
+
+#ifndef ALOGD
+#define ALOGD(...) ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__))
+#endif
+
+#ifndef ALOGI
+#define ALOGI(...) ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__))
+#endif
+
+#ifndef ALOGW
+#define ALOGW(...) ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__))
+#endif
+
+#ifndef ALOGE
+#define ALOGE(...) ((void)ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__))
+#endif
+
+#ifndef ALOGF
+#define ALOGF(...) ((void)ALOG(LOG_FATAL, LOG_TAG, __VA_ARGS__))
+#endif
+
+/*
+ * Log a fatal error if cond is true. The condition test is inverted from
+ * assert(3) semantics. The test and message are not stripped from release
+ * builds
+ */
+#ifndef ALOG_ALWAYS_FATAL_IF
+#define ALOG_ALWAYS_FATAL_IF(cond, ...) \
+    if (cond) __android_log_assert(#cond, LOG_TAG, __VA_ARGS__)
+#endif

src/include/log.h

@@ -1,7 +1,7 @@
 #include "ViPER.h"
 #include <cstring>
-#include <chrono>
-#include "constants.h"
+#include <constants.h>
+#include <log.h>
 
 ViPER::ViPER() : 
     frameCount(0),
@@ -11,8 +11,8 @@ ViPER::ViPER() :
     iirFilter(IIRFilter(10)),
     gainL(1.0),
     gainR(1.0) {
-    VIPER_LOGI("Welcome to ViPER FX");
-    VIPER_LOGI("Current version is %d", VIPER_VERSION);
+    ALOGI("Welcome to ViPER FX");
+    ALOGI("Current version is %d", VIPER_VERSION);
 
     this->convolver.SetEnable(false);
     this->convolver.SetSamplingRate(this->samplingRate);
@@ -94,7 +94,7 @@ void ViPER::process(std::vector<float>& buffer, uint32_t size) {
     uint32_t tmpBufSize;
 
     if (this->convolver.GetEnabled() || this->vhe.GetEnabled()) {
-//        VIPER_LOGD("Convolver or VHE is enable, use wave buffer");
+//        ALOGD("Convolver or VHE is enable, use wave buffer");
 
         if (!this->waveBuffer.PushSamples(buffer.data(), size)) {
             this->waveBuffer.Reset();
@@ -119,7 +119,7 @@ void ViPER::process(std::vector<float>& buffer, uint32_t size) {
         tmpBuf = ptr;
         tmpBufSize = ret;
     } else {
-//        VIPER_LOGD("Convolver and VHE are disabled, use adaptive buffer");
+//        ALOGD("Convolver and VHE are disabled, use adaptive buffer");
 
         if (this->adaptiveBuffer.PushFrames(buffer.data(), size)) {
             this->adaptiveBuffer.SetBufferOffset(size);
@@ -132,7 +132,7 @@ void ViPER::process(std::vector<float>& buffer, uint32_t size) {
         }
     }
 
-//    VIPER_LOGD("Process buffer size: %d", tmpBufSize);
+//    ALOGD("Process buffer size: %d", tmpBufSize);
     if (tmpBufSize != 0) {
         this->viperDdc.Process(tmpBuf, size);
         this->spectrumExtend.Process(tmpBuf, size);
@@ -175,7 +175,7 @@ void ViPER::process(std::vector<float>& buffer, uint32_t size) {
 
 //void ViPER::DispatchCommand(int param, int val1, int val2, int val3, int val4, uint32_t arrSize,
 //                            signed char *arr) {
-//    VIPER_LOGD("Dispatch command: %d, %d, %d, %d, %d, %d, %p", param, val1, val2, val3, val4, arrSize, arr);
+//    ALOGD("Dispatch command: %d, %d, %d, %d, %d, %d, %p", param, val1, val2, val3, val4, arrSize, arr);
 //    switch (param) {
 //        case PARAM_SET_RESET_STATUS: {
 //            this->reset();

src/log.h

@@ -1,6 +1,6 @@
 #include "AnalogX.h"
 #include <cstring>
-#include "../constants.h"
+#include <constants.h>
 
 static const float ANALOGX_HARMONICS[] = {
         0.01f,