Commit 30322ca2 authored by vaclav's avatar vaclav
Browse files

Merge branch 'simplification-in-set_bw_mct()' into 'main' 

Bit-exact simplification in set_bw_mct()

See merge request !309
parents ae0c7a44 f7421b0c

lib_enc/bw_detect.c

+6 −6
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ int16_t set_bw_mct( 
    const int16_t nCPE                   /* i  : number of CPEs              */

)

{

    Encoder_State *sts[MCT_MAX_CHANNELS];

    Encoder_State *st;

    int16_t ch, cpe_id;

    int16_t mct_bwidth, last_mct_bwidth, bw_changed;
@@ -671,13 +671,13 @@ int16_t set_bw_mct( 
    {

        for ( ch = 0; ch < CPE_CHANNELS; ch++ )

        {

            sts[ch] = hCPE[cpe_id]->hCoreCoder[ch];

            if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )

            st = hCPE[cpe_id]->hCoreCoder[ch];

            if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )

            {

                continue;

            }



            mct_bwidth = max( mct_bwidth, sts[ch]->input_bwidth );

            mct_bwidth = max( mct_bwidth, st->input_bwidth );

        }

    }
@@ -690,8 +690,8 @@ int16_t set_bw_mct( 
        {

            for ( ch = 0; ch < CPE_CHANNELS; ch++ )

            {

                sts[ch] = hCPE[cpe_id]->hCoreCoder[ch];

                sts[ch]->bwidth = mct_bwidth;

                st = hCPE[cpe_id]->hCoreCoder[ch];

                st->bwidth = mct_bwidth;

            }

        }

    }