Commit d2cb29a3 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

small changes -allocation for LFE channel not needed, slightly reduce EFAP... 

small changes -allocation for LFE channel not needed, slightly reduce EFAP memory usage too (cannot have more than 16 output loudspeakers)
parent 802c3b71

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1319,7 +1319,11 @@ typedef enum 
#define PANNING_ELE_RESOLUTION                  5



#define EFAP_MAX_CHAN_NUM                       5                           /* Maximum number of channels that constitute a polygon, 4 or 5 */

#ifdef ALLRAD_OPTIM

#define EFAP_MAX_POLY_SET                       50                          /* Upper bound on number of polygons; with a Speaker setup of 16.0, we obtain 44 polygons/triangles in the matlab implementation. */

#else

#define EFAP_MAX_POLY_SET                       70                          /* Upper bound on number of polygons; with a Speaker setup of 26.0, we obtain 54 polygons/triangles in the matlab implementation. */

#endif



#define EFAP_MODE_EFAP                          0                           /* EFAP Panning */

#define EFAP_MODE_EFIP                          1                           /* EFIP Panning */

lib_dec/ivas_allrad_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ ivas_error ivas_sba_get_hoa_dec_matrix( 
    /* Allocate memory */

    assert( *hoa_dec_mtx == NULL && "hoa_dec_mtx != NULL" );

#ifdef ALLRAD_OPTIM

    if ( ( *hoa_dec_mtx = (float *) count_malloc( SBA_NHARM_HOA3 * ( hOutSetup.nchan_out_woLFE + hOutSetup.num_lfe ) * sizeof( float ) ) ) == NULL )

    if ( ( *hoa_dec_mtx = (float *) count_malloc( SBA_NHARM_HOA3 * ( hOutSetup.nchan_out_woLFE ) * sizeof( float ) ) ) == NULL )

#else

    if ( ( *hoa_dec_mtx = (float *) count_malloc( SBA_NHARM_HOA3 * MAX_OUTPUT_CHANNELS * sizeof( float ) ) ) == NULL )

#endif