Several updates

[processor-sdk/performance-audio-sr.git] / processor_audio_sdk_1_00_00_00 / pasdk / test_dsp / framework / audioStreamOutProc.c

diff --git a/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/framework/audioStreamOutProc.c b/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/framework/audioStreamOutProc.c
index 30228251423eb2865377898a9e3c25ec6c1c7322..c883b1caf663398d5bf6ab2d105919e68c2cd6d2 100644 (file)
--- a/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/framework/audioStreamOutProc.c
+++ b/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/framework/audioStreamOutProc.c
@@ -130,6 +130,7 @@ Void taskAsopFxn(
     const PAF_AST_Patchs *pQ
 )
 {
+    PAF_AST_Config *pC;             /* Local configuration pointer */
     Int as;                         /* Audio Stream Number (1, 2, etc.) */
     Int z;                          /* input/encode/stream/decode/output counter */
     Int i;                          /* phase */
@@ -139,31 +140,30 @@ Void taskAsopFxn(
 
     Log_info0("Enter taskAsopFxn()");    
 
-    //
-    // Audio Framework Configuration (*pC):
-    //
-    pC = &gPAF_AST_config;
-
-    TRACE_TERSE1("TaskAsop: Started with betaPrimeValue=%d.", gBetaPrimeValue);
-    as = pC->as;        /* Audio Stream Number (1, 2, etc.) */    
-
     //
     // Audio Framework Parameters & Patch (*pP, *pQ)
     //
     if (!pP) 
     {
-        TRACE_TERSE1("TaskAsop: AS%d: No Parameters defined. Exiting.", as);
+        TRACE_TERSE0("TaskAsop: No Parameters defined. Exiting.");
         LINNO_RPRT(TaskAsop, -1);
         return;
     }
 
     if (!pQ)
     {
-        TRACE_TERSE1("TaskAsip: AS%d: No Patchs defined. Exiting.", as);
+        TRACE_TERSE0("TaskAsip: No Patchs defined. Exiting.");
         LINNO_RPRT(TaskAsop, -1);
         return;
     }    
 
+    //
+    // Audio Framework Configuration (*pC):
+    //
+    pC = &gPAF_AST_config;
+    as = pC->as;        /* Audio Stream Number (1, 2, etc.) */    
+    TRACE_TERSE1("TaskAsop: Started with AS%d.", as);
+
     //
     // Initialize message log trace and line number reporting
     //
@@ -1576,12 +1576,12 @@ PAF_ASOT_decodeInit(
     Int z;                              /* decode/encode counter */
     Int errno;                          /* error number */
     Int zO, zS;
-    PAF_DecodeOpCircBuf *pCb;           /* decoder output circular buffer */
+    PAF_AST_DecOpCircBuf *pCb;          /* decoder output circular buffer */
 
     for (z=DECODE1; z < DECODEN; z++)
     {
         // Start decoder output circular buffer reads
-        pCb = &pC->xDec[z].decOpCb;
+        pCb = &pC->xDecOpCb[z];
         errno = cbReadStart(pCb);
         if (errno)
         {
@@ -1757,7 +1757,7 @@ PAF_ASOT_decodeStream(
 )
 {
     Int z;                              /* decode/stream counter */
-    PAF_DecodeOpCircBuf *pCb;
+    PAF_AST_DecOpCircBuf *pCb;          /* decoder output circular buffer */
     PAF_AudioFrame *pAfRd;
     Int cbErrno;
     Int errno;
@@ -1769,7 +1769,7 @@ PAF_ASOT_decodeStream(
         //
         // (***) FL: read circular buffer
         //
-        pCb = &pC->xDec[z].decOpCb;
+        pCb = &pC->xDecOpCb[z];
         pAfRd = pC->xStr[zS].pAudioFrame;
         cbErrno = cbReadAf(pCb, pAfRd);
         if (cbErrno != 0)
@@ -2028,14 +2028,14 @@ PAF_ASOT_decodeComplete(
     Int as  = pC->as;                   /* Audio Stream Number (1, 2, etc.) */
     Int z;                              /* decode/encode counter */
     Int errno;                          /* error number */
-    PAF_DecodeOpCircBuf *pCb;           /* decoder output circular buffer */
+    PAF_AST_DecOpCircBuf *pCb;          /* decoder output circular buffer */
 
     (void)as;  // clear compiler warning in case not used with tracing disabled
 
     for (z=DECODE1; z < DECODEN; z++)
     {
         // Stop decoder output circular buffer reads
-        pCb = &pC->xDec[z].decOpCb;
+        pCb = &pC->xDecOpCb[z];
         errno = cbReadStop(pCb);
         if (errno)
         {