Commit a8a15539 authored by vaclav's avatar vaclav
Browse files

accept FIX_866_MOVE_VBAP

parent 852a2dba

lib_com/ivas_prot.h

+2 −27
Original line number Diff line number Diff line
@@ -5349,15 +5349,10 @@ 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) */
@@ -5365,27 +5360,6 @@ 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)          */

    const float *speaker_node_ele_deg,                          /* i  : vector of speaker node elevations (positive up)          */

    const int16_t num_speaker_nodes,                            /* i  : number of speaker nodes in the set                       */

    const IVAS_FORMAT ivas_format                               /* i  : IVAS format                                              */

);



void vbap_free_data(

    VBAP_HANDLE *hVBAPdata                                      /* i/o: VBAP handle to be freed                                  */

);



void vbap_determine_gains(

    const VBAP_HANDLE hVBAPdata,                                /* i  : VBAP structure                                           */

    float *gains,                                               /* o  : gain vector for speaker nodes for given direction        */

    const int16_t azi_deg,                                      /* i  : azimuth in degrees for panning direction (positive left) */

    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                                      */
@@ -5393,6 +5367,7 @@ void v_sort_ind( 
    const int16_t len                                           /* i  : vector length                                            */

);





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

 * LS Renderer prototypes

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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_866_MOVE_VBAP                               /* Nokia: Issue 866: Move VBAP to lib_rend */

#define FIX_863_REMOVE_REDUNDANCIES_OMASA               /* Nokia/VA: Issue 863: Remove redundancies in stereo_classifier for OMASA */

#define FIX_879_USAN_ERROR_IN_MASA_DECODING             /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */

lib_rend/ivas_prot_rend.h

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ void efap_determine_gains( 
    const float ele_deg,                                        /* i  : elevation in degrees for panning direction (positive up) */

    const int16_t efap_mode                                     /* i  : indicates whether EFAP or EFIP is used                   */

);

#ifdef FIX_866_MOVE_VBAP





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

 * Amplitude Panning VBAP prototypes
@@ -158,7 +158,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





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

 * DirAC/MASA rendering