Commit 0a030ae8 authored by reutelhuber's avatar reutelhuber
Browse files

remove some obsolete special cases for nchan_transport == 2

parent d9705e48

lib_dec/ivas_sba_dirac_stereo_dec.c

100644 → 100755
+1 −12
Original line number Diff line number Diff line
@@ -845,11 +845,7 @@ void ivas_sba_dirac_stereo_dec( 
    float tmp_synth[L_FRAME16k];

    float hb_gain[NB_DIV];

    float hb_synth_stereo[CPE_CHANNELS][L_FRAME48k];

#ifdef DFT_STEREO_SPAR_MIXING

    float DFT[CPE_CHANNELS + 1][STEREO_DFT_BUF_MAX];

#else

    float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX];

#endif

    SCE_DEC_HANDLE hSCE;

    CPE_DEC_HANDLE hCPE;

    STEREO_DFT_DEC_DATA_HANDLE hStereoDft;
@@ -885,19 +881,12 @@ void ivas_sba_dirac_stereo_dec( 


    stereo_dft_dec_update( hStereoDft, output_frame, 1 /*st_ivas->sba_dirac_stereo_flag*/ );

#ifdef DFT_STEREO_SPAR_MIXING

    if ( st_ivas->nchan_transport > 2 )

    if ( st_ivas->nchan_transport > 1 )

    {

        stereo_dft_dec_analyze( hCPE, output[0], DFT, 0, output_frame, output_frame, DFT_STEREO_DEC_ANA_FB, 0, 0 );

        stereo_dft_dec_analyze( hCPE, output[1], DFT, 1, output_frame, output_frame, DFT_STEREO_DEC_ANA_FB, 0, 0 );

        hStereoDft->core_hist[0] = hCPE->hCoreCoder[0]->core;

    }

    else if ( st_ivas->nchan_transport == 2 )

    {

        stereo_dft_dec_analyze( hCPE, output[0], DFT, 0, output_frame, output_frame, DFT_STEREO_DEC_ANA_FB, 0, 0 );

        stereo_dft_dec_analyze( hCPE, output[1], DFT, 2, output_frame, output_frame, DFT_STEREO_DEC_ANA_FB, 0, 0 );

        hStereoDft->core_hist[0] = hCPE->hCoreCoder[0]->core;

    }

    else

#endif

    {

        /* nrg calculation for TD Stereo Filling, as done in ICBWE which is not used in this case */

lib_dec/ivas_stat_dec.h

100644 → 100755
+0 −4
Original line number Diff line number Diff line
@@ -958,11 +958,7 @@ typedef struct cpe_dec_data_structure 
    float prev_synth[CPE_CHANNELS][NS2SA( 48000, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS )];



    /* DFT stereo I/O channel buffer memories that need to be updated for TD->DFT stereo switching */

#ifdef DFT_STEREO_SPAR_MIXING

    float *input_mem[CPE_CHANNELS+1];

#else

    float *input_mem[CPE_CHANNELS];

#endif

    float *input_mem_LB[CPE_CHANNELS];

    float *input_mem_BPF[1];

    float *output_mem[CPE_CHANNELS];

lib_dec/ivas_stereo_dft_dec.c

100644 → 100755
+1 −5
Original line number Diff line number Diff line
@@ -1279,14 +1279,10 @@ void stereo_dft_dec( 
        pDFT_RES = DFT[1] + k * STEREO_DFT32MS_N_MAX;

#ifdef DFT_STEREO_SPAR_MIXING

        pDFT_DMX1 = 0;

        if ( nchan_transport > 2 )

        if ( nchan_transport > 1 )

        {

            pDFT_DMX1 = DFT[1] + k * STEREO_DFT32MS_N_MAX;

        }

        else if ( nchan_transport == 2 )

        {

            pDFT_DMX1 = DFT[2] + k * STEREO_DFT32MS_N_MAX;

        }

#endif



        /*Apply Stereo*/