Commit b27603d8 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Issue 866, move vbap to lib_rend.

parent c5b383d5

Workspace_msvc/lib_dec.vcxproj

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

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

+0 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

Workspace_msvc/lib_rend.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ 
    <ClCompile Include="..\lib_rend\ivas_rotation.c" />

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

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

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

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

  </ItemGroup>

  <ItemGroup>

Workspace_msvc/lib_rend.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -158,6 +158,9 @@ 
    <ClCompile Include="..\lib_rend\ivas_reflections.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_vbap.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_lcld_rom_tables.c">

      <Filter>rend_c</Filter>

    </ClCompile>

lib_com/ivas_prot.h

+8 −2
Original line number Diff line number Diff line
@@ -5377,10 +5377,15 @@ void ivas_ism2sba_sf( 
    const int16_t sba_order                                     /* i  : Ambisonic (SBA) order                           */

);





#ifndef FIX_866_MOVE_VBAP

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

 * Amplitude Panning tool prototypes

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

#else

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

 * Amplitude Panning VBAP prototypes

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

#endif



void panning_wrap_angles(

    const float azi_deg,                                        /* i  : azimuth in degrees for panning direction (positive left) */
@@ -5388,7 +5393,7 @@ void panning_wrap_angles( 
    float *azi_wrapped,                                         /* o  : wrapped azimuth component                                */

    float *ele_wrapped                                          /* o  : wrapped elevation component                              */

);



#ifndef FIX_866_MOVE_VBAP

ivas_error vbap_init_data(

    VBAP_HANDLE *hVBAPdata,                                     /* i/o: handle for VBAP data structure that will be initialized  */

    const float *speaker_node_azi_deg,                          /* i  : vector of speaker node azimuths (positive left)          */
@@ -5408,6 +5413,7 @@ void vbap_determine_gains( 
    const int16_t ele_deg,                                      /* i  : elevation in degrees for panning direction (positive up) */

    const int16_t use_object_mode                               /* i  : select between object mode panning and spatial mode panning */

);

#endif



void v_sort_ind(

    float *x,                                                   /* i/o: Vector to be sorted                                      */