From 905c84ec478d85e0e9862f416821f2cc0e01a66c Mon Sep 17 00:00:00 2001
From: Fedor <fedor@mail.ru>
Date: Fri, 2 Oct 2020 10:34:43 +0300
Subject: [PATCH] [webaudio] Keep track of whether the HRTF database has
 already been loaded.

---
 dom/media/webaudio/blink/HRTFDatabaseLoader.cpp | 3 +++
 dom/media/webaudio/blink/HRTFDatabaseLoader.h   | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp b/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp
index 090e1b217..96c53b1cd 100644
--- a/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp
+++ b/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2020 M. Straver. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -72,6 +73,7 @@ HRTFDatabaseLoader::HRTFDatabaseLoader(float sampleRate)
     , m_threadLock("HRTFDatabaseLoader")
     , m_databaseLoaderThread(nullptr)
     , m_databaseSampleRate(sampleRate)
+    , m_databaseLoaded(false)
 {
     MOZ_ASSERT(NS_IsMainThread());
 }
@@ -164,6 +166,7 @@ void HRTFDatabaseLoader::load()
     MOZ_ASSERT(!m_hrtfDatabase.get(), "Called twice");
     // Load the default HRTF database.
     m_hrtfDatabase = HRTFDatabase::create(m_databaseSampleRate);
+    m_databaseLoaded = true;
     // Notifies the main thread of completion.  See loadAsynchronously().
     Release();
 }
diff --git a/dom/media/webaudio/blink/HRTFDatabaseLoader.h b/dom/media/webaudio/blink/HRTFDatabaseLoader.h
index 50a875b18..4dfbd4fc8 100644
--- a/dom/media/webaudio/blink/HRTFDatabaseLoader.h
+++ b/dom/media/webaudio/blink/HRTFDatabaseLoader.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2020 M. Straver. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -85,7 +86,12 @@ public:
     // on any thread except m_databaseLoaderThread.
     void waitForLoaderThreadCompletion();
     
-    HRTFDatabase* database() { return m_hrtfDatabase.get(); }
+    HRTFDatabase* database() {
+      if (!m_databaseLoaded) {
+        return nullptr;
+      }
+      return m_hrtfDatabase.get();
+    }
 
     float databaseSampleRate() const { return m_databaseSampleRate; }
 
@@ -141,6 +147,7 @@ private:
     PRThread* m_databaseLoaderThread;
 
     float m_databaseSampleRate;
+    mozilla::Atomic<bool> m_databaseLoaded;
 };
 
 } // namespace WebCore