From 4c6d99c3c6d54287572ea5bd7f97c353c4f5823a Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 30 Nov 2023 16:07:49 +0100 Subject: [PATCH 1/3] fix remaining split rendering warnings --- lib_com/options.h | 1 + lib_dec/lib_dec.c | 4 ++++ lib_rend/ivas_crend.c | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 94e2ae1529..2306127748 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -156,6 +156,7 @@ #define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */ #define FIX_891_PARAMUPMIX_CLEANUP /* Dlb: issue 891: remove unneeded code from ParamUpmix */ #define FIX_917_LCLD_WARNINGS /* Dlb: issue 917 and 918: fix LCLD codec warnings*/ +#define FIX_SPLITREND_WARNINGS /* FhG: fix warnings related to split rendering observed in build jobs */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index b1ac64db2d..6e44fddc44 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -3966,7 +3966,11 @@ 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 1d7bebf5b8..2b160d4625 100644 --- a/lib_rend/ivas_crend.c +++ b/lib_rend/ivas_crend.c @@ -2253,7 +2253,9 @@ 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]; @@ -2328,11 +2330,13 @@ 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 c3f050b74be2fcc147058aaa48a91eb00d06f830 Mon Sep 17 00:00:00 2001 From: hsd Date: Thu, 30 Nov 2023 17:14:53 +0100 Subject: [PATCH 2/3] encapsulate LC3PLUS_DEC_ALLOW_DISABLE_CACHING specific functions into the relevant define to avoid unused function warnings --- .../lc3plus/ivas_lc3plus_unit_test_selective_decoding.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c index afbcf9bd0d..d7eb5daf67 100644 --- a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c +++ b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c @@ -1242,6 +1242,7 @@ static int scenario_per_subframe_switches_dec_first( return IVAS_ERR_OK; } +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING /* * Step1: * in: [dec, dec, skip, skip] @@ -1428,7 +1429,7 @@ static int scenario_per_subframe_switches_dec_first_no_caching( IVAS_LC3PLUS_DEC_FreeSubframeDecodingMatrix( selective_decoding_matrix ); return IVAS_ERR_OK; } - +#endif /* * Step1: @@ -1922,6 +1923,7 @@ static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_bundle_swi return err; } +#ifdef LC3PLUS_DEC_ALLOW_DISABLE_CACHING static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_switches_dec_first_no_caching( void ) { int err = 0; @@ -1934,7 +1936,7 @@ static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_per_subframe_switches_d } return err; } - +#endif static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_get_active_dont_cache( void ) { -- GitLab From c187a132b2f2a3310caacd80171d37e07c4fd79d Mon Sep 17 00:00:00 2001 From: hsd Date: Thu, 30 Nov 2023 17:15:42 +0100 Subject: [PATCH 3/3] resolved unused function warnings due to passing both .c files of the unit test individually to the compiler --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 435773d7bc..08b444139b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,8 +208,7 @@ endif() if(INCLUDE_SPLIT) if(NOT WMOPS) - file(GLOB unitTestIvasLc3plusSrcs "scripts/split_rendering/lc3plus/*.c") - add_executable(ivas_lc3plus_unit_test ${unitTestIvasLc3plusSrcs}) + add_executable(ivas_lc3plus_unit_test ${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c) target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug) endif() endif() -- GitLab