it plucking works

i cannot believe it i really cannot believe it
djshaji · Mar 21, 2024 · bf1c9b8 · bf1c9b8
1 parent 7fa613f
commit bf1c9b8
Show file tree

Hide file tree

Showing 171 changed files with 285 additions and 20,441 deletions.
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
@@ -34,7 +34,6 @@ set_target_properties( # Specifies the target library.
         ${CMAKE_CURRENT_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libopus.a )
 
 add_library(libopusenc STATIC IMPORTED)
-add_library(libap4 STATIC IMPORTED)
 
 set_target_properties( # Specifies the target library.
         libopusenc
@@ -45,17 +44,7 @@ set_target_properties( # Specifies the target library.
         # Provides the path to the library you want to import.
         ${CMAKE_CURRENT_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libopusenc.a )
 
-set_target_properties( # Specifies the target library.
-        libap4
-
-        # Specifies the parameter you want to define.
-        PROPERTIES IMPORTED_LOCATION
-
-        # Provides the path to the library you want to import.
-        ${CMAKE_CURRENT_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libap4.a )
-
 add_library(libmp3lame STATIC IMPORTED)
-add_library(libfaac STATIC IMPORTED)
 set_target_properties( # Specifies the target library.
         libmp3lame
 
@@ -65,15 +54,6 @@ set_target_properties( # Specifies the target library.
         # Provides the path to the library you want to import.
         ${CMAKE_CURRENT_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libmp3lame.a )
 
-set_target_properties( # Specifies the target library.
-        libfaac
-
-        # Specifies the parameter you want to define.
-        PROPERTIES IMPORTED_LOCATION
-
-        # Provides the path to the library you want to import.
-        ${CMAKE_CURRENT_SOURCE_DIR}/../jniLibs/${ANDROID_ABI}/libfaac.a )
-
 
 add_library( # Sets the name of the library.
         amprack
@@ -96,7 +76,6 @@ add_library( # Sets the name of the library.
         Plugin2.cpp
         Meter.cpp
         LockFreeQueue.cpp
-        MP4.cpp
         )
 
 # Searches for a specified prebuilt library and stores the path as a
@@ -122,10 +101,8 @@ target_link_libraries( # Specifies the target library.
         oboe::oboe
         libsndfile
         libopusenc
-        libap4
         libopus
         libmp3lame
-        libfaac
         mediandk
         android
         OpenMAXAL

diff --git a/app/src/main/cpp/Engine.cpp b/app/src/main/cpp/Engine.cpp
@@ -90,8 +90,6 @@ bool Engine::setEffectOn(bool isOn) {
                 meter->lastRecordedFileName = fileWriter->filename;
                 meter->enable();
                 meter->start();
-                meter->faacInit(mSampleRate, bufferSizeInFrames);
-                meter->faacConfig();
 //                addPluginToRack(0, 0);
                 mIsEffectOn = isOn;
             }
@@ -106,7 +104,6 @@ bool Engine::setEffectOn(bool isOn) {
             mFullDuplexPass.stop();
             closeStreams();
             mIsEffectOn = isOn;
-            meter->faacClose();
         }
     }
 

diff --git a/app/src/main/cpp/MP4.cpp b/app/src/main/cpp/MP4.cpp
diff --git a/app/src/main/cpp/MP4.h b/app/src/main/cpp/MP4.h
diff --git a/app/src/main/cpp/Meter.cpp b/app/src/main/cpp/Meter.cpp
@@ -7,10 +7,7 @@
 
 #define TUNER_ARRAY_SIZE 4096
 
-MP4 * Meter::mp4 ;
-
 unsigned char * Meter::audioToVideoBytes = NULL ;
-faacEncHandle Meter::faacEncHandle = nullptr;
 jfloatArray Meter::jfloatArray1 ;
 int Meter::jfloatArray1_index = 0 ;
 int Meter::jfloatArray1_Size = 0 ;
@@ -467,43 +464,3 @@ void Meter::process (int nframes, const float * data, bool isInput) {
      */
 }
 
-void Meter::faacInit (int sampleRate, unsigned long maxSamples) {
-    LOGD("[faac] init %d %d", sampleRate, maxSamples);
-    unsigned long maxBytes = TUNER_ARRAY_SIZE ;
-    jack_samplerate = sampleRate ;
-    faacEncHandle = faacEncOpen(
-                sampleRate,
-                1,
-                &maxSamples,
-                &maxBytes
-            ) ;
-
-    if (faacEncHandle == NULL) {
-        LOGE("[faac] unable to initialize encoder!");
-    }
-}
-
-void Meter::faacClose () {
-    faacEncClose(faacEncHandle);
-}
-
-void Meter::faacConfig () {
-    faacEncConfigurationPtr config = faacEncGetCurrentConfiguration(faacEncHandle);
-    config -> bitRate = 160000 ;
-    config->inputFormat = 4 ; // aaaaahhhhhhhhhhh
-    faacEncSetConfiguration(faacEncHandle, config);
-}
-
-int Meter::faacEncode (float * data, int nframes, unsigned char *outputBuffer,
-                       unsigned int bufferSize) {
-    int bytesWritten = faacEncEncode(faacEncHandle,  (int32_t *) data, nframes, (unsigned char *) outputBuffer, bufferSize) ;
-    if (bytesWritten < 0) {
-        LOGE("[faac] error: %d", bytesWritten);
-    }
-
-//    for (int i = 0 ; i < bytesWritten ; i ++)
-//        LOGD("%c", outputBuffer [i]);
-//
-//    LOGD("[faac] in %d: out: %d", nframes, bytesWritten);
-    return bytesWritten;
-}
diff --git a/app/src/main/cpp/Meter.h b/app/src/main/cpp/Meter.h
@@ -20,8 +20,6 @@ extern "C" {
 }
 #endif
 #include "LockFreeQueue.h"
-#include "faac.h"
-#include "MP4.h"
 
 //#include "FileWriter.h"
 JNIEnv* getEnv() ;
@@ -62,7 +60,6 @@ class Meter {
 public:
     Meter(JavaVM *pVm);
     std::string lastRecordedFileName ;
-    static MP4 * mp4 ;
     static bool tunerEnabled ;
     static jmethodID setMixerMeter ;
     static jclass mainActivity ;
@@ -219,17 +216,8 @@ class Meter {
     static int jfloatArray1_index;
     static jmethodID pushToVideo;
     static bool videoRecording;
-    static faacEncHandle faacEncHandle;
 
 public:
-    void faacInit(int sampleRate, unsigned long maxSamples);
-
-    void faacClose();
-
-    void faacConfig();
-
-    static int faacEncode(float * data, int nframes, unsigned char *outputBuffer, unsigned int bufferSize);
-
     static unsigned char *audioToVideoBytes;
 };