Commit 4c50bd8c authored by reutelhuber's avatar reutelhuber
Browse files

fix more crashes for WB, (O)MASA this time

parent c4af5ba4

lib_enc/init_enc.c

+6 −2
Original line number Diff line number Diff line
@@ -751,11 +751,15 @@ ivas_error init_encoder( 


#ifdef IGF_MEMORY_ALLOC_OPT

    igf_brate = st->total_brate;

    if ( st->element_mode == IVAS_SCE && st_ivas->hEncoderConfig->ivas_format == ISM_FORMAT )

    if ( st->element_mode == IVAS_SCE && ( st_ivas->hEncoderConfig->ivas_format == ISM_FORMAT || st_ivas->hEncoderConfig->ivas_format == MASA_ISM_FORMAT ) )

    {

        igf_brate = st->total_brate - ISM_NB_BITS_METADATA_NOMINAL * FRAMES_PER_SEC;

    }

    else if ( st->element_mode == IVAS_CPE_DFT || ( st->element_mode == IVAS_SCE && ( st_ivas->hEncoderConfig->ivas_format == SBA_FORMAT || st_ivas->hEncoderConfig->ivas_format == SBA_ISM_FORMAT || st_ivas->hEncoderConfig->ivas_format == MC_FORMAT ) ) )

    else if ( st->element_mode == IVAS_CPE_DFT || ( st->element_mode == IVAS_SCE && ( 

              st_ivas->hEncoderConfig->ivas_format == SBA_FORMAT || 

              st_ivas->hEncoderConfig->ivas_format == SBA_ISM_FORMAT || 

              st_ivas->hEncoderConfig->ivas_format == MC_FORMAT ||

              st_ivas->hEncoderConfig->ivas_format == MASA_FORMAT ) ) )

    {

        /* use nominal bitrates for DFT Stereo and (O)SBA, same as in stereo_dft_config()/ivas_spar_config() */

        if ( element_brate == IVAS_13k2 )