Commit 0e4cf38f authored by vaclav's avatar vaclav
Browse files

port FIX_993_REMOVE_SBA_GET_ORDER

parent 2498b3d5

lib_com/ivas_prot_fx.h

+2 −1
Original line number Diff line number Diff line
@@ -4937,12 +4937,13 @@ ivas_error ivas_cldfb_dec_reconfig_fx( 
ivas_error ivas_sba_enc_reconfigure_fx(

    Encoder_Struct *st_ivas /* i/o: IVAS encoder structure                  */

);



#ifndef FIX_993_REMOVE_SBA_GET_ORDER

Word16 ivas_sba_get_order_fx(

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

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

);



#endif

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

Word16 ivas_sba_get_analysis_order(

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

lib_com/ivas_sba_config_fx.c

+6 −2
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ void ivas_sba_config_fx( 
    Word16 *element_mode          /* o  : element mode of the core coder           */

)

{

#ifndef FIX_993_REMOVE_SBA_GET_ORDER

    test();

    IF( sba_order < 0 && nb_channels < 0 )

    {
@@ -74,6 +75,9 @@ void ivas_sba_config_fx( 
        nb_channels = ivas_sba_get_nchan_fx( sba_order, sba_planar );

    }

    ELSE

#else

    IF( nb_channels > 0 )

#endif

    {

        IF( sba_planar )

        {
@@ -124,7 +128,7 @@ void ivas_sba_config_fx( 
    return;

}





#ifndef FIX_993_REMOVE_SBA_GET_ORDER

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

 * ivas_sba_get_order()

 *
@@ -174,7 +178,7 @@ Word16 ivas_sba_get_order_fx( 


    return ( sba_order );

}



#endif



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

 * ivas_sba_get_analysis_order()

lib_com/options.h

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


#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

#define FIX_969_USAN_IGF_ARITH                          /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */

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



/* #################### End BASOP porting switches ############################ */