Mute Audio Default Setting (#268)

* Implement default setting to start recordings muted or with audio * use new .withAudioEnabled API * Rename Mute Audio usages to default positive * audio uistate --------- Co-authored-by: Jaehwa Noh <shwoghk14@gmail.com>
google · Jan 21, 2025 · ebddf33 · ebddf33
1 parent e610e53
commit ebddf33
Show file tree

Hide file tree

Showing 26 changed files with 682 additions and 74 deletions.
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSession.kt
@@ -694,7 +694,7 @@ private fun getPendingRecording(
 
 context(CameraSessionContext)
 private suspend fun startVideoRecordingInternal(
-    initialMuted: Boolean,
+    isInitialAudioEnabled: Boolean,
     context: Context,
     pendingRecord: PendingRecording,
     maxDurationMillis: Long,
@@ -712,14 +712,15 @@ private suspend fun startVideoRecordingInternal(
     // if the video recording isn't started with audio enabled, you will not be able to un-mute it
     // the toggle should only affect whether or not the audio is muted.
     // the permission will determine whether or not the audio is enabled.
-    val audioEnabled = checkSelfPermission(
+    val isAudioGranted = checkSelfPermission(
         context,
         Manifest.permission.RECORD_AUDIO
     ) == PackageManager.PERMISSION_GRANTED
 
     pendingRecord.apply {
-        if (audioEnabled) {
-            withAudioEnabled()
+        if (isAudioGranted) {
+            Log.d(TAG, "INITIAL AUDIO $isInitialAudioEnabled")
+            withAudioEnabled(isInitialAudioEnabled)
         }
     }
         .asPersistentRecording()
@@ -859,7 +860,7 @@ private suspend fun startVideoRecordingInternal(
             }
         }
     }.apply {
-        mute(initialMuted)
+        mute(!isInitialAudioEnabled)
     }
 }
 
@@ -887,7 +888,7 @@ private suspend fun runVideoRecording(
         onVideoRecord
     )?.let {
         startVideoRecordingInternal(
-            initialMuted = currentSettings.isAudioMuted,
+            isInitialAudioEnabled = currentSettings.isAudioEnabled,
             context = context,
             pendingRecord = it,
             maxDurationMillis = maxDurationMillis,
@@ -898,8 +899,8 @@ private suspend fun runVideoRecording(
 
                 transientSettings.filterNotNull()
                     .collectLatest { newTransientSettings ->
-                        if (currentSettings.isAudioMuted != newTransientSettings.isAudioMuted) {
-                            recording.mute(newTransientSettings.isAudioMuted)
+                        if (currentSettings.isAudioEnabled != newTransientSettings.isAudioEnabled) {
+                            recording.mute(newTransientSettings.isAudioEnabled)
                         }
                         if (currentSettings.isFlashModeOn() !=
                             newTransientSettings.isFlashModeOn()

diff --git a/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSessionSettings.kt b/core/camera/src/main/java/com/google/jetpackcamera/core/camera/CameraSessionSettings.kt
@@ -60,7 +60,7 @@ internal sealed interface PerpetualSessionSettings {
  * The use cases typically will not need to be re-bound.
  */
 internal data class TransientSessionSettings(
-    val isAudioMuted: Boolean,
+    val isAudioEnabled: Boolean,
     val deviceRotation: DeviceRotation,
     val flashMode: FlashMode,
     val zoomScale: Float,