Commit 724faab7 authored by emerit's avatar emerit
Browse files

remove unecessary render type and add custom binary file for fastconv and param brir

parent 1e518d7c

lib_util/hrtf_file_reader.c

+8 −1
Original line number Diff line number Diff line
@@ -193,7 +193,11 @@ static ivas_error check_hrtf_binary_header( 
    /* Check the renderer type */

    if ( ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_MIXER_CONV ) && ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM ) &&

         ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_FASTCONV ) && ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ) &&

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

         ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_PARAMETRIC ) &&

#else

         ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_PARAMETRIC ) && ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM ) &&

#endif

         ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_OBJECTS_TD ) && ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_REVERB_ALL ) )

    {

        return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Header of HRTF binary file not compliant (renderer type)" );
@@ -2536,8 +2540,11 @@ ivas_error load_parambin_HRTF_from_binary( 
            free( hrtf_data );

            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "HRTF binary file not compliant (number of HRTF)" );

        }



#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

        if ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_PARAMETRIC ) /* Parametric binauralizer data is represented as single entity */

#else

        if ( hrtf_header.rend_type == HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM ) /* Parametric binauralizer data is represented as single entity */

#endif

        {

            if ( fread( hrtf_data, 1, hrtf_header.data_size, f_hrtf ) != hrtf_header.data_size )

            {

lib_util/hrtf_file_reader.h

+2 −0
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ typedef enum 
    HRTF_READER_RENDERER_BINAURAL_FASTCONV,

    HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM,

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC,

#ifndef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM,

#endif

    HRTF_READER_RENDERER_BINAURAL_OBJECTS_TD,

    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV,

    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM,

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+11 −2
Original line number Diff line number Diff line
@@ -1398,11 +1398,20 @@ char *create_hrtf_parametric( int32_t *hrtf_size ) 


        if ( is_fx == 1 )

        {

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

            *( (int32_t *) ( hrtf_wptr ) ) = HRTF_READER_RENDERER_BINAURAL_PARAMETRIC + DEFAULT_BIN_FILE_FX_FLAG;

#else

            *( (int32_t *) ( hrtf_wptr ) ) = HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM + DEFAULT_BIN_FILE_FX_FLAG;

#endif

        }

        else

        {

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

            *( (int32_t *) ( hrtf_wptr ) ) = HRTF_READER_RENDERER_BINAURAL_PARAMETRIC;

#else

            *( (int32_t *) ( hrtf_wptr ) ) = HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM;



#endif

        }

        hrtf_wptr += sizeof( int32_t );
@@ -1546,7 +1555,7 @@ char *create_hrtf_parametric( int32_t *hrtf_size ) 
    hrtf_wptr = hrtf;



    // Renderer type - we use only parametric room type here to cover both cases

    *( (int32_t *) ( hrtf_wptr ) ) = HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM;

    *( (int32_t *) ( hrtf_wptr ) ) = HRTF_READER_RENDERER_BINAURAL_PARAMETRIC;

    hrtf_wptr += sizeof( int32_t );



    // Decoder output format - not relevant parametric binaural renderer
@@ -2306,7 +2315,7 @@ int16_t check_hrtf_data( HRTF_READER_RENDERER_TYPE rend_type, BINAURAL_INPUT_AUD 


    if ( rend_type == HRTF_READER_RENDERER_BINAURAL_OBJECTS_TD || rend_type == HRTF_READER_RENDERER_BINAURAL_REVERB_ALL ||

         rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV || rend_type == HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM ||

         rend_type == HRTF_READER_RENDERER_BINAURAL_PARAMETRIC || rend_type == HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM )

         rend_type == HRTF_READER_RENDERER_BINAURAL_PARAMETRIC )

    {

        return 0;

    }