allow binaural option if channels >= 2

mltframework · Feb 17, 2024 · 0fbe464 · 0fbe464
1 parent 74828c0
commit 0fbe464
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/modules/spatialaudio/filter_ambisonic-decoder.cpp b/src/modules/spatialaudio/filter_ambisonic-decoder.cpp
@@ -71,7 +71,7 @@ class SpatialAudio
     bool getAudio(mlt_frame frame, float *buffer, int samples, int channels)
     {
         bool error = false;
-        bool binaural = channels == 2 && mlt_properties_get_int(properties(), "binaural");
+        bool binaural = channels >= 2 && mlt_properties_get_int(properties(), "binaural");
 
         // First time setup
         if (binaural && !binauralizer.GetChannelCount()) {
@@ -158,10 +158,15 @@ class SpatialAudio
             } else {
                 for (int i = 0; i < channels; ++i)
                     speakers[i] = &buffer[samples * i];
-                if (binaural)
+                if (binaural) {
                     binauralizer.Process(&bformat, speakers, samples);
-                else
+                    if (channels > 2) {
+                        for (int i = 2; i < channels; ++i)
+                            ::memset(speakers[i], 0, samples * sizeof(float));
+                    }
+                } else {
                     decoder.Process(&bformat, samples, speakers);
+                }
             }
         }
         return error;

diff --git a/src/modules/spatialaudio/filter_ambisonic-decoder.yml b/src/modules/spatialaudio/filter_ambisonic-decoder.yml
@@ -63,7 +63,7 @@ parameters:
     title: Binaural Output
     description: >
       This indicates whether to render as binaural instead of stereo.
-      This only applies when the channel count is 2.
+      This property overrides the "ambisonic" property.
     type: boolean
     default: 0
     mutable: no