Merge pull request #33 from leomccormack/soloFeature

Solo feature

Author: leomccormack

examples/include/ambi_enc.h

@@ -146,6 +146,22 @@ void ambi_enc_setNormType(void* const hAmbi, int newType);
  */
 void ambi_enc_setEnablePostScaling(void* const hAmbi, int newStatus);
 
+
+/**
+ * Sets gain factor for an input source.
+ */
+void ambi_enc_setSourceGain(void* const hAmbi, int srcIdx, float newGain);
+
+/**
+ * Set a source to solo.
+ */
+void ambi_enc_setSourceSolo(void* const hAmbi, int srcIdx);
+
+/**
+ * Unsolo / unmute all sources.
+ */
+void ambi_enc_setUnSolo(void* const hAmbi);
+
 
 /* ========================================================================== */
 /*                                Get Functions                               */

examples/include/binauraliser.h

@@ -216,6 +216,20 @@ void binauraliser_setRPYflag(void* const hBin, int newState);
 /** NOT IMPLEMENTED YET */
 void binauraliser_setInterpMode(void* const hBin, int newMode);
 
+/**
+ * Sets gain factor for an input source.
+ */
+void binauraliser_setSourceGain(void* const hBin, int srcIdx, float newGain);
+
+/**
+ * Set a source to solo.
+ */
+void binauraliser_setSourceSolo(void* const hBin, int srcIdx);
+
+/**
+ * Unsolo / unmute all sources.
+ */
+void binauraliser_setUnSolo(void* const hBin);
 
 
 /* ========================================================================== */

examples/src/ambi_enc/ambi_enc.c

@@ -40,8 +40,10 @@ void ambi_enc_create
     /* default user parameters */
     loadSourceConfigPreset(SOURCE_CONFIG_PRESET_DEFAULT, pData->src_dirs_deg, &(pData->new_nSources));
     pData->nSources = pData->new_nSources;
-    for(i=0; i<MAX_NUM_INPUTS; i++)
+    for(i=0; i<MAX_NUM_INPUTS; i++){
         pData->recalc_SH_FLAG[i] = 1;
+        pData->src_gains[i] = 1.f;
+    }
     pData->chOrdering = CH_ACN;
     pData->norm = NORM_SN3D;
     pData->order = SH_ORDER_FIRST;
@@ -117,18 +119,21 @@ void ambi_enc_process
 
         /* recalulate SHs (only if encoding direction has changed) */
         mixWithPreviousFLAG = 0;
-        for(i=0; i<nSources; i++){
-            if(pData->recalc_SH_FLAG[i]){
-                getRSH_recur(order, pData->src_dirs_deg[i], 1, (float*)Y_src);
+        for(ch=0; ch<nSources; ch++){
+            if(pData->recalc_SH_FLAG[ch]){
+                getRSH_recur(order, pData->src_dirs_deg[ch], 1, (float*)Y_src);
                 for(j=0; j<nSH; j++)
-                    pData->Y[j][i] = Y_src[j];
+                    pData->Y[j][ch] = Y_src[j];
                 for(; j<MAX_NUM_SH_SIGNALS; j++)
-                    pData->Y[j][i] = 0.0f;
-                pData->recalc_SH_FLAG[i] = 0;
+                    pData->Y[j][ch] = 0.0f;
+                pData->recalc_SH_FLAG[ch] = 0;
 
                 /* If encoding gains have changed, then we should also mix with and interpolate the previous gains */
                 mixWithPreviousFLAG = 1;
             }
+            /* Apply source gains */
+            if(fabsf(pData->src_gains[ch] - 1.f) > 1e-6f)
+                utility_svsmul(pData->inputFrameTD[ch], &(pData->src_gains[ch]), AMBI_ENC_FRAME_SIZE, NULL);
         }
 
         /* spatially encode the input signals into spherical harmonic signals */
@@ -281,6 +286,30 @@ void ambi_enc_setEnablePostScaling(void* const hAmbi, int newStatus)
     pData->enablePostScaling = newStatus;
 }
 
+void ambi_enc_setSourceGain(void* const hAmbi, int srcIdx, float newGain)
+{
+    ambi_enc_data *pData = (ambi_enc_data*)(hAmbi);
+    pData->src_gains[srcIdx] = newGain;
+}
+
+void ambi_enc_setSourceSolo(void* const hAmbi, int srcIdx)
+{
+    ambi_enc_data *pData = (ambi_enc_data*)(hAmbi);
+    int i;
+    for(i=0; i<pData->nSources; i++){
+        if(i==srcIdx)
+            pData->src_gains[i] = 1.f;
+        else
+            pData->src_gains[i] = 0.f;
+    }
+}
+
+void ambi_enc_setUnSolo(void* const hAmbi)
+{
+    ambi_enc_data *pData = (ambi_enc_data*)(hAmbi);
+    for(int i=0; i<pData->nSources; i++)
+        pData->src_gains[i] = 1.f;
+}
 
 /* Get Functions */
 

examples/src/ambi_enc/ambi_enc_internal.h

@@ -80,7 +80,8 @@ typedef struct _ambi_enc
     NORM_TYPES norm;                                             /**< Ambisonic normalisation convention (see #NORM_TYPES) */
     SH_ORDERS order;                                             /**< Current SH encoding order */
     int enablePostScaling;                                       /**< Flag 1: output signals scaled by 1/sqrt(nSources), 0: disabled */
-    
+    float src_gains[MAX_NUM_INPUTS];                             /**< Gains applied per source */
+
 } ambi_enc_data;
 
 

examples/src/binauraliser/binauraliser.c

@@ -88,8 +88,10 @@ void binauraliser_create
     pData->codecStatus = CODEC_STATUS_NOT_INITIALISED;
     pData->procStatus = PROC_STATUS_NOT_ONGOING;
     pData->reInitHRTFsAndGainTables = 1;
-    for(ch=0; ch<MAX_NUM_INPUTS; ch++)
+    for(ch=0; ch<MAX_NUM_INPUTS; ch++) {
         pData->recalc_hrtf_interpFLAG[ch] = 1;
+        pData->src_gains[ch] = 1.f;
+    }
     pData->recalc_M_rotFLAG = 1; 
 }
 
@@ -215,6 +217,12 @@ void binauraliser_process
         for(; i<nSources; i++)
             memset(pData->inputFrameTD[i], 0, BINAURALISER_FRAME_SIZE * sizeof(float));
 
+        /* Apply source gains */
+        for (ch = 0; ch < nSources; ch++) {
+            if(fabsf(pData->src_gains[ch] - 1.f) > 1e-6f)
+                utility_svsmul(pData->inputFrameTD[ch], &(pData->src_gains[ch]), BINAURALISER_FRAME_SIZE, NULL);
+        }
+
         /* Apply time-frequency transform (TFT) */
         afSTFT_forward_knownDimensions(pData->hSTFT, pData->inputFrameTD, BINAURALISER_FRAME_SIZE, MAX_NUM_INPUTS, TIME_SLOTS, pData->inputframeTF);
 
@@ -436,6 +444,30 @@ void binauraliser_setInterpMode(void* const hBin, int newMode)
         pData->recalc_hrtf_interpFLAG[ch] = 1;
 }
 
+void binauraliser_setSourceGain(void* const hAmbi, int srcIdx, float newGain)
+{
+    binauraliser_data *pData = (binauraliser_data*)(hAmbi);
+    pData->src_gains[srcIdx] = newGain;
+}
+
+void binauraliser_setSourceSolo(void* const hAmbi, int srcIdx)
+{
+    binauraliser_data *pData = (binauraliser_data*)(hAmbi);
+    int i;
+    for(i=0; i<pData->nSources; i++){
+        if(i==srcIdx)
+            pData->src_gains[i] = 1.f;
+        else
+            pData->src_gains[i] = 0.f;
+    }
+}
+
+void binauraliser_setUnSolo(void* const hAmbi)
+{
+    binauraliser_data *pData = (binauraliser_data*)(hAmbi);
+    for(int i=0; i<pData->nSources; i++)
+         pData->src_gains[i] = 1.f;
+}
 
 
 /* Get Functions */

examples/src/binauraliser/binauraliser_internal.h

@@ -133,7 +133,8 @@ typedef struct _binauraliser
     int bFlipPitch;                          /**< flag to flip the sign of the pitch rotation angle */
     int bFlipRoll;                           /**< flag to flip the sign of the roll rotation angle */
     int useRollPitchYawFlag;                 /**< rotation order flag, 1: r-p-y, 0: y-p-r */
-    
+    float src_gains[MAX_NUM_INPUTS];         /**< Gains applied per source */
+
 } binauraliser_data;