Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Legacy mic mute mode #582

Merged
merged 5 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ let package = Package(
],
dependencies: [
// LK-Prefixed Dynamic WebRTC XCFramework
.package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "125.6422.17"),
.package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "125.6422.18"),
.package(url: "https://github.com/apple/swift-protobuf.git", from: "1.26.0"),
.package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
// Only used for DocC generation
Expand Down
2 changes: 1 addition & 1 deletion [email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let package = Package(
],
dependencies: [
// LK-Prefixed Dynamic WebRTC XCFramework
.package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "125.6422.17"),
.package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "125.6422.18"),
.package(url: "https://github.com/apple/swift-protobuf.git", from: "1.26.0"),
.package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
// Only used for DocC generation
Expand Down
25 changes: 25 additions & 0 deletions Sources/LiveKit/Track/AudioManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@
public var localTracksCount: Int = 0
public var remoteTracksCount: Int = 0
public var isSpeakerOutputPreferred: Bool = true
public var customConfigureFunc: ConfigureAudioSessionFunc?

Check warning on line 104 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-15, 16.2, macOS,variant=Mac Catalyst)

'ConfigureAudioSessionFunc' is deprecated

Check warning on line 104 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-15, 16.2, iOS Simulator,OS=18.1,name=iPhone 16 Pro)

'ConfigureAudioSessionFunc' is deprecated

Check warning on line 104 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, tvOS Simulator,name=Apple TV)

'ConfigureAudioSessionFunc' is deprecated

Check warning on line 104 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, macOS,variant=Mac Catalyst)

'ConfigureAudioSessionFunc' is deprecated

Check warning on line 104 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, macOS,variant=Mac Catalyst)

'ConfigureAudioSessionFunc' is deprecated

Check warning on line 104 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, tvOS Simulator,name=Apple TV)

'ConfigureAudioSessionFunc' is deprecated

Check warning on line 104 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, visionOS Simulator,name=Apple Vision Pro)

'ConfigureAudioSessionFunc' is deprecated

Check warning on line 104 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, visionOS Simulator,name=Apple Vision Pro)

'ConfigureAudioSessionFunc' is deprecated

Check warning on line 104 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, iOS Simulator,OS=17.5,name=iPhone 15 Pro)

'ConfigureAudioSessionFunc' is deprecated

Check warning on line 104 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, iOS Simulator,OS=17.5,name=iPhone 15 Pro)

'ConfigureAudioSessionFunc' is deprecated
public var sessionConfiguration: AudioSessionConfiguration?

public var trackState: TrackState {

Check warning on line 107 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-15, 16.2, macOS,variant=Mac Catalyst)

'TrackState' is deprecated

Check warning on line 107 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-15, 16.2, iOS Simulator,OS=18.1,name=iPhone 16 Pro)

'TrackState' is deprecated

Check warning on line 107 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, tvOS Simulator,name=Apple TV)

'TrackState' is deprecated

Check warning on line 107 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, macOS,variant=Mac Catalyst)

'TrackState' is deprecated

Check warning on line 107 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, macOS,variant=Mac Catalyst)

'TrackState' is deprecated

Check warning on line 107 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, tvOS Simulator,name=Apple TV)

'TrackState' is deprecated

Check warning on line 107 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, visionOS Simulator,name=Apple Vision Pro)

'TrackState' is deprecated

Check warning on line 107 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, visionOS Simulator,name=Apple Vision Pro)

'TrackState' is deprecated

Check warning on line 107 in Sources/LiveKit/Track/AudioManager.swift

View workflow job for this annotation

GitHub Actions / test (macos-14, 15.4, iOS Simulator,OS=17.5,name=iPhone 15 Pro)

'TrackState' is deprecated
switch (localTracksCount > 0, remoteTracksCount > 0) {
case (true, false): return .localOnly
case (false, true): return .remoteOnly
Expand Down Expand Up @@ -258,8 +258,33 @@
_state.mutate { $0.engineObservers = engineObservers }
}

/// Set to `true` to enable legacy mic mute mode.
///
/// - Default: Uses `AVAudioEngine`'s `isVoiceProcessingInputMuted` internally.
/// This is fast, and muted speaker detection works. However, iOS will play a sound effect.
/// - Legacy: Restarts the internal `AVAudioEngine` without mic input when muted.
/// This is slower, and muted speaker detection does not work. No sound effect is played.
public var isLegacyMuteMode: Bool {
get { RTC.audioDeviceModule.muteMode == .restartEngine }
set { RTC.audioDeviceModule.muteMode = newValue ? .restartEngine : .voiceProcessing }
}

// MARK: - For testing

var isEngineRunning: Bool {
RTC.audioDeviceModule.isEngineRunning
}

var isMicrophoneMuted: Bool {
get { RTC.audioDeviceModule.isMicrophoneMuted }
set { RTC.audioDeviceModule.isMicrophoneMuted = newValue }
}

var engineState: RTCAudioEngineState {
get { RTC.audioDeviceModule.engineState }
set { RTC.audioDeviceModule.engineState = newValue }
}

var isPlayoutInitialized: Bool {
RTC.audioDeviceModule.isPlayoutInitialized
}
Expand Down
174 changes: 174 additions & 0 deletions Tests/LiveKitTests/MuteTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
/*
* Copyright 2025 LiveKit
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

@testable import LiveKit
import LiveKitWebRTC
import XCTest

struct TestEngineTransition {
let outputEnabled: ValueOrAbsent<Bool>
let outputRunning: ValueOrAbsent<Bool>
let inputEnabled: ValueOrAbsent<Bool>
let inputRunning: ValueOrAbsent<Bool>
let legacyMuteMode: ValueOrAbsent<Bool>
let inputMuted: ValueOrAbsent<Bool>

init(outputEnabled: ValueOrAbsent<Bool> = .absent,
outputRunning: ValueOrAbsent<Bool> = .absent,
inputEnabled: ValueOrAbsent<Bool> = .absent,
inputRunning: ValueOrAbsent<Bool> = .absent,
legacyMuteMode: ValueOrAbsent<Bool> = .absent,
inputMuted: ValueOrAbsent<Bool> = .absent)
{
self.outputEnabled = outputEnabled
self.outputRunning = outputRunning
self.inputEnabled = inputEnabled
self.inputRunning = inputRunning
self.legacyMuteMode = legacyMuteMode
self.inputMuted = inputMuted
}
}

struct TestEngineAssert: Hashable {
let engineRunning: Bool
}

struct TestEngineStep {
let transition: TestEngineTransition
let assert: TestEngineAssert
}

extension RTCAudioEngineState: CustomStringConvertible {
public var description: String {
"EngineState(" +
"outputEnabled: \(outputEnabled), " +
"outputRunning: \(outputRunning), " +
"inputEnabled: \(inputEnabled), " +
"inputRunning: \(inputRunning), " +
"inputMuted: \(inputMuted), " +
"muteMode: \(muteMode)" +
")"
}
}

func applyEngineTransition(_ transition: TestEngineTransition) {
let adm = AudioManager.shared
var engineState = adm.engineState

if case let .value(value) = transition.outputEnabled {
engineState.outputEnabled = value
}

if case let .value(value) = transition.outputRunning {
engineState.outputRunning = value
}

if case let .value(value) = transition.inputEnabled {
engineState.inputEnabled = value
}

if case let .value(value) = transition.inputRunning {
engineState.inputRunning = value
}

if case let .value(value) = transition.inputMuted {
engineState.inputMuted = value
}

if case let .value(value) = transition.legacyMuteMode {
engineState.muteMode = value ? .restartEngine : .voiceProcessing
}

print("Testing engine state: \(engineState)")
adm.engineState = engineState
}

let standardEngineSteps: [TestEngineStep] = [
// Enable output
TestEngineStep(transition: .init(outputEnabled: .value(true)), assert: .init(engineRunning: false)),
TestEngineStep(transition: .init(outputRunning: .value(true)), assert: .init(engineRunning: true)),
// Enable input
TestEngineStep(transition: .init(inputEnabled: .value(true)), assert: .init(engineRunning: true)),
TestEngineStep(transition: .init(inputRunning: .value(true)), assert: .init(engineRunning: true)),
// Disable input
TestEngineStep(transition: .init(inputRunning: .value(false)), assert: .init(engineRunning: true)),
TestEngineStep(transition: .init(inputEnabled: .value(false)), assert: .init(engineRunning: true)),
// Disable output
TestEngineStep(transition: .init(outputRunning: .value(false)), assert: .init(engineRunning: false)),
TestEngineStep(transition: .init(outputEnabled: .value(false)), assert: .init(engineRunning: false)),
]

let muteEngineSteps: [TestEngineStep] = [
// Enable output
TestEngineStep(transition: .init(outputEnabled: .value(true)), assert: .init(engineRunning: false)),
TestEngineStep(transition: .init(outputRunning: .value(true)), assert: .init(engineRunning: true)),

// Enable input
TestEngineStep(transition: .init(inputEnabled: .value(true)), assert: .init(engineRunning: true)),
TestEngineStep(transition: .init(inputRunning: .value(true)), assert: .init(engineRunning: true)),

// Toggle mute
TestEngineStep(transition: .init(inputMuted: .value(true)), assert: .init(engineRunning: true)),
TestEngineStep(transition: .init(inputMuted: .value(false)), assert: .init(engineRunning: true)),

// Enable legacy mute mode
TestEngineStep(transition: .init(legacyMuteMode: .value(true)), assert: .init(engineRunning: true)),

// Disable output
TestEngineStep(transition: .init(outputRunning: .value(false)), assert: .init(engineRunning: true)),
TestEngineStep(transition: .init(outputEnabled: .value(false)), assert: .init(engineRunning: true)),

// Engine should shut down at this point
TestEngineStep(transition: .init(inputMuted: .value(true)), assert: .init(engineRunning: false)),

// Engine starts
TestEngineStep(transition: .init(inputMuted: .value(false)), assert: .init(engineRunning: true)),

// Enable output
TestEngineStep(transition: .init(outputEnabled: .value(true)), assert: .init(engineRunning: true)),
TestEngineStep(transition: .init(outputRunning: .value(true)), assert: .init(engineRunning: true)),

// Mute
TestEngineStep(transition: .init(inputMuted: .value(true)), assert: .init(engineRunning: true)),

// Disable input
TestEngineStep(transition: .init(inputRunning: .value(false)), assert: .init(engineRunning: true)),
TestEngineStep(transition: .init(inputEnabled: .value(false)), assert: .init(engineRunning: true)),

// Disable output
TestEngineStep(transition: .init(outputRunning: .value(false)), assert: .init(engineRunning: false)),
TestEngineStep(transition: .init(outputEnabled: .value(false)), assert: .init(engineRunning: false)),
]

class MuteTests: XCTestCase {
override func setUp() {
super.setUp()
continueAfterFailure = false
}

func testTransitions() async throws {
let adm = AudioManager.shared

for step in muteEngineSteps {
applyEngineTransition(step.transition)
// Check if engine running state is correct.
XCTAssert(adm.isEngineRunning == step.assert.engineRunning)

let ns = UInt64(1 * 1_000_000_000)
try await Task.sleep(nanoseconds: ns)
}
}
}
2 changes: 1 addition & 1 deletion Tests/LiveKitTests/Support/AudioRecorder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class AudioRecorder {
public let filePath: URL
private var audioFile: AVAudioFile?

init(sampleRate: Double = 16000, channels: Int = 1) throws {
init(sampleRate: Double = 48000, channels: Int = 1) throws {
self.sampleRate = sampleRate

let settings: [String: Any] = [
Expand Down
Loading