Commit f8c1706d authored by vaclav's avatar vaclav
Browse files

replace 'const uint16_t t_design_11_size' by '#define SBA_T_DESIGN_11_SIZE'

parent 3419ddcd

lib_com/ivas_cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -832,6 +832,7 @@ typedef enum { 
#define SBA_PLANAR_BITS                         1

#define SBA_ORDER_BITS                          2

#define SBA_NHARM_HOA3                          16

#define SBA_T_DESIGN_11_SIZE                    70



typedef enum 

{

lib_dec/ivas_allrad_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -144,11 +144,10 @@ ivas_error ivas_sba_get_hoa_dec_matrix( 
            return error;

        }





        num_harm = ( ambisonics_order + 1 ) * ( ambisonics_order + 1 );



        /* Get t-design values */

        num_td = t_design_11_size;

        num_td = SBA_T_DESIGN_11_SIZE;

        t_design_azi = t_design_11_azimuth;

        t_design_ele = t_design_11_elevation;

lib_dec/ivas_rom_dec.c

+2 −4
Original line number Diff line number Diff line
@@ -1130,9 +1130,7 @@ const float norm_sn3d_hoa3[16] = 
};



/* Order 11 t-design */

const uint16_t t_design_11_size = 70;



const float t_design_11_azimuth[70] = 

const float t_design_11_azimuth[SBA_T_DESIGN_11_SIZE] = 

{

     1.329273e+02f, -8.393495e+01f,  8.474100e+00f, -1.133408e+02f, -1.032659e+02f, -3.323704e+01f,  2.185643e+01f, -1.565395e+02f, 

    -6.426475e+01f,  1.657795e+02f, -2.520283e+01f, -9.700380e+01f,  2.785464e+01f,  1.532142e+02f, -1.550616e+02f, -1.184214e+01f,
@@ -1145,7 +1143,7 @@ const float t_design_11_azimuth[70] = 
    -1.362968e+02f,  9.356446e+01f, -9.708401e+01f, -1.691583e+02f, -4.413238e+01f,  8.147954e+01f 

};



const float t_design_11_elevation[70] =

const float t_design_11_elevation[SBA_T_DESIGN_11_SIZE] =

{

     7.692547e+00f, -2.373007e+01f,  2.351276e+01f,  7.042259e+01f, -9.896944e+00f, -7.075133e+01f, -2.646185e+01f,  4.777649e+01f, 

    -7.720470e+00f,  4.453436e+01f,  2.638979e+01f, -4.465789e+01f,  9.767035e+00f, -4.770533e+01f,  7.453029e+00f, -2.359012e+01f,

lib_dec/ivas_rom_dec.h

+2 −2
Original line number Diff line number Diff line
@@ -195,8 +195,8 @@ extern const float norm_sn3d_hoa3[16]; 


/* Order 11 t-design */

extern const uint16_t t_design_11_size;

extern const float t_design_11_azimuth[70];

extern const float t_design_11_elevation[70];

extern const float t_design_11_azimuth[SBA_T_DESIGN_11_SIZE];

extern const float t_design_11_elevation[SBA_T_DESIGN_11_SIZE];





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