Commit 2f12af7b authored by vaclav's avatar vaclav
Browse files

update OMASA for FIX_417_TD_DECORR_BRATE_SW (fixes crash for BR switching)

parent 0badcc34

lib_dec/ivas_masa_dec.c

+26 −17
Original line number Diff line number Diff line
@@ -1427,6 +1427,11 @@ ivas_error ivas_masa_dec_reconfigure( 
        }

    }



#ifdef MASA_AND_OBJECTS

    if ( st_ivas->ivas_format != MASA_ISM_FORMAT )

    {

#endif



#ifdef FIX_417_TD_DECORR_BRATE_SW

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

         * TD Decorrelator
@@ -1454,6 +1459,10 @@ ivas_error ivas_masa_dec_reconfigure( 
         *-----------------------------------------------------------------*/

#endif



#ifdef MASA_AND_OBJECTS

    }

#endif



#ifdef MASA_AND_OBJECTS

    ism_total_brate = 0;

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->nSCE > 0 && ( st_ivas->ism_mode == ISM_MASA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ ) )

lib_dec/ivas_omasa_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -238,6 +238,17 @@ ivas_error ivas_omasa_dec_config( 


        ivas_ism_metadata_close( st_ivas->hIsmMetaData, n_MD );



#ifdef FIX_417_TD_DECORR_BRATE_SW

        /* TD Decorrelator */

        if ( st_ivas->hDiracDecBin != NULL )

        {

            if ( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( st_ivas->hDiracDecBin->hTdDecorr ), &( st_ivas->hDiracDecBin->useTdDecorr ) ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }

#endif



        /* CLDFB instances */

        if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, 2, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK )

        {