Commit 35745e2b authored by multrus's avatar multrus
Browse files

formatting

parent 472752df

lib_com/options.h

+4 −15
Original line number Diff line number Diff line
@@ -73,35 +73,28 @@ 


/* Note: each compile switch (FIX_1101_...) is independent from the other ones */







#define ISSUE_1796_replace_shl_o                             /* FhG: replace shl_ro by overflow-free alternatives - BE*/

#define ISSUE_1836_replace_overflow_libcom                   /* FhG: replace overflow operators by non-overflow-alternatives - BE */

#define ISSUE_1866_replace_overflow_libdec                   /* FhG: BE - Replace BASOPoverflow operators all over the lib_dec module if Overflow result is not used */



#define FIX_1917_DIRAC_RENDER_PTR_INCR                       /* FhG: fix wrong pointer increment in ivas_dirac_dec_render_sf_fx() for object rendering */

#define FIX_CDLFB_BUFFER_SCALING                             /* FhG: fix wrong buffer scaling in ivas_dirac_dec_render_sf_fx() for object rendering */





#define FIX_ISSUE_1817_REPLACE_CARRY_OVERFLOW                /* FhG: bit-exact, replace carry and overflow operations by 64-bit operations, MR 1931 */

#define	NONBE_SVD_OPTIMIZATION                               /* FhG: reduce WMOPS of HouseHolderReduction() in ivas_svd_dec.c() by removing redundant mathematics and using 64 bit additions */

#define FIX_1766_TCX2ACELP_BWE_ISSUE                         /* VA : Fix rare BWE issue when switching from TCX to ACELP */



#define	NONBE_SVD_OPTIMIZATION /* FhG: reduce WMOPS of HouseHolderReduction() in ivas_svd_dec.c() by removing redundant mathematics and using 64 bit additions.*/

/* #################### Start BASOP porting switches ############################ */



#define FIX_1372_ISAR_POST_REND

#define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nokia: issue #984: complete the OMASA EXT output implementation */

#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */



#define FIX_1052_EXT_OUTPUT                             /* VA: issue 1052: define EXT decoder output configuration for stereo and MC formats */

#define NONBE_1215_FIX_JBM_MAX_SCALING                  /* FhG: issue 1215: Fix assert hit in a specific VoIP decoder config. Caused by integer overflow in max scaling calculation. */



#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */

#define FIX_1050_EFAP_ALLOC                             /* FhG: issue 1050: reduction of memory allocated to EFAP handle */

#define NONBE_FIX_1091_PMC_LOW_SIGNAL_BURSTS            /* FhG: fix for #1091, fix limit calculation for the regularized inverse of Kx to avoid bursts in very low signals */



#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/



#define LC3PLUS_LEA_COMPAT_BITRATES_48_6                /* FhG: treat split-rendering 256kbps lc3plus 10ms 0dof bitrate as sentinel value for LEA compatible 48_6 bitrate (124 kbps per channel)  */

#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */
@@ -124,16 +117,12 @@ 
#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */



#define NONBE_1894_OSBA_SCALING                          /* FhG: do not scale OSBA inputs by 0.5 any more */

#define NONBE_FIX_1141_OSBA_ROOM_RENDERING               /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect  */

#define NONBE_1360_LFE_DELAY                           /* Dlb: LFE delay alignment when rendering in CLDFB domain*/



#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define NONBE_SVD_OPTIMIZATION 



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



#define FIX_1766_TCX2ACELP_BWE_ISSUE    /* VA : Fix rare BWE issue when switching from TCX to ACELP */



#endif

lib_dec/dec_tcx_fx.c

+40 −44
Original line number Diff line number Diff line
@@ -3685,12 +3685,9 @@ void IMDCT_ivas_fx( 
    test();

    test();

    test();

    IF( ( left_rect != 0 ) && ( frame_cnt == 0 ) && st->last_core_bfi == ACELP_CORE && ( st->prev_bfi != 0 ) )

    {

        IF( FB_flag != 0 )

        {

            FOR( i = 0; i < ( tcx_mdct_window_half_length / 2 ); i++ )

            {

    IF( ( left_rect != 0 ) && ( frame_cnt == 0 ) && st->last_core_bfi == ACELP_CORE && ( st->prev_bfi != 0 ) ){

        IF( FB_flag != 0 ){

            FOR( i = 0; i < ( tcx_mdct_window_half_length / 2 ); i++ ){

                xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = mult_r( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], tcx_mdct_window_half_fx[i].v.im );                                                                    // Q(-2)

    xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( mult_r( hTcxDec->syn_OverlFB[i], tcx_mdct_window_half_fx[i].v.re ), tcx_mdct_window_half_fx[i].v.re ) ); // Q(-2)

    move16();
@@ -4178,7 +4175,6 @@ void decoder_tcx_ivas_fx( 


    Scale_sig( st->hTcxDec->old_syn_Overl, 320, ( -2 - st->hTcxDec->Q_old_syn_Overl ) ); // Scaling to Q-2

    st->hTcxDec->Q_old_syn_Overl = -2;



}



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

lib_dec/ivas_binRenderer_internal_fx.c

+362 −363
Original line number Diff line number Diff line
@@ -1350,8 +1350,7 @@ ivas_error ivas_binRenderer_open_fx( 


    /* Allocate memories needed for reverb module */

    test();

    IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) )

        {

    IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) ){

        IF( NE_32( ( error = ivas_binaural_reverb_init( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx ) ), IVAS_ERR_OK ) ){

            return error;

}

lib_rend/ivas_reverb_utils_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ static void ivas_reverb_set_energies( 
    }







    ivas_reverb_interpolate_energies_fx( avg_pwr_len, input_fc_fx, avg_pwr_l, avg_pwr_r,

                                         CLDFB_NO_CHANNELS_MAX, output_fc_fx, avg_pwr_left_fx, avg_pwr_right_fx, avg_pwr_left_e, avg_pwr_right_e );
@@ -179,5 +178,4 @@ static void ivas_reverb_set_energies( 
        avg_pwr_left[i] = (float) fabs( me2f( avg_pwr_left_fx[i], avg_pwr_left_e[i] ) );

        avg_pwr_right[i] = (float) fabs( me2f( avg_pwr_right_fx[i], avg_pwr_right_e[i] ) );

    }



}

lib_enc/hvq_enc_fx.c

+6 −6

File changed.

Contains only whitespace changes.

lib_enc/swb_tbe_enc_fx.c

+1 −1

File changed.

Contains only whitespace changes.

lib_rend/ivas_rom_binauralRenderer.h

+2 −2

File changed.

Contains only whitespace changes.

lib_enc/find_tilt_fx.c

+2 −2

File changed.

Contains only whitespace changes.

lib_enc/nois_est_fx.c

+5 −5

File changed.

Contains only whitespace changes.

lib_enc/vad_fx.c

+1 −1

File changed.

Contains only whitespace changes.

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+1 −1

File changed.

Contains only whitespace changes.

lib_dec/lib_dec_fx.c

+2 −2

File changed.

Contains only whitespace changes.

lib_enc/analy_sp_fx.c

+1 −1

File changed.

Contains only whitespace changes.

lib_enc/pvq_encode_fx.c

+4 −4

File changed.

Contains only whitespace changes.

lib_rend/ivas_stat_rend.h

+7 −7

File changed.

Contains only whitespace changes.

lib_rend/ivas_reverb_fx.c

+6 −6

File changed.

Contains only whitespace changes.