Move handle of HRTFDatabaseLoader to AudioListener.

Source/modules/webaudio/PannerNode.cpp

 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #if ENABLE(WEB_AUDIO)
 
 #include "modules/webaudio/PannerNode.h"
 
 #include "core/dom/ExecutionContext.h"
+#include "platform/audio/HRTFDatabaseLoader.h"
 #include "platform/audio/HRTFPanner.h"
 #include "modules/webaudio/AudioBufferSourceNode.h"
 #include "modules/webaudio/AudioContext.h"
 #include "modules/webaudio/AudioNodeInput.h"
 #include "modules/webaudio/AudioNodeOutput.h"
 #include "wtf/MathExtras.h"
 
 namespace WebCore {
 
 static void fixNANs(double &x)
@@ skipping 14 matching lines @@
     , m_isDopplerRateDirty(true)
     , m_lastGain(-1.0)
     , m_cachedAzimuth(0)
     , m_cachedElevation(0)
     , m_cachedDistanceConeGain(1.0f)
     , m_cachedDopplerRate(1)
     , m_connectionCount(0)
 {
     // Load the HRTF database asynchronously so we don't block the Javascript thread while creating the HRTF database.
     // The HRTF panner will return zeroes until the database is loaded.
-    m_hrtfDatabaseLoader = HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary(context->sampleRate());
+    listener()->createAndLoadHRTFDatabaseLoader(context->sampleRate());
 
     ScriptWrappable::init(this);
     addInput();
     addOutput(AudioNodeOutput::create(this, 2));
 
     // Node-specific default mixing rules.
     m_channelCount = 2;
     m_channelCountMode = ClampedMax;
     m_channelInterpretation = AudioBus::Speakers;
 
@@ skipping 39 matching lines @@
         destination->zero();
         return;
     }
 
     // The audio thread can't block on this lock, so we call tryLock() instead.
     MutexTryLocker tryLocker(m_processLock);
     MutexTryLocker tryListenerLocker(listener()->listenerLock());
 
     if (tryLocker.locked() && tryListenerLocker.locked()) {
         // HRTFDatabase should be loaded before proceeding for offline audio context when the panning model is HRTF.
-        if (m_panningModel == Panner::PanningModelHRTF && !m_hrtfDatabaseLoader->isLoaded()) {
+        if (m_panningModel == Panner::PanningModelHRTF && !hrtfDatabaseLoader()->isLoaded()) {

[Raymond Toy, 2014/07/17 17:25:45]

Since the HRTF database is loaded in the listener, should we get rid of
hrftDatabaseLoader() and use listener()->isHRTFDatabaseLoaded()? (Or some other
suitable name?)

             if (context()->isOfflineContext()) {
-                m_hrtfDatabaseLoader->waitForLoaderThreadCompletion();
+                hrtfDatabaseLoader()->waitForLoaderThreadCompletion();

[Raymond Toy, 2014/07/17 17:25:46]

Same as above.  Maybe use listener()->waitForHRTFLoaded()? (Or some other
suitable name.)

             } else {
                 destination->zero();
                 return;
             }
         }
 
         // Apply the panning effect.
         double azimuth;
         double elevation;
         azimuthElevation(&azimuth, &elevation);
@@ skipping 14 matching lines @@
         // We must be in the middle of changing the properties of the panner or the listener.
         destination->zero();
     }
 }
 
 void PannerNode::initialize()
 {
     if (isInitialized())
         return;
 
-    m_panner = Panner::create(m_panningModel, sampleRate(), m_hrtfDatabaseLoader.get());
+    m_panner = Panner::create(m_panningModel, sampleRate(), hrtfDatabaseLoader());
     listener()->addPanner(this);
 
     AudioNode::initialize();
 }
 
 void PannerNode::uninitialize()
 {
     if (!isInitialized())
         return;
 
@@ skipping 30 matching lines @@
 }
 
 bool PannerNode::setPanningModel(unsigned model)
 {
     switch (model) {
     case Panner::PanningModelEqualPower:
     case Panner::PanningModelHRTF:
         if (!m_panner.get() || model != m_panningModel) {
             // This synchronizes with process().
             MutexLocker processLocker(m_processLock);
-            OwnPtr<Panner> newPanner = Panner::create(model, sampleRate(), m_hrtfDatabaseLoader.get());
+            OwnPtr<Panner> newPanner = Panner::create(model, sampleRate(), hrtfDatabaseLoader());
             m_panner = newPanner.release();
             m_panningModel = model;
         }
         break;
     default:
         ASSERT_NOT_REACHED();
         return false;
     }
 
     return true;
@@ skipping 346 matching lines @@
                     notifyAudioSourcesConnectedToNode(connectedNode, visitedNodes); // recurse
                 }
             }
         }
     }
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)