Commit cb3c6b8a authored by vaclav's avatar vaclav
Browse files

- fix compilation warning + move back function ivas_param_ism_compute_noisy_speech_flag()

parent 4e83c71f

lib_dec/ivas_ism_param_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1445,6 +1445,7 @@ static void ivas_param_ism_dec_dequantize_DOA_dtx( 
/*-------------------------------------------------------------------------

 * ivas_param_ism_metadata_dtx_dec()

 *

 *

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



void ivas_param_ism_metadata_dtx_dec(
@@ -1452,7 +1453,7 @@ void ivas_param_ism_metadata_dtx_dec( 
)

{

    int16_t azi_idx, ele_idx, i;

    int16_t nb_bits_start, last_bit_pos, next_bit_pos_orig;

    int16_t last_bit_pos, next_bit_pos_orig;

    uint16_t bstr_meta[IVAS_SID_5k2 / FRAMES_PER_SEC], *bstr_orig;

    DEC_CORE_HANDLE st0;

    PARAM_ISM_CONFIG_HANDLE hParamIsm; /* Parametric ISM handle */
@@ -1466,7 +1467,6 @@ void ivas_param_ism_metadata_dtx_dec( 
    st0 = st_ivas->hSCE[0]->hCoreCoder[0];

    hParamIsm = st_ivas->hDirAC->hParamIsm;



    nb_bits_start = 0;

    last_bit_pos = (int16_t) ( ( st_ivas->hDecoderConfig->ivas_total_brate / FRAMES_PER_SEC ) - 1 - SID_FORMAT_NBITS );

    bstr_orig = st0->bit_stream;

    next_bit_pos_orig = st0->next_bit_pos;

lib_enc/ivas_ism_enc.c

+5 −5
Original line number Diff line number Diff line
@@ -192,11 +192,6 @@ ivas_error ivas_ism_enc( 
        /* analysis and decision about DTX */

        dtx_flag = ivas_ism_dtx_enc( st_ivas, &sid_flag );



        if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            ivas_param_ism_compute_noisy_speech_flag( st_ivas );

        }



        if ( sid_flag )

        {

            /* estimate coherence between objects */
@@ -215,6 +210,11 @@ ivas_error ivas_ism_enc( 
     * Metadata quantization and encoding

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



    if ( st_ivas->ism_mode == ISM_MODE_PARAM )

    {

        ivas_param_ism_compute_noisy_speech_flag( st_ivas );

    }



#ifdef PARAM_ISM_DTX_CNG

    if ( dtx_flag )

    {

lib_dec/ivas_ism_dtx_dec.c

+1 −1

File changed.

Contains only whitespace changes.