Commit 69ff8238 authored by vaclav's avatar vaclav
Browse files

maintenance: 

- typos
- rename pState -> hMdEnc/hMdDec
- add "VE2DB" comments
parent 22e37c8a

lib_com/bitstream.c

+5 −5
Original line number Diff line number Diff line
@@ -2063,7 +2063,7 @@ ivas_error read_indices( 
        }

        else if ( k == SIZE_IVAS_BRATE_TBL )

        {

            /*temp change for spar DTX*/

            /*temp change for SPAR DTX*/

            if ( total_brate == IVAS_SID_5k )

            {

                st_ivas->element_mode_init = -1;
@@ -2116,7 +2116,7 @@ ivas_error read_indices( 
        }

        else

        {

            sid_upd_bad = 1; /* this frame type may happen in ETSI/3GPP CS cases ,  a corrupt sid frames  */

            sid_upd_bad = 1; /* this frame type may happen in ETSI/3GPP CS cases, a corrupt SID frames  */

        }

    }
@@ -2201,7 +2201,7 @@ ivas_error read_indices( 
                          /* total_brate= 0  */

    }



    /* handle bad/lost speech frame(and CS bad sid frame) in the decoders CNG synthesis settings pair (total_brate, bfi) */

    /* handle bad/lost speech frame(and CS bad SID frame) in the decoders CNG synthesis settings pair (total_brate, bfi) */

    if ( ( ( *CNG != 0 ) && ( ( speech_bad != 0 ) || ( speech_lost != 0 ) ) ) || /* SP_BAD or SPEECH_LOST)   --> stay in CNG */

         ( sid_upd_bad != 0 ) )                                                  /* SID_UPD_BAD              --> start CNG */

    {
@@ -2320,7 +2320,7 @@ static Word32 read_indices_mime_handle_dtx( 
    {

        if ( st->bfi )

        {

            sid_upd_bad = 1; /*  corrupt sid_first, signaled as bad sid  */

            sid_upd_bad = 1; /*  corrupt sid_first, signaled as bad SID  */

        }

        else

        {
@@ -2378,7 +2378,7 @@ static Word32 read_indices_mime_handle_dtx( 
    }



    /* in CNG  */

    /* handle bad speech frame(and bad sid frame) in the decoders CNG synthesis settings pair (total_brate, bfi)  */

    /* handle bad speech frame(and bad SID frame) in the decoders CNG synthesis settings pair (total_brate, bfi)  */

    if ( ( *CNG != 0 && ( speech_bad || speech_lost || no_data ) ) || /* SP_BAD or SPEECH_LOST)   --> stay in CNG */

         sid_upd_bad )                                                /* SID_UPD_BAD               --> start/stay  CNG   */

    {

lib_com/ivas_fb_mixer.c

+2 −2
Original line number Diff line number Diff line
@@ -1098,8 +1098,8 @@ static ivas_error ivas_filterbank_setup( 


        for ( j = 0; j < IVAS_MAX_NUM_FB_BANDS; j++ )

        {

            pFb->fb_bin_to_band.p_short_stride_num_bins_per_band[j] = 0;  /* aka num_active_bins per spar band */

            pFb->fb_bin_to_band.p_short_stride_start_bin_per_band[j] = 0; /* first considered bin index per spar band */

            pFb->fb_bin_to_band.p_short_stride_num_bins_per_band[j] = 0;  /* aka num_active_bins per SPAR band */

            pFb->fb_bin_to_band.p_short_stride_start_bin_per_band[j] = 0; /* first considered bin index per SPAR band */

            pFb->fb_bin_to_band.pp_short_stride_bin_to_band[j] = NULL;

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

            {

lib_com/ivas_spar_com_quant_util.c

+3 −3
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ void ivas_map_prior_coeffs_quant( 
/*-----------------------------------------------------------------------------------------*

 * Function ivas_spar_quant_dtx_init()

 *

 * Init spar md with minmax vals

 * Init SPAR MD with minmax vals

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



void ivas_spar_quant_dtx_init(
@@ -347,7 +347,7 @@ void ivas_copy_band_coeffs_idx_to_arr( 
/*-----------------------------------------------------------------------------------------*

 * Function ivas_clear_band_coeffs()

 *

 * clear band coeffs array in spar MD

 * clear band coeffs array in SPAR MD

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



void ivas_clear_band_coeffs(
@@ -374,7 +374,7 @@ void ivas_clear_band_coeffs( 
/*-----------------------------------------------------------------------------------------*

 * Function ivas_clear_band_coeff_idx()

 *

 * clear band coeffs index array in spar MD

 * clear band coeffs index array in SPAR MD

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



void ivas_clear_band_coeff_idx(

lib_com/ivas_stat_com.h

+2 −2
Original line number Diff line number Diff line
@@ -692,8 +692,8 @@ typedef struct ivas_fb_bin_to_band_data_t 
    float *pFb_bin_to_band[IVAS_MAX_NUM_FB_BANDS];

    const int16_t *pFb_start_bin_per_band;

    const int16_t *pFb_active_bins_per_band;

    float pp_cldfb_weights_per_spar_band[CLDFB_NO_CHANNELS_MAX][IVAS_MAX_NUM_FB_BANDS]; /* weights for linear combination of parameters from different spar bands*/

    int16_t p_spar_start_bands[CLDFB_NO_CHANNELS_MAX];                                  /* the first spar band per CLFB band when the weight is > 0 */

    float pp_cldfb_weights_per_spar_band[CLDFB_NO_CHANNELS_MAX][IVAS_MAX_NUM_FB_BANDS]; /* weights for linear combination of parameters from different SPAR bands*/

    int16_t p_spar_start_bands[CLDFB_NO_CHANNELS_MAX];                                  /* the first SPAR band per CLFB band when the weight is > 0 */

    int16_t p_cldfb_map_to_spar_band[CLDFB_NO_CHANNELS_MAX];                            /* a direct mapping from CLDFB band to SPAR band */

    int16_t p_short_stride_start_bin_per_band[IVAS_MAX_NUM_FB_BANDS];

    int16_t p_short_stride_num_bins_per_band[IVAS_MAX_NUM_FB_BANDS];

lib_dec/ivas_cpe_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ static void read_stereo_mode_and_bwidth( 
                hCPE->element_mode = IVAS_CPE_MDCT;

                break;

            case SID_SBA_1TC:

                assert( "Forbidden value for sid format in CPE (SBA 1TC), should have already been adressed earlier" );

                assert( "Forbidden value for SID format in CPE (SBA 1TC), should have already been adressed earlier" );

                break;

            case SID_MASA_1TC:

                hCPE->element_mode = IVAS_SCE;