Commit 879663af authored by vaclav's avatar vaclav
Browse files

move dmxmtx_table[][] ROM table to appropriate place

parent 10e56aef

lib_com/ivas_td_decorr.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static const float ivas_hadamard_decorr_APD_coeff[IVAS_APD_16_SECT][IVAS_APD_16_ 




/* For R = 3.^([0:obj.parm_APD_nSections-1]/4); */

const float ivas_three_pow_frac[IVAS_MAX_DECORR_APD_SECTIONS] = {

static const float ivas_three_pow_frac[IVAS_MAX_DECORR_APD_SECTIONS] = {

    1.000000000000000f,

    1.316074013710022f,

    1.732050776481628f,

lib_dec/ivas_binRenderer_internal.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "cnst.h"

#include "ivas_cnst.h"

#include "ivas_rom_rend.h"

#include "ivas_rom_dec.h"

#include "ivas_rom_com.h"

#include "ivas_rom_binauralRenderer.h"

#ifdef DEBUGGING

lib_dec/ivas_rom_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -526,4 +526,15 @@ const int16_t sba_map_tc[8] = 
};





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

 * FASTCONV and PARAMETRIC binaural renderer ROM tables

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



const float dmxmtx_table[BINAURAL_CHANNELS][11] =

{

    { 1.0f, 0.0f, 0.70709997f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f },

    { 0.0f, 1.0f, 0.70709997f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f },

};





/* clang-format on */

lib_dec/ivas_rom_dec.h

+8 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ extern const float dft_ap_gains[5][3]; 
extern const int16_t dft_ap_delays[3][3];

extern const float dft_res_pred_weights[][STEREO_DFT_BAND_MAX];





extern const float dft_win232ms_8k[75];

extern const float dft_win232ms_12k8[120];

extern const float dft_win232ms_16k[150];
@@ -76,6 +75,7 @@ extern const float max_smooth_gains1[SBA_DIRAC_STEREO_NUM_BANDS]; 
extern const float min_smooth_gains2[SBA_DIRAC_STEREO_NUM_BANDS];

extern const float max_smooth_gains2[SBA_DIRAC_STEREO_NUM_BANDS];





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

 * ECLVQ Stereo ROM tables

 *----------------------------------------------------------------------------------*/
@@ -114,4 +114,11 @@ extern const float ap_split_frequencies[DIRAC_DECORR_NUM_SPLIT_BANDS + 1]; 
extern const int16_t sba_map_tc[8];





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

 * FASTCONV and PARAMETRIC binaural renderer ROM tables

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



extern const float dmxmtx_table[BINAURAL_CHANNELS][11];





#endif

lib_rend/ivas_rom_rend.c

+0 −6
Original line number Diff line number Diff line
@@ -43,12 +43,6 @@ 
 * FASTCONV and PARAMETRIC binaural renderer ROM tables

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



const float dmxmtx_table[BINAURAL_CHANNELS][11] =

{

    { 1.0f, 0.0f, 0.70709997f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f },

    { 0.0f, 1.0f, 0.70709997f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f },

};



/*

* 0 = 30,0

* 1 = -30,0