Add audio level monitor

Author: ReneeVandervelde

android-application/src/main/java/com/inkapplications/ack/android/capture/CaptureEvents.kt

@@ -14,12 +14,15 @@ import com.inkapplications.ack.structures.*
 import com.inkapplications.android.extensions.control.ControlState
 import com.inkapplications.coroutines.combinePair
 import com.inkapplications.coroutines.combineTriple
+import inkapplications.spondee.scalar.WholePercentage
+import inkapplications.spondee.structure.value
 import kimchi.logger.KimchiLogger
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.coroutines.coroutineContext
+import kotlin.math.roundToInt
 import kotlin.time.ExperimentalTime
 
 @Singleton
@@ -92,6 +95,9 @@ class CaptureEvents @Inject constructor(
         .combine(internetTransmitControlState) { viewModel, transmit ->
             viewModel.copy(internetTransmitState = transmit)
         }
+        .combine(drivers.afskDriver.volume) { viewModel, volume ->
+            viewModel.copy(audioLevel = "${volume?.value(WholePercentage)?.roundToInt()}%")
+        }
 
     suspend fun connectAudio() {
         coroutineScope {

android-application/src/main/java/com/inkapplications/ack/android/capture/CaptureScreen.kt

@@ -209,7 +209,7 @@ private fun CaptureSettingsSheet(
         CaptureSettingRow(
             icon = Icons.Filled.Mic,
             iconColor = AckTheme.colors.brand,
-            name = stringResource(R.string.capture_controls_audio_capture_enabled_name),
+            name = stringResource(R.string.capture_controls_audio_capture_enabled_name, captureScreenState.audioLevel),
             onClick = captureController::onAudioCaptureDisableClick
         )
     }

android-application/src/main/java/com/inkapplications/ack/android/capture/CaptureScreenViewModel.kt

@@ -4,6 +4,7 @@ import com.inkapplications.android.extensions.control.ControlState
 
 data class CaptureScreenViewModel(
     val audioCaptureState: ControlState = ControlState.Hidden,
+    val audioLevel: String = "",
     val internetCaptureState: ControlState = ControlState.Hidden,
     val internetTransmitState: ControlState = ControlState.Hidden,
     val audioTransmitState: ControlState = ControlState.Hidden,

android-application/src/main/res/values/capture.xml

@@ -7,7 +7,7 @@
     <string name="capture_controls_expand_action">Controls</string>
     <string name="capture_controls_collapse_action">Close</string>
     <string name="capture_controls_audio_capture_disabled_name">Audio Capture Disabled</string>
-    <string name="capture_controls_audio_capture_enabled_name">Audio Capture Enabled</string>
+    <string name="capture_controls_audio_capture_enabled_name">Audio Capture Enabled (level: %s)</string>
     <string name="capture_controls_audio_transmit_disabled_name">Audio Transmit Disabled</string>
     <string name="capture_controls_audio_transmit_enabled_name">Audio Transmit Enabled</string>
     <string name="capture_controls_internet_capture_disabled_name">Internet Capture Disabled</string>

aprs-android/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"  package="com.inkapplications.ack.data" >
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 </manifest>

aprs-android/src/main/java/com/inkapplications/ack/data/AudioDataCapture.kt

@@ -24,7 +24,7 @@ internal class AudioDataCapture(
 ) {
     private val recorder: AudioRecord by lazy {
         AudioRecord(
-            MediaRecorder.AudioSource.DEFAULT,
+            MediaRecorder.AudioSource.MIC,
             SAMPLE_RATE,
             AudioFormat.CHANNEL_IN_MONO,
             AudioFormat.ENCODING_PCM_16BIT,

aprs-android/src/main/java/com/inkapplications/ack/data/AudioDataProcessor.kt

@@ -1,7 +1,11 @@
 package com.inkapplications.ack.data
 
+import inkapplications.spondee.scalar.DecimalPercentage
+import inkapplications.spondee.scalar.Percentage
 import kotlinx.coroutines.channels.consumeEach
-import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.*
+import kotlin.math.abs
+import kotlin.math.absoluteValue
 
 private const val overlap = 18
 
@@ -24,11 +28,18 @@ internal class AudioDataProcessor(
 
         invokeOnClose {
             audioIn.cancel()
+            peak.value = null
         }
         audioIn.audioData.consumeEach { decode(it) }
     }
 
-    fun decode(audioData: ShortArray) {
+    private val peak = MutableStateFlow<Short?>(null)
+    val volume: Flow<Percentage?> = peak.map {
+        it?.toDouble()?.absoluteValue?.div(Short.MAX_VALUE)?.let(DecimalPercentage::of)
+    }
+
+    private fun decode(audioData: ShortArray) {
+        peak.value = audioData.maxOf { abs(it.toInt()) }.toShort()
         for (i in audioData.indices) {
             fbuf[fbuf_cnt++] = audioData[i] * (1.0f / 32768.0f)
         }

aprs-android/src/main/java/com/inkapplications/ack/data/drivers/AfskDriver.kt

@@ -11,21 +11,20 @@ import com.inkapplications.coroutines.combinePair
 import kimchi.logger.KimchiLogger
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 
-internal class AfskDriver(
+class AfskDriver internal constructor(
     private val aprsCodec: AprsCodec,
     private val packetStorage: PacketStorage,
     private val audioProcessor: AudioDataProcessor,
     private val modulator: AndroidAfskModulator,
     private val settings: DriverSettingsProvider,
     private val logger: KimchiLogger,
-): PacketDriver {
+): PacketDriver, AudioConnectionMonitor {
     override val incoming = MutableSharedFlow<CapturedPacket>()
     override val receivePermissions: Set<String> = setOf(Manifest.permission.RECORD_AUDIO)
+    override val volume = audioProcessor.volume
     private val transmitQueue = MutableSharedFlow<ByteArray>(extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
 
     override suspend fun transmitPacket(packet: AprsPacket, encodingConfig: EncodingConfig) {

aprs-android/src/main/java/com/inkapplications/ack/data/drivers/AudioConnectionMonitor.kt

@@ -0,0 +1,8 @@
+package com.inkapplications.ack.data.drivers
+
+import inkapplications.spondee.scalar.Percentage
+import kotlinx.coroutines.flow.Flow
+
+interface AudioConnectionMonitor {
+    val volume: Flow<Percentage?>
+}

aprs-android/src/main/java/com/inkapplications/ack/data/drivers/InternetDriver.kt

@@ -18,7 +18,7 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 
-internal class InternetDriver(
+class InternetDriver internal constructor(
     private val aprsCodec: AprsCodec,
     private val packetStorage: PacketStorage,
     private val client: AprsDataClient,