fix(android): race condition when calling stop recording.

llfbandit · Oct 9, 2024 · 833fa33 · 833fa33
2 parents 8485404 + 01e6892
commit 833fa33
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/..._android/android/src/main/kotlin/com/llfbandit/record/record/encoder/MediaCodecEncoder.kt b/..._android/android/src/main/kotlin/com/llfbandit/record/record/encoder/MediaCodecEncoder.kt
@@ -79,9 +79,11 @@ class MediaCodecEncoder(
                 processInputBuffer()
             }
         } else if (msg.what == MSG_ENCODE_INPUT) {
-            mQueue.addLast(msg.obj as Sample)
-            if (mInputBufferIndex >= 0) {
-                processInputBuffer()
+            if (!mStopped.get()) {
+                mQueue.addLast(msg.obj as Sample)
+                if (mInputBufferIndex >= 0) {
+                    processInputBuffer()
+                }
             }
         }
 
@@ -124,6 +126,7 @@ class MediaCodecEncoder(
                         getPresentationTimestampUs(mInputBufferPosition),
                         MediaCodec.BUFFER_FLAG_END_OF_STREAM
                     )
+                    mInputBufferIndex = -1 // Reset index after sending EOS
                 }
                 return
             }
@@ -174,7 +177,6 @@ class MediaCodecEncoder(
 
     private fun finish() {
         stopAndRelease()
-        mStoppedCompleter?.release()
     }
 
     private fun stopAndRelease() {
@@ -185,6 +187,9 @@ class MediaCodecEncoder(
         mContainer?.stop()
         mContainer?.release()
         mContainer = null
+
+        mStoppedCompleter?.release()
+        mStoppedCompleter = null
     }
 
     private fun calculateInputRate() {

diff --git a/record_android/android/src/main/kotlin/com/llfbandit/record/record/recorder/RecordThread.kt b/record_android/android/src/main/kotlin/com/llfbandit/record/record/recorder/RecordThread.kt
@@ -118,18 +118,21 @@ class RecordThread(
     }
 
     private fun stopAndRelease() {
-        mPcmReader?.stop()
-        mPcmReader?.release()
-        mPcmReader = null
+        try {
+            mPcmReader?.stop()
+            mPcmReader?.release()
+            mPcmReader = null
 
-        mEncoder?.stopEncoding()
-        mEncoder = null
+            mEncoder?.stopEncoding()
+            mEncoder = null
 
-        if (mHasBeenCanceled) {
-            Utils.deleteFile(config.path)
+            if (mHasBeenCanceled) {
+                Utils.deleteFile(config.path)
+            }
+            recorderListener.onStop()
+        } catch (ex: Exception) {
+            recorderListener.onFailure(ex)
         }
-
-        recorderListener.onStop()
     }
 
     private fun selectFormat(): Format {