[#1451] Merge changes from C55 branch to expand frames search engine can handle to SHRT_MAX.

git-svn-id: https://gforge.ti.com/svn/tiesr/trunk@147 469fd053-429d-4955-9e4c-93c0d7a8ff27

4 files changed, 96 insertions, 70 deletions

diff --git a/TIesrEngine/src/gmhmm_type_common.cpp b/TIesrEngine/src/gmhmm_type_common.cpp
index 6ebd43b..d07b7a5 100755
--- a/TIesrEngine/src/gmhmm_type_common.cpp
+++ b/TIesrEngine/src/gmhmm_type_common.cpp
@@ -168,11 +168,15 @@ TIESRENGINECOREAPI_API short GetVolumeStatus(const gmhmm_type *gvv)
   return (gvv)->vol;
 }
 
-/* GMHMM_SI_API */ 
-TIESRENGINECOREAPI_API short GetConfidenceScore(const gmhmm_type *gvv)
+/* GMHMM_SI_API */
+TIESRENGINECOREAPI_API short GetConfidenceScore( const gmhmm_type *gvv )
 {
 #ifdef USE_CONFIDENCE
-   return (gvv )->cm_score;
+   /* Return confidence score if cm_score calculated */
+   if( gvv->pConf->bCalced )
+      return (gvv)->cm_score;
+   else
+      return 0;
 #else
    return 0;
 #endif
diff --git a/TIesrEngine/src/jac-estm.cpp b/TIesrEngine/src/jac-estm.cpp
index 826b15e..37de5d7 100755
--- a/TIesrEngine/src/jac-estm.cpp
+++ b/TIesrEngine/src/jac-estm.cpp
@@ -987,7 +987,14 @@ TIesrEngineJACStatusType JAC_update(gmhmm_type *gvv)
   ushort  frame_cnt[NBR_TRANSFO] /* total number of frames */;
   long temp[3*N_FILTER26];
 
-  
+    /* Can not do JAC_update if there was not enough memory to store mfcc vectors
+     recognized. This test along with access to the stored vectors and counts 
+     should be supplied outside of JAC_update to increase modularity. The 
+     error condition is flagged as no alignment, since it is not possible to 
+     do the alignment. */
+    if( gv->frm_cnt > gv->max_frame_nbr )
+       return  eTIesrEngineJACNoAlignment;
+
   //IF word based backtrace is used, do a forced alignment here.
   if (gvv->word_backtrace==WORDBT)
   { 
diff --git a/TIesrEngine/src/liveproc.cpp b/TIesrEngine/src/liveproc.cpp
index 7612ba5..ec503f3 100755
--- a/TIesrEngine/src/liveproc.cpp
+++ b/TIesrEngine/src/liveproc.cpp
@@ -201,101 +201,110 @@ MP_CallEachPass(short sig_frm[], gmhmm_type * gvv, Boolean bDoSearch)
 
 
 
-  if( gv->speech_detected && bDoSearch )
-  {
-    if( gv->frm_cnt < gv->max_frame_nbr )
-    {
-      /* several speech frames have already been detected, go back as far
-       as possible in the circular buffer */
-      idx = circ_idx( gv->buf_idx - ( MFCC_BUF_SZ - 1 ) + REG_SPAN );
-      /* fprintf(pf, "speech = %d\n",  signal_cnt - ( MFCC_BUF_SZ - 1 ) + REG_SPAN); */
+   /* Speech has been detected, do recognition */
+   if( gv->speech_detected && bDoSearch )
+   {
+      /* Check if frames processed above maximum. frm_cnt must always increase
+       for each frame processed by the recognizer. If frm_cnt has reached its
+       maximum, then declare eTIesrEngineTimeOut */
+      if( gv->frm_cnt < SHRT_MAX )
+      {
+         /* several speech frames have already been detected, go back as far
+            as possible in the circular buffer */
+         idx = circ_idx( gv->buf_idx - ( MFCC_BUF_SZ - 1 ) + REG_SPAN );
+         /* fprintf(pf, "speech = %d\n",  signal_cnt - ( MFCC_BUF_SZ - 1 ) + REG_SPAN); */
 
-      compute_regression( idx, 1, reg_mfcc, gv->n_mfcc, gv->muScaleP2, gv->mfcc_buf );
+         /* Compute delta mfcc coefficients. Build feature vector for current frame*/
+         compute_regression( idx, 1, reg_mfcc, gv->n_mfcc, gv->muScaleP2, gv->mfcc_buf );
 
-      for( i = 0; i < gv->n_mfcc; i++ )
-      {
-        mfcc_feature[i] = gv->mfcc_buf[idx][i];
-        mfcc_feature[i + gv->n_mfcc] = reg_mfcc[i];
-      }
+         for( i = 0; i < gv->n_mfcc; i++ )
+         {
+            mfcc_feature[i] = gv->mfcc_buf[idx][i];
+            mfcc_feature[i + gv->n_mfcc] = reg_mfcc[i];
+         }
 
 #if defined(USE_GAUSS_SELECT) || defined(USE_ORM_VAD)
 
-      /* compute Gaussian cluster scores */
-      i = rj_clear_obs_scr( gv, mfcc_feature );
-      /* update scores from an on-line reference model */
-      rj_update_noise( gv, mfcc_feature, i );
+         /* compute Gaussian cluster scores */
+         i = rj_clear_obs_scr( gv, mfcc_feature );
+         /* update scores from an on-line reference model */
+         rj_update_noise( gv, mfcc_feature, i );
 
 #if defined(USE_ORM_VAD)
-      /* GMM-based VAD */
-      while( ( p_fea = rj_vad_proc( gv, mfcc_feature ) ) != NULL )
-      {
+         /* GMM-based VAD. Retrieve and process all mfcc vectors available from
+          storage buffer. */
+         while( ( p_fea = rj_vad_proc( gv, mfcc_feature ) ) != NULL )
+         {
 #else
-      {
+         {
 #endif
 
 #endif
 
+            /* Save feature vector for post-recognition adaptation and confidence
+                measure calculations if room is still available the the buffer. */
+            if( gv->frm_cnt < gv->max_frame_nbr )
+            {
 #ifdef BIT8FEAT
-        if( gv->mem_feature )
-          vector_packing( p_fea, gv->mem_feature + gv->mfcc_cnt, gv->scale_feat, gv->n_mfcc );
+               if( gv->mem_feature )
+                  vector_packing( p_fea, gv->mem_feature + gv->mfcc_cnt, gv->scale_feat, gv->n_mfcc );
 #else
 
-        // Store integer values of features during recognition
-        // TODO: modify to handle static, delta, acc ...
-        if( gv->mem_feature )
-        {
-          int idx;
-          short *featmem = (short*)gv->mem_feature + 2 * gv->mfcc_cnt;
-          for( idx = 0; idx < gv->nbr_dim; idx++ )
-          {
-            featmem[idx] = p_fea[idx];
-          }
-        }
-#endif  
+               // Store integer values of features during recognition
+               // TODO: modify to handle static, delta, acc ...
+               if( gv->mem_feature )
+               {
+                  int idx;
+                  short *featmem = (short*)gv->mem_feature + 2 * gv->mfcc_cnt;
+                  for( idx = 0; idx < gv->nbr_dim; idx++ )
+                  {
+                     featmem[idx] = p_fea[idx];
+                  }
+               }
+#endif
+               /* Advance number of mfcc in buffer */
+               gv->mfcc_cnt += gv->n_mfcc;
+            }
 
+            /* Run recognition search if requested. Must start with frm_cnt = 0 */
+            a_status = (TIesrEngineStatusType)search_a_frame( p_fea, 1, gv->frm_cnt, gv );
+            gv->frm_cnt++;
 
-        /* search needs frm_cnt to start with 0 */
 
-        /* if (bDoSearch)  */
-        a_status = (TIesrEngineStatusType)search_a_frame( p_fea, 1, gv->frm_cnt, gv );
-        gv->frm_cnt++;
-        /* gv->mfcc_cnt += gv->n_mfcc; */
-        if( gv->frm_cnt < gv->max_frame_nbr )
-          gv->mfcc_cnt += gv->n_mfcc;
 
 
 
 #if defined(USE_GAUSS_SELECT) || defined(USE_ORM_VAD)
-      }
+         }
 #endif
 
-    }
+      }
 
-    else
-      /* Not allowed to do search, since the MFCC input frame buffer is full */
-      a_status = eTIesrEngineFeatureMemoryOut;
-  }
+      else
+         /* Not allowed to do search, since frm_cnt has reached its maximum. */
+         a_status = eTIesrEngineTimeOut;
+   }
 
 
-  /* Update input frame counter and MFCC circular buffer index */
-  if( gv->signal_cnt < USHRT_MAX - 1)
-    ( gv->signal_cnt )++;
+   /* Update input frame counter and MFCC circular buffer index */
+   if( gv->signal_cnt < USHRT_MAX - 1 )
+      ( gv->signal_cnt )++;
 
-  gv->buf_idx = circ_idx( ++gv->buf_idx );
+   gv->buf_idx = circ_idx( ++gv->buf_idx );
+
+
+   /* Prepare overlap (WINDOW_LEN - FRAME_LEN) for next input frame */
+   for( i = 0; i < OVERLAP; i++ )
+   {
+      gv->sample_signal[ i ] = gv->sample_signal[ i + FRAME_LEN ];
 
-/*
-  if ( gv->signal_cnt > TIMEOUT) return eTIesrEngineTimeOut;
-*/
-  
-  /* Prepare overlap for next input frame */
-  for (i = 0; i <  OVERLAP /* WINDOW_LEN - FRAME_LEN */ ; i++) {
-    gv->sample_signal[ i ] = gv->sample_signal[ i + FRAME_LEN ];
 #ifdef USE_AUDIO
-    if (gv->sample_signal[i] > gv->amplitude_max) gv->amplitude_max = gv->sample_signal[i];
-    else if (gv->sample_signal[i] < gv->amplitude_min) gv->amplitude_min = gv->sample_signal[i];
+      if( gv->sample_signal[i] > gv->amplitude_max ) gv->amplitude_max = gv->sample_signal[i];
+      else if( gv->sample_signal[i] < gv->amplitude_min ) gv->amplitude_min = gv->sample_signal[i];
 #endif
-  }
-  return a_status;
+
+   }
+   return a_status;
 }
 
 /*---------------------------------------------------------------------------
diff --git a/TIesrEngine/src/rapidsearch.cpp b/TIesrEngine/src/rapidsearch.cpp
index 4ff695c..f875ea7 100755
--- a/TIesrEngine/src/rapidsearch.cpp
+++ b/TIesrEngine/src/rapidsearch.cpp
@@ -2057,11 +2057,17 @@ static void cm_update_logistic( short iTrue, short pCM, ConfType * pConf )
 
 
 #ifdef USE_CONFIDENCE
+/* This function not currently used */
 short cm_score(gmhmm_type *gv)
 {
   ConfType * pConf = (ConfType*) (gv->pConf);
-  if (pConf->bCalced == FALSE) cm_update_status(gv);
-  return gv->cm_score; 
+
+  /* At present can only update status if JAC_update was successfully called. */
+  if (pConf && pConf->bCalced == TRUE )
+       return gv->cm_score; 
+  else
+     /* cm_update_status(gv); */
+     return 0;
 }
 
 /* update confidence measure status */