Commit 919528fb authored by emerit's avatar emerit
Browse files

fix error tests vector because of diff between binary file format

parent 87802938

apps/decoder.c

+19 −1
Original line number Diff line number Diff line
@@ -765,10 +765,28 @@ int main( 
        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

#ifdef FIX_OLD_BINARY_FORMAT

                hrtfFileReader_close( &hrtfReader );

                strcat( arg.hrtfFileName, "new" );

                if ( hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                    goto cleanup;

                }

                if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

                {

                    if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                    {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                        goto cleanup;

                    }

                    else

                    {

                destroy_td_hrtf( hHrtfTD );

                    }

                }

#else

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                goto cleanup;

#endif

            }

apps/renderer.c

+22 −0
Original line number Diff line number Diff line
@@ -1077,6 +1077,18 @@ int main( 
            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {

#ifdef FIX_OLD_BINARY_FORMAT

                    hrtfFileReader_close( &hrtfFileReader );

                    strcat( args.customHrtfFilePath, "new" );

                    if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )

                    {

                    fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );

                    goto cleanup;

                    }

                    if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )

                    {

                        if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                        {

                            fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );

                            goto cleanup;

                        }
@@ -1085,6 +1097,16 @@ int main( 
                            destroy_td_hrtf( hHrtfTD );

                        }

                    }

#else

                    fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );

                    goto cleanup;

#endif

                }

                else

                {

                    destroy_td_hrtf( hHrtfTD );

                }

            }



#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

            if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )

scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c

+15 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ 
#endif

#define DEFAULT_INPUT_ROM_FILE "ivas_binaural"



#ifdef FIX_OLD_BINARY_FORMAT

#define DEFAULT_BIN_FILE_EXT_OUT ".binnew"

#endif

#define DEFAULT_BIN_FILE_EXT ".bin"



#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
@@ -311,13 +314,25 @@ int main( int argc, char *argv[] ) 


    for ( k = 0; k < nb_freq; k++ )

    {

#ifdef FIX_OLD_BINARY_FORMAT

        full_out_path = (char *) malloc( sizeof( char ) * ( strlen( output_path ) + 1 + strlen( output_file_name ) + 6 + strlen( DEFAULT_BIN_FILE_EXT_OUT ) + 1 ) );

#else

        full_out_path = (char *) malloc( sizeof( char ) * ( strlen( output_path ) + 1 + strlen( output_file_name ) + 6 + strlen( DEFAULT_BIN_FILE_EXT ) + 1 ) );

#endif

        if ( full_out_path )

        {

#ifdef FIX_OLD_BINARY_FORMAT

#ifdef _WIN32

            sprintf( full_out_path, "%s\\%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT_OUT );

#else

            sprintf( full_out_path, "%s/%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT_OUT );

#endif

#else

#ifdef _WIN32

            sprintf( full_out_path, "%s\\%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT );

#else

            sprintf( full_out_path, "%s/%s_%dkHz%s", output_path, output_file_name, freq_ptr[k] / 1000, DEFAULT_BIN_FILE_EXT );

#endif

#endif

        }

        else