Commit ecf09edb authored by emerit's avatar emerit
Browse files

Fix test failed because of hrir binary file format difference

parent 3b9bc7c3

apps/decoder.c

+23 −0
Original line number Diff line number Diff line
@@ -797,6 +797,17 @@ int main( 
#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )

        {

#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 = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != 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 );
@@ -807,6 +818,18 @@ int main( 
                    destroy_SetOfHRTF( hSetOfHRTF );

                }

            }

#else

            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_SetOfHRTF( hSetOfHRTF );

            }

#endif

        }

#else

        if ( ( error = create_SetOfHRTF_from_binary( hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )

        {

apps/renderer.c

+22 −0
Original line number Diff line number Diff line
@@ -1094,6 +1094,27 @@ int main( 


            if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )

            {

#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: %s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );

                    goto cleanup;

                }

                if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )

                {

                    if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                    {

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

                        goto cleanup;

                    }

                    else

                    {

                        destroy_SetOfHRTF( hSetOfHRTF );

                    }

                }

#else

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {

                    fprintf( stderr, "\nError in loading HRTF binary file %s:%s \n\n", args.customHrtfFilePath, ivas_error_to_string( error ) );
@@ -1103,6 +1124,7 @@ int main( 
                {

                    destroy_SetOfHRTF( hSetOfHRTF );

                }

#endif

            }



            if ( ( error = IVAS_REND_GetHrtfFastConvHandle( hIvasRend, &hHrtfFastConv ) ) != IVAS_ERR_OK )

lib_util/hrtf_file_reader.c

+10 −0
Original line number Diff line number Diff line
@@ -1209,6 +1209,16 @@ static ivas_error create_HRTF_from_rawdata( 
    }

#endif



#ifdef FIX_OLD_BINARY_FORMAT

    for ( i = 0; i < ( *hHRTF )->max_num_ir; i++ )

    {

        if ( ( *hHRTF )->inv_diffuse_weight[1][i] != ( *hHRTF )->inv_diffuse_weight[0][i] )

        {

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file format not compliant (BINAURAL_CHANNELS)" );

        }

    }

#endif



    /* max_total_num_fsamp_per_iteration */

    max_total_num_fsamp_per_iteration = *( (uint16_t *) ( hrtf_data_rptr ) );

    hrtf_data_rptr += sizeof( uint16_t );