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

harmonize more init. calls

parent 5e3e0189

lib_dec/ivas_init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -523,6 +523,8 @@ ivas_error ivas_init_decoder_front( 
    st_ivas->mc_mode = MC_MODE_NONE;

    st_ivas->sba_mode = SBA_MODE_NONE;



    st_ivas->sba_dirac_stereo_flag = 0;

    

    /* HRTF binauralization latency in ns */

    st_ivas->binaural_latency_ns = 0;
@@ -677,6 +679,7 @@ ivas_error ivas_init_decoder( 
        }

    }



#if 0

    /*-----------------------------------------------------------------*

     * Dummy pointers to decoder handles

     *-----------------------------------------------------------------*/
@@ -728,6 +731,7 @@ ivas_error ivas_init_decoder( 
    st_ivas->hMonoDmxRenderer = NULL;   /* Mono downmix renderer */

    st_ivas->hHrtf = NULL;              /* Crend hrtf data */

    st_ivas->hCrend = NULL;             /* Crend renderer */

#endif



    /*-----------------------------------------------------------------*

     * Allocate and initalize SCE/CPE and other handles

lib_dec/lib_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -146,9 +146,12 @@ ivas_error IVAS_DEC_Open( 
    hIvasDec->prev_ft_speech = 1; /* RXDTX handeler previous frametype flag for G.192 format AMRWB SID_FIRST detection */

    hIvasDec->CNG = 0;            /* RXDTX handler CNG = 1, no CNG = 0*/



    /* initialize pointers to handles */

    ivas_initialize_handles_dec( hIvasDec->st_ivas );



    /* high-level set parameters */

    if ( mode == IVAS_DEC_MODE_EVS )

    {

        /* EVS - do alloc etc. */

        hIvasDec->st_ivas->codec_mode = 0; /* unknown before first frame */

        hIvasDec->st_ivas->element_mode_init = EVS_MONO;

        hIvasDec->st_ivas->ivas_format = MONO_FORMAT;
@@ -170,9 +173,6 @@ ivas_error IVAS_DEC_Open( 
        hIvasDec->st_ivas->ini_active_frame = 0;

        hIvasDec->st_ivas->writeFECoffset = 0;



        /*initialize pointers*/

        ivas_initialize_handles_dec( hIvasDec->st_ivas );



        hIvasDec->st_ivas->ism_mode = ISM_MODE_NONE;

        hIvasDec->st_ivas->sba_mode = SBA_MODE_NONE;

        hIvasDec->st_ivas->mc_mode = MC_MODE_NONE;

lib_enc/lib_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ static ivas_error configureEncoder( 
        }

    }



    if ( hEncoderConfig->ivas_total_brate == 13200 && hEncoderConfig->Opt_RF_ON == 1 )

    if ( hEncoderConfig->ivas_total_brate == IVAS_13k2 && hEncoderConfig->Opt_RF_ON == 1 )

    {

        st_ivas->codec_mode = MODE2;

    }