Commit c54a1e58 authored by emerit's avatar emerit
Browse files

fix decoder

parent c2ac8621

apps/decoder.c

+2 −2
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ int main( 
            }

            else

            {

                ivas_HRTF_binary_close( hHrtfTD );

                dealloc_HRTF_binary( hHrtfTD );

            }

        }

#else
@@ -926,7 +926,7 @@ cleanup: 
#endif

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

#ifdef FIX_BINARY_BINAURAL_READING

        dealloc_HRTF_binary( *hHrtfTD );

        dealloc_HRTF_binary( hHrtfTD );

#else

        dealloc_HRTF_binary( hHrtfTD );

#endif

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -176,8 +176,6 @@ 
#define FIX_BINARY_BINAURAL_READING                     /* Add support reading binaural binary file */

#define FIX_CRASH_LONG_BRIR                             /* Fix crash when long BRIR is set */





#define FIX_632_USAN_ERROR_NULL_POINTER                /* FhG: issue 632 USAN offset to null pointer proto_diffuse_buffer_f in dirac rendering*/

/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

lib_util/hrtf_file_reader.c

+17 −2
Original line number Diff line number Diff line
@@ -742,18 +742,31 @@ static void HRTF_energy_sections_precalc( 
 *---------------------------------------------------------------------*/



ivas_error dealloc_HRTF_binary(

#ifdef FIX_BINARY_BINAURAL_READING

    IVAS_DEC_HRTF_HANDLE *phHrtf /* i/o: HRTF handle                         */

#else

    IVAS_DEC_HRTF_HANDLE hHrtf /* i/o: HRTF handle                         */

#endif

)

{

    int16_t i;

    ivas_error error;

#ifdef FIX_BINARY_BINAURAL_READING

    IVAS_DEC_HRTF_HANDLE hHrtf;

#endif

    error = IVAS_ERR_OK;



#ifdef FIX_BINARY_BINAURAL_READING

    if ( phHrtf == NULL || *phHrtf == NULL )

#else

    if ( hHrtf == NULL )

#endif

    {

        return error;

    }



#ifdef FIX_BINARY_BINAURAL_READING

    hHrtf = *phHrtf;

#endif

    if ( !hHrtf->ModelParams.modelROM )

    {

        if ( hHrtf->ModelParams.UseItdModel )
@@ -800,7 +813,9 @@ ivas_error dealloc_HRTF_binary( 
            free( hHrtf->lr_energy_and_iac_dyn[i] );

        }

    }



#ifdef FIX_BINARY_BINAURAL_READING

    *phHrtf = NULL;

#endif

    return error;

}

lib_util/hrtf_file_reader.h

+4 −0
Original line number Diff line number Diff line
@@ -146,7 +146,11 @@ ivas_error load_parambin_HRTF_from_binary( 
 *---------------------------------------------------------------------*/



ivas_error dealloc_HRTF_binary(

#ifdef FIX_BINARY_BINAURAL_READING

    IVAS_DEC_HRTF_HANDLE *phHrtf /* i/o: HRTF handle                         */

#else

    IVAS_DEC_HRTF_HANDLE hHrtf /* i/o: HRTF handle                         */

#endif

);



#endif /* IVAS_HRTF_FILE_READER_H */