From 3cb76d6ce57c40130434db71e0827356a980caf0 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Fri, 15 Dec 2023 08:52:28 +0100 Subject: [PATCH 1/6] [cleanup] accept FIX_SPLITREND_WARNINGS --- lib_com/options.h | 1 - lib_dec/lib_dec.c | 4 ---- lib_rend/ivas_crend.c | 10 ---------- 3 files changed, 15 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index f2bd4eddb9..3c67d14543 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -152,7 +152,6 @@ /*#define SPLIT_REND_WITH_HEAD_ROT */ /* Dlb,FhG: Split Rendering contributions 21 and 35 */ #define FIX_CRASH_LONG_BRIR /* Orange : Fix crash when long BRIR is set */ -#define FIX_SPLITREND_WARNINGS /* FhG: fix warnings related to split rendering observed in build jobs */ #define FIX_923_EXTERNAL_REND_COMMAND_LINE /* VA: issue 923: enable external renderer command-line options in UPPER case letters */ #define FIX_921_OMASA_DELAY_PRINTOUT /* VA: issue 921: correct OMASA decoder delay printout */ #define FIX_929_RENDERER_CMDL /* Nokia: issue #929: renderer command line option */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 6ab6841635..3dee69a1d9 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -3715,11 +3715,7 @@ static ivas_error set_pcm_buffer_to_zero( error = IVAS_ERR_INTERNAL; } -#ifdef FIX_SPLITREND_WARNINGS return error; -#else - return IVAS_ERR_OK; -#endif } diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c index 89a6b80a10..8001bb6009 100644 --- a/lib_rend/ivas_crend.c +++ b/lib_rend/ivas_crend.c @@ -2266,9 +2266,6 @@ ivas_error ivas_rend_crendProcessSubframesSplitBin( ivas_error error; float gain_lfe; float tmpLfeBuffer[L_FRAME48k]; -#ifndef FIX_SPLITREND_WARNINGS - float *p_bin_output[BINAURAL_CHANNELS]; -#endif int16_t original_subframes_rendered, original_slots_rendered; float tmpInputBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k]; float *p_tmpInputBuffer[MAX_OUTPUT_CHANNELS]; @@ -2343,13 +2340,6 @@ ivas_error ivas_rend_crendProcessSubframesSplitBin( pCombinedOrientationDataLocal = &combinedOrientationDataLocal; -#ifndef FIX_SPLITREND_WARNINGS - /* set output channels */ - for ( i = 0; i < BINAURAL_CHANNELS; i++ ) - { - p_bin_output[i] = output[pos_idx * BINAURAL_CHANNELS + i]; - } -#endif hTcBuffer->subframes_rendered = original_subframes_rendered; hTcBuffer->slots_rendered = original_slots_rendered; -- GitLab From c6ce05053a5283384bff3c29a4986f5f958ccbd4 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Fri, 15 Dec 2023 08:53:14 +0100 Subject: [PATCH 2/6] [cleanup] accept FIX_923_EXTERNAL_REND_COMMAND_LINE --- lib_com/options.h | 1 - lib_util/cmdln_parser.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 3c67d14543..5bf1669249 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -152,7 +152,6 @@ /*#define SPLIT_REND_WITH_HEAD_ROT */ /* Dlb,FhG: Split Rendering contributions 21 and 35 */ #define FIX_CRASH_LONG_BRIR /* Orange : Fix crash when long BRIR is set */ -#define FIX_923_EXTERNAL_REND_COMMAND_LINE /* VA: issue 923: enable external renderer command-line options in UPPER case letters */ #define FIX_921_OMASA_DELAY_PRINTOUT /* VA: issue 921: correct OMASA decoder delay printout */ #define FIX_929_RENDERER_CMDL /* Nokia: issue #929: renderer command line option */ #define FIX_910_REMOVE_DUPLICATION_TD_REND /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */ diff --git a/lib_util/cmdln_parser.c b/lib_util/cmdln_parser.c index 8211994865..7fc325c0e0 100644 --- a/lib_util/cmdln_parser.c +++ b/lib_util/cmdln_parser.c @@ -150,7 +150,6 @@ static int8_t optionMatchesString( const char *optionName = stringToOptionName( str ); -#ifdef FIX_923_EXTERNAL_REND_COMMAND_LINE char optionName_to_upper[FILENAME_MAX]; strncpy( optionName_to_upper, optionName, sizeof( optionName_to_upper ) - 1 ); optionName_to_upper[sizeof( optionName_to_upper ) - 1] = '\0'; @@ -167,9 +166,6 @@ static int8_t optionMatchesString( to_upper( matchShort_to_upper ); if ( strncmp( optionName_to_upper, match_to_upper, MAX_OPTION_LENGTH ) == 0 || strncmp( optionName_to_upper, matchShort_to_upper, MAX_OPTION_LENGTH ) == 0 ) -#else - if ( strncmp( optionName, opt.props.match, MAX_OPTION_LENGTH ) == 0 || strncmp( optionName, opt.props.matchShort, MAX_OPTION_LENGTH ) == 0 ) -#endif { return 1; } -- GitLab From 928abcc283fda0507e446095aad96cd7a29bf437 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Fri, 15 Dec 2023 08:54:01 +0100 Subject: [PATCH 3/6] [cleanup] accept FIX_921_OMASA_DELAY_PRINTOUT --- lib_com/options.h | 1 - lib_dec/lib_dec.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 5bf1669249..c12e402e88 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -152,7 +152,6 @@ /*#define SPLIT_REND_WITH_HEAD_ROT */ /* Dlb,FhG: Split Rendering contributions 21 and 35 */ #define FIX_CRASH_LONG_BRIR /* Orange : Fix crash when long BRIR is set */ -#define FIX_921_OMASA_DELAY_PRINTOUT /* VA: issue 921: correct OMASA decoder delay printout */ #define FIX_929_RENDERER_CMDL /* Nokia: issue #929: renderer command line option */ #define FIX_910_REMOVE_DUPLICATION_TD_REND /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */ #define FIX_940_DEBUGGING_VARIABLE /* Nokia: issue #940: remove debugging variable */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 3dee69a1d9..a9e907bae2 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -2153,11 +2153,7 @@ ivas_error IVAS_DEC_GetDelay( nSamples[2] = (int16_t) roundf( (float) st_ivas->binaural_latency_ns * hDecoderConfig->output_Fs / 1000000000.f ); nSamples[0] = nSamples[1] + nSamples[2]; -#ifdef FIX_921_OMASA_DELAY_PRINTOUT if ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) -#else - if ( st_ivas->ivas_format == MASA_FORMAT ) -#endif { /* note: in MASA, all delay is compensated at the decoder by default, so subtract the encoder delay for print-out */ nSamples[1] -= NS2SA( hDecoderConfig->output_Fs, IVAS_ENC_DELAY_NS ); -- GitLab From c45e74ab011eb84a95f6b694dc724cdb1ba1b586 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Fri, 15 Dec 2023 08:55:41 +0100 Subject: [PATCH 4/6] [cleanup] accept NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA --- apps/renderer.c | 4 ---- lib_com/options.h | 2 -- lib_dec/ivas_jbm_dec.c | 4 ---- 3 files changed, 10 deletions(-) diff --git a/apps/renderer.c b/apps/renderer.c index 4c9dcf516d..ff4c74cde3 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -328,11 +328,7 @@ static const CmdLnParser_Option cliOptions[] = { .description = "LFE panning matrix. File (CSV table) containing a matrix of dimensions [ num_input_lfe x num_output_channels ] with elements specifying linear routing gain (like --gain, -g). \nIf specified, overrides the output LFE position option and the default behavior which attempts to map input to output LFE channel(s)" }, { .id = CmdLnOptionId_noDelayCmp, -#ifdef FIX_929_RENDERER_CMDL .match = "no_delay_compensation", -#else - .match = "no_delay_comparison", -#endif .matchShort = "no_delay_cmp", .description = "[flag] Turn off delay compensation", }, diff --git a/lib_com/options.h b/lib_com/options.h index c12e402e88..540d0060a7 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -152,7 +152,6 @@ /*#define SPLIT_REND_WITH_HEAD_ROT */ /* Dlb,FhG: Split Rendering contributions 21 and 35 */ #define FIX_CRASH_LONG_BRIR /* Orange : Fix crash when long BRIR is set */ -#define FIX_929_RENDERER_CMDL /* Nokia: issue #929: renderer command line option */ #define FIX_910_REMOVE_DUPLICATION_TD_REND /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */ #define FIX_940_DEBUGGING_VARIABLE /* Nokia: issue #940: remove debugging variable */ @@ -163,7 +162,6 @@ /* all switches in this category should start with "NONBE_" */ #define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/ -#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA /* FhG: issue 926: crash in OSBA decoding with planar FOA */ #define NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH /* FhG: issue 908: fix crash in OSBA BR switching with long test vectors */ #define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */ #define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING /* Dlb: issue 907: fix for band mapping at VLBR */ diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 6352df9df5..375ba442bf 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -2110,11 +2110,7 @@ int16_t ivas_jbm_dec_get_num_tc_channels( { num_tc = CPE_CHANNELS; } -#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA if ( num_tc == 3 ) -#else - if ( ( st_ivas->sba_planar && num_tc >= 3 ) || ( num_tc == 3 ) ) -#endif { num_tc++; } -- GitLab From f6bf09a0d223ce4e7b89392641cc0aaa6aee833f Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Fri, 15 Dec 2023 08:56:24 +0100 Subject: [PATCH 5/6] [cleanup] accept NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH --- lib_com/options.h | 1 - lib_dec/ivas_sba_dec.c | 4 ---- lib_enc/lib_enc.c | 4 ---- 3 files changed, 9 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 540d0060a7..e443fb0378 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -162,7 +162,6 @@ /* all switches in this category should start with "NONBE_" */ #define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/ -#define NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH /* FhG: issue 908: fix crash in OSBA BR switching with long test vectors */ #define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */ #define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING /* Dlb: issue 907: fix for band mapping at VLBR */ #define NONBE_FIX_869_MASA_PREREND_MERGE /* Nokia: issue: #869: MASA pre-rend not updating energy */ diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index 2cc4e19ade..73ced6e6c9 100644 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -313,11 +313,7 @@ ivas_error ivas_sba_dec_reconfigure( } } -#ifdef NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH if ( hSpar->hPCA == NULL && st_ivas->hDecoderConfig->ivas_total_brate == PCA_BRATE && st_ivas->sba_order == 1 && ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) ) -#else - if ( hSpar->hPCA == NULL && st_ivas->hDecoderConfig->ivas_total_brate == PCA_BRATE && st_ivas->sba_order == 1 && st_ivas->ivas_format == SBA_FORMAT ) -#endif { if ( ( hSpar->hPCA = (PCA_DEC_STATE *) malloc( sizeof( PCA_DEC_STATE ) ) ) == NULL ) { diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index a650bf8bd4..cd787be1cc 100644 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -990,11 +990,7 @@ static ivas_error configureEncoder( } #endif -#ifdef NONBE_FIX_908_OSBA_BR_SWITCHING_CRASH if ( hEncoderConfig->Opt_PCA_ON && !( ( hEncoderConfig->ivas_format == SBA_FORMAT || hEncoderConfig->ivas_format == SBA_ISM_FORMAT ) && hEncoderConfig->ivas_total_brate == PCA_BRATE && hEncoderConfig->sba_order == SBA_FOA_ORDER ) ) -#else - if ( hEncoderConfig->Opt_PCA_ON && !( hEncoderConfig->ivas_format == SBA_FORMAT && hEncoderConfig->ivas_total_brate == PCA_BRATE && hEncoderConfig->sba_order == SBA_FOA_ORDER ) ) -#endif { return IVAS_ERROR( IVAS_ERR_NOT_SUPPORTED_OPTION, "PCA supported at SBA FOA 256 kbps only." ); } -- GitLab From d1ec262ba7268d8b2f5af68464c2e64b2ad636da Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Fri, 15 Dec 2023 08:57:04 +0100 Subject: [PATCH 6/6] [cleanup] accept NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR --- lib_com/options.h | 1 - lib_dec/ivas_binRenderer_internal.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index e443fb0378..ee1d1b1559 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -162,7 +162,6 @@ /* all switches in this category should start with "NONBE_" */ #define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/ -#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */ #define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING /* Dlb: issue 907: fix for band mapping at VLBR */ #define NONBE_FIX_869_MASA_PREREND_MERGE /* Nokia: issue: #869: MASA pre-rend not updating energy */ #define NONBE_FIX_931_IGF_STEREO_DEC_NOISE /* FhG: issue #931: fix noise substitution in the stereo IGF decoder */ diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 6ece78587d..964a1fcd9c 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -1229,11 +1229,7 @@ ivas_error ivas_binRenderer_open( } /* Allocate memories needed for reverb module */ -#ifdef NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) -#else - if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) -#endif { if ( ( error = ivas_binaural_reverb_open_fastconv( &( hBinRenderer->hReverb ), hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hIntSetup.output_config, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK ) { -- GitLab