Commit 47c0ea20 authored by vaclav's avatar vaclav
Browse files

- rename parameter under FORCE_EST 

- replace constant 2 by MAX_PARAM_ISM_WAVE
parent 5925dc71

lib_dec/fd_cng_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ void ApplyFdCng( 
                   ( *timeDomainInput<FLT_MAX && * timeDomainInput>( -FLT_MAX ) &&

                     *( timeDomainInput + hFdCngCom->frameSize - 1 ) < FLT_MAX &&

                     *( timeDomainInput + hFdCngCom->frameSize - 1 ) > ( -FLT_MAX ) ) ) &&

                 ( ( ( ( st->element_mode != IVAS_CPE_TD && st->element_mode != IVAS_CPE_DFT && hFdCngDec->flag_dtx_mode ) || !st->VAD || ( st->ini_frame < 100 && st->is_ism_mode ) ) &&

                 ( ( ( ( st->element_mode != IVAS_CPE_TD && st->element_mode != IVAS_CPE_DFT && hFdCngDec->flag_dtx_mode ) || !st->VAD || ( st->ini_frame < 100 && st->is_ism_format ) ) &&

                     !( st->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) ||

                   ( st->element_mode == IVAS_CPE_TD ) ) &&

                 ( !st->BER_detect ) )

lib_dec/init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ ivas_error init_decoder( 
    st->cng_ism_flag = 0;

    st->read_sid_info = 1; /* by default read the sid info from bitstream */

#ifdef FORCE_EST

    st->is_ism_mode = 0;

    st->is_ism_format = 0;

#endif

lib_dec/ivas_init_dec.c

+6 −2
Original line number Diff line number Diff line
@@ -862,8 +862,8 @@ ivas_error ivas_init_decoder( 


        if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            st_ivas->nchan_transport = 2;

            st_ivas->nSCE = 2;

            st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE;

            st_ivas->nSCE = MAX_PARAM_ISM_WAVE;



            if ( ( error = ivas_param_ism_dec_open( st_ivas ) ) != IVAS_ERR_OK )

            {
@@ -884,6 +884,10 @@ ivas_error ivas_init_decoder( 
            }



            reset_indices_dec( st_ivas->hSCE[sce_id]->hCoreCoder[0] );



#ifdef FORCE_EST

            st_ivas->hSCE[sce_id]->hCoreCoder[0]->is_ism_format = 1;

#endif

        }



        if ( st_ivas->ism_mode == ISM_MODE_PARAM )

lib_dec/ivas_ism_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ ivas_error ivas_ism_dec_config( 
#endif

        if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            st_ivas->nchan_transport = 2;

            st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE;

            if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

            {

#ifdef NCHAN_ISM_PARAMETER
@@ -344,7 +344,7 @@ ivas_error ivas_ism_dec_config( 
#endif

        if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            st_ivas->nchan_transport = 2;

            st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE;

            if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

            {

#ifdef NCHAN_ISM_PARAMETER

lib_dec/ivas_sce_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -364,12 +364,6 @@ ivas_error create_sce_dec( 
    {

        return error;

    }

#ifdef FORCE_EST

    if ( st_ivas->ivas_format == ISM_FORMAT )

    {

        st->is_ism_mode = 1;

    }

#endif



    if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO )

    {