author | Chitresh Gupta <chitresh.g@pathpartnertech.com> | |
Mon, 12 Dec 2016 11:39:08 +0000 (17:09 +0530) | ||
committer | Chitresh Gupta <chitresh.g@pathpartnertech.com> | |
Mon, 12 Dec 2016 11:39:08 +0000 (17:09 +0530) |
Conflicts:
pasdk/paf
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_dsp/framework/audioStreamInpProc.c
pasdk/paf
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_dsp/framework/audioStreamInpProc.c
diff --cc pasdk/test_arm/.cproject
Simple merge
diff --cc pasdk/test_arm/application/app.cfg
Simple merge
diff --cc pasdk/test_arm/application/app.cmd
index 7c5354e20f7769389a0c4fb5544d48edeee8a631,9e57befc5db1dd9fb515870c6e3aa6cd83353441..17311c47413364dbefbfe07e4f4ec1f9bb4d3a7c
SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\dolby_ip\intrinsics\Dolby_Intrinsics_Imp\lib_float_A15 )
SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\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_00\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_00\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_00\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_00\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\thd_alg_lib\a15 )
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 )
+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 )
SECTIONS
{
diff --cc pasdk/test_dsp/.cproject
Simple merge
diff --cc pasdk/test_dsp/application/app.cfg
Simple merge
Simple merge