admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves threading issues when audio is interrupted on iOS.

Browse Source 
Before this change we could crash in Debug when WebRTC audio was first
interrupted and then resumed again. The reason was that the new audio
stream stems from a new native I/O thread and that triggered thread
checkers. With this change, failing thread checkers are detached when
audio is interrupted to ensure that they don't fail when audio is restarted.

NOTRY=TRUE

Bug: webrtc:8126
Change-Id: Ib36ff6bc942477730aba60066f049ed0c43d3901
Reviewed-on: https://chromium-review.googlesource.com/628716
Commit-Queue: Henrik Andreasson <henrika@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19465}
This commit is contained in:
henrika 2017-08-23 15:04:40 +02:00 committed by Commit Bot
parent cca0006e33
commit 09a76193f5
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/audio_device/audio_device_buffer.cc
View File

@ -260,6 +260,12 @@ int32_t AudioDeviceBuffer::SetTypingStatus(bool typing_status) {
return 0; return 0;
} }
void AudioDeviceBuffer::NativeAudioInterrupted() {
RTC_DCHECK(main_thread_checker_.CalledOnValidThread());
playout_thread_checker_.DetachFromThread();
recording_thread_checker_.DetachFromThread();
}
uint32_t AudioDeviceBuffer::NewMicLevel() const { uint32_t AudioDeviceBuffer::NewMicLevel() const {
RTC_DCHECK_RUN_ON(&recording_thread_checker_); RTC_DCHECK_RUN_ON(&recording_thread_checker_);
return new_mic_level_; return new_mic_level_;

6
webrtc/modules/audio_device/audio_device_buffer.h
View File

@ -118,6 +118,12 @@ class AudioDeviceBuffer {
int32_t SetTypingStatus(bool typing_status); int32_t SetTypingStatus(bool typing_status);
// Called on iOS where the native audio layer can be interrupted by other
// audio applications. This method can then be used to reset internal
// states and detach thread checkers to allow for a new audio session where
// native callbacks may come from a new set of I/O threads.
void NativeAudioInterrupted();
private: private:
// Starts/stops periodic logging of audio stats. // Starts/stops periodic logging of audio stats.
void StartPeriodicLogging(); void StartPeriodicLogging();

9
webrtc/modules/audio_device/ios/audio_device_ios.mm
View File

@ -554,6 +554,15 @@ void AudioDeviceIOS::HandleInterruptionBegin() {
RTCLog(@"Stopping the audio unit due to interruption begin."); RTCLog(@"Stopping the audio unit due to interruption begin.");
if (!audio_unit_->Stop()) { if (!audio_unit_->Stop()) {
RTCLogError(@"Failed to stop the audio unit for interruption begin."); RTCLogError(@"Failed to stop the audio unit for interruption begin.");
} else {
// The audio unit has been stopped but will be restarted when the
// interruption ends in HandleInterruptionEnd(). It will result in audio
// callbacks from a new native I/O thread which means that we must detach
// thread checkers here to be prepared for an upcoming new audio stream.
io_thread_checker_.DetachFromThread();
// The audio device buffer must also be informed about the interrupted
// state so it can detach its thread checkers as well.
audio_device_buffer_->NativeAudioInterrupted();
} }
} }
is_interrupted_ = true; is_interrupted_ = true;