xiemeng / Optek_sdk_131 · Commits

Commit d64902dc6a5facc3b66670cfb37c79fb833f69db

Authored by luozhesi
1 parent 7e937523

master local output upstream sound

Inline Side-by-side
Showing 7 changed files with 164 additions and 152 deletions
@@ -21,38 +21,38 @@ @@ -21,38 +21,38 @@
21 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/tools/RG-2018.9-win32/XtensaTools/xtensa-elf/include"/> 21 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/tools/RG-2018.9-win32/XtensaTools/xtensa-elf/include"/>
22 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++"/> 22 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++"/>
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"/> 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_game\BlueSea_OPTEK_LINK_SDK\source\include&quot;"/>  
25 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\threadRTOS\inc&quot;"/>  
26 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\inc&quot;"/>  
27 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\include&quot;"/>  
28 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\Source\os\freeRTOS\portable\XCC\Xtensa&quot;"/>  
29 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\Xtensa&quot;"/>  
30 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\hw&quot;"/>  
31 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os&quot;"/>  
32 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\printf&quot;"/>  
33 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common&quot;"/>  
34 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec&quot;"/>  
35 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\include&quot;"/>  
36 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\wav_dec&quot;"/>  
37 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\dd_ac3_dec&quot;"/>  
38 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\mp3_enc\&quot;"/>  
39 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\dsp&quot;"/>  
40 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\mp3dec\include&quot;"/>  
41 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\mp3dec\test\include&quot;"/>  
42 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\wmadec\include&quot;"/>  
43 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci&quot;"/>  
44 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci\lib&quot;"/>  
45 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\ui\OEM&quot;"/>  
46 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\usbhost&quot;"/>  
47 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\usbdev&quot;"/>  
48 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\media_uis&quot;"/>  
49 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\audio&quot;"/>  
50 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\dsp\d2as&quot;"/>  
51 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\display&quot;"/>  
52 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\remote&quot;"/>  
53 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\sd&quot;"/>  
54 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\save&quot;"/>  
55 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\tone&quot;"/> 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;"/>
56 </option> 56 </option>
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"> 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 <listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/> 58 <listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
@@ -103,38 +103,38 @@ @@ -103,38 +103,38 @@
103 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/tools/RG-2018.9-win32/XtensaTools/xtensa-elf/include"/> 103 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/tools/RG-2018.9-win32/XtensaTools/xtensa-elf/include"/>
104 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++"/> 104 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++"/>
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"/> 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_game\BlueSea_OPTEK_LINK_SDK\source\include&quot;"/>  
107 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\threadRTOS\inc&quot;"/>  
108 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\inc&quot;"/>  
109 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\include&quot;"/>  
110 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\Source\os\freeRTOS\portable\XCC\Xtensa&quot;"/>  
111 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\Xtensa&quot;"/>  
112 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\hw&quot;"/>  
113 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os&quot;"/>  
114 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\printf&quot;"/>  
115 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common&quot;"/>  
116 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec&quot;"/>  
117 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\include&quot;"/>  
118 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\wav_dec&quot;"/>  
119 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\dd_ac3_dec&quot;"/>  
120 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\mp3_enc\&quot;"/>  
121 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\dsp&quot;"/>  
122 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\mp3dec\include&quot;"/>  
123 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\mp3dec\test\include&quot;"/>  
124 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\wmadec\include&quot;"/>  
125 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci&quot;"/>  
126 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci\lib&quot;"/>  
127 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\ui\OEM&quot;"/>  
128 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\usbhost&quot;"/>  
129 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\usbdev&quot;"/>  
130 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\media_uis&quot;"/>  
131 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\audio&quot;"/>  
132 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\dsp\d2as&quot;"/>  
133 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\display&quot;"/>  
134 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\remote&quot;"/>  
135 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\sd&quot;"/>  
136 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\save&quot;"/>  
137 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\tone&quot;"/> 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;"/>
138 </option> 138 </option>
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"> 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 <listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/> 140 <listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
@@ -185,38 +185,38 @@ @@ -185,38 +185,38 @@
185 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/tools/RG-2018.9-win32/XtensaTools/xtensa-elf/include"/> 185 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/tools/RG-2018.9-win32/XtensaTools/xtensa-elf/include"/>
186 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++"/> 186 <listOptionValue builtIn="false" value="D:/usr/xtensa/XtDevTools/install/builds/RG-2018.9-win32/Optek_HiFi3_prod/xtensa-elf/include/xcc/c++"/>
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"/> 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_game\BlueSea_OPTEK_LINK_SDK\source\include&quot;"/>  
189 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\threadRTOS\inc&quot;"/>  
190 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\inc&quot;"/>  
191 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\include&quot;"/>  
192 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\Source\os\freeRTOS\portable\XCC\Xtensa&quot;"/>  
193 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os\freeRTOS\Xtensa&quot;"/>  
194 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\hw&quot;"/>  
195 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\os&quot;"/>  
196 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\printf&quot;"/>  
197 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common&quot;"/>  
198 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec&quot;"/>  
199 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\include&quot;"/>  
200 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\wav_dec&quot;"/>  
201 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\dd_ac3_dec&quot;"/>  
202 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\codec\mp3_enc\&quot;"/>  
203 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\dsp&quot;"/>  
204 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\mp3dec\include&quot;"/>  
205 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\mp3dec\test\include&quot;"/>  
206 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\wmadec\include&quot;"/>  
207 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci&quot;"/>  
208 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\bt_hci\lib&quot;"/>  
209 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\ui\OEM&quot;"/>  
210 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\usbhost&quot;"/>  
211 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\usbdev&quot;"/>  
212 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\media_uis&quot;"/>  
213 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\audio&quot;"/>  
214 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\dsp\d2as&quot;"/>  
215 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\display&quot;"/>  
216 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\remote&quot;"/>  
217 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\media\sd&quot;"/>  
218 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\save&quot;"/>  
219 - <listOptionValue builtIn="false" value="&quot;E:\workspace_optek_link_sdk_game\BlueSea_OPTEK_LINK_SDK\source\common\tone&quot;"/> 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;"/>
220 </option> 220 </option>
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"> 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 <listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/> 222 <listOptionValue builtIn="false" value="__LONG_LONG_MAX__=9223372036854775807LL"/>
@@ -18,7 +18,7 @@ export SHELL = cmd @@ -18,7 +18,7 @@ export SHELL = cmd
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 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 all: 20 all:
21 - cmd /c "cd /D ""E:\\workspace_optek_link_sdk_game\\BlueSea_OPTEK_LINK_SDK\\bin\\Optek_HiFi3_prod\\Debug"" && $(MAKE) all " 21 + cmd /c "cd /D ""E:\\workspace_optek_link_sdk_developing\\BlueSea_OPTEK_LINK_SDK\\bin\\Optek_HiFi3_prod\\Debug"" && $(MAKE) all "
22 22
23 clean: 23 clean:
24 - cmd /c "cd /D ""E:\\workspace_optek_link_sdk_game\\BlueSea_OPTEK_LINK_SDK\\bin\\Optek_HiFi3_prod\\Debug"" && $(MAKE) clean " 24 + cmd /c "cd /D ""E:\\workspace_optek_link_sdk_developing\\BlueSea_OPTEK_LINK_SDK\\bin\\Optek_HiFi3_prod\\Debug"" && $(MAKE) clean "
@@ -138,7 +138,7 @@ const APP_NAV_SOURCE source_table[] = @@ -138,7 +138,7 @@ const APP_NAV_SOURCE source_table[] =
138 {MEDIA_OPTICAL,app_nav_rmt_convert_spdif}, 138 {MEDIA_OPTICAL,app_nav_rmt_convert_spdif},
139 139
140 #ifdef USB_HOST_ENABLE 140 #ifdef USB_HOST_ENABLE
141 -// {MEDIA_USB_DEVICE,app_nav_rmt_convert_usb}, 141 + {MEDIA_USB_DEVICE,app_nav_rmt_convert_usb},
142 #endif 142 #endif
143 143
144 #ifdef SD_ENABLE 144 #ifdef SD_ENABLE
@@ -694,6 +694,9 @@ void app_nav_rmt_convert_aux(void) @@ -694,6 +694,9 @@ void app_nav_rmt_convert_aux(void)
694 app_dac_receive_pcm_enable(FALSE); 694 app_dac_receive_pcm_enable(FALSE);
695 695
696 #if defined OPL_MODE_TWO_WAY || defined OPL_MODE_SINGLE_WAY 696 #if defined OPL_MODE_TWO_WAY || defined OPL_MODE_SINGLE_WAY
  697 + #if 1
  698 + app_change_mode_req(GAME_HEADPHONE_PT_5MS_LP,100,50);
  699 + #else
697 if (optek_link_mode == GAME_HEADPHONE_PT_5MS_LP || optek_link_mode == BC_SF48K_PT5MS) 700 if (optek_link_mode == GAME_HEADPHONE_PT_5MS_LP || optek_link_mode == BC_SF48K_PT5MS)
698 { 701 {
699 app_change_mode_req(BC_SF48K_PT5MS,100,6); 702 app_change_mode_req(BC_SF48K_PT5MS,100,6);
@@ -702,6 +705,7 @@ void app_nav_rmt_convert_aux(void) @@ -702,6 +705,7 @@ void app_nav_rmt_convert_aux(void)
702 { 705 {
703 app_change_mode_req(BC_SF48K_PT7P5MS,150,6); 706 app_change_mode_req(BC_SF48K_PT7P5MS,150,6);
704 } 707 }
  708 + #endif
705 #elif defined OPL_MODE_SWF 709 #elif defined OPL_MODE_SWF
706 app_change_mode_req(SUBW_SF48K_PT2P5MS,24,6); 710 app_change_mode_req(SUBW_SF48K_PT2P5MS,24,6);
707 #endif 711 #endif
@@ -150,7 +150,15 @@ int pcm_dec_decode_frame(U8 **pout,U16 *plen) @@ -150,7 +150,15 @@ int pcm_dec_decode_frame(U8 **pout,U16 *plen)
150 if (inout_dma_sync_flag == FALSE) 150 if (inout_dma_sync_flag == FALSE)
151 { 151 {
152 U32 dma0_cnt = DMA_0_COUNT; 152 U32 dma0_cnt = DMA_0_COUNT;
153 - i32 count = ((AD_PCM_BLOCK_SIZE/2-16) - dma0_cnt); 153 + U32 in_out_offset;
  154 +
  155 + #ifdef OPL_MODE_TWO_WAY
  156 + in_out_offset = 180;
  157 + #else
  158 + in_out_offset = 16;
  159 + #endif
  160 + //i32 count = ((AD_PCM_BLOCK_SIZE/2-16) - dma0_cnt);
  161 + i32 count = ((AD_PCM_BLOCK_SIZE/2-in_out_offset) - dma0_cnt);
154 162
155 discard_frame_cnt = 3; 163 discard_frame_cnt = 3;
156 164
@@ -164,9 +172,9 @@ int pcm_dec_decode_frame(U8 **pout,U16 *plen) @@ -164,9 +172,9 @@ int pcm_dec_decode_frame(U8 **pout,U16 *plen)
164 { 172 {
165 count = AD_PCM_BLOCK_SIZE/4; 173 count = AD_PCM_BLOCK_SIZE/4;
166 } 174 }
167 - else if (count < -16) 175 + else if (count < -in_out_offset)
168 { 176 {
169 - count = -16; 177 + count = -in_out_offset;
170 } 178 }
171 179
172 DBG_Printf("adj count:%d\r\n",count); 180 DBG_Printf("adj count:%d\r\n",count);
@@ -193,44 +201,7 @@ int pcm_dec_decode_frame(U8 **pout,U16 *plen) @@ -193,44 +201,7 @@ int pcm_dec_decode_frame(U8 **pout,U16 *plen)
193 return DECODE_SUCCESS; 201 return DECODE_SUCCESS;
194 } 202 }
195 203
196 - //csbm_put_tx_unencoded_data(p,AD_PCM_BLOCK_SIZE);  
197 -  
198 -  
199 - #ifdef OPL_MODE_TWO_WAY  
200 - if (optek_link_mode == GAME_HEADPHONE_PT7P5MS_T7R3E || optek_link_mode == GAME_HEADPHONE_PT_5MS_LP)  
201 - {  
202 - #ifdef LC3_DECODE_ENABLE  
203 - int app_lc3_decoding_code_text_copy(void);  
204 - app_lc3_decoding_code_text_copy();  
205 - #endif  
206 -U8* wait_upstream_decode_event(void);  
207 - wait_upstream_decode_event();  
208 -  
209 -// DBG_PIN_HIGH;  
210 - //if (master_rev_flag)//(AUDIO_FIFO_STREAM_DATA_LEN())  
211 - {  
212 - xa_lc3_dec_frame(&p,&size);  
213 - //master_rev_flag--;  
214 -  
215 - size >>= 1;  
216 - short *pIn = p;  
217 - short *pOut = pDecOut;  
218 - for (i=0;i<size;i++)  
219 - {  
220 - *pOut++ = *pIn;  
221 - *pOut++ = *pIn;  
222 - *pOut++ = *pIn;  
223 - *pOut++ = *pIn;  
224 - pIn++;  
225 - }  
226 - if (size == 0)  
227 - {  
228 - memset(pDecOut,0,AD_PCM_BLOCK_SIZE);  
229 - }  
230 - }  
231 - p = pDecOut;  
232 - }  
233 - #endif 204 + //csbm_put_tx_unencoded_data(p,AD_PCM_BLOCK_SIZE);
234 #else 205 #else
235 U8 *p; 206 U8 *p;
236 U16 size,i; 207 U16 size,i;
@@ -1394,6 +1365,7 @@ void taskDec(void *pvParameters) @@ -1394,6 +1365,7 @@ void taskDec(void *pvParameters)
1394 DEC_MSG uMsg; 1365 DEC_MSG uMsg;
1395 DECODE_DEVICE *pcur_dec = &idle_decode; 1366 DECODE_DEVICE *pcur_dec = &idle_decode;
1396 U8 *pOut; 1367 U8 *pOut;
  1368 + U8 *pOut_up;
1397 U8 *pDacbuf; 1369 U8 *pDacbuf;
1398 U8 *p; 1370 U8 *p;
1399 U16 len,i,j; 1371 U16 len,i,j;
@@ -1592,15 +1564,17 @@ void taskDec(void *pvParameters) @@ -1592,15 +1564,17 @@ void taskDec(void *pvParameters)
1592 slice = 1; 1564 slice = 1;
1593 if (decoding_flag && !uiDacMute) 1565 if (decoding_flag && !uiDacMute)
1594 { 1566 {
  1567 + pOut_up = NULL;
  1568 +
1595 #if (defined OPL_MASTER_ENABLE && defined OPL_MODE_TWO_WAY) 1569 #if (defined OPL_MASTER_ENABLE && defined OPL_MODE_TWO_WAY)
1596 if((app_main_data.share_link_role == SL_ROLE_MASTER)&&(optek_link_mode == GAME_HEADPHONE_PT_5MS_LP || optek_link_mode == GAME_HEADPHONE_PT7P5MS_T7R3E)) 1570 if((app_main_data.share_link_role == SL_ROLE_MASTER)&&(optek_link_mode == GAME_HEADPHONE_PT_5MS_LP || optek_link_mode == GAME_HEADPHONE_PT7P5MS_T7R3E))
1597 { 1571 {
1598 //if (master_rev_flag) 1572 //if (master_rev_flag)
1599 { 1573 {
1600 1574
1601 - xa_lc3_dec_frame(&pOut,&len); 1575 + xa_lc3_dec_frame(&pOut_up,&len);
1602 1576
1603 - short *p = pOut; 1577 + short *p = pOut_up;
1604 //24k to 48K 1578 //24k to 48K
1605 for(i=0; i<len/2; i++) 1579 for(i=0; i<len/2; i++)
1606 { 1580 {
@@ -1609,6 +1583,7 @@ void taskDec(void *pvParameters) @@ -1609,6 +1583,7 @@ void taskDec(void *pvParameters)
1609 } 1583 }
1610 1584
1611 len *= 2; 1585 len *= 2;
  1586 +
1612 /* 1587 /*
1613 static U8 cnt; 1588 static U8 cnt;
1614 if (cnt++ == 0) 1589 if (cnt++ == 0)
@@ -1616,11 +1591,13 @@ void taskDec(void *pvParameters) @@ -1616,11 +1591,13 @@ void taskDec(void *pvParameters)
1616 DBG_Printf("rev:%d\r\n",len); 1591 DBG_Printf("rev:%d\r\n",len);
1617 } 1592 }
1618 */ 1593 */
  1594 +
1619 extern void *upStreamHandle; 1595 extern void *upStreamHandle;
1620 - optek_bqdiir_mono_16b_process (upStreamHandle,pOut,pOut,len/2); 1596 + optek_bqdiir_mono_16b_process (upStreamHandle,pOut_up,pOut_up,len/2);
  1597 +
1621 1598
1622 //master_rev_flag = 0xff; 1599 //master_rev_flag = 0xff;
1623 - if (fifo_put_data(&AdcInFifo, pOut,len) != len) 1600 + if (fifo_put_data(&AdcInFifo, pOut_up,len) != len)
1624 { 1601 {
1625 //DBG_Printf("usbdev upstream overflow\r\n"); 1602 //DBG_Printf("usbdev upstream overflow\r\n");
1626 } 1603 }
@@ -1659,7 +1636,10 @@ void taskDec(void *pvParameters) @@ -1659,7 +1636,10 @@ void taskDec(void *pvParameters)
1659 #endif 1636 #endif
1660 1637
1661 //optek_hifi2_24b_to_16b(pDacbuf,pDacbuf,(samples<<1)); 1638 //optek_hifi2_24b_to_16b(pDacbuf,pDacbuf,(samples<<1));
1662 - csbm_put_tx_unencoded_data(pOut,AD_PCM_BLOCK_SIZE); 1639 + if (decode_type == DECODE_PCM)
  1640 + csbm_put_tx_unencoded_data(pOut,AD_PCM_BLOCK_SIZE);
  1641 + else
  1642 + csbm_put_tx_unencoded_data(pOut,len);
1663 1643
1664 DBG_PIN_HIGH; 1644 DBG_PIN_HIGH;
1665 DBG_PIN_LOW; 1645 DBG_PIN_LOW;
@@ -1673,6 +1653,13 @@ void taskDec(void *pvParameters) @@ -1673,6 +1653,13 @@ void taskDec(void *pvParameters)
1673 } 1653 }
1674 #endif 1654 #endif
1675 1655
  1656 + if (pOut_up != NULL)
  1657 + {
  1658 + app_main_data.playing_stream_chans = 1;
  1659 + len >>= 1;
  1660 + pOut = pOut_up;
  1661 + }
  1662 +
1676 while(len > max_out_len) 1663 while(len > max_out_len)
1677 { 1664 {
1678 slice <<= 1; 1665 slice <<= 1;
@@ -131,8 +131,8 @@ @@ -131,8 +131,8 @@
131 131
132 /*********Choose one*************/ 132 /*********Choose one*************/
133 //#define OPL_MODE_SINGLE_WAY 133 //#define OPL_MODE_SINGLE_WAY
134 -//#define OPL_MODE_TWO_WAY  
135 -#define OPL_MODE_SWF 134 +#define OPL_MODE_TWO_WAY
  135 +//#define OPL_MODE_SWF
136 136
137 #if (defined OPL_MODE_TWO_WAY || (defined OPL_MODE_SINGLE_WAY && defined OPL_MASTER_ENABLE)) 137 #if (defined OPL_MODE_TWO_WAY || (defined OPL_MODE_SINGLE_WAY && defined OPL_MASTER_ENABLE))
138 #define LC3_ENCODE_ENABLE 138 #define LC3_ENCODE_ENABLE
@@ -160,8 +160,8 @@ U8 start_offset; @@ -160,8 +160,8 @@ U8 start_offset;
160 void *downsampleFilterHandle; 160 void *downsampleFilterHandle;
161 161
162 FIFO opl_swf_tx_fifo; 162 FIFO opl_swf_tx_fifo;
163 -U8 tx_fifo_buf[256];  
164 -short tx_temp_buf[256/sizeof(short)]; 163 +U8 tx_fifo_buf[256*4];
  164 +short tx_temp_buf[1152*2/sizeof(short)];
165 #endif 165 #endif
166 166
167 void csbm_tx_init(U16 sample_rate,U8 bt_src) 167 void csbm_tx_init(U16 sample_rate,U8 bt_src)
@@ -348,7 +348,7 @@ void csbm_put_tx_unencoded_data(short *ptr,U16 len) @@ -348,7 +348,7 @@ void csbm_put_tx_unencoded_data(short *ptr,U16 len)
348 348
349 pOut = tx_temp_buf; 349 pOut = tx_temp_buf;
350 350
351 - pend = tx_temp_buf+samples; 351 + pend = tx_temp_buf + samples;
352 352
353 pOutDataLen = 0; 353 pOutDataLen = 0;
354 while (pIn < pend) 354 while (pIn < pend)
@@ -379,7 +379,7 @@ void csbm_put_tx_unencoded_data(short *ptr,U16 len) @@ -379,7 +379,7 @@ void csbm_put_tx_unencoded_data(short *ptr,U16 len)
379 { 379 {
380 DBG_Printf("tx overflow\r\n"); 380 DBG_Printf("tx overflow\r\n");
381 } 381 }
382 - 382 +/*
383 if (fifo_get_fifo_data_len(&opl_swf_tx_fifo) >= tx_len) 383 if (fifo_get_fifo_data_len(&opl_swf_tx_fifo) >= tx_len)
384 { 384 {
385 if (bc_tx_data.tx_len == 0) 385 if (bc_tx_data.tx_len == 0)
@@ -392,6 +392,7 @@ void csbm_put_tx_unencoded_data(short *ptr,U16 len) @@ -392,6 +392,7 @@ void csbm_put_tx_unencoded_data(short *ptr,U16 len)
392 DBG_Printf("optek link tx too slow:%d\r\n",bc_tx_data.tx_len); 392 DBG_Printf("optek link tx too slow:%d\r\n",bc_tx_data.tx_len);
393 } 393 }
394 } 394 }
  395 +*/
395 #endif 396 #endif
396 397
397 398
@@ -868,7 +869,25 @@ u8 optek_link_tx_data_cb(u8 cpy, u8 *buf, u8 role, u8 ext_frame, u8 id) @@ -868,7 +869,25 @@ u8 optek_link_tx_data_cb(u8 cpy, u8 *buf, u8 role, u8 ext_frame, u8 id)
868 869
869 if (cpy == 1) 870 if (cpy == 1)
870 { 871 {
  872 +#ifdef OPL_MODE_SWF
  873 + //len = bc_tx_data.tx_len;
  874 +
  875 + if (fifo_get_data_len(&opl_swf_tx_fifo) >= 24)
  876 + {
  877 + //bc_tx_data.tx_len = 0;
  878 +
  879 + //CFasm_memcpy((void *)buf, (void *)bc_tx_data.tx_data,len);
  880 +
  881 + fifo_get_data(&opl_swf_tx_fifo,buf,24);
871 882
  883 + bc_tx_data.last_tx_len = 24;
  884 + }
  885 + else if (bc_tx_data.last_tx_len)
  886 + {
  887 + memset((void *)buf,0,bc_tx_data.last_tx_len);
  888 + bc_tx_data.last_tx_len = 0;
  889 + }
  890 +#else
872 len = bc_tx_data.tx_len; 891 len = bc_tx_data.tx_len;
873 892
874 if (len) 893 if (len)
@@ -876,13 +895,15 @@ u8 optek_link_tx_data_cb(u8 cpy, u8 *buf, u8 role, u8 ext_frame, u8 id) @@ -876,13 +895,15 @@ u8 optek_link_tx_data_cb(u8 cpy, u8 *buf, u8 role, u8 ext_frame, u8 id)
876 bc_tx_data.tx_len = 0; 895 bc_tx_data.tx_len = 0;
877 896
878 CFasm_memcpy((void *)buf, (void *)bc_tx_data.tx_data,len); 897 CFasm_memcpy((void *)buf, (void *)bc_tx_data.tx_data,len);
  898 +
879 bc_tx_data.last_tx_len = len; 899 bc_tx_data.last_tx_len = len;
880 } 900 }
881 else if (bc_tx_data.last_tx_len) 901 else if (bc_tx_data.last_tx_len)
882 { 902 {
883 memset((void *)buf,0,bc_tx_data.last_tx_len); 903 memset((void *)buf,0,bc_tx_data.last_tx_len);
884 bc_tx_data.last_tx_len = 0; 904 bc_tx_data.last_tx_len = 0;
885 - } 905 + }
  906 +#endif
886 } 907 }
887 908
888 if (role == OPTEK_LINK_MASTER) 909 if (role == OPTEK_LINK_MASTER)
Please register or login to post a comment