Commit 8b6f8e81 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1341-usage-of-open-deletecldfb-functions-multiple-variants' into 'main-pc' 

[skip-name-check] Resolve "Usage of open/deleteCldfb() functions - multiple variants"

See merge request !1214
parents 2a0b7caf 57b876ec

lib_isar/isar_splitRendererPost.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,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, DEC ) ) != IVAS_ERR_OK )

            if ( ( error = openCldfb_ivas_fx( &( hBinRend->cldfbSynReconsBinDec[i][ch] ), CLDFB_SYNTHESIS, output_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ) != IVAS_ERR_OK )

            {

                return error;

            }
@@ -150,7 +150,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;

                }

            }

lib_isar/isar_splitRendererPre.c

+2 −2
Original line number Diff line number Diff line
@@ -2780,7 +2780,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;

            }
@@ -2836,7 +2836,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;

                    }

                }

lib_isar/lib_isar_pre_rend.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

            }

        }

lib_rend/lib_rend.c

+2 −2
Original line number Diff line number Diff line
@@ -9285,7 +9285,7 @@ void IVAS_REND_closeCldfb( 
    {

        if ( cldfbAna[n] != NULL )

        {

            deleteCldfb( &( cldfbAna[n] ) );

            deleteCldfb_ivas_fx( &( cldfbAna[n] ) );

            cldfbAna[n] = NULL;

        }

    }
@@ -9294,7 +9294,7 @@ void IVAS_REND_closeCldfb( 
    {

        if ( cldfbSyn[n] != NULL )

        {

            deleteCldfb( &( cldfbSyn[n] ) );

            deleteCldfb_ivas_fx( &( cldfbSyn[n] ) );

            cldfbSyn[n] = NULL;

        }

    }