Commit 58ea34d4 authored by multrus's avatar multrus
Browse files

formatting

parent 68091d96
Loading
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -147,12 +147,10 @@
#define PRINT_SBA_ORDER                                 /* Issue 179: print-out also the SBA order of IVAS SBA format to stdout */
#define FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS              /* Issue 124: do not allocate unused plc struct in IVAS modes which is only used in EVS mono */
/*#define FIX_MCT_PLC_RECOVERY*/                            /* Issue 184: scale the old synthesis part correctly in the first good frame after lost frames in MCT modes - to be activated after previous switch is merged */
#define FIX_MSAN_ERROR_STEREO_RATE_SWITCHING            /* addresses Issue 177 */
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/
#define FIX_AGC_WINFUNC_MEMORY                          /* Issue 62: lower agc_com.winFunc memory consumption */



/* ################## End DEVELOPMENT switches ######################### */
/* clang-format on */
#endif
+1 −3
Original line number Diff line number Diff line
@@ -803,9 +803,7 @@ ivas_error ivas_init_decoder(
                    return error;
                }

                if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA
                     && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO
                )
                if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO )
                {
                    if ( ( error = ivas_dirac_dec_open( st_ivas ) ) != IVAS_ERR_OK )
                    {
+0 −4
Original line number Diff line number Diff line
@@ -478,11 +478,7 @@ void stereo_dft_dec_core_switching(
                mvr2r( output, pAp_input, st->L_frame );
            }

#ifdef FIX_MSAN_ERROR_STEREO_RATE_SWITCHING
            if ( st->last_core == ACELP_CORE && !( st->prev_bfi == 1 && st->last_core == ACELP_CORE && st->last_con_tcx == 1 ) && !st->tcxonly ) /* ACELP -> TCX/HQ-Core */
#else
            if ( st->last_core == ACELP_CORE && !( st->prev_bfi == 1 && st->last_core == ACELP_CORE && st->last_con_tcx == 1 ) ) /* ACELP -> TCX/HQ-Core */
#endif
            {
                mvr2r( tcx_core_buf, tmp_fade, ap_fade_len );
                for ( i = 0; i < ap_fade_len; i++ )
+1 −3
Original line number Diff line number Diff line
@@ -1132,9 +1132,7 @@ void ivas_spar_dec_upmixer(
            }
        }

        if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA
             && hDecoderConfig->output_config != AUDIO_CONFIG_STEREO && hDecoderConfig->output_config != AUDIO_CONFIG_MONO
        )
        if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA && hDecoderConfig->output_config != AUDIO_CONFIG_STEREO && hDecoderConfig->output_config != AUDIO_CONFIG_MONO )
        {
            ivas_dirac_dec( st_ivas, output, nchan_internal, cldfb_in_ts_re, cldfb_in_ts_im, i_sf );
        }
+37 −37

File changed.

Contains only whitespace changes.

+2 −2

File changed.

Contains only whitespace changes.

+2 −2

File changed.

Contains only whitespace changes.

Loading