From e770ed197d5832d684fb1740283e42413b37351e Mon Sep 17 00:00:00 2001
From: azmill <adam.mills@dolby.com>
Date: Wed, 9 Aug 2023 11:04:41 +1000
Subject: [PATCH 1/4] Fixing the binary hrtf files and the convertor so that
 they use the correct number of taps

---
 apps/decoder.c                                              | 2 ++
 .../Table_Format_Converter/CMakeLists.txt                   | 3 ++-
 .../generate_tables_from_rom_to_bin.c                       | 6 +++---
 .../binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin    | 4 ++--
 .../binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin    | 4 ++--
 .../binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin    | 4 ++--
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/apps/decoder.c b/apps/decoder.c
index ea8a58f8db..02eed48de3 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -668,6 +668,7 @@ int main(
         if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nError in loading HRTF binary file %s for FastConv \n\n", arg.hrtfCRendFileName );
+            goto cleanup;
         }
         IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin = NULL;
         IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin );
@@ -675,6 +676,7 @@ int main(
         if ( ( error = load_parambin_HRTF_from_binary( hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nError in loading HRTF binary file %s for parametric binauralizer \n\n", arg.hrtfCRendFileName );
+            goto cleanup;
         }
     }
 
diff --git a/scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt b/scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt
index 259e3b97b6..cc9c9a9cdc 100644
--- a/scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt
+++ b/scripts/binauralRenderer_interface/Table_Format_Converter/CMakeLists.txt
@@ -19,8 +19,9 @@ set(IVAS_ENC_PATH ${IVAS_PATH}/lib_enc)
 set(IVAS_COM_PATH ${IVAS_PATH}/lib_com)
 set(IVAS_REND_PATH ${IVAS_PATH}/lib_rend)
 set(IVAS_DEBUG_PATH ${IVAS_PATH}/lib_debug)
+set(IVAS_LC3PLUS_PATH ${IVAS_PATH}/lc3plus)
 
-include_directories(${IVAS_UTIL_PATH} ${IVAS_ENC_PATH} ${IVAS_DEC_PATH} ${IVAS_COM_PATH} ${IVAS_REND_PATH} ${IVAS_DEBUG_PATH})
+include_directories(${IVAS_UTIL_PATH} ${IVAS_ENC_PATH} ${IVAS_DEC_PATH} ${IVAS_COM_PATH} ${IVAS_REND_PATH} ${IVAS_DEBUG_PATH} ${IVAS_LC3PLUS_PATH})
 
 set(SOURCE_FILES_C
   ${IVAS_REND_PATH}/ivas_rom_binauralRenderer.c
diff --git a/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c b/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c
index 00520bb924..1c51ea1c07 100644
--- a/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c
+++ b/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c
@@ -833,7 +833,7 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG
 
         latency_s = FASTCONV_HOA3_latency_s;
         hrtf_channels = HRTF_SH_CHANNELS;
-        num_taps = BINAURAL_NTAPS;
+        num_taps = BINAURAL_NTAPS_SBA;
     }
     else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 )
     {
@@ -845,7 +845,7 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG
 
         latency_s = FASTCONV_HOA2_latency_s;
         hrtf_channels = 9;
-        num_taps = BINAURAL_NTAPS;
+        num_taps = BINAURAL_NTAPS_SBA;
     }
     else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA )
     {
@@ -857,7 +857,7 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG
 
         latency_s = FASTCONV_FOA_latency_s;
         hrtf_channels = 4;
-        num_taps = BINAURAL_NTAPS;
+        num_taps = BINAURAL_NTAPS_SBA;
     }
     else
     {
diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
index 980668c27e..a6277b6987 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07d2de62c345650f19a404001c5502e64f72277e6c689064e204a7031779bc0e
-size 2072948
+oid sha256:d9177d022015cf351ac44e5200cae6834603d3edbf5359257053fd519e12f545
+size 2026548
diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
index 9659006ef6..ca0cfd1bde 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2c8461458ca23f86f592acf102edfec4eb80bbb935bb324e04ab1c535d0dd94
-size 2573320
+oid sha256:3e4522b317234430196fc3f4088ac97acc68defd1da94f7985e976c3bc743ea0
+size 2526920
diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
index d2dee97c34..6e09ebaf27 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80043c85556218c5444c87aa2a86498ab4158fc40c6f4c3190caa182af1553e5
-size 2852056
+oid sha256:444919f25a7f14daab1e2110a30c2bc3553b59f73c595d70e9bdc9e39335dd7a
+size 2805656
-- 
GitLab


From bb0aa9b8d69477dce847c3c62c92da26e91d06c0 Mon Sep 17 00:00:00 2001
From: azmill <adam.mills@dolby.com>
Date: Thu, 10 Aug 2023 14:44:31 +1000
Subject: [PATCH 2/4] Pushing a bad bin files to check error handling

---
 .../binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
index ca0cfd1bde..a15aa4b6e9 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e4522b317234430196fc3f4088ac97acc68defd1da94f7985e976c3bc743ea0
-size 2526920
+oid sha256:a77546c4bad2b9890eb44e974098bfa172e7a04c5527e258c1fd0a59b7c084ec
+size 2573320
-- 
GitLab


From ddf5f1a2fdfe85ef6d82602793dfaaef45ea6b8a Mon Sep 17 00:00:00 2001
From: azmill <adam.mills@dolby.com>
Date: Thu, 10 Aug 2023 15:58:05 +1000
Subject: [PATCH 3/4] Fixing the 32kHz bin

---
 .../binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
index a15aa4b6e9..ca0cfd1bde 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a77546c4bad2b9890eb44e974098bfa172e7a04c5527e258c1fd0a59b7c084ec
-size 2573320
+oid sha256:3e4522b317234430196fc3f4088ac97acc68defd1da94f7985e976c3bc743ea0
+size 2526920
-- 
GitLab


From b01b3e76c44345ccc3d4c9487279b8a6c8f5de12 Mon Sep 17 00:00:00 2001
From: azmill <adam.mills@dolby.com>
Date: Thu, 10 Aug 2023 20:52:39 +1000
Subject: [PATCH 4/4] Fixing bin files

---
 .../binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin      | 4 ++--
 .../binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin      | 4 ++--
 .../binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
index 94d2db66cd..d2fe916764 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d522e9a2e6fee7784b28dbf15fd900bc6c1b7c5d13d567bcf5229d57782724f
-size 255
+oid sha256:7e6083e464f1f3f3e56bd5f55cfac39fbaa033c1c9a8b52125279058628230f8
+size 1988942
diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
index 18b268b1e0..5be2ffc647 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f211aae4315419e54f6e11a2b42d6a369f9fae4232cc144f68a1a9bbd769349
-size 255
+oid sha256:c806db52e44bf58bcbacd74139542d78f1e5c0d2a9119bcdda26cba210ee8130
+size 2452162
diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
index c4be6d36e8..3ae9682d81 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:def42dabdb48e12370c9e23f80ded035723aad498f3448e59c6decf21769985e
-size 255
+oid sha256:ebbf826bf08df11e31ec0f33666a34925e1e83288156ed70a331f05d1a8ffd36
+size 2694610
-- 
GitLab