添加CSI DSP支持,添加双精度浮点支持

Author: O2C14

.clang-format

@@ -0,0 +1,33 @@
+#
+# Copyright 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# Below are some minor deviations from the default Google style to
+# accommodate for handling of the large legacy code base.
+#
+
+BasedOnStyle: Google
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+ColumnLimit: 100
+AllowShortFunctionsOnASingleLine: Empty
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+BreakConstructorInitializers: BeforeColon
+AlignAfterOpenBracket: AlwaysBreak
+BinPackArguments: false
+BinPackParameters: false
+# 连续宏时，进行对齐
+AlignConsecutiveMacros: AcrossEmptyLinesAndComments

CMakeLists.txt

@@ -2,45 +2,44 @@ cmake_minimum_required(VERSION 3.15)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
 
+
+option(Only_compile_decoder "Only compile decoder" ON)
+option(Used_CSI_DSP "Used CSI DSP" OFF)
+option(Used_double "Used double" OFF)
+
 include_directories(
     ./inc
 )
-file(GLOB_RECURSE SRC_DIR_LIST_dec "./src/*.c")
+set(LDAC_SRC_DIC ./src)
 add_library(
     ldac_dec_lib STATIC
-    ${SRC_DIR_LIST_dec}
+    ${LDAC_SRC_DIC}/ldacBT.c
+    ${LDAC_SRC_DIC}/ldaclib.c
 )
-option(Only_compile_decoder "Only compile decoder" ON)
+
+if(Used_CSI_DSP)
+add_definitions(-DCONFIG_USED_CSI_DSP)
+endif()
+
+if(Used_double)
+add_definitions(-DCONFIG_SCALAR_F64)
+endif()
+
 if(NOT Only_compile_decoder)
 set(lib_enc_dic ../encode/libldac)#from aosp
 
-set(libldac ${lib_enc_dic})
+
+set(libldac_enc ${lib_enc_dic})
 include_directories(
-    ${libldac}/inc
+    ${libldac_enc}/inc
 )
 
-set(enc_dic ${libldac}/src)
+set(enc_dic ${libldac_enc}/src)
 
 add_library(
     ldac_enc_lib STATIC
-
-    ${enc_dic}/bitalloc_ldac.c
-    ${enc_dic}/bitalloc_sub_ldac.c
-    ${enc_dic}/encode_ldac.c
     ${enc_dic}/ldacBT.c
-    ${enc_dic}/ldacBT_api.c
-    ${enc_dic}/ldacBT_internal.c
     ${enc_dic}/ldaclib.c
-    ${enc_dic}/ldaclib_api.c
-    ${enc_dic}/memory_ldac.c
-    ${enc_dic}/pack_ldac.c
-    ${enc_dic}/tables_ldac.c
-    
-    ${enc_dic}/mdct_ldac.c
-    ${enc_dic}/quant_ldac.c
-    ${enc_dic}/setpcm_ldac.c
-    ${enc_dic}/sigana_ldac.c
-    ${enc_dic}/tables_sigproc_ldac.c
 )
 
 

README

@@ -5,6 +5,6 @@ auto_test.c用于执行自动测试
 
 ldac_enc_test.c 用于生成测试解码器所需的bin文件,执行3次会生成三个后缀分别为 _HQ.bin _SQ.bin _MQ.bin 的LDAC流文件
 输入的wav文件要放在cmake生成目录的上级文件夹
-这个仓库没有包含编码库,缺失的函数请从aosp获取
+这个分支没有包含编码库,缺失的函数请从aosp获取或者使用all分支,all分支合并了编码器和解码器
 
 ldac_dec_test.c 用于测试解码器,执行3次会生成三个后缀分别为 _HQ.wav _SQ.wav _MQ.wav 的wav文件

auto_test.c

@@ -7,7 +7,10 @@ int main()
 
   DIR *dir;
   struct dirent *ent;
-
+#if  __WIN32
+  unsigned __int64 t0 = *(
+      unsigned __int64 *)(0x7FFE0000 + 0x8); // like QueryUnbiasedInterruptTime
+#endif
   if ((dir = opendir("../")) != NULL)
   {
     // 打开当前目录
@@ -66,6 +69,10 @@ int main()
   {
     perror("");
   }
-
+#if  __WIN32
+  unsigned __int64 t = *(unsigned __int64 *)(0x7FFE0000 + 0x8) - t0;
+  printf("used %lfs\n", ((double)t) / 10000000.0);
+#endif
+  system("pause");
   return 0;
 }

ldac_dec_test.c

@@ -268,6 +268,7 @@ int main(int argc, char *argv[]) {
     npack += 1;
   }
   if (result != 0) {
+    printf("%s\r\n",get_error_code_string(ldacBT_get_error_code(ldacBT_dec_handle)));
     printf("Error generated in the %dth stage of decoding\r\n", result);
     printf("error\r\n");
   }
@@ -276,8 +277,7 @@ int main(int argc, char *argv[]) {
   printf("used %lfs,%lfus per pack\n", ((double)t) / 10000000.0,
          ((double)t / (double)npack) / 10.0);
 #endif
-  printf("%s\r\n",
-         get_error_code_string(ldacBT_get_error_code(ldacBT_dec_handle)));
+
 
   free(pStream);
   ldacBT_close_handle(ldacBT_dec_handle);

src/imdct_ldac.o.c

@@ -4,6 +4,7 @@ static void proc_imdct_core_ldac(SCALAR* p_y, SCALAR* p_x, int nlnn) {
   int loop1, loop2;
   int coef, index0, index1, offset;
   const int nsmpl = npow2_ldac(nlnn);
+  const int nsmpl_half = nsmpl >> 1;
   const int* p_rp;
   const SCALAR *p_w, *p_c, *p_s;
   SCALAR a_work[LDAC_MAXLSU];
@@ -12,6 +13,7 @@ static void proc_imdct_core_ldac(SCALAR* p_y, SCALAR* p_x, int nlnn) {
 
   i = nlnn - LDAC_1FSLNN;
   p_w = gaa_bwin_ldac[i];
+#if !(CONFIG_USED_CSI_DSP)
   p_c = gaa_wcos_ldac[i];
   p_s = gaa_wsin_ldac[i];
   p_rp = gaa_rev_perm_ldac[i];
@@ -68,24 +70,25 @@ static void proc_imdct_core_ldac(SCALAR* p_y, SCALAR* p_x, int nlnn) {
       index1 += 2 - nsmpl;
     }
   }
-  const int nsmpl_half = nsmpl >> 1;
-  if (nsmpl_half > 0) {
-    i = 0;
-    do {
-      p_y[2 * i] = p_s[coef + i] * a_work[2 * i + 1] + p_c[coef + i] * a_work[2 * i];
-      p_y[nsmpl - 2 * i - 1] = p_s[coef + i] * a_work[2 * i] - a_work[2 * i + 1] * p_c[coef + i];
-      i++;
-    } while (nsmpl_half != i);
-    i = 0;
-    do {
-      p_x[i] = p_y[nsmpl_half + i] * p_w[i] - p_w[nsmpl - 1 - i] * p_x[nsmpl + i];
-      p_x[nsmpl_half + i] = -p_w[nsmpl_half - 1 - i] * p_x[nsmpl + nsmpl_half + i] -
-                            p_y[nsmpl - 1 - i] * p_w[nsmpl_half + i];
-      p_x[nsmpl + i] = p_y[nsmpl_half - 1 - i];
-      p_x[nsmpl + nsmpl_half + i] = p_y[i];
-      i++;
-    } while (nsmpl_half != i);
-  }
+
+  i = 0;
+  do {
+    p_y[2 * i] = p_s[coef + i] * a_work[2 * i + 1] + p_c[coef + i] * a_work[2 * i];
+    p_y[nsmpl - 2 * i - 1] = p_s[coef + i] * a_work[2 * i] - a_work[2 * i + 1] * p_c[coef + i];
+    i++;
+  } while (nsmpl_half != i);
+#else
+  csi_dct4_f32(&dct4f32, a_work, p_y);
+#endif
+  i = 0;
+  do {
+    p_x[i] = p_y[nsmpl_half + i] * p_w[i] - p_w[nsmpl - 1 - i] * p_x[nsmpl + i];
+    p_x[nsmpl_half + i] = -p_w[nsmpl_half - 1 - i] * p_x[nsmpl + nsmpl_half + i] -
+                          p_y[nsmpl - 1 - i] * p_w[nsmpl_half + i];
+    p_x[nsmpl + i] = p_y[nsmpl_half - 1 - i];
+    p_x[nsmpl + nsmpl_half + i] = p_y[i];
+    i++;
+  } while (nsmpl_half != i);
 }
 
 DECLFUNC void proc_imdct_ldac(SFINFO* p_sfinfo, int nlnn) {

src/ldac.h

@@ -259,5 +259,4 @@ struct _hcdec_ldac {
   (((bs) & (0x1 << ((nbits)-1))) ? ((bs) | ((~0x0) << (nbits))) : bs)
 
 #include "proto_ldac.h"
-#include "tables.h"
 #endif /* _LDAC_H */

src/ldacBT.c

@@ -0,0 +1,5 @@
+#include "ldacBT.h"
+
+#include "ldacBT_internal.o.c"
+#include "ldacBT_api.o.c"
+

src/ldacBT_api.o.c

@@ -55,7 +55,7 @@ LDACBT_API void ldacBT_free_handle(HANDLE_LDAC_BT hLdacBT) {
 
   if (hLdacBT->hLDAC != NULL) {
     /* close ldaclib handle */
-    if (hLdacBT->proc_mode == LDACBT_PROCMODE_ENCODE) {
+    if (hLdacBT->proc_mode == LDACBT_PROCMODE_DECODE) {
       ldaclib_free_decode(hLdacBT->hLDAC);
     }
     /* free ldaclib handle */
@@ -85,7 +85,7 @@ LDACBT_API void ldacBT_close_handle(HANDLE_LDAC_BT hLdacBT) {
 
   if (hLdacBT->hLDAC != NULL) {
     /* close ldaclib handle */
-    if (hLdacBT->proc_mode == LDACBT_PROCMODE_ENCODE) {
+    if (hLdacBT->proc_mode == LDACBT_PROCMODE_DECODE) {
       ldaclib_free_decode(hLdacBT->hLDAC);
     }
     /* clear error code */

src/ldacBT_internal.h

@@ -13,7 +13,7 @@ extern "C" {
 #endif
 
 /* Function declaration */
-#define DECLFUNC// static
+#define DECLFUNC static
 
 /* Limit for alter EQMID process */
 #define LDACBT_LIMIT_ALTER_EQMID_PRIORITY LDACBT_EQMID_MQ