Commit fcccecdb authored by emerit's avatar emerit
Browse files

fix switch

parent 41476abd

apps/decoder.c

+2 −1
Original line number Diff line number Diff line
@@ -783,12 +783,13 @@ int main( 
            }

        }

#endif

#endif



        if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }

#endif



        if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )

        {

lib_com/options.h

+7 −2
Original line number Diff line number Diff line
@@ -188,6 +188,13 @@ 


//#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */

#ifdef USE_NEW_HRTF_BINARY_FILE_FORMAT

#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES			  /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers	*/

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#define	FIX_638_ENERGIE_IAC_ROM_TABLES						  /* Orange: Missing left/right and coherence late reverb tables in binary format */

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#define NONBE_FIX_AVG_IAC_CLDFB_REVERB

#endif

#endif

#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange: Missing left/right and coherence late reverb tables in binary format*/

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#define NONBE_FIX_AVG_IAC_CLDFB_REVERB
@@ -206,8 +213,6 @@ 
#define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */

#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */

#define NONBE_FIX_951_MCMASA_5MS_RENDERING                    /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2kbps to BINAURAL */

#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES			  /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers	*/

#define	FIX_638_ENERGIE_IAC_ROM_TABLES						  /* Orange: Missing left/right and coherence late reverb tables in binary format */

#define NONBE_FIX_979_OSBA_STEREO_5MS                   /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */

#define FIX_983_DISC_ISM_DIGEST_NUM_OBJS                /* FhG: issue #983: the discrete ISM digest function uses the wrong number of objects */

#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

lib_dec/ivas_ism_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
            /* Open Crend Binaural renderer */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

            if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hSplitBinRend.splitrend.multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs, ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )

#endif

lib_dec/ivas_mct_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ static ivas_error ivas_mc_dec_reconfig( 
            {

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

                if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hSplitBinRend.splitrend.multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )

                if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )

#else

                if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs, ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )

#endif

lib_rend/ivas_stat_rend.h

+8 −5
Original line number Diff line number Diff line
@@ -1338,9 +1338,12 @@ typedef struct ivas_hrtfs_parambin_struct 
#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

typedef struct ivas_hrtfs_statistics_struct

{

    float *average_energy_l;

    float *average_energy_r;

    float *inter_aural_coherence;

    const float *average_energy_l;

    const float *average_energy_r;

    const float *inter_aural_coherence;

    float *average_energy_l_dyn;

    float *average_energy_r_dyn;

    float *inter_aural_coherence_dyn;

    int16_t fromROM; /*  Flag that indicates that the pointers point to tables in ROM (controls init/dealloc).*/

} HRTFS_STATISTICS, *HRTFS_STATISTICS_HANDLE;

#endif