Commit 064fed5f authored by vaclav's avatar vaclav
Browse files

- remove unused ROM tables 

- remove outdated VE2AT comments
parent 9ef90cc2

lib_rend/ivas_hrtf.c

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "options.h"

#include "prot.h"

#include "ivas_prot.h"

#include "ivas_lib_rend_internal.h" // VE2AT: remove it

//#include "ivas_lib_rend_internal.h"

//#include "lib_dec.h"

//#include "string.h"

//#include "assert.h"
@@ -90,7 +90,7 @@ void ivas_HRTF_binary_close( 
 *

 * Allocate HRTF binary handle

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

//VE2AT: move to lib_dec



ivas_error ivas_HRTF_CRend_binary_open(

    HRTFS_CREND **hSetOfHRTF )

{

lib_rend/ivas_rom_rend.c

+0 −17
Original line number Diff line number Diff line
@@ -310,25 +310,8 @@ const float ivas_reverb_default_DSR[IVAS_REVERB_DEFAULT_N_BANDS] = 
/* CICP1 - Mono */

const float ls_azimuth_CICP1[1] = { 0.0f };

const float ls_elevation_CICP1[1] = { 0.0f };

const uint32_t ls_LFE_last_idx_CICP1[1] = { 0 };



/* CICP2 - Stereo */

const uint32_t ls_LFE_last_idx_CICP2[2] = { 0, 1 };



/* CICP6 - 5.1 */

const uint32_t ls_LFE_last_idx_CICP6[6] = { 0, 1, 2, 4, 5, 3 };



/* CICP12 - 7.1 */

const uint32_t ls_LFE_last_idx_CICP12[8] = { 0, 1, 2, 4, 5, 6, 7, 3 };



/* CICP14 - 5.1.2 */

const uint32_t ls_LFE_last_idx_CICP14[8] = { 0, 1, 2, 4, 5, 6, 7, 3 };



/* CICP16 - 5.1.4 */

const uint32_t ls_LFE_last_idx_CICP16[10] = { 0, 1, 2, 4, 5, 6, 7, 8, 9, 3 };



/* CICP19 - 7.1.4 */

const uint32_t ls_LFE_last_idx_CICP19[12] = { 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 3 };



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

 * LS Renderer ROM tables

lib_rend/ivas_rom_rend.h

+1 −8
Original line number Diff line number Diff line
@@ -91,16 +91,9 @@ extern const float ivas_reverb_default_DSR[]; 
 * Renderer SBA & MC enc/dec matrices

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



extern const float hoa_dec_mtx_CICP1[16]; // VE2AT: not used

extern const float ls_azimuth_CICP1[1];

extern const float ls_elevation_CICP1[1];

extern const uint32_t ls_LFE_last_idx_CICP1[1]; // VE2AT: not used

extern const uint32_t ls_LFE_last_idx_CICP2[2];

extern const uint32_t ls_LFE_last_idx_CICP6[6];

extern const uint32_t ls_LFE_last_idx_CICP12[8];

extern const uint32_t ls_LFE_last_idx_CICP14[8];

extern const uint32_t ls_LFE_last_idx_CICP16[10];

extern const uint32_t ls_LFE_last_idx_CICP19[12];





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

 * LS Configuration Converter ROM tables

lib_rend/ivas_stat_rend.h

+1 −3
Original line number Diff line number Diff line
@@ -38,11 +38,9 @@ 
#include "cnst.h"

#include "ivas_cnst.h"

#include "ivas_stat_com.h"

#include "common_api_types.h" // VE2AT: don't we want to avoid this include in the library? I admit that the rules hefre are not 100% clear to me but introducing it just for IVAS_QUATERNION is not necessry I think

#include "common_api_types.h"

#endif



#define MAX_SPEAKERS 12 /* Max number of speakers (including LFE) in a channel-based config */ // VE2AT: not used





#ifdef FIX_197_CREND_INTERFACE