From 624502b3a47c118171a9abad195837a4832716e0 Mon Sep 17 00:00:00 2001
From: Elephant ~ <r.davicarvalho@gmail.com>
Date: Mon, 17 Apr 2023 22:45:44 +0100
Subject: [PATCH] include batch files

---
 env_setup.bat    |  4 ++++
 renderer.py      | 26 +++++++++-----------------
 start_spyder.bat |  2 ++
 3 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 env_setup.bat
 create mode 100644 start_spyder.bat

diff --git a/env_setup.bat b/env_setup.bat
new file mode 100644
index 0000000..8c80979
--- /dev/null
+++ b/env_setup.bat
@@ -0,0 +1,4 @@
+call conda create -n auralizaeac python=3.10 -y 
+call conda activate auralizaeac
+
+call pip install -r requirements.txt --user 
\ No newline at end of file
diff --git a/renderer.py b/renderer.py
index b312b99..1a2ab4b 100644
--- a/renderer.py
+++ b/renderer.py
@@ -11,7 +11,7 @@
 import warnings
 import threading
 import numpy as np
-import librosa as lb
+import soundfile as sf
 from copy import deepcopy
 from FIRconv import FIRfilter
 from EACheadtracker import HeadTracker
@@ -52,7 +52,7 @@
     elevação=90: topo
     azimute negativo: esquerda
 '''
-src_azim = 30  # azimute
+src_azim = 0  # azimute
 src_elev = 0   # elevação
 
 # ##################################################################################33
@@ -75,20 +75,12 @@
 
 
 # %% Audio Input
-def mono2stereo(audio):
-    if np.size(audio.shape) < 2:
-        audio = np.expand_dims(audio, 0)
-        audio = np.append(audio, audio, axis=0)
-    return audio.T
-
-
 # Audio input
-audio_in, _ = lb.load(audioPath,
-                      sr=fs,
-                      mono=True,
-                      duration=None,
+audio_in, _ = sf.read(audioPath,
+                      samplerate=None,
+                      always_2d=True,
                       dtype=np.float32)  # input signal
-audio_in = mono2stereo(audio_in)
+audio_in = np.mean(audio_in, axis=1, keepdims=True)
 N_ch = audio_in.shape[-1]
 
 
@@ -110,7 +102,7 @@ def sph2cart(posArray):
 
 def closestPosIdx(posArray, azi, ele, src_azim=src_azim, src_elev=src_elev):
     aparent_azi = azi - src_azim
-    aparent_ele = ele - src_elev
+    aparent_ele = src_elev - ele
     pErr = np.sqrt((posArray[:, 0] - aparent_azi)**2 +
                    (posArray[:, 1] - aparent_ele)**2)
     return np.argmin(pErr)
@@ -129,7 +121,7 @@ def closestPosIdx(posArray, azi, ele, src_azim=src_azim, src_elev=src_elev):
 p = pyaudio.PyAudio()
 # open stream (2)
 stream = p.open(format=pyaudio.paFloat32,
-                channels=N_ch,
+                channels=2,
                 rate=fs,
                 output=True,
                 frames_per_buffer=buffer_sz)
@@ -137,7 +129,7 @@ def closestPosIdx(posArray, azi, ele, src_azim=src_azim, src_elev=src_elev):
 # play stream (3)
 sigLen = audio_in.shape[0]
 
-data_out = np.zeros((buffer_sz, N_ch))
+data_out = np.zeros((buffer_sz, 2))
 frame_start = 0
 frame_end = frame_start + buffer_sz
 while True:
diff --git a/start_spyder.bat b/start_spyder.bat
new file mode 100644
index 0000000..a645ca8
--- /dev/null
+++ b/start_spyder.bat
@@ -0,0 +1,2 @@
+call conda activate auralizaeac
+call spyder
\ No newline at end of file