Commit 2fedced3 authored by Rivukanta Bhattacharya's avatar Rivukanta Bhattacharya
Browse files

Merge branch 'main' into 163-hcovstate-handle-in-sba

parents 0a678819 21a710dc

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ 


#define FIX_483                                         /* FhG: fix issue 483, division by zero in nois_est */

#define FIX_483b                                        /* FhG: fix issue 483, uninitialized values in ivas_mct_core_enc */

#define FIX_170_DTX_MASA                                /* Nokia: Fix issue 170, relaxing the use of DTX in MASA format */



                                                        /* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_enc/lib_enc.c

+7 −0
Original line number Diff line number Diff line
@@ -895,11 +895,18 @@ static ivas_error configureEncoder( 
        return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "8kHz input sampling rate is not supported in IVAS." );

    }



#ifdef FIX_170_DTX_MASA

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

         ( ( 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

           ) )

#else

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

         ( ( 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

           ) )

#endif

    {

        return IVAS_ERROR( IVAS_ERR_DTX_NOT_SUPPORTED, "DTX is not supported in this IVAS format and element mode." );

    }