Re-order CAR and OAR in patches since OAR overwrites audio frame bitstream metadata...

CAR will always execute if it follows OAR.
This follows DA8xx DH1.2 convention.

This PASDK-35 & PASDK-111 testing, before bug fix version of framework.

diff --git a/pasdk/test_dsp/framework/itopo/patchs.c b/pasdk/test_dsp/framework/itopo/patchs.c
index c460e09ac7cceb952653c09ee36cbe5734f304e9..a12d4754550a41d3f9c4d39198a45a0bdf538c88 100644 (file)
--- a/pasdk/test_dsp/framework/itopo/patchs.c
+++ b/pasdk/test_dsp/framework/itopo/patchs.c
@@ -74,18 +74,18 @@ All rights reserved.
 #define SUC_TIH_ISUC SRC_TIH_ISRC
 #endif
 
 #define SUC_TIH_ISUC SRC_TIH_ISRC
 #endif
 

-//#define _OAR_
-#ifdef _OAR_
-#include <oar.h>
-#include <oar_tig.h>
-#endif
-
-#define _CAR_
+//#define _CAR_

 #ifdef _CAR_
 #include <car.h>
 #include <car_tig.h>
 #endif
 
 #ifdef _CAR_
 #include <car.h>
 #include <car_tig.h>
 #endif
 

+#define _OAR_
+#ifdef _OAR_
+#include <oar.h>
+#include <oar_tig.h>
+#endif
+

 //#define _DAP_
 #ifdef _DAP_
 #include <dap.h>
 //#define _DAP_
 #ifdef _DAP_
 #include <dap.h>


@@ -109,14 +109,14 @@ const PAF_ASP_LinkInit aspLinkInitAllI13[] =
     PAF_ASP_LINKINITPARAMS(STD, SRC, TIH, &ISRC_PARAMS_DS_8CH_HBW),
 #endif
 
     PAF_ASP_LINKINITPARAMS(STD, SRC, TIH, &ISRC_PARAMS_DS_8CH_HBW),
 #endif
 

-#ifdef _OAR_
-    PAF_ASP_LINKINIT(STD, OAR, TIG),
-#endif
-

 #ifdef _CAR_
     PAF_ASP_LINKINIT(STD, CAR, TIG),
 #endif
 
 #ifdef _CAR_
     PAF_ASP_LINKINIT(STD, CAR, TIG),
 #endif
 

+#ifdef _OAR_
+    PAF_ASP_LINKINIT(STD, OAR, TIG),
+#endif
+

 #ifdef _DAP_
     PAF_ASP_LINKINIT(STD, DAP, TIG),
 #endif
 #ifdef _DAP_
     PAF_ASP_LINKINIT(STD, DAP, TIG),
 #endif


@@ -143,14 +143,14 @@ const PAF_ASP_LinkInit aspLinkInitStdI13[] =
     PAF_ASP_LINKINITPARAMS(STD, SRC, TIH, &ISRC_PARAMS_DS_8CH_HBW),
 #endif
 
     PAF_ASP_LINKINITPARAMS(STD, SRC, TIH, &ISRC_PARAMS_DS_8CH_HBW),
 #endif
 

-#ifdef _OAR_
-    PAF_ASP_LINKINIT(STD, OAR, TIG),
-#endif
-

 #ifdef _CAR_
     PAF_ASP_LINKINIT(STD, CAR, TIG),
 #endif
 
 #ifdef _CAR_
     PAF_ASP_LINKINIT(STD, CAR, TIG),
 #endif
 

+#ifdef _OAR_
+    PAF_ASP_LINKINIT(STD, OAR, TIG),
+#endif
+

 #ifdef _DAP_
     PAF_ASP_LINKINIT(STD, DAP, TIG),
 #endif
 #ifdef _DAP_
     PAF_ASP_LINKINIT(STD, DAP, TIG),
 #endif