Merge pull request #13 in PROCESSOR-SDK/audio-preprocessing-fw from PRSDK-4807 to masterHEADDEV.PROCESSOR-SDK.06.01.00.07DEV.PROCESSOR-SDK.06.00.00.05DEV.PROCESSOR-SDK.05.03.00.05DEV.AUDIO_PREPROC.01.06.00.00master

* commit '668931c4ad1b70cd92bb24287bd20924639aff94':
  PRSDK-4807 Addressing review comments
  PRSDK-4807 Fix Klocwork issue

1 files changed, 16 insertions, 10 deletions

diff --git a/common/components/mss/src/mssproc.c b/common/components/mss/src/mssproc.c
index 87ce6ff..fa54d08 100644
--- a/common/components/mss/src/mssproc.c
+++ b/common/components/mss/src/mssproc.c
@@ -343,7 +343,7 @@ void mss_src_output(mssInst_t *inst, void *out, void *mic_fix[],
   }

 

   /* Check if in the middle of a switch. */

-  if(!mss_chkbit(inst->state_bf, MSS_STATE_BIT_SWITCH_SRC)) {

+  if(!mss_chkbit(inst->state_bf, MSS_STATE_BIT_SWITCH_SRC) && cur_sel_src != NULL) {

     /* If it is not during a switch, copy the current selected source to output 

        without any modification. */

     memcpy(out, cur_sel_src, inst->frame_size*sizeof(linSample));

@@ -369,17 +369,23 @@ void mss_src_output(mssInst_t *inst, void *out, void *mic_fix[],
     phase_inc = inst->crossfade_phase_inc;

     output = (linSample *)out;

 

-    for(i=0; i<inst->frame_size; i++) {

-//      alpha = (1-utlSin(phase>>16)) / 2; /* to use macros */

-      sin_phase = utlSin(phase>>16);   /* Q.31 to Q.15 */

-      fade_out_alpha = MSS_SIN_PIOVER2/2 - sin_phase/2; /* (1-sin(pha))/2 in Q.14 */

-      fade_in_alpha  = MSS_SIN_PIOVER2/2 + sin_phase/2; /* (1+sin(pha))/2 in Q.14 */

-      fade_out_alpha = mss_MIN(16383, fade_out_alpha);

-      fade_in_alpha  = mss_MIN(16383, fade_in_alpha);

-      output[i] = frctMul(cur_sel_src[i], 0, fade_out_alpha, 14, 0) 

+    if(cur_sel_src != NULL && new_sel_src != NULL)

+    {

+        for(i=0; i<inst->frame_size; i++) {

+            sin_phase = utlSin(phase>>16);   /* Q.31 to Q.15 */

+            fade_out_alpha = MSS_SIN_PIOVER2/2 - sin_phase/2; /* (1-sin(pha))/2 in Q.14 */

+            fade_in_alpha  = MSS_SIN_PIOVER2/2 + sin_phase/2; /* (1+sin(pha))/2 in Q.14 */

+            fade_out_alpha = mss_MIN(16383, fade_out_alpha);

+            fade_in_alpha  = mss_MIN(16383, fade_in_alpha);

+            output[i] = frctMul(cur_sel_src[i], 0, fade_out_alpha, 14, 0) 

                  +frctMul(new_sel_src[i], 0, fade_in_alpha,  14, 0);

-      phase += phase_inc;

+            phase += phase_inc;

+        }

+    }

+    else {

+      /* error message */

     }

+

     inst->crossfade_phase = phase;

 

     /* for debugging only */