Commit 75c41eec authored by vaclav's avatar vaclav
Browse files

- move ivas_hrtf.c back to lib_rend 

- comments
parent 7b98efe1

Workspace_msvc/lib_dec.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -276,7 +276,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />

    <ClCompile Include="..\lib_dec\ivas_hrtf.c" />

    <ClCompile Include="..\lib_dec\ivas_init_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -512,9 +512,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_objectRenderer_internal.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_hrtf.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

Workspace_msvc/lib_rend.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ 
  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions.c" />

    <ClCompile Include="..\lib_rend\ivas_hrtf.c" />

    <ClCompile Include="..\lib_rend\ivas_sba_rendering.c" />

    <ClCompile Include="..\lib_rend\ivas_allrad_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_crend.c" />

lib_com/ivas_prot.h

+0 −54
Original line number Diff line number Diff line
@@ -4518,10 +4518,6 @@ void ivas_binaural_add_LFE( 
#endif





ivas_error ivas_headTrack_open(

    HEAD_TRACK_DATA_HANDLE *hHeadTrackData                      /* o  : head track handle                                       */

);







/*----------------------------------------------------------------------------------*
@@ -4943,56 +4939,6 @@ int16_t ivas_get_num_bands_from_bw_idx( 
 * HRTF

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



ivas_error ivas_HRTF_binary_open(

    TDREND_HRFILT_FiltSet_t **hHrtfTD                           /* i/o: TD renderer HRTF handle                 */

);



void ivas_HRTF_binary_close(

    TDREND_HRFILT_FiltSet_t **hHrtfTD                           /* i/o: TD renderer HRTF handle                 */

);



ivas_error ivas_HRTF_fastconv_binary_open(

    HRTFS_FASTCONV **hHrtfFastConv                              /* i/o: FASTCONV HRTF structure */

);



void ivas_HRTF_fastconv_binary_close(

    HRTFS_FASTCONV **hHrtfFastConv                              /* i/o: FASTCONV HRTF structure */

);



ivas_error ivas_HRTF_parambin_binary_open(

    HRTFS_PARAMBIN **hHrtfParambin                              /* i/o: Parametric binauralizer HRTF structure */

);



void ivas_HRTF_parambin_binary_close(

    HRTFS_PARAMBIN **hHrtfParambin                              /* i/o: Parametric binauralizer HRTF structure */

);



#ifdef HRTF_BINARY_FILE



ivas_error ivas_HRTF_CRend_binary_open(

	HRTFS_CREND **hSetOfHRTF                                    /* i/o: Set of HRTF handle                      */

);



void ivas_HRTF_CRend_binary_close(

	HRTFS_CREND **hSetOfHRTF                                    /* i/o: Set of HRTF handle                      */

);



#ifndef FIX_197_CREND_INTERFACE



ivas_error ivas_crend_init_from_setofhrtf(

	Decoder_Struct *st_ivas     /* i/o: IVAS decoder structure                                 */

);



ivas_error ivas_crend_init_from_hrtf_handle(

	Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */

	HRTFS_HANDLE hrtf);

#endif



void destroy_SetOfHRTF(

	HRTFS_CREND_HANDLE hSetOfHRTF                               /* i/o: Set of HRTF CRend handle                */

);



#endif



#ifndef FIX_197_CREND_INTERFACE

lib_dec/ivas_hrtf.c→lib_rend/ivas_hrtf.c

+5 −3
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
#include <stdint.h>

#include "options.h"

#include "prot.h"

#include "ivas_prot.h"

//#include "ivas_prot.h"

#include "ivas_prot_rend.h"

#include "ivas_error.h"

#include "wmc_auto.h"
@@ -224,6 +225,7 @@ ivas_error ivas_HRTF_fastconv_binary_open( 
    return IVAS_ERR_OK;

}





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

 * ivas_HRTF_fastconv_binary_close()

 *
@@ -243,9 +245,8 @@ void ivas_HRTF_fastconv_binary_close( 


    return;

}

#endif



#ifdef HRTF_BINARY_FILE



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

 * ivas_HRTF_parambin_binary_open()

 *
@@ -264,6 +265,7 @@ ivas_error ivas_HRTF_parambin_binary_open( 
    return IVAS_ERR_OK;

}





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

 * ivas_HRTF_parambin_binary_close()

 *