Commit 67be0ea6 authored by liksonov's avatar liksonov
Browse files

Update implementation. Move function declaration to ivas_prot.h, remove extra header file.

parent e4cdf055

Workspace_msvc/lib_dec.vcxproj

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

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\ivas_prox_mix.h" />

    <ClInclude Include="..\lib_dec\ivas_rom_binauralRenderer.h" />

    <ClInclude Include="..\lib_dec\ivas_rom_binaural_crend_head.h" />

    <ClInclude Include="..\lib_dec\ivas_rom_dec.h" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -632,9 +632,6 @@ 
    <ClInclude Include="..\lib_dec\ivas_rom_binaural_crend_head.h">

      <Filter>dec_h</Filter>

    </ClInclude>

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

      <Filter>dec_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="dec_all_c">

lib_com/ivas_prot.h

+14 −0
Original line number Diff line number Diff line
@@ -5401,6 +5401,20 @@ void ivas_reverb_get_hrtf_set_properties( 
);





#ifdef I15_IMPLEMENT_PROX_MIXING_FOR_ISM_DECODER

/* Proximity-based mixing */

ivas_error ivas_prox_mixer_compute_gains(

    const int16_t userID, 

    float *pMixer, 

    const int16_t *userLoc, 

    const int16_t nChan, 

    const float ppPcm_in[][L_FRAME48k], 

    const int16_t frame_len, 

    float *powvec

);

#endif





/* Orientation tracking */

void ivas_orient_trk_Init( 

    ivas_orient_trk_state_t *pOTR

lib_dec/ivas_mono_dmx_renderer.c

+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ 
#include "ivas_cnst.h"

#include "ivas_rom_com.h"

#include "ivas_rom_dec.h"

#ifdef I15_IMPLEMENT_PROX_MIXING_FOR_ISM_DECODER

#include "ivas_prox_mix.h"

#endif /* I15_IMPLEMENT_PROX_MIXING_FOR_ISM_DECODER */

#include "wmops.h"

lib_dec/ivas_prox_mix.c

+4 −1
Original line number Diff line number Diff line
@@ -44,12 +44,15 @@ 
#ifdef DEBUGGING

#include "debug.h"

#endif

#include "ivas_prox_mix.h"

#include "ivas_prot.h"

#include "wmops.h"



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

* PreProcessor

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

#define POWER_FACT              ( 1.0f )

#define POWER_SMOOTH_HI         ( 0.8f )

#define POWER_SMOOTH_LO         ( 0.95f )



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

 * Global variables