fix: ensure AudioRecord is initialised before recording

anarchuser · anarchuser · commit 72e747da237f · 2022-06-17T10:36:55.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,16 @@
-#### 0.6.0
+### 0.6.1
+
+* Fix issues of the Audio Recorder not always being properly reinitialised on android
+
+## 0.6.0
 
 + Changing microphone config now reconfigures audio recorder. To change config, recall `microphone({config})` with the new config.
 
-#### 0.5.5
+### 0.5.5
 
 * Add flag to prevent permission request dialogue
 
-#### 0.5.4
+### 0.5.4
 
 * Don't ask for permission on MacOS, since they seem to have permission anyways
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# mic_stream: 0.6.0
+# mic_stream: 0.6.1
 
 [Flutter Plugin]
 Provides a tool to get the microphone input as 8 or 16 bit PCM Stream.
diff --git a/android/src/main/java/com/code/aaron/micstream/MicStreamPlugin.java b/android/src/main/java/com/code/aaron/micstream/MicStreamPlugin.java
@@ -57,7 +57,7 @@ private void registerWith(BinaryMessenger messenger) {
     private EventChannel.EventSink eventSink;
 
     // Audio recorder + initial values
-    private static volatile AudioRecord recorder;
+    private static volatile AudioRecord recorder = null;
 
     private int AUDIO_SOURCE = MediaRecorder.AudioSource.DEFAULT;
     private int SAMPLE_RATE = 16000;
@@ -90,16 +90,28 @@ public void onMethodCall(MethodCall call, Result result) {
         }
     }
 
+    private void initRecorder () {
+        // Try to initialize and start the recorder
+        recorder = new AudioRecord(AUDIO_SOURCE, SAMPLE_RATE, CHANNEL_CONFIG, AUDIO_FORMAT, BUFFER_SIZE);
+        if (recorder.getState() != AudioRecord.STATE_INITIALIZED) {
+            eventSink.error("-1", "PlatformError", null);
+            return;
+        }
+
+        recorder.startRecording();
+    }
+
     private final Runnable runnable = new Runnable() {
         @Override
         public void run() {
+            if (recorder == null) initRecorder();
             isRecording = true;
-            
+
             actualSampleRate = recorder.getSampleRate();
             actualBitDepth = (recorder.getAudioFormat() == AudioFormat.ENCODING_PCM_8BIT ? 8 : 16);
 
             // Wait until recorder is initialised
-            while (recorder.getRecordingState() != AudioRecord.RECORDSTATE_RECORDING);
+            while (recorder == null || recorder.getRecordingState() != AudioRecord.RECORDSTATE_RECORDING);
 
             // Repeatedly push audio samples to stream
             while (record) {
@@ -194,15 +206,6 @@ public void onListen(Object args, final EventChannel.EventSink eventSink) {
 
         this.eventSink = new MainThreadEventSink(eventSink);
 
-        // Try to initialize and start the recorder
-        recorder = new AudioRecord(AUDIO_SOURCE, SAMPLE_RATE, CHANNEL_CONFIG, AUDIO_FORMAT, BUFFER_SIZE);
-        if (recorder.getState() != AudioRecord.STATE_INITIALIZED) {
-            eventSink.error("-1", "PlatformError", null);
-            return;
-        }
-        
-        recorder.startRecording();
-
         // Start runnable
         record = true;
         new Thread(runnable).start();
@@ -212,12 +215,13 @@ record = true;
     public void onCancel(Object o) {
         // Stop runnable
         record = false;
+        while (isRecording);
         if(recorder != null) {
             // Stop and reset audio recorder
             recorder.stop();
             recorder.release();
-            recorder = null;
         }
+        recorder = null;
     }
 }
 
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: mic_stream
-description: MicStream is a plugin to receive raw byte streams from a device's microphone. Audio is returned as `Stream<Uint8list>`.
-version: 0.6.0
+description: A plugin to receive raw byte streams from a device's microphone. Audio is returned as `Stream<Uint8list>`.
+version: 0.6.1
 homepage: https://github.com/anarchuser/mic_stream
 
 environment:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# mic_stream: 0.6.0`
	`1`	`+# mic_stream: 0.6.1`
`2`	`2`
`3`	`3`	`[Flutter Plugin]`
`4`	`4`	`Provides a tool to get the microphone input as 8 or 16 bit PCM Stream.`