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.

Sign up for GitHub

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

Jump to bottom

Update custom-audio-driver sample #47

Merged
merged 1 commit into from
Nov 6, 2017
Merged

Update custom-audio-driver sample #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
102 changes: 63 additions & 39 deletions Custom-Audio-Driver/Custom-Audio-Driver/DefaultAudioDevice.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,14 @@ class DefaultAudioDevice: NSObject {
var recordingAudioUnitPropertyLatency: Float64 = 0
var playoutDelay: UInt32 = 0
var playing = false
var playbackRequested = false
var playoutInitialized = false
var recording = false
var recordingRequested = false
var recordingInitialized = false
var interruptedPlayback = false
var isRecorderInterrupted = false
var isPlayerInterrupted = false
var isResetting = false
var restartRetryCount = 0
fileprivate var recordingVoiceUnit: AudioUnit?
fileprivate var playoutVoiceUnit: AudioUnit?

Expand All @@ -60,10 +65,6 @@ class DefaultAudioDevice: NSObject {
var areListenerBlocksSetup = false
var streamFormat = AudioStreamBasicDescription()

static let sharedInstance: DefaultAudioDevice = {
return DefaultAudioDevice()
}()

override init() {
audioFormat.sampleRate = DefaultAudioDevice.kSampleRate
audioFormat.numChannels = 1
Expand All @@ -81,33 +82,45 @@ class DefaultAudioDevice: NSObject {
}
}

fileprivate func doRestartAudio(numberOfAttempts: Int) {
if numberOfAttempts <= 0 {
print("Error restarting audio")
return
fileprivate func restartAudioAfterInterruption() {
if isRecorderInterrupted {
if startCapture() {
isRecorderInterrupted = false
restartRetryCount = 0
} else {
restartRetryCount += 1
if restartRetryCount < 3 {
safetyQueue.asyncAfter(deadline: DispatchTime.now(), execute: { [unowned self] in
self.restartAudioAfterInterruption()
})
} else {
isRecorderInterrupted = false
isPlayerInterrupted = false
restartRetryCount = 0
print("ERROR[OpenTok]:Unable to acquire audio session")
}
}
}
if isPlayerInterrupted {
isPlayerInterrupted = false
let _ = startRendering()
}
}

fileprivate func doRestartAudio(numberOfAttempts: Int) {

var success = true
if recordingRequested {
success = success && stopCapture()
if recording {
let _ = stopCapture()
disposeAudioUnit(audioUnit: &recordingVoiceUnit)
success = success && startCapture()
let _ = startCapture()
}

if playbackRequested {
success = success && self.stopRendering()
if playing {
let _ = self.stopRendering()
disposeAudioUnit(audioUnit: &playoutVoiceUnit)
success = success && self.startRendering()
}

if success {
recordingRequested = false
playbackRequested = false
} else {
safetyQueue.asyncAfter(deadline: .now() + 1, execute: {
self.doRestartAudio(numberOfAttempts: numberOfAttempts - 1)
})
let _ = self.startRendering()
}
isResetting = false
}

fileprivate func setupAudioUnit(withPlayout playout: Bool) -> Bool {
Expand Down Expand Up @@ -156,13 +169,21 @@ class DefaultAudioDevice: NSObject {
AudioUnitSetProperty(playoutVoiceUnit!, kAudioUnitProperty_StreamFormat,
kAudioUnitScope_Input, DefaultAudioDevice.kOutputBus, &streamFormat,
UInt32(MemoryLayout<AudioStreamBasicDescription>.size))
// Disable Input on playout
var enableInput = 0
AudioUnitSetProperty(playoutVoiceUnit!, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Input,
DefaultAudioDevice.kInputBus, &enableInput, UInt32(MemoryLayout<UInt32>.size))
} else {
AudioUnitSetProperty(recordingVoiceUnit!, kAudioOutputUnitProperty_EnableIO,
kAudioUnitScope_Input, DefaultAudioDevice.kInputBus, &value,
UInt32(MemoryLayout<UInt32>.size))
AudioUnitSetProperty(recordingVoiceUnit!, kAudioUnitProperty_StreamFormat,
kAudioUnitScope_Output, DefaultAudioDevice.kInputBus, &streamFormat,
UInt32(MemoryLayout<AudioStreamBasicDescription>.size))
// Disable Output on record
var enableOutput = 0
AudioUnitSetProperty(recordingVoiceUnit!, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Output,
DefaultAudioDevice.kOutputBus, &enableOutput, UInt32(MemoryLayout<UInt32>.size))
}

if playout {
Expand Down Expand Up @@ -261,7 +282,7 @@ extension DefaultAudioDevice: OTAudioDevice {
return true
}
func renderingIsInitialized() -> Bool {
return true
return playoutInitialized
}
func isRendering() -> Bool {
return playing
Expand All @@ -279,15 +300,19 @@ extension DefaultAudioDevice: OTAudioDevice {
return true
}
func captureIsInitialized() -> Bool {
return true
return recordingInitialized
}

func initializeRendering() -> Bool {
return !playing
if playing { return false }

playoutInitialized = true
return playoutInitialized
}

func startRendering() -> Bool {
if playing { return true }
playing = true
if playoutVoiceUnit == nil {
playing = setupAudioUnit(withPlayout: true)
if !playing {
Expand Down Expand Up @@ -317,7 +342,7 @@ extension DefaultAudioDevice: OTAudioDevice {
return false
}

if !recording && !recordingRequested {
if !recording && !isPlayerInterrupted && !isResetting {
tearDownAudio()
}

Expand All @@ -326,7 +351,10 @@ extension DefaultAudioDevice: OTAudioDevice {


func initializeCapture() -> Bool {
return !recording
if recording { return false }

recordingInitialized = true
return recordingInitialized
}

func startCapture() -> Bool {
Expand Down Expand Up @@ -367,7 +395,7 @@ extension DefaultAudioDevice: OTAudioDevice {

freeupAudioBuffers()

if !recording && !recordingRequested {
if !recording && !isRecorderInterrupted && !isResetting {
tearDownAudio()
}

Expand All @@ -392,17 +420,17 @@ extension DefaultAudioDevice {

switch UInt(interruptionType) {
case AVAudioSessionInterruptionType.began.rawValue:
recordingRequested = recording
playbackRequested = playing
if recording {
isRecorderInterrupted = true
let _ = stopCapture()
}
if playing {
isPlayerInterrupted = true
let _ = stopRendering()
}
case AVAudioSessionInterruptionType.ended.rawValue:
configureAudioSessionWithDesiredAudioRoute(desiredAudioRoute: DefaultAudioDevice.kAudioDeviceBluetooth)
restartAudio()
restartAudioAfterInterruption()
default:
break
}
Expand Down Expand Up @@ -450,8 +478,6 @@ extension DefaultAudioDevice {
return
}

recordingRequested = recording
playbackRequested = playing
restartAudio()
}
}
Expand Down Expand Up @@ -488,8 +514,6 @@ extension DefaultAudioDevice {
avAudioSessionPreffSampleRate = session.preferredSampleRate
avAudioSessionChannels = session.inputNumberOfChannels
do {


try session.setPreferredSampleRate(Double(DefaultAudioDevice.kSampleRate))
try session.setPreferredIOBufferDuration(0.01)
let audioOptions = AVAudioSessionCategoryOptions.mixWithOthers.rawValue |
Expand Down
2 changes: 1 addition & 1 deletion Custom-Audio-Driver/Custom-Audio-Driver/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ViewController: UIViewController {

var publisher: OTPublisher?
var subscriber: OTSubscriber?
let customAudioDevice = DefaultAudioDevice.sharedInstance
let customAudioDevice = DefaultAudioDevice()

// Change to `false` to subscribe to streams other than your own.
var subscribeToSelf = false
Expand Down