Commit d5e1ad76 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/add-5-and-10-ms-rendering-to-sanitizer-tests

parents 3ba996df cf494821

apps/decoder.c

+0 −6
Original line number Diff line number Diff line
@@ -3366,14 +3366,10 @@ static ivas_error decodeVoIP( 
        }

        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

        frame++;

#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE

        if ( vec_pos_update == 0 )

        {

            systemTime_ms += vec_pos_len * systemTimeInc_ms;

        }

#else

        systemTime_ms += systemTimeInc_ms;

#endif



#ifdef WMOPS

        update_mem();
@@ -3382,7 +3378,6 @@ static ivas_error decodeVoIP( 
    }





#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE

    int16_t nSamplesFlushed = 0;



    /* decode and get samples */
@@ -3460,7 +3455,6 @@ static ivas_error decodeVoIP( 
            }

        }

    }

#endif



    /*------------------------------------------------------------------------------------------*

     * Add zeros at the end to have equal length of synthesized signals

lib_com/ivas_prot.h

+0 −9
Original line number Diff line number Diff line
@@ -769,9 +769,7 @@ void dtx_read_padding_bits( 
);



void ivas_apply_non_diegetic_panning( 

#ifdef FIX_1009_ISM_NONDIEGETIC_PANNING

    float *input_f,                                             /* i  : non-diegetic object                                         */

#endif

    float *output_f[],                                          /* o  : core-coder transport mono channel/stereo output             */

    const float non_diegetic_pan_gain,                          /* i  : non-diegetic panning gain                                   */

    const int16_t output_frame                                  /* i  : output frame length per channel                             */
@@ -3499,13 +3497,6 @@ ivas_error ivas_cldfb_dec_reconfig( 
    const int16_t numCldfbSyntheses_old                         /* i  : number of CLDFB synthesis instances in previous frame */

);



#ifndef FIX_993_REMOVE_SBA_GET_ORDER

/*! r: Ambisonic (SBA) order */

int16_t ivas_sba_get_order(

    const int16_t nb_channels,                                  /* i  : Number of ambisonic channels            */

    const int16_t sba_planar                                    /* i  : SBA planar flag                         */

);

#endif

/*! r: Ambisonic (SBA) order used for analysis and coding */

int16_t ivas_sba_get_analysis_order(

    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */

lib_com/ivas_sba_config.c

+0 −47
Original line number Diff line number Diff line
@@ -64,23 +64,7 @@ void ivas_sba_config( 
    int16_t *element_mode          /* o  : element mode of the core coder           */

)

{

#ifndef FIX_993_REMOVE_SBA_GET_ORDER

    if ( ( sba_order < 0 ) && ( nb_channels < 0 ) )

    {

        assert( 0 && "Either order or number of channels must be positive" );

    }

    else if ( sba_order < 0 )

    {

        sba_order = ivas_sba_get_order( nb_channels, sba_planar );

    }

    else if ( nb_channels < 0 )

    {

        nb_channels = ivas_sba_get_nchan( sba_order, sba_planar );

    }

    else

#else

    if ( nb_channels > 0 )

#endif

    {

        if ( sba_planar )

        {
@@ -121,37 +105,6 @@ void ivas_sba_config( 
    return;

}



#ifndef FIX_993_REMOVE_SBA_GET_ORDER

/*-------------------------------------------------------------------*

 * ivas_sba_get_order()

 *

 * Get Ambisonic order from number of ambisonic channels

 *-------------------------------------------------------------------*/



/*! r: Ambisonic (SBA) order */

int16_t ivas_sba_get_order(

    const int16_t nb_channels, /* i  : Number of ambisonic channels     */

    const int16_t sba_planar   /* i  : SBA Planar flag                  */

)

{

    int16_t sba_order;



    if ( sba_planar )

    {

        sba_order = ( nb_channels - 1 ) / 2;

        assert( ( 2 * sba_order + 1 == nb_channels ) && "Number of channels not supported in Planar SBA!" );

    }

    else

    {

        sba_order = (int16_t) sqrtf( (float) nb_channels ) - 1;

        assert( ( ( sba_order + 1 ) * ( sba_order + 1 ) == nb_channels ) && "Number of channels not supported in SBA!" );

    }



    assert( ( sba_order <= 3 ) && "Error: SBA order must be <= 3!" );



    return ( sba_order );

}

#endif



/*-------------------------------------------------------------------*

 * ivas_sba_get_analysis_order()

lib_com/ivas_stat_com.h

+0 −1
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ typedef struct ivas_spar_md_com_cfg 
    int16_t max_bits_per_blk;

    int16_t prev_quant_idx;

    int16_t agc_bits_ch_idx;

    int16_t planarCP;

    int16_t num_umx_chs;

    int16_t max_md_bits_spar;

lib_com/options.h

100755 → 100644
+1 −12
Original line number Diff line number Diff line
@@ -156,11 +156,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_998_UNUSED_FUNCTION                         /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */ 

#define FIX_1009_ISM_NONDIEGETIC_PANNING                /* FhG: issue #1009: use correct object buffer for ISM1 non-diegetic pan      */

#define FIX_993_REMOVE_SBA_GET_ORDER                    /* VA: issue 993: remove unused function ivas_sba_get_order() */

#define FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE            /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions   */

#define FIX_960_SYN_OUTPUT                              /* VA: issue 960: unused function syn_output() is removed */

#define FIX_1027_GSC_INT_OVERFLOW                       /* VA: issue 2207: overflow in GSC */



/* #################### End BE switches ################################## */
@@ -168,13 +164,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_864_JBM_RENDER_FRAMESIZE                    /* FhG: issue #864: fix different behaviour of JBM TSM with different render frame sizes */

#define NONBE_FIX_1012_1013_JBM_FLUSH_BUFFER                  /* FhG: issues #1012, 1013: JBM flush function uses wrong output buffer */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS                  /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO              /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

#define NONBE_FIX_1006_PAST_DMX_NRG_ERROR                     /* Eri/FhG: Issue 1006: Bug fix in ivas_stereo_dft_dec not replicated in ivas_stereo_dft_dec_dmx */

#define NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO                 /* Eri: Issue 1010: Division by zero in Stereo CNG */



/* ##################### End NON-BE switches ########################### */