Commit 78ae9df0 authored by emerit's avatar emerit
Browse files

update linked to MR33

parent ba4cea85

apps/decoder.c

+94 −10
Original line number Diff line number Diff line
@@ -567,11 +567,45 @@ int main( 
            goto cleanup;

        }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        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

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

        {

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

            goto cleanup;

        }

#endif



#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( *hHrtfTD != NULL ) && ( error = load_reverb_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

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

        {

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

            goto cleanup;

        }

#endif

#endif



#ifdef FIX_POINT_HRTF_FILE_FORMAT

        IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
@@ -584,11 +618,27 @@ int main( 
            goto cleanup;

        }



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



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

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

                goto cleanup;

            }

            else

            {

                destroy_SetOfHRTF( hSetOfHRTF );

            }

        }

#else

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

        {

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

            goto cleanup;

        }

#endif



#ifdef FIX_POINT_HRTF_FILE_FORMAT

        IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
@@ -601,11 +651,27 @@ int main( 
            goto cleanup;

        }





#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, 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_fastconv_hrtf( hHrtfFastConv );

            }

        }

#else

        if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )

        {

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

            goto cleanup;

        }

#endif



#ifdef FIX_POINT_HRTF_FILE_FORMAT

        IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
@@ -618,11 +684,26 @@ int main( 
            goto cleanup;

        }



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, 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_parambin_hrtf( hHrtfParambin );

            }

        }

#else

        if ( ( error = load_parambin_HRTF_from_binary( hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )

        {

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

            goto cleanup;

        }

#endif

    }

#endif

    /*------------------------------------------------------------------------------------------*
@@ -706,11 +787,13 @@ cleanup: 
        IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

#endif

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

#ifdef FIX_POINT_HRTF_FILE_FORMAT

        if ( hHrtfTD )

            dealloc_HRTF_binary( *hHrtfTD );

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( hHrtfTD != NULL )

        {

            destroy_td_hrtf( hHrtfTD );

        }

#else

        dealloc_HRTF_binary( hHrtfTD );

        dealloc_HRTF_binary( *hHrtfTD );

#endif

#ifdef FIX_POINT_HRTF_FILE_FORMAT

        IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
@@ -718,12 +801,13 @@ cleanup: 
        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;

#endif

        IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );

#ifdef FIX_POINT_HRTF_FILE_FORMAT

        if ( hSetOfHRTF )

            destroy_SetOfHRTF( *hSetOfHRTF );

#else

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( hSetOfHRTF != NULL )

        {

            destroy_SetOfHRTF( hSetOfHRTF );

#endif

        }

#else

        destroy_SetOfHRTF( *hSetOfHRTF );

#endif

    }

apps/renderer.c

+11 −0
Original line number Diff line number Diff line
@@ -959,6 +959,17 @@ int main( 
                }

            }



#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

            if ( ( hHrtfTD != NULL ) && ( error = load_reverb_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;

                }

            }

#endif



            if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hHrtfCrend ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_Rend_GetHrtfCRendHandle failed: %s\n\n", ivas_error_to_string( error ) );