Commit d81961ed authored by vaclav's avatar vaclav
Browse files

issue 993: remove unused function ivas_sba_get_order(); under FIX_993_REMOVE_SBA_GET_ORDER

parent b7be58e4

lib_com/ivas_prot.h

+2 −1
Original line number Diff line number Diff line
@@ -3496,12 +3496,13 @@ 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

+6 −2
Original line number Diff line number Diff line
@@ -70,7 +70,11 @@ void ivas_sba_config( 
    }

    else if ( sba_order < 0 )

    {

#ifdef FIX_993_REMOVE_SBA_GET_ORDER

        assert( !"SBA order cannot be negative!" );

#else

        sba_order = ivas_sba_get_order( nb_channels, sba_planar );

#endif

    }

    else if ( nb_channels < 0 )

    {
@@ -117,7 +121,7 @@ void ivas_sba_config( 
    return;

}





#ifndef FIX_993_REMOVE_SBA_GET_ORDER

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

 * ivas_sba_get_order()

 *
@@ -147,7 +151,7 @@ int16_t ivas_sba_get_order( 


    return ( sba_order );

}



#endif



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

 * ivas_sba_get_analysis_order()

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ 
#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */

#define FIX_901_PARAMMC_DEAD_CODE                       /* FhG: issue 901: remove dead ParamMC code             */

#define FIX_1008_EXTORIENT_TARGET_INTERPOLATION          /* FhG: issue #1008, external orientation init was wrong for 5ms */

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





/* #################### End BE switches ################################## */