Commit 9983a470 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch '744_step3_code_changes' into... 

Merge branch '744_step3_code_changes' into 922-use-precomputed-HRTF-average-LR-energies-and-IAC-in-all-renderers
parents 580bb66f ec1f3d2a

apps/decoder.c

+2 −10
Original line number Diff line number Diff line
@@ -747,11 +747,7 @@ int main( 
                    }

                    else

                    {

                        if ( ( error = destroy_td_hrtf( hHrtfTD ) ) != IVAS_ERR_OK )

                        {

                            fprintf( stderr, "\ndestroy_td_hrtf() failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                            goto cleanup;

                        }

                        destroy_td_hrtf( hHrtfTD );

                    }

                }

#else
@@ -761,11 +757,7 @@ int main( 
            }

            else

            {

                if ( ( error = destroy_td_hrtf( hHrtfTD ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\ndestroy_td_hrtf() failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;

                }

                destroy_td_hrtf( hHrtfTD );

            }

        }

#else

apps/renderer.c

+1 −5
Original line number Diff line number Diff line
@@ -1078,11 +1078,7 @@ int main( 
                }

                else

                {

                    if ( ( error = destroy_td_hrtf( hHrtfTD ) ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\ndestroy_td_hrtf() failed: \n\n" /*, IVAS_DEC_GetErrorMessage( error )*/ );

                        goto cleanup;

                    }

                    destroy_td_hrtf( hHrtfTD );

                }

            }

lib_util/hrtf_file_reader.c

+2 −0
Original line number Diff line number Diff line
@@ -558,6 +558,7 @@ static ivas_error set_default_reverb_iac_energy( 
}

#endif



#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES



/*-------------------------------------------------------------------*

 * load_reverb_from_binary()
@@ -715,6 +716,7 @@ static ivas_error load_reverb_from_binary( 


    return IVAS_ERR_OK;

}

#endif



/*---------------------------------------------------------------------*

 * load_reverb_binary()

lib_util/hrtf_file_reader.h

+0 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ 
#define IVAS_HRTF_FILE_READER_H



#include "common_api_types.h"

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

#include "ivas_cnst.h"

#endif



typedef struct hrtfFileReader hrtfFileReader;