Commit 78539cab authored by vaclav's avatar vaclav
Browse files

remove FIX_HRTF_LOAD_KEEP_BE - it is now obsolete and even causes errors in OMASA br switching

parent def6779d

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ 
#define CHECK_BE_USING_OLD_ROM_TABLES_ONLY

#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */

#define FIX_HRTF_LOAD                                   /* VA: issue 1187: fix memory issue when HRTFs are loaded from a binary file */

/*#define FIX_HRTF_LOAD_KEEP_BE*/                           // VA: temp. hack to keep BE when FIX_HRTF_LOAD is activated

#ifdef CHECK_BE_USING_OLD_ROM_TABLES_ONLY

#define USE_NEW_CREND_ROM_TABLE

#ifdef USE_NEW_CREND_ROM_TABLE

lib_dec/ivas_masa_dec.c

+3 −10
Original line number Diff line number Diff line
@@ -1407,10 +1407,6 @@ ivas_error ivas_masa_dec_reconfigure( 
        sts[0]->bit_stream = bit_stream + num_bits;

        num_bits += (int16_t) ( st_ivas->hSCE[sce_id]->element_brate / FRAMES_PER_SEC );



#ifdef FIX_HRTF_LOAD_KEEP_BE

        if ( ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs ) >= st_ivas->hTcBuffer->n_samples_granularity )

        {

#endif

        if ( ( st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) && st_ivas->hDiracDecBin[0] != NULL )

        {

            if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE ) ) != IVAS_ERR_OK )
@@ -1418,9 +1414,6 @@ ivas_error ivas_masa_dec_reconfigure( 
                return error;

            }

        }

#ifdef FIX_HRTF_LOAD_KEEP_BE

        }

#endif

    }



    for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )

lib_dec/lib_dec.c

+0 −21
Original line number Diff line number Diff line
@@ -1051,27 +1051,6 @@ ivas_error IVAS_DEC_ReadFormat( 


            if ( tc_granularity_new < st_ivas->hTcBuffer->n_samples_granularity )

            {

#ifdef FIX_HRTF_LOAD_KEEP_BE

                if ( ivas_format_old == MASA_ISM_FORMAT && ism_mode_old == ISM_MASA_MODE_DISC )

                {

                    if ( st_ivas->hDiracDecBin[0] != 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[0]->hTdDecorr ), &( st_ivas->hDiracDecBin[0]->useTdDecorr ) ) ) != IVAS_ERR_OK )

                        {

                            return error;

                        }

                    }



                    if ( ( st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) && st_ivas->hDiracDecBin[0] != NULL )

                    {

                        if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE ) ) != IVAS_ERR_OK )

                        {

                            return error;

                        }

                    }

                }

#endif



                if ( ( error = ivas_jbm_dec_flush_renderer( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &st_ivas->hIntSetup, mc_mode_old, ism_mode_old, &hIvasDec->nSamplesFlushed, pcm_type_API_to_internal( hIvasDec->pcmType ), hIvasDec->flushbuffer ) ) != IVAS_ERR_OK )

                {

                    return error;