Commit f3e3e391 authored by reutelhuber's avatar reutelhuber
Browse files

reduce buffer mixer_mat_smooth by half

parent 62053ebd

lib_dec/ivas_sba_dirac_stereo_dec.c

+5 −5
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ void ivas_sba_dirac_stereo_smooth_parameters( 
            {

                if ( hStereoDft->first_frame )

                {

                    for ( i = 0; i < 4; i++ )

                    for ( i = 0; i < 2; i++ )

                    {

                        for ( j = 0; j < 4; j++ )

                        {
@@ -745,7 +745,7 @@ void ivas_sba_dirac_stereo_smooth_parameters( 
                }

                else

                {

                    for ( i = 0; i < 4; i++ )

                    for ( i = 0; i < 2; i++ )

                    {

                        for ( j = 0; j < 4; j++ )

                        {
@@ -771,7 +771,7 @@ void ivas_sba_dirac_stereo_smooth_parameters( 
                mvr2r( hMdDec->mixer_mat_prev[3][0][0], hMdDec->mixer_mat_prev[2][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS );

                mvr2r( hMdDec->mixer_mat_prev[4][0][0], hMdDec->mixer_mat_prev[3][0][0], IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH * IVAS_MAX_NUM_BANDS );



                for ( i = 0; i < 4; i++ )

                for ( i = 0; i < 2; i++ )

                {

                    for ( j = 0; j < 4; j++ )

                    {
@@ -792,7 +792,7 @@ void ivas_sba_dirac_stereo_smooth_parameters( 
            if ( f_mat == 0 )

                f_mat = fopen( "mixer_mat_stereo_smooth", "w" );



            for ( i = 0; i < 4; i++ )

            for ( i = 0; i < 2; i++ )

            {

                for ( j = 0; j < 4; j++ )

                {
@@ -803,7 +803,7 @@ void ivas_sba_dirac_stereo_smooth_parameters( 
                }

            }



            for ( i = 0; i < 4; i++ )

            for ( i = 0; i < 2; i++ )

            {

                for ( j = 0; j < 4; j++ )

                {

lib_dec/ivas_stat_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ typedef struct stereo_dft_dec_data_struct 


#ifdef DFT_STEREO_SPAR_MIXING

    int16_t first_frame;

    float mixer_mat_smooth[4][4][2*IVAS_MAX_NUM_BANDS];

    float mixer_mat_smooth[2][4][2*IVAS_MAX_NUM_BANDS];

    float g_L_prev;

    float g_R_prev;

    const float *max_smooth_gains, *min_smooth_gains;

lib_dec/ivas_stereo_dft_dec.c

+1 −3
Original line number Diff line number Diff line
@@ -529,15 +529,13 @@ void stereo_dft_dec_reset( 
#ifdef DFT_STEREO_SPAR_MIXING

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

    {

        for ( i = 0; i < 4; i++ )

        for ( i = 0; i < 2; i++ )

        {

            for ( j = 0; j < 4; j++ )

            {

                hStereoDft->mixer_mat_smooth[i][j][b] = 0.0f;

            }

        }

        hStereoDft->mixer_mat_smooth[0][0][b] = 0.0f;

        hStereoDft->mixer_mat_smooth[1][1][b] = 0.0f;

    }

    hStereoDft->first_frame = 1;

    hStereoDft->g_L_prev = 0.f;