Commit 237fc9fb authored by PLAINSI's avatar PLAINSI
Browse files

506 Warning fixes

parent 57b457c2

lib_com/ivas_prot.h

+6 −0
Original line number Diff line number Diff line
@@ -3948,9 +3948,15 @@ void ivas_mc_paramupmix_dec( 
    float output_f[][L_FRAME48k]                                    /* i/o: synthesized core-coder transport channels/DirAC output  */

);



#ifdef FIX_506_WARNINGS

int16_t ivas_mc_paramupmix_enc_getNumTransportChannels(

    void

);

#else

int16_t ivas_mc_paramupmix_getNumTransportChannels(

    void

);

#endif



ivas_error ivas_mc_paramupmix_dec_open(

    Decoder_Struct *st_ivas                                         /* i/o: IVAS decoder structure                          */

lib_dec/ivas_mc_paramupmix_dec.c

+24 −1
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ static void dequant_beta( int16_t nv, int16_t ivStart, QUANT_TYPE quant_type, in 


static void get_ec_data( Decoder_State *st, PAR_TYPE parType, QUANT_TYPE quant_type, int16_t nParBand, int16_t parBandStart, int32_t *parQ, int32_t *alphaQEnv, float ab[IVAS_MAX_NUM_BANDS] );



#ifdef FIX_506_WARNINGS

static int16_t ivas_mc_paramupmix_dec_getNumTransportChannels( void );

#endif



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

 * ivas_mc_paramupmix_dec_read_BS()

 *
@@ -288,6 +292,7 @@ void ivas_mc_paramupmix_dec( 
    return;

}



#ifndef FIX_506_WARNINGS

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

 * ivas_mc_paramupmix_getNumTransportChannels()

 *
@@ -299,6 +304,7 @@ int16_t ivas_mc_paramupmix_getNumTransportChannels() 
    nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; /* 5.1.2 */

    return nchan_transport;

}

#endif



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

 * ivas_mc_paramupmix_dec_open()
@@ -328,8 +334,11 @@ ivas_error ivas_mc_paramupmix_dec_open( 
    }

    output_Fs = st_ivas->hDecoderConfig->output_Fs;

    hMCParamUpmix->first_frame = 1;



#ifdef FIX_506_WARNINGS

    st_ivas->nchan_transport = ivas_mc_paramupmix_dec_getNumTransportChannels();

#else

    st_ivas->nchan_transport = ivas_mc_paramupmix_getNumTransportChannels();

#endif

    nchan_transport = st_ivas->nchan_transport;



    switch ( nchan_transport )
@@ -691,3 +700,17 @@ static void get_ec_data( 
        dequant_beta( nParBand, parBandStart, quant_type, alphaQEnv, parQ, ab );

    }

}



#ifdef FIX_506_WARNINGS

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

 * ivas_mc_paramupmix_getNumTransportChannels()

 *

 *

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

static int16_t ivas_mc_paramupmix_dec_getNumTransportChannels( void )

{

    int16_t nchan_transport;

    nchan_transport = MC_PARAMUPMIX_MAX_TRANSPORT_CHANS; /* 5.1.2 */

    return nchan_transport;

}

#endif

lib_enc/ivas_mc_paramupmix_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -359,7 +359,11 @@ void ivas_mc_paramupmix_enc_close( 
 *------------------------------------------------------------------------*/



/* r  : number of IVAS transport channels */

#ifdef FIX_506_WARNINGS

int16_t ivas_mc_paramupmix_enc_getNumTransportChannels( void )

#else

int16_t ivas_mc_paramupmix_getNumTransportChannels()

#endif

{

    int16_t nchan_transport;

lib_enc/ivas_mct_enc.c

+8 −0
Original line number Diff line number Diff line
@@ -317,7 +317,11 @@ ivas_error create_mct_enc( 
    }

    else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMUPMIX )

    {

#ifdef FIX_506_WARNINGS

        hMCT->nchan_out_woLFE = ivas_mc_paramupmix_enc_getNumTransportChannels();

#else

        hMCT->nchan_out_woLFE = ivas_mc_paramupmix_getNumTransportChannels();

#endif

    }

    else if ( ivas_format == SBA_FORMAT )

    {
@@ -429,7 +433,11 @@ ivas_error mct_enc_reconfigure( 
        }

        else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMUPMIX )

        {

#ifdef FIX_506_WARNINGS

            hMCT->nchan_out_woLFE = ivas_mc_paramupmix_enc_getNumTransportChannels();

#else

            hMCT->nchan_out_woLFE = ivas_mc_paramupmix_getNumTransportChannels();

#endif

        }

        else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC )

        {