xiemeng / Optek_sdk_131 · Commits

Commit 8e886ba1c4757b4904b4b42123e1c12656091b34

Authored by LuoZheSi
1 parent 935235d9

refactor(optek link sync with dma0):Closes #I3Y4QX

Inline Side-by-side
Showing 10 changed files with 218 additions and 214 deletions
... ... @@ -21,38 +21,38 @@
21 21 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/tools/RG-2018.9-win32/XtensaTools/xtensa-elf/include"/>
22 22 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++"/>
23 23 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++/xtensa-elf"/>
24   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\include&quot;"/>
25   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\threadRTOS\inc&quot;"/>
26   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\inc&quot;"/>
27   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\include&quot;"/>
28   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\Source\os\freeRTOS\portable\XCC\Xtensa&quot;"/>
29   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\Xtensa&quot;"/>
30   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\hw&quot;"/>
31   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os&quot;"/>
32   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\printf&quot;"/>
33   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common&quot;"/>
34   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec&quot;"/>
35   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\include&quot;"/>
36   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\wav_dec&quot;"/>
37   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\dd_ac3_dec&quot;"/>
38   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\mp3_enc\&quot;"/>
39   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\dsp&quot;"/>
40   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\mp3dec\include&quot;"/>
41   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\mp3dec\test\include&quot;"/>
42   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\wmadec\include&quot;"/>
43   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci&quot;"/>
44   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci\lib&quot;"/>
45   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\ui\OEM&quot;"/>
46   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\usbhost&quot;"/>
47   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\usbdev&quot;"/>
48   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\media_uis&quot;"/>
49   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\audio&quot;"/>
50   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\dsp\d2as&quot;"/>
51   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\display&quot;"/>
52   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\remote&quot;"/>
53   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\sd&quot;"/>
54   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\save&quot;"/>
55   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\tone&quot;"/>
  24 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\include&quot;"/>
  25 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\threadRTOS\inc&quot;"/>
  26 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\inc&quot;"/>
  27 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\include&quot;"/>
  28 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\Source\os\freeRTOS\portable\XCC\Xtensa&quot;"/>
  29 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\Xtensa&quot;"/>
  30 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\hw&quot;"/>
  31 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os&quot;"/>
  32 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\printf&quot;"/>
  33 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common&quot;"/>
  34 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec&quot;"/>
  35 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\include&quot;"/>
  36 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\wav_dec&quot;"/>
  37 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\dd_ac3_dec&quot;"/>
  38 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\mp3_enc\&quot;"/>
  39 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\dsp&quot;"/>
  40 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\mp3dec\include&quot;"/>
  41 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\mp3dec\test\include&quot;"/>
  42 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\wmadec\include&quot;"/>
  43 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci&quot;"/>
  44 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci\lib&quot;"/>
  45 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\ui\OEM&quot;"/>
  46 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\usbhost&quot;"/>
  47 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\usbdev&quot;"/>
  48 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\media_uis&quot;"/>
  49 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\audio&quot;"/>
  50 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\dsp\d2as&quot;"/>
  51 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\display&quot;"/>
  52 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\remote&quot;"/>
  53 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\sd&quot;"/>
  54 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\save&quot;"/>
  55 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\tone&quot;"/>
56 56 </option>
57 57 <option id="org.eclipse.cdt.build.core.settings.holder.symbols.1682679382" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
58 58 <listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
... ... @@ -103,38 +103,38 @@
103 103 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/tools/RG-2018.9-win32/XtensaTools/xtensa-elf/include"/>
104 104 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++"/>
105 105 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++/xtensa-elf"/>
106   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\include&quot;"/>
107   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\threadRTOS\inc&quot;"/>
108   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\inc&quot;"/>
109   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\include&quot;"/>
110   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\Source\os\freeRTOS\portable\XCC\Xtensa&quot;"/>
111   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\Xtensa&quot;"/>
112   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\hw&quot;"/>
113   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os&quot;"/>
114   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\printf&quot;"/>
115   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common&quot;"/>
116   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec&quot;"/>
117   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\include&quot;"/>
118   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\wav_dec&quot;"/>
119   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\dd_ac3_dec&quot;"/>
120   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\mp3_enc\&quot;"/>
121   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\dsp&quot;"/>
122   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\mp3dec\include&quot;"/>
123   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\mp3dec\test\include&quot;"/>
124   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\wmadec\include&quot;"/>
125   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci&quot;"/>
126   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci\lib&quot;"/>
127   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\ui\OEM&quot;"/>
128   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\usbhost&quot;"/>
129   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\usbdev&quot;"/>
130   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\media_uis&quot;"/>
131   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\audio&quot;"/>
132   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\dsp\d2as&quot;"/>
133   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\display&quot;"/>
134   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\remote&quot;"/>
135   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\sd&quot;"/>
136   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\save&quot;"/>
137   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\tone&quot;"/>
  106 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\include&quot;"/>
  107 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\threadRTOS\inc&quot;"/>
  108 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\inc&quot;"/>
  109 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\include&quot;"/>
  110 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\Source\os\freeRTOS\portable\XCC\Xtensa&quot;"/>
  111 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\Xtensa&quot;"/>
  112 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\hw&quot;"/>
  113 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os&quot;"/>
  114 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\printf&quot;"/>
  115 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common&quot;"/>
  116 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec&quot;"/>
  117 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\include&quot;"/>
  118 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\wav_dec&quot;"/>
  119 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\dd_ac3_dec&quot;"/>
  120 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\mp3_enc\&quot;"/>
  121 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\dsp&quot;"/>
  122 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\mp3dec\include&quot;"/>
  123 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\mp3dec\test\include&quot;"/>
  124 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\wmadec\include&quot;"/>
  125 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci&quot;"/>
  126 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci\lib&quot;"/>
  127 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\ui\OEM&quot;"/>
  128 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\usbhost&quot;"/>
  129 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\usbdev&quot;"/>
  130 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\media_uis&quot;"/>
  131 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\audio&quot;"/>
  132 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\dsp\d2as&quot;"/>
  133 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\display&quot;"/>
  134 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\remote&quot;"/>
  135 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\sd&quot;"/>
  136 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\save&quot;"/>
  137 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\tone&quot;"/>
138 138 </option>
139 139 <option id="org.eclipse.cdt.build.core.settings.holder.symbols.1136703501" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
140 140 <listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
... ... @@ -185,38 +185,38 @@
185 185 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/tools/RG-2018.9-win32/XtensaTools/xtensa-elf/include"/>
186 186 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++"/>
187 187 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++/xtensa-elf"/>
188   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\include&quot;"/>
189   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\threadRTOS\inc&quot;"/>
190   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\inc&quot;"/>
191   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\include&quot;"/>
192   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\Source\os\freeRTOS\portable\XCC\Xtensa&quot;"/>
193   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\Xtensa&quot;"/>
194   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\hw&quot;"/>
195   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\os&quot;"/>
196   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\printf&quot;"/>
197   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common&quot;"/>
198   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec&quot;"/>
199   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\include&quot;"/>
200   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\wav_dec&quot;"/>
201   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\dd_ac3_dec&quot;"/>
202   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\codec\mp3_enc\&quot;"/>
203   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\dsp&quot;"/>
204   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\mp3dec\include&quot;"/>
205   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\mp3dec\test\include&quot;"/>
206   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\wmadec\include&quot;"/>
207   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci&quot;"/>
208   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci\lib&quot;"/>
209   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\ui\OEM&quot;"/>
210   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\usbhost&quot;"/>
211   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\usbdev&quot;"/>
212   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\media_uis&quot;"/>
213   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\audio&quot;"/>
214   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\dsp\d2as&quot;"/>
215   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\display&quot;"/>
216   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\remote&quot;"/>
217   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\media\sd&quot;"/>
218   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\save&quot;"/>
219   - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_developing\BlueSea_OPTEK_LINK_SDK\source\common\tone&quot;"/>
  188 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\include&quot;"/>
  189 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\threadRTOS\inc&quot;"/>
  190 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\inc&quot;"/>
  191 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\include&quot;"/>
  192 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\Source\os\freeRTOS\portable\XCC\Xtensa&quot;"/>
  193 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\Xtensa&quot;"/>
  194 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\hw&quot;"/>
  195 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\os&quot;"/>
  196 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\printf&quot;"/>
  197 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common&quot;"/>
  198 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec&quot;"/>
  199 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\include&quot;"/>
  200 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\wav_dec&quot;"/>
  201 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\dd_ac3_dec&quot;"/>
  202 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\codec\mp3_enc\&quot;"/>
  203 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\dsp&quot;"/>
  204 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\mp3dec\include&quot;"/>
  205 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\mp3dec\test\include&quot;"/>
  206 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\wmadec\include&quot;"/>
  207 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci&quot;"/>
  208 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci\lib&quot;"/>
  209 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\ui\OEM&quot;"/>
  210 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\usbhost&quot;"/>
  211 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\usbdev&quot;"/>
  212 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\media_uis&quot;"/>
  213 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\audio&quot;"/>
  214 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\dsp\d2as&quot;"/>
  215 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\display&quot;"/>
  216 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\remote&quot;"/>
  217 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\media\sd&quot;"/>
  218 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\save&quot;"/>
  219 + <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_debug2\BlueSea_OPTEK_LINK_SDK\source\common\tone&quot;"/>
220 220 </option>
221 221 <option id="org.eclipse.cdt.build.core.settings.holder.symbols.1841637738" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
222 222 <listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
... ...
... ... @@ -18,7 +18,7 @@ export SHELL = cmd
18 18 export PATH = D:\usr\xtensa\XtDevTools\install\tools\RG-2018.9-win32\XtensaTools\bin\;D:\usr\xtensa\XtDevTools\install\tools\RG-2018.9-win32\XtensaTools\lib\iss\;C:\WINDOWS\system32
19 19
20 20 all:
21   - cmd /c "cd /D ""E:\\workspace_optek_link_sdk_developing\\BlueSea_OPTEK_LINK_SDK\\bin\\Optek_HiFi3_prod\\Debug"" && $(MAKE) all "
  21 + cmd /c "cd /D ""E:\\workspace_optek_link_sdk_debug2\\BlueSea_OPTEK_LINK_SDK\\bin\\Optek_HiFi3_prod\\Debug"" && $(MAKE) all "
22 22
23 23 clean:
24   - cmd /c "cd /D ""E:\\workspace_optek_link_sdk_developing\\BlueSea_OPTEK_LINK_SDK\\bin\\Optek_HiFi3_prod\\Debug"" && $(MAKE) clean "
  24 + cmd /c "cd /D ""E:\\workspace_optek_link_sdk_debug2\\BlueSea_OPTEK_LINK_SDK\\bin\\Optek_HiFi3_prod\\Debug"" && $(MAKE) clean "
... ...
... ... @@ -693,7 +693,7 @@ void app_nav_rmt_convert_aux(void)
693 693 app_dac_receive_pcm_enable(FALSE);
694 694
695 695 #if defined OPL_MODE_TWO_WAY || defined OPL_MODE_SINGLE_WAY
696   - #if 1
  696 + #if 0//two way test
697 697 #ifdef UPSTREAM_SAMPLERATE_48k
698 698 app_change_mode_req(GAME_HEADPHONE_PT_5MS_LP,100,60);
699 699 #else
... ...
... ... @@ -180,12 +180,14 @@ void app_nav_rmt_convert_bt_hci(void)
180 180 app_main_data.playing_stream_status = STREAM_WAITING_DATA;
181 181 app_main_data.ui_background = app_nav_bt_hci_process;
182 182
  183 + #ifdef BT_RELINK_ENABLE
183 184 if(app_main_data.share_link_role != SL_ROLE_SLAVE)
184 185 {
185 186 //uiBtHCI_relink();
186 187 app_timer_bt_reLinktTimer_time_set(3000);
187 188 }
188   -
  189 + #endif
  190 +
189 191 if (app_main_data.share_link_role == SL_ROLE_SLAVE)
190 192 {
191 193 #if (defined OPL_MODE_TWO_WAY || defined OPL_MODE_SINGLE_WAY)
... ... @@ -229,12 +231,6 @@ void app_nav_rmt_convert_bt_hci(void)
229 231 DBG_Assert(s != INVALID_STREAM_ID);
230 232 }*/
231 233
232   -#if 0//def BT_HCI_RELINK
233   - if (app_main_data.tws_role == TWS_L)
234   - {
235   - app_timer_relink_time_set(6000);
236   - }
237   -#endif
238 234
239 235 #if defined AUDIO_CODEC_USED_CHANNEL
240 236 AUDIOdevice.Set_Channel(app_main_data.media);
... ...
... ... @@ -363,6 +363,7 @@ void app_dac_receive_pcm_enable(U8 con)
363 363
364 364 if (con)
365 365 {
  366 + clear_decode_data_rev_event();
366 367 fifo_init (&AdcInFifo, awInStore.awInSampleStore1[0], ADC_IN_FIFO_SIZE,TRUE);
367 368 memset((void *)awInStore.awInSampleStore1[0], 0, ADC_IN_FIFO_SIZE);
368 369 pDmaDest = (U32 *)awInStore.awInSampleStore1[0];
... ... @@ -405,7 +406,7 @@ void app_dac_receive_pcm_enable(U8 con)
405 406 if (optek_link_mode == GAME_HEADPHONE_PT7P5MS_T7R3E || optek_link_mode == BC_SF48K_PT7P5MS)
406 407 DMA_Channel2_Init(pDmaDest, pDmaSrc, 16*11+48, DmaSel);
407 408 else
408   - DMA_Channel2_Init(pDmaDest, pDmaSrc, 16*6+48, DmaSel);
  409 + DMA_Channel2_Init(pDmaDest, pDmaSrc, 16*5+48, DmaSel);
409 410 #endif
410 411 }
411 412 }
... ... @@ -648,6 +649,11 @@ U8* wait_decode_data(void)
648 649 }
649 650 }
650 651
  652 +void clear_decode_data_rev_event(void)
  653 +{
  654 + xEventGroupWaitBits(event_grop, AUDIO_DECODE_EVENT2, pdTRUE, pdTRUE, 0);
  655 +}
  656 +
651 657 #ifdef UART0_TX_DMA
652 658 void SoftInt0Isr (void)
653 659 {
... ...
... ... @@ -1933,8 +1933,6 @@ detect_enter:
1933 1933 //audio_pll_set_fnpll_clk_in ();
1934 1934 //audio_pll_set (SR_48000_SPDIF_2x); //detect sample rate
1935 1935
1936   - spdif_data_parser_init();
1937   -
1938 1936 //audio_pll_set (SR_49000_SPDIF); //detect sample rate
1939 1937 hw_audio_pll_clk_fre_set(SF_BASE_DET, SPDIF_SF_4x);
1940 1938 apdif_dect_cn_init();
... ... @@ -1945,7 +1943,8 @@ detect_enter:
1945 1943
1946 1944 //lzs spdif_dec_disable (); //also disable detect
1947 1945 app_cmd_DecoderExit();
1948   -
  1946 +
  1947 + spdif_data_parser_init();
1949 1948 Spdif_StreamConfig();
1950 1949
1951 1950 app_main_data.playing_stream_status = STREAM_SPDIF_SR_REDETECT;
... ...
... ... @@ -90,7 +90,6 @@ U16 app_dec_request_codec_exit (void)
90 90 U16 discard_frame_cnt;
91 91 U32 max_peak;
92 92 U16 noice_cnt;
93   -U8 inout_dma_sync_flag;
94 93 #define MAX_NOISE_GAIN 128
95 94 void pcm_dec_init(void)
96 95 {
... ... @@ -114,8 +113,6 @@ void pcm_dec_init(void)
114 113 #ifndef OPTEK_LINK_ENABLE
115 114 app_dac_receive_pcm_enable(TRUE);
116 115 #endif
117   -
118   - inout_dma_sync_flag = FALSE;
119 116 }
120 117
121 118 void pcm_dec_fini(int reason)
... ... @@ -1385,6 +1382,8 @@ void taskDec(void *pvParameters)
1385 1382 part1_samples = DEC_PART1_SAMPLES;//
1386 1383 pDacbuf = NULL;
1387 1384
  1385 + spk_out_sync_w_tx_status = SPK_AND_TX_SYNCED;
  1386 +
1388 1387 while(1)
1389 1388 {
1390 1389 #ifdef OPTEK_LINK_ENABLE
... ... @@ -1451,55 +1450,6 @@ void taskDec(void *pvParameters)
1451 1450 csbm_tx_init(app_main_data.playing_stream_sample_rate,decode_type == DECODE_SBC);
1452 1451 }
1453 1452
1454   - #ifdef OPL_MODE_SINGLE_WAY
1455   - //app_change_mode_req(BC_SF48K_PT5MS,100,6);
1456   -
1457   - if (app_main_data.playing_stream_sample_rate == 48000)
1458   - {
1459   - app_change_mode_req(BC_SF48K_PT5MS,100,6);
1460   - }
1461   - else if (app_main_data.playing_stream_sample_rate == 44100)
1462   - {
1463   - app_change_mode_req(BC_SF44K_PT5MS,108,6);
1464   - }
1465   - else
1466   - {
1467   - DBG_Printf("optek link not support sample rate\r\n");
1468   - }
1469   - #elif defined OPL_MODE_SWF
1470   - if (decode_type == DECODE_SBC)
1471   - {
1472   - /*if (app_main_data.playing_stream_sample_rate == 48000)
1473   - {
1474   - app_change_mode_req(SUBW_SF48K_PT2P5MS,24,6);
1475   - }
1476   - else if (app_main_data.playing_stream_sample_rate == 44100)
1477   - {
1478   - app_change_mode_req(SUBW_SF44K_PT2P5MS,24,6);
1479   - }
1480   - else
1481   - {
1482   - DBG_Printf("optek link not support sample rate\r\n");
1483   - }*/
1484   - }
1485   - else
1486   - {
1487   - if (app_main_data.playing_stream_sample_rate == 48000)
1488   - {
1489   - app_change_mode_req(SUBW_SF48K_PT2P5MS,24,6);
1490   - }
1491   - else if (app_main_data.playing_stream_sample_rate == 44100)
1492   - {
1493   - app_change_mode_req(SUBW_SF44K_PT2P5MS,24,6);
1494   - }
1495   - else
1496   - {
1497   - DBG_Printf("optek link not support sample rate\r\n");
1498   - }
1499   - }
1500   -
1501   - #endif
1502   -
1503 1453 if (app_main_data.playing_stream_chans == 1)
1504 1454 max_out_len = AUDIO_OUT_BUF_SIZE;
1505 1455 else
... ... @@ -1528,7 +1478,8 @@ void taskDec(void *pvParameters)
1528 1478 case DECODE_EXIT:
1529 1479 if (decoding_flag)
1530 1480 {
1531   - DBG_Printf("codec exit:%s\r\n",p_decode->dec_name);
  1481 + DBG_Printf("codec exit:%s\r\n",p_decode->dec_name);
  1482 + spk_out_sync_w_tx_status = SPK_AND_TX_SYNCED;
1532 1483 decoding_flag = FALSE;
1533 1484 p_decode->fini(DECODE_USER_EXIT);
1534 1485 app_main_data.playing_stream_chans = 2;
... ... @@ -1602,6 +1553,7 @@ void taskDec(void *pvParameters)
1602 1553 }
1603 1554 else
1604 1555 {
  1556 + spk_out_sync_w_tx_status = SPK_AND_TX_SYNCED;
1605 1557 app_main_data.playing_stream_pcm_sample += len/4;
1606 1558 DBG_Printf("codec exit 1:%s\r\n",p_decode->dec_name);
1607 1559 decoding_flag = FALSE;
... ... @@ -1616,6 +1568,11 @@ void taskDec(void *pvParameters)
1616 1568 continue;
1617 1569 }
1618 1570
  1571 + if (spk_out_sync_w_tx_status != SPK_AND_TX_SYNCED)
  1572 + {
  1573 + memset(pOut,0,len);
  1574 + }
  1575 +
1619 1576 #ifdef OPL_MODE_WIRELESS_MIC
1620 1577 if(app_main_data.share_link_role == SL_ROLE_SLAVE)
1621 1578 {
... ... @@ -1720,41 +1677,6 @@ void taskDec(void *pvParameters)
1720 1677
1721 1678 len = AD_PCM_BLOCK_SIZE*2;
1722 1679
1723   -
1724   -/*********sync***************/
1725   - static I32 last_adj = 0;
1726   - I32 adj;
1727   - U32 hsamples = TRANS_PART1_SAMPLES/2;
1728   -
1729   - adj_outsamples -= last_adj;
1730   -
1731   - last_adj = 0;
1732   -
1733   - adj = adj_outsamples;
1734   -
1735   - if (adj)
1736   - {
1737   - if (adj > 0)
1738   - {
1739   - len += (adj<<3);
1740   - last_adj = adj;
1741   - }
1742   - else if (adj < 0)
1743   - {
1744   - adj = -adj;
1745   -
1746   - if (adj > hsamples)
1747   - {
1748   - adj = hsamples;
1749   - }
1750   - len -= (adj<<3);
1751   - last_adj = -adj;
1752   - }
1753   -
1754   - DBG_Printf("adj:%d,left:%d\r\n",last_adj,adj_outsamples - last_adj);
1755   - }
1756   -/*********sync end***************/
1757   -
1758 1680 memset(pDacbuf,0,len);
1759 1681 }
1760 1682 /*****************decode a frame end**************************/
... ... @@ -1863,6 +1785,34 @@ void taskDec(void *pvParameters)
1863 1785 //optek_dapp_process (pDacbuf, 2,samples<<1);
1864 1786 #endif
1865 1787
  1788 + #ifdef OPTEK_LINK_ENABLE
  1789 + /*********sync***************/
  1790 + if (spk_out_sync_w_tx_status != SPK_AND_TX_SYNCED)
  1791 + {
  1792 + if (adj_outsamples)
  1793 + {
  1794 + static I32 last_adj = 0;
  1795 + U32 max_adjsamples = samples/8;
  1796 +
  1797 + adj_outsamples -= last_adj;
  1798 +
  1799 + if (adj_outsamples > (i32)max_adjsamples)
  1800 + last_adj = (i32)max_adjsamples;
  1801 + else if (adj_outsamples < (i32)(-max_adjsamples))
  1802 + last_adj = (i32)(-max_adjsamples);
  1803 + else
  1804 + last_adj = adj_outsamples;
  1805 +
  1806 +
  1807 + samples += last_adj;
  1808 + DBG_Printf("adj:%d,left:%d\r\n",last_adj,adj_outsamples - last_adj);
  1809 + }
  1810 + memset(pDacbuf,0,samples<<3);
  1811 + }
  1812 + /*********sync end***************/
  1813 + #endif
  1814 +
  1815 +
1866 1816 if (app_main_data.audio_out_bit == AUDIO_OUT_16BIT)
1867 1817 {
1868 1818 optek_hifi2_24b_to_16b(pDacbuf,pDacbuf,(samples<<1));
... ...
... ... @@ -106,7 +106,6 @@
106 106 #define BT_RDA_RADIO
107 107
108 108 //#define BT_OUTOPLAY_ENABLE
109   -#define BT_HCI_RELINK
110 109 #define BT_VOLUME_SET
111 110 #define BT_VOLUME_SYC
112 111
... ... @@ -117,12 +116,12 @@
117 116 #define BT_MULTI_LINK /*Multi party bt connetion*/
118 117 //#define BT_W_EEPROM
119 118
120   -#define BT_RELINK_ENABLE
  119 +//#define BT_RELINK_ENABLE
121 120
122 121 #define BT_PA_ENABLE
123 122
124 123 /***********************OPTEK LINK 2.0******************************/
125   -#define OPTEK_LINK_ENABLE
  124 +//#define OPTEK_LINK_ENABLE
126 125
127 126 #ifdef OPTEK_LINK_ENABLE
128 127
... ... @@ -130,8 +129,8 @@
130 129 #define OPL_SLAVE_ENBALE
131 130
132 131 /*********Choose one*************/
133   -#define OPL_MODE_SINGLE_WAY // use optek link lib:optek_link_5ms.a
134   -//#define OPL_MODE_TWO_WAY // use optek link lib:optek_link_5ms.a
  132 +//#define OPL_MODE_SINGLE_WAY // use optek link lib:optek_link_5ms.a
  133 +#define OPL_MODE_TWO_WAY // use optek link lib:optek_link_5ms.a
135 134 //#define OPL_MODE_SWF // use optek link lib:optek_link_5ms_for_swf.a
136 135 //#define OPL_MODE_WIRELESS_MIC // use optek link lib:optek_link_5ms_for_mic.a
137 136
... ...
... ... @@ -213,14 +213,12 @@ void csbm_tx_init(U16 sample_rate,U8 bt_src)
213 213 }
214 214 }
215 215 #endif
216   -
  216 + spk_out_sync_w_tx_status = SPK_AND_TX_SYNCING;
217 217 return;
218 218 }
219 219 #endif
220 220 #endif
221 221
222   - spk_out_sync_w_tx_status = SPK_AND_TX_NOTSYNC;
223   -
224 222 #ifdef OPL_MASTER_ENABLE
225 223
226 224 #ifdef LC3_DUMP_DEBUG
... ... @@ -330,10 +328,59 @@ extern FIFO audio_delay_fifo;
330 328 lc3_dec_main_process_init_for_master();
331 329 #endif
332 330
333   - if (app_main_data.media == MEDIA_AUX)
  331 +
  332 +
  333 + #ifdef OPL_MODE_SINGLE_WAY
  334 + //app_change_mode_req(BC_SF48K_PT5MS,100,6);
  335 +
  336 + if (app_main_data.playing_stream_sample_rate == 48000)
334 337 {
335   - spk_out_sync_w_tx_status = SPK_AND_TX_SYNCING;
  338 + app_change_mode_req(BC_SF48K_PT5MS,100,6);
  339 + }
  340 + else if (app_main_data.playing_stream_sample_rate == 44100)
  341 + {
  342 + app_change_mode_req(BC_SF44K_PT5MS,108,6);
  343 + }
  344 + else
  345 + {
  346 + DBG_Printf("optek link not support sample rate\r\n");
  347 + }
  348 + #elif defined OPL_MODE_SWF
  349 + if (decode_type == DECODE_SBC)
  350 + {
  351 + /*if (app_main_data.playing_stream_sample_rate == 48000)
  352 + {
  353 + app_change_mode_req(SUBW_SF48K_PT2P5MS,24,6);
  354 + }
  355 + else if (app_main_data.playing_stream_sample_rate == 44100)
  356 + {
  357 + app_change_mode_req(SUBW_SF44K_PT2P5MS,24,6);
  358 + }
  359 + else
  360 + {
  361 + DBG_Printf("optek link not support sample rate\r\n");
  362 + }*/
  363 + }
  364 + else
  365 + {
  366 + if (app_main_data.playing_stream_sample_rate == 48000)
  367 + {
  368 + app_change_mode_req(SUBW_SF48K_PT2P5MS,24,6);
  369 + }
  370 + else if (app_main_data.playing_stream_sample_rate == 44100)
  371 + {
  372 + app_change_mode_req(SUBW_SF44K_PT2P5MS,24,6);
  373 + }
  374 + else
  375 + {
  376 + DBG_Printf("optek link not support sample rate\r\n");
  377 + }
336 378 }
  379 +
  380 + #endif
  381 +
  382 + spk_out_sync_w_tx_status = SPK_AND_TX_SYNCING;
  383 +
337 384 #endif
338 385 }
339 386 /*
... ... @@ -931,6 +978,7 @@ void optek_link_slave_rx_end_cb(u8*buf, u16 len, u8 id)
931 978 //AUDIO_FIFO_STREAM_PUT_DATA(buf, len);
932 979 uiDecSend(DECODE_FRAME,FALSE);
933 980 app_main_data.playing_stream_status = STREAM_MEDIA;
  981 + spk_out_sync_w_tx_status = SPK_AND_TX_SYNCED;
934 982 first_dma_count = 0xffffffff;
935 983 frame_count = 0;
936 984 diff_sample = 0;
... ... @@ -1095,18 +1143,22 @@ u8 optek_link_tx_data_cb(u8 cpy, u8 *buf, u8 role, u8 ext_frame, u8 id)
1095 1143 /**************for sync********************/
1096 1144 if (spk_out_sync_w_tx_status == SPK_AND_TX_SYNCING)
1097 1145 {
1098   - app_dac_receive_pcm_enable(FALSE);
  1146 + if (decode_type == DECODE_PCM)
  1147 + app_dac_receive_pcm_enable(FALSE);
  1148 +
1099 1149 spk_out_sync_w_tx_status = SPK_AND_TX_SYNCING_STEP2;
1100 1150 }
1101 1151 else if (spk_out_sync_w_tx_status == SPK_AND_TX_SYNCING_STEP2)
1102 1152 {
  1153 + #define TX_AND_DECODE_DIST 10//SAMPLES
  1154 +
1103 1155 U32 dma0_count = DMA_0_COUNT;
1104 1156
1105 1157 if (adj_outsamples == 0)
1106 1158 {
1107 1159 i32 out_dma_cnt;
1108 1160
1109   - out_dma_cnt = 10 - (dma0_count>>1);
  1161 + out_dma_cnt = TX_AND_DECODE_DIST - (dma0_count>>1);
1110 1162
1111 1163 //if ((out_dma_cnt < -1) || (out_dma_cnt > 1))
1112 1164 if (out_dma_cnt == 0)
... ... @@ -1119,13 +1171,15 @@ u8 optek_link_tx_data_cb(u8 cpy, u8 *buf, u8 role, u8 ext_frame, u8 id)
1119 1171 //DBG_Printf("req adj:%d,%d,%d\r\n",adj_outsamples,dma0_count,dma8_count);
1120 1172 }
1121 1173 }
1122   -
1123 1174 }
1124 1175 else if ((spk_out_sync_w_tx_status == SPK_AND_TX_SYNCING_STEP3)&&(ext_frame == 0))
1125 1176 {
1126   - app_dac_receive_pcm_enable(TRUE);
1127 1177 spk_out_sync_w_tx_status = SPK_AND_TX_SYNCED;
1128   - uiDecSend (DECODE_FRAME, FALSE);
  1178 + if (decode_type == DECODE_PCM)
  1179 + {
  1180 + app_dac_receive_pcm_enable(TRUE);
  1181 + uiDecSend (DECODE_FRAME, FALSE);
  1182 + }
1129 1183 }
1130 1184 //SOFT3_INT_SET;
1131 1185 #endif
... ...
... ... @@ -449,7 +449,7 @@ void hfp_recv_data(struct rfcomm_dlc *pDLC, u8 *pBuf, u8 len)
449 449 pData[HFP_STATE] = HFP_CIND_1;
450 450 at_cmd_len = at_send_CIND_1(at_buf);
451 451 hfp_data_send(pDLC,at_buf,(u8) at_cmd_len);
452   - hfp_codec = 2;
  452 + //hfp_codec = 2;
453 453 }
454 454
455 455 }
... ...
Please register or login to post a comment