Merge branch 'develop'

Author: jananifernandez

.github/workflows/cmake.yml

@@ -32,6 +32,9 @@ jobs:
       run: |
         curl https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.26/OpenBLAS-0.3.26-x64.zip -L -o tmp.zip
         7z x ./tmp.zip -oOpenBLAS
+        cp ./OpenBLAS/lib/libopenblas.lib $GITHUB_WORKSPACE
+        cp ./OpenBLAS/bin/libopenblas.dll $GITHUB_WORKSPACE
+        echo "$GITHUB_WORKSPACE" >> $GITHUB_PATH
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all subsequent commands
@@ -66,9 +69,18 @@ jobs:
       # Execute the build.  You can specify a specific target with "--target <NAME>"
       run: cmake --build . --config $BUILD_TYPE
 
-    - name: Test
+    - name: Test (Unix)
+      if: ${{ contains( runner.os, 'Linux' ) || contains( runner.os, 'macOS' )}}
       working-directory: ${{runner.workspace}}/build
       shell: bash
-      if: ${{ contains( runner.os, 'Linux' ) || contains( runner.os, 'macOS' )}}
       # Execute tests
       run: ./test/saf_test
+      
+    - name: Test (Windows)
+      if: ${{ contains( runner.os, 'Windows' ) }}
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: |
+        cp $GITHUB_WORKSPACE/libopenblas.dll ./test/$BUILD_TYPE/
+        ls -lh ./test/$BUILD_TYPE/
+        ./test/$BUILD_TYPE/saf_test.exe

examples/src/ambi_bin/ambi_bin.c

@@ -270,7 +270,7 @@ void ambi_bin_initCodec
                 }
             }
             else{
-                saf_print_warning("Too many grid points");
+                saf_print_warning("Too many grid points to calculate grid weights. Assuming that the HRTF measurement grid was uniform.");
                 free(pars->weights);
                 pars->weights = NULL;
             }

examples/src/ambi_dec/ambi_dec_internal.c

@@ -131,6 +131,12 @@ void loadLoudspeakerArrayPreset
             /* fall through */
         case LOUDSPEAKER_ARRAY_PRESET_DEFAULT:
             /* fall through */
+        case LOUDSPEAKER_ARRAY_PRESET_STEREO:
+            nCH = 2;
+            for(ch=0; ch<nCH; ch++)
+                for(i=0; i<2; i++)
+                    dirs_deg[ch][i] = __stereo_dirs_deg[ch][i];
+            break;
         case LOUDSPEAKER_ARRAY_PRESET_5PX:
             nCH = 5;
             for(ch=0; ch<nCH; ch++)

examples/src/ambi_roomsim/ambi_roomsim.c

@@ -332,7 +332,7 @@ void ambi_roomsim_setRoomDimZ(void* const hAmbi, float newValue)
 void ambi_roomsim_setWallAbsCoeff(void* const hAmbi, int xyz_idx, int posNeg_idx, float new_value)
 {
     ambi_roomsim_data *pData = (ambi_roomsim_data*)(hAmbi);
-    saf_assert(xyz_idx<4, "xyz_idx indicates each spatial axis, so cannot exceed 4");
+    saf_assert(xyz_idx<3, "xyz_idx indicates each spatial axis, so cannot exceed 3");
     saf_assert(posNeg_idx==0 || posNeg_idx==1, "posNeg_idx is a bool");
     if(new_value!=pData->abs_wall[2*xyz_idx+posNeg_idx]){
         pData->abs_wall[2*xyz_idx+posNeg_idx] = new_value;

examples/src/binauraliser/binauraliser_internal.c

@@ -244,7 +244,7 @@ void binauraliser_initHRTFsAndGainTables(void* const hBin)
             }
         }
         else{
-            saf_print_warning("Too many grid points to calculate grid weights. i.e., we're not assuming that the HRTF measurement grid was uniform.");
+            saf_print_warning("Too many grid points to calculate grid weights. Assuming that the HRTF measurement grid was uniform.");
             free(pData->weights);
             pData->weights = NULL;
         }