From b8ed5d1d656cfece4c7ca6bea5a60d93cdd2ef95 Mon Sep 17 00:00:00 2001
From: hlvs-apps <hlvs-apps@sauers.de>
Date: Sat, 20 Aug 2022 13:39:40 +0200
Subject: [PATCH 1/4] Create LICENSE

---
 LICENSE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..bf591b6
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Rakibul Hasan Rajib
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From 59c3b0401b121c21f497fb390461efc7dc61b6a3 Mon Sep 17 00:00:00 2001
From: hlvs-apps <hlvs-apps@sauers.de>
Date: Thu, 25 Aug 2022 13:26:10 +0200
Subject: [PATCH 2/4] Update Gradle Plugin Version and Compile and Target Sdk,
 added possibility to publishToMavenLocal

---
 .idea/gradle.xml                              |  5 +-
 .idea/jarRepositories.xml                     | 10 +++
 .idea/misc.xml                                |  2 +-
 app/build.gradle                              | 13 ++--
 app/src/main/AndroidManifest.xml              |  3 +-
 .../android/audiomixer/MainActivity.java      | 20 ++++-
 app/src/main/res/layout/activity_main.xml     |  6 ++
 audio_mixer/build.gradle                      | 53 ++++++++++---
 build.gradle                                  |  6 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 maven-publish-helper.gradle                   | 78 +++++++++++++++++++
 11 files changed, 168 insertions(+), 30 deletions(-)
 create mode 100644 maven-publish-helper.gradle

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ba01ea0..99a25fd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -15,7 +15,6 @@
             <option value="$PROJECT_DIR$/audio_mixer" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..851ab99 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,15 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:/C:/Users/Henri%20Sauer/.m2/repository/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..ef61796 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 95c8fa6..24d504a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "zeroonezero.android.audiomixer"
@@ -29,11 +28,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     implementation project(":audio_mixer")
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 53de23d..9f0ee82 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,8 @@
         android:supportsRtl="true"
         android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme">
-        <activity android:name="zeroonezero.android.audiomixer.MainActivity">
+        <activity android:name="zeroonezero.android.audiomixer.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/zeroonezero/android/audiomixer/MainActivity.java b/app/src/main/java/zeroonezero/android/audiomixer/MainActivity.java
index 72d7ce8..1691ed8 100644
--- a/app/src/main/java/zeroonezero/android/audiomixer/MainActivity.java
+++ b/app/src/main/java/zeroonezero/android/audiomixer/MainActivity.java
@@ -53,6 +53,13 @@ public void onClick(View v) {
             }
         });
 
+        findViewById(R.id.add_video_audio_btn).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                openVideoChooser();
+            }
+        });
+
         findViewById(R.id.mix_btn).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -109,7 +116,7 @@ private void startMixing(){
         }catch (Exception e){
             e.printStackTrace();
         }
-        //audioMixer.setSampleRate(44100);  // optional
+        audioMixer.setSampleRate(48000);  // optional
         //audioMixer.setBitRate(128000); // optional
         //audioMixer.setChannelCount(2); // 1 or 2 // optional
         //audioMixer.setLoopingEnabled(true); // Only works for parallel mixing
@@ -163,6 +170,14 @@ public void openChooser(){
         startActivityForResult(intent, AUDIO_CHOOSE_REQUEST_CODE);
     }
 
+    public void openVideoChooser(){
+        Intent intent = new Intent();
+        intent.setType("video/*");
+        intent.setAction(Intent.ACTION_GET_CONTENT);
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        startActivityForResult(intent, AUDIO_CHOOSE_REQUEST_CODE);
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -207,9 +222,10 @@ private boolean checkPermission() {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         switch (requestCode) {
             case PERMISSION_REQUEST_CODE:
-                if (    grantResults.length > 1
+                if (grantResults.length > 1
                         && grantResults[0] == PackageManager.PERMISSION_GRANTED
                         && grantResults[1] == PackageManager.PERMISSION_GRANTED) {
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3e7f29b..26e6075 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,6 +11,12 @@
         android:orientation="vertical"
         android:layout_centerInParent="true">
 
+        <Button
+            android:id="@+id/add_video_audio_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Add video audio"/>
+
         <Button
             android:id="@+id/add_audio_btn"
             android:layout_width="wrap_content"
diff --git a/audio_mixer/build.gradle b/audio_mixer/build.gradle
index f8954fa..c0de85c 100644
--- a/audio_mixer/build.gradle
+++ b/audio_mixer/build.gradle
@@ -1,15 +1,15 @@
-apply plugin: 'com.android.library'
-
+plugins {
+    id 'com.android.library'
+    id 'maven-publish'
+}
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 32
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 29
+        targetSdkVersion 32
         versionCode 1
-        versionName "1.0"
-
+        versionName "1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
@@ -19,19 +19,48 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+            minifyEnabled false
+        }
     }
 
     compileOptions{
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    publishing {
+        singleVariant('release') {
+        }
+        singleVariant('debug') {
+        }
+    }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-}
\ No newline at end of file
+}
+
+repositories {
+    mavenLocal()
+}
+
+apply from: '../maven-publish-helper.gradle'
+
+publishing {
+    publications {
+        release(MavenPublication) {
+            groupId 'zeroonezero.android_audio_mixer'
+            artifactId = 'android_audio_mixer'
+        }
+        debug(MavenPublication) {
+            groupId 'zeroonezero.android_audio_mixer'
+            artifactId = 'android_audio_mixer-debug'
+        }
+    }
+}
diff --git a/build.gradle b/build.gradle
index da807a2..8f8a149 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.0"
+        classpath 'com.android.tools.build:gradle:7.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,7 +15,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 10d2b11..78050f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/maven-publish-helper.gradle b/maven-publish-helper.gradle
new file mode 100644
index 0000000..b64fe4c
--- /dev/null
+++ b/maven-publish-helper.gradle
@@ -0,0 +1,78 @@
+/**
+ * Maven Publish Helper
+ *
+ * Requires Android Gradle plugin 3.6.0 or higher (available since Android Studio 3.6).
+ * See also: https://developer.android.com/studio/build/maven-publish-plugin
+ *
+ * @Author Robert Pösel
+ * @Author hlvs-apps
+ * @Version 1.5
+ * @Date 3.3.2020
+ */
+
+apply plugin: 'maven-publish'
+
+
+// To build to Maven Local ./gradlew build publishToMavenLocal
+
+task androidJavadocs(type: Javadoc) {
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    android.libraryVariants.all { variant ->
+        if (variant.name == 'release' || variant.name == 'debug') {
+            owner.classpath += variant.javaCompileProvider.get().classpath
+        }
+    }
+    exclude '**/R.html', '**/R.*.html', '**/index.html'
+}
+
+tasks.withType(Javadoc) {
+    failOnError false
+    options.addStringOption('Xdoclint:none', '-quiet')
+    options.addStringOption('encoding', 'UTF-8')
+    options.addStringOption('charSet', 'UTF-8')
+}
+
+task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+    archiveClassifier.set('javadoc')
+    from androidJavadocs.destinationDir
+}
+
+task androidSourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from android.sourceSets.main.java.srcDirs
+}
+
+// Because the components are created only during the afterEvaluate phase, you must
+// configure your publications using the afterEvaluate() lifecycle method.
+afterEvaluate {
+    publishing {
+        publications {
+            // Creates a Maven publication called "release".
+            release(MavenPublication) {
+                // Applies the component for the release build variant.
+                from components.release
+
+                // Adds javadocs and sources as separate jars.
+                artifact androidJavadocsJar
+                artifact androidSourcesJar
+
+                // You can customize attributes of the publication here or in module's build.gradle file.
+                //groupId = 'com.example'
+                //artifactId = 'custom-artifact'
+                version = android.defaultConfig.versionName
+            }
+            debug(MavenPublication) {
+                from components.debug
+                // Adds javadocs and sources as separate jars.
+                artifact androidJavadocsJar
+                artifact androidSourcesJar
+
+                // You can customize attributes of the publication here or in module's build.gradle file.
+                //groupId = 'com.example'
+                //artifactId = 'custom-artifact'
+                version = android.defaultConfig.versionName // or just '1.0'
+            }
+        }
+    }
+}
\ No newline at end of file

From b835227d9fddfe3b76741a919f3f3e4cb9644d1f Mon Sep 17 00:00:00 2001
From: hlvs-apps <hlvs-apps@sauers.de>
Date: Sat, 27 Aug 2022 01:35:49 +0200
Subject: [PATCH 3/4] Added Oboe C library for Resampling

---
 .gitmodules                                   |  3 +
 .idea/misc.xml                                |  7 ++
 .idea/runConfigurations.xml                   | 12 ---
 .idea/vcs.xml                                 |  1 +
 .../android/audiomixer/MainActivity.java      | 16 ++++
 app/src/main/res/layout/activity_main.xml     |  6 ++
 audio_mixer/build.gradle                      | 17 +++-
 audio_mixer/src/main/cpp/CMakeLists.txt       | 78 +++++++++++++++++
 audio_mixer/src/main/cpp/audio_mixer.cpp      | 84 +++++++++++++++++++
 audio_mixer/src/main/cpp/oboe                 |  1 +
 .../audio_mixer/resample/AudioResampler.java  |  8 +-
 .../resample/DefaultAudioResampler.java       |  8 +-
 .../DifferentSampleRateResampler.java         | 40 +++++++++
 13 files changed, 256 insertions(+), 25 deletions(-)
 create mode 100644 .gitmodules
 delete mode 100644 .idea/runConfigurations.xml
 create mode 100644 audio_mixer/src/main/cpp/CMakeLists.txt
 create mode 100644 audio_mixer/src/main/cpp/audio_mixer.cpp
 create mode 160000 audio_mixer/src/main/cpp/oboe
 create mode 100644 audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DifferentSampleRateResampler.java

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..4abdea1
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "audio_mixer/src/main/cpp/oboe"]
+	path = audio_mixer/src/main/cpp/oboe
+	url = https://github.com/google/oboe
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ef61796..7af94e4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/Henri/OpenSource/android_audio_mixer/app/src/main/res/layout/activity_main.xml" value="0.5045289855072463" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..e2ca0ed 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/audio_mixer/src/main/cpp/oboe" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/zeroonezero/android/audiomixer/MainActivity.java b/app/src/main/java/zeroonezero/android/audiomixer/MainActivity.java
index 1691ed8..6bdd1f8 100644
--- a/app/src/main/java/zeroonezero/android/audiomixer/MainActivity.java
+++ b/app/src/main/java/zeroonezero/android/audiomixer/MainActivity.java
@@ -9,7 +9,9 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.media.AudioManager;
 import android.media.MediaMetadataRetriever;
+import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -18,6 +20,7 @@
 import android.view.View;
 import android.widget.Toast;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -83,6 +86,19 @@ public void onClick(View v) {
             }
         });
 
+        findViewById(R.id.play_btn).setOnClickListener(v -> {
+            File file=new File(outputPath);
+            MediaPlayer mediaPlayer = new MediaPlayer();
+            mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+            try {
+                mediaPlayer.setDataSource(getApplicationContext(), Uri.fromFile(file));
+                mediaPlayer.prepare();
+                mediaPlayer.start();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        });
+
         checkPermission();
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 26e6075..a8a92ac 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -35,6 +35,12 @@
             android:layout_height="wrap_content"
             android:text="Mix"/>
 
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/play_btn"
+            android:text="Play Audio File"/>
+
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/audio_mixer/build.gradle b/audio_mixer/build.gradle
index c0de85c..ba898c9 100644
--- a/audio_mixer/build.gradle
+++ b/audio_mixer/build.gradle
@@ -12,6 +12,12 @@ android {
         versionName "1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
+        externalNativeBuild {
+            cmake {
+                cppFlags ""
+                arguments "-DRESAMPLER_OUTER_NAMESPACE=zeroonezero.android.audio_mixer -Wc++17-extensions"
+            }
+        }
     }
 
     buildTypes {
@@ -28,7 +34,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
+    externalNativeBuild {
+        cmake {
+            path file('src/main/cpp/CMakeLists.txt')
+            version '3.18.1'
+        }
+    }
     publishing {
         singleVariant('release') {
         }
@@ -55,11 +66,11 @@ apply from: '../maven-publish-helper.gradle'
 publishing {
     publications {
         release(MavenPublication) {
-            groupId 'zeroonezero.android_audio_mixer'
+            groupId 'zeroonezero.android.audio_mixer'
             artifactId = 'android_audio_mixer'
         }
         debug(MavenPublication) {
-            groupId 'zeroonezero.android_audio_mixer'
+            groupId 'zeroonezero.android.audio_mixer'
             artifactId = 'android_audio_mixer-debug'
         }
     }
diff --git a/audio_mixer/src/main/cpp/CMakeLists.txt b/audio_mixer/src/main/cpp/CMakeLists.txt
new file mode 100644
index 0000000..a80ea5d
--- /dev/null
+++ b/audio_mixer/src/main/cpp/CMakeLists.txt
@@ -0,0 +1,78 @@
+
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+# Sets the minimum version of CMake required to build the native library.
+
+cmake_minimum_required(VERSION 3.18.1)
+
+# Declares and names the project.
+
+project("libaudio_mixer")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+
+set (OBOE_DIR ./oboe)
+set (OBOE_SOURCES
+        ${OBOE_DIR}/src/flowgraph/resampler/IntegerRatio.cpp
+        ${OBOE_DIR}/src/flowgraph/resampler/LinearResampler.cpp
+        ${OBOE_DIR}/src/flowgraph/resampler/MultiChannelResampler.cpp
+        ${OBOE_DIR}/src/flowgraph/resampler/PolyphaseResampler.cpp
+        ${OBOE_DIR}/src/flowgraph/resampler/PolyphaseResamplerMono.cpp
+        ${OBOE_DIR}/src/flowgraph/resampler/PolyphaseResamplerStereo.cpp
+        ${OBOE_DIR}/src/flowgraph/resampler/SincResampler.cpp
+        ${OBOE_DIR}/src/flowgraph/resampler/SincResamplerStereo.cpp)
+
+
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds them for you.
+# Gradle automatically packages shared libraries with your APK.
+
+add_library( # Sets the name of the library.
+             libaudio_mixer
+
+             # Sets the library as a shared library.
+             SHARED
+
+             # Provides a relative path to your source file(s).
+             audio_mixer.cpp
+             ${OBOE_SOURCES}
+        )
+
+# Searches for a specified prebuilt library and stores the path as a
+# variable. Because CMake includes system libraries in the search path by
+# default, you only need to specify the name of the public NDK library
+# you want to add. CMake verifies that the library exists before
+# completing its build.
+
+find_library( # Sets the name of the path variable.
+              log-lib
+
+              # Specifies the name of the NDK library that
+              # you want CMake to locate.
+              log )
+# Specifies libraries CMake should link to your target library. You
+# can link multiple libraries, such as libraries you define in this
+# build script, prebuilt third-party libraries, or system libraries.
+
+# Add the Oboe library as a subdirectory in your project.
+# add_subdirectory tells CMake to look in this directory to
+# compile oboe source files using oboe's CMake file.
+# ./oboe specifies where the compiled binaries will be stored
+#add_subdirectory (${OBOE_DIR} ./oboe)
+
+# Specify the path to the Oboe header files.
+# This allows targets compiled with this CMake (application code)
+# to see public Oboe headers, in order to access its API.
+#include_directories (${OBOE_DIR}/include)
+
+
+target_link_libraries( # Specifies the target library.
+                        libaudio_mixer
+
+                        # Links the target library to the log library
+                        # included in the NDK.
+                        ${log-lib}
+                        #oboe
+        )
diff --git a/audio_mixer/src/main/cpp/audio_mixer.cpp b/audio_mixer/src/main/cpp/audio_mixer.cpp
new file mode 100644
index 0000000..b049375
--- /dev/null
+++ b/audio_mixer/src/main/cpp/audio_mixer.cpp
@@ -0,0 +1,84 @@
+#include "oboe/src/flowgraph/resampler/MultiChannelResampler.h"
+#include <jni.h>
+#include <algorithm>
+#include <iostream>
+#include <cmath>
+#include <android/log.h>
+#define  LOG_TAG    "resampler"
+#define  ALOG(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
+
+int resample(int channelCount,int inputSampleRate,int outputSampleRate, float* inputBuffer,float* outputBuffer,int numInputFrames){
+    //ALOG("Resample c++ Called!!!!!\n");
+    oboe::resampler::MultiChannelResampler *resampler = oboe::resampler::MultiChannelResampler::make(
+            channelCount, // channel count
+            inputSampleRate, // input sampleRate
+            outputSampleRate, // output sampleRate
+            oboe::resampler::MultiChannelResampler::Quality::Best);
+    ALOG("Created Resampler with following Settings: Input SampleRate:%d, Output SampleRate: %d, Channels: %d, Num of Input Samples: %d",inputSampleRate,outputSampleRate,channelCount,numInputFrames);
+    int numOutputFrames = 0;
+    int inputFramesLeft = numInputFrames/channelCount;
+    /*for(int outputFramesLeft=numInputFrames;outputFramesLeft>0;outputFramesLeft--){
+        float var=*inputBuffer;
+        //ALOG("Soundvalue Array1= %f; Value Array2=%f",var,*outputBuffer);
+        *outputBuffer=var;
+        //ALOG("Soundvalue Array2= %f",*outputBuffer);
+        inputBuffer ++;
+        outputBuffer ++;
+    }
+    numOutputFrames=numInputFrames;*/
+    //ALOG("%d Frames Left:",inputFramesLeft);
+    while (inputFramesLeft > 0) {
+        //ALOG("%d Frames Left",inputFramesLeft);d
+        if(resampler->isWriteNeeded()) {
+            resampler->writeNextFrame(inputBuffer);
+            inputBuffer += channelCount;
+            inputFramesLeft--;
+        } else {
+            resampler->readNextFrame(outputBuffer);
+            outputBuffer += channelCount;
+            numOutputFrames++;
+        }
+    }
+    //ALOG("num Output frames:%d",numOutputFrames);
+    delete resampler;
+    return numOutputFrames * channelCount;
+}
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_zeroonezero_android_audio_1mixer_resample_DifferentSampleRateResampler_resampleCBuffer(JNIEnv *env,
+                                                                                            jobject thiz,
+                                                                                            jint channel_count,
+                                                                                            jint input_sample_rate,
+                                                                                            jint output_sample_rate,
+                                                                                            jobject input_buffer,
+                                                                                            jobject output_buffer,
+                                                                                            jint num_input_frames) {
+    //ALOG("Starting Conversion");
+
+
+    //ALOG("Input Capicity send%d, real %lld",num_input_frames,env->GetDirectBufferCapacity(input_buffer));
+    //jfloat *inputBuffer= (jfloat *)(env->GetDirectBufferAddress(input_buffer));
+    jshort *inputShort=(jshort *)(env->GetDirectBufferAddress(input_buffer));
+    float inputBuffer[num_input_frames];
+    std::transform(inputShort, inputShort + num_input_frames, inputBuffer, [](short f){
+        return f;});
+    //jfloat* outputBuffer= (jfloat *)(env->GetDirectBufferAddress(output_buffer));
+    jshort *outputShort= (jshort *)(env->GetDirectBufferAddress(output_buffer));
+    float outputBuffer[env->GetDirectBufferCapacity(output_buffer)];
+    //ALOG("Finished Conversion, starting Resample");
+    int outputLength=resample(channel_count, input_sample_rate, output_sample_rate, inputBuffer, outputBuffer, num_input_frames);
+    //ALOG("Finished Resample, starting Conversion");
+    std::transform(outputBuffer, outputBuffer + outputLength, outputShort, [](float f){
+        short x= std::round(f);
+        //ALOG("Float %f to Short %d",f,x);
+        return x;
+    });
+    return outputLength;
+}
+extern "C"
+JNIEXPORT void JNICALL
+Java_zeroonezero_android_audio_1mixer_resample_DifferentSampleRateResampler_test(JNIEnv *env,
+                                                                                 jclass thiz) {
+    ALOG("Successfully initialised audio_mixer.cpp");
+}
\ No newline at end of file
diff --git a/audio_mixer/src/main/cpp/oboe b/audio_mixer/src/main/cpp/oboe
new file mode 160000
index 0000000..574c882
--- /dev/null
+++ b/audio_mixer/src/main/cpp/oboe
@@ -0,0 +1 @@
+Subproject commit 574c8824c9ce5109d6128922ad7e4d35aab379ed
diff --git a/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/AudioResampler.java b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/AudioResampler.java
index a0b8b88..7c57ff3 100644
--- a/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/AudioResampler.java
+++ b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/AudioResampler.java
@@ -5,8 +5,8 @@
 import java.nio.ShortBuffer;
 
 /**
- * Resamples audio data. See {@link UpsampleAudioResampler} or
- * {@link DownsampleAudioResampler} for concrete implementations.
+ * Resamples audio data. See {@link DifferentSampleRateResampler} or
+ * {@link PassThroughAudioResampler} for concrete implementations.
  */
 public interface AudioResampler {
 
@@ -21,9 +21,7 @@ public interface AudioResampler {
      */
     void resample(@NonNull final ShortBuffer inputBuffer, int inputSampleRate, @NonNull final ShortBuffer outputBuffer, int outputSampleRate, int channels);
 
-    AudioResampler DOWNSAMPLE = new DownsampleAudioResampler();
-
-    AudioResampler UPSAMPLE = new UpsampleAudioResampler();
+    AudioResampler DIFFSAMPLE = new DifferentSampleRateResampler();
 
     AudioResampler PASSTHROUGH = new PassThroughAudioResampler();
 }
diff --git a/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DefaultAudioResampler.java b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DefaultAudioResampler.java
index 88b7837..beac8a3 100644
--- a/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DefaultAudioResampler.java
+++ b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DefaultAudioResampler.java
@@ -12,11 +12,9 @@ public class DefaultAudioResampler implements AudioResampler {
 
     @Override
     public void resample(@NonNull ShortBuffer inputBuffer, int inputSampleRate, @NonNull ShortBuffer outputBuffer, int outputSampleRate, int channels) {
-        if (inputSampleRate < outputSampleRate) {
-            UPSAMPLE.resample(inputBuffer, inputSampleRate, outputBuffer, outputSampleRate, channels);
-        } else if (inputSampleRate > outputSampleRate) {
-            DOWNSAMPLE.resample(inputBuffer, inputSampleRate, outputBuffer, outputSampleRate, channels);
-        } else {
+        if (inputSampleRate != outputSampleRate) {
+            DIFFSAMPLE.resample(inputBuffer, inputSampleRate, outputBuffer, outputSampleRate, channels);
+        }else {
             PASSTHROUGH.resample(inputBuffer, inputSampleRate, outputBuffer, outputSampleRate, channels);
         }
     }
diff --git a/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DifferentSampleRateResampler.java b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DifferentSampleRateResampler.java
new file mode 100644
index 0000000..4125c9b
--- /dev/null
+++ b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DifferentSampleRateResampler.java
@@ -0,0 +1,40 @@
+package zeroonezero.android.audio_mixer.resample;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import java.nio.FloatBuffer;
+import java.nio.ShortBuffer;
+
+/**
+ * An {@link AudioResampler} that upsamples/downsamples from a lower/higher sample rate to a higher/lower sample rate.
+ */
+public class DifferentSampleRateResampler implements AudioResampler {
+
+    static {
+        try {
+            System.loadLibrary("libaudio_mixer");
+            Log.i("resampler","Successfully loaded native libaudio_mixer.so");
+            test();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void resample(@NonNull ShortBuffer inputBuffer, int inputSampleRate, @NonNull ShortBuffer outputBuffer, int outputSampleRate, int channels) {
+        try {
+            int remaining=inputBuffer.remaining();
+            int oldPosition=outputBuffer.position();//8 hours of Debugging to add this line, before that nothing worked
+            int newPosition=resampleCBuffer(channels, inputSampleRate, outputSampleRate, inputBuffer, outputBuffer, remaining) +oldPosition;
+            outputBuffer.position(newPosition);//8 hours of Debugging to add this line, before that nothing worked
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    native int resampleCBuffer(int channelCount, int inputSampleRate, int outputSampleRate, ShortBuffer inputBuffer, ShortBuffer outputBuffer, int numInputBufferSamples);
+
+    native static void test();
+}

From 881310c5603ef5ef49050a6e05aa59a3d1acfb81 Mon Sep 17 00:00:00 2001
From: hlvs-apps <hlvs-apps@sauers.de>
Date: Tue, 30 Aug 2022 15:44:37 +0200
Subject: [PATCH 4/4] Using Oboe C library to resample with better quality

---
 audio_mixer/src/main/cpp/audio_mixer.cpp      | 68 ++++++++++++-------
 .../audio_mixer/resample/AudioResampler.java  |  2 -
 .../resample/DefaultAudioResampler.java       | 24 ++++++-
 .../DifferentSampleRateResampler.java         | 26 +++++--
 4 files changed, 88 insertions(+), 32 deletions(-)

diff --git a/audio_mixer/src/main/cpp/audio_mixer.cpp b/audio_mixer/src/main/cpp/audio_mixer.cpp
index b049375..b9f7213 100644
--- a/audio_mixer/src/main/cpp/audio_mixer.cpp
+++ b/audio_mixer/src/main/cpp/audio_mixer.cpp
@@ -7,31 +7,35 @@
 #define  LOG_TAG    "resampler"
 #define  ALOG(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
-int resample(int channelCount,int inputSampleRate,int outputSampleRate, float* inputBuffer,float* outputBuffer,int numInputFrames){
-    //ALOG("Resample c++ Called!!!!!\n");
+
+long long createResampler(int channelCount,int inputSampleRate,int outputSampleRate){
     oboe::resampler::MultiChannelResampler *resampler = oboe::resampler::MultiChannelResampler::make(
             channelCount, // channel count
             inputSampleRate, // input sampleRate
             outputSampleRate, // output sampleRate
             oboe::resampler::MultiChannelResampler::Quality::Best);
-    ALOG("Created Resampler with following Settings: Input SampleRate:%d, Output SampleRate: %d, Channels: %d, Num of Input Samples: %d",inputSampleRate,outputSampleRate,channelCount,numInputFrames);
+    return (long long) resampler;
+}
+
+void deleteResampler(long long resamplerPointer){
+    oboe::resampler::MultiChannelResampler *resampler= (oboe::resampler::MultiChannelResampler*) resamplerPointer;
+    delete resampler;
+}
+
+int resample(long long resamplerPointer,int channelCount, float* inputBuffer,float* outputBuffer,int numInputFrames){
+    //ALOG("Resample c++ Called!!!!!\n");
+    oboe::resampler::MultiChannelResampler *resampler = (oboe::resampler::MultiChannelResampler*) resamplerPointer;
+
+    //ALOG("Created Resampler with following Settings: Input SampleRate:%d, Output SampleRate: %d, Channels: %d, Num of Input Samples: %d",inputSampleRate,outputSampleRate,channelCount,numInputFrames);
     int numOutputFrames = 0;
     int inputFramesLeft = numInputFrames/channelCount;
-    /*for(int outputFramesLeft=numInputFrames;outputFramesLeft>0;outputFramesLeft--){
-        float var=*inputBuffer;
-        //ALOG("Soundvalue Array1= %f; Value Array2=%f",var,*outputBuffer);
-        *outputBuffer=var;
-        //ALOG("Soundvalue Array2= %f",*outputBuffer);
-        inputBuffer ++;
-        outputBuffer ++;
-    }
-    numOutputFrames=numInputFrames;*/
-    //ALOG("%d Frames Left:",inputFramesLeft);
-    while (inputFramesLeft > 0) {
+    while (inputFramesLeft > -1) {
         //ALOG("%d Frames Left",inputFramesLeft);d
         if(resampler->isWriteNeeded()) {
-            resampler->writeNextFrame(inputBuffer);
-            inputBuffer += channelCount;
+            if(inputFramesLeft>0) {
+                resampler->writeNextFrame(inputBuffer);
+                inputBuffer += channelCount;
+            }
             inputFramesLeft--;
         } else {
             resampler->readNextFrame(outputBuffer);
@@ -40,7 +44,6 @@ int resample(int channelCount,int inputSampleRate,int outputSampleRate, float* i
         }
     }
     //ALOG("num Output frames:%d",numOutputFrames);
-    delete resampler;
     return numOutputFrames * channelCount;
 }
 
@@ -48,26 +51,25 @@ extern "C"
 JNIEXPORT jint JNICALL
 Java_zeroonezero_android_audio_1mixer_resample_DifferentSampleRateResampler_resampleCBuffer(JNIEnv *env,
                                                                                             jobject thiz,
+                                                                                            jlong resamplerPointer,
                                                                                             jint channel_count,
-                                                                                            jint input_sample_rate,
-                                                                                            jint output_sample_rate,
                                                                                             jobject input_buffer,
                                                                                             jobject output_buffer,
                                                                                             jint num_input_frames) {
     //ALOG("Starting Conversion");
 
-
     //ALOG("Input Capicity send%d, real %lld",num_input_frames,env->GetDirectBufferCapacity(input_buffer));
     //jfloat *inputBuffer= (jfloat *)(env->GetDirectBufferAddress(input_buffer));
     jshort *inputShort=(jshort *)(env->GetDirectBufferAddress(input_buffer));
     float inputBuffer[num_input_frames];
-    std::transform(inputShort, inputShort + num_input_frames, inputBuffer, [](short f){
-        return f;});
+    std::transform(inputShort, inputShort + num_input_frames, inputBuffer, [](int f){
+        return f;
+    });
     //jfloat* outputBuffer= (jfloat *)(env->GetDirectBufferAddress(output_buffer));
     jshort *outputShort= (jshort *)(env->GetDirectBufferAddress(output_buffer));
     float outputBuffer[env->GetDirectBufferCapacity(output_buffer)];
     //ALOG("Finished Conversion, starting Resample");
-    int outputLength=resample(channel_count, input_sample_rate, output_sample_rate, inputBuffer, outputBuffer, num_input_frames);
+    int outputLength=resample(resamplerPointer,channel_count, inputBuffer, outputBuffer, num_input_frames);
     //ALOG("Finished Resample, starting Conversion");
     std::transform(outputBuffer, outputBuffer + outputLength, outputShort, [](float f){
         short x= std::round(f);
@@ -76,9 +78,25 @@ Java_zeroonezero_android_audio_1mixer_resample_DifferentSampleRateResampler_resa
     });
     return outputLength;
 }
-extern "C"
+/*extern "C"
 JNIEXPORT void JNICALL
 Java_zeroonezero_android_audio_1mixer_resample_DifferentSampleRateResampler_test(JNIEnv *env,
                                                                                  jclass thiz) {
-    ALOG("Successfully initialised audio_mixer.cpp");
+    //ALOG("Successfully initialised audio_mixer.cpp");
+}
+*/
+extern "C"
+JNIEXPORT jlong JNICALL
+Java_zeroonezero_android_audio_1mixer_resample_DifferentSampleRateResampler_createResampler(
+        JNIEnv *env, jobject thiz, jint channel_count, jint input_sample_rate,
+        jint output_sample_rate) {
+    return createResampler(channel_count,input_sample_rate,output_sample_rate);
+}
+
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_zeroonezero_android_audio_1mixer_resample_DifferentSampleRateResampler_deleteResampler(
+        JNIEnv *env, jobject thiz, jlong resampler_pointer) {
+    deleteResampler(resampler_pointer);
 }
\ No newline at end of file
diff --git a/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/AudioResampler.java b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/AudioResampler.java
index 7c57ff3..1bc17a9 100644
--- a/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/AudioResampler.java
+++ b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/AudioResampler.java
@@ -21,7 +21,5 @@ public interface AudioResampler {
      */
     void resample(@NonNull final ShortBuffer inputBuffer, int inputSampleRate, @NonNull final ShortBuffer outputBuffer, int outputSampleRate, int channels);
 
-    AudioResampler DIFFSAMPLE = new DifferentSampleRateResampler();
-
     AudioResampler PASSTHROUGH = new PassThroughAudioResampler();
 }
diff --git a/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DefaultAudioResampler.java b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DefaultAudioResampler.java
index beac8a3..20c8058 100644
--- a/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DefaultAudioResampler.java
+++ b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DefaultAudioResampler.java
@@ -3,6 +3,9 @@
 import androidx.annotation.NonNull;
 
 import java.nio.ShortBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * An {@link AudioResampler} that delegates to appropriate classes
@@ -10,10 +13,29 @@
  */
 public class DefaultAudioResampler implements AudioResampler {
 
+
+    private static class AudioResamplerBuffer{
+        private final HashMap<String,AudioResampler> resamplers;
+        private AudioResamplerBuffer(int maxItems){
+            resamplers=new HashMap<>(maxItems);
+        }
+        private AudioResampler getResampler(int inputSampleRate, int outputSampleRate, int channelCount){
+            String hashString=inputSampleRate+":"+outputSampleRate+":"+channelCount;
+            AudioResampler r=resamplers.get(hashString);
+            if(r == null){
+                r=new DifferentSampleRateResampler(inputSampleRate,outputSampleRate,channelCount);
+                resamplers.put(hashString,r);
+            }
+            return r;
+        }
+    }
+
+    AudioResamplerBuffer buffer= new AudioResamplerBuffer(1);
+
     @Override
     public void resample(@NonNull ShortBuffer inputBuffer, int inputSampleRate, @NonNull ShortBuffer outputBuffer, int outputSampleRate, int channels) {
         if (inputSampleRate != outputSampleRate) {
-            DIFFSAMPLE.resample(inputBuffer, inputSampleRate, outputBuffer, outputSampleRate, channels);
+            buffer.getResampler(inputSampleRate,outputSampleRate,channels).resample(inputBuffer, inputSampleRate, outputBuffer, outputSampleRate, channels);
         }else {
             PASSTHROUGH.resample(inputBuffer, inputSampleRate, outputBuffer, outputSampleRate, channels);
         }
diff --git a/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DifferentSampleRateResampler.java b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DifferentSampleRateResampler.java
index 4125c9b..c0943df 100644
--- a/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DifferentSampleRateResampler.java
+++ b/audio_mixer/src/main/java/zeroonezero/android/audio_mixer/resample/DifferentSampleRateResampler.java
@@ -5,36 +5,54 @@
 import androidx.annotation.NonNull;
 
 import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 
 /**
  * An {@link AudioResampler} that upsamples/downsamples from a lower/higher sample rate to a higher/lower sample rate.
  */
 public class DifferentSampleRateResampler implements AudioResampler {
+    long resamplerPointer;
 
+    public DifferentSampleRateResampler(int inputSampleRate, int outputSampleRate,int channelCount){
+        resamplerPointer=createResampler(channelCount,inputSampleRate,outputSampleRate);
+
+    }
     static {
         try {
             System.loadLibrary("libaudio_mixer");
             Log.i("resampler","Successfully loaded native libaudio_mixer.so");
-            test();
+            //test();
         }catch (Exception e){
             e.printStackTrace();
         }
     }
 
+
     @Override
     public void resample(@NonNull ShortBuffer inputBuffer, int inputSampleRate, @NonNull ShortBuffer outputBuffer, int outputSampleRate, int channels) {
         try {
+            inputBuffer.rewind();
             int remaining=inputBuffer.remaining();
             int oldPosition=outputBuffer.position();//8 hours of Debugging to add this line, before that nothing worked
-            int newPosition=resampleCBuffer(channels, inputSampleRate, outputSampleRate, inputBuffer, outputBuffer, remaining) +oldPosition;
+            int newPosition=resampleCBuffer(resamplerPointer,channels, inputBuffer, outputBuffer, remaining) + oldPosition;
             outputBuffer.position(newPosition);//8 hours of Debugging to add this line, before that nothing worked
         }catch (Exception e){
             e.printStackTrace();
         }
     }
 
-    native int resampleCBuffer(int channelCount, int inputSampleRate, int outputSampleRate, ShortBuffer inputBuffer, ShortBuffer outputBuffer, int numInputBufferSamples);
+    native int resampleCBuffer(long resamplerPointer,int channelCount, ShortBuffer inputBuffer, ShortBuffer outputBuffer, int numInputBufferSamples);
+
+    native long createResampler(int channelCount, int inputSampleRate, int outputSampleRate);
+
+    native void deleteResampler(long resamplerPointer);
+
+    @Override
+    protected void finalize() throws Throwable {
+        deleteResampler(resamplerPointer);
+        super.finalize();
+    }
 
-    native static void test();
+    //native static void test();
 }