[cleanup] accept NONBE_FIX_225_MASA_EXT_REND (e70ea04f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -1795,7 +1795,6 @@ int main(
		exit( -1 );
		}

		#ifdef NONBE_FIX_225_MASA_EXT_REND
		if ( isCurrentFrameMultipleOf20ms )
		{
		if ( masaReaders[i] != NULL )
		@@ -1814,19 +1813,6 @@ int main(
		}
		}
		}
		#else
		if ( masaReaders[i] != NULL )
		{
		/* This will update data in hMasaMetadata[i] */
		MasaFileReader_readNextFrame( masaReaders[i] );

		if ( ( error = IVAS_REND_FeedInputMasaMetadata( hIvasRend, masaIds[i], hMasaMetadata[i] ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}
		#endif
		}


		@@ -2531,13 +2517,7 @@ static IVAS_AUDIO_CONFIG parseAudioConfig(
		switch ( charBuf[4] )
		{
		case '1':
		#ifdef NONBE_FIX_225_MASA_EXT_REND
		return IVAS_AUDIO_CONFIG_MASA1;
		#else
		fprintf( stderr, "1TC MASA support is not functional and is pending on DirAC renderer refactoring.\n" );
		exit( EXIT_FAILURE );
		/return IVAS_AUDIO_CONFIG_MASA1;/ // ToDo: temporarily disabled to avoid compilation warnings
		#endif
		case '2':
		return IVAS_AUDIO_CONFIG_MASA2;
		default:

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,6 @@
		#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/
		#define NONBE_UNIFIED_DECODING_PATHS /* FhG: unify decoding paths */
		#define NONBE_FIX_871_ACELP_CRASH_IN_OSBA /* FhG: isse 871: crash in ACELP core encoder with OSBA */
		#define NONBE_FIX_225_MASA_EXT_REND /* Nokia: Resolve #225: Complete MASA external renderer implementation */
		#define NONBE_FIX_897_USAN_WITH_MASA_RENDERING /* Nokia: issue #897: USAN null pointer in MASA external renderer to Ambisonics */
		#define NONBE_FIX_811_DFT_DOUBLE_TO_FLOAT /* FhG: issue 811: change double precision functions to float in DFT Stereo */

lib_dec/ivas_dirac_dec.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -41,9 +41,7 @@
		#include "ivas_cnst.h"
		#include "ivas_rom_com.h"
		#include "ivas_rom_dec.h"
		#ifdef NONBE_FIX_225_MASA_EXT_REND
		#include "ivas_rom_rend.h"
		#endif
		#ifdef DEBUGGING
		#include "debug.h"
		#endif
		@@ -843,14 +841,8 @@ ivas_error ivas_dirac_dec_config(
		if ( !sparfoa_flag )
		{
		common_rend_config_flag = st_ivas->hSpatParamRendCom == NULL ? DIRAC_OPEN : flag_config_inp;
		#ifdef NONBE_FIX_225_MASA_EXT_REND
		if ( ( error = ivas_spat_hSpatParamRendCom_config( &st_ivas->hSpatParamRendCom, common_rend_config_flag, dec_param_estim_new,
		st_ivas->ivas_format, st_ivas->mc_mode, output_Fs, hodirac_flag, 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_spat_hSpatParamRendCom_config( &st_ivas->hSpatParamRendCom, common_rend_config_flag, dec_param_estim_new,
		st_ivas->ivas_format, st_ivas->mc_mode, output_Fs, hodirac_flag ) ) != IVAS_ERR_OK )

		#endif
		{
		return error;
		}
		@@ -1969,11 +1961,7 @@ void ivas_dirac_dec_render_sf(
		ivas_dirac_dec_compute_directional_responses( hSpatParamRendCom,
		hDirACRend,
		st_ivas->hVBAPdata,
		#ifdef NONBE_FIX_225_MASA_EXT_REND
		st_ivas->hMasa == NULL ? NULL : st_ivas->hMasa->data.band_mapping,
		#else
		st_ivas->hMasa,
		#endif
		st_ivas->hMasaIsmData,
		azimuth,
		elevation,
		@@ -1988,11 +1976,7 @@ void ivas_dirac_dec_render_sf(
		ivas_dirac_dec_compute_directional_responses( hSpatParamRendCom,
		hDirACRend,
		st_ivas->hVBAPdata,
		#ifdef NONBE_FIX_225_MASA_EXT_REND
		st_ivas->hMasa == NULL ? NULL : st_ivas->hMasa->data.band_mapping,
		#else
		st_ivas->hMasa,
		#endif
		st_ivas->hMasaIsmData,
		azimuth,
		elevation,

lib_dec/ivas_rom_dec.c

+0 −144

Original line number	Diff line number	Diff line
		@@ -379,18 +379,6 @@ const uint16_t * const sym_freq_ECSQ_tab_abs_lsbs[1 + 4] =
		* DirAC ROM tables
		----------------------------------------------------------------------------------/

		#ifndef NONBE_FIX_225_MASA_EXT_REND
		const float ls_azimuth_4d4[8] = { 45.0f, -45.0f, 135.0f, -135.0f, 45.0f, -45.0f, 135.0f, -135.0f };

		const float ls_elevation_4d4[8] = { 0.0f, 0.0f, 0.0f, 0.0f, 35.0f, 35.0f, 35.0f, 35.0f };

		const float diffuse_response_CICP6[5] = { 0.4219f, 0.4219f, 0.3704f, 0.5034f, 0.5034f };

		const float diffuse_response_CICP14[7] = { 0.3817f, 0.3817f, 0.2819f, 0.5399f, 0.5399f, 0.1519f, 0.1519f };

		const float diffuse_response_CICP16[9] = { 0.3456f, 0.3456f, 0.3035f, 0.4124f, 0.4124f, 0.2702f, 0.2702f, 0.3023f, 0.3023f };

		#endif

		const float dirac_dithering_azi_scale[DIRAC_DIFFUSE_LEVELS] =
		{
		@@ -402,138 +390,6 @@ const float dirac_dithering_ele_scale[DIRAC_DIFFUSE_LEVELS] =
		6.716062e-01f, 1.011804e+00f, 1.796875e+00f, 2.804382e+00f, 4.623130e+00f, 7.802667e+00f, 1.045446e+01f, 1.379538e+01f
		};

		#ifndef NONBE_FIX_225_MASA_EXT_REND
		const int16_t ap_pre_delay[DIRAC_DECORR_NUM_SPLIT_BANDS] = { 7, 2, 1 };

		const int16_t ap_filter_length[DIRAC_DECORR_NUM_SPLIT_BANDS] = { 15, 6, 3 };

		const float ap_lattice_delta_phi[DIRAC_MAX_NUM_DECORR_FILTERS*DIRAC_MAX_DECORR_FILTER_LEN] =
		{
		1.802519f, 0.922986f, 1.813685f, 1.272828f, 0.856928f, 0.366571f, 1.531249f, 1.318158f, 0.123812f, 0.897173f, 0.958696f, 1.256384f, 0.179677f, 0.668918f, 1.440292f, 1.573058f, 1.396481f, 1.191463f, 0.444143f, 1.666942f,
		1.273955f, 1.747171f, 1.408330f, 1.002782f, 1.559302f, 1.782992f, 1.474896f, 0.813181f, 1.457724f, 0.588531f, 1.384302f, 0.156493f, 0.600048f, 1.661632f, 0.538958f, 0.645429f, 0.565237f, 0.024684f, 0.264229f, 0.062140f,
		1.235343f, 0.851725f, 1.820211f, 0.116148f, 0.972111f, 0.488703f, 1.777672f, 1.452170f, 0.814134f, 1.272649f, 1.281416f, 0.101871f, 0.897888f, 0.199760f, 0.085732f, 1.686579f, 0.964558f, 0.057281f, 0.910252f, 1.662302f,
		0.955234f, 0.834348f, 1.672478f, 1.324896f, 0.444544f, 1.721172f, 0.153356f, 1.602240f, 0.171880f, 1.169774f, 0.543628f, 1.409581f, 1.763724f, 1.686754f, 1.210390f, 0.402691f, 0.983618f, 0.862997f, 1.220409f, 0.890061f,
		0.031641f, 0.461590f, 1.719550f, 1.357698f, 1.112262f, 1.166531f, 0.246097f, 1.387325f, 0.177485f, 1.446268f, 0.799476f, 1.667227f, 1.723465f, 1.505920f, 0.245874f, 1.155854f, 0.831394f, 0.677194f, 0.568871f, 1.652070f,
		0.019803f, 1.197794f, 0.635553f, 0.531682f, 0.878194f, 0.048050f, 0.080480f, 1.566743f, 0.724210f, 0.853668f, 1.741191f, 0.698465f, 1.553550f, 0.130290f, 0.688346f, 1.331091f, 0.599759f, 1.125466f, 1.764818f, 1.042879f,
		1.486589f, 1.627971f, 1.871181f, 0.102359f, 0.035021f, 1.403176f, 1.468675f, 0.190347f, 0.553282f, 1.031227f, 1.232390f, 1.255724f, 1.504443f, 0.683526f, 0.600958f, 1.746936f, 1.529243f, 1.448196f, 0.646850f, 0.116053f,
		1.283295f, 0.355220f, 1.380620f, 1.858453f, 0.818804f, 0.219006f, 0.476292f, 0.420029f, 1.291187f, 0.568738f, 1.174088f, 0.628805f, 1.753154f, 1.459582f, 1.354449f, 1.755790f, 0.441757f, 0.856240f, 1.647962f, 0.686353f,
		1.395289f, 0.699934f, 0.239310f, 0.239535f, 0.958190f, 0.748780f, 0.513784f, 1.666344f, 1.461995f, 1.599060f, 0.893107f, 0.341873f, 1.387703f, 1.808363f, 0.676542f, 1.424958f, 0.310574f, 0.836247f, 1.011101f, 1.686200f,
		1.823432f, 0.994827f, 1.635555f, 0.684380f, 1.017029f, 1.440371f, 1.694641f, 0.607132f, 1.197331f, 0.862161f, 0.666449f, 1.047956f, 0.159627f, 0.043131f, 1.251515f, 1.618724f, 0.216906f, 0.152250f, 0.471610f, 0.744260f,
		0.576810f, 1.632177f, 1.556912f, 1.866317f, 0.568088f, 1.541817f, 1.726725f, 0.275154f, 0.814958f, 0.863399f, 1.333040f, 0.148277f, 0.197893f, 1.048665f, 1.158090f, 1.692225f, 0.884294f, 0.289619f, 0.380633f, 1.728234f,
		1.433213f, 1.749505f, 1.533837f, 0.669701f, 0.372580f, 1.052390f, 1.116645f, 0.181320f, 1.139126f, 0.222671f, 0.604393f, 1.811797f, 1.743315f, 1.368792f, 1.861434f, 0.751908f, 0.159811f, 1.566503f, 0.443273f, 1.667530f,
		1.083060f, 1.243136f, 0.717777f, 0.675019f, 0.690490f, 0.672228f, 1.060789f, 0.423566f, 1.198457f, 0.485768f, 0.993953f, 0.443540f, 0.361702f, 1.552042f, 0.863562f, 1.517677f, 1.061899f, 0.691413f, 1.642818f, 1.756590f,
		0.278323f, 0.790363f, 0.172303f, 0.417138f, 0.009343f, 0.783325f, 1.369303f, 1.041067f, 0.467102f, 0.992773f, 1.525170f, 0.871213f, 0.243906f, 1.542036f, 0.449148f, 0.843633f, 0.191800f, 1.614246f, 1.038188f, 1.415620f,
		0.551081f, 0.382599f, 1.410121f, 0.102084f, 0.137286f, 0.671081f, 0.254860f, 1.758068f, 1.079013f, 0.129143f, 1.410873f, 0.150485f, 0.601119f, 0.760737f, 0.975905f, 0.223261f, 0.710162f, 1.677048f, 0.996836f, 1.849865f,
		1.536222f, 0.089016f, 0.960881f, 0.388690f, 0.379955f, 1.002223f, 1.271420f, 1.410632f, 0.254397f, 1.535559f, 1.133703f, 1.305280f, 1.466565f, 0.274167f, 0.399688f, 1.359638f, 1.766289f, 1.401348f, 1.310883f, 0.261030f,
		1.314825f, 1.538635f, 1.317986f, 1.243167f, 1.749461f, 1.689706f, 0.024853f, 0.634754f, 1.036317f, 1.828101f, 1.676951f, 0.023606f, 0.857000f, 0.076471f, 1.622198f, 0.254469f, 1.451625f, 1.720881f, 0.763812f, 0.186982f,
		0.056994f, 0.590507f, 0.375291f, 1.609261f, 0.607721f, 0.026355f, 0.483366f, 0.823931f, 0.792878f, 0.163577f, 0.753588f, 0.730789f, 0.135991f, 1.031660f, 1.554135f, 1.192863f, 0.016693f, 0.125796f, 1.017920f, 1.591773f,
		0.575956f, 0.112943f, 0.249506f, 1.399570f, 0.053241f, 1.410759f, 0.251638f, 1.059086f, 0.025315f, 1.422914f, 1.030412f, 0.848758f, 0.317396f, 1.375456f, 1.116858f, 1.682310f, 0.279550f, 0.325974f, 0.937704f, 1.744329f,
		0.447773f, 1.024286f, 1.001528f, 1.863684f, 1.278323f, 0.860699f, 1.346331f, 1.692596f, 0.022627f, 1.033613f, 0.546354f, 0.395804f, 1.486546f, 1.381045f, 1.312260f, 0.245976f, 1.607429f, 1.818793f, 0.964359f, 1.496598f,
		0.669967f, 1.535929f, 1.841878f, 0.979127f, 0.614002f, 1.879218f, 0.512531f, 1.167061f, 0.081697f, 1.773427f, 1.535668f, 0.757729f, 0.220395f, 1.538243f, 1.281162f, 0.302159f, 0.889871f, 0.798522f, 1.476288f, 1.665941f,
		0.915365f, 1.394094f, 0.757041f, 0.350064f, 1.199679f, 1.319499f, 1.128405f, 0.632337f, 0.790673f, 0.461582f, 1.693343f, 1.537442f, 0.346527f, 0.433782f, 1.754552f, 0.550903f, 0.686724f, 0.764433f, 1.792750f, 1.489998f
		};

		const float ap_lattice_coeffs_1[DIRAC_DECORR_FILTER_LEN_1*DIRAC_MAX_NUM_DECORR_FILTERS] =
		{
		0.795329f, 0.502700f, 0.204456f, 0.416566f, 0.459648f, 0.270454f, -0.201944f, 0.027997f, 0.067811f, -0.052627f, -0.038779f, -0.057387f, 0.020480f, 0.367697f, -0.593705f,
		0.533667f, 0.202500f, -0.001953f, 0.195081f, -0.184458f, -0.233867f, 0.228100f, -0.329293f, -0.338714f, -0.079700f, 0.052389f, -0.009468f, 0.178807f, 0.190843f, -0.478877f,
		0.044022f, 0.788498f, 0.133529f, -0.173657f, 0.545391f, 0.681431f, 0.332868f, 0.294685f, 0.325261f, 0.047617f, 0.157401f, 0.116272f, 0.218980f, -0.189248f, -0.317401f,
		-0.753681f, 0.772385f, -0.507384f, 0.276980f, -0.692775f, 0.232302f, -0.354759f, -0.015620f, -0.223059f, 0.310506f, -0.035034f, 0.085783f, -0.499998f, 0.215260f, 0.201415f,
		-0.495551f, -0.301660f, 0.196510f, 0.326147f, -0.594364f, 0.314921f, 0.668671f, 0.076643f, 0.045711f, -0.124790f, -0.203272f, -0.297190f, 0.125806f, -0.179483f, -0.201757f,
		0.161128f, 0.396050f, 0.266897f, 0.356586f, 0.488145f, -0.056254f, 0.139280f, -0.296405f, -0.112844f, 0.037405f, -0.367425f, -0.216292f, -0.277360f, 0.389420f, 0.115115f,
		-0.240449f, -0.271015f, 0.426720f, -0.011059f, 0.151813f, 0.253490f, 0.225764f, 0.498716f, -0.136377f, 0.443004f, -0.305017f, -0.031310f, -0.010765f, 0.170349f, 0.496478f,
		-0.139875f, -0.241998f, -0.104850f, 0.294343f, -0.067728f, -0.492202f, -0.487610f, 0.036395f, 0.109393f, 0.396155f, -0.352845f, -0.205913f, -0.082999f, -0.463033f, -0.309296f,
		0.025886f, -0.092456f, -0.125139f, -0.156117f, -0.004887f, 0.178440f, 0.089586f, 0.044827f, 0.238219f, -0.312120f, -0.390688f, -0.178543f, 0.454418f, 0.387012f, -0.388874f,
		-0.197797f, 0.035540f, 0.455388f, -0.054410f, 0.380035f, 0.290964f, 0.048804f, 0.078637f, 0.221740f, -0.217548f, 0.121289f, -0.396681f, -0.218482f, -0.127265f, -0.269507f,
		-0.344218f, -0.465038f, -0.421415f, -0.026031f, 0.221547f, 0.361993f, -0.348243f, 0.294983f, 0.366175f, 0.070663f, -0.086050f, 0.252129f, 0.156066f, -0.062800f, 0.408972f,
		0.242461f, -0.301764f, -0.066160f, 0.388651f, -0.462227f, -0.158880f, 0.230796f, -0.093179f, 0.047076f, 0.073402f, -0.335018f, 0.022940f, 0.354611f, 0.072391f, 0.019473f,
		0.336900f, -0.480534f, 0.170267f, 0.259663f, -0.393576f, -0.348588f, -0.108962f, 0.278842f, 0.385490f, 0.362249f, -0.318739f, 0.362305f, 0.288936f, 0.291204f, -0.278019f,
		-0.449302f, -0.288513f, -0.413973f, -0.405279f, -0.295152f, -0.245110f, 0.002530f, 0.287890f, 0.348229f, -0.178354f, -0.206517f, 0.351081f, -0.482205f, 0.021360f, -0.492207f,
		0.048642f, 0.453282f, 0.109160f, 0.232599f, -0.473781f, 0.140502f, 0.352527f, -0.098606f, 0.147172f, -0.055797f, 0.107739f, -0.231026f, 0.357310f, 0.348031f, 0.232404f,
		-0.324788f, 0.162480f, 0.057647f, -0.060734f, -0.009742f, -0.224185f, -0.282355f, -0.065443f, 0.064697f, 0.280370f, -0.284906f, -0.470501f, 0.019484f, -0.442308f, 0.377214f,
		0.447384f, -0.290498f, 0.345528f, 0.370207f, -0.313120f, 0.119592f, 0.300014f, 0.406995f, -0.277922f, 0.447039f, 0.194824f, 0.157703f, -0.223402f, -0.147167f, 0.379073f,
		-0.216342f, 0.137967f, -0.397180f, 0.073905f, -0.273110f, -0.443037f, -0.168327f, 0.346264f, 0.037543f, 0.065387f, 0.163901f, -0.122523f, 0.365477f, -0.316321f, 0.117273f,
		-0.301282f, 0.169625f, -0.336466f, 0.269914f, -0.420160f, -0.331296f, 0.498523f, -0.393009f, -0.462184f, -0.323097f, 0.470977f, -0.359463f, 0.264315f, 0.216797f, 0.493400f,
		0.151489f, -0.321653f, 0.464413f, -0.355673f, 0.420401f, 0.184297f, -0.302128f, 0.136536f, -0.252849f, 0.193906f, 0.298775f, 0.238808f, -0.386298f, -0.181999f, -0.077326f,
		0.124840f, -0.263394f, 0.389606f, 0.004502f, 0.339804f, 0.415204f, 0.377751f, 0.400221f, 0.352426f, -0.003808f, -0.184530f, 0.433348f, -0.237554f, 0.147684f, 0.407210f,
		0.067616f, -0.249313f, -0.354010f, 0.320937f, 0.426000f, 0.309576f, -0.189689f, -0.209447f, 0.158967f, -0.081929f, 0.386828f, 0.178582f, -0.407143f, 0.222189f, -0.149097f
		};

		const float ap_lattice_coeffs_2[DIRAC_DECORR_FILTER_LEN_2*DIRAC_MAX_NUM_DECORR_FILTERS] =
		{
		0.633692f, 0.681207f, -0.049418f, 0.286715f, 0.146022f, 0.135402f,
		-0.410145f, -0.206766f, -0.656968f, -0.101746f, 0.436299f, 0.339818f,
		-0.131383f, -0.773746f, -0.301627f, 0.327561f, 0.332227f, 0.205858f,
		0.717602f, -0.552370f, -0.150136f, 0.054556f, 0.239519f, -0.648477f,
		-0.721848f, 0.189377f, 0.068185f, 0.006216f, 0.077025f, 0.038678f,
		0.423415f, -0.108658f, 0.432050f, -0.414641f, 0.277840f, 0.418486f,
		0.077811f, -0.283063f, -0.357008f, 0.004634f, -0.442640f, -0.372315f,
		0.403336f, 0.243023f, 0.314367f, 0.444513f, 0.347517f, 0.496043f,
		0.108408f, 0.469382f, -0.170286f, 0.326310f, 0.172157f, 0.440334f,
		0.058417f, 0.339673f, -0.194965f, 0.491219f, -0.281296f, -0.043120f,
		-0.482487f, -0.335005f, -0.336159f, 0.196469f, -0.164623f, 0.442491f,
		-0.135190f, -0.354385f, 0.452133f, -0.311221f, -0.347640f, 0.498342f,
		-0.288999f, 0.376431f, -0.177924f, 0.195542f, 0.333872f, -0.152697f,
		0.053230f, 0.457767f, 0.442476f, 0.235254f, -0.345159f, -0.286098f,
		0.155438f, 0.405393f, 0.217073f, -0.107960f, 0.010698f, 0.368987f,
		-0.498358f, -0.495816f, -0.215479f, -0.093869f, 0.320276f, -0.013842f,
		0.489406f, 0.470814f, -0.065834f, 0.346871f, 0.027279f, 0.150086f,
		0.484013f, -0.497391f, 0.168796f, -0.493841f, -0.173528f, 0.334676f,
		0.264235f, -0.424651f, -0.314926f, 0.253086f, 0.397381f, -0.491565f,
		-0.453727f, -0.463358f, -0.019128f, 0.000344f, 0.315432f, 0.472345f,
		0.095139f, 0.283375f, -0.225088f, -0.119762f, -0.476871f, 0.037525f,
		0.336951f, 0.494511f, -0.062603f, 0.177652f, 0.463892f, 0.489286f
		};

		const float ap_lattice_coeffs_3[DIRAC_DECORR_FILTER_LEN_3*DIRAC_MAX_NUM_DECORR_FILTERS] =
		{
		0.018977f, -0.212205f, 0.422719f,
		-0.400657f, -0.106890f, -0.024589f,
		0.140005f, 0.279582f, 0.032357f,
		0.632535f, 0.578535f, -0.734606f,
		0.017182f, 0.013244f, -0.027715f,
		-0.353356f, -0.482160f, -0.491265f,
		0.457024f, 0.165122f, 0.469723f,
		-0.195705f, 0.440105f, -0.477366f,
		0.360186f, -0.490565f, 0.484623f,
		-0.173791f, 0.007543f, 0.278186f,
		0.434416f, 0.060363f, -0.193717f,
		-0.033709f, 0.496222f, 0.002939f,
		-0.480848f, -0.109552f, -0.023198f,
		0.324679f, -0.292075f, -0.356148f,
		-0.366595f, 0.380917f, -0.301741f,
		0.110318f, 0.383789f, 0.303984f,
		-0.499685f, -0.349584f, 0.334749f,
		-0.020224f, -0.430078f, -0.154705f,
		-0.371129f, 0.334080f, 0.346913f,
		-0.166781f, -0.229089f, 0.117956f,
		0.341292f, 0.490463f, 0.493655f,
		-0.367726f, 0.426528f, -0.045774f
		};

		const float * const ap_lattice_coeffs[DIRAC_DECORR_NUM_SPLIT_BANDS] =
		{
		&ap_lattice_coeffs_1[0],
		&ap_lattice_coeffs_2[0],
		&ap_lattice_coeffs_3[0],
		};

		const float ap_split_frequencies[DIRAC_DECORR_NUM_SPLIT_BANDS + 1] =
		{
		0.0f, 0.125f, 0.375f, 1.0f
		};

		const int16_t sba_map_tc[11] =
		{
		0, 1, 2, 3, 4, 8, 9, 15, 5, 6, 7
		};
		const int16_t sba_map_tc_512[11] =
		{
		0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 15
		};


		#endif
		/----------------------------------------------------------------------------------
		* FASTCONV and PARAMETRIC binaural renderer ROM tables
		----------------------------------------------------------------------------------/

lib_dec/ivas_rom_dec.h

+0 −21

Original line number	Diff line number	Diff line
		@@ -92,31 +92,10 @@ extern const uint16_t *const sym_freq_ECSQ_tab_abs_lsbs[1 + 4];
		* DirAC ROM tables
		----------------------------------------------------------------------------------/

		#ifndef NONBE_FIX_225_MASA_EXT_REND
		extern const float ls_azimuth_4d4[8];
		extern const float ls_elevation_4d4[8];
		extern const float diffuse_response_CICP6[5];
		extern const float diffuse_response_CICP14[7];
		extern const float diffuse_response_CICP16[9];

		#endif

		extern const float dirac_dithering_azi_scale[DIRAC_DIFFUSE_LEVELS];
		extern const float dirac_dithering_ele_scale[DIRAC_DIFFUSE_LEVELS];

		#ifndef NONBE_FIX_225_MASA_EXT_REND
		extern const int16_t ap_pre_delay[DIRAC_DECORR_NUM_SPLIT_BANDS];
		extern const int16_t ap_filter_length[DIRAC_DECORR_NUM_SPLIT_BANDS];
		extern const float ap_lattice_delta_phi[DIRAC_MAX_NUM_DECORR_FILTERS * DIRAC_MAX_DECORR_FILTER_LEN];
		extern const float ap_lattice_coeffs_1[DIRAC_DECORR_FILTER_LEN_1 * DIRAC_MAX_NUM_DECORR_FILTERS];
		extern const float ap_lattice_coeffs_2[DIRAC_DECORR_FILTER_LEN_2 * DIRAC_MAX_NUM_DECORR_FILTERS];
		extern const float ap_lattice_coeffs_3[DIRAC_DECORR_FILTER_LEN_3 * DIRAC_MAX_NUM_DECORR_FILTERS];
		extern const float *const ap_lattice_coeffs[DIRAC_DECORR_NUM_SPLIT_BANDS];
		extern const float ap_split_frequencies[DIRAC_DECORR_NUM_SPLIT_BANDS + 1];

		extern const int16_t sba_map_tc[11];
		extern const int16_t sba_map_tc_512[11];
		#endif

		/----------------------------------------------------------------------------------
		* FASTCONV and PARAMETRIC binaural renderer ROM tables