Commit 9387717a authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix crashes in 256 kbps modes

parent 0b4f02a3

lib_com/ivas_dirac_com.c

+6 −6
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ ivas_error ivas_dirac_config( 


        spar_dirac_split_band = min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND );

#ifdef HODIRAC

        if ( sba_order > 1 )

        if ( sba_order > 1 && ivas_total_brate > IVAS_256k )

        {

            spar_dirac_split_band = 0;

        }
@@ -174,7 +174,7 @@ ivas_error ivas_dirac_config( 
                hConfig->enc_param_start_band = spar_dirac_split_band;

            }

#ifdef HODIRAC

            if ( sba_order > 1 )

            if ( sba_order > 1  && ivas_total_brate > IVAS_240_PT_LEN )

            {

                hConfig->dec_param_estim = FALSE;

                hConfig->enc_param_start_band = 0;
@@ -376,7 +376,7 @@ ivas_error ivas_dirac_sba_config( 
        {

            hQMetaData->useLowerBandRes = 0;

#ifdef HODIRAC

            if ( !( sba_order > 1 ) )

            if ( !( sba_order > 1 && sba_total_brate > IVAS_256k) )

#endif

            {

                nbands_coded = nbands - 1; /* always combine the last two bands */
@@ -386,7 +386,7 @@ ivas_error ivas_dirac_sba_config( 
        {

            int16_t no_dirs = 1;

#ifdef HODIRAC

            if ( sba_order > 1 )

            if ( sba_order > 1 && sba_total_brate > IVAS_256k )

            {

                no_dirs = 2;

            }
@@ -491,7 +491,7 @@ ivas_error ivas_dirac_sba_config( 
            {

                int16_t no_dirs = 1;

#ifdef HODIRAC

                if ( sba_order > 1 )

                if ( sba_order > 1 && sba_total_brate > IVAS_256k )

                {

                    no_dirs = 2;

                }
@@ -529,7 +529,7 @@ ivas_error ivas_dirac_sba_config( 
            {

                hQMetaData->q_direction[i].cfg.search_effort = 1;

#ifdef HODIRAC

                if ( sba_order > 1 )

                if ( sba_order > 1 && sba_total_brate > IVAS_256k )

                {

                    hQMetaData->q_direction[i].cfg.start_band = 0;

                }

lib_dec/ivas_dirac_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -2988,8 +2988,7 @@ void ivas_dirac_dec( 
                                                              index_slot

#endif

#ifdef HODIRAC

                                                                          st_ivas->sba_analysis_order > 1 &&

                                                                  st_ivas->hDecoderConfig->ivas_total_brate > IVAS_256k

                                                                  st_ivas->sba_analysis_order > 1 && st_ivas->hDecoderConfig->ivas_total_brate > IVAS_256k

#endif

                );

            }

lib_dec/ivas_spar_md_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -3037,7 +3037,7 @@ void ivas_spar_to_dirac( 


    if ( hDirAC != NULL

#ifdef HODIRAC

         && st_ivas->sba_analysis_order <= 1

         && ( st_ivas->sba_analysis_order <= 1 || st_ivas->hDecoderConfig->ivas_total_brate < IVAS_256k )

#endif

    )

    {