Commit 1ac6d996 authored by eichenseer's avatar eichenseer
Browse files

Two more small fixes (warnings) related to restricting the contribution to ParamISM.

parent 6973e4c3

lib_dec/ivas_tcx_core_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ void stereo_tcx_core_dec( 
        if ( st->element_mode != IVAS_CPE_TD )

        {

#ifdef PARAM_ISM_DTX_CNG

            if ( ivas_format != NULL && ism_mode != NULL && ivas_format == ISM_FORMAT && ism_mode == ISM_MODE_PARAM )

            if ( ivas_format == ISM_FORMAT && ism_mode == ISM_MODE_PARAM )

            {

                float buffer[L_FRAME16k];

                lerp( signal_outFB, buffer, st->L_frame, hTcxDec->L_frameTCX );

lib_enc/lib_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ static ivas_error configureEncoder( 
#ifdef PARAM_ISM_DTX_CNG

    if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_format != MONO_FORMAT &&

         ( ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp == 2 ) ||                                  // ToDo: see Issue 113

           ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp > 2 && !hEncoderConfig->ivas_total_brate == IVAS_24k4 && !hEncoderConfig->ivas_total_brate == IVAS_32k ) || // ParamISM

           ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp > 2 && hEncoderConfig->ivas_total_brate != IVAS_24k4 && hEncoderConfig->ivas_total_brate != IVAS_32k ) || // ParamISM

           ( hEncoderConfig->ivas_format == MASA_FORMAT && hEncoderConfig->ivas_total_brate > IVAS_128k ) ||                   // ToDo: remove the bitrate limitation

           ( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_get_sba_num_TCs( hEncoderConfig->ivas_total_brate, 1 ) > 2 ) || // ToDo: support for 3+ TCs to be done

           hEncoderConfig->ivas_format == MC_FORMAT                                                                            // ToDo: TBD