PASDK-258:Merge remote-tracking branch 'origin/dev_pasdk_pp_pasdk242HigherSamplingRat...
authorFrank Livingston <frank-livingston@ti.com>
Thu, 9 Mar 2017 20:08:08 +0000 (14:08 -0600)
committerFrank Livingston <frank-livingston@ti.com>
Thu, 9 Mar 2017 20:08:08 +0000 (14:08 -0600)
13 files changed:
1  2 
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_dsp/.cproject
pasdk/test_dsp/application/app.cfg
pasdk/test_dsp/application/app.cmd
pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
pasdk/test_dsp/framework/aspDecOpCircBuf_master.c
pasdk/test_dsp/framework/audioStreamInpProc.c
pasdk/test_dsp/framework/audioStreamOutProc.c
pasdk/test_dsp/framework/itopo/params.c
pasdk/test_dsp/framework/itopo/patchs.c
pasdk/test_dsp/framework/systemInit.c
pasdk/test_dsp/sap/sap_d10.c
scripts/build_paf_libs.bat

index 12c4e8b6902badc2a36011662f9458661ed2d025,62ce3f743c33d0384f6b66f791ec9ce4ea34dee6..deafa1ecce64122a1c555e4bd40bcd4587077e51
@@@ -718,52 -713,41 +718,54 @@@ Void taskAsdpFxn
                          //    Log_info0("capAfWrite() error");
                          //}                        
  
+                         GPIOSetOutput(GPIO_PORT_0, GPIO_PIN_107);
                          cbErrno = cbWriteAf(pCbCtl, z, pAfWrt);
 -                        if (cbErrno < 0)
 +                        if ((cbErrno < 0) && (cbErrno != ASP_DECOP_CB_WRITE_OVERFLOW))
                          {
 +                            gCbWrtAfErrCnt++;
                              //SW_BREAKPOINT; // FL: debug
 -                            
 -                            if (cbErrno == ASP_DECOP_CB_WRITE_OVERFLOW)
 +                        }
 +                        
 +                        // Handle overflows
 +                        if (cbErrno == ASP_DECOP_CB_WRITE_OVERFLOW)
 +                        {
 +                            gDecOpCbWrtAfOvr++; // increment circular buffer overflow count
 +                            if (gDecOpCbWrtAfOvr >= DEC_OP_CB_WRTAF_OVR_THR)
                              {
 +                                gMaxDecOpCbWrtAfOvr = DEC_OP_CB_WRTAF_OVR_THR; // update max overflow count
 +                                gDecOpCbWrtAfOvr = 0; // reset overflow count
 +                                
                                  // Reset circular buffer
                                  cbReset(pCbCtl, z);
 -                                // Update overflow count, return if above threshold
 -                                gDecOpCbWrtAfOvr++;
 -                                if (gDecOpCbWrtAfOvr < DEC_OP_CB_WRTAF_OVR_THR)
 -                                {
 -                                    cbErrno = 0;
 -                                }
 -                                else 
 -                                {
 -                                    gDecOpCbWrtAfOvr = 0;
 -                                }
                              }
                          }
 +                        else if ((cbErrno == ASP_DECOP_CB_SOK) && (gDecOpCbWrtAfOvr > 0))
 +                        {
 +                            // No overflow detected.
 +                            // update max overflow count,
 +                            // reset overflow count
 +                            
 +                            if (gDecOpCbWrtAfOvr > gMaxDecOpCbWrtAfOvr)
 +                            {
 +                                gMaxDecOpCbWrtAfOvr = gDecOpCbWrtAfOvr;
 +                            }
 +                            gDecOpCbWrtAfOvr = 0; // reset circular buffer overflow count
 +                            
 +                            cbErrno = 0; // don't return error condition
 +                        }
+                         GPIOClearOutput(GPIO_PORT_0, GPIO_PIN_107);
                          TRACE_TERSE0("Dec:cbWriteAf() complete");
                          
 -#if 1 // (***) FL: shows timing of CB write
 -                        /// (***) debug // B9
 -                        //{
 -                        //    static Uint8 toggleState = 0;
 -                        //    if (toggleState == 0)
 -                        //        GPIOSetOutput(GPIO_PORT_0, GPIO_PIN_107);
 -                        //    else
 -                        //        GPIOClearOutput(GPIO_PORT_0, GPIO_PIN_107);
 -                        //    toggleState = ~(toggleState);
 -                        //}
 +#if 0 // (***) FL: shows timing of CB write
 +                        // (***) debug // B9
 +                        {
 +                            static Uint8 toggleState = 0;
 +                            if (toggleState == 0)
 +                                GPIOSetOutput(GPIO_PORT_0, GPIO_PIN_107);
 +                            else
 +                                GPIOClearOutput(GPIO_PORT_0, GPIO_PIN_107);
 +                            toggleState = ~(toggleState);
 +                        }
  #endif        
                          
                          // FL: debug, log circular buffer control variables
index 1a6368570ffadc72931ea17f2c7d526eed89ffff,eab0ace19af2ec302f52154b6ebc4593133eff42..553cc09182844538ea7404efdc6b91db1943ac56
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/asp/com&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/asp/del&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/asp/fil/alg&quot;"/>
 +                                                                      <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/asp/ml0&quot;"/>
 +                                                                      <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/asp/ml0/alpha&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/asp/src4/alg&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/asp/src4/alpha&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/asp/std&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/enc/pce2/alg&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/enc/pce2/alpha&quot;"/>
Simple merge
Simple merge
index 9fc77113085d86637956f281de92ee290b8b0bf9,411c328eb11f8389728fc05093e00f73460929aa..2125b4526bfeb0c73a21fde9b53ba15509b89059
@@@ -53,9 -53,9 +53,10 @@@ All rights reserved
  //#include <pafnic_a.h>\r
  #include <pcm_a.h>\r
  #include <pce_a.h>\r
 -#include <ae_a.h>\r
  //#include <dm_a.h>\r
 +#include <ae_a.h>\r
 +#include <ml_a.h>\r
+ #include <src_a.h>\r
  #include <ddpat_a.h>\r
  #include <thd_a.h>\r
  #include <car_a.h>\r
index 3cbf034f3541dad7dd139b4846e3da96fe32db13,a4827864b0d8aa74736784ba90993c3d6c30dd8a..300ee675090ed55d6ae4fefd92017f5b83c01184
@@@ -1913,7 -1910,47 +1914,21 @@@ PAF_ASOT_decodeStream
              }
              gDecOpCbRdAfUnd = 0; // reset circular buffer underflow count
          }
 -        
 -#if 0
 -        if (cbErrno != 0)
 -        {
 -            TRACE_TERSE1("PAF_ASOT_decodeStream:cbReadAf() error=%d", cbErrno);
 -            //SW_BREAKPOINT; // FL: debug
 -            
 -            if (cbErrno == ASP_DECOP_CB_READ_UNDERFLOW)
 +        //Log_info0("PAF_ASOT_decodeStream:cbReadAf() complete.");
+         GPIOClearOutput(GPIO_PORT_0, GPIO_PIN_106);
++        Log_info0("PAF_ASOT_decodeStream:cbReadAf() complete.");
+         
 -                // Reset circular buffer
 -                cbReset(pCbCtl, z);
 -                Log_info0("PAF_ASOT_decodeStream:cbReset");
 -
 -                // Update underflow count, return if above threshold
 -                gDecOpCbRdAfUnd++;
 -                if (gDecOpCbRdAfUnd == DEC_OP_CB_RDAF_UND_THR)
 -                {
 -                    gDecOpCbRdAfUnd = 0;
 -                    return cbErrno;
 -                }
++#if 0 // (***) FL: shows timing of CB read
++            // (***) debug // B8
+             {
 -        }
 -        GPIOClearOutput(GPIO_PORT_0, GPIO_PIN_106);
 -        Log_info0("PAF_ASOT_decodeStream:cbReadAf() complete.");
 -#endif
 -        
 -
 -
 -#if 1 // (***) FL: shows timing of CB read
 -            //// (***) debug // B8
 -            //{
 -            //    static Uint8 toggleState = 0;
 -            //    if (toggleState == 0)
 -            //        GPIOSetOutput(GPIO_PORT_0, GPIO_PIN_106);
 -            //    else
 -            //        GPIOClearOutput(GPIO_PORT_0, GPIO_PIN_106);
 -            //    toggleState = ~(toggleState);
 -            //}
++                static Uint8 toggleState = 0;
++                if (toggleState == 0)
++                    GPIOSetOutput(GPIO_PORT_0, GPIO_PIN_106);
++                else
++                    GPIOClearOutput(GPIO_PORT_0, GPIO_PIN_106);
++                toggleState = ~(toggleState);
+             }
+ #endif
  
          // FL: debug
          cbLog(pCbCtl, z, 1, "PAF_ASOT_decodeStream:cbReadAf");
index 7cec93ed0ae5959d8efa7369c9bc0a6012309c43,7b141dc77e94ccb10abea947f382e199afae3b24..0503c39e45a49db6d1bff07868ae961e15bcd2d3
@@@ -72,17 -72,11 +72,11 @@@ extern PAF_ASOT_Fxns PAF_ASOT_params_fx
  
  Int gSysInit=0;
  
- // (***) FL: temporary fix for PASDK-64
- //#define TASK_AFP_PRI        ( 1 )
- //#define TASK_AIP_PRI        ( 2 )
- //#define TASK_ASIP_PRI       ( 3 )
- //#define TASK_ASOP_PRI       ( 3 )
 -#define TASK_AFP_PRI        ( 1 )//( 1 )  // (***) FL: temporary fix for PASDK-64
 -#define TASK_AIP_PRI        ( 2 )//( 2 )
 +#define TASK_AFP_PRI        ( 2 )
 +#define TASK_AIP_PRI        ( 3 )
  #define TASK_SSP_PRI        ( 1 )
 -#define TASK_ASIP_PRI       ( 3 )//( 3 )
 -#define TASK_ASOP_PRI       ( 3 )//( 3 )
 +#define TASK_ASIP_PRI       ( 5 ) //( 4 )
 +#define TASK_ASOP_PRI       ( 4 )
  
  #define __TASK_NAME__  "TaskSysInit"
  
Simple merge
Simple merge