Changeset 270943 in webkit

Timestamp:

Dec 17, 2020 1:33:12 PM (19 months ago)

Author:

jer.noble@apple.com

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/AudioHardwareListener.cpp (modified) (1 diff)
• platform/audio/AudioHardwareListener.h (modified) (2 diffs)
• platform/audio/cocoa/MediaSessionManagerCocoa.mm (modified) (1 diff)
• platform/audio/mac/AudioHardwareListenerMac.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-17  Jer Noble  <jer.noble@apple.com>
+
+        [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  <katherine_cheney@apple.com>
 

trunk/Source/WebCore/platform/audio/AudioHardwareListener.cpp

@@ -40 +40 @@
 {
 #if PLATFORM(IOS_FAMILY)
-    m_outputDeviceSupportsLowPowerMode = true;
+    m_supportedBufferSizes = { 32, 4096 };
 #endif
 }

trunk/Source/WebCore/platform/audio/AudioHardwareListener.h

@@ -52 +52 @@
     
     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:
@@ -58 +65 @@
 
     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;
 };
 

trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm

@@ -110 +110 @@
     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;

trunk/Source/WebCore/platform/audio/mac/AudioHardwareListenerMac.cpp

@@ -60 +60 @@
 }
 
-static bool currentDeviceSupportsLowPowerBufferSize()
+static AudioHardwareListener::BufferSizeRange currentDeviceSupportedBufferSizes()
 {
     AudioDeviceID deviceID = kAudioDeviceUnknown;
@@ -70 +70 @@
 
     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()
@@ -124 +124 @@
 {
     setHardwareActivity(isAudioHardwareProcessRunning());
-    setOutputDeviceSupportsLowPowerMode(currentDeviceSupportsLowPowerBufferSize());
+    setSupportedBufferSizes(currentDeviceSupportedBufferSizes());
 
     auto weakThis = makeWeakPtr(*this);
@@ -173 +173 @@
 void AudioHardwareListenerMac::outputDeviceChanged()
 {
-    setOutputDeviceSupportsLowPowerMode(currentDeviceSupportsLowPowerBufferSize());
+    setSupportedBufferSizes(currentDeviceSupportedBufferSizes());
     m_client.audioOutputDeviceChanged();
 }