Commit d8e5c770 authored by vaclav's avatar vaclav
Browse files

remove 'dtx_silence_mode' parameter which was always == 0

parent d8c0f7d9

lib_enc/ivas_spar_md_enc.c

+6 −4
Original line number Diff line number Diff line
@@ -82,11 +82,14 @@ static void ivas_select_next_strat( ivas_strats_t prior_strat, ivas_strats_t cs[ 


static void ivas_store_prior_coeffs( ivas_spar_md_enc_state_t *hMdEnc, const int16_t num_bands, const int16_t bands_bw, const int16_t strat, const int16_t dtx_vad, const int16_t qsi );



static void ivas_write_spar_md_bitstream( ivas_spar_md_enc_state_t *hMdEnc, const int16_t nB, const int16_t bands_bw, BSTR_ENC_HANDLE hMetaData, const int32_t ivas_total_brate, const int16_t dtx_silence_mode, const int16_t strat, const int16_t qsi, const int16_t planarCP );

static void ivas_write_spar_md_bitstream( ivas_spar_md_enc_state_t *hMdEnc, const int16_t nB, const int16_t bands_bw, BSTR_ENC_HANDLE hMetaData, const int32_t ivas_total_brate, const int16_t strat, const int16_t qsi, const int16_t planarCP );



static ivas_error ivas_spar_md_enc_init( ivas_spar_md_enc_state_t *hMdEnc, const ENCODER_CONFIG_HANDLE hEncoderConfig, const int16_t sba_order );



static void ivas_spar_quant_pred_coeffs_dtx( ivas_spar_md_t *pSpar_md, const float *pValues, const int16_t ndm, int16_t *pIndex, const int16_t dim1, float *pQuant );



static void ivas_quant_p_per_band_dtx( float *pP_mat, const int16_t num_dec, const int16_t num_dmx, int16_t *ppIdx_pd, float *pP_out, const int16_t num_ch );



static void ivas_write_parameter_bitstream_dtx( ivas_spar_md_t *pSpar_md, BSTR_ENC_HANDLE hMetaData, int16_t *num_dmx, int16_t *num_dec, const int16_t num_bands );



static void ivas_quant_p_per_band( ivas_band_coeffs_t *pband_coeffs, ivas_band_coeffs_ind_t *pBand_coeffs_idx, ivas_quant_strat_t *pQs, const int16_t num_ch );
@@ -902,7 +905,7 @@ ivas_error ivas_spar_md_enc_process( 
            {

                reset_indices_enc( &hMetaData_tmp, MAX_BITS_METADATA );



                ivas_write_spar_md_bitstream( hMdEnc, num_bands, bands_bw, &hMetaData_tmp, hEncoderConfig->ivas_total_brate, 0, strat, qsi, planarCP );

                ivas_write_spar_md_bitstream( hMdEnc, num_bands, bands_bw, &hMetaData_tmp, hEncoderConfig->ivas_total_brate, strat, qsi, planarCP );



                if ( hMetaData->nb_bits_tot == bit_pos_start || hMetaData_tmp.nb_bits_tot < ( hMetaData->nb_bits_tot - bit_pos_start ) )

                {
@@ -1178,7 +1181,6 @@ static void ivas_write_spar_md_bitstream( 
    const int16_t bands_bw,

    BSTR_ENC_HANDLE hMetaData,

    const int32_t ivas_total_brate,

    const int16_t dtx_silence_mode, // VE2DB: it is always 0 -> remove it?

    const int16_t strat,

    const int16_t qsi,

    const int16_t planarCP )
@@ -1192,7 +1194,7 @@ static void ivas_write_spar_md_bitstream( 
    }



    /* write quant strat */

    if ( dtx_silence_mode == 0 && ivas_total_brate >= BRATE_SPAR_Q_STRAT )

    if ( ivas_total_brate >= BRATE_SPAR_Q_STRAT )

    {

        push_next_indice( hMetaData, qsi >> 1, hMdEnc->spar_md_cfg.quant_strat_bits - 1 );

    }