From feaf8795f1281f832dfb9a49fc0f3829839cecad Mon Sep 17 00:00:00 2001 From: Jianzhong Xu Date: Fri, 26 Apr 2019 14:38:39 -0400 Subject: [PATCH] Merged PASDK 1.2.4 changes. Fixed following bugs: - PASDK-514: Moved CB status to Non-cached memory. - PASDK-518: Move AAC status structure to Non-cache memory - PASDK-644: Fix for ASOT getting stuck in ASOT_STATE_INITSYNC_DEC_INFO1 --- .gitattributes | 5 +- build_all.bat | 52 ++- pasrc/common/aspDecOpCircBuf_common.c | 7 + pasrc/common/aspDecOpCircBuf_common.h | 8 + pasrc/test_arm/.cproject | 22 +- .../framework/aspDecOpCircBuf_slave.c | 12 + .../framework/audioStreamDecodeProc.c | 20 +- pasrc/test_arm/framework/itopo/patchs.c | 12 + pasrc/test_dsp/.cproject | 30 +- .../application/itopo/evmk2g/atboot.c | 4 +- .../framework/aspDecOpCircBuf_master.c | 8 + pasrc/test_dsp/framework/audioStreamInpDec.c | 50 +++ pasrc/test_dsp/framework/audioStreamInpProc.c | 35 +- pasrc/test_dsp/framework/audioStreamInpProc.h | 3 +- pasrc/test_dsp/framework/audioStreamOutProc.c | 136 +++++++- pasrc/test_dsp/io/ioConfig.h | 2 +- pasrc/test_dsp/io/ioData.c | 18 +- pasrc/test_dsp/mib/mib.c | 3 +- pasrc/test_dsp/sap/sap.c | 2 +- scripts/build_aac.bat | 76 ----- scripts/build_aacip_pkg.bat | 104 ------ scripts/build_ccs_projects.bat | 179 ----------- scripts/build_dh_libs.bat | 193 ----------- scripts/build_dhip_pkg.bat | 204 ------------ scripts/build_dhip_pkgs.bat | 50 --- scripts/build_dsd.bat | 72 ----- scripts/build_dsdip_pkg.bat | 104 ------ scripts/build_dtsx_libs.bat | 130 -------- scripts/build_dtsxip_pkg.bat | 119 ------- scripts/build_dtsxip_pkgs.bat | 46 --- scripts/build_fd_pkg.bat | 171 ---------- scripts/build_neo.bat | 61 ---- scripts/build_neoip_pkg.bat | 103 ------ scripts/build_os_pkg.bat | 183 ----------- scripts/build_paf_libs.bat | 215 ------------- scripts/build_parma_libs.bat | 122 ------- scripts/build_pdk_libs.bat | 56 ---- scripts/install_code.bat | 300 ------------------ scripts/install_dhip_pkgs.bat | 76 ----- scripts/install_dtsxip_pkgs.bat | 52 --- scripts/libarch_setup_env.bat | 7 - scripts/setup_env.bat | 232 -------------- 42 files changed, 385 insertions(+), 2899 deletions(-) delete mode 100644 scripts/build_aac.bat delete mode 100644 scripts/build_aacip_pkg.bat delete mode 100644 scripts/build_ccs_projects.bat delete mode 100644 scripts/build_dh_libs.bat delete mode 100644 scripts/build_dhip_pkg.bat delete mode 100644 scripts/build_dhip_pkgs.bat delete mode 100644 scripts/build_dsd.bat delete mode 100644 scripts/build_dsdip_pkg.bat delete mode 100644 scripts/build_dtsx_libs.bat delete mode 100644 scripts/build_dtsxip_pkg.bat delete mode 100644 scripts/build_dtsxip_pkgs.bat delete mode 100644 scripts/build_fd_pkg.bat delete mode 100644 scripts/build_neo.bat delete mode 100644 scripts/build_neoip_pkg.bat delete mode 100644 scripts/build_os_pkg.bat delete mode 100644 scripts/build_paf_libs.bat delete mode 100644 scripts/build_parma_libs.bat delete mode 100644 scripts/build_pdk_libs.bat delete mode 100644 scripts/install_code.bat delete mode 100644 scripts/install_dhip_pkgs.bat delete mode 100644 scripts/install_dtsxip_pkgs.bat delete mode 100644 scripts/libarch_setup_env.bat delete mode 100644 scripts/setup_env.bat diff --git a/.gitattributes b/.gitattributes index b9ddb5d2..9fb3f84c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,7 @@ # Denote all files as binary and should not be modified (do not convert LF to CR/LF). psdk_cust/ipc_3_43_00_00_eng/* text eol=lf .gitmodules merge=ours -docs merge=ours +./docs merge=ours +./installer_builder merge=ours +./psdk_cust merge=ours +./ merge=ours diff --git a/build_all.bat b/build_all.bat index 927092d6..34657861 100644 --- a/build_all.bat +++ b/build_all.bat @@ -66,6 +66,10 @@ set OS_PKG_DIR=%RELEASE_DIR%\os_package set DHIP_PKG_DIR=%RELEASE_DIR%\dhip_package :: Set DTSX-IP package directory set DTSXIP_PKG_DIR=%RELEASE_DIR%\dtsxip_package +:: Set AAC package directory +set AACIP_PKG_DIR=%RELEASE_DIR%\k2gx_a15_aac +:: Set AAC testapp package directory +set AACIPTEST_PKG_DIR=%RELEASE_DIR%\k2gx_a15_aac_test if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% ) @@ -102,10 +106,11 @@ set TRUE= if "%1"=="DH" set TRUE=1 if "%1"=="ALLIP" set TRUE=1 if "%1"=="ALL" set TRUE=1 +if "%1"=="ALLDH" set TRUE=1 if defined TRUE ( rem Build Dolby Harmony component libraries @pushd scripts - @call build_dh_libs.bat + @call build_dh_libs_prsdk.bat @popd if "%3"=="SDF" ( @@ -126,11 +131,12 @@ set TRUE= if "%1"=="DTSX" set TRUE=1 if "%1"=="ALLIP" set TRUE=1 if "%1"=="ALL" set TRUE=1 +if "%1"=="ALLDTSX" set TRUE=1 if defined TRUE ( rem Build DTS:X component libraries @pushd scripts - @call build_dtsx_libs.bat - @call build_parma_libs.bat + @call build_dtsx_libs_prsdk.bat + @call build_parma_libs_prsdk.bat @popd if "%3"=="SDF" ( @@ -163,6 +169,46 @@ if "%3" NEQ "SDF" goto cleanupenv @call build_os_pkg.bat %OS_PKG_DIR% @popd +:: Build AAC testapp and library +@pushd scripts +@call setup_env.bat +@call build_aac.bat testapp +@call build_aacip_pkg.bat aactestapp %AACIPTEST_PKG_DIR% +@call setup_env.bat +@call build_aac.bat lib +@call build_aacip_pkg.bat aacdec %AACIP_PKG_DIR% +@popd + +:build_installer_package +@pushd installer_builder +python generate_installer.py pasdk +@popd +set TRUE= +if "%1"=="DTSX" set TRUE=1 +if "%1"=="ALLIP" set TRUE=1 +if "%1"=="COMBINEDIP" set TRUE=1 +if "%1"=="ALLDTSX" set TRUE=1 +if defined TRUE ( + @pushd installer_builder + python generate_installer.py dts_withwrappersrc + @popd +) + +set TRUE= +if "%1"=="DH" set TRUE=1 +if "%1"=="ALLIP" set TRUE=1 +if "%1"=="ALL" set TRUE=1 +if "%1"=="ALLDH" set TRUE=1 +if defined TRUE ( + @pushd installer_builder + python generate_installer.py dolby + python generate_installer.py dolby_withwrappersrc + @popd +) + +@pushd installer_builder +python generate_installer.py aac +@popd :cleanupenv set PAROOT_DIR= diff --git a/pasrc/common/aspDecOpCircBuf_common.c b/pasrc/common/aspDecOpCircBuf_common.c index 02e6bf29..8c04e834 100644 --- a/pasrc/common/aspDecOpCircBuf_common.c +++ b/pasrc/common/aspDecOpCircBuf_common.c @@ -166,6 +166,13 @@ Int cbReset( pCb->afWrtIdx = ASP_DECOP_CB_INIT_WRTIDX_DTS; pCb->afRdIdx = ASP_DECOP_CB_INIT_RDIDX_DTS; } + else if ((pCb->sourceSel == PAF_SOURCE_DSD1) || + (pCb->sourceSel == PAF_SOURCE_DSD2) || + (pCb->sourceSel == PAF_SOURCE_DSD3)) + { + pCb->afWrtIdx = ASP_DECOP_CB_INIT_WRTIDX_DSD; + pCb->afRdIdx = ASP_DECOP_CB_INIT_RDIDX_DSD; + } else { // diff --git a/pasrc/common/aspDecOpCircBuf_common.h b/pasrc/common/aspDecOpCircBuf_common.h index cea2d723..14ceec8e 100644 --- a/pasrc/common/aspDecOpCircBuf_common.h +++ b/pasrc/common/aspDecOpCircBuf_common.h @@ -135,6 +135,14 @@ All rights reserved. #define ASP_DECOP_CB_INIT_WRTIDX_DTS ( 7 ) #define ASP_DECOP_CB_INIT_RDIDX_DTS ( 0 ) +#define ASP_DECOP_CB_MAX_NUM_AF_DSD ( 10 ) +#if (ASP_DECOP_CB_MAX_NUM_AF_DSD > ASP_DECOP_CB_MAX_NUM_AF) + #error "CB Max AF DSD error" +#endif +#define ASP_DECOP_CB_INIT_WRTIDX_DSD ( 0 ) +#define ASP_DECOP_CB_INIT_RDIDX_DSD ( 0 ) +#define ASP_DECOP_CB_TARGET_ND_SAMPS_DSD ( (4+1) * 256 ) + // Decoder output circular buffer status typedef struct PAF_AST_DecOpCircBufStatus diff --git a/pasrc/test_arm/.cproject b/pasrc/test_arm/.cproject index fb808ecb..e00c82e9 100644 --- a/pasrc/test_arm/.cproject +++ b/pasrc/test_arm/.cproject @@ -32,7 +32,7 @@ - + @@ -157,11 +157,11 @@ - - - - - + + + + +