[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
crogers at google.com
crogers at google.com
Wed Dec 22 13:50:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 2c2bef95b0e3705d262bdc1f93d845a18ec4b8f1
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 28 02:08:30 2010 +0000
2010-09-27 Chris Rogers <crogers at google.com>
Reviewed by James Robinson.
Add HRTFDatabaseLoader files
https://bugs.webkit.org/show_bug.cgi?id=46234
No new tests since audio API is not yet implemented.
* platform/audio/HRTFDatabaseLoader.cpp: Added.
(WebCore::HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary):
(WebCore::HRTFDatabaseLoader::HRTFDatabaseLoader):
(WebCore::HRTFDatabaseLoader::~HRTFDatabaseLoader):
(WebCore::databaseLoaderEntry):
(WebCore::HRTFDatabaseLoader::load):
(WebCore::HRTFDatabaseLoader::loadAsynchronously):
(WebCore::HRTFDatabaseLoader::isLoaded):
(WebCore::HRTFDatabaseLoader::defaultHRTFDatabase):
* platform/audio/HRTFDatabaseLoader.h: Added.
(WebCore::HRTFDatabaseLoader::database):
(WebCore::HRTFDatabaseLoader::databaseSampleRate):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68470 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b641102..160b7d2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-09-27 Chris Rogers <crogers at google.com>
+
+ Reviewed by James Robinson.
+
+ Add HRTFDatabaseLoader files
+ https://bugs.webkit.org/show_bug.cgi?id=46234
+
+ No new tests since audio API is not yet implemented.
+
+ * platform/audio/HRTFDatabaseLoader.cpp: Added.
+ (WebCore::HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary):
+ (WebCore::HRTFDatabaseLoader::HRTFDatabaseLoader):
+ (WebCore::HRTFDatabaseLoader::~HRTFDatabaseLoader):
+ (WebCore::databaseLoaderEntry):
+ (WebCore::HRTFDatabaseLoader::load):
+ (WebCore::HRTFDatabaseLoader::loadAsynchronously):
+ (WebCore::HRTFDatabaseLoader::isLoaded):
+ (WebCore::HRTFDatabaseLoader::defaultHRTFDatabase):
+ * platform/audio/HRTFDatabaseLoader.h: Added.
+ (WebCore::HRTFDatabaseLoader::database):
+ (WebCore::HRTFDatabaseLoader::databaseSampleRate):
+
2010-09-27 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/audio/HRTFDatabaseLoader.cpp b/WebCore/platform/audio/HRTFDatabaseLoader.cpp
new file mode 100644
index 0000000..4368d22
--- /dev/null
+++ b/WebCore/platform/audio/HRTFDatabaseLoader.cpp
@@ -0,0 +1,133 @@
+/*
+ * 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
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(WEB_AUDIO)
+
+#include "HRTFDatabaseLoader.h"
+
+#include "HRTFDatabase.h"
+
+namespace WebCore {
+
+// Singleton
+HRTFDatabaseLoader* HRTFDatabaseLoader::s_loader = 0;
+
+PassRefPtr<HRTFDatabaseLoader> HRTFDatabaseLoader::createAndLoadAsynchronouslyIfNecessary(double sampleRate)
+{
+ ASSERT(isMainThread());
+
+ 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;
+ ASSERT(sampleRate == loader->databaseSampleRate());
+ }
+
+ return loader;
+}
+
+HRTFDatabaseLoader::HRTFDatabaseLoader(double sampleRate)
+ : m_hrtfDatabase(0)
+ , m_databaseLoaderThread(0)
+ , m_startedLoadingDatabase(false)
+ , m_databaseSampleRate(sampleRate)
+{
+ ASSERT(isMainThread());
+}
+
+HRTFDatabaseLoader::~HRTFDatabaseLoader()
+{
+ ASSERT(isMainThread());
+
+ if (m_startedLoadingDatabase)
+ waitForThreadCompletion(m_databaseLoaderThread, 0);
+
+ m_startedLoadingDatabase = false;
+ m_databaseLoaderThread = 0;
+
+ m_hrtfDatabase.clear();
+
+ // Clear out singleton.
+ ASSERT(this == s_loader);
+ s_loader = 0;
+}
+
+
+// Asynchronously load the database in this thread.
+static void* databaseLoaderEntry(void* threadData)
+{
+ HRTFDatabaseLoader* loader = reinterpret_cast<HRTFDatabaseLoader*>(threadData);
+ ASSERT(loader);
+ loader->load();
+
+ return 0;
+}
+
+void HRTFDatabaseLoader::load()
+{
+ ASSERT(!isMainThread());
+ if (!m_hrtfDatabase.get()) {
+ // Load the default HRTF database.
+ m_hrtfDatabase = HRTFDatabase::create(m_databaseSampleRate);
+ }
+}
+
+void HRTFDatabaseLoader::loadAsynchronously()
+{
+ ASSERT(isMainThread());
+
+ if (!m_hrtfDatabase.get() && !m_startedLoadingDatabase) {
+ // Start the asynchronous database loading process.
+ m_startedLoadingDatabase = true;
+ m_databaseLoaderThread = createThread(databaseLoaderEntry, this, "HRTF database loader");
+ }
+}
+
+bool HRTFDatabaseLoader::isLoaded() const
+{
+ return m_hrtfDatabase.get();
+}
+
+HRTFDatabase* HRTFDatabaseLoader::defaultHRTFDatabase()
+{
+ if (!s_loader)
+ return 0;
+
+ return s_loader->database();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_AUDIO)
diff --git a/WebCore/platform/audio/HRTFDatabaseLoader.h b/WebCore/platform/audio/HRTFDatabaseLoader.h
new file mode 100644
index 0000000..72002c5
--- /dev/null
+++ b/WebCore/platform/audio/HRTFDatabaseLoader.h
@@ -0,0 +1,85 @@
+/*
+ * 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
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef HRTFDatabaseLoader_h
+#define HRTFDatabaseLoader_h
+
+#include "HRTFDatabase.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
+#include <wtf/Threading.h>
+
+namespace WebCore {
+
+// HRTFDatabaseLoader will asynchronously load the default HRTFDatabase in a new thread.
+
+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.
+ // Must be called from the main thread.
+ static PassRefPtr<HRTFDatabaseLoader> createAndLoadAsynchronouslyIfNecessary(double sampleRate);
+
+ // Both constructor and destructor must be called from the main thread.
+ ~HRTFDatabaseLoader();
+
+ // Returns true once the default database has been completely loaded.
+ bool isLoaded() const;
+
+ HRTFDatabase* database() { return m_hrtfDatabase.get(); }
+
+ // Called in asynchronous loading thread.
+ 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.
+ explicit HRTFDatabaseLoader(double sampleRate);
+
+ // If it hasn't already been loaded, creates a new thread and initiates asynchronous loading of the default database.
+ // This must be called from the main thread.
+ void loadAsynchronously();
+
+ double databaseSampleRate() const { return m_databaseSampleRate; }
+
+ static HRTFDatabaseLoader* s_loader; // singleton
+ OwnPtr<HRTFDatabase> m_hrtfDatabase;
+ ThreadIdentifier m_databaseLoaderThread;
+ bool m_startedLoadingDatabase;
+ double m_databaseSampleRate;
+};
+
+
+} // namespace WebCore
+
+#endif // HRTFDatabaseLoader_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list