feat:新增音频调试

Author: chenyouwei

.idea/markdown-navigator-enh.xml

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.hugh.audiofun"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"

.idea/markdown-navigator.xml

@@ -12,7 +12,9 @@
 import android.widget.TextView;
 
 import com.hugh.audiohome.AudioFunHomeActivity;
+import com.hugh.libwebrtc.AFRtcMainActivity;
 import com.hugh.libwebrtc.RtcActivity;
+import com.hugh.libwebrtc.kt.RtcFileActivity;
 import com.hugh.sound.SoundTouch;
 import com.hugh.sound.SoundTouchActivity;
 import com.zhl.commonadapter.BaseViewHolder;
@@ -77,6 +79,9 @@ public BaseViewHolder<Item> createViewHolder(int type) {
                     case TYPE_GO_FUN_AUDIO:
                         startActivity(new Intent(MainActivity.this, AudioFunHomeActivity.class));
                         break;
+                    case TYPE_GO_WEBRTC2:
+                        startActivity(new Intent(MainActivity.this, RtcFileActivity.class));
+                        break;
                     default:
                         break;
                 }
@@ -102,6 +107,7 @@ enum Item {
         TYPE_PLAY_3("播放颤音"),
         TYPE_PLAY_4("混响功能使用"),
         TYPE_GO_WEBRTC("进入webRtc"),
+        TYPE_GO_WEBRTC2("进入webRtc2"),
         TYPE_GO_FUN_AUDIO("进入录音调节页面");
 
 

app/build.gradle

@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    
+    ext.kotlin_version = '1.3.61'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.3'
-        
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

app/src/main/java/com/hugh/audiofun/MainActivity.java

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"

build.gradle

@@ -1,11 +1,13 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
     buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
@@ -45,7 +47,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

libsoundtouch/build.gradle

@@ -3,5 +3,6 @@
     <application >
         <activity android:name=".RtcActivity"/>
         <activity android:name=".AFRtcMainActivity"/>
+        <activity android:name=".kt.RtcFileActivity"/>
     </application>
 </manifest>

libwebrtc/build.gradle

@@ -69,14 +69,14 @@ Java_com_hugh_libwebrtc_WebRtcNsUtils_nsFree(JNIEnv *env,
 }
 
 JNIEXPORT jlong JNICALL
-Java_com_hugh_libwebrtc_WebRtcNsUtils_WebRtcNs_1Create(JNIEnv *env, jclass obj) {
+Java_com_hugh_libwebrtc_WebRtcNsUtils_WebRtcNsx_1Create(JNIEnv *env, jclass obj) {
     return (long) WebRtcNsx_Create();
 }
 
 
 JNIEXPORT jint JNICALL
-Java_com_hugh_libwebrtc_WebRtcNsUtils_WebRtcNs_1Init(JNIEnv *env, jclass obj, jlong nsHandler,
-                                                     jint frequency
+Java_com_hugh_libwebrtc_WebRtcNsUtils_WebRtcNsx_1Init(JNIEnv *env, jclass obj, jlong nsHandler,
+                                                      jint frequency
 ) {
     NsxHandle *handler = (NsxHandle *) nsHandler;
     if (handler == nullptr) {
@@ -101,12 +101,12 @@ Java_com_hugh_libwebrtc_WebRtcNsUtils_nsxSetPolicy(JNIEnv *env,
 
 
 JNIEXPORT jint JNICALL
-Java_com_hugh_libwebrtc_WebRtcNsUtils_WebRtcNs_1Process(JNIEnv *env,
-                                                        jclass obj, jlong
+Java_com_hugh_libwebrtc_WebRtcNsUtils_WebRtcNsx_1Process(JNIEnv *env,
+                                                         jclass obj, jlong
                                                         nsHandler,
-                                                        jshortArray speechFrame,
-                                                        jint num_bands,
-                                                        jshortArray outframe) {
+                                                         jshortArray speechFrame,
+                                                         jint num_bands,
+                                                         jshortArray outframe) {
     NsxHandle *handle = (NsxHandle *) nsHandler;
     if (handle == nullptr) {
         return -3;
@@ -142,7 +142,7 @@ Java_com_hugh_libwebrtc_WebRtcNsUtils_WebRtcNs_1ProcessShort(JNIEnv* env, jclass
 }
 
 JNIEXPORT jint JNICALL
-Java_com_hugh_libwebrtc_WebRtcNsUtils_WebRtcNs_1Free(JNIEnv *env, jclass obj, jlong nsHandler) {
+Java_com_hugh_libwebrtc_WebRtcNsUtils_WebRtcNsx_1Free(JNIEnv *env, jclass obj, jlong nsHandler) {
     NsxHandle *handle = (NsxHandle *) nsHandler;
     if (handle == nullptr) {
         return -3;

libwebrtc/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 
 import android.Manifest;
 import android.app.Activity;
-import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.AssetManager;
 import android.media.AudioFormat;
@@ -125,7 +124,7 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
             initAudioFile();
         }
 
-        startActivity(new Intent(RtcActivity.this,AFRtcMainActivity.class));
+//        startActivity(new Intent(RtcActivity.this,AFRtcMainActivity.class));
     }
 
     private void initAudioFile() {
@@ -281,16 +280,16 @@ public void run() {
 //                            WebRtcUtils.webRtcAgcProcess32k(nsProcessData, processData, nsProcessData.length);
 //                            out.write(shortsToBytes(processData));
                         } else {
-                            short[] nsProcessData;
+                            short[] nsProcessData = new short[160];
                             if (selectId == R.id.rb_16k) {
 //                                nsProcessData = WebRtcNsUtils.webRtcNsProcess(mSampleRate, shortData.length, shortData);
 //                                WebRtcUtils.webRtcAgcProcess(nsProcessData, processData, shortData.length);
 //                                out.write(shortsToBytes(nsProcessData));
                             } else if (selectId == R.id.rb_8k) {
                                 Log.e("aaa", "shortData.length---->" + shortData.length);
-//                                nsProcessData = WebRtcNsUtils.webRtcNsProcess(mSampleRate, shortData.length, shortData);
+//                                 WebRtcNsUtils.WebRtcNsx_Process(WebRtcNs, shortData,1, nsProcessData);
 //                                WebRtcUtils.webRtcAgcProcess(nsProcessData, processData, nsProcessData.length);
-//                                out.write(shortsToBytes(nsProcessData));
+                                out.write(shortsToBytes(nsProcessData));
                             }
                         }