Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[iOS] Respond to AudioSession interruption and resume
https://bugs.webkit.org/show_bug.cgi?id=173718 <rdar://problem/32925263> Reviewed by Youenn Fablet. Tested manually. * WebCore.xcodeproj/project.pbxproj: Add CoreAudioCaptureSourceIOS.mm/.h * platform/mediastream/RealtimeMediaSource.h: Make createWeakPtr protected so derived classes can use it. * platform/mediastream/ios/CoreAudioCaptureSourceIOS.h: Added. * platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm: Added. (-[WebCoreAudioCaptureSourceIOSListener initWithCallback:]): (-[WebCoreAudioCaptureSourceIOSListener invalidate]): (-[WebCoreAudioCaptureSourceIOSListener handleInterruption:]): (-[WebCoreAudioCaptureSourceIOSListener sessionMediaServicesWereReset:]): (WebCore::CoreAudioCaptureSourceIOS::CoreAudioCaptureSourceIOS): (WebCore::CoreAudioCaptureSourceIOS::~CoreAudioCaptureSourceIOS): * platform/mediastream/mac/CoreAudioCaptureSource.cpp: (WebCore::CoreAudioSharedUnit::suspended): (WebCore::CoreAudioSharedUnit::setupAudioUnit): Clear m_suspended. (WebCore::CoreAudioSharedUnit::suspend): Don't clear sources or uninitialize the audio unit, suspend is temporary. Set m_suspended. (WebCore::CoreAudioSharedUnit::resume): New, restart the audio unit. (WebCore::CoreAudioCaptureSource::create): Create the correct object. (WebCore::CoreAudioCaptureSource::scheduleReconfiguration): Dispatch to main thread if necessary. (WebCore::CoreAudioCaptureSource::beginInterruption): New, suspend from main thread. (WebCore::CoreAudioCaptureSource::endInterruption): New, resume/reconfigure from main thread. (WebCore::CoreAudioCaptureSource::interrupted): * platform/mediastream/mac/CoreAudioCaptureSource.h: Canonical link: https://commits.webkit.org/190629@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@218746 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
1 parent
dc8c02e
commit 222633f
Showing
7 changed files
with
405 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
Source/WebCore/platform/mediastream/ios/CoreAudioCaptureSourceIOS.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright (C) 2017 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | ||
| * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | ||
| * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
| * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
| * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | ||
| * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #if ENABLE(MEDIA_STREAM) && PLATFORM(IOS) | ||
|
|
||
| #include "CoreAudioCaptureSource.h" | ||
|
|
||
| OBJC_CLASS WebCoreAudioCaptureSourceIOSListener; | ||
|
|
||
| namespace WebCore { | ||
|
|
||
| class CoreAudioCaptureSourceIOS final : public CoreAudioCaptureSource { | ||
| private: | ||
| friend class CoreAudioCaptureSource; | ||
|
|
||
| CoreAudioCaptureSourceIOS(const String& deviceID, const String& label); | ||
| ~CoreAudioCaptureSourceIOS(); | ||
|
|
||
| RetainPtr<WebCoreAudioCaptureSourceIOSListener> m_listener; | ||
| }; | ||
|
|
||
| } // namespace WebCore | ||
|
|
||
| #endif // ENABLE(MEDIA_STREAM) |
139 changes: 139 additions & 0 deletions
139
Source/WebCore/platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| /* | ||
| * Copyright (C) 2017 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | ||
| * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | ||
| * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | ||
| * THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include "config.h" | ||
| #include "CoreAudioCaptureSourceIOS.h" | ||
|
|
||
| #if ENABLE(MEDIA_STREAM) && PLATFORM(IOS) | ||
|
|
||
| #import "Logging.h" | ||
| #import "SoftLinking.h" | ||
| #import <AVFoundation/AVAudioSession.h> | ||
| #import <wtf/MainThread.h> | ||
|
|
||
| typedef AVAudioSession AVAudioSessionType; | ||
|
|
||
| SOFT_LINK_FRAMEWORK(AVFoundation) | ||
| SOFT_LINK_CLASS(AVFoundation, AVAudioSession) | ||
|
|
||
| SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionNotification, NSString *) | ||
| SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionTypeKey, NSString *) | ||
| SOFT_LINK_POINTER(AVFoundation, AVAudioSessionMediaServicesWereResetNotification, NSString *) | ||
|
|
||
| #define AVAudioSession getAVAudioSessionClass() | ||
| #define AVAudioSessionInterruptionNotification getAVAudioSessionInterruptionNotification() | ||
| #define AVAudioSessionInterruptionTypeKey getAVAudioSessionInterruptionTypeKey() | ||
| #define AVAudioSessionMediaServicesWereResetNotification getAVAudioSessionMediaServicesWereResetNotification() | ||
|
|
||
| using namespace WebCore; | ||
|
|
||
| @interface WebCoreAudioCaptureSourceIOSListener : NSObject { | ||
| CoreAudioCaptureSourceIOS* _callback; | ||
| } | ||
|
|
||
| - (void)invalidate; | ||
| - (void)handleInterruption:(NSNotification*)notification; | ||
| - (void)sessionMediaServicesWereReset:(NSNotification*)notification; | ||
| @end | ||
|
|
||
| @implementation WebCoreAudioCaptureSourceIOSListener | ||
| - (id)initWithCallback:(CoreAudioCaptureSourceIOS*)callback | ||
| { | ||
| self = [super init]; | ||
| if (!self) | ||
| return nil; | ||
|
|
||
| _callback = callback; | ||
|
|
||
| NSNotificationCenter* center = [NSNotificationCenter defaultCenter]; | ||
| AVAudioSessionType* session = [AVAudioSession sharedInstance]; | ||
|
|
||
| [center addObserver:self selector:@selector(handleInterruption:) name:AVAudioSessionInterruptionNotification object:session]; | ||
| [center addObserver:self selector:@selector(sessionMediaServicesWereReset:) name:AVAudioSessionMediaServicesWereResetNotification object:session]; | ||
|
|
||
| return self; | ||
| } | ||
|
|
||
| - (void)invalidate | ||
| { | ||
| _callback = nullptr; | ||
| [[NSNotificationCenter defaultCenter] removeObserver:self]; | ||
| } | ||
|
|
||
| - (void)handleInterruption:(NSNotification*)notification | ||
| { | ||
| ASSERT(_callback); | ||
| if (!_callback) | ||
| return; | ||
|
|
||
| if ([[notification.userInfo valueForKey:AVAudioSessionInterruptionTypeKey] intValue] == AVAudioSessionInterruptionTypeBegan) { | ||
| _callback->beginInterruption(); | ||
| return; | ||
| } | ||
|
|
||
| if ([[notification.userInfo valueForKey:AVAudioSessionInterruptionTypeKey] intValue] == AVAudioSessionInterruptionTypeEnded) { | ||
| NSError *error = nil; | ||
| [[AVAudioSession sharedInstance] setActive:YES error:&error]; | ||
|
|
||
| #if !LOG_DISABLED | ||
| if (error) | ||
| LOG(Media, "-[WebCoreAudioCaptureSourceIOSListener handleInterruption] (%p) - error = %s", self, [[error localizedDescription] UTF8String]); | ||
| #endif | ||
|
|
||
| _callback->endInterruption(); | ||
| } | ||
| } | ||
|
|
||
| - (void)sessionMediaServicesWereReset:(NSNotification*)notification | ||
| { | ||
| UNUSED_PARAM(notification); | ||
| ASSERT(_callback); | ||
|
|
||
| if (!_callback) | ||
| return; | ||
|
|
||
| // mediaserverd crashed and was relaunched, rebuild everything. See | ||
| // https://developer.apple.com/library/content/qa/qa1749/_index.html. | ||
| _callback->scheduleReconfiguration(); | ||
| } | ||
| @end | ||
|
|
||
| namespace WebCore { | ||
|
|
||
| CoreAudioCaptureSourceIOS::CoreAudioCaptureSourceIOS(const String& deviceID, const String& label) | ||
| : CoreAudioCaptureSource(deviceID, label, 0) | ||
| , m_listener(adoptNS([[WebCoreAudioCaptureSourceIOSListener alloc] initWithCallback:this])) | ||
| { | ||
| } | ||
|
|
||
| CoreAudioCaptureSourceIOS::~CoreAudioCaptureSourceIOS() | ||
| { | ||
| [m_listener invalidate]; | ||
| m_listener = nullptr; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| #endif // ENABLE(MEDIA_STREAM) && PLATFORM(IOS) |
Oops, something went wrong.