fix: Stability fixes and Pipeline tests.

Signed-off-by: Axel Nana <[email protected]>
AmplitudeAudio · Nov 22, 2024 · c95702d · c95702d
1 parent 6e0a1a4
commit c95702d
Show file tree

Hide file tree

Showing 21 changed files with 1,104 additions and 73 deletions.
diff --git a/include/SparkyStudios/Audio/Amplitude/Mixer/Node.h b/include/SparkyStudios/Audio/Amplitude/Mixer/Node.h
@@ -100,7 +100,7 @@ namespace SparkyStudios::Audio::Amplitude
         /**
          * @brief Consumes audio data from the provider node.
          *
-         * The provider node should be  specified with the call of @ref Connect `Connect()`.
+         * The provider node should be specified with the call of @ref Connect `Connect()`.
          */
         virtual void Consume() = 0;
 

diff --git a/sample_project/.amignore b/sample_project/.amignore
@@ -0,0 +1,2 @@
+# Test files
+**/tests.*.json
diff --git a/sample_project/pipelines/tests.double_consume.json b/sample_project/pipelines/tests.double_consume.json
@@ -0,0 +1,33 @@
+{
+    "id": 98,
+    "name": "tests.double_consume",
+    "nodes": [
+        {
+            "id": 1,
+            "name": "Input",
+            "consume": []
+        },
+        {
+            "id": 8,
+            "name": "StereoPanning",
+            "consume": [
+                1
+            ]
+        },
+        {
+            "id": 2,
+            "name": "StereoMixer",
+            "consume": [
+                8,
+                8
+            ]
+        },
+        {
+            "id": 9,
+            "name": "Output",
+            "consume": [
+                2
+            ]
+        }
+    ]
+}
diff --git a/sample_project/pipelines/tests.invalid.invalid_consumer_node.json b/sample_project/pipelines/tests.invalid.invalid_consumer_node.json
@@ -0,0 +1,32 @@
+{
+    "id": 99,
+    "name": "tests.invalid_consumer_node",
+    "nodes": [
+        {
+            "id": 1,
+            "name": "Input",
+            "consume": []
+        },
+        {
+            "id": 8,
+            "name": "StereoPanning",
+            "consume": [
+                3
+            ]
+        },
+        {
+            "id": 9,
+            "name": "Output",
+            "consume": [
+                8
+            ]
+        },
+        {
+            "id": 3,
+            "name": "InvalidConsumerNode",
+            "consume": [
+                1
+            ]
+        }
+    ]
+}
diff --git a/sample_project/pipelines/tests.invalid.invalid_producers_count.json b/sample_project/pipelines/tests.invalid.invalid_producers_count.json
@@ -0,0 +1,33 @@
+{
+    "id": 93,
+    "name": "tests.invalid_producers_count",
+    "nodes": [
+        {
+            "id": 1,
+            "name": "Input",
+            "consume": []
+        },
+        {
+            "id": 2,
+            "name": "Attenuation",
+            "consume": [
+                1
+            ]
+        },
+        {
+            "id": 8,
+            "name": "StereoPanning",
+            "consume": [
+                1,
+                2
+            ]
+        },
+        {
+            "id": 9,
+            "name": "Output",
+            "consume": [
+                8
+            ]
+        }
+    ]
+}
diff --git a/sample_project/pipelines/tests.invalid.missing_input.json b/sample_project/pipelines/tests.invalid.missing_input.json
@@ -0,0 +1,30 @@
+{
+    "id": 90,
+    "name": "tests.missing_input",
+    "nodes": [
+        {
+            "id": 8,
+            "name": "StereoPanning",
+            "consume": []
+        },
+        {
+            "id": 11,
+            "name": "Reflections",
+            "consume": []
+        },
+        {
+            "id": 12,
+            "name": "AmbisonicBinauralDecoder",
+            "consume": [
+                11
+            ]
+        },
+        {
+            "id": 9,
+            "name": "Output",
+            "consume": [
+                12
+            ]
+        }
+    ]
+}
diff --git a/sample_project/pipelines/tests.invalid.missing_output.json b/sample_project/pipelines/tests.invalid.missing_output.json
@@ -0,0 +1,32 @@
+{
+    "id": 91,
+    "name": "tests.missing_output",
+    "nodes": [
+        {
+            "id": 1,
+            "name": "Input",
+            "consume": []
+        },
+        {
+            "id": 8,
+            "name": "StereoPanning",
+            "consume": [
+                1
+            ]
+        },
+        {
+            "id": 11,
+            "name": "Reflections",
+            "consume": [
+                1
+            ]
+        },
+        {
+            "id": 12,
+            "name": "AmbisonicBinauralDecoder",
+            "consume": [
+                11
+            ]
+        }
+    ]
+}
diff --git a/sample_project/pipelines/tests.invalid.missing_producers.json b/sample_project/pipelines/tests.invalid.missing_producers.json
@@ -0,0 +1,23 @@
+{
+    "id": 92,
+    "name": "tests.missing_producers",
+    "nodes": [
+        {
+            "id": 1,
+            "name": "Input",
+            "consume": []
+        },
+        {
+            "id": 8,
+            "name": "StereoPanning",
+            "consume": []
+        },
+        {
+            "id": 9,
+            "name": "Output",
+            "consume": [
+                8
+            ]
+        }
+    ]
+}
diff --git a/sample_project/pipelines/tests.invalid.multiple_input.json b/sample_project/pipelines/tests.invalid.multiple_input.json
@@ -0,0 +1,30 @@
+{
+    "id": 94,
+    "name": "tests.multiple_input",
+    "nodes": [
+        {
+            "id": 1,
+            "name": "Input",
+            "consume": []
+        },
+        {
+            "id": 2,
+            "name": "Input",
+            "consume": []
+        },
+        {
+            "id": 8,
+            "name": "StereoPanning",
+            "consume": [
+                1
+            ]
+        },
+        {
+            "id": 9,
+            "name": "Output",
+            "consume": [
+                2
+            ]
+        }
+    ]
+}
diff --git a/sample_project/pipelines/tests.invalid.multiple_output.json b/sample_project/pipelines/tests.invalid.multiple_output.json
@@ -0,0 +1,32 @@
+{
+    "id": 95,
+    "name": "tests.multiple_output",
+    "nodes": [
+        {
+            "id": 1,
+            "name": "Input",
+            "consume": []
+        },
+        {
+            "id": 8,
+            "name": "StereoPanning",
+            "consume": [
+                1
+            ]
+        },
+        {
+            "id": 9,
+            "name": "Output",
+            "consume": [
+                8
+            ]
+        },
+        {
+            "id": 3,
+            "name": "Output",
+            "consume": [
+                1
+            ]
+        }
+    ]
+}
diff --git a/sample_project/pipelines/tests.invalid.self_consume.json b/sample_project/pipelines/tests.invalid.self_consume.json
@@ -0,0 +1,18 @@
+{
+    "id": 97,
+    "name": "tests.self_consume",
+    "nodes": [
+        {
+            "id": 1,
+            "name": "Input",
+            "consume": []
+        },
+        {
+            "id": 9,
+            "name": "Output",
+            "consume": [
+                9
+            ]
+        }
+    ]
+}
diff --git a/sample_project/pipelines/tests.invalid.unknown_node.json b/sample_project/pipelines/tests.invalid.unknown_node.json
@@ -0,0 +1,32 @@
+{
+    "id": 96,
+    "name": "tests.unknown_node",
+    "nodes": [
+        {
+            "id": 1,
+            "name": "Input",
+            "consume": []
+        },
+        {
+            "id": 8,
+            "name": "StereoPanning",
+            "consume": [
+                3
+            ]
+        },
+        {
+            "id": 9,
+            "name": "Output",
+            "consume": [
+                8
+            ]
+        },
+        {
+            "id": 3,
+            "name": "DoSomethingWeird",
+            "consume": [
+                1
+            ]
+        }
+    ]
+}
diff --git a/src/Core/Engine.cpp b/src/Core/Engine.cpp
@@ -682,7 +682,8 @@ namespace SparkyStudios::Audio::Amplitude
 
         if (_audioDriver == nullptr)
         {
-            amLogCritical("Failed to load the specified driver, the default driver, and the null driver. Please check your engine configuration, and ensure that all the needed plugins are loaded.");
+            amLogCritical("Failed to load the specified driver, the default driver, and the null driver. Please check your engine "
+                          "configuration, and ensure that all the needed plugins are loaded.");
             Deinitialize();
             return false;
         }
@@ -818,7 +819,9 @@ namespace SparkyStudios::Audio::Amplitude
         // Open the audio device through the driver
         if (!_audioDriver->Open(_state->mixer.GetDeviceDescription()))
         {
-            amLogError("Could not open the audio device using the '%s' driver. Loading the null driver as fallback.", _audioDriver->GetName().c_str());
+            amLogError(
+                "Could not open the audio device using the '%s' driver. Loading the null driver as fallback.",
+                _audioDriver->GetName().c_str());
             _audioDriver = sNullDriverPlugin.get();
 
             if (_audioDriver == nullptr || !_audioDriver->Open(_state->mixer.GetDeviceDescription()))
@@ -860,7 +863,8 @@ namespace SparkyStudios::Audio::Amplitude
             _state->mixer.Deinit();
 
         // Unload sound banks
-        UnloadSoundBanks();
+        while (HasLoadedSoundBanks())
+            UnloadSoundBanks();
 
         // Release HRIR sphere
         if (_state->hrir_sphere != nullptr)

diff --git a/src/Mixer/Amplimix.h b/src/Mixer/Amplimix.h
@@ -61,14 +61,14 @@ namespace SparkyStudios::Audio::Amplitude
     class AmplimixLayerImpl final : public AmplimixLayer
     {
     public:
-        AmUInt32 id; // playing id
+        AmUInt32 id = kAmInvalidObjectId; // playing id
         _Atomic(PlayStateFlag) flag; // state
         _Atomic(AmUInt64) cursor; // cursor
         _Atomic(AmReal32) gain; // gain
         _Atomic(AmReal32) pan; // pan
         _Atomic(AmReal32) pitch; // pitch
-        SoundData* snd; // sound data
-        AmUInt64 start, end; // start and end frames
+        SoundData* snd = nullptr; // sound data
+        AmUInt64 start = 0, end = 0; // start and end frames
 
         _Atomic(AmReal32) obstruction; // obstruction factor
         _Atomic(AmReal32) occlusion; // occlusion factor
@@ -79,10 +79,10 @@ namespace SparkyStudios::Audio::Amplitude
         _Atomic(AmReal32) sampleRateRatio; // sample rate ratio
         _Atomic(AmReal32) baseSampleRateRatio; // base sample rate ratio
 
-        AudioConverter* dataConverter; // miniaudio resampler & channel converter
-        PipelineInstance* pipeline; // pipeline for this layer
+        AudioConverter* dataConverter = nullptr; // miniaudio resampler & channel converter
+        PipelineInstance* pipeline = nullptr; // pipeline for this layer
 
-        AmMutexHandle mutex; // mutex for thread-safe access
+        AmMutexHandle mutex = nullptr; // mutex for thread-safe access
         std::unordered_map<AmThreadID, bool> mutexLocked; // true if mutex is locked
 
         ~AmplimixLayerImpl();