Commit 2e82bc1a authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_871_ACELP_CRASH_IN_OSBA

parent ec4febba

lib_com/ivas_dirac_com.c

+0 −10
Original line number Diff line number Diff line
@@ -163,10 +163,8 @@ ivas_error ivas_dirac_config( 
    if ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) /* skip for MASA decoder */

    {

        if ( ( error = ivas_dirac_sba_config( hQMetaData, element_mode, ivas_total_brate, sba_order, hConfig->nbands - spar_dirac_split_band

#ifdef NONBE_FIX_871_ACELP_CRASH_IN_OSBA

                                              ,

                                              ivas_format

#endif

                                              ) ) != IVAS_ERR_OK )

        {

            return error;
@@ -325,10 +323,8 @@ void ivas_get_dirac_sba_max_md_bits( 
    int16_t *metadata_max_bits,

    int16_t *qmetadata_max_bit_req,

    const int16_t nbands

#ifdef NONBE_FIX_871_ACELP_CRASH_IN_OSBA

    ,

    IVAS_FORMAT ivas_format

#endif

)

{

    if ( sba_total_brate <= IVAS_13k2 )
@@ -345,13 +341,11 @@ void ivas_get_dirac_sba_max_md_bits( 
    {

        *bits_frame_nominal = ACELP_16k40 / FRAMES_PER_SEC;

        *metadata_max_bits = 103;

#ifdef NONBE_FIX_871_ACELP_CRASH_IN_OSBA

        /* OSBA needs an additional 2-bits safety margin to avoid acelp crashes */

        if ( ivas_format == SBA_ISM_FORMAT )

        {

            ( *metadata_max_bits ) -= 3;

        }

#endif

    }

    else if ( sba_total_brate <= IVAS_32k )

    {
@@ -407,10 +401,8 @@ ivas_error ivas_dirac_sba_config( 
    int32_t sba_total_brate,          /* i  : SBA total bitrate                                    */

    const int16_t sba_order,          /* i  : Ambisonic (SBA) order                                */

    const int16_t nbands              /* i  : number of frequency bands                            */

#ifdef NONBE_FIX_871_ACELP_CRASH_IN_OSBA

    ,

    IVAS_FORMAT ivas_format

#endif

)

{

    int16_t nbands_coded;
@@ -474,10 +466,8 @@ ivas_error ivas_dirac_sba_config( 
    }



    ivas_get_dirac_sba_max_md_bits( sba_total_brate, &hQMetaData->bits_frame_nominal, &hQMetaData->metadata_max_bits, &hQMetaData->qmetadata_max_bit_req, hQMetaData->q_direction[0].cfg.nbands

#ifdef NONBE_FIX_871_ACELP_CRASH_IN_OSBA

                                    ,

                                    ivas_format

#endif

    );



    return error;

lib_com/ivas_prot.h

+0 −4
Original line number Diff line number Diff line
@@ -3644,10 +3644,8 @@ void ivas_get_dirac_sba_max_md_bits( 
    int16_t *metadata_max_bits,

    int16_t *qmetadata_max_bit_req,

    const int16_t nbands

#ifdef NONBE_FIX_871_ACELP_CRASH_IN_OSBA

	,

	IVAS_FORMAT ivas_format

#endif

);



ivas_error ivas_dirac_sba_config(
@@ -3656,10 +3654,8 @@ ivas_error ivas_dirac_sba_config( 
    int32_t sba_total_brate,                                    /* i  : SBA total bitrate                                    */

    const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                                */

    const int16_t nbands                                        /* i  : number of frequency bands                            */

#ifdef NONBE_FIX_871_ACELP_CRASH_IN_OSBA

	,

	IVAS_FORMAT ivas_format

#endif

);



ivas_error ivas_dirac_dec_config(

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_FIX_871_ACELP_CRASH_IN_OSBA                     /* FhG: isse 871: crash in ACELP core encoder with OSBA */

#define NONBE_FIX_906_SBA_LBR_SMOOTHING                       /* FhG: issue #906: fix SBA low bit rate smoothing for HOA2/HOA3 output */

#define NONBE_FIX_878_RS_FEC_STEREO_CNG                       /* Eri: Frame loss and Unified Stereo CNG may cause false BER detection which results in corrupt bitstream decoding */

#define NONBE_FIX_904_JBM_SBA_RS_FOA                          /* FhG: issue #904: fix JBM SBA RS to FOA decoding */

lib_dec/ivas_init_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1382,10 +1382,8 @@ ivas_error ivas_init_decoder( 
        }



        if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND )

#ifdef NONBE_FIX_871_ACELP_CRASH_IN_OSBA

                                                                                                                                                   ,

                                              st_ivas->ivas_format

#endif

                                              ) ) != IVAS_ERR_OK )

        {

            return error;
@@ -1540,10 +1538,8 @@ ivas_error ivas_init_decoder( 
        }



        if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND )

#ifdef NONBE_FIX_871_ACELP_CRASH_IN_OSBA

                                                                                                                                                   ,

                                              st_ivas->ivas_format

#endif

                                              ) ) != IVAS_ERR_OK )

        {

            return error;

lib_dec/ivas_sba_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -396,10 +396,8 @@ ivas_error ivas_sba_dec_reconfigure( 
    }



    if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND )

#ifdef NONBE_FIX_871_ACELP_CRASH_IN_OSBA

                                                                                                                                               ,

                                          st_ivas->ivas_format

#endif

                                          ) ) != IVAS_ERR_OK )

    {

        return error;