From ee1e4557429390c6a4add56d5e31e4e55d575714 Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Wed, 5 Mar 2025 13:59:19 +0100 Subject: [PATCH 1/2] use _ivas_fx versions of open/deleteCldfb for split rendering --- lib_isar/isar_splitRendererPost.c | 4 ++-- lib_isar/isar_splitRendererPre.c | 4 ++-- lib_isar/lib_isar_pre_rend.c | 4 ++-- lib_rend/lib_rend.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib_isar/isar_splitRendererPost.c b/lib_isar/isar_splitRendererPost.c index 6f6af1484..baa7e2ed3 100644 --- a/lib_isar/isar_splitRendererPost.c +++ b/lib_isar/isar_splitRendererPost.c @@ -102,7 +102,7 @@ ivas_error isar_splitBinPostRendOpen( { for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) { - if ( ( error = openCldfb( &( hBinRend->cldfbSynReconsBinDec[i][ch] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK ) + if ( ( error = openCldfb_ivas_fx( &( hBinRend->cldfbSynReconsBinDec[i][ch] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK ) { return error; } @@ -151,7 +151,7 @@ void isar_splitBinPostRendClose( { if ( ( *hBinHrSplitPostRend )->cldfbSynReconsBinDec[i][ch] != NULL ) { - deleteCldfb( &( ( *hBinHrSplitPostRend )->cldfbSynReconsBinDec[i][ch] ) ); + deleteCldfb_ivas_fx( &( ( *hBinHrSplitPostRend )->cldfbSynReconsBinDec[i][ch] ) ); ( *hBinHrSplitPostRend )->cldfbSynReconsBinDec[i][ch] = NULL; } } diff --git a/lib_isar/isar_splitRendererPre.c b/lib_isar/isar_splitRendererPre.c index a766418d1..b96fa59f5 100644 --- a/lib_isar/isar_splitRendererPre.c +++ b/lib_isar/isar_splitRendererPre.c @@ -2781,7 +2781,7 @@ ivas_error isar_splitBinPreRendOpen( { for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ ) { - if ( ( error = openCldfb( &( hBinRend->cldfbSynRotBinDec[i][ch] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK ) + if ( ( error = openCldfb_ivas_fx( &( hBinRend->cldfbSynRotBinDec[i][ch] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS ) ) != IVAS_ERR_OK ) { return error; } @@ -2837,7 +2837,7 @@ void isar_splitBinPreRendClose( { IF( ( *hBinHrSplitPreRend )->cldfbSynRotBinDec[i][n] != NULL ) { - deleteCldfb( &( ( *hBinHrSplitPreRend )->cldfbSynRotBinDec[i][n] ) ); + deleteCldfb_ivas_fx( &( ( *hBinHrSplitPreRend )->cldfbSynRotBinDec[i][n] ) ); ( *hBinHrSplitPreRend )->cldfbSynRotBinDec[i][n] = NULL; } } diff --git a/lib_isar/lib_isar_pre_rend.c b/lib_isar/lib_isar_pre_rend.c index c44767404..41326e03c 100644 --- a/lib_isar/lib_isar_pre_rend.c +++ b/lib_isar/lib_isar_pre_rend.c @@ -247,7 +247,7 @@ void ISAR_PRE_REND_close( { IF( hSplitBinRend->hCldfbHandles->cldfbAna[ch] != NULL ) { - deleteCldfb( &hSplitBinRend->hCldfbHandles->cldfbAna[ch] ); + deleteCldfb_ivas_fx( &hSplitBinRend->hCldfbHandles->cldfbAna[ch] ); hSplitBinRend->hCldfbHandles->cldfbAna[ch] = NULL; } } @@ -257,7 +257,7 @@ void ISAR_PRE_REND_close( { IF( hSplitBinRend->hCldfbHandles->cldfbSyn[ch] != NULL ) { - deleteCldfb( &hSplitBinRend->hCldfbHandles->cldfbSyn[ch] ); + deleteCldfb_ivas_fx( &hSplitBinRend->hCldfbHandles->cldfbSyn[ch] ); hSplitBinRend->hCldfbHandles->cldfbSyn[ch] = NULL; } } diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index 8a10c1993..1a19223b2 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -9288,7 +9288,7 @@ void IVAS_REND_closeCldfb( { if ( cldfbAna[n] != NULL ) { - deleteCldfb( &( cldfbAna[n] ) ); + deleteCldfb_ivas_fx( &( cldfbAna[n] ) ); cldfbAna[n] = NULL; } } @@ -9297,7 +9297,7 @@ void IVAS_REND_closeCldfb( { if ( cldfbSyn[n] != NULL ) { - deleteCldfb( &( cldfbSyn[n] ) ); + deleteCldfb_ivas_fx( &( cldfbSyn[n] ) ); cldfbSyn[n] = NULL; } } -- GitLab From 1ddfab3636875fa716b2b6a6ca0a7a920980c3ed Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 6 Mar 2025 13:24:40 +0100 Subject: [PATCH 2/2] dummy commit to trigger CI -- GitLab