Changeset 152234 in webkit

Timestamp:

Jul 1, 2013 11:40:27 AM (11 years ago)

Author:

jer.noble@apple.com

Message:

Audio in apps which embed WebViews is corrupted.
​https://bugs.webkit.org/show_bug.cgi?id=118163

Reviewed by Maciej Stachowiak.

Source/WebCore:

Add a preference, which defaults to off, which controls whether the
AudioSessionManager will switch to a large audio buffer setting for
power-savings during <video> playback.

• WebCore.exp.in:
• page/Settings.cpp:

(WebCore::Settings::setLowPowerVideoAudioBufferSizeEnabled): Added. Simple setter.

• page/Settings.h:

(WebCore::Settings::lowPowerVideoAudioBufferSizeEnabled): Added. Simple getter.

• platform/audio/mac/AudioSessionManagerMac.cpp:

(AudioSessionManager::updateSessionState): Only set the large audio buffer

size if lowPowerVideoAudioBufferSize is enabled.

Source/WebKit/mac:

Expose the WebCore lowPowerVideoAudioBufferSizeEnabled setting to WebKit clients.

• WebView/WebPreferenceKeysPrivate.h:
• WebView/WebPreferences.mm:

(+[WebPreferences initialize]):
(-[WebPreferences lowPowerVideoAudioBufferSizeEnabled]):
(-[WebPreferences setLowPowerVideoAudioBufferSizeEnabled:]):

• WebView/WebPreferencesPrivate.h:
• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Source/WebKit2:

Expose the WebCore lowPowerVideoAudioBufferSizeEnabled setting to WebKit2 clients.

• Shared/WebPreferencesStore.h:
• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/page/Settings.cpp (modified) (2 diffs)
• WebCore/page/Settings.h (modified) (3 diffs)
• WebCore/platform/audio/mac/AudioSessionManagerMac.cpp (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebPreferenceKeysPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebPreferences.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebPreferencesPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebPreferencesStore.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-27  Jer Noble  <jer.noble@apple.com>
+
+        Audio in apps which embed WebViews is corrupted.
+        https://bugs.webkit.org/show_bug.cgi?id=118163
+
+        Reviewed by Maciej Stachowiak.
+
+        Add a preference, which defaults to off, which controls whether the
+        AudioSessionManager will switch to a large audio buffer setting for
+        power-savings during <video> playback.
+
+        * WebCore.exp.in:
+        * page/Settings.cpp:
+        (WebCore::Settings::setLowPowerVideoAudioBufferSizeEnabled): Added.  Simple setter.
+        * page/Settings.h:
+        (WebCore::Settings::lowPowerVideoAudioBufferSizeEnabled): Added.  Simple getter.
+        * platform/audio/mac/AudioSessionManagerMac.cpp:
+        (AudioSessionManager::updateSessionState): Only set the large audio buffer
+            size if lowPowerVideoAudioBufferSize is enabled.
+
 2013-07-01  Brian Holt  <brian.holt@samsung.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1120 +1120 @@
 __ZN7WebCore8Settings33setAggressiveTileRetentionEnabledEb
 __ZN7WebCore8Settings37setScrollingPerformanceLoggingEnabledEb
+__ZN7WebCore8Settings38setLowPowerVideoAudioBufferSizeEnabledEb
 __ZN7WebCore8Settings42setHiddenPageCSSAnimationSuspensionEnabledEb
 __ZN7WebCore8Settings45setShouldRespectPriorityInCSSAttributeSettersEb

trunk/Source/WebCore/page/Settings.cpp

@@ -90 +90 @@
     
 bool Settings::gShouldRespectPriorityInCSSAttributeSetters = false;
+bool Settings::gLowPowerVideoAudioBufferSizeEnabled = false;
 
 // NOTEs
@@ -612 +613 @@
 #endif
 
+void Settings::setLowPowerVideoAudioBufferSizeEnabled(bool flag)
+{
+    gLowPowerVideoAudioBufferSizeEnabled = flag;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/page/Settings.h

@@ -259 +259 @@
 #endif
 
+        static bool lowPowerVideoAudioBufferSizeEnabled() { return gLowPowerVideoAudioBufferSizeEnabled; }
+        static void setLowPowerVideoAudioBufferSizeEnabled(bool);
+
     private:
         explicit Settings(Page*);
@@ -316 +319 @@
         bool m_hiddenPageCSSAnimationSuspensionEnabled : 1;
 #endif
-
         static double gDefaultMinDOMTimerInterval;
         static double gDefaultDOMTimerAlignmentInterval;
@@ -340 +342 @@
 
         static double gHiddenPageDOMTimerAlignmentInterval;
+
+        static bool gLowPowerVideoAudioBufferSizeEnabled;
     };
 

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

@@ -30 +30 @@
 
 #include "Logging.h"
+#include "Settings.h"
 
 using namespace WebCore;
@@ -45 +46 @@
     // causes media LayoutTests to fail on 10.8.
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-    else if (has(Video) || has(Audio))
+    else if ((has(Video) || has(Audio)) && Settings::lowPowerVideoAudioBufferSizeEnabled())
         AudioSession::sharedSession().setPreferredBufferSize(kLowPowerVideoBufferSize);
 #endif

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-06-27  Jer Noble  <jer.noble@apple.com>
+
+        Audio in apps which embed WebViews is corrupted.
+        https://bugs.webkit.org/show_bug.cgi?id=118163
+
+        Reviewed by Maciej Stachowiak.
+
+        Expose the WebCore lowPowerVideoAudioBufferSizeEnabled setting to WebKit clients.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences lowPowerVideoAudioBufferSizeEnabled]):
+        (-[WebPreferences setLowPowerVideoAudioBufferSizeEnabled:]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
 2013-07-01  Kangil Han  <kangil.han@samsung.com>
 

trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

@@ -133 +133 @@
 #define WebKitHiddenPageDOMTimerThrottlingEnabledPreferenceKey @"WebKitHiddenPageDOMTimerThrottlingEnabled"
 #define WebKitHiddenPageCSSAnimationSuspensionEnabledPreferenceKey @"WebKitHiddenPageCSSAnimationSuspensionEnabled"
+#define WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey @"WebKitLowPowerVideoAudioBufferSizeEnabled"
 
 // These are private both because callers should be using the cover methods and because the

trunk/Source/WebKit/mac/WebView/WebPreferences.mm

@@ -419 +419 @@
         [NSNumber numberWithBool:NO], WebKitHiddenPageDOMTimerThrottlingEnabledPreferenceKey,
         [NSNumber numberWithBool:NO], WebKitHiddenPageCSSAnimationSuspensionEnabledPreferenceKey,
+        [NSNumber numberWithBool:NO], WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey,
         nil];
 
@@ -1830 +1831 @@
 }
 
+- (BOOL)lowPowerVideoAudioBufferSizeEnabled
+{
+    return [self _boolValueForKey:WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey];
+}
+
+- (void)setLowPowerVideoAudioBufferSizeEnabled:(BOOL)enabled
+{
+    [self _setBoolValue:enabled forKey:WebKitLowPowerVideoAudioBufferSizeEnabledPreferenceKey];
+}
+
 @end
 

trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

@@ -336 +336 @@
 - (void)setHiddenPageCSSAnimationSuspensionEnabled:(BOOL)flag;
 
+- (BOOL)lowPowerVideoAudioBufferSizeEnabled;
+- (void)setLowPowerVideoAudioBufferSizeEnabled:(BOOL)enabled;
+
+
 @end

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1549 +1549 @@
     settings->setNeedsDidFinishLoadOrderQuirk(needsDidFinishLoadOrderQuirk());
     settings->setDiagnosticLoggingEnabled([preferences diagnosticLoggingEnabled]);
+    settings->setLowPowerVideoAudioBufferSizeEnabled([preferences lowPowerVideoAudioBufferSizeEnabled]);
 
     switch ([preferences storageBlockingPolicy]) {

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-06-27  Jer Noble  <jer.noble@apple.com>
+
+        Audio in apps which embed WebViews is corrupted.
+        https://bugs.webkit.org/show_bug.cgi?id=118163
+
+        Reviewed by Maciej Stachowiak.
+
+        Expose the WebCore lowPowerVideoAudioBufferSizeEnabled setting to WebKit2 clients.
+
+        * Shared/WebPreferencesStore.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
 2013-07-01  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/Shared/WebPreferencesStore.h

@@ -161 +161 @@
     macro(HiddenPageDOMTimerThrottlingEnabled, hiddenPageDOMTimerThrottlingEnabled, Bool, bool, DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED) \
     macro(HiddenPageCSSAnimationSuspensionEnabled, hiddenPageCSSAnimationSuspensionEnabled, Bool, bool, DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED) \
+    macro(LowPowerVideoAudioBufferSizeEnabled, lowPowerVideoAudioBufferSizeEnabled, Bool, bool, false) \
     \
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -2573 +2573 @@
 #endif
 
+    settings->setLowPowerVideoAudioBufferSizeEnabled(store.getBoolValueForKey(WebPreferencesKey::lowPowerVideoAudioBufferSizeEnabledKey()));
+
     platformPreferencesDidChange(store);