Commit 1e5c3936 authored by vaclav's avatar vaclav
Browse files

harmonize init_encoder_fx()

parent a3b9d782

lib_com/prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -11052,7 +11052,7 @@ void read_next_force( 
);

#endif













ivas_error init_encoder_ivas_fx(













ivas_error init_encoder_fx(















    Encoder_State *st,          /* i/o: state structure                      */















    Encoder_Struct *st_ivas,    /* i/o: encoder state structure              */















    const Word16 idchan,        /* i  : channel ID                           */

























lib_enc/init_enc_fx.c



+64
−1178




























File changed.
Preview size limit exceeded, changes collapsed.
























lib_enc/ivas_cpe_enc_fx.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -1447,7 +1447,7 @@ ivas_error create_cpe_enc_fx(













        }















        st->mct_chan_mode = MCT_CHAN_MODE_REGULAR;















        move16();













        IF( NE_32( ( error = init_encoder_ivas_fx( st, st_ivas, n, 0, ISM_MODE_NONE, hCPE->element_brate ) ), IVAS_ERR_OK ) )













        IF( NE_32( ( error = init_encoder_fx( st, st_ivas, n, 0, ISM_MODE_NONE, hCPE->element_brate ) ), IVAS_ERR_OK ) )















        {















            return error;















        }

































lib_enc/ivas_sce_enc_fx.c



+2
−12






























Original line number
Diff line number
Diff line








@@ -474,20 +474,10 @@ ivas_error create_sce_enc_fx(













    st->max_bwidth = st_ivas->hEncoderConfig->max_bwidth;















    st->input_Fs = st_ivas->hEncoderConfig->input_Fs;





























    IF( st->element_mode == EVS_MONO )













    {













        IF( NE_32( ( error = init_encoder_fx( st, st_ivas ) ), IVAS_ERR_OK ) )













        {













            return error;













        }













    }













    ELSE













    {













        IF( NE_32( ( error = init_encoder_ivas_fx( st, st_ivas, 0, 0, st_ivas->ism_mode, hSCE->element_brate ) ), IVAS_ERR_OK ) )













    IF( NE_32( ( error = init_encoder_fx( st, st_ivas, 0, 0, st_ivas->ism_mode, hSCE->element_brate ) ), IVAS_ERR_OK ) )















    {















        return error;















    }













    }































    hSCE->hCoreCoder[0] = st;

















































lib_enc/ivas_spar_encoder_fx.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -228,7 +228,7 @@ ivas_error ivas_spar_enc_open_fx(













            hSpar->hCoreCoderVAD->mct_chan_mode = MCT_CHAN_MODE_IGNORE;















            move32();















            move32();













            IF( NE_32( ( error = init_encoder_ivas_fx( hSpar->hCoreCoderVAD, st_ivas, 0, 1, st_ivas->ism_mode, hSpar->hCoreCoderVAD->total_brate ) ), IVAS_ERR_OK ) )













            IF( NE_32( ( error = init_encoder_fx( hSpar->hCoreCoderVAD, st_ivas, 0, 1, st_ivas->ism_mode, hSpar->hCoreCoderVAD->total_brate ) ), IVAS_ERR_OK ) )















            {















                return error;















            }