Commit 991388df authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_993_REMOVE_SBA_GET_ORDER

parent fd0091a0

lib_com/ivas_prot.h

+0 −7
Original line number Diff line number Diff line
@@ -3497,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/options.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 
/*#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_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 */