Commit d13327e9 authored by vaclav's avatar vaclav
Browse files

remove unnecessary condition

parent 6ba16a16

lib_dec/ivas_dec.c

+1 −4
Original line number Diff line number Diff line
@@ -777,14 +777,11 @@ ivas_error ivas_dec( 
    {

        st = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0];



        /* LFE channel decoder */

        if ( st_ivas->mc_mode == MC_MODE_MCT )

        {

            /* LFE channel decoder */

            ivas_lfe_dec( st_ivas->hLFE, st, output_frame, st_ivas->bfi, p_output[LFE_CHANNEL] );

        }



        if ( st_ivas->mc_mode == MC_MODE_MCT )

        {

            if ( ( error = ivas_mct_dec( st_ivas, p_output, output_frame, 0 ) ) != IVAS_ERR_OK )

            {

                return error;

lib_dec/ivas_jbm_dec.c

+2 −4
Original line number Diff line number Diff line
@@ -406,7 +406,6 @@ ivas_error ivas_jbm_dec_tc( 
    {

        st = ( st_ivas->nSCE > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0];



        /* LFE channel decoder */

        if ( st_ivas->mc_mode == MC_MODE_MCT )

        {

            if ( st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg == NULL ) // ToDo: this is missing in ivas_dec() -> TBV
@@ -414,11 +413,9 @@ ivas_error ivas_jbm_dec_tc( 
                st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg = st_ivas->hCPE[1]->hCoreCoder[0]->hTcxCfg;

            }



            /* LFE channel decoder */

            ivas_lfe_dec( st_ivas->hLFE, st, output_frame, st_ivas->bfi, p_output[LFE_CHANNEL] );

        }



        if ( st_ivas->mc_mode == MC_MODE_MCT )

        {

            if ( ( error = ivas_mct_dec( st_ivas, p_output, output_frame, 0 ) ) != IVAS_ERR_OK )

            {

                return error;
@@ -455,6 +452,7 @@ ivas_error ivas_jbm_dec_tc( 
        }

        else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX )

        {

            /* LFE channel decoder */

            ivas_lfe_dec( st_ivas->hLFE, st, output_frame, st_ivas->bfi, p_output[LFE_CHANNEL] );



            ivas_mc_paramupmix_dec_read_BS( st_ivas, st, st_ivas->hMCParamUpmix, &nb_bits_metadata[0] );