Commit a1d47617 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_170_DTX_MASA

parent bbb81c1c

lib_com/options.h

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




#define FIX_506_WARNINGS                                /* FhG/Eri/Dlb/VA: Issue 508, Warnings on MacOS */

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

#define FIX_296_CFG_LFE_SCENE_DESC                       /* FhG: Fix issue 296 - add configurable LFE handling to the scene description file */

#define FIX_510                                         /* FhG: fix issue 510, misleading error message for invalid input format */

#define FIX_509                                         /* FhG: fix issue 509, too low number of bitsream indices in SBA */

lib_enc/lib_enc.c

+0 −7
Original line number Diff line number Diff line
@@ -908,17 +908,10 @@ 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 ) ||

           hEncoderConfig->ivas_format == MC_FORMAT ) )

#endif

    {

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

    }