Commit 22e37c8a authored by vaclav's avatar vaclav
Browse files

formatting

parent b1cedd90

lib_com/ivas_prot.h

+8 −10
Original line number Diff line number Diff line
@@ -3864,8 +3864,7 @@ void ivas_spar_dec_upmixer( 
/* MD module */

ivas_error ivas_spar_md_enc_open(

    ivas_spar_md_enc_state_t **hMdEnc,                          /* i/o: SPAR MD encoder handle                  */

    const ENCODER_CONFIG_HANDLE hEncoderConfig                  /* i  : configuration structure                 */

    ,

    const ENCODER_CONFIG_HANDLE hEncoderConfig,                 /* i  : configuration structure                 */

    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order                   */

);
@@ -3878,8 +3877,7 @@ ivas_error ivas_spar_md_enc_process( 
    const ENCODER_CONFIG_HANDLE hEncoderConfig,                 /* i  : configuration structure                 */

    ivas_spar_md_enc_in_buf_t *pIn_buf,

    BSTR_ENC_HANDLE hMetaData,                                  /* i/o: MetaData handle                         */

    const int16_t dtx_silence_mode

    ,

    const int16_t dtx_silence_mode,

    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order                   */

);

lib_com/options.h

+3 −8
Original line number Diff line number Diff line
@@ -146,15 +146,10 @@ 
/*#define FIX_IVAS_185_MDCT_ST_PLC_FADEOUT*/            /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */

/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/







#define FIX_ADAP_STEFI_SHIFT                            /* Issue 89: fix bug in parameter shift of adaptive stereo filling */

#define SPAR_SCALING_HARMONIZATION                      /* issue 80: Changes to harmonize scaling in spar */



                                                        



/* NTT switches */



#define SPAR_SCALING_HARMONIZATION                      /* issue 80: Changes to harmonize scaling in spar */

                                                        /* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_enc/ivas_spar_md_enc.c

+3 −4
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ static void ivas_quant_pred_coeffs_per_band( ivas_band_coeffs_t *pband_coeffs, i 


ivas_error ivas_spar_md_enc_open(

    ivas_spar_md_enc_state_t **hMdEnc_in,       /* i/o: SPAR MD encoder handle  */

    const ENCODER_CONFIG_HANDLE hEncoderConfig /* i  : configuration structure */

    ,

    const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i  : configuration structure */

    const int16_t sba_order                     /* i  : Ambisonic (SBA) order   */

)

{