Update build scripts for DTSX SDF build

diff --git a/build_all.bat b/build_all.bat
index a9d96d422ebfcb45a7b591c9b57d18aeb99cc109..3d907815e361b1a4f4481faa57c8f450ec04d9b1 100644 (file)
--- a/build_all.bat
+++ b/build_all.bat
@@ -15,7 +15,7 @@
 ::
 :: *************************************************************************
 
-@echo Executing:  %~fn0 %1 %2
+@echo Executing:  %~fn0 %1 %2 %3
 
 :: *************************************************************************
 :: *** Check command line input
@@ -96,7 +96,7 @@ if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% )
 @popd
 
 :: Build ARM/DSP component libraries
-if "%2" NEQ "DH" goto build_dtsx_libs
+if "%1" NEQ "DH" goto build_dtsx_libs
 :: Build Atmos component libraries
 @pushd scripts
 @call build_dh_libs.bat
@@ -107,6 +107,10 @@ if "%3" NEQ "SDF" goto build_ccs_projects
 @pushd scripts
 @call build_dhip_pkgs %DHIP_PKG_DIR%
 @popd
+:: Install DH-IP packages
+@pushd scripts
+@call install_dhip_pkgs %DHIP_PKG_DIR%
+@popd
 
 goto build_ccs_projects
 
@@ -122,11 +126,15 @@ if "%3" NEQ "SDF" goto build_ccs_projects
 @pushd scripts
 @call build_dtsxip_pkgs %DTSXIP_PKG_DIR%
 @popd
+:: Install DTS-IP packages
+@pushd scripts
+@call install_dtsxip_pkgs %DTSXIP_PKG_DIR%
+@popd
 
 :build_ccs_projects
 :: Build DSP PDK platform library, ARM/DSP applications
 @pushd scripts
-@call build_ccs_projects.bat %3 %DHIP_PKG_DIR%
+@call build_ccs_projects.bat %3
 @popd
 
 if "%3" NEQ "SDF" goto cleanupenv

diff --git a/pasdk/test_arm/.cproject b/pasdk/test_arm/.cproject
index cacc5500906a9c9ff3c2ca1981ce565bba73a5b9..fd4bec5f7882b3f5c5935885d62a73916e197919 100644 (file)
--- a/pasdk/test_arm/.cproject
+++ b/pasdk/test_arm/.cproject
@@ -375,7 +375,7 @@
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="Debug build using generated Dolby IP packages" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1859149112.1432483120" name="Debug_pkgs" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug" postbuildStep="" prebuildStep="">
+                               <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="Debug build using generated IP packages" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1859149112.1432483120" name="Debug_pkgs" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug" postbuildStep="" prebuildStep="">
                                        <folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1859149112.1432483120." name="/" resourcePath="">
                                                <toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.DebugToolchain.540692306" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.linkerDebug.1772732929">
                                                        <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1365694556" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
@@ -397,6 +397,7 @@
                                                        <tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.767496334" name="GNU Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug">
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEFINE.954399099" name="Define symbols (-D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEFINE" valueType="definedSymbols">
                                                                        <listOptionValue builtIn="false" value="k2g02"/>
+                                                                       <listOptionValue builtIn="false" value="DTS_BUILD"/>
                                                                        <listOptionValue builtIn="false" value="arm0"/>
                                                                        <listOptionValue builtIn="false" value="ARMCOMPILE"/>
                                                                        <listOptionValue builtIn="false" value="PAF_DEVICE=0xDA000000"/>
@@ -427,10 +428,13 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/common&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/shared&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_arm/framework&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_arm/application&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_dsp/sio&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_dsp/sio_dev2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dolby_ip/dh-ip/dec/rel/ddp2/alg&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dolby_ip/dh-ip/dec/rel/thd2/alg&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/3p-ip-dts/dtsx-ip/dec/rel/dtsx/alg&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/3p-ip-dts/dtsx-ip/dec/rel/dtsx/alpha&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}&quot;"/>
                                                                </option>
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MFLOAT_ABI.429385650" name="Specify if floating point hardware should be used (-mfloat-abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MFLOAT_ABI" value="hard" valueType="string"/>

diff --git a/pasdk/test_arm/application/app.cmd b/pasdk/test_arm/application/app.cmd
index cc7abc042950c4d85d2d098a96a0b4f0bd8bb0da..15df0566bdf24d65a3a2ec76ab168e88309a913d 100644 (file)
--- a/pasdk/test_arm/application/app.cmd
+++ b/pasdk/test_arm/application/app.cmd
@@ -33,23 +33,16 @@ All rights reserved.
 */
 
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\build\a15\release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\util\da10x_misc\a15\release )
+
+/*
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\intrinsics\Dolby_Intrinsics_Imp\lib_float_A15 )
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_lib\a15 )
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_wrapper\a15 )
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\dthd_dec_lib\a15 )
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\mat_dec_lib\a15 )
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\thd_alg_lib\a15 )
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\util\da10x_misc\a15\release )
-
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-3d\misc\build\a15\Release )
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-base\misc\build\a15\Release )
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\common-flib\misc\build\a15\Release )
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbr\Release )
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbrdec\Release )
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\parma-dec\misc\build\a15\Release )
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dtshd-c-decoder\misc\build\a15\lib\Release )
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\la-strm-reconstruction\misc\build\a15\Release )
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\alg\misc\build\a15\Release )
+*/
 
 /*
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-3d\misc\build\a15\Debug )
@@ -62,12 +55,23 @@ SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\la-strm-reconstruction\misc\build\a15\Debug )
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\alg\misc\build\a15\Debug )
 */
+
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-3d\misc\build\a15\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-base\misc\build\a15\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\common-flib\misc\build\a15\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbr\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbrdec\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\parma-dec\misc\build\a15\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dtshd-c-decoder\misc\build\a15\lib\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\la-strm-reconstruction\misc\build\a15\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\alg\misc\build\a15\Release )
+
 INPUT ( c67x_cintrins_elf.lib simulate_dma_elf.lib )
 INPUT ( acp_elf.lib asp_std_elf.lib com_asp_elf.lib com_dec_elf.lib pcm1_elf.lib statusop_common_elf.lib )
-INPUT ( dlb_intrinsics_generic_float32_release.a )
+INPUT ( misc_elf.lib )
+/* INPUT ( dlb_intrinsics_generic_float32_release.a ) */
 /* INPUT ( ddp_dec_lib_generic_wrapper_release.a ddp_dec_lib_generic_float32_release.a ) */
 /* INPUT ( mat_dec_lib_generic_float32_release.lib thd_alg_lib_generic_float32_release.lib dthd_dec_lib_generic_float32_release.lib ) */
-INPUT ( misc_elf.lib )
 INPUT ( dts-3d.lib dts-base.lib dts-flib.lib dts-lbr.lib dts-lbr-dec.lib dts-parma-dec.lib dtsx-c-decoder.lib la-strm-reconstruction.lib dts-alg.lib )
 
 SECTIONS

diff --git a/pasdk/test_arm/application/app_pkgs.cmd b/pasdk/test_arm/application/app_pkgs.cmd
index 92a45680e0cae93a45215c31ce7ee28bd0137421..ebc1e4da4f70213b5d6b777b740c2a86fc60db92 100644 (file)
--- a/pasdk/test_arm/application/app_pkgs.cmd
+++ b/pasdk/test_arm/application/app_pkgs.cmd
@@ -33,6 +33,8 @@ All rights reserved.
 */
 
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\build\a15\release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\util\da10x_misc\a15\release )
+
 /*
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\intrinsics\Dolby_Intrinsics_Imp\lib_float_A15 )
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_lib\a15 )
@@ -41,15 +43,40 @@ SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\mat-thd\Dolby_MAT_Dec
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\mat_dec_lib\a15 )
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\thd_alg_lib\a15 )
 */
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\dh-ip\build\a15\release )
-SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\util\da10x_misc\a15\release )
+/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\dh-ip\build\a15\release ) */
+
+/*
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-3d\misc\build\a15\Debug )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-base\misc\build\a15\Debug )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\common-flib\misc\build\a15\Debug )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbr\Debug )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbrdec\Debug )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\parma-dec\misc\build\a15\Debug )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dtshd-c-decoder\misc\build\a15\lib\Debug )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\la-strm-reconstruction\misc\build\a15\Debug )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\alg\misc\build\a15\Debug )
+*/
+
+/*
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-3d\misc\build\a15\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-base\misc\build\a15\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\common-flib\misc\build\a15\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbr\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbrdec\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\parma-dec\misc\build\a15\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dtshd-c-decoder\misc\build\a15\lib\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\la-strm-reconstruction\misc\build\a15\Release )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\alg\misc\build\a15\Release )
+*/
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\dtsx-ip\build\a15\release )
 
 INPUT ( c67x_cintrins_elf.lib simulate_dma_elf.lib )
 INPUT ( acp_elf.lib asp_std_elf.lib com_asp_elf.lib com_dec_elf.lib pcm1_elf.lib statusop_common_elf.lib )
-INPUT ( dlb_intrinsics_generic_float32_release.a )
-INPUT ( ddp_dec_lib_generic_wrapper_release.a ddp_dec_lib_generic_float32_release.a )
-INPUT ( mat_dec_lib_generic_float32_release.lib thd_alg_lib_generic_float32_release.lib dthd_dec_lib_generic_float32_release.lib )
 INPUT ( misc_elf.lib )
+/* INPUT ( dlb_intrinsics_generic_float32_release.a ) */
+/* INPUT ( ddp_dec_lib_generic_wrapper_release.a ddp_dec_lib_generic_float32_release.a ) */
+/* INPUT ( mat_dec_lib_generic_float32_release.lib thd_alg_lib_generic_float32_release.lib dthd_dec_lib_generic_float32_release.lib ) */
+INPUT ( dts-3d.lib dts-base.lib dts-flib.lib dts-lbr.lib dts-lbr-dec.lib dts-parma-dec.lib dtsx-c-decoder.lib la-strm-reconstruction.lib dts-alg.lib )
 
 SECTIONS
 {

diff --git a/pasdk/test_dsp/.cproject b/pasdk/test_dsp/.cproject
index 2e9da38a6ce08dc3a1af6bb8a0d5ffc579759ae6..a864532676b742e11d12a5ed80027433030e1614 100644 (file)
--- a/pasdk/test_dsp/.cproject
+++ b/pasdk/test_dsp/.cproject
@@ -495,7 +495,7 @@
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="Debug build using generated Dolby IP packages" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser" id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.1924763286" name="Debug_pkgs" parent="com.ti.ccstudio.buildDefinitions.C6000.Debug" postbuildStep="" prebuildStep="">
+                               <configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="Debug build using generated IP packages" errorParsers="org.eclipse.rtsc.xdctools.parsers.ErrorParser;com.ti.ccstudio.errorparser.CoffErrorParser;com.ti.ccstudio.errorparser.LinkErrorParser;com.ti.ccstudio.errorparser.AsmErrorParser" id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.1924763286" name="Debug_pkgs" parent="com.ti.ccstudio.buildDefinitions.C6000.Debug" postbuildStep="" prebuildStep="">
                                        <folderInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.1924763286." name="/" resourcePath="">
                                                <toolChain id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.DebugToolchain.1017573827" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.linkerDebug.610272205">
                                                        <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1436320383" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
@@ -599,6 +599,8 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dolby_ip/dh-ip/asp/rel/dap"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dolby_ip/dh-ip/asp/rel/dap/alg"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dolby_ip/dh-ip/asp/rel/dap/alpha"/>
+                                                                       <listOptionValue builtIn="false" value="C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\dtsx-ip\asp\rel\parma\alg"/>
+                                                                       <listOptionValue builtIn="false" value="C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\dtsx-ip\asp\rel\parma\alpha"/>
                                                                </option>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI.44528664" name="Application binary interface (coffabi not supported) [See 'General' page to edit] (--abi)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI.eabi" valueType="enumerated"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.MEM_MODEL__DATA.679300770" name="Data access model (--mem_model:data)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.MEM_MODEL__DATA" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.MEM_MODEL__DATA.far_aggregates" valueType="enumerated"/>

diff --git a/pasdk/test_dsp/application/app.cmd b/pasdk/test_dsp/application/app.cmd
index 446144d77609585c26c3433500c712f9c1f221fd..39c69b62b3e90e6d006f3dfb20d0c97e762b4b80 100644 (file)
--- a/pasdk/test_dsp/application/app.cmd
+++ b/pasdk/test_dsp/application/app.cmd
@@ -33,6 +33,12 @@ All rights reserved.
 */
 
 -i"C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\build\c66x\release"
+-i"C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\util\da10x_misc\c66x\release"
+
+-i"C:\ti\dsplib_c66x_3_4_0_0\packages\ti\dsplib\lib"
+-i"C:\ti\mathlib_c66x_3_1_1_0\packages\ti\mathlib\lib"
+
+/*
 -i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\oar\CCS_OAR_lib\make"
 -i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\car\Source_Code\car\make\alg_car\tisim_eabi_c66_ccs"
 -i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\car\Source_Code\car\make\libcar\tisim_eabi_c66_ccs"
@@ -40,9 +46,8 @@ All rights reserved.
 -i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\dap\Dolby_Audio_Processing_Home_Theatre_Imp\Source_Code\dap_ht\make\libdap_ht\linux_omap_eabi_c66_c6run"
 -i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\bmda\Source_Code\make\c66x\release"
 -i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\intrinsics\Dolby_Intrinsics_Imp\lib_elf_C66"
--i"C:\ti\dsplib_c66x_3_4_0_0\packages\ti\dsplib\lib"
--i"C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\util\da10x_misc\c66x\release"
--i"C:\ti\mathlib_c66x_3_1_1_0\packages\ti\mathlib\lib"
+*/
+
 -i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\dts-3d\misc\build\c66x\Release"
 -i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\dts-base\misc\build\c66x\Release"
 -i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\common-flib\misc\build\c66x\Release"
@@ -66,19 +71,20 @@ All rights reserved.
 -l"misc_elf.lib"
 -l"src4_elf.lib"
 -l"fil_elf.lib"
+-l"ae0_elf.lib"
+-l"ml_elf.lib"
+
+-l"dsplib.lib"
+-l"mathlib.ae66"
 
-/*-l"dolby_oar_lib.lib"*/
+/* -l"dolby_oar_lib.lib" */
 /* -l"libcar_c66_float_release.lib" */
 /* -l"algcar_c66_float_release.lib" */
 /* -l"algdap_ht_c66_float_release.lib" */
 /* -l"libdap_ht_c66_float_release.lib" */
--l"dsplib.lib"
--l"mathlib.ae66"
 /* -l"bmda_elf.lib" */
--l"dlb_intrinsics_c66_float_release.lib"
+/* -l"dlb_intrinsics_c66_float_release.lib" */
 
--l"ae0_elf.lib"
--l"ml_elf.lib"
 -l"dts-3d.lib" 
 -l"dts-base.lib" 
 -l"dts-flib.lib" 

diff --git a/pasdk/test_dsp/application/app_pkgs.cmd b/pasdk/test_dsp/application/app_pkgs.cmd
index f239d83cf46bbf827d91a2af6eb739178087eb03..f5b9775dcab25617c469cf35b57566efda05d7b8 100644 (file)
--- a/pasdk/test_dsp/application/app_pkgs.cmd
+++ b/pasdk/test_dsp/application/app_pkgs.cmd
@@ -33,6 +33,11 @@ All rights reserved.
 */
 
 -i"C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\build\c66x\release"
+-i"C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\util\da10x_misc\c66x\release"
+
+-i"C:\ti\dsplib_c66x_3_4_0_0\packages\ti\dsplib\lib"
+-i"C:\ti\mathlib_c66x_3_1_1_0\packages\ti\mathlib\lib"
+
 /*
 -i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\oar\CCS_OAR_lib\make"
 -i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\car\Source_Code\car\make\alg_car\tisim_eabi_c66_ccs"
@@ -42,10 +47,20 @@ All rights reserved.
 -i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\bmda\Source_Code\make\c66x\release"
 -i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\intrinsics\Dolby_Intrinsics_Imp\lib_elf_C66"
 */
--i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\dh-ip\build\c66x\release"
--i"C:\ti\dsplib_c66x_3_4_0_0\packages\ti\dsplib\lib"
--i"C:\ti\processor_audio_sdk_1_00_00_04\pasdk\paf\pa\util\da10x_misc\c66x\release"
+/* -i"C:\ti\processor_audio_sdk_1_00_00_04\dolby_ip\dh-ip\build\c66x\release" */
 
+/*
+-i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\dts-3d\misc\build\c66x\Release"
+-i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\dts-base\misc\build\c66x\Release"
+-i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\common-flib\misc\build\c66x\Release"
+-i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\lbr\misc\build\c66x\lbr\Release"
+-i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\lbr\misc\build\c66x\lbrdec\Release"
+-i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\parma-dec\misc\build\c66x\Release"
+-i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\dtshd-c-decoder\misc\build\c66x\lib\Release"
+-i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\la-strm-reconstruction\misc\build\c66x\Release"
+-i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\Source_Code\PARMA\alg\misc\build\c66x\Release"
+*/
+-i"C:\ti\processor_audio_sdk_1_00_00_04\3p-ip-dts\dtsx-ip\build\c66x\release"
 
 -l"acp_elf.lib"
 -l"asp_std_elf.lib"
@@ -59,18 +74,29 @@ All rights reserved.
 -l"misc_elf.lib"
 -l"src4_elf.lib"
 -l"fil_elf.lib"
+-l"ae0_elf.lib"
+-l"ml_elf.lib"
+
+-l"dsplib.lib"
+-l"mathlib.ae66"
 
--l"dolby_oar_lib.lib"
--l"libcar_c66_float_release.lib"
--l"algcar_c66_float_release.lib"
+/* -l"dolby_oar_lib.lib" */
+/* -l"libcar_c66_float_release.lib" */
+/* -l"algcar_c66_float_release.lib" */
 /* -l"algdap_ht_c66_float_release.lib" */
 /* -l"libdap_ht_c66_float_release.lib" */
--l"dsplib.lib"
--l"bmda_elf.lib"
--l"dlb_intrinsics_c66_float_release.lib"
+/* -l"bmda_elf.lib" */
+/* -l"dlb_intrinsics_c66_float_release.lib" */
 
--l"ae0_elf.lib"
--l"ml_elf.lib"
+-l"dts-3d.lib" 
+-l"dts-base.lib" 
+-l"dts-flib.lib" 
+-l"dts-lbr.lib" 
+-l"dts-lbr-dec.lib" 
+-l"dts-parma-dec.lib" 
+-l"dtsx-c-decoder.lib" 
+-l"la-strm-reconstruction.lib" 
+-l"dts-alg.lib"
 
 SECTIONS
 {

diff --git a/pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h b/pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
index ecbbd2b198cbc41c1a4e135b48fec8a2862be36f..81f558ff8c64b191d8d4453ec0f48fb818ccc954 100644 (file)
--- a/pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
+++ b/pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
@@ -57,11 +57,11 @@ All rights reserved.
 #include <ae_a.h>
 #include <ml_a.h>
 #include <src_a.h>
-#include <ddpat_a.h>
-#include <thd_a.h>
-#include <car_a.h>
-#include <oar_a.h>
-#include <bmda_a.h>
+//#include <ddpat_a.h>
+//#include <thd_a.h>
+//#include <car_a.h>
+//#include <oar_a.h>
+//#include <bmda_a.h>
 //#include <dap_a.h>
-#include <dtsuhda_a.h>
+#include <dtsuhdb_a.h>
 #endif /* _I13_A_H_ */

diff --git a/scripts/build_ccs_projects.bat b/scripts/build_ccs_projects.bat
index 8f18180fa1bb1c906c3b8c9b67b15bbe0db7f9f2..1a91cc1277e062710652fcc2bcd70f204e744e86 100644 (file)
--- a/scripts/build_ccs_projects.bat
+++ b/scripts/build_ccs_projects.bat
@@ -10,8 +10,7 @@
 :: *************************************************************************
 
 :: %1: Build profile: Debug, Release, SDF
-:: %2: DH-IP package source directory
-@echo Executing:  %~fn0 %1 %2
+@echo Executing:  %~fn0 %1
 
 if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
 
@@ -38,14 +37,14 @@ if "%1"=="Release" goto SetBuildProfilesRelease
 set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
 set ARM_APP_BUILD_PROFILE=Debug_pkgs
 set DSP_APP_BUILD_PROFILE=Debug_pkgs
-goto cont1
+goto build_ccs_projects
 
 :SetBuildProfilesDebug
 :: Set build profiles for debug
 set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
 set ARM_APP_BUILD_PROFILE=Debug
 set DSP_APP_BUILD_PROFILE=Debug
-goto cont1
+goto build_ccs_projects
 
 :SetBuildProfilesRelease
 :: Set build profiles for release
@@ -55,54 +54,6 @@ set ARM_APP_BUILD_PROFILE=Debug
 set DSP_APP_BUILD_PROFILE=Release
 
 
-:cont1
-if "%1" NEQ "SDF" goto build_ccs_projects
-:: Set unzip path
-for %%i in (git.exe) do set GIT_PATH=%DRIVE%%%~sp$PATH:i
-set UNZIP_PATH=%GIT_PATH%..\usr\bin
-set GIT_PATH=
-
-:: Set Dolby IP local root directory
-set DOLBY_IP_LROOT=%PASDK_ROOT_DIR%dolby_ip
-:: Set package install directories (location generated packages unziped for ARM/DSP application build)
-set BMDA_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
-set CAR_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
-set OAR_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
-set DDP_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
-set MATTHD_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
-set INTR_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
-:: All packages install to same directory
-::set DHIP_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
-
-:: Set package directory (location of generated packages)
-::set DHIP_PKG_DIR=%DOLBY_IP_LROOT%\package
-set DHIP_PKG_DIR=%2
-
-:: Set package names
-for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*bmda* /b') do set BMDA_PKG_FNAME=%%a
-for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*car* /b') do set CAR_PKG_FNAME=%%a
-for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*oar* /b') do set OAR_PKG_FNAME=%%a
-for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*ddp* /b') do set DDP_PKG_FNAME=%%a
-for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*matthd* /b') do set MATTHD_PKG_FNAME=%%a
-for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*intrinsics* /b') do set INTR_PKG_FNAME=%%a
-
-:: Install packages at application build locations
-if exist %BMDA_PKG_INSTALL_DIR%\nul     ( rmdir /S / Q %BMDA_PKG_INSTALL_DIR% )
-if exist %CAR_PKG_INSTALL_DIR%\nul      ( rmdir /S / Q %CAR_PKG_INSTALL_DIR% )
-if exist %OAR_PKG_INSTALL_DIR%\nul      ( rmdir /S / Q %OAR_PKG_INSTALL_DIR% )
-if exist %DDP_PKG_INSTALL_DIR%\nul      ( rmdir /S / Q %DDP_PKG_INSTALL_DIR% )
-if exist %MATTHD_PKG_INSTALL_DIR%\nul   ( rmdir /S / Q %MATTHD_PKG_INSTALL_DIR% )
-if exist %INTR_PKG_INSTALL_DIR%\nul     ( rmdir /S / Q %INTR_PKG_INSTALL_DIR% )
-@%UNZIP_PATH%\unzip -o -d %BMDA_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%BMDA_PKG_FNAME%
-@%UNZIP_PATH%\unzip -o -d %CAR_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%CAR_PKG_FNAME%
-@%UNZIP_PATH%\unzip -o -d %OAR_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%OAR_PKG_FNAME%
-@%UNZIP_PATH%\unzip -o -d %DDP_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%DDP_PKG_FNAME%
-@%UNZIP_PATH%\unzip -o -d %MATTHD_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%MATTHD_PKG_FNAME%
-@%UNZIP_PATH%\unzip -o -d %INTR_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%INTR_PKG_FNAME%
-:: All packages install to same directory
-::@%UNZIP_PATH%\unzip -o -d %DHIP_PKG_INSTALL_DIR% '%DHIP_PKG_DIR%\*.zip'
-
-
 :build_ccs_projects
 ::
 :: Initialize RTSC tools discovery path
@@ -147,21 +98,6 @@ set CYGWIN=
 set PDK_PLATFORM_LIB_BUILD_PROFILE=
 set ARM_APP_BUILD_PROFILE=
 set DSP_APP_BUILD_PROFILE=
-set UNZIP_PATH=
-set DOLBY_IP_LROOT=
-set BMDA_PKG_INSTALL_DIR=
-set CAR_PKG_INSTALL_DIR=
-set OAR_PKG_INSTALL_DIR=
-set DDP_PKG_INSTALL_DIR=
-set MATTHD_PKG_INSTALL_DIR=
-set INTR_PKG_INSTALL_DIR=
-set DHIP_PKG_DIR=
-set BMDA_PKG_FNAME=
-set CAR_PKG_FNAME=
-set OAR_PKG_FNAME=
-set DDP_PKG_FNAME=
-set MATTHD_PKG_FNAME=
-set INTR_PKG_FNAME=
 
 
 :end

diff --git a/scripts/build_dhip_pkgs.bat b/scripts/build_dhip_pkgs.bat
index 3de8f778f2423dfa8ac8b914c9c5c1296fa90ce9..352028c3b9a2a66a660afb7ebbf7b9db6eb30abd 100644 (file)
--- a/scripts/build_dhip_pkgs.bat
+++ b/scripts/build_dhip_pkgs.bat
@@ -38,7 +38,9 @@ if NOT exist %DHIP_PKGS_DEST_DIR%\nul ( mkdir %DHIP_PKGS_DEST_DIR% )
 @call build_dhip_pkg oar %DHIP_PKGS_DEST_DIR%
 @call build_dhip_pkg intrinsics %DHIP_PKGS_DEST_DIR%
 
-@copy /Y %PASDK_ROOT_DIR%docs\PASDK_release_notes_dolby_ip.pdf %DHIP_PKGS_DEST_DIR%\PASDK_release_notes_dolby_ip.pdf
+if exist %PASDK_ROOT_DIR%docs\PASDK_release_notes_dolby_ip.pdf (
+    @copy /Y %PASDK_ROOT_DIR%docs\PASDK_release_notes_dolby_ip.pdf %DTSXIP_PKGS_DEST_DIR%\PASDK_release_notes_dolby_ip.pdf
+)
 
 
 :cleanupenv

diff --git a/scripts/build_dtsxip_pkg.bat b/scripts/build_dtsxip_pkg.bat
new file mode 100644 (file)
index 0000000..19b58ae
--- /dev/null
+++ b/scripts/build_dtsxip_pkg.bat
@@ -0,0 +1,119 @@
+@echo off
+:: *************************************************************************
+::  FILE           : build_dtsxip_pkg.bat
+::  DESCRIPTION    :
+::
+::     Builds package for DTS:X component library.
+::     Assumes setup_env.bat has been called.
+::
+:: *************************************************************************
+
+:: %1: package to build (bmda, car, ddp, matthd, oar, intrinsics)
+:: %2: package destination directory
+@echo Executing:  %~fn0 %1 %2
+
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+
+:: Set DTSX IP local root directory
+set DTSX_IP_LROOT=%PASDK_ROOT_DIR%3p-ip-dts
+
+:: Set package directory
+if "%2"=="" goto def_prm_pkg_dest_dir
+
+:prm_pkg_dest_dir
+set DTSXIP_PKG_DEST_DIR=%2
+goto set_dtsxip_pkg_name
+
+:def_prm_pkg_dest_dir
+set DTSXIP_PKG_DEST_DIR=%~dp0
+
+
+:set_dtsxip_pkg_name
+:: Set package name
+for /f "tokens=2 delims==" %%a in ('wmic OS Get localdatetime /value') do set "dt=%%a"
+set DATESTR=%dt:~2,2%%dt:~4,2%%dt:~6,2%
+
+set DTSXIP_PKG_FNAME=pasdk
+if "%PASDK_TARGET_PLATFORM%" NEQ "" set DTSXIP_PKG_FNAME=%DTSXIP_PKG_FNAME%_%PASDK_TARGET_PLATFORM%
+set DTSXIP_PKG_FNAME=%DTSXIP_PKG_FNAME%_%DATESTR%_%1
+
+if /I "%1" == "dtsxdec" goto build_dtsxdec_pkg
+if /I "%1" == "parma" goto build_parma_pkg
+@echo "Invalid package"
+goto cleanupenv
+
+
+:build_dtsxdec_pkg
+@echo Build package: %1 %DTSXIP_PKG_DEST_DIR%
+set DTSXDEC_ROOT_DIR=%DTSX_IP_LROOT%\Source_Code\sdk-dts-uhd-no-guidedparma-src
+if exist Temp\nul ( rmdir /S /Q Temp )
+if NOT exist %DTSXIP_PKG_DEST_DIR%\nul ( mkdir %DTSXIP_PKG_DEST_DIR% )
+@mkdir Temp
+@pushd Temp
+@mkdir dec\rel\dtsx\alg
+@mkdir dec\rel\dtsx\alpha
+@mkdir build\a15\release
+@mkdir DOC
+@copy /Y %DTSXDEC_ROOT_DIR%\alg\src\dtsuhda.h dec\rel\dtsx\alg
+@copy /Y %DTSXDEC_ROOT_DIR%\alg\src\dtsuhda_tid.h dec\rel\dtsx\alg
+@copy /Y %DTSXDEC_ROOT_DIR%\alg\src\idtsuhda.h dec\rel\dtsx\alg
+@copy /Y %DTSXDEC_ROOT_DIR%\alg\alpha\dtsuhda_a.h dec\rel\dtsx\alpha
+@copy /Y %DTSXDEC_ROOT_DIR%\parma-dec\misc\build\a15\Release\dts-parma-dec.lib build\a15\release
+@copy /Y %DTSXDEC_ROOT_DIR%\la-strm-reconstruction\misc\build\a15\Release\la-strm-reconstruction.lib build\a15\release
+@copy /Y %DTSXDEC_ROOT_DIR%\lbr\misc\build\a15\lbr\Release\dts-lbr.lib build\a15\release
+@copy /Y %DTSXDEC_ROOT_DIR%\lbr\misc\build\a15\lbrdec\Release\dts-lbr-dec.lib  build\a15\release
+@copy /Y %DTSXDEC_ROOT_DIR%\dts-3d\misc\build\a15\Release\dts-3d.lib build\a15\release
+@copy /Y %DTSXDEC_ROOT_DIR%\dts-base\misc\build\a15\Release\dts-base.lib build\a15\release
+@copy /Y %DTSXDEC_ROOT_DIR%\common-flib\misc\build\a15\Release\dts-flib.lib build\a15\release
+@copy /Y %DTSXDEC_ROOT_DIR%\dtshd-c-decoder\misc\build\a15\lib\Release\dtsx-c-decoder.lib build\a15\release
+@copy /Y %DTSXDEC_ROOT_DIR%\alg\misc\build\a15\Release\dts-alg.lib build\a15\release
+::@copy /Y %DTSXDEC_ROOT_DIR%\doc\XXXUsersGuide.pdf DOC
+7z a -tzip -r pkg.zip
+@popd
+@copy /Y Temp\pkg.zip %DTSXIP_PKG_DEST_DIR%\%DTSXIP_PKG_FNAME%.zip
+@rmdir /S /Q Temp
+set DTSXDEC_ROOT_DIR=
+goto cleanupenv
+
+
+:build_parma_pkg
+@echo Build package: %1 %DTSXIP_PKG_DEST_DIR%
+set PARMA_ROOT_DIR=%DTSX_IP_LROOT%\Source_Code\PARMA
+if exist Temp\nul ( rmdir /S /Q Temp )
+if NOT exist %DTSXIP_PKG_DEST_DIR%\nul ( mkdir %DTSXIP_PKG_DEST_DIR% )
+@mkdir Temp
+@pushd Temp
+@mkdir asp\rel\parma\alg
+@mkdir asp\rel\parma\alpha
+@mkdir build\c66x\release
+@mkdir DOC
+@copy /Y %PARMA_ROOT_DIR%\alg\src\dtsuhdb.h asp\rel\parma\alg
+@copy /Y %PARMA_ROOT_DIR%\alg\src\dtsuhdb_mds.h asp\rel\parma\alg
+@copy /Y %PARMA_ROOT_DIR%\alg\src\idtsuhdb.h asp\rel\parma\alg
+@copy /Y %PARMA_ROOT_DIR%\alg\alpha\dtsuhdb_a.h asp\rel\parma\alpha
+@copy /Y %PARMA_ROOT_DIR%\parma-dec\misc\build\c66x\Release\dts-parma-dec.lib build\c66x\release
+@copy /Y %PARMA_ROOT_DIR%\la-strm-reconstruction\misc\build\c66x\Release\la-strm-reconstruction.lib build\c66x\release
+@copy /Y %PARMA_ROOT_DIR%\lbr\misc\build\c66x\lbr\Release\dts-lbr.lib build\c66x\release
+@copy /Y %PARMA_ROOT_DIR%\lbr\misc\build\c66x\lbrdec\Release\dts-lbr-dec.lib build\c66x\release
+@copy /Y %PARMA_ROOT_DIR%\dts-3d\misc\build\c66x\Release\dts-3d.lib build\c66x\release
+@copy /Y %PARMA_ROOT_DIR%\dts-base\misc\build\c66x\Release\dts-base.lib build\c66x\release
+@copy /Y %PARMA_ROOT_DIR%\common-flib\misc\build\c66x\Release\dts-flib.lib build\c66x\release
+@copy /Y %PARMA_ROOT_DIR%\dtshd-c-decoder\misc\build\c66x\lib\Release\dtsx-c-decoder.lib build\c66x\release
+@copy /Y %PARMA_ROOT_DIR%\alg\misc\build\c66x\Release\dts-alg.lib build\c66x\release
+::@copy /Y %PARMA_ROOT_DIR%\doc\XXXUsersGuide.pdf DOC
+7z a -tzip -r pkg.zip
+@popd
+@copy /Y Temp\pkg.zip %DTSXIP_PKG_DEST_DIR%\%DTSXIP_PKG_FNAME%.zip
+@rmdir /S /Q Temp
+set PARMA_ROOT_DIR=
+goto cleanupenv
+
+
+:cleanupenv
+set DTSX_IP_LROOT=
+set DTSXIP_PKG_DEST_DIR=
+set DATESTR=
+set DTSXIP_PKG_FNAME=
+
+
+:end

diff --git a/scripts/build_dtsxip_pkgs.bat b/scripts/build_dtsxip_pkgs.bat
new file mode 100644 (file)
index 0000000..0dc8fa9
--- /dev/null
+++ b/scripts/build_dtsxip_pkgs.bat
@@ -0,0 +1,46 @@
+@echo off
+:: *************************************************************************
+::  FILE           : build_dtsxip_pkgs.bat
+::  DESCRIPTION    :
+::
+::     Builds DTSX-IP packages.
+::     Assumes setup_env.bat has been called.
+::
+:: *************************************************************************
+
+:: %1: packages destination directory
+@echo Executing:  %~fn0 %1
+
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+
+if "%1"=="" goto def_prm_dtsxip_pkgs_dest_dir
+
+:: Set package directory
+:prm_dtsxip_pkgs_dest_dir
+set DTSXIP_PKGS_DEST_DIR=%1
+goto build_dtsxip_pkgs
+
+:def_prm_dtsxip_pkgs_dest_dir
+set DTSXIP_PKGS_DEST_DIR=%~dp0
+
+
+:build_dtsxip_pkgs
+::
+:: Build ARM/DSP component packages
+::
+
+:: Build Atmos component packages
+if NOT exist %DTSXIP_PKGS_DEST_DIR%\nul ( mkdir %DTSXIP_PKGS_DEST_DIR% )
+@call build_dtsxip_pkg dtsxdec %DTSXIP_PKGS_DEST_DIR%
+@call build_dtsxip_pkg parma %DTSXIP_PKGS_DEST_DIR%
+
+if exist %PASDK_ROOT_DIR%docs\PASDK_release_notes_dtsx_ip.pdf (
+    @copy /Y %PASDK_ROOT_DIR%docs\PASDK_release_notes_dtsx_ip.pdf %DTSXIP_PKGS_DEST_DIR%\PASDK_release_notes_dtsx_ip.pdf
+)
+
+
+:cleanupenv
+set DTSXIP_PKGS_DEST_DIR=
+
+
+:end

diff --git a/scripts/install_dhip_pkgs.bat b/scripts/install_dhip_pkgs.bat
new file mode 100644 (file)
index 0000000..c67b1fd
--- /dev/null
+++ b/scripts/install_dhip_pkgs.bat
@@ -0,0 +1,74 @@
+@echo off
+:: *************************************************************************
+::  FILE           : install_dhip_pkgs.bat
+::  DESCRIPTION    :
+::
+::     Installes DH-IP packages.
+::
+:: *************************************************************************
+
+:: %1: DH-IP package source directory
+@echo Executing:  %~fn0 %1
+
+:: Set unzip path
+for %%i in (git.exe) do set GIT_PATH=%DRIVE%%%~sp$PATH:i
+set UNZIP_PATH=%GIT_PATH%..\usr\bin
+set GIT_PATH=
+
+:: Set Dolby IP local root directory
+set DOLBY_IP_LROOT=%PASDK_ROOT_DIR%dolby_ip
+:: Set package install directories (location generated packages unziped for ARM/DSP application build)
+set BMDA_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
+set CAR_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
+set OAR_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
+set DDP_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
+set MATTHD_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
+set INTR_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
+:: All packages install to same directory
+::set DHIP_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
+
+:: Set package directory (location of generated packages)
+::set DHIP_PKG_DIR=%DOLBY_IP_LROOT%\package
+set DHIP_PKG_DIR=%1
+
+:: Set package names
+for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*bmda* /b') do set BMDA_PKG_FNAME=%%a
+for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*car* /b') do set CAR_PKG_FNAME=%%a
+for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*oar* /b') do set OAR_PKG_FNAME=%%a
+for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*ddp* /b') do set DDP_PKG_FNAME=%%a
+for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*matthd* /b') do set MATTHD_PKG_FNAME=%%a
+for /f "delims=" %%a in ('dir %DHIP_PKG_DIR%\*intrinsics* /b') do set INTR_PKG_FNAME=%%a
+
+:: Install packages at application build locations
+if exist %BMDA_PKG_INSTALL_DIR%\nul     ( rmdir /S / Q %BMDA_PKG_INSTALL_DIR% )
+if exist %CAR_PKG_INSTALL_DIR%\nul      ( rmdir /S / Q %CAR_PKG_INSTALL_DIR% )
+if exist %OAR_PKG_INSTALL_DIR%\nul      ( rmdir /S / Q %OAR_PKG_INSTALL_DIR% )
+if exist %DDP_PKG_INSTALL_DIR%\nul      ( rmdir /S / Q %DDP_PKG_INSTALL_DIR% )
+if exist %MATTHD_PKG_INSTALL_DIR%\nul   ( rmdir /S / Q %MATTHD_PKG_INSTALL_DIR% )
+if exist %INTR_PKG_INSTALL_DIR%\nul     ( rmdir /S / Q %INTR_PKG_INSTALL_DIR% )
+@%UNZIP_PATH%\unzip -o -d %BMDA_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%BMDA_PKG_FNAME%
+@%UNZIP_PATH%\unzip -o -d %CAR_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%CAR_PKG_FNAME%
+@%UNZIP_PATH%\unzip -o -d %OAR_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%OAR_PKG_FNAME%
+@%UNZIP_PATH%\unzip -o -d %DDP_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%DDP_PKG_FNAME%
+@%UNZIP_PATH%\unzip -o -d %MATTHD_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%MATTHD_PKG_FNAME%
+@%UNZIP_PATH%\unzip -o -d %INTR_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\%INTR_PKG_FNAME%
+:: All packages install to same directory
+::@%UNZIP_PATH%\unzip -o -d %DHIP_PKG_INSTALL_DIR% '%DHIP_PKG_DIR%\*.zip'
+
+
+:cleanupenv
+set UNZIP_PATH=
+set DOLBY_IP_LROOT=
+set BMDA_PKG_INSTALL_DIR=
+set CAR_PKG_INSTALL_DIR=
+set OAR_PKG_INSTALL_DIR=
+set DDP_PKG_INSTALL_DIR=
+set MATTHD_PKG_INSTALL_DIR=
+set INTR_PKG_INSTALL_DIR=
+set DHIP_PKG_DIR=
+set BMDA_PKG_FNAME=
+set CAR_PKG_FNAME=
+set OAR_PKG_FNAME=
+set DDP_PKG_FNAME=
+set MATTHD_PKG_FNAME=
+set INTR_PKG_FNAME=

diff --git a/scripts/install_dtsxip_pkgs.bat b/scripts/install_dtsxip_pkgs.bat
new file mode 100644 (file)
index 0000000..54aff23
--- /dev/null
+++ b/scripts/install_dtsxip_pkgs.bat
@@ -0,0 +1,50 @@
+@echo off
+:: *************************************************************************
+::  FILE           : install_dtsxip_pkgs.bat
+::  DESCRIPTION    :
+::
+::     Installes DTSX-IP packages.
+::
+:: *************************************************************************
+
+:: %1: DTSX-IP package source directory
+@echo Executing:  %~fn0 %1
+
+:: Set unzip path
+for %%i in (git.exe) do set GIT_PATH=%DRIVE%%%~sp$PATH:i
+set UNZIP_PATH=%GIT_PATH%..\usr\bin
+set GIT_PATH=
+
+:: Set DTS IP local root directory
+set DTS_IP_LROOT=%PASDK_ROOT_DIR%3p-ip-dts
+:: Set package install directories (location generated packages unziped for ARM/DSP application build)
+set DTSXDEC_PKG_INSTALL_DIR=%DTS_IP_LROOT%\dtsx-ip
+set PARMA_PKG_INSTALL_DIR=%DTS_IP_LROOT%\dtsx-ip
+:: All packages install to same directory
+::set DTSX_PKG_INSTALL_DIR=%DTS_IP_LROOT%\dtsx-ip
+
+:: Set package directory (location of generated packages)
+::set DTSXIP_PKG_DIR=%DTS_IP_LROOT%\package
+set DTSXIP_PKG_DIR=%1
+
+:: Set package names
+for /f "delims=" %%a in ('dir %DTSXIP_PKG_DIR%\*dtsx* /b') do set DTSXDEC_PKG_FNAME=%%a
+for /f "delims=" %%a in ('dir %DTSXIP_PKG_DIR%\*parma* /b') do set PARMA_PKG_FNAME=%%a
+
+:: Install packages at application build locations
+if exist %DTSXDEC_PKG_INSTALL_DIR%\nul    ( rmdir /S / Q %DTSXDEC_PKG_INSTALL_DIR% )
+if exist %PARMA_PKG_INSTALL_DIR%\nul      ( rmdir /S / Q %PARMA_PKG_INSTALL_DIR% )
+@%UNZIP_PATH%\unzip -o -d %DTSXDEC_PKG_INSTALL_DIR% %DTSXIP_PKG_DIR%\%DTSXDEC_PKG_FNAME%
+@%UNZIP_PATH%\unzip -o -d %PARMA_PKG_INSTALL_DIR% %DTSXIP_PKG_DIR%\%PARMA_PKG_FNAME%
+:: All packages install to same directory
+::@%UNZIP_PATH%\unzip -o -d %DTSX_PKG_INSTALL_DIR% '%DTSXIP_PKG_DIR%\*.zip'
+
+
+:cleanupenv
+::set UNZIP_PATH=
+::set DTS_IP_LROOT=
+::set DTSXDEC_PKG_INSTALL_DIR=
+::set PARMA_PKG_INSTALL_DIR=
+::set DTSXIP_PKG_DIR=
+::set DTSXDEC_PKG_FNAME=
+::set PARMA_PKG_FNAME=