From e116a40e58e4edb5528f89162ff22b923854b065 Mon Sep 17 00:00:00 2001 From: leomccormack Date: Wed, 24 Jan 2024 14:08:02 +0200 Subject: [PATCH] added a default starting fs for many of the examples, which may help with compatibility with other hosts) --- examples/src/ambi_dec/ambi_dec.c | 3 ++- examples/src/ambi_enc/ambi_enc.c | 1 + examples/src/ambi_roomsim/ambi_roomsim.c | 1 + examples/src/array2sh/array2sh.c | 1 + examples/src/binauraliser/binauraliser.c | 1 + examples/src/binauraliser_nf/binauraliser_nf.c | 1 + examples/src/decorrelator/decorrelator.c | 1 + examples/src/dirass/dirass.c | 1 + examples/src/matrixconv/matrixconv.c | 1 + examples/src/multiconv/multiconv.c | 1 + examples/src/panner/panner.c | 1 + examples/src/pitch_shifter/pitch_shifter.c | 1 + examples/src/powermap/powermap.c | 1 + examples/src/rotator/rotator.c | 1 + examples/src/sldoa/sldoa.c | 1 + examples/src/spreader/spreader.c | 1 + examples/src/tvconv/tvconv.c | 1 + 17 files changed, 18 insertions(+), 1 deletion(-) diff --git a/examples/src/ambi_dec/ambi_dec.c b/examples/src/ambi_dec/ambi_dec.c index bc3987bde..d7d2ff331 100644 --- a/examples/src/ambi_dec/ambi_dec.c +++ b/examples/src/ambi_dec/ambi_dec.c @@ -73,7 +73,8 @@ void ambi_dec_create pData->transitionFreq = 800.0f; /* afSTFT stuff and audio buffers */ - pData->hSTFT = NULL; + pData->fs = 48000.0f; + pData->hSTFT = NULL; pData->SHFrameTD = (float**)malloc2d(MAX_NUM_SH_SIGNALS, AMBI_DEC_FRAME_SIZE, sizeof(float)); pData->outputFrameTD = (float**)malloc2d(SAF_MAX(MAX_NUM_LOUDSPEAKERS, NUM_EARS), AMBI_DEC_FRAME_SIZE, sizeof(float)); pData->SHframeTF = (float_complex***)malloc3d(HYBRID_BANDS, MAX_NUM_SH_SIGNALS, TIME_SLOTS, sizeof(float_complex)); diff --git a/examples/src/ambi_enc/ambi_enc.c b/examples/src/ambi_enc/ambi_enc.c index 536f3a4db..bd8010d75 100644 --- a/examples/src/ambi_enc/ambi_enc.c +++ b/examples/src/ambi_enc/ambi_enc.c @@ -36,6 +36,7 @@ void ambi_enc_create int i; pData->order = 1; + pData->fs = 48000.0f; /* default user parameters */ loadSourceConfigPreset(SOURCE_CONFIG_PRESET_DEFAULT, pData->src_dirs_deg, &(pData->new_nSources)); diff --git a/examples/src/ambi_roomsim/ambi_roomsim.c b/examples/src/ambi_roomsim/ambi_roomsim.c index 8ef5eda8d..b920db940 100644 --- a/examples/src/ambi_roomsim/ambi_roomsim.c +++ b/examples/src/ambi_roomsim/ambi_roomsim.c @@ -53,6 +53,7 @@ void ambi_roomsim_create memset(pData->rec_pos, 0, ROOM_SIM_MAX_NUM_RECEIVERS*3*sizeof(float)); /* Internal */ + pData->fs = 48000.0f; pData->hIms = NULL; float src_pos[3] = {5.2f, 1.5f, 1.4f}; memcpy(pData->src_pos[0], src_pos, 3*sizeof(float)); diff --git a/examples/src/array2sh/array2sh.c b/examples/src/array2sh/array2sh.c index 6e3e1273b..b0fa51bb7 100644 --- a/examples/src/array2sh/array2sh.c +++ b/examples/src/array2sh/array2sh.c @@ -70,6 +70,7 @@ void array2sh_create pData->enableDiffEQpastAliasing = 1; /* time-frequency transform + buffers */ + pData->fs = 48000.0f; pData->hSTFT = NULL; pData->inputFrameTD = (float**)malloc2d(MAX_NUM_SENSORS, ARRAY2SH_FRAME_SIZE, sizeof(float)); pData->SHframeTD = (float**)malloc2d(MAX_NUM_SH_SIGNALS, ARRAY2SH_FRAME_SIZE, sizeof(float)); diff --git a/examples/src/binauraliser/binauraliser.c b/examples/src/binauraliser/binauraliser.c index 5ac011d7e..f3f67484e 100644 --- a/examples/src/binauraliser/binauraliser.c +++ b/examples/src/binauraliser/binauraliser.c @@ -58,6 +58,7 @@ void binauraliser_create /* time-frequency transform + buffers */ pData->hSTFT = NULL; + pData->fs = 48000.0f; pData->inputFrameTD = (float**)malloc2d(MAX_NUM_INPUTS, BINAURALISER_FRAME_SIZE, sizeof(float)); pData->outframeTD = (float**)malloc2d(NUM_EARS, BINAURALISER_FRAME_SIZE, sizeof(float)); pData->inputframeTF = (float_complex***)malloc3d(HYBRID_BANDS, MAX_NUM_INPUTS, TIME_SLOTS, sizeof(float_complex)); diff --git a/examples/src/binauraliser_nf/binauraliser_nf.c b/examples/src/binauraliser_nf/binauraliser_nf.c index 119423a0a..125ad2da8 100644 --- a/examples/src/binauraliser_nf/binauraliser_nf.c +++ b/examples/src/binauraliser_nf/binauraliser_nf.c @@ -92,6 +92,7 @@ void binauraliserNF_create /* FREQUENCY DOMAIN version */ pData->hrir_loaded_fs = pData->hrir_runtime_fs = -1; /* unknown */ /* time domain buffers */ + pData->fs = 48000.0f; pData->inputFrameTD = (float**)malloc2d(MAX_NUM_INPUTS, BINAURALISER_FRAME_SIZE, sizeof(float)); pData->outframeTD = (float**)malloc2d(NUM_EARS, BINAURALISER_FRAME_SIZE, sizeof(float)); pData->inputframeTF = (float_complex***)malloc3d(HYBRID_BANDS, MAX_NUM_INPUTS, TIME_SLOTS, sizeof(float_complex)); diff --git a/examples/src/decorrelator/decorrelator.c b/examples/src/decorrelator/decorrelator.c index 66583ff34..bac68a7d4 100644 --- a/examples/src/decorrelator/decorrelator.c +++ b/examples/src/decorrelator/decorrelator.c @@ -40,6 +40,7 @@ void decorrelator_create pData->compensateLevel = 0; /* afSTFT stuff */ + pData->fs = 48000.0f; pData->hSTFT = NULL; pData->InputFrameTD = (float**)malloc2d(MAX_NUM_CHANNELS, DECORRELATOR_FRAME_SIZE, sizeof(float)); pData->OutputFrameTD = (float**)malloc2d(MAX_NUM_CHANNELS, DECORRELATOR_FRAME_SIZE, sizeof(float)); diff --git a/examples/src/dirass/dirass.c b/examples/src/dirass/dirass.c index 144790367..c0d1fa9d6 100644 --- a/examples/src/dirass/dirass.c +++ b/examples/src/dirass/dirass.c @@ -94,6 +94,7 @@ void dirass_create pData->recalcPmap = 1; /* set FIFO buffers */ + pData->fs = 48000.0f; pData->FIFO_idx = 0; memset(pData->inFIFO, 0, MAX_NUM_INPUT_SH_SIGNALS*DIRASS_FRAME_SIZE*sizeof(float)); } diff --git a/examples/src/matrixconv/matrixconv.c b/examples/src/matrixconv/matrixconv.c index d42fa6816..1f210b01a 100644 --- a/examples/src/matrixconv/matrixconv.c +++ b/examples/src/matrixconv/matrixconv.c @@ -51,6 +51,7 @@ void matrixconv_create pData->nOutputChannels = 0; /* set FIFO buffers */ + pData->host_fs = 48000.0f; pData->FIFO_idx = 0; memset(pData->inFIFO, 0, MAX_NUM_CHANNELS*MAX_FRAME_SIZE*sizeof(float)); memset(pData->outFIFO, 0, MAX_NUM_CHANNELS*MAX_FRAME_SIZE*sizeof(float)); diff --git a/examples/src/multiconv/multiconv.c b/examples/src/multiconv/multiconv.c index 889bf9c5d..4355d00ee 100644 --- a/examples/src/multiconv/multiconv.c +++ b/examples/src/multiconv/multiconv.c @@ -49,6 +49,7 @@ void multiconv_create pData->filter_fs = 0; /* set FIFO buffers */ + pData->host_fs = 48000.0f; pData->FIFO_idx = 0; memset(pData->inFIFO, 0, MAX_NUM_CHANNELS*MAX_FRAME_SIZE*sizeof(float)); memset(pData->outFIFO, 0, MAX_NUM_CHANNELS*MAX_FRAME_SIZE*sizeof(float)); diff --git a/examples/src/panner/panner.c b/examples/src/panner/panner.c index be443a772..fce71e0a9 100644 --- a/examples/src/panner/panner.c +++ b/examples/src/panner/panner.c @@ -67,6 +67,7 @@ void panner_create pData->bFlipRoll = 0; /* time-frequency transform + buffers */ + pData->fs = 48000.0f; pData->hSTFT = NULL; pData->inputFrameTD = (float**)malloc2d(MAX_NUM_INPUTS, PANNER_FRAME_SIZE, sizeof(float)); pData->outputFrameTD = (float**)malloc2d(MAX_NUM_OUTPUTS, PANNER_FRAME_SIZE, sizeof(float)); diff --git a/examples/src/pitch_shifter/pitch_shifter.c b/examples/src/pitch_shifter/pitch_shifter.c index 564dfb4f5..02aa661a3 100644 --- a/examples/src/pitch_shifter/pitch_shifter.c +++ b/examples/src/pitch_shifter/pitch_shifter.c @@ -54,6 +54,7 @@ void pitch_shifter_create pData->codecStatus = CODEC_STATUS_NOT_INITIALISED; /* set FIFO buffers */ + pData->sampleRate = 48000.0f; pData->FIFO_idx = 0; memset(pData->inFIFO, 0, MAX_NUM_CHANNELS*PITCH_SHIFTER_FRAME_SIZE*sizeof(float)); memset(pData->outFIFO, 0, MAX_NUM_CHANNELS*PITCH_SHIFTER_FRAME_SIZE*sizeof(float)); diff --git a/examples/src/powermap/powermap.c b/examples/src/powermap/powermap.c index 289eb2a39..ca3002eec 100644 --- a/examples/src/powermap/powermap.c +++ b/examples/src/powermap/powermap.c @@ -87,6 +87,7 @@ void powermap_create pData->recalcPmap = 1; /* set FIFO buffer */ + pData->fs = 48000.0f; pData->FIFO_idx = 0; memset(pData->inFIFO, 0, MAX_NUM_SH_SIGNALS*POWERMAP_FRAME_SIZE*sizeof(float)); } diff --git a/examples/src/rotator/rotator.c b/examples/src/rotator/rotator.c index 9ae82997b..422fe658a 100644 --- a/examples/src/rotator/rotator.c +++ b/examples/src/rotator/rotator.c @@ -43,6 +43,7 @@ void rotator_create *phRot = (void*)pData; pData->M_rot_status = M_ROT_RECOMPUTE_QUATERNION; + pData->fs = 48000.0f; /* Default user parameters */ pData->Q.w = 1.0f; diff --git a/examples/src/sldoa/sldoa.c b/examples/src/sldoa/sldoa.c index 4547ff502..05d23564b 100644 --- a/examples/src/sldoa/sldoa.c +++ b/examples/src/sldoa/sldoa.c @@ -100,6 +100,7 @@ void sldoa_create } /* set FIFO buffer */ + pData->fs = 48000.0f; pData->FIFO_idx = 0; memset(pData->inFIFO, 0, MAX_NUM_SH_SIGNALS*SLDOA_FRAME_SIZE*sizeof(float)); } diff --git a/examples/src/spreader/spreader.c b/examples/src/spreader/spreader.c index c178e2ee1..5a28c22b4 100644 --- a/examples/src/spreader/spreader.c +++ b/examples/src/spreader/spreader.c @@ -50,6 +50,7 @@ void spreader_create memset(pData->src_dirs_deg, 0, SPREADER_MAX_NUM_SOURCES*2*sizeof(float)); /* time-frequency transform + buffers */ + pData->fs = 48000.0f; pData->hSTFT = NULL; pData->inputFrameTD = (float**)malloc2d(MAX_NUM_INPUTS, SPREADER_FRAME_SIZE, sizeof(float)); pData->outframeTD = (float**)malloc2d(MAX_NUM_OUTPUTS, SPREADER_FRAME_SIZE, sizeof(float)); diff --git a/examples/src/tvconv/tvconv.c b/examples/src/tvconv/tvconv.c index 9d11a7ac8..0cc9647fa 100644 --- a/examples/src/tvconv/tvconv.c +++ b/examples/src/tvconv/tvconv.c @@ -50,6 +50,7 @@ void tvconv_create pData->sofa_file_error = SAF_TVCONV_NOT_INIT; /* set FIFO buffers */ + pData->host_fs = 48000.0f; pData->FIFO_idx = 0; memset(pData->inFIFO, 0, MAX_NUM_CHANNELS*MAX_FRAME_SIZE*sizeof(float)); memset(pData->outFIFO, 0, MAX_NUM_CHANNELS*MAX_FRAME_SIZE*sizeof(float));