Commit 6dfad9d5 authored by vaclav's avatar vaclav
Browse files

revert past change around "element_mode_init = IVAS_CPE_MDCT"

parent 31d931b9

lib_enc/ivas_corecoder_enc_reconfig.c

+5 −0
Original line number Diff line number Diff line
@@ -352,6 +352,11 @@ ivas_error ivas_corecoder_enc_reconfig( 
            for ( cpe_id = nCPE_existing; cpe_id < st_ivas->nCPE; cpe_id++ )

            {

#ifdef MC_BITRATE_SWITCHING

                if ( st_ivas->mc_mode == MC_MODE_MCMASA && st_ivas->hMcMasa->separateChannelEnabled )

                {

                    st_ivas->hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;

                }



                if ( ( error = create_cpe_enc( st_ivas, cpe_id, brate_CPE ) ) != IVAS_ERR_OK )

#else

                if ( ( error = create_cpe_enc( st_ivas, cpe_id, ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS ) ) != IVAS_ERR_OK )

lib_enc/ivas_mct_enc.c

+0 −7
Original line number Diff line number Diff line
@@ -725,13 +725,6 @@ static ivas_error ivas_mc_enc_reconfig( 
            }

        }



#ifdef MC_BITRATE_SWITCHING

        if ( st_ivas->mc_mode == MC_MODE_MCMASA && st_ivas->hMcMasa->separateChannelEnabled )

        {

            st_ivas->hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;

        }

#endif



        if ( st_ivas->hParamMC != NULL )

        {

            ivas_param_mc_enc_close( st_ivas->hParamMC, st_ivas->hEncoderConfig->input_Fs );