Commit 17eb7a5b 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 55e930ae

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ 
//#define USE_TDREND_16BIT_ROM                            /* if desactivated old rom hrtf tables is used.  when active some tests case with 4 ISM fail due to owerflow in round_fixed function */

//#define USE_FASTCONV_PARAMBIN_16BIT_ROM                 /* if desactivated old rom hrtf tables is used */

#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 - the code will be removed once HRTF updates are stable

#endif

#define NONBE_1377_REND_DIRATT_CONF                     /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */

#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK       /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/

lib_dec/ivas_masa_dec_fx.c

+6 −13
Original line number Diff line number Diff line
@@ -1807,10 +1807,6 @@ ivas_error ivas_masa_dec_reconfigure_fx( 
        tmp = extract_l( Mpy_32_32( st_ivas->hSCE[sce_id]->element_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) );

        num_bits = add( num_bits, tmp );



#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

        test();

        test();

        test();
@@ -1821,9 +1817,6 @@ ivas_error ivas_masa_dec_reconfigure_fx( 
                return error;

            }

        }

#ifdef FIX_HRTF_LOAD_KEEP_BE

        }

#endif

    }



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

lib_dec/lib_dec_fx.c

+0 −20
Original line number Diff line number Diff line
@@ -3688,26 +3688,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_fx( st_ivas, DIRAC_RECONFIGURE ) ) != IVAS_ERR_OK )

                        {

                            return error;

                        }

                    }

                }

#endif

                IF( ( error = ivas_jbm_dec_flush_renderer_fx( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &st_ivas->hIntSetup, mc_mode_old, ism_mode_old, &hIvasDec->nSamplesFlushed, hIvasDec->flushbuffer ) ) != IVAS_ERR_OK )

                {

                    return error;