Commit e10b17fb authored by vaclav's avatar vaclav
Browse files

Merge branch '1558_basop_PortFlpMR1420' into 'main-pc' 

Port float MR1420 to main-pc

See merge request !1537
parents 12934411 cf0fb136

lib_com/ivas_prot_fx.h

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

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ 
#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural */

#endif

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



//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

#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 */

lib_enc/ivas_enc_fx.c

+1 −2
Original line number Diff line number Diff line
@@ -247,8 +247,7 @@ ivas_error ivas_enc_fx( 
            IF( EQ_16( st_ivas->nchan_transport, 2 ) )

            {

                IF( ( error = ivas_masa_encode_fx( st_ivas->hMasa, st_ivas->hQMetaData, hMetaData, &nb_bits_metadata[0], st_ivas->nchan_transport, ivas_format, ivas_total_brate, hEncoderConfig->Opt_DTX_ON, st_ivas->hCPE[0]->element_mode,

                                                   ISM_MODE_NONE, -1, NULL, -1, NULL, 0, 0 ) ) !=

                    IVAS_ERR_OK )

                                                   ISM_MODE_NONE, -1, NULL, -1, NULL, 0, 0 ) ) != IVAS_ERR_OK )

                {

                    return error;

                }