Commit 5d8311ca authored by emerit's avatar emerit
Browse files

version on test

parent 94783724

lib_com/options.h

+4 −1
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ 
#define FIX_852_FIX_HANDLE_DEREF                        /* VA: issue 852: Fix missing handle dereferencing of hIsmMetadaData in ivas_ism_metadata_close() */

#define FIX_901_PARAMMC_DEAD_CODE                       /* FhG: issue 901: remove dead ParamMC code             */

#define FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT          /* ORANGE : add crend changes and fix point binaural rom and hrtf binary file format */

//#define FIX_PARAM_CHANGES_AND_HRTF_FILE_FORMAT          /* ORANGE : add parametric binaural renderer changes and fix point binaural rom and hrtf binary file format */

#define FIX_TDREND_HRTF_FILE_FORMAT

#define FIX_TDREND_HRTF_FILE_FORMAT_OR



/* #################### End BE switches ################################## */

lib_dec/ivas_binRenderer_internal.c

+0 −29
Original line number Diff line number Diff line
@@ -2503,35 +2503,6 @@ void ivas_binaural_hrtf_close( 
    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_FOA, FOA_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_FOA, FOA_CHANNELS, allocate_init_flag );



#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

#ifdef IVAS_FLOAT_FIXED

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRReal_fx, HRTF_LS_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRImag_fx, HRTF_LS_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRReal_fx, HRTF_LS_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRImag_fx, HRTF_LS_CHANNELS, allocate_init_flag );



    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftBRIRReal_fx, HRTF_LS_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftBRIRImag_fx, HRTF_LS_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightBRIRReal_fx, HRTF_LS_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightBRIRImag_fx, HRTF_LS_CHANNELS, allocate_init_flag );



    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRReal_HOA3_fx, HOA3_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRImag_HOA3_fx, HOA3_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRReal_HOA3_fx, HOA3_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRImag_HOA3_fx, HOA3_CHANNELS, allocate_init_flag );



    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRReal_HOA2_fx, HOA2_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRImag_HOA2_fx, HOA2_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRReal_HOA2_fx, HOA2_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRImag_HOA2_fx, HOA2_CHANNELS, allocate_init_flag );



    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRReal_FOA_fx, FOA_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRImag_FOA_fx, FOA_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRReal_FOA_fx, FOA_CHANNELS, allocate_init_flag );

    ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRImag_FOA_fx, FOA_CHANNELS, allocate_init_flag );

#endif

#endif



    return;

}

#endif

lib_dec/ivas_dirac_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1620,7 +1620,11 @@ ivas_error ivas_dirac_dec_config_fx( 


            IF( st_ivas->hDiracDecBin == NULL )

            {

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

                IF( ( error = ivas_dirac_dec_init_binaural_data_fx( st_ivas, &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

#else

                IF( ( error = ivas_dirac_dec_init_binaural_data_fx( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }

lib_dec/ivas_init_dec.c

+2 −5
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ ivas_error ivas_dec_setup( 
            {

                st_ivas->ism_mode = ISM_SBA_MODE_DISC;

            }

            else

            ELSE

            {

                st_ivas->ism_mode = ISM_MODE_NONE;

            }
@@ -3813,16 +3813,13 @@ ivas_error ivas_init_decoder( 
#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

        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 ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#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 ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }

#endif



        st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;

lib_dec/ivas_ism_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -259,7 +259,11 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
                return error;

            }



#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

            IF( ( error = ivas_dirac_dec_init_binaural_data_fx( st_ivas, &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

#else

            IF( ( error = ivas_dirac_dec_init_binaural_data_fx( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }
@@ -290,7 +294,11 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
                return error;

            }



#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

            IF( ( error = ivas_dirac_dec_init_binaural_data_fx( st_ivas, &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

#else

            IF( ( error = ivas_dirac_dec_init_binaural_data_fx( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }