feat(android): support for wav recording

farfromrefug · farfromrefug · commit fdbf72075fe8 · 2022-09-16T17:13:56.000+02:00
diff --git a/README.md b/README.md
@@ -148,6 +148,9 @@ player
 
 ### Recorder
 
+On Android if you want to record PCM you need to use `ANDROID_ENCODER_PCM_16 | ` exported by this plugin for the `encoder` option
+While using PCM `infoCallback`, `errorCallback` and `_getMeters` are not used on Android
+
 #### TNSRecorder Methods
 
 | Method                                                      | Description                                                              |
diff --git a/packages/audio/platforms/android/include.gradle b/packages/audio/platforms/android/include.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    implementation 'com.github.squti:Android-Wave-Recorder:1.7.0'
+}
diff --git a/packages/audio/platforms/android/native-api-usage.json b/packages/audio/platforms/android/native-api-usage.json
@@ -14,6 +14,7 @@
         "android.media:PlaybackParams*",
         "android.media:MediaRecorder*",
         "android.media.MediaRecorder:OnErrorListener*",
-        "android.media.MediaRecorder:OnInfoListener*"
+        "android.media.MediaRecorder:OnInfoListener*",
+        "com.github.squti.androidwaverecorder:WaveRecorder*"
     ]
 }
diff --git a/src/audio/android/player.ts b/src/audio/android/player.ts
@@ -248,7 +248,7 @@ export class TNSPlayer extends Observable {
                 if (options.infoCallback) {
                     player.setOnInfoListener(
                         new android.media.MediaPlayer.OnInfoListener({
-                            onInfo: (player: any, info: number, extra: number) => {
+                            onInfo: (player: android.media.MediaPlayer, info: number, extra: number) => {
                                 options.infoCallback({ player, info, extra });
                                 return true;
                             }
@@ -322,7 +322,7 @@ export class TNSPlayer extends Observable {
             // https://developer.android.com/reference/android/app/Activity.html#setVolumeControlStream(int)
             activity.setVolumeControlStream(android.media.AudioManager.STREAM_MUSIC);
 
-            // register the receiver so when calls or another app takes main audio focus the player pauses
+            // register the receiver so when calls or another app takes main   focus the player pauses
             Application.android.registerBroadcastReceiver(android.media.AudioManager.ACTION_AUDIO_BECOMING_NOISY, (context: android.content.Context, intent: android.content.Intent) => {
                 this.pause();
             });
@@ -392,7 +392,7 @@ export class TNSPlayer extends Observable {
 
     public async getAudioTrackDuration() {
         const duration = this._player ? this._player.getDuration() : 0;
-        return duration.toString();
+        return duration;
     }
 
     /**
diff --git a/src/audio/android/recorder.ts b/src/audio/android/recorder.ts
@@ -1,13 +1,11 @@
 import { check, request } from '@nativescript-community/perms';
 import { Application } from '@nativescript/core';
-import { AudioRecorderOptions } from '..';
+import { ANDROID_ENCODER_PCM, ANDROID_ENCODER_PCM_16, AudioRecorderOptions } from '..';
 
 export class TNSRecorder {
     private _recorder: any;
+    private _wavrecorder: any;
 
-    get android() {
-        return this._recorder;
-    }
 
     public static CAN_RECORD(): boolean {
         const pManager = Application.android.context.getPackageManager();
@@ -32,57 +30,68 @@ export class TNSRecorder {
         // bake the permission into this so the dev doesn't have to call it
         await this.requestRecordPermission();
 
+        const audioSource = options.source ? options.source : 0;
         if (this._recorder) {
             // reset for reuse
             this._recorder.reset();
         } else {
-            this._recorder = new android.media.MediaRecorder();
+            if (options.encoder === ANDROID_ENCODER_PCM || options.encoder === ANDROID_ENCODER_PCM_16) {
+                console.log('WaveRecorder');
+                //@ts-ignore
+                this._wavrecorder = new com.github.squti.androidwaverecorder.WaveRecorder(options.filename);
+            } else {
+                this._recorder = new android.media.MediaRecorder();
+            }
         }
-
-        const audioSource = options.source ? options.source : 0;
-        this._recorder.setAudioSource(audioSource);
-
-        const outFormat = options.format ? options.format : 0;
-        this._recorder.setOutputFormat(outFormat);
-
-        const encoder = options.encoder ? options.encoder : 0;
-        this._recorder.setAudioEncoder(encoder);
-
-        if (options.channels) {
-            this._recorder.setAudioChannels(options.channels);
-        }
-        if (options.sampleRate) {
-            this._recorder.setAudioSamplingRate(options.sampleRate);
-        }
-        if (options.bitRate) {
-            this._recorder.setAudioEncodingBitRate(options.bitRate);
-        }
-        if (options.maxDuration) {
-            this._recorder.setMaxDuration(options.maxDuration);
+        if (this._recorder) {
+            this._recorder.setAudioSource(audioSource);
+            const outFormat = options.format ? options.format : 0;
+            this._recorder.setOutputFormat(outFormat);
+
+            const encoder = options.encoder ? options.encoder : 0;
+            this._recorder.setAudioEncoder(encoder);
+
+            if (options.channels) {
+                this._recorder.setAudioChannels(options.channels);
+            }
+            if (options.sampleRate) {
+                this._recorder.setAudioSamplingRate(options.sampleRate);
+            }
+            if (options.bitRate) {
+                this._recorder.setAudioEncodingBitRate(options.bitRate);
+            }
+            if (options.maxDuration) {
+                this._recorder.setMaxDuration(options.maxDuration);
+            }
+            // On Error
+            options.errorCallback &&
+                this._recorder.setOnErrorListener(
+                    new android.media.MediaRecorder.OnErrorListener({
+                        onError: (recorder: any, error: number, extra: number) => {
+                            options.errorCallback({ recorder, error, extra });
+                        }
+                    })
+                );
+
+            // On Info
+            options.infoCallback &&
+                this._recorder.setOnInfoListener(
+                    new android.media.MediaRecorder.OnInfoListener({
+                        onInfo: (recorder: any, info: number, extra: number) => {
+                            options.infoCallback({ recorder, info, extra });
+                        }
+                    })
+                );
+            this._recorder.setOutputFile(options.filename);
+            this._recorder.prepare();
+            this._recorder.start();
+        } else if (this._wavrecorder) {
+            this._wavrecorder.waveConfig.sampleRate = options.sampleRate || 44100;
+            this._wavrecorder.waveConfig.channels = options.channels === 1 ? android.media.AudioFormat.CHANNEL_IN_MONO : 2;
+            this._wavrecorder.waveConfig.audioEncoding = options.encoder === ANDROID_ENCODER_PCM_16 ? android.media.AudioFormat.ENCODING_PCM_16BIT : android.media.AudioFormat.ENCODING_PCM_8BIT;
+            this._wavrecorder.startRecording();
         }
 
-        this._recorder.setOutputFile(options.filename);
-
-        // On Error
-        this._recorder.setOnErrorListener(
-            new android.media.MediaRecorder.OnErrorListener({
-                onError: (recorder: any, error: number, extra: number) => {
-                    options.errorCallback({ recorder, error, extra });
-                }
-            })
-        );
-
-        // On Info
-        this._recorder.setOnInfoListener(
-            new android.media.MediaRecorder.OnInfoListener({
-                onInfo: (recorder: any, info: number, extra: number) => {
-                    options.infoCallback({ recorder, info, extra });
-                }
-            })
-        );
-
-        this._recorder.prepare();
-        this._recorder.start();
     }
 
     public getMeters(): number {
@@ -92,19 +101,27 @@ export class TNSRecorder {
 
     public async pause() {
         if (this._recorder) {
+            // not working yet with pcm
             this._recorder.pause();
+        } else if (this._wavrecorder) {
+            this._wavrecorder.pauseRecording();
         }
     }
 
     public async resume() {
         if (this._recorder) {
+            // not working yet with pcm
             this._recorder.resume();
+        } else if (this._wavrecorder) {
+            this._wavrecorder.resumeRecording();
         }
     }
 
     public async stop() {
         if (this._recorder) {
             this._recorder.stop();
+        } else if (this._wavrecorder) {
+            this._wavrecorder.stopRecording();
         }
     }
 
diff --git a/src/audio/common.ts b/src/audio/common.ts
@@ -1,5 +1,10 @@
 import { Utils, knownFolders, path as nsFilePath } from '@nativescript/core';
 
+
+export const ANDROID_ENCODER_PCM = 161234;
+export const ANDROID_ENCODER_PCM_16 = 1612341;
+
+
 export enum AudioPlayerEvents {
     seek = 'seek',
     paused = 'paused',
diff --git a/src/audio/index.d.ts b/src/audio/index.d.ts
@@ -1,6 +1,6 @@
 import { Observable } from '@nativescript/core';
 
-export { AudioPlayerEvents } from './common';
+export { AudioPlayerEvents, ANDROID_ENCODER_PCM, ANDROID_ENCODER_PCM_16 } from './common';
 export interface AudioPlayerOptions {
     /**
      * The audio file to play.
@@ -21,7 +21,6 @@ export interface AudioPlayerOptions {
      * Set true to enable audio metering.
      */
     metering?: boolean;
-    audioMixing?: boolean;
 
     pitch?: number;
 
@@ -43,6 +42,11 @@ export interface AudioPlayerOptions {
      */
     infoCallback?: Function;
 
+    /**
+     * Should mix audio.
+     */
+    audioMixing?: boolean;
+
     /**
      * iOS: The category for playing recorded music or other sounds that are central to the successful use of your app.
      *  https://developer.apple.com/documentation/avfaudio/avaudiosessioncategory?language=objc
@@ -191,7 +195,7 @@ export declare class TNSPlayer {
     /**
      * Get the duration of the audio file playing.
      */
-    getAudioTrackDuration(): Promise<string>;
+    getAudioTrackDuration(): Promise<number>;
 
     /**
      * Android Only
@@ -272,7 +276,6 @@ export declare class TNSRecorder {
     audioRecorderDidFinishRecording(recorder: any, success: boolean): void;
 }
 
-
 export enum AudioFocusDurationHint {
     /**
      * Expresses the fact that your application is now the sole source

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+dependencies {`
	`2`	`+ implementation 'com.github.squti:Android-Wave-Recorder:1.7.0'`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`"android.media:PlaybackParams*",`
`15`	`15`	`"android.media:MediaRecorder*",`
`16`	`16`	`"android.media.MediaRecorder:OnErrorListener*",`
`17`		`- "android.media.MediaRecorder:OnInfoListener*"`
	`17`	`+ "android.media.MediaRecorder:OnInfoListener*",`
	`18`	`+ "com.github.squti.androidwaverecorder:WaveRecorder*"`
`18`	`19`	`]`
`19`	`20`	`}`