Commit 4e9edd5d authored by vaillancour's avatar vaillancour
Browse files

clean-up to make it easier to merge

parent 22efb51f

apps/decoder.c

+2 −2
Original line number Diff line number Diff line
@@ -1995,9 +1995,9 @@ static ivas_error decodeG192( 
     *------------------------------------------------------------------------------------------*/



    decodingFailed = false; /* This will stay set to true if cleanup is reached via a goto due to an error */

    //BASOP_end



cleanup:

    /* free memory etc. */



    AudioFileWriter_close( &afWriter );

    MasaFileWriter_close( &masaWriter );

    for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; i++ )

lib_dec/ivas_jbm_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -60,10 +60,6 @@ static void ivas_jbm_dec_copy_masa_meta_to_buffer( Decoder_Struct *st_ivas ); 


static void ivas_jbm_masa_sf_to_slot_map( Decoder_Struct *st_ivas, const int16_t nCldfbTs );



#ifdef WMOPS_FX

extern int currCounter;

int idxId;

#endif



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

 * ivas_jbm_dec_tc()

lib_dec/lib_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -1047,7 +1047,6 @@ static ivas_error IVAS_DEC_GetTcSamples( 
{

    Decoder_Struct *st_ivas;

    ivas_error error;

    SUB_WMOPS_INIT( "IVAS_DEC_GetTcSamples" );



    IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL )

    {
@@ -1080,7 +1079,6 @@ static ivas_error IVAS_DEC_GetTcSamples( 
    {

        hIvasDec->hasDecodedFirstGoodFrame = true;

    }

    END_SUB_WMOPS; /*IVAS_DEC_GetTcSamples*/



    return IVAS_ERR_OK;

}

lib_dec/tonalMDCTconcealment_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "prot_fx2.h"

#include "stat_com.h"

#include "prot.h"

#include "wmc_auto.h"



#define CROSSFADE_THRESHOLD (32762) // close to 1.0f in Q15 such that (x == 1.0f) is true