Commit 002f1c41 authored by emerit's avatar emerit
Browse files

remove unexessary enum

parent a6e5f3f3

lib_util/hrtf_file_reader.c

+2 −2
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static ivas_error check_hrtf_binary_header( 
#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

    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 ) &&

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

         ( hrtf_header->rend_type != HRTF_READER_RENDERER_BINAURAL_PARAMETRIC ) &&

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

#else

    if ( ( hrtf_header->rend_type != RENDERER_BINAURAL_MIXER_CONV ) && ( hrtf_header->rend_type != RENDERER_BINAURAL_MIXER_CONV_ROOM ) &&
@@ -2843,7 +2843,7 @@ ivas_error load_parambin_HRTF_from_binary( 
        }



#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

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

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

#else

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

#endif

lib_util/hrtf_file_reader.h

+4 −2
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ typedef enum 
    HRTF_READER_RENDERER_BINAURAL_FASTCONV,

    HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM,

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC,

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM,

#ifndef FIX_CREND_CHANGES_AND_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

+9 −2
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ const HRTF_READER_RENDERER_TYPE rend_types[IVAS_NB_RENDERER_TYPE] = { 
    HRTF_READER_RENDERER_BINAURAL_FASTCONV,

    HRTF_READER_RENDERER_BINAURAL_FASTCONV_ROOM,

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC,

#ifndef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

    HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM,

#endif

    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV,

    HRTF_READER_RENDERER_BINAURAL_MIXER_CONV_ROOM,

    HRTF_READER_RENDERER_BINAURAL_OBJECTS_TD,
@@ -1398,11 +1401,11 @@ char *create_hrtf_parametric( int32_t *hrtf_size ) 


        if ( is_fx == 1 )

        {

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

            *( (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;

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

        }

        hrtf_wptr += sizeof( int32_t );
@@ -2306,7 +2309,11 @@ 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 ||

#ifdef FIX_CREND_CHANGES_AND_HRTF_FILE_FORMAT

         rend_type == HRTF_READER_RENDERER_BINAURAL_PARAMETRIC )

#else

         rend_type == HRTF_READER_RENDERER_BINAURAL_PARAMETRIC || rend_type == HRTF_READER_RENDERER_BINAURAL_PARAMETRIC_ROOM )

#endif

    {

        return 0;

    }