Commit 3ce74e4d authored by multrus's avatar multrus
Browse files

formatting

parent 0d27f53b

lib_dec/ivas_stereo_mdct_core_dec.c

+3 −7
Original line number Diff line number Diff line
@@ -294,9 +294,7 @@ void stereo_mdct_core_dec( 


            for ( k = 0; k < nSubframes[0]; k++ )

            {

                if ( ( hCPE->hStereoMdct->IGFStereoMode[k] != SMDCT_DUAL_MONO || hCPE->hStereoMdct->mdct_stereo_mode[k] != SMDCT_DUAL_MONO )

                     && !hCPE->hStereoMdct->isSBAStereoMode

                )

                if ( ( hCPE->hStereoMdct->IGFStereoMode[k] != SMDCT_DUAL_MONO || hCPE->hStereoMdct->mdct_stereo_mode[k] != SMDCT_DUAL_MONO ) && !hCPE->hStereoMdct->isSBAStereoMode )

                {

                    assert( ( sts[0]->core == sts[1]->core ) || ( hCPE->hStereoMdct->mdct_stereo_mode[0] == SMDCT_DUAL_MONO ) );
@@ -372,9 +370,7 @@ void stereo_mdct_core_dec( 
        mvs2s( ms_mask[1], hCPE->hStereoMdct->prev_ms_mask[1], MAX_SFB );

    }



    if ( ( !bfi || !( sts[0]->core == ACELP_CORE && sts[1]->core == ACELP_CORE ) )

         && !hCPE->hStereoMdct->isSBAStereoMode

    )

    if ( ( !bfi || !( sts[0]->core == ACELP_CORE && sts[1]->core == ACELP_CORE ) ) && !hCPE->hStereoMdct->isSBAStereoMode )

    {

#ifdef DEBUGGING

        assert( ( sts[0]->core == sts[1]->core ) || ( ( hCPE->hStereoMdct->mdct_stereo_mode[0] == SMDCT_DUAL_MONO ) && ( hCPE->hStereoMdct->mdct_stereo_mode[1] == SMDCT_DUAL_MONO ) ) );

lib_enc/ivas_cpe_enc.c

100755 → 100644
+3 −3

File changed.File mode changed from 100755 to 100644.

Contains only whitespace changes.

lib_enc/ivas_mdct_core_enc.c

+1 −3
Original line number Diff line number Diff line
@@ -713,9 +713,7 @@ void ivas_mdct_core_whitening_enc( 


    sts[0]->hTcxEnc->fUseTns[1] = 0;



    if ( sts[0]->element_brate < IVAS_80k && sts[0]->core == sts[1]->core && sts[0]->element_mode == IVAS_CPE_MDCT && !mct_on

         && !hCPE->hStereoMdct->isSBAStereoMode

    )

    if ( sts[0]->element_brate < IVAS_80k && sts[0]->core == sts[1]->core && sts[0]->element_mode == IVAS_CPE_MDCT && !mct_on && !hCPE->hStereoMdct->isSBAStereoMode )

    {

        int16_t nSampCore;

        int32_t totalRate;

lib_enc/ivas_stereo_mdct_core_enc.c

100755 → 100644
+2 −3
Original line number Diff line number Diff line
@@ -348,9 +348,8 @@ void stereo_mdct_core_enc( 
            for ( n = 0; n < nSubframes; n++ )

            {

                if ( ( hStereoMdct->mdct_stereo_mode[n] != hStereoMdct->IGFStereoMode[n] ||

                       hStereoMdct->mdct_stereo_mode[n] == SMDCT_BW_MS )

                     && !hStereoMdct->isSBAStereoMode

                )

                       hStereoMdct->mdct_stereo_mode[n] == SMDCT_BW_MS ) &&

                     !hStereoMdct->isSBAStereoMode )

                {

                    ProcessStereoIGF( hStereoMdct, sts, ms_mask, orig_spectrum, powerSpec, powerSpecMsInv, inv_spectrum, n, hCPE->hCoreCoder[0]->sp_aud_decision0, hCPE->hCoreCoder[0]->element_brate, 0 );

                }

lib_enc/ivas_sba_enc.c

+1 −1

File changed.

Contains only whitespace changes.

lib_enc/ivas_stereo_switching_enc.c

+1 −1

File changed.

Contains only whitespace changes.