Skip to content

Commit 4238a4e

Browse files
committed
fix(mobile): preserve captured audio when Stop wins inference startup
1 parent 31a7924 commit 4238a4e

3 files changed

Lines changed: 97 additions & 14 deletions

File tree

‎apps/mobile/modules/t3-voice-transcription/android/src/main/java/expo/modules/t3voicetranscription/LivePcmCapture.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ internal class LivePcmCapture(
3333
private val output: PcmOutput,
3434
private val clock: TimeSource = TimeSource.Monotonic
3535
) {
36-
private var worker: Job? = null
36+
@Volatile private var worker: Job? = null
3737
private val completion = CompletableDeferred<Result<Unit>>()
3838
private val microphoneStopped = CompletableDeferred<Result<Unit>>()
3939

@@ -50,7 +50,8 @@ internal class LivePcmCapture(
5050

5151
@Volatile var inputExhausted = false
5252
private set
53-
val isRecording get() = worker != null && !microphoneStopped.isCompleted
53+
val hasStarted get() = worker != null
54+
val isRecording get() = hasStarted && !microphoneStopped.isCompleted
5455

5556
fun start(scope: CoroutineScope, seconds: Double, onFinished: (Throwable?) -> Unit) {
5657
check(worker == null && !sourceReleased) { "The microphone is not prepared." }

‎apps/mobile/modules/t3-voice-transcription/android/src/main/java/expo/modules/t3voicetranscription/LiveVoiceRecorder.kt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,17 @@ internal class LiveVoiceRecorder(
125125
}
126126

127127
suspend fun stop() {
128-
val selection = synchronized(this) { inputSelection }
129-
selection?.cancel()
130-
selection?.join()
131-
capture?.stop()
132-
if (!inferenceStarted) pipe?.close()
128+
val recording = capture
129+
val output = pipe
130+
try {
131+
val selection = synchronized(this) { inputSelection }
132+
selection?.cancel()
133+
selection?.join()
134+
recording?.stop()
135+
} finally {
136+
// Recognition can start after Stop and still needs the captured PCM pipe.
137+
if (recording?.hasStarted != true) output?.close()
138+
}
133139
}
134140

135141
fun status() = mapOf(

‎apps/mobile/modules/t3-voice-transcription/android/src/test/java/expo/modules/t3voicetranscription/LiveVoiceRecorderTest.kt‎

Lines changed: 83 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
package expo.modules.t3voicetranscription
22

3+
import android.content.Context
34
import android.media.AudioRecord
5+
import android.os.ParcelFileDescriptor
46
import com.facebook.react.bridge.BridgeReactContext
57
import expo.modules.kotlin.AppContext
68
import expo.modules.kotlin.ModulesProvider
79
import expo.modules.kotlin.modules.Module
10+
import java.io.File
811
import java.lang.ref.WeakReference
12+
import kotlinx.coroutines.CoroutineStart
13+
import kotlinx.coroutines.async
14+
import kotlinx.coroutines.channels.Channel
915
import kotlinx.coroutines.test.runTest
1016
import org.junit.Assert.assertEquals
17+
import org.junit.Assert.assertFalse
18+
import org.junit.Assert.assertTrue
1119
import org.junit.Test
1220
import org.junit.runner.RunWith
1321
import org.robolectric.RobolectricTestRunner
@@ -18,7 +26,81 @@ import org.robolectric.util.ReflectionHelpers
1826
@RunWith(RobolectricTestRunner::class)
1927
@Config(manifest = Config.NONE, sdk = [31])
2028
class LiveVoiceRecorderTest {
29+
private class Source(private val failStop: Boolean = false) : PcmCaptureSource {
30+
override val capacityBytes = 32000
31+
val chunks = Channel<ByteArray>(Channel.UNLIMITED)
32+
val reading = Channel<Unit>(Channel.UNLIMITED)
33+
override fun start() = Unit
34+
override suspend fun read(buffer: ByteArray, blocking: Boolean): Int {
35+
reading.send(Unit)
36+
val chunk = if (blocking) chunks.receive() else chunks.tryReceive().getOrNull() ?: return 0
37+
chunk.copyInto(buffer)
38+
return chunk.size
39+
}
40+
override fun stop() {
41+
check(!failStop) { "The microphone could not stop." }
42+
}
43+
override fun release() = Unit
44+
}
45+
2146
@Test fun preparingAgainReleasesTheUnusedMicrophone() = runTest {
47+
withAppContext { context, appContext ->
48+
val recorder = LiveVoiceRecorder(context, appContext, this) {}
49+
try {
50+
recorder.prepare()
51+
val previous = ReflectionHelpers.getField<AudioRecord>(recorder, "audio")
52+
assertEquals(AudioRecord.STATE_INITIALIZED, previous.state)
53+
recorder.prepare()
54+
assertEquals(AudioRecord.STATE_UNINITIALIZED, previous.state)
55+
} finally {
56+
recorder.sharedObjectDidRelease()
57+
}
58+
}
59+
}
60+
61+
@Test fun stoppingBeforeInferencePreservesQueuedAudioAndClosesUnusedPipes() = runTest {
62+
withAppContext { context, appContext ->
63+
for (phase in listOf("prepared", "recording", "draining", "prepared-failure")) {
64+
val started = phase == "recording" || phase == "draining"
65+
val source = Source(phase == "prepared-failure")
66+
val pipe = PcmPipe.open()
67+
val reader = ReflectionHelpers.getField<ParcelFileDescriptor.AutoCloseInputStream>(
68+
pipe,
69+
"reader"
70+
)
71+
val file = File.createTempFile("recorder-stop-test-", ".pcm")
72+
val capture = LivePcmCapture(source, file, pipe, testScheduler.timeSource)
73+
val recorder = LiveVoiceRecorder(context, appContext, this) {}
74+
ReflectionHelpers.setField(recorder, "capture", capture)
75+
ReflectionHelpers.setField(recorder, "pipe", pipe)
76+
try {
77+
assertTrue(reader.fd.valid())
78+
if (started) {
79+
capture.start(this, 300.0) {}
80+
source.reading.receive()
81+
source.chunks.send(ByteArray(3200))
82+
source.reading.receive()
83+
val stopped = async(start = CoroutineStart.UNDISPATCHED) {
84+
if (phase == "draining") capture.stop() else recorder.stop()
85+
}
86+
source.chunks.send(byteArrayOf(1, 2))
87+
stopped.await()
88+
if (phase == "draining") recorder.stop()
89+
assertFalse(capture.isFinished)
90+
} else {
91+
assertEquals(phase == "prepared-failure", runCatching { recorder.stop() }.isFailure)
92+
}
93+
assertEquals(started, reader.fd.valid())
94+
} finally {
95+
capture.cancel()
96+
recorder.sharedObjectDidRelease()
97+
file.delete()
98+
}
99+
}
100+
}
101+
}
102+
103+
private suspend fun withAppContext(block: suspend (Context, AppContext) -> Unit) {
22104
val context = RuntimeEnvironment.getApplication()
23105
val reactContext = BridgeReactContext(context)
24106
val appContext = AppContext(
@@ -28,15 +110,9 @@ class LiveVoiceRecorderTest {
28110
expo.modules.core.ModuleRegistry(emptyList(), emptyList()),
29111
WeakReference(reactContext)
30112
)
31-
val recorder = LiveVoiceRecorder(context, appContext, this) {}
32113
try {
33-
recorder.prepare()
34-
val previous = ReflectionHelpers.getField<AudioRecord>(recorder, "audio")
35-
assertEquals(AudioRecord.STATE_INITIALIZED, previous.state)
36-
recorder.prepare()
37-
assertEquals(AudioRecord.STATE_UNINITIALIZED, previous.state)
114+
block(context, appContext)
38115
} finally {
39-
recorder.sharedObjectDidRelease()
40116
appContext.javaClass.declaredMethods.first {
41117
it.name.startsWith("onDestroy") && it.parameterCount == 0
42118
}

0 commit comments

Comments
 (0)