Changeset 150856 in webkit

Timestamp:

May 28, 2013 4:42:45 PM (11 years ago)

Author:

crogers@google.com

Message:

Support multiple HRTFDatabases for different sample-rates
​https://bugs.webkit.org/show_bug.cgi?id=116183

Reviewed by Kenneth Russell.

Adapted from Blink:
​https://codereview.chromium.org/14636011/

This removes the limitation which required OfflineAudioContexts to be created at native sample-rate

• Modules/webaudio/AudioContext.h:

(WebCore::AudioContext::hrtfDatabaseLoader):
(AudioContext):

• Modules/webaudio/OfflineAudioContext.cpp:

(WebCore::OfflineAudioContext::create):

• Modules/webaudio/OfflineAudioDestinationNode.cpp:

(WebCore::OfflineAudioDestinationNode::offlineRender):

• Modules/webaudio/PannerNode.cpp:

(WebCore::PannerNode::initialize):
(WebCore::PannerNode::setPanningModel):

• platform/audio/HRTFDatabaseLoader.cpp:

(WebCore):
(WebCore::HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary):
(WebCore::HRTFDatabaseLoader::~HRTFDatabaseLoader):

• platform/audio/HRTFDatabaseLoader.h:

(HRTFDatabaseLoader):
(WebCore::HRTFDatabaseLoader::loaderMap):

• platform/audio/HRTFPanner.cpp:

(WebCore::HRTFPanner::HRTFPanner):
(WebCore::HRTFPanner::calculateDesiredAzimuthIndexAndBlend):
(WebCore::HRTFPanner::pan):

• platform/audio/HRTFPanner.h:

(HRTFPanner):

• platform/audio/Panner.cpp:

(WebCore::Panner::create):

• platform/audio/Panner.h:

(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webaudio/AudioContext.h (modified) (1 diff)
• Modules/webaudio/OfflineAudioContext.cpp (modified) (2 diffs)
• Modules/webaudio/OfflineAudioDestinationNode.cpp (modified) (1 diff)
• Modules/webaudio/PannerNode.cpp (modified) (2 diffs)
• platform/audio/HRTFDatabaseLoader.cpp (modified) (4 diffs)
• platform/audio/HRTFDatabaseLoader.h (modified) (4 diffs)
• platform/audio/HRTFPanner.cpp (modified) (4 diffs)
• platform/audio/HRTFPanner.h (modified) (3 diffs)
• platform/audio/Panner.cpp (modified) (2 diffs)
• platform/audio/Panner.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-28  Chris Rogers  <crogers@google.com>
+
+        Support multiple HRTFDatabases for different sample-rates
+        https://bugs.webkit.org/show_bug.cgi?id=116183
+
+        Reviewed by Kenneth Russell.
+
+        Adapted from Blink:
+        https://codereview.chromium.org/14636011/
+
+        This removes the limitation which required OfflineAudioContexts to be created at native sample-rate
+
+        * Modules/webaudio/AudioContext.h:
+        (WebCore::AudioContext::hrtfDatabaseLoader):
+        (AudioContext):
+        * Modules/webaudio/OfflineAudioContext.cpp:
+        (WebCore::OfflineAudioContext::create):
+        * Modules/webaudio/OfflineAudioDestinationNode.cpp:
+        (WebCore::OfflineAudioDestinationNode::offlineRender):
+        * Modules/webaudio/PannerNode.cpp:
+        (WebCore::PannerNode::initialize):
+        (WebCore::PannerNode::setPanningModel):
+        * platform/audio/HRTFDatabaseLoader.cpp:
+        (WebCore):
+        (WebCore::HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary):
+        (WebCore::HRTFDatabaseLoader::~HRTFDatabaseLoader):
+        * platform/audio/HRTFDatabaseLoader.h:
+        (HRTFDatabaseLoader):
+        (WebCore::HRTFDatabaseLoader::loaderMap):
+        * platform/audio/HRTFPanner.cpp:
+        (WebCore::HRTFPanner::HRTFPanner):
+        (WebCore::HRTFPanner::calculateDesiredAzimuthIndexAndBlend):
+        (WebCore::HRTFPanner::pan):
+        * platform/audio/HRTFPanner.h:
+        (HRTFPanner):
+        * platform/audio/Panner.cpp:
+        (WebCore::Panner::create):
+        * platform/audio/Panner.h:
+        (WebCore):
+
 2013-05-28  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/Modules/webaudio/AudioContext.h

@@ -89 +89 @@
     // Returns true when initialize() was called AND all asynchronous initialization has completed.
     bool isRunnable() const;
+
+    HRTFDatabaseLoader* hrtfDatabaseLoader() const { return m_hrtfDatabaseLoader.get(); }
 
     // Document notification

trunk/Source/WebCore/Modules/webaudio/OfflineAudioContext.cpp

@@ -31 +31 @@
 #include "Document.h"
 #include "ExceptionCode.h"
-#include "HRTFDatabaseLoader.h"
 #include "ScriptExecutionContext.h"
 
@@ -46 +45 @@
     Document* document = toDocument(context);
 
-    // FIXME: offline contexts have limitations on supported sample-rates.
-    // Currently all AudioContexts must have the same sample-rate.
-    HRTFDatabaseLoader* loader = HRTFDatabaseLoader::loader();
-    if (numberOfChannels > 10 || !isSampleRateRangeGood(sampleRate) || (loader && loader->databaseSampleRate() != sampleRate)) {
+    if (numberOfChannels > 10 || !isSampleRateRangeGood(sampleRate)) {
         ec = SYNTAX_ERR;
         return 0;

trunk/Source/WebCore/Modules/webaudio/OfflineAudioDestinationNode.cpp

@@ -117 +117 @@
     // Synchronize with HRTFDatabaseLoader.
     // The database must be loaded before we can proceed.
-    HRTFDatabaseLoader* loader = HRTFDatabaseLoader::loader();
+    HRTFDatabaseLoader* loader = context()->hrtfDatabaseLoader();
     ASSERT(loader);
     if (!loader)

trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp

@@ -145 +145 @@
     if (isInitialized())
         return;
-        
-    m_panner = Panner::create(m_panningModel, sampleRate());
+
+    m_panner = Panner::create(m_panningModel, sampleRate(), context()->hrtfDatabaseLoader());
 
     AudioNode::initialize();
@@ -201 +201 @@
             MutexLocker processLocker(m_pannerLock);
             
-            OwnPtr<Panner> newPanner = Panner::create(model, sampleRate());
+            OwnPtr<Panner> newPanner = Panner::create(model, sampleRate(), context()->hrtfDatabaseLoader());
             m_panner = newPanner.release();
             m_panningModel = model;

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

@@ -39 +39 @@
 
 // Singleton
-HRTFDatabaseLoader* HRTFDatabaseLoader::s_loader = 0;
+HRTFDatabaseLoader::LoaderMap* HRTFDatabaseLoader::s_loaderMap = 0;
 
 PassRefPtr<HRTFDatabaseLoader> HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary(float sampleRate)
@@ -47 +47 @@
     RefPtr<HRTFDatabaseLoader> loader;
     
-    if (!s_loader) {
-        // Lazily create and load.
-        loader = adoptRef(new HRTFDatabaseLoader(sampleRate));
-        s_loader = loader.get();
-        loader->loadAsynchronously();
-    } else {
-        loader = s_loader;
+    if (!s_loaderMap)
+        s_loaderMap = adoptPtr(new LoaderMap()).leakPtr();
+
+    loader = s_loaderMap->get(sampleRate);
+    if (loader) {
         ASSERT(sampleRate == loader->databaseSampleRate());
+        return loader;
     }
-    
+
+    loader = adoptRef(new HRTFDatabaseLoader(sampleRate));
+    s_loaderMap->add(sampleRate, loader.get());
+
+    loader->loadAsynchronously();
+
     return loader;
 }
@@ -73 +77 @@
     waitForLoaderThreadCompletion();
     m_hrtfDatabase.clear();
-    
-    // Clear out singleton.
-    ASSERT(this == s_loader);
-    s_loader = 0;
+
+    // Remove ourself from the map.
+    if (s_loaderMap)
+        s_loaderMap->remove(m_databaseSampleRate);
 }
-
 
 // Asynchronously load the database in this thread.
@@ -124 +127 @@
 }
 
-HRTFDatabase* HRTFDatabaseLoader::defaultHRTFDatabase()
-{
-    if (!s_loader)
-        return 0;
-    
-    return s_loader->database();
-}
-
 } // namespace WebCore
 

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

@@ -31 +31 @@
 
 #include "HRTFDatabase.h"
+#include <wtf/HashMap.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -42 +43 @@
 class HRTFDatabaseLoader : public RefCounted<HRTFDatabaseLoader> {
 public:
-    // Lazily creates the singleton HRTFDatabaseLoader (if not already created) and starts loading asynchronously (when created the first time).
-    // Returns the singleton HRTFDatabaseLoader.
+    // Lazily creates a HRTFDatabaseLoader (if not already created) for the given sample-rate
+    // and starts loading asynchronously (when created the first time).
+    // Returns the HRTFDatabaseLoader.
     // Must be called from the main thread.
     static PassRefPtr<HRTFDatabaseLoader> createAndLoadAsynchronouslyIfNecessary(float sampleRate);
 
-    // Returns the singleton HRTFDatabaseLoader.
-    static HRTFDatabaseLoader* loader() { return s_loader; }
-    
     // Both constructor and destructor must be called from the main thread.
     ~HRTFDatabaseLoader();
@@ -66 +65 @@
     void load();
 
-    // defaultHRTFDatabase() gives access to the loaded database.
-    // This can be called from any thread, but it is the callers responsibilty to call this while the context (and thus HRTFDatabaseLoader)
-    // is still alive.  Otherwise this will return 0.
-    static HRTFDatabase* defaultHRTFDatabase();
-
 private:
     // Both constructor and destructor must be called from the main thread.
@@ -79 +73 @@
     void loadAsynchronously();
 
-    static HRTFDatabaseLoader* s_loader; // singleton
+    // Map from sample-rate to loader.
+    typedef HashMap<double, HRTFDatabaseLoader*> LoaderMap;
+
+    // Keeps track of loaders on a per-sample-rate basis.
+    static LoaderMap* s_loaderMap; // singleton
+    static HRTFDatabaseLoader::LoaderMap* loaderMap() { return s_loaderMap; }
+
     OwnPtr<HRTFDatabase> m_hrtfDatabase;
 

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

@@ -48 +48 @@
 const unsigned RenderingQuantum = 128;
 
-HRTFPanner::HRTFPanner(float sampleRate)
+HRTFPanner::HRTFPanner(float sampleRate, HRTFDatabaseLoader* databaseLoader)
     : Panner(PanningModelHRTF)
+    , m_databaseLoader(databaseLoader)
     , m_sampleRate(sampleRate)
     , m_crossfadeSelection(CrossfadeSelection1)
@@ -69 +70 @@
     , m_tempR2(RenderingQuantum)
 {
+    ASSERT(databaseLoader);
 }
 
@@ -101 +103 @@
         azimuth += 360.0;
 
-    HRTFDatabase* database = HRTFDatabaseLoader::defaultHRTFDatabase();
+    HRTFDatabase* database = m_databaseLoader->database();
     ASSERT(database);
 
@@ -136 +138 @@
 
     // This code only runs as long as the context is alive and after database has been loaded.
-    HRTFDatabase* database = HRTFDatabaseLoader::defaultHRTFDatabase();
+    HRTFDatabase* database = m_databaseLoader->database();
     ASSERT(database);
     if (!database) {

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

@@ -28 +28 @@
 #include "DelayDSPKernel.h"
 #include "FFTConvolver.h"
+#include "HRTFDatabaseLoader.h"
 #include "Panner.h"
 
@@ -34 +35 @@
 class HRTFPanner : public Panner {
 public:
-    explicit HRTFPanner(float sampleRate);
+    explicit HRTFPanner(float sampleRate, HRTFDatabaseLoader*);
     virtual ~HRTFPanner();
 
@@ -53 +54 @@
     // and azimuthBlend which is an interpolation value from 0 -> 1.
     int calculateDesiredAzimuthIndexAndBlend(double azimuth, double& azimuthBlend);
+
+    RefPtr<HRTFDatabaseLoader> m_databaseLoader;
 
     float m_sampleRate;

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

@@ -39 +39 @@
 namespace WebCore {
 
-PassOwnPtr<Panner> Panner::create(PanningModel model, float sampleRate)
+PassOwnPtr<Panner> Panner::create(PanningModel model, float sampleRate, HRTFDatabaseLoader* databaseLoader)
 {
     OwnPtr<Panner> panner;
@@ -49 +49 @@
 
     case PanningModelHRTF:
-        panner = adoptPtr(new HRTFPanner(sampleRate));
+        panner = adoptPtr(new HRTFPanner(sampleRate, databaseLoader));
         break;
 

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

@@ -35 +35 @@
 
 class AudioBus;
+class HRTFDatabaseLoader;
 
 // Abstract base class for panning a mono or stereo source.
@@ -48 +49 @@
     typedef unsigned PanningModel;
 
-    static PassOwnPtr<Panner> create(PanningModel, float sampleRate);
+    static PassOwnPtr<Panner> create(PanningModel, float sampleRate, HRTFDatabaseLoader*);
 
     virtual ~Panner() { };