Add runtime logging to AudioSession and related classes #14432

eric-carlson · 2023-05-27T22:15:52Z

`cd55188`

Add runtime logging to AudioSession and related classes
https://bugs.webkit.org/show_bug.cgi?id=257431
rdar://109934372

Reviewed by Youenn Fablet.

* Source/WebCore/platform/audio/AudioSession.cpp:
(WebCore::AudioSession::tryToSetActive):
(WebCore::AudioSession::beginInterruption):
(WebCore::AudioSession::endInterruption):
(WebCore::AudioSession::setCategoryOverride):
(WebCore::AudioSession::logger):
(WebCore::AudioSession::logChannel const):
* Source/WebCore/platform/audio/AudioSession.h:
* Source/WebCore/platform/audio/ios/AudioSessionIOS.mm:
(WebCore::AudioSessionIOS::setHostProcessAttribution):
(WebCore::AudioSessionIOS::setPresentingProcesses):
(WebCore::AudioSessionIOS::setCategory):
(WebCore::AudioSessionIOS::setPreferredBufferSize):
* Source/WebCore/platform/audio/mac/AudioSessionMac.h:
* Source/WebCore/platform/audio/mac/AudioSessionMac.mm:
(WebCore::AudioSessionMac::audioOutputDeviceChanged):
(WebCore::AudioSessionMac::setIsPlayingToBluetoothOverride):
(WebCore::AudioSessionMac::setCategory):
(WebCore::AudioSessionMac::setPreferredBufferSize):
(WebCore::AudioSessionMac::logChannel const):
(WebCore::AudioSessionMac::logIdentifier const):
* Source/WebCore/platform/audio/mac/SharedRoutingArbitrator.h:
* Source/WebCore/platform/audio/mac/SharedRoutingArbitrator.mm:
(WebCore::SharedRoutingArbitrator::Token::logIdentifier const):
(WebCore::SharedRoutingArbitrator::beginRoutingArbitrationForToken):
(WebCore::SharedRoutingArbitrator::endRoutingArbitrationForToken):
(WebCore::SharedRoutingArbitrator::setLogger):
(WebCore::SharedRoutingArbitrator::logger):
(WebCore::SharedRoutingArbitrator::logChannel const):
* Source/WebKit/GPUProcess/mac/LocalAudioSessionRoutingArbitrator.cpp:
(WebKit::LocalAudioSessionRoutingArbitrator::LocalAudioSessionRoutingArbitrator):
(WebKit::LocalAudioSessionRoutingArbitrator::beginRoutingArbitrationWithCategory):
(WebKit::LocalAudioSessionRoutingArbitrator::logger):
(WebKit::LocalAudioSessionRoutingArbitrator::logChannel const):
(WebKit::LocalAudioSessionRoutingArbitrator::canLog const):
* Source/WebKit/GPUProcess/mac/LocalAudioSessionRoutingArbitrator.h:
* Source/WebKit/UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp:
(WebKit::AudioSessionRoutingArbitratorProxy::AudioSessionRoutingArbitratorProxy):
(WebKit::AudioSessionRoutingArbitratorProxy::logger):
(WebKit::AudioSessionRoutingArbitratorProxy::logChannel const):
* Source/WebKit/UIProcess/Media/AudioSessionRoutingArbitratorProxy.h:
(WebKit::AudioSessionRoutingArbitratorProxy::logIdentifier const):
(WebKit::AudioSessionRoutingArbitratorProxy::logClassName const):
* Source/WebKit/UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm:
(WebKit::AudioSessionRoutingArbitratorProxy::AudioSessionRoutingArbitratorProxy):
(WebKit::AudioSessionRoutingArbitratorProxy::beginRoutingArbitrationWithCategory):
(WebKit::AudioSessionRoutingArbitratorProxy::endRoutingArbitration):
* Source/WebKit/UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::WebProcessProxy):
(WebKit::m_routingArbitrator):
(WebKit::WebProcessProxy::setWebsiteDataStore):
(WebKit::WebProcessProxy::logger):
(WebKit::m_webPermissionController): Deleted.
* Source/WebKit/UIProcess/WebProcessProxy.h:
* Source/WebKit/WebProcess/cocoa/AudioSessionRoutingArbitrator.cpp:
(WebKit::m_logIdentifier):
(WebKit::AudioSessionRoutingArbitrator::canLog const):
* Source/WebKit/WebProcess/cocoa/AudioSessionRoutingArbitrator.h:

Canonical link: https://commits.webkit.org/264658@main

19da6f5

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	❌ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-05-27T22:18:56Z

EWS run on previous version of this PR (hash 3d8904a)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	❌ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	❌ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🛠 gtk
	❌ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	❌ 🧪 api-ios	❌ 🧪 mac-wk2	✅ 🧪 api-gtk
	❌ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	❌ 🛠 tv-sim	❌ 🧪 mac-wk2-stress
	❌ 🛠 watch
	❌ 🛠 watch-sim

webkit-early-warning-system · 2023-05-28T03:27:21Z

Starting EWS tests for d3449d7. Live statuses available at the PR page, #14432

webkit-early-warning-system · 2023-05-28T03:27:21Z

EWS run on previous version of this PR (hash d3449d7)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	❌ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	~~🧪 gtk-wk2~~
⏳ 🛠 🧪 jsc	✅ 🧪 api-ios	❌ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	❌ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim	❌ 🧪 mac-wk2-stress
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-05-28T03:58:28Z

Starting EWS tests for 3427a93. Live statuses available at the PR page, #14432

webkit-early-warning-system · 2023-05-28T03:58:29Z

EWS run on previous version of this PR (hash 3427a93)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	❌ 🧪 mac-wk2	❌ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim	❌ 🧪 mac-wk2-stress
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-05-28T14:09:12Z

EWS run on previous version of this PR (hash bccdbf9)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	❌ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	❌ 🧪 mac-wk1	✅ 🧪 gtk-wk2
	✅ 🧪 api-ios	❌ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim	❌ 🧪 mac-wk2-stress
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-05-28T16:57:55Z

EWS run on current version of this PR (hash 19da6f5)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🛠 gtk
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	❌ 🧪 gtk-wk2
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2
	✅ 🛠 tv-sim
✅ 🛠 🧪 merge	✅ 🛠 watch
	✅ 🛠 watch-sim

Source/WebCore/platform/audio/ios/AudioSessionIOS.mm

https://bugs.webkit.org/show_bug.cgi?id=257431 rdar://109934372 Reviewed by Youenn Fablet. * Source/WebCore/platform/audio/AudioSession.cpp: (WebCore::AudioSession::tryToSetActive): (WebCore::AudioSession::beginInterruption): (WebCore::AudioSession::endInterruption): (WebCore::AudioSession::setCategoryOverride): (WebCore::AudioSession::logger): (WebCore::AudioSession::logChannel const): * Source/WebCore/platform/audio/AudioSession.h: * Source/WebCore/platform/audio/ios/AudioSessionIOS.mm: (WebCore::AudioSessionIOS::setHostProcessAttribution): (WebCore::AudioSessionIOS::setPresentingProcesses): (WebCore::AudioSessionIOS::setCategory): (WebCore::AudioSessionIOS::setPreferredBufferSize): * Source/WebCore/platform/audio/mac/AudioSessionMac.h: * Source/WebCore/platform/audio/mac/AudioSessionMac.mm: (WebCore::AudioSessionMac::audioOutputDeviceChanged): (WebCore::AudioSessionMac::setIsPlayingToBluetoothOverride): (WebCore::AudioSessionMac::setCategory): (WebCore::AudioSessionMac::setPreferredBufferSize): (WebCore::AudioSessionMac::logChannel const): (WebCore::AudioSessionMac::logIdentifier const): * Source/WebCore/platform/audio/mac/SharedRoutingArbitrator.h: * Source/WebCore/platform/audio/mac/SharedRoutingArbitrator.mm: (WebCore::SharedRoutingArbitrator::Token::logIdentifier const): (WebCore::SharedRoutingArbitrator::beginRoutingArbitrationForToken): (WebCore::SharedRoutingArbitrator::endRoutingArbitrationForToken): (WebCore::SharedRoutingArbitrator::setLogger): (WebCore::SharedRoutingArbitrator::logger): (WebCore::SharedRoutingArbitrator::logChannel const): * Source/WebKit/GPUProcess/mac/LocalAudioSessionRoutingArbitrator.cpp: (WebKit::LocalAudioSessionRoutingArbitrator::LocalAudioSessionRoutingArbitrator): (WebKit::LocalAudioSessionRoutingArbitrator::beginRoutingArbitrationWithCategory): (WebKit::LocalAudioSessionRoutingArbitrator::logger): (WebKit::LocalAudioSessionRoutingArbitrator::logChannel const): (WebKit::LocalAudioSessionRoutingArbitrator::canLog const): * Source/WebKit/GPUProcess/mac/LocalAudioSessionRoutingArbitrator.h: * Source/WebKit/UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp: (WebKit::AudioSessionRoutingArbitratorProxy::AudioSessionRoutingArbitratorProxy): (WebKit::AudioSessionRoutingArbitratorProxy::logger): (WebKit::AudioSessionRoutingArbitratorProxy::logChannel const): * Source/WebKit/UIProcess/Media/AudioSessionRoutingArbitratorProxy.h: (WebKit::AudioSessionRoutingArbitratorProxy::logIdentifier const): (WebKit::AudioSessionRoutingArbitratorProxy::logClassName const): * Source/WebKit/UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm: (WebKit::AudioSessionRoutingArbitratorProxy::AudioSessionRoutingArbitratorProxy): (WebKit::AudioSessionRoutingArbitratorProxy::beginRoutingArbitrationWithCategory): (WebKit::AudioSessionRoutingArbitratorProxy::endRoutingArbitration): * Source/WebKit/UIProcess/WebProcessProxy.cpp: (WebKit::WebProcessProxy::WebProcessProxy): (WebKit::m_routingArbitrator): (WebKit::WebProcessProxy::setWebsiteDataStore): (WebKit::WebProcessProxy::logger): (WebKit::m_webPermissionController): Deleted. * Source/WebKit/UIProcess/WebProcessProxy.h: * Source/WebKit/WebProcess/cocoa/AudioSessionRoutingArbitrator.cpp: (WebKit::m_logIdentifier): (WebKit::AudioSessionRoutingArbitrator::canLog const): * Source/WebKit/WebProcess/cocoa/AudioSessionRoutingArbitrator.h: Canonical link: https://commits.webkit.org/264658@main

webkit-commit-queue · 2023-05-30T00:23:53Z

Committed 264658@main (cd55188): https://commits.webkit.org/264658@main

Reviewed commits have been landed. Closing PR #14432 and removing active labels.

eric-carlson requested a review from cdumez as a code owner May 27, 2023 22:15

eric-carlson self-assigned this May 27, 2023

eric-carlson added the Media Bugs related to the HTML 5 Media elements. label May 27, 2023

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 27, 2023

eric-carlson removed the merging-blocked Applied to prevent a change from being merged label May 28, 2023

eric-carlson force-pushed the audio-runtime-logging branch from 3d8904a to d3449d7 Compare May 28, 2023 03:21

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 28, 2023

eric-carlson removed the merging-blocked Applied to prevent a change from being merged label May 28, 2023

eric-carlson force-pushed the audio-runtime-logging branch from d3449d7 to 3427a93 Compare May 28, 2023 03:53

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 28, 2023

eric-carlson removed the merging-blocked Applied to prevent a change from being merged label May 28, 2023

eric-carlson force-pushed the audio-runtime-logging branch from 3427a93 to bccdbf9 Compare May 28, 2023 14:06

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 28, 2023

eric-carlson removed the merging-blocked Applied to prevent a change from being merged label May 28, 2023

eric-carlson force-pushed the audio-runtime-logging branch from bccdbf9 to 19da6f5 Compare May 28, 2023 16:57

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 28, 2023

youennf approved these changes May 28, 2023

View reviewed changes

Source/WebCore/platform/audio/ios/AudioSessionIOS.mm Show resolved Hide resolved

eric-carlson added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels May 29, 2023

webkit-commit-queue force-pushed the audio-runtime-logging branch from 19da6f5 to cd55188 Compare May 30, 2023 00:23

webkit-commit-queue merged commit cd55188 into WebKit:main May 30, 2023

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label May 30, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add runtime logging to AudioSession and related classes #14432

Add runtime logging to AudioSession and related classes #14432

eric-carlson commented May 27, 2023 •

edited by webkit-early-warning-system

webkit-early-warning-system commented May 27, 2023 •

edited

webkit-early-warning-system commented May 28, 2023

webkit-early-warning-system commented May 28, 2023 •

edited

webkit-early-warning-system commented May 28, 2023

webkit-early-warning-system commented May 28, 2023 •

edited

webkit-early-warning-system commented May 28, 2023 •

edited

webkit-early-warning-system commented May 28, 2023 •

edited

webkit-commit-queue commented May 30, 2023

Add runtime logging to AudioSession and related classes #14432

Add runtime logging to AudioSession and related classes #14432

Conversation

eric-carlson commented May 27, 2023 • edited by webkit-early-warning-system

cd55188

webkit-early-warning-system commented May 27, 2023 • edited

webkit-early-warning-system commented May 28, 2023

webkit-early-warning-system commented May 28, 2023 • edited

webkit-early-warning-system commented May 28, 2023

webkit-early-warning-system commented May 28, 2023 • edited

webkit-early-warning-system commented May 28, 2023 • edited

webkit-early-warning-system commented May 28, 2023 • edited

webkit-commit-queue commented May 30, 2023

eric-carlson commented May 27, 2023 •

edited by webkit-early-warning-system

`cd55188`

webkit-early-warning-system commented May 27, 2023 •

edited

webkit-early-warning-system commented May 28, 2023 •

edited

webkit-early-warning-system commented May 28, 2023 •

edited

webkit-early-warning-system commented May 28, 2023 •

edited

webkit-early-warning-system commented May 28, 2023 •

edited