From 5c9da2207f5eac93dacb29ea6c97cd365da02ce4 Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Tue, 10 Jan 2023 12:54:22 +0100 Subject: [PATCH 1/2] add FIX_272_COV and wrap related code under DEBUGGING --- lib_com/options.h | 1 + lib_dec/ivas_dec.c | 4 ++++ lib_rend/ivas_binauralRenderer.c | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index a5193624e9..989143e5c6 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -150,6 +150,7 @@ #define MC_JBM /* FhG: extend JBM beyond mono for running IVAS in VoIP mode (contribution 19) */ #define FIX_265_MC_BRATE_SWITCHING /* Issue 265: fix use-of-uninitialized-value in MC bitrate switching */ #define FIX_ANGLE_WRAPPING /* Issue 244: Problems with angle wrapping*/ +#define FIX_272_COV /* Issue 272: Cleanup for code coverage related to calls to ivas_binaural_cldfb() */ /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c index 7176a00886..642d02315a 100644 --- a/lib_dec/ivas_dec.c +++ b/lib_dec/ivas_dec.c @@ -210,10 +210,12 @@ ivas_error ivas_dec( ivas_crend_process( st_ivas, output ); ivas_binaural_add_LFE( st_ivas, output_frame, output ); } +#ifdef DEBUGGING else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) { ivas_binaural_cldfb( st_ivas, output ); } +#endif } } else if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) @@ -394,11 +396,13 @@ ivas_error ivas_dec( ivas_crend_process( st_ivas, output ); ivas_binaural_add_LFE( st_ivas, output_frame, output ); } +#ifndef FIX_272_COV else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) { ivas_binaural_cldfb( st_ivas, output ); ivas_binaural_add_LFE( st_ivas, output_frame, output ); } +#endif else if ( st_ivas->renderer_type == RENDERER_MC ) { ivas_ls_setup_conversion( st_ivas, output_frame, output ); diff --git a/lib_rend/ivas_binauralRenderer.c b/lib_rend/ivas_binauralRenderer.c index 1443766b60..d266c5c955 100644 --- a/lib_rend/ivas_binauralRenderer.c +++ b/lib_rend/ivas_binauralRenderer.c @@ -807,8 +807,9 @@ void ivas_binaural_add_LFE( } +#ifdef DEBUGGING /*-------------------------------------------------------------------------* - * ivas_binRenderer_cldfb() + * ivas_binaural_cldfb() * * Perform CLDFB analysis, fastconv binaural rendering and CLDFB synthesis *-------------------------------------------------------------------------*/ @@ -880,6 +881,7 @@ void ivas_binaural_cldfb( return; } +#endif /*------------------------------------------------------------------------- -- GitLab From 7c0ddddd1595b4e38a2e964e05a1770f8a7139a1 Mon Sep 17 00:00:00 2001 From: vaclav Date: Tue, 10 Jan 2023 13:36:41 +0000 Subject: [PATCH 2/2] Wrap ivas_binaural_cldfb() declaration under DEBUGGING. --- lib_com/ivas_prot.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index f94e1e4ceb..ec86280ebe 100644 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -4608,11 +4608,12 @@ void ivas_binRenderer_close( BINAURAL_RENDERER_HANDLE *hBinRenderer /* i/o: decoder binaural renderer handle */ ); +#ifdef DEBUGGING void ivas_binaural_cldfb( Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */ float output_f[][L_FRAME48k] /* i/o: synthesized core-coder transport channels/DirAC output */ ); - +#endif void ivas_binRenderer( BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: fastconv binaural renderer handle */ HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i/o: head track handle */ -- GitLab