Commit f2308d39 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_STEREO_474

parent a70b76c5

lib_com/ivas_prot.h

+0 −4
Original line number Diff line number Diff line
@@ -1315,10 +1315,8 @@ void stereo_dft_dec( 
    const int16_t cross_fade_start_offset,                      /* i  : SPAR mixer delay compensation       */

    const int32_t output_Fs,                                    /* i  : Fs for delay calculation            */

    const int16_t nchan_transport                               /* i  : number of transpor channels         */

#ifdef FIX_STEREO_474

    ,

    const int16_t num_md_sub_frames                             /* i:  number of MD subframes              */

#endif

);



void stereo_dft_res_ecu(
@@ -3529,10 +3527,8 @@ void ivas_sba_dirac_stereo_smooth_parameters( 
    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD handle for upmixing             */

    const int16_t cross_fade_start_offset,                      /* i  : SPAR mixer delay compensation           */

    const int32_t output_Fs                                     /* i  : Fs for delay calculation                */

#ifdef FIX_STEREO_474

    ,

    const int16_t num_md_sub_frames                             /* i : number of subframes in mixing matrix  */

#endif

);



void ivas_sba2mc_cldfb(

lib_com/options.h

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


/*#define FIX_XXX_JBM_FIFO_BUFFER  */                   /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/



#define FIX_STEREO_474                                  /* FhG fix for issue 574, crash with SBA to stereo output at 512 kbps */

#define FIX_MDCT_ST_PLC_FADEOUT_DELAY

#define FIX_DIRAC_LS_SYNTHESIS_CONFIG_479               /* FhG: fix for issue 479, broken LS output with DirAC at high BRs */

#define HYBRID_ITD_MAX                                 /* FhG: Improvement for DFT-stereo for cases with large ITDs */

lib_dec/ivas_cpe_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -406,10 +406,8 @@ ivas_error ivas_cpe_dec( 
        else

        {

            stereo_dft_dec( hCPE->hStereoDft, sts[0], DFT, hCPE->input_mem[1], hCPE->hStereoCng, 0, 0, 0, 0, 0, 0

#ifdef FIX_STEREO_474

                            ,

                            MAX_PARAM_SPATIAL_SUBFRAMES

#endif

            );

        }

lib_dec/ivas_sba_dirac_stereo_dec.c

+0 −12
Original line number Diff line number Diff line
@@ -697,10 +697,8 @@ void ivas_sba_dirac_stereo_smooth_parameters( 
    ivas_spar_md_dec_state_t *hMdDec,      /* i/o: SPAR MD handle for upmixing      */

    const int16_t cross_fade_start_offset, /* i  : SPAR mixer delay compensation    */

    const int32_t output_Fs                /* i  : Fs for delay calculation         */

#ifdef FIX_STEREO_474

    ,

    const int16_t num_md_sub_frames /* i : number of subframes in mixing matrix  */

#endif

)

{

    int16_t i, j, k, i_sf;
@@ -740,9 +738,7 @@ void ivas_sba_dirac_stereo_smooth_parameters( 
        float xfade_start_ns;

        int16_t xfade_delay_subframes;

        int16_t i_hist;

#ifdef FIX_STEREO_474

        int16_t md_sf;

#endif



        xfade_start_ns = cross_fade_start_offset / (float) output_Fs * 1000000000.f - IVAS_FB_ENC_DELAY_NS;

        xfade_delay_subframes = (int16_t) ( xfade_start_ns / ( FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES ) );
@@ -754,9 +750,7 @@ void ivas_sba_dirac_stereo_smooth_parameters( 
            for ( i_sf = k * 2; i_sf < ( k + 1 ) * 2; i_sf++ )

            {



#ifdef FIX_STEREO_474

                md_sf = ( num_md_sub_frames == MAX_PARAM_SPATIAL_SUBFRAMES ) ? i_sf : 0;

#endif



                if ( hStereoDft->first_frame )

                {
@@ -802,11 +796,7 @@ void ivas_sba_dirac_stereo_smooth_parameters( 
                    {

                        for ( b = 0; b < hStereoDft->nbands; b++ )

                        {

#ifdef FIX_STEREO_474

                            hMdDec->mixer_mat_prev[4][i][j][b] = hMdDec->mixer_mat[i][j][b + md_sf * IVAS_MAX_NUM_BANDS];

#else

                            hMdDec->mixer_mat_prev[4][i][j][b] = hMdDec->mixer_mat[i][j][b + i_sf * IVAS_MAX_NUM_BANDS];

#endif

                        }

                    }

                }
@@ -916,10 +906,8 @@ void ivas_sba_dirac_stereo_dec( 
                    ( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hMdDec : NULL,

                    ( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hFbMixer->cross_fade_start_offset : 0,

                    st_ivas->hDecoderConfig->output_Fs, st_ivas->nchan_transport

#ifdef FIX_STEREO_474

                    ,

                    ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate )

#endif

    );



    /* DFT synthesis */

lib_dec/ivas_stereo_dft_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1131,10 +1131,8 @@ void stereo_dft_dec( 
    const int16_t cross_fade_start_offset,       /* i  : SPAR mixer delay compensation      */

    const int32_t output_Fs,                     /* i  : Fs for delay calculation           */

    const int16_t nchan_transport                /* i  : number of transpor channels        */

#ifdef FIX_STEREO_474

    ,

    const int16_t num_md_sub_frames /* i:  number of MD subframes              */

#endif

)

{

    int16_t i, k, b, N_div, stop;
@@ -1213,10 +1211,8 @@ void stereo_dft_dec( 
                                                     hMdDec,

                                                     cross_fade_start_offset,

                                                     output_Fs

#ifdef FIX_STEREO_474

                                                     ,

                                                     num_md_sub_frames

#endif

            );

        }

        else