Commit 5aba3cdc authored by vaclav's avatar vaclav
Browse files

- rename "EVS channel" to "core-coder channel" 

- rename "fs" to "Fs"
- empty lines
parent b0f08726

lib_com/basop_proto_func.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ void basop_lsf2lsp( const Word16 lsf[], Word16 lsp[] ); 
void basop_weight_a( const Word16 *a, Word16 *ap, const Word16 gamma );

void basop_weight_a_inv( const Word16 *a, Word16 *ap, const Word16 inv_gamma );

void basop_E_LPC_a_add_tilt( const Word16 *a, Word16 *ap, Word16 gamma );

void basop_reorder_lsf( Word16 *lsf, const Word16 min_dist, const Word16 n, const Word32 fs );

void basop_reorder_lsf( Word16 *lsf, const Word16 min_dist, const Word16 n, const Word32 Fs );

void basop_E_LPC_f_lsp_a_conversion( const Word16 *lsp, Word16 *a, const Word16 m );



/* tcx_utils.c */

lib_com/cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ enum 
#define L_MDCT_OVLP_MAX_CORE_FS             L_NEXT_MAX_32k                      /* 280, 2/3 * L_MDCT_OVLP_MAX */

#define L_MDCT_HALF_OVLP_MAX_CORE_FS        2 * ( L_MDCT_HALF_OVLP_MAX ) / 3    /* 2/3 * L_MDCT_HALF_OVLP_MAX */

#define L_MDCT_MIN_OVLP_MAX_CORE_FS         2 * ( L_MDCT_MIN_OVLP_MAX ) / 3     /* 2/3 * L_MDCT_MIN_OVLP_MAX */

#define L_ALDO_WIN1_MAX_CORE_FS             460                                 /* ALDO1 maximum window length for max core fs */

#define L_ALDO_WIN1_MAX_CORE_FS             460                                 /* ALDO1 maximum window length for max core Fs */

#define L_ALDO_WIN1_FB_MAX                  690                                 /* ALDO1 maximum window length */



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

lib_com/core_com_config.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 


/*! r: flag indicating a valid bitrate */

int16_t is_EVS_bitrate(

    const int32_t ivas_total_brate, /* i  : EVS total bitrate  */

    const int32_t ivas_total_brate, /* i  : IVAS total bitrate  */

    int16_t *Opt_AMR_WB             /* i  : AMR-WB IO flag      */

)

{

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ typedef enum 


#define IVAS_SPAR_BR_TABLE_LEN                  18



/* TD decorr */

/* TD decorr */ // VE: not all 16CH are currently supported -> t be revisited later

enum

{

    IVAS_TD_DECORR_OUT_1CH = 1,

lib_com/ivas_dirac_com.c

+4 −5
Original line number Diff line number Diff line
@@ -178,20 +178,18 @@ ivas_error ivas_dirac_config( 
    if ( sba_mode == SBA_MODE_SPAR )

    {

        ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ),

                                 dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hConfig->enc_param_start_band,

                                 hFbMdft );

                                 dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hConfig->enc_param_start_band, hFbMdft );

    }

    else

    {

        ivas_dirac_config_bands( band_grouping, hConfig->nbands, (int16_t) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ),

                                 NULL, 0, 0,

                                 hFbMdft );

                                 NULL, 0, 0, hFbMdft );

    }





    return error;

}





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

 * ivas_dirac_sba_config_bands()

 *
@@ -294,6 +292,7 @@ void ivas_dirac_config_bands( 
    return;

}





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

 * ivas_dirac_sba_config()

 *