Commit 5130d3d0 authored by emerit's avatar emerit
Browse files

on going

parent 4f6ea96c

apps/decoder.c

+5 −8
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ int main( 
        }

    }



#ifndef FIX_POINT_HRTF_FILE_FORMAT

#ifndef FIX_POINT_HRTF_FILE_OPTIM

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

     * Load HRTF binary file data

     *------------------------------------------------------------------------------------------*/
@@ -686,6 +686,7 @@ cleanup: 
#endif

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

#ifdef FIX_POINT_HRTF_FILE_FORMAT

        if ( hHrtfTD )

            dealloc_HRTF_binary( *hHrtfTD );

#else

        dealloc_HRTF_binary( hHrtfTD );
@@ -697,6 +698,7 @@ cleanup: 
#endif

        IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );

#ifdef FIX_POINT_HRTF_FILE_FORMAT

        if ( hSetOfHRTF )

            destroy_SetOfHRTF( *hSetOfHRTF );

#else

        destroy_SetOfHRTF( hSetOfHRTF );
@@ -2714,11 +2716,6 @@ static ivas_error load_hrtf_from_file( 
            return error;

        }



        if ( ( error = IVAS_DEC_HRTF_binary_open( hIvasDec, binaural_renderer_sec ) ) != IVAS_ERR_OK )

        {

            return error;

        }



        if ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_TDREND || binaural_renderer_sec == IVAS_BIN_RENDERER_TYPE_TDREND || binaural_renderer == IVAS_BIN_RENDERER_TYPE_DEFAULT )

        {

            if ( ( error = IVAS_DEC_GetHrtfTDrendHandle( hIvasDec, &hHrtfBinary->hHrtfTD ) ) != IVAS_ERR_OK )

lib_com/options.h

+7 −17
Original line number Diff line number Diff line
@@ -85,30 +85,20 @@ 
#define CR_2109_to_2112_cd0_ce0  /* This is related to the CRs include in the 26.444 package of 21-12. Concerns lead_deindexing and  */

#define FIX_QMETADATA_PENALTY /* Nokia: transform penalty calculation in qmetadata into integer operations */



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

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

// #define FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM                     /* FhG: issue 1123: update FastConv and ParamBin ROM tables and scripts to generate 16 bit tables instead of float */

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

// #define FIX_POINT_CREND_HRTF_FILE_FORMAT

//#define FIX_TDREND_HRTF_FILE_FORMAT

//#define FIX_POINT_HRTF_FILE_OPTIM

#ifdef FIX_POINT_HRTF_FILE_OPTIM

#define FIX_POINT_HRTF_FILE_FORMAT

#endif

#ifdef FIX_POINT_HRTF_FILE_FORMAT_REVERB

#define FIX_POINT_HRTF_FILE_FORMAT

#define FIX_POINT_HRTF_FILE_OPTIM

#endif

#ifdef FIX_POINT_CREND_HRTF_FILE_FORMAT

#define FIX_POINT_HRTF_FILE_FORMAT

#define FIX_POINT_HRTF_FILE_OPTIM

#endif

#ifdef FIX_TDREND_HRTF_FILE_FORMAT

#ifdef FIX_POINT_HRTF_FILE_OPTIM

#define FIX_POINT_HRTF_FILE_FORMAT

#define FIX_POINT_HRTF_FILE_OPTIM

#endif

#ifdef FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

#define FIX_POINT_HRTF_FILE_FORMAT

#define FIX_POINT_HRTF_FILE_OPTIM

#ifdef FIX_POINT_HRTF_FILE_FORMAT

#define FIX_POINT_HRTF_FILE_FORMAT_REVERB

#define FIX_POINT_CREND_HRTF_FILE_FORMAT

#define FIX_TDREND_HRTF_FILE_FORMAT

#define FIX_1123_FASTCONV_PARAMBIN_16BIT_ROM

#endif



#define FIX_1013_CRASH_HQ_CORE_DEC /* Ittiam: Saturation added on the lines of EVS */

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2451,7 +2451,7 @@ ivas_error ivas_init_decoder_fx( 
#ifdef FIX_POINT_HRTF_FILE_FORMAT_REVERB

#ifdef FIX_POINT_HRTF_FILE_OPTIM

        IF( NE_32( ( 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, 0 ) ),

                                                  st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ),

                   IVAS_ERR_OK ) )

        {

            return error;

lib_dec/ivas_ism_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
            /* Open Crend Binaural renderer */

#ifdef FIX_POINT_HRTF_FILE_FORMAT_REVERB

#ifdef FIX_POINT_HRTF_FILE_OPTIM

            IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0 ) ), IVAS_ERR_OK ) )

            IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )

#else

            IF( NE_32( ( 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, 0 ) ), IVAS_ERR_OK ) )

#endif

lib_dec/ivas_mct_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1534,7 +1534,7 @@ static ivas_error ivas_mc_dec_reconfig_fx( 
            {

#ifdef FIX_POINT_HRTF_FILE_FORMAT_REVERB

#ifdef FIX_POINT_HRTF_FILE_OPTIM

                IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0 ) ), IVAS_ERR_OK ) )

                IF( NE_32( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )

#else

                IF( NE_32( ( 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, 0 ) ), IVAS_ERR_OK ) )

#endif