Commit 077febab authored by vaclav's avatar vaclav
Browse files

- move and rename "lib_rend/ivas_binauralRenderer.c" to "lib_dec/ivas_binRenderer_internal.c" 

- ivas_headTrack_open() to lib_dec
parent fb1bec0c

Workspace_msvc/lib_dec.vcxproj

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

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">

Workspace_msvc/lib_rend.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ 
  <ItemGroup>

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

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

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

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

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

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

lib_rend/ivas_hrtf.c

+36 −6
Original line number Diff line number Diff line
@@ -29,16 +29,11 @@ 
   the United Nations Convention on Contracts on the International Sales of Goods.



*******************************************************************************************************/

// VE2AT: move this file to lib_dec



#include <stdint.h>

#include "options.h"

#include "prot.h"

#include "ivas_prot.h"

//#include "ivas_prot_rend.h"

//#include "lib_dec.h"

//#include "string.h"

//#include "assert.h"

#include "ivas_rom_TdBinauralRenderer.h"

#include "ivas_error.h"

#include "wmc_auto.h"
@@ -210,3 +205,38 @@ void ivas_HRTF_parambin_binary_close( 
    return;

}

#endif





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

 * ivas_headTrack_open()

 *

 * Allocate and initialize Head-Tracking handle

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



ivas_error ivas_headTrack_open(

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

)

{

    int16_t i;



    /* Allocate Head-Tracking handle */

    if ( ( *hHeadTrackData = (HEAD_TRACK_DATA_HANDLE) malloc( sizeof( HEAD_TRACK_DATA ) ) ) == NULL )

    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for head-tracking memory\n" ) );

    }



    /* Initialization */

    ( *hHeadTrackData )->num_quaternions = 0;

    ( *hHeadTrackData )->lrSwitchInterpVal = 0.0f;

    ( *hHeadTrackData )->lrSwitchedCurrent = 0;

    ( *hHeadTrackData )->lrSwitchedNext = 0;



    /* Initialise Rmat_prev to I, Rmat will be computed later */

    for ( i = 0; i < 3; i++ )

    {

        set_zero( ( *hHeadTrackData )->Rmat_prev[i], 3 );

        ( *hHeadTrackData )->Rmat_prev[i][i] = 1.0f;

    }



    return IVAS_ERR_OK;

}