From 10e56aef506a624a6208d5b73f2130d19a57f996 Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 27 Feb 2023 13:04:11 +0100 Subject: [PATCH 1/3] revison of includes in lib_util and app and use "common_api_types" wherever applicable --- apps/decoder.c | 1 - apps/encoder.c | 1 - apps/renderer.c | 5 +---- lib_com/common_api_types.h | 3 +-- lib_dec/lib_dec.h | 2 -- lib_enc/lib_enc.h | 2 -- lib_rend/lib_rend.h | 2 -- lib_util/audio_file_reader.h | 3 +-- lib_util/audio_file_writer.h | 3 +-- lib_util/bitstream_reader.h | 4 +--- lib_util/bitstream_writer.c | 1 - lib_util/bitstream_writer.h | 3 +-- lib_util/cmdln_parser.c | 1 - lib_util/cmdln_parser.h | 4 +--- lib_util/g192.c | 3 --- lib_util/g192.h | 3 ++- lib_util/head_rotation_file_reader.c | 1 - lib_util/head_rotation_file_reader.h | 1 - lib_util/hrtf_file_reader.c | 1 - lib_util/hrtf_file_reader.h | 3 +-- lib_util/ism_file_reader.c | 1 - lib_util/ism_file_reader.h | 2 -- lib_util/ism_file_writer.c | 1 - lib_util/ism_file_writer.h | 2 -- lib_util/jbm_file_reader.c | 1 - lib_util/jbm_file_reader.h | 2 -- lib_util/jbm_file_writer.c | 1 - lib_util/jbm_file_writer.h | 2 -- lib_util/ls_custom_file_reader.c | 1 - lib_util/ls_custom_file_reader.h | 2 -- lib_util/masa_file_reader.c | 1 - lib_util/masa_file_reader.h | 2 -- lib_util/masa_file_writer.c | 1 - lib_util/masa_file_writer.h | 2 -- lib_util/mime_io.c | 1 - lib_util/render_config_reader.c | 1 - lib_util/render_config_reader.h | 1 - 37 files changed, 10 insertions(+), 61 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 3b312b95f6..685461fd3f 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -33,7 +33,6 @@ #include #include #include -#include "options.h" #include "lib_dec.h" #include "cmdl_tools.h" #include "audio_file_writer.h" diff --git a/apps/encoder.c b/apps/encoder.c index 09baa814ae..2bba771bda 100644 --- a/apps/encoder.c +++ b/apps/encoder.c @@ -33,7 +33,6 @@ #include #include #include -#include "options.h" #include "lib_enc.h" #include "cmdl_tools.h" #include "audio_file_reader.h" diff --git a/apps/renderer.c b/apps/renderer.c index 66a1d666e3..ceda39b43b 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -30,23 +30,20 @@ *******************************************************************************************************/ +#include "lib_rend.h" #include #include #include #include -#include #include #include -#include "options.h" #include "audio_file_reader.h" #include "audio_file_writer.h" #include "cmdl_tools.h" #include "cmdln_parser.h" -#include "common_api_types.h" #include "head_rotation_file_reader.h" #include "hrtf_file_reader.h" #include "ism_file_reader.h" -#include "lib_rend.h" #include "ls_custom_file_reader.h" #include "masa_file_reader.h" #include "prot.h" diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h index d03a0b7f81..f3bf6466c6 100644 --- a/lib_com/common_api_types.h +++ b/lib_com/common_api_types.h @@ -33,11 +33,10 @@ #ifndef COMMON_API_TYPES_H #define COMMON_API_TYPES_H -/* options.h needed for debugging/development features - * It should be stripped for delivery along with debugging switches */ #include "options.h" #include #include +#include "ivas_error.h" /*----------------------------------------------------------------------------------* * Common API constants diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h index e41937b3b1..0de964b15c 100644 --- a/lib_dec/lib_dec.h +++ b/lib_dec/lib_dec.h @@ -34,9 +34,7 @@ #define LIB_DEC_H #include "common_api_types.h" -#include "ivas_error.h" #include -#include /*---------------------------------------------------------------------* diff --git a/lib_enc/lib_enc.h b/lib_enc/lib_enc.h index be4d673596..e400e04db7 100644 --- a/lib_enc/lib_enc.h +++ b/lib_enc/lib_enc.h @@ -34,9 +34,7 @@ #define LIB_ENC_H #include "common_api_types.h" -#include "ivas_error.h" #include -#include /*---------------------------------------------------------------------* diff --git a/lib_rend/lib_rend.h b/lib_rend/lib_rend.h index 1a7738d37f..6db5fd91dc 100644 --- a/lib_rend/lib_rend.h +++ b/lib_rend/lib_rend.h @@ -34,9 +34,7 @@ #define LIB_REND_H #include "common_api_types.h" -#include "ivas_error.h" #include -#include #define RENDERER_MAX_ISM_INPUTS 4 diff --git a/lib_util/audio_file_reader.h b/lib_util/audio_file_reader.h index 46c458e646..4cdb566ba5 100644 --- a/lib_util/audio_file_reader.h +++ b/lib_util/audio_file_reader.h @@ -33,8 +33,7 @@ #ifndef IVAS_AUDIO_FILE_READER_H #define IVAS_AUDIO_FILE_READER_H -#include -#include "ivas_error.h" +#include "common_api_types.h" struct AudioFileReader; typedef struct AudioFileReader AudioFileReader; diff --git a/lib_util/audio_file_writer.h b/lib_util/audio_file_writer.h index e2bf1b850d..b5157ffde4 100644 --- a/lib_util/audio_file_writer.h +++ b/lib_util/audio_file_writer.h @@ -33,8 +33,7 @@ #ifndef IVAS_AUDIO_FILE_WRITER_H #define IVAS_AUDIO_FILE_WRITER_H -#include -#include "ivas_error.h" +#include "common_api_types.h" struct AudioFileWriter; typedef struct AudioFileWriter AudioFileWriter; diff --git a/lib_util/bitstream_reader.h b/lib_util/bitstream_reader.h index 3d6ac06f20..2accbbd242 100644 --- a/lib_util/bitstream_reader.h +++ b/lib_util/bitstream_reader.h @@ -33,9 +33,7 @@ #ifndef BITSTREAM_READER_H #define BITSTREAM_READER_H -#include "options.h" -#include "ivas_error.h" -#include +#include "common_api_types.h" /*-----------------------------------------------------------------------* diff --git a/lib_util/bitstream_writer.c b/lib_util/bitstream_writer.c index 0e0f9af6ae..7862ff1977 100644 --- a/lib_util/bitstream_writer.c +++ b/lib_util/bitstream_writer.c @@ -33,7 +33,6 @@ #include "bitstream_writer.h" #include "g192.h" #include "mime_io.h" -#include "ivas_error.h" #include "ivas_error_utils.h" #include #include diff --git a/lib_util/bitstream_writer.h b/lib_util/bitstream_writer.h index 19b09907bf..a855f347d2 100644 --- a/lib_util/bitstream_writer.h +++ b/lib_util/bitstream_writer.h @@ -33,8 +33,7 @@ #ifndef BITSTREAM_WRITER_H #define BITSTREAM_WRITER_H -#include -#include "ivas_error.h" +#include "common_api_types.h" /*-----------------------------------------------------------------------* diff --git a/lib_util/cmdln_parser.c b/lib_util/cmdln_parser.c index 860765476a..200b8c86e9 100644 --- a/lib_util/cmdln_parser.c +++ b/lib_util/cmdln_parser.c @@ -31,7 +31,6 @@ *******************************************************************************************************/ #include "cmdln_parser.h" - #include #include #include diff --git a/lib_util/cmdln_parser.h b/lib_util/cmdln_parser.h index 61f3ad4a30..b8c8370eb4 100644 --- a/lib_util/cmdln_parser.h +++ b/lib_util/cmdln_parser.h @@ -33,11 +33,9 @@ #ifndef CMDLN_PARSER_H #define CMDLN_PARSER_H -#include +#include "common_api_types.h" #include -#include "options.h" - typedef struct { int32_t id; diff --git a/lib_util/g192.c b/lib_util/g192.c index 2105c1d5a8..04ba16c369 100644 --- a/lib_util/g192.c +++ b/lib_util/g192.c @@ -35,10 +35,7 @@ ====================================================================================*/ #include "g192.h" -#include "common_api_types.h" #include -#include -#include #include #include #ifndef _WIN32 diff --git a/lib_util/g192.h b/lib_util/g192.h index f07cc77b22..2dfd34b9e5 100644 --- a/lib_util/g192.h +++ b/lib_util/g192.h @@ -37,8 +37,9 @@ #ifndef G192_H #define G192_H G192_H +#include "common_api_types.h" #include -#include + /*-----------------------------------------------------------------------* * Enums diff --git a/lib_util/head_rotation_file_reader.c b/lib_util/head_rotation_file_reader.c index 4267be7c52..533c14a651 100644 --- a/lib_util/head_rotation_file_reader.c +++ b/lib_util/head_rotation_file_reader.c @@ -31,7 +31,6 @@ *******************************************************************************************************/ #include "head_rotation_file_reader.h" -#include #include #include #include diff --git a/lib_util/head_rotation_file_reader.h b/lib_util/head_rotation_file_reader.h index ad99318563..e70281401a 100644 --- a/lib_util/head_rotation_file_reader.h +++ b/lib_util/head_rotation_file_reader.h @@ -34,7 +34,6 @@ #define IVAS_HR_FILE_READER_H #include "common_api_types.h" -#include "ivas_error.h" #define IVAS_MAX_PARAM_SPATIAL_SUBFRAMES 4 diff --git a/lib_util/hrtf_file_reader.c b/lib_util/hrtf_file_reader.c index 928f006456..b7ffe81682 100644 --- a/lib_util/hrtf_file_reader.c +++ b/lib_util/hrtf_file_reader.c @@ -31,7 +31,6 @@ *******************************************************************************************************/ #include "hrtf_file_reader.h" -#include #include #include "prot.h" #include "ivas_prot_rend.h" diff --git a/lib_util/hrtf_file_reader.h b/lib_util/hrtf_file_reader.h index 5a7e413f81..2b59c3150b 100644 --- a/lib_util/hrtf_file_reader.h +++ b/lib_util/hrtf_file_reader.h @@ -34,8 +34,7 @@ #define IVAS_HRTF_FILE_READER_H #include "common_api_types.h" -#include "ivas_error.h" -// VE2AT: would it make sense to put includes of "ivas_error.h" into "common_api_types" in order to not repeate it again and again? -> YES, TBD + typedef struct hrtfFileReader hrtfFileReader; diff --git a/lib_util/ism_file_reader.c b/lib_util/ism_file_reader.c index 33fae320b5..77912f5c58 100644 --- a/lib_util/ism_file_reader.c +++ b/lib_util/ism_file_reader.c @@ -32,7 +32,6 @@ #include "ism_file_reader.h" #include "cmdl_tools.h" -#include #include #include diff --git a/lib_util/ism_file_reader.h b/lib_util/ism_file_reader.h index 4e87b2f6bc..8ddb67704e 100644 --- a/lib_util/ism_file_reader.h +++ b/lib_util/ism_file_reader.h @@ -33,9 +33,7 @@ #ifndef IVAS_ISM_FILE_READER_H #define IVAS_ISM_FILE_READER_H -#include #include "common_api_types.h" -#include "ivas_error.h" /* clang-format off */ diff --git a/lib_util/ism_file_writer.c b/lib_util/ism_file_writer.c index 46705316c8..c4dffe38b0 100644 --- a/lib_util/ism_file_writer.c +++ b/lib_util/ism_file_writer.c @@ -31,7 +31,6 @@ *******************************************************************************************************/ #include "ism_file_writer.h" -#include #include #include diff --git a/lib_util/ism_file_writer.h b/lib_util/ism_file_writer.h index 4e1211cd82..24b4c58bd4 100644 --- a/lib_util/ism_file_writer.h +++ b/lib_util/ism_file_writer.h @@ -33,9 +33,7 @@ #ifndef IVAS_ISM_FILE_WRITER_H #define IVAS_ISM_FILE_WRITER_H -#include #include "common_api_types.h" -#include "ivas_error.h" typedef struct IsmFileWriter IsmFileWriter; diff --git a/lib_util/jbm_file_reader.c b/lib_util/jbm_file_reader.c index fe08d5cea6..1be5c22365 100644 --- a/lib_util/jbm_file_reader.c +++ b/lib_util/jbm_file_reader.c @@ -32,7 +32,6 @@ #include "jbm_file_reader.h" #include "cmdl_tools.h" -#include #include #include diff --git a/lib_util/jbm_file_reader.h b/lib_util/jbm_file_reader.h index 1a45362746..64d2d17e45 100644 --- a/lib_util/jbm_file_reader.h +++ b/lib_util/jbm_file_reader.h @@ -33,9 +33,7 @@ #ifndef IVAS_JBM_FILE_READER_H #define IVAS_JBM_FILE_READER_H -#include #include "common_api_types.h" -#include "ivas_error.h" /* clang-format off */ diff --git a/lib_util/jbm_file_writer.c b/lib_util/jbm_file_writer.c index 0fce217e4e..584a22bc7f 100644 --- a/lib_util/jbm_file_writer.c +++ b/lib_util/jbm_file_writer.c @@ -31,7 +31,6 @@ *******************************************************************************************************/ #include "jbm_file_writer.h" -#include #include #include diff --git a/lib_util/jbm_file_writer.h b/lib_util/jbm_file_writer.h index 1dd308499e..c82c38e0f9 100644 --- a/lib_util/jbm_file_writer.h +++ b/lib_util/jbm_file_writer.h @@ -33,9 +33,7 @@ #ifndef IVAS_JBM_FILE_WRITER_H #define IVAS_JBM_FILE_WRITER_H -#include #include "common_api_types.h" -#include "ivas_error.h" /* clang-format off */ diff --git a/lib_util/ls_custom_file_reader.c b/lib_util/ls_custom_file_reader.c index ace442029d..f73022e849 100644 --- a/lib_util/ls_custom_file_reader.c +++ b/lib_util/ls_custom_file_reader.c @@ -32,7 +32,6 @@ #include "ls_custom_file_reader.h" #include -#include #include #include "ivas_prot.h" #include "prot.h" diff --git a/lib_util/ls_custom_file_reader.h b/lib_util/ls_custom_file_reader.h index 390659cb7b..70c854aa9c 100644 --- a/lib_util/ls_custom_file_reader.h +++ b/lib_util/ls_custom_file_reader.h @@ -33,9 +33,7 @@ #ifndef IVAS_LS_CUSTOM_FILE_READER_H #define IVAS_LS_CUSTOM_FILE_READER_H -#include #include "common_api_types.h" -#include "ivas_error.h" typedef struct LsCustomFileReader LsCustomFileReader; diff --git a/lib_util/masa_file_reader.c b/lib_util/masa_file_reader.c index 58ecf35c82..19f12182f3 100644 --- a/lib_util/masa_file_reader.c +++ b/lib_util/masa_file_reader.c @@ -33,7 +33,6 @@ #include "masa_file_reader.h" #include "ivas_prot.h" #include "ivas_stat_com.h" -#include #include #include diff --git a/lib_util/masa_file_reader.h b/lib_util/masa_file_reader.h index 8e9cd2fd72..5f3f2fec2a 100644 --- a/lib_util/masa_file_reader.h +++ b/lib_util/masa_file_reader.h @@ -33,9 +33,7 @@ #ifndef IVAS_MASA_FILE_READER_H #define IVAS_MASA_FILE_READER_H -#include #include "common_api_types.h" -#include "ivas_error.h" struct MasaFileReader; diff --git a/lib_util/masa_file_writer.c b/lib_util/masa_file_writer.c index 3b4df4f1c9..0ccd8b2ae0 100644 --- a/lib_util/masa_file_writer.c +++ b/lib_util/masa_file_writer.c @@ -34,7 +34,6 @@ #include "ivas_stat_com.h" #include "ivas_cnst.h" #include -#include #include #include diff --git a/lib_util/masa_file_writer.h b/lib_util/masa_file_writer.h index 29b4dd1b3f..a01b90e7ee 100644 --- a/lib_util/masa_file_writer.h +++ b/lib_util/masa_file_writer.h @@ -33,9 +33,7 @@ #ifndef IVAS_MASA_FILE_WRITER_H #define IVAS_MASA_FILE_WRITER_H -#include #include "common_api_types.h" -#include "ivas_error.h" struct MasaFileWriter; diff --git a/lib_util/mime_io.c b/lib_util/mime_io.c index 4615a9219d..b5c257bb49 100644 --- a/lib_util/mime_io.c +++ b/lib_util/mime_io.c @@ -30,7 +30,6 @@ *******************************************************************************************************/ -#include "options.h" #include "mime_io.h" #include "mime.h" #include "prot.h" diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index c715905938..9fe7f019eb 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -33,7 +33,6 @@ #include "render_config_reader.h" #include #include -#include #include #include #include "cmdl_tools.h" diff --git a/lib_util/render_config_reader.h b/lib_util/render_config_reader.h index 01509148cf..c2afb92e8b 100644 --- a/lib_util/render_config_reader.h +++ b/lib_util/render_config_reader.h @@ -34,7 +34,6 @@ #define RENDER_CONFIG_READER_H #include "common_api_types.h" -#include "ivas_error.h" typedef struct RenderConfigReader RenderConfigReader; -- GitLab From 879663af2c746b8d44deda9803c1bd67a2631018 Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 27 Feb 2023 13:22:07 +0100 Subject: [PATCH 2/3] move dmxmtx_table[][] ROM table to appropriate place --- lib_com/ivas_td_decorr.c | 2 +- lib_dec/ivas_binRenderer_internal.c | 1 + lib_dec/ivas_rom_dec.c | 11 +++++++++++ lib_dec/ivas_rom_dec.h | 9 ++++++++- lib_rend/ivas_rom_rend.c | 6 ------ lib_rend/ivas_rom_rend.h | 2 -- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/lib_com/ivas_td_decorr.c b/lib_com/ivas_td_decorr.c index 81c477fb43..23620b3b2d 100644 --- a/lib_com/ivas_td_decorr.c +++ b/lib_com/ivas_td_decorr.c @@ -67,7 +67,7 @@ static const float ivas_hadamard_decorr_APD_coeff[IVAS_APD_16_SECT][IVAS_APD_16_ /* For R = 3.^([0:obj.parm_APD_nSections-1]/4); */ -const float ivas_three_pow_frac[IVAS_MAX_DECORR_APD_SECTIONS] = { +static const float ivas_three_pow_frac[IVAS_MAX_DECORR_APD_SECTIONS] = { 1.000000000000000f, 1.316074013710022f, 1.732050776481628f, diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 115b6ea59c..9fcb85ac0c 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -39,6 +39,7 @@ #include "cnst.h" #include "ivas_cnst.h" #include "ivas_rom_rend.h" +#include "ivas_rom_dec.h" #include "ivas_rom_com.h" #include "ivas_rom_binauralRenderer.h" #ifdef DEBUGGING diff --git a/lib_dec/ivas_rom_dec.c b/lib_dec/ivas_rom_dec.c index 32c78bba05..78d4eafea1 100644 --- a/lib_dec/ivas_rom_dec.c +++ b/lib_dec/ivas_rom_dec.c @@ -526,4 +526,15 @@ const int16_t sba_map_tc[8] = }; +/*----------------------------------------------------------------------------------* + * FASTCONV and PARAMETRIC binaural renderer ROM tables + *----------------------------------------------------------------------------------*/ + +const float dmxmtx_table[BINAURAL_CHANNELS][11] = +{ + { 1.0f, 0.0f, 0.70709997f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f }, + { 0.0f, 1.0f, 0.70709997f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f }, +}; + + /* clang-format on */ diff --git a/lib_dec/ivas_rom_dec.h b/lib_dec/ivas_rom_dec.h index 2f1dfa8239..4366077bbb 100644 --- a/lib_dec/ivas_rom_dec.h +++ b/lib_dec/ivas_rom_dec.h @@ -60,7 +60,6 @@ extern const float dft_ap_gains[5][3]; extern const int16_t dft_ap_delays[3][3]; extern const float dft_res_pred_weights[][STEREO_DFT_BAND_MAX]; - extern const float dft_win232ms_8k[75]; extern const float dft_win232ms_12k8[120]; extern const float dft_win232ms_16k[150]; @@ -76,6 +75,7 @@ extern const float max_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS]; extern const float min_smooth_gains2[SBA_DIRAC_STEREO_NUM_BANDS]; extern const float max_smooth_gains2[SBA_DIRAC_STEREO_NUM_BANDS]; + /*----------------------------------------------------------------------------------* * ECLVQ Stereo ROM tables *----------------------------------------------------------------------------------*/ @@ -114,4 +114,11 @@ extern const float ap_split_frequencies[DIRAC_DECORR_NUM_SPLIT_BANDS + 1]; extern const int16_t sba_map_tc[8]; +/*----------------------------------------------------------------------------------* + * FASTCONV and PARAMETRIC binaural renderer ROM tables + *----------------------------------------------------------------------------------*/ + +extern const float dmxmtx_table[BINAURAL_CHANNELS][11]; + + #endif diff --git a/lib_rend/ivas_rom_rend.c b/lib_rend/ivas_rom_rend.c index 9624dddf54..0dfdaf0d28 100644 --- a/lib_rend/ivas_rom_rend.c +++ b/lib_rend/ivas_rom_rend.c @@ -43,12 +43,6 @@ * FASTCONV and PARAMETRIC binaural renderer ROM tables *----------------------------------------------------------------------------------*/ -const float dmxmtx_table[BINAURAL_CHANNELS][11] = -{ - { 1.0f, 0.0f, 0.70709997f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f }, - { 0.0f, 1.0f, 0.70709997f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f }, -}; - /* * 0 = 30,0 * 1 = -30,0 diff --git a/lib_rend/ivas_rom_rend.h b/lib_rend/ivas_rom_rend.h index cb43c2a0ff..c4e1ca1533 100644 --- a/lib_rend/ivas_rom_rend.h +++ b/lib_rend/ivas_rom_rend.h @@ -45,8 +45,6 @@ * FASTCONV and PARAMETRIC binaural renderer ROM tables *----------------------------------------------------------------------------------*/ -extern const float dmxmtx_table[BINAURAL_CHANNELS][11]; - extern const int16_t channelIndex_CICP6[5]; extern const int16_t channelIndex_CICP12[7]; extern const int16_t channelIndex_CICP14[7]; -- GitLab From a91586cb5c4fffa7bfd85e66deff0bf506fbeae1 Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 27 Feb 2023 16:12:36 +0100 Subject: [PATCH 3/3] put back a comment --- lib_com/common_api_types.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h index f3bf6466c6..893bf6b265 100644 --- a/lib_com/common_api_types.h +++ b/lib_com/common_api_types.h @@ -33,6 +33,8 @@ #ifndef COMMON_API_TYPES_H #define COMMON_API_TYPES_H +/* options.h needed for debugging/development features + * It should be stripped for delivery along with debugging switches */ #include "options.h" #include #include -- GitLab