- Revision
- 270943
- Author
- [email protected]
- Date
- 2020-12-17 13:33:12 -0800 (Thu, 17 Dec 2020)
Log Message
[macOS] Use low-power audio buffer sizes for more output devices
https://bugs.webkit.org/show_bug.cgi?id=219975
<rdar://problem/72391280>
Reviewed by Eric Carlson.
In r171069, we limited setting the preferred buffer duration to a "low power", high-duration value to
built-in hardware, as some external audio devices would report supporting those high-duration values
only to have audible glitches when that value was set. Since then, external, wireless audio devices have
become vastly more prevalent. To enable "low power" buffer durations on those devices, allow these larger
durations to be set on external devices so long as they claim to support that larger duration.
* platform/audio/AudioHardwareListener.cpp:
(WebCore::AudioHardwareListener::AudioHardwareListener):
* platform/audio/AudioHardwareListener.h:
(WebCore::AudioHardwareListener::BufferSizeRange::operator bool const):
(WebCore::AudioHardwareListener::BufferSizeRange::nearest const):
(WebCore::AudioHardwareListener::supportedBufferSizes const):
(WebCore::AudioHardwareListener::setSupportedBufferSizes):
(WebCore::AudioHardwareListener::outputDeviceSupportsLowPowerMode const): Deleted.
(WebCore::AudioHardwareListener::setOutputDeviceSupportsLowPowerMode): Deleted.
* platform/audio/cocoa/MediaSessionManagerCocoa.mm:
(WebCore::MediaSessionManagerCocoa::updateSessionState):
* platform/audio/mac/AudioHardwareListenerMac.cpp:
(WebCore::currentDeviceSupportedBufferSizes):
(WebCore::AudioHardwareListenerMac::AudioHardwareListenerMac):
(WebCore::AudioHardwareListenerMac::outputDeviceChanged):
(WebCore::currentDeviceSupportsLowPowerBufferSize): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (270942 => 270943)
--- trunk/Source/WebCore/ChangeLog 2020-12-17 21:22:25 UTC (rev 270942)
+++ trunk/Source/WebCore/ChangeLog 2020-12-17 21:33:12 UTC (rev 270943)
@@ -1,3 +1,34 @@
+2020-12-17 Jer Noble <[email protected]>
+
+ [macOS] Use low-power audio buffer sizes for more output devices
+ https://bugs.webkit.org/show_bug.cgi?id=219975
+ <rdar://problem/72391280>
+
+ Reviewed by Eric Carlson.
+
+ In r171069, we limited setting the preferred buffer duration to a "low power", high-duration value to
+ built-in hardware, as some external audio devices would report supporting those high-duration values
+ only to have audible glitches when that value was set. Since then, external, wireless audio devices have
+ become vastly more prevalent. To enable "low power" buffer durations on those devices, allow these larger
+ durations to be set on external devices so long as they claim to support that larger duration.
+
+ * platform/audio/AudioHardwareListener.cpp:
+ (WebCore::AudioHardwareListener::AudioHardwareListener):
+ * platform/audio/AudioHardwareListener.h:
+ (WebCore::AudioHardwareListener::BufferSizeRange::operator bool const):
+ (WebCore::AudioHardwareListener::BufferSizeRange::nearest const):
+ (WebCore::AudioHardwareListener::supportedBufferSizes const):
+ (WebCore::AudioHardwareListener::setSupportedBufferSizes):
+ (WebCore::AudioHardwareListener::outputDeviceSupportsLowPowerMode const): Deleted.
+ (WebCore::AudioHardwareListener::setOutputDeviceSupportsLowPowerMode): Deleted.
+ * platform/audio/cocoa/MediaSessionManagerCocoa.mm:
+ (WebCore::MediaSessionManagerCocoa::updateSessionState):
+ * platform/audio/mac/AudioHardwareListenerMac.cpp:
+ (WebCore::currentDeviceSupportedBufferSizes):
+ (WebCore::AudioHardwareListenerMac::AudioHardwareListenerMac):
+ (WebCore::AudioHardwareListenerMac::outputDeviceChanged):
+ (WebCore::currentDeviceSupportsLowPowerBufferSize): Deleted.
+
2020-12-17 Kate Cheney <[email protected]>
Followup patch: Still can't login to my.playstation.com
Modified: trunk/Source/WebCore/platform/audio/AudioHardwareListener.cpp (270942 => 270943)
--- trunk/Source/WebCore/platform/audio/AudioHardwareListener.cpp 2020-12-17 21:22:25 UTC (rev 270942)
+++ trunk/Source/WebCore/platform/audio/AudioHardwareListener.cpp 2020-12-17 21:33:12 UTC (rev 270943)
@@ -39,7 +39,7 @@
: m_client(client)
{
#if PLATFORM(IOS_FAMILY)
- m_outputDeviceSupportsLowPowerMode = true;
+ m_supportedBufferSizes = { 32, 4096 };
#endif
}
Modified: trunk/Source/WebCore/platform/audio/AudioHardwareListener.h (270942 => 270943)
--- trunk/Source/WebCore/platform/audio/AudioHardwareListener.h 2020-12-17 21:22:25 UTC (rev 270942)
+++ trunk/Source/WebCore/platform/audio/AudioHardwareListener.h 2020-12-17 21:33:12 UTC (rev 270943)
@@ -51,17 +51,24 @@
virtual ~AudioHardwareListener() = default;
AudioHardwareActivityType hardwareActivity() const { return m_activity; }
- bool outputDeviceSupportsLowPowerMode() const { return m_outputDeviceSupportsLowPowerMode; }
+ struct BufferSizeRange {
+ size_t minimum { 0 };
+ size_t maximum { 0 };
+ operator bool() const { return minimum && maximum; }
+ size_t nearest(size_t value) const { return std::min(std::max(value, minimum), maximum); }
+ };
+ BufferSizeRange supportedBufferSizes() const { return m_supportedBufferSizes; }
+
protected:
AudioHardwareListener(Client&);
void setHardwareActivity(AudioHardwareActivityType activity) { m_activity = activity; }
- void setOutputDeviceSupportsLowPowerMode(bool support) { m_outputDeviceSupportsLowPowerMode = support; }
+ void setSupportedBufferSizes(BufferSizeRange sizes) { m_supportedBufferSizes = sizes; }
Client& m_client;
AudioHardwareActivityType m_activity { AudioHardwareActivityType::Unknown };
- bool m_outputDeviceSupportsLowPowerMode { false };
+ BufferSizeRange m_supportedBufferSizes;
};
}
Modified: trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm (270942 => 270943)
--- trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm 2020-12-17 21:22:25 UTC (rev 270942)
+++ trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm 2020-12-17 21:33:12 UTC (rev 270943)
@@ -109,8 +109,8 @@
AudioSession::sharedSession().setPreferredBufferSize(AudioSession::sharedSession().sampleRate() / 50);
else if ((videoAudioCount || audioCount) && DeprecatedGlobalSettings::lowPowerVideoAudioBufferSizeEnabled()) {
size_t bufferSize;
- if (m_audioHardwareListener && m_audioHardwareListener->outputDeviceSupportsLowPowerMode())
- bufferSize = kLowPowerVideoBufferSize;
+ if (m_audioHardwareListener && m_audioHardwareListener->supportedBufferSizes())
+ bufferSize = m_audioHardwareListener->supportedBufferSizes().nearest(kLowPowerVideoBufferSize);
else
bufferSize = AudioUtilities::renderQuantumSize;
Modified: trunk/Source/WebCore/platform/audio/mac/AudioHardwareListenerMac.cpp (270942 => 270943)
--- trunk/Source/WebCore/platform/audio/mac/AudioHardwareListenerMac.cpp 2020-12-17 21:22:25 UTC (rev 270942)
+++ trunk/Source/WebCore/platform/audio/mac/AudioHardwareListenerMac.cpp 2020-12-17 21:33:12 UTC (rev 270943)
@@ -59,7 +59,7 @@
return AudioHardwareActivityType::IsInactive;
}
-static bool currentDeviceSupportsLowPowerBufferSize()
+static AudioHardwareListener::BufferSizeRange currentDeviceSupportedBufferSizes()
{
AudioDeviceID deviceID = kAudioDeviceUnknown;
UInt32 descriptorSize = sizeof(deviceID);
@@ -69,24 +69,24 @@
kAudioObjectPropertyElementMaster };
if (AudioObjectGetPropertyData(kAudioObjectSystemObject, &defaultOutputDeviceDescriptor, 0, 0, &descriptorSize, (void*)&deviceID))
- return false;
+ return { };
- UInt32 transportType = kAudioDeviceTransportTypeUnknown;
- descriptorSize = sizeof(transportType);
- AudioObjectPropertyAddress tranportTypeDescriptor = {
- kAudioDevicePropertyTransportType,
+ AudioValueRange bufferSizes;
+ descriptorSize = sizeof(bufferSizes);
+
+ AudioObjectPropertyAddress bufferSizeDescriptor = {
+ kAudioDevicePropertyBufferFrameSizeRange,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster,
};
- if (AudioObjectGetPropertyData(deviceID, &tranportTypeDescriptor, 0, 0, &descriptorSize, &transportType))
- return false;
+ if (AudioObjectGetPropertyData(deviceID, &bufferSizeDescriptor, 0, 0, &descriptorSize, &bufferSizes))
+ return { };
- // Only allow low-power buffer size when using built-in output device, many external devices perform
- // poorly with a large output buffer.
- return kAudioDeviceTransportTypeBuiltIn == transportType;
+ return { static_cast<size_t>(bufferSizes.mMinimum), static_cast<size_t>(bufferSizes.mMaximum) };
}
+
static const AudioObjectPropertyAddress& processIsRunningPropertyDescriptor()
{
static const AudioObjectPropertyAddress processIsRunningProperty = {
@@ -123,7 +123,7 @@
: AudioHardwareListener(client)
{
setHardwareActivity(isAudioHardwareProcessRunning());
- setOutputDeviceSupportsLowPowerMode(currentDeviceSupportsLowPowerBufferSize());
+ setSupportedBufferSizes(currentDeviceSupportedBufferSizes());
auto weakThis = makeWeakPtr(*this);
m_block = Block_copy(^(UInt32 count, const AudioObjectPropertyAddress properties[]) {
@@ -172,7 +172,7 @@
void AudioHardwareListenerMac::outputDeviceChanged()
{
- setOutputDeviceSupportsLowPowerMode(currentDeviceSupportsLowPowerBufferSize());
+ setSupportedBufferSizes(currentDeviceSupportedBufferSizes());
m_client.audioOutputDeviceChanged();
}