Commit c73e52da authored by emerit's avatar emerit
Browse files

Merge branch 'main' into update_crend

parents 3f287a66 e0a989ab

lib_com/core_com_config.c

+4 −0
Original line number Diff line number Diff line
@@ -1416,7 +1416,11 @@ void init_tcx_cfg( 
    hTcxCfg->tcxRateLoopOpt = ( element_mode == IVAS_CPE_MDCT ) ? 3 : hTcxCfg->tcxRateLoopOpt;



    /* TCX bandwidth */

#ifndef IVAS_FLOAT_FIXED

    hTcxCfg->bandwidth_flt = getTcxBandwidth_flt( bwidth );

#else

    hTcxCfg->bandwidth = getTcxBandwidth( bwidth );

#endif



    /* set number of coded lines */

    hTcxCfg->tcx_coded_lines = getNumTcxCodedLines( bwidth );

lib_com/deemph.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void deemph_fx_32( 
    Word16 shift,    /*scaled output*/

    Word32 *signal,  /* i/o: signal            Qx*/

    const Word16 mu, /* i  : deemphasis factor Q15*/

    const int16_t L, /* i  : vector size         */

    const Word16 L,  /* i  : vector size         */

    Word32 *mem      /* i/o: memory (y[-1])    Qx+shift*/

)

{

lib_com/fd_cng_com.c

+0 −25
Original line number Diff line number Diff line
@@ -55,31 +55,6 @@ static void mhvals_flt( const int16_t d, float *m ); 
#endif

static void getmidbands( int16_t *part, const int16_t npart, int16_t *midband, float *psize_flt, float *psize_inv_flt );





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

 * createFdCngCom_flt()

 *

 * Create an instance of type FD_CNG_COM

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



ivas_error createFdCngCom_flt(

    HANDLE_FD_CNG_COM *hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */

)

{

    HANDLE_FD_CNG_COM hs;



    /* Allocate memory */

    if ( ( hs = (HANDLE_FD_CNG_COM) malloc( sizeof( FD_CNG_COM ) ) ) == NULL )

    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD CNG COM" );

    }



    *hFdCngCom = hs;



    return IVAS_ERR_OK;

}





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

 * initFdCngCom_flt()

 *

lib_com/fd_cng_com_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static void getmidbands( const Word16 *part, const Word16 npart, Word16 *midband 
 *

 * Create an instance of type FD_CNG_COM

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

ivas_error createFdCngCom(

ivas_error createFdCngCom_fx(

    HANDLE_FD_CNG_COM *hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */

)

{

lib_com/ivas_prot.h

+0 −4
Original line number Diff line number Diff line
@@ -2029,10 +2029,6 @@ void adjustTargetSignal( 
 * IC-BWE Stereo prototypes

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



void stereo_icBWE_init_enc(

    STEREO_ICBWE_ENC_HANDLE hStereoICBWE                        /* i/o: Stereo inter-channel BWE handle                 */

);



void spectral_balancer(

    float *signal,

    float *mem,