Commit c59c4f16 authored by vaclav's avatar vaclav
Browse files

remove obsolete assignments

parent 0bb4df8f

lib_com/cldfb.c

+10 −7
Original line number Diff line number Diff line
@@ -883,15 +883,18 @@ void deleteCldfb( 
{

    HANDLE_CLDFB_FILTER_BANK hs = *h_cldfb;



    if ( hs )

    if ( h_cldfb == NULL || *h_cldfb == NULL )

    {

        return;

    }



    if ( hs->cldfb_state )

    {

        free( hs->cldfb_state );

    }



    free( hs );

    *h_cldfb = NULL;

    }



    return;

}

lib_com/prot.h

+2 −2
Original line number Diff line number Diff line
@@ -2236,7 +2236,7 @@ void LPDmem_enc_init( 
    LPD_state_HANDLE hLPDmem /* i/o: LP memories                             */

);



void destroy_encoder(

void destroy_cldfb_encoder(

    Encoder_State *st /* i/o: state structure                         */

);

ivas_error evs_enc(
@@ -5120,7 +5120,7 @@ ivas_error init_decoder( 
    const MC_MODE mc_mode /* i  : MC mode                                   */

);



void destroy_decoder(

void destroy_cldfb_decoder(

    Decoder_State *st /* o  : Decoder static variables structure        */

);

lib_dec/init_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -770,12 +770,12 @@ void reset_preecho_dec( 




/*----------------------------------------------------------------------*

 * destroy_decoder()

 * destroy_cldfb_decoder()

 *

 * Free memory which was allocated in init_decoder()

 *----------------------------------------------------------------------*/



void destroy_decoder(

void destroy_cldfb_decoder(

    Decoder_State *st /* o  :   Decoder static variables structure */

)

{

lib_dec/ivas_corecoder_dec_reconfig.c

+0 −3
Original line number Diff line number Diff line
@@ -453,7 +453,6 @@ ivas_error ivas_cldfb_dec_reconfig( 
    if ( st_ivas->ivas_format == SBA_FORMAT && nchan_transport_old == 1 && numCldfbAnalyses_old == 2 && st_ivas->nchan_transport > 1 )

    {

        deleteCldfb( &( st_ivas->cldfbAnaDec[1] ) );

        st_ivas->cldfbAnaDec[1] = NULL;

        numCldfbAnalyses_old--;

    }
@@ -473,7 +472,6 @@ ivas_error ivas_cldfb_dec_reconfig( 
        for ( i = numCldfbAnalyses; i < numCldfbAnalyses_old; i++ )

        {

            deleteCldfb( &( st_ivas->cldfbAnaDec[i] ) );

            st_ivas->cldfbAnaDec[i] = NULL;

        }

    }

    else if ( numCldfbAnalyses_old < numCldfbAnalyses )
@@ -495,7 +493,6 @@ ivas_error ivas_cldfb_dec_reconfig( 
        for ( i = numCldfbSyntheses; i < numCldfbSyntheses_old; i++ )

        {

            deleteCldfb( &( st_ivas->cldfbSynDec[i] ) );

            st_ivas->cldfbSynDec[i] = NULL;

        }

    }

    else if ( numCldfbSyntheses_old < numCldfbSyntheses )

lib_dec/ivas_init_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -1420,7 +1420,7 @@ void destroy_core_dec( 
    DEC_CORE_HANDLE hCoreCoder /* i/o: core decoder structure      */

)

{

    destroy_decoder( hCoreCoder );

    destroy_cldfb_decoder( hCoreCoder );



    if ( hCoreCoder->hGSCDec != NULL )

    {
@@ -1685,9 +1685,6 @@ void ivas_destroy_dec( 
        }

    }



    /* LFE handle */

    ivas_lfe_dec_close( &( st_ivas->hLFE ) );



    /* HP20 filter handles */

    if ( st_ivas->mem_hp20_out != NULL )

    {
@@ -1739,6 +1736,9 @@ void ivas_destroy_dec( 
    /* MCT handle */

    ivas_mct_dec_close( &st_ivas->hMCT );



    /* LFE handle */

    ivas_lfe_dec_close( &( st_ivas->hLFE ) );



    /* Parametric MC handle */

    ivas_param_mc_dec_close( &st_ivas->hParamMC );