update to version 1.3.1-beta.4

4Players · Jan 27, 2023 · 500b634 · 500b634
1 parent bcde0b6
commit 500b634
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 31 deletions.
diff --git a/bin/android-aarch64/libodin.so b/bin/android-aarch64/libodin.so
diff --git a/bin/android-x86_64/libodin.so b/bin/android-x86_64/libodin.so
diff --git a/bin/ios-aarch64/libodin.dylib b/bin/ios-aarch64/libodin.dylib
diff --git a/bin/ios-x86_64/libodin.dylib b/bin/ios-x86_64/libodin.dylib
diff --git a/bin/linux-aarch64/libodin.so b/bin/linux-aarch64/libodin.so
diff --git a/bin/linux-x86_64/libodin.so b/bin/linux-x86_64/libodin.so
diff --git a/bin/macos-aarch64/libodin.dylib b/bin/macos-aarch64/libodin.dylib
diff --git a/bin/macos-x86_64/libodin.dylib b/bin/macos-x86_64/libodin.dylib
diff --git a/bin/windows-aarch64/odin.dll b/bin/windows-aarch64/odin.dll
diff --git a/bin/windows-aarch64/odin.lib b/bin/windows-aarch64/odin.lib
diff --git a/bin/windows-x86_64/odin.dll b/bin/windows-x86_64/odin.dll
diff --git a/bin/windows-x86_64/odin.lib b/bin/windows-x86_64/odin.lib
diff --git a/include/odin.h b/include/odin.h
@@ -2,13 +2,15 @@
 
 #pragma once
 
+/** @file */
+
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
 
-#define ODIN_VERSION "1.3.0"
+#define ODIN_VERSION "1.3.1-beta.4"
 
 /**
  * Supported channel layouts in audio functions.
@@ -450,7 +452,7 @@ typedef struct OdinApmConfig {
      */
     float voice_activity_detection_release_probability;
     /**
-     * Enables or disables voice activity detection (VAD)
+     * Enables or disables the input volume gate
      */
     bool volume_gate;
     /**

diff --git a/test/src/main.c b/test/src/main.c
@@ -287,14 +287,39 @@ void handle_audio_data(ma_device *device, void *output, const void *input, ma_ui
     }
     else if (device->type == ma_device_type_playback)
     {
-        /*
-         * Keep things simple and fill the miniaudio output buffer with mixed data from available ODIN output streams
-         */
-        size_t samples_read = frame_count;
-        int error = odin_audio_mix_streams(room, output_streams, output_streams_len, output, &samples_read, OdinChannelLayout_Mono);
-        if (odin_is_error(error))
+        if (true /* wether or not to handle invidual streams */)
+        {
+            /**
+             * Walk through list of ODIN output streams to read and mix their data into the miniaudio output buffer
+             */
+            float *samples = malloc(frame_count * sizeof(float));
+            for (size_t i = 0; i < output_streams_len; i++)
+            {
+
+                int error = odin_audio_read_data(output_streams[i], samples, frame_count, OdinChannelLayout_Mono);
+                if (odin_is_error(error))
+                {
+                    print_error(error, "Failed to read audio data from media handle");
+                }
+                for (size_t i = 0; i < frame_count; ++i)
+                {
+                    ((float *)output)[i] += samples[i];
+                }
+            }
+            odin_audio_process_reverse(room, (float *)output, frame_count, OdinChannelLayout_Mono);
+            free(samples);
+        }
+        else
         {
-            print_error(error, "Failed to read mixed audio data");
+            /*
+             * Keep things simple and fill the miniaudio output buffer with mixed data from available ODIN output streams
+             */
+            size_t samples_read = frame_count;
+            int error = odin_audio_mix_streams(room, output_streams, output_streams_len, output, &samples_read, OdinChannelLayout_Mono);
+            if (odin_is_error(error))
+            {
+                print_error(error, "Failed to read mixed audio data");
+            }
         }
     }
 }