diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d00b37f0adee3da393e90d43e23046c7120dfb4..71ff18eb921492704a10719070618a85b697eae4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,6 +49,13 @@ stages:
echo "Commit time was $CI_COMMIT_TIMESTAMP"
date | xargs echo "System time is"
+.print-common-info-windows: &print-common-info-windows
+ - |
+ echo "Printing common information for build job."
+ echo "Current job is run on commit $CI_COMMIT_SHA"
+ echo "Commit time was $CI_COMMIT_TIMESTAMP"
+ ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression
+
.get-previous-merge-commit-sha: &get-previous-merge-commit-sha
- previous_merge_commit=$(git --no-pager log --merges HEAD~1 -n 1 --pretty=format:%H)
@@ -156,6 +163,11 @@ stages:
tags:
- ivas-linux
+.build-job-windows:
+ stage: build
+ timeout: "4 minutes"
+ tags:
+ - ivas-windows
# template for test jobs on linux that need the TESTV_DIR
.test-job-linux-needs-testv-dir:
@@ -172,6 +184,12 @@ stages:
exit_codes:
- 123
+.build-job-windows-with-check-for-warnings:
+ extends: .build-job-windows
+ stage: build
+ allow_failure:
+ exit_codes:
+ - 123
# ---------------------------------------------------------------
@@ -262,6 +280,31 @@ build-codec-sanitizers-linux:
- *print-common-info
- bash ci/build_codec_sanitizers_linux.sh
+build-codec-windows-cmake:
+ extends:
+ - .build-job-windows-with-check-for-warnings
+ - .rules-basis
+ script:
+ - *print-common-info-windows
+ - $winoutdata = $null
+ - cmake -G "Visual Studio 15 2017" . -Bbuild
+ - cmake --build build -j | tee -variable winoutdata
+ - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8
+ - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression
+ - ("exit $LASTEXITCODE") | Invoke-Expression
+
+build-codec-windows-msbuild:
+ extends:
+ - .build-job-windows-with-check-for-warnings
+ - .rules-basis
+ script:
+ - *print-common-info-windows
+ - $winoutdata = $null
+ - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug | tee -variable winoutdata
+ - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8
+ - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression
+ - ("exit $LASTEXITCODE") | Invoke-Expression
+
# ---------------------------------------------------------------
# Test jobs for merge requests
# ---------------------------------------------------------------
@@ -740,13 +783,13 @@ codec-comparison-on-main-push:
.sanitizer-test-schedule-A:
extends:
- .sanitizer-test-template
- timeout: 2 hours 30 minutes
sanitizer-test-mono:
extends: .sanitizer-test-schedule-A
rules:
- if: $SANITIZER_SCHEDULE_A
+ timeout: 2 hour
script:
- *update-ltv-repo
- python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS
@@ -756,7 +799,8 @@ sanitizer-test-stereo:
rules:
- if: $SANITIZER_SCHEDULE_A
when: delayed
- start_in: 2 hours 30 minutes
+ start_in: 2 hour
+ timeout: 2 hour
script:
- *update-ltv-repo
- python3 ci/run_scheduled_sanitizer_test.py stereo $OUT_FORMATS_CHANNEL_BASED --tests $SANITIZER_TESTS
@@ -766,7 +810,8 @@ sanitizer-test-stereodmxevs:
rules:
- if: $SANITIZER_SCHEDULE_A
when: delayed
- start_in: 5 hours
+ start_in: 4 hours
+ timeout: 2 hour
script:
- *update-ltv-repo
- python3 ci/run_scheduled_sanitizer_test.py StereoDmxEVS mono --tests $SANITIZER_TESTS
@@ -776,7 +821,8 @@ sanitizer-test-ism1:
rules:
- if: $SANITIZER_SCHEDULE_A
when: delayed
- start_in: 7 hours 30 minutes
+ start_in: 6 hours
+ timeout: 2 hours
script:
- *update-ltv-repo
- python3 ci/run_scheduled_sanitizer_test.py ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
@@ -786,7 +832,8 @@ sanitizer-test-ism2:
rules:
- if: $SANITIZER_SCHEDULE_A
when: delayed
- start_in: 10 hours
+ start_in: 8 hours
+ timeout: 3 hours
script:
- *update-ltv-repo
- python3 ci/run_scheduled_sanitizer_test.py ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
@@ -796,7 +843,8 @@ sanitizer-test-ism3:
rules:
- if: $SANITIZER_SCHEDULE_A
when: delayed
- start_in: 12 hours 30 minutes
+ start_in: 11 hours
+ timeout: 3 hour
script:
- *update-ltv-repo
- python3 ci/run_scheduled_sanitizer_test.py ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
@@ -806,7 +854,8 @@ sanitizer-test-ism4:
rules:
- if: $SANITIZER_SCHEDULE_A
when: delayed
- start_in: 15 hours
+ start_in: 14 hours
+ timeout: 4 hours
script:
- *update-ltv-repo
- python3 ci/run_scheduled_sanitizer_test.py ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
@@ -816,7 +865,8 @@ sanitizer-test-masa:
rules:
- if: $SANITIZER_SCHEDULE_A
when: delayed
- start_in: 17 hours 30 minutes
+ start_in: 18 hours
+ timeout: 3 hours
script:
- *update-ltv-repo
- python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
diff --git a/Makefile b/Makefile
index 7f8874d3439cc1fb73096cd5af609880ba9b874a..0d6d44ec5ac079f2a5a15978cbeacd55d33b6012 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ LDLIBS += -lm
CCCLANG = clang
ifeq "$(CLANG)" "1"
CC = $(CCCLANG)
-CFLAGS += -fsanitize=memory
+CFLAGS += -fsanitize=memory -fsanitize-memory-track-origins
LDFLAGS += -fsanitize=memory
endif
ifeq "$(CLANG)" "2"
diff --git a/Workspace_msvc/lib_com.vcxproj b/Workspace_msvc/lib_com.vcxproj
index f31f8d673a7ecf15af007f023ff81aefe7c3ccb3..78ed7bb39d871958b7bc2e35bb4258e4ba3de60f 100644
--- a/Workspace_msvc/lib_com.vcxproj
+++ b/Workspace_msvc/lib_com.vcxproj
@@ -244,9 +244,9 @@
+
-
diff --git a/Workspace_msvc/lib_com.vcxproj.filters b/Workspace_msvc/lib_com.vcxproj.filters
index e093373227c84ffb417ff0f2edd2c11ef1245df8..02b89d239320bfa5f5a975d62fc5bfa11c2bb2c1 100644
--- a/Workspace_msvc/lib_com.vcxproj.filters
+++ b/Workspace_msvc/lib_com.vcxproj.filters
@@ -379,9 +379,6 @@
common_evs_c
-
- common_ivas_c
-
common_ivas_c
@@ -466,6 +463,9 @@
common_ivas_c
+
+ common_ivas_c
+
common_ivas_c
diff --git a/Workspace_msvc/lib_util.vcxproj b/Workspace_msvc/lib_util.vcxproj
index 32bebc753654bfa97481586598e171fdb5e9451b..5b5e5f30ccdc3697e60b72e2b74750fe06e90598 100644
--- a/Workspace_msvc/lib_util.vcxproj
+++ b/Workspace_msvc/lib_util.vcxproj
@@ -146,6 +146,7 @@
+
@@ -167,6 +168,7 @@
+
diff --git a/apps/decoder.c b/apps/decoder.c
index 310d2aa25efd909a541a8039da8471057d667bf3..ee4d18cda06a2c62fffb7828c632d45000f8bbbc 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -42,6 +42,7 @@
#include "ls_custom_file_reader.h"
#include "hrtf_file_reader.h"
#include "head_rotation_file_reader.h"
+#include "vector3_pair_file_reader.h"
#include "jbm_file_writer.h"
#include "evs_rtp_payload.h"
#ifdef DEBUGGING
@@ -69,9 +70,11 @@ static
#define MAX_NUM_OUTPUT_CHANNELS 16
#define MAX_OUTPUT_PCM_BUFFER_SIZE ( MAX_NUM_OUTPUT_CHANNELS * MAX_FRAME_SIZE )
-#define IVAS_PUBLIC_ORIENT_TRK_REF 0
-#define IVAS_PUBLIC_ORIENT_TRK_AVG 1
-
+#define IVAS_PUBLIC_ORIENT_TRK_NONE ( 0 )
+#define IVAS_PUBLIC_ORIENT_TRK_REF ( 1 )
+#define IVAS_PUBLIC_ORIENT_TRK_AVG ( 2 )
+#define IVAS_PUBLIC_ORIENT_TRK_REF_VEC ( 3 )
+#define IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV ( 4 )
typedef struct
{
@@ -85,6 +88,10 @@ typedef struct
bool voipMode;
bool enableHeadRotation;
char *headrotTrajFileName;
+ bool enableReferenceRotation;
+ char *refrotTrajFileName;
+ bool enableReferenceVectorTracking;
+ char *referenceVectorTrajFileName;
#ifdef SUPPORT_JBM_TRACEFILE
char *jbmTraceFilename;
#endif
@@ -104,9 +111,6 @@ typedef struct
char *renderConfigFilename;
#ifdef DEBUGGING
-#ifndef REMOVE_FORCE_SUBFRAME_BIN
- bool forceSubframeBinauralization;
-#endif
IVAS_DEC_FORCED_REND_MODE forcedRendMode;
#ifdef DEBUG_FOA_AGC
FILE *agcBitstream; /* temporary */
@@ -129,7 +133,7 @@ typedef struct
static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );
static void usage_dec( void );
-static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, HeadRotFileReader *headRotReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
+static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, HeadRotFileReader *headRotReader, HeadRotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );
#ifdef DEBUGGING
static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );
@@ -155,6 +159,8 @@ int main(
LsCustomFileReader *hLsCustomReader = NULL;
hrtfFileReader *hrtfReader = NULL;
HeadRotFileReader *headRotReader = NULL;
+ HeadRotFileReader *refRotReader = NULL;
+ Vector3PairFileReader *referenceVectorReader = NULL;
ivas_error error = IVAS_ERR_UNKNOWN;
int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];
RenderConfigReader *renderConfigReader = NULL;
@@ -228,7 +234,6 @@ int main(
if ( arg.hrtfReaderEnabled )
{
-#ifdef FIX_351_HRTF_COMMAND
/* sanity check */
if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
{
@@ -236,13 +241,10 @@ int main(
fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" );
goto cleanup;
}
-#endif
if ( ( error = hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) ) != IVAS_ERR_OK )
{
-#ifdef FIX_351_HRTF_COMMAND
arg.hrtfReaderEnabled = false;
-#endif
fprintf( stderr, "\nError: Can't open HRTF binary file %s \n\n", arg.hrtfFileName );
goto cleanup;
}
@@ -254,14 +256,12 @@ int main(
if ( arg.enableHeadRotation )
{
-#ifdef FIX_351_HRTF_COMMAND
/* sanity check */
if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
{
fprintf( stderr, "\nError: Head-rotation file file cannot be used in this output configuration.\n\n" );
goto cleanup;
}
-#endif
if ( ( error = HeadRotationFileReader_open( arg.headrotTrajFileName, &headRotReader ) ) != IVAS_ERR_OK )
{
@@ -270,6 +270,60 @@ int main(
}
}
+ /*------------------------------------------------------------------------------------------*
+ * Open reference rotation file
+ *------------------------------------------------------------------------------------------*/
+
+ if ( arg.enableReferenceRotation )
+ {
+ /* sanity check */
+ if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
+ {
+ fprintf( stderr, "\nError: Reference rotation file cannot be used in this output configuration.\n\n" );
+ goto cleanup;
+ }
+
+ /* sanity check */
+ if ( arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF )
+ {
+ fprintf( stderr, "\nError: Reference rotation file can be used in '-otr ref' mode only.\n\n" );
+ goto cleanup;
+ }
+
+ if ( ( error = HeadRotationFileReader_open( arg.refrotTrajFileName, &refRotReader ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError: Can't open reference rotation file %s \n\n", arg.refrotTrajFileName );
+ goto cleanup;
+ }
+ }
+
+ /*------------------------------------------------------------------------------------------*
+ * Open reference vector trajectory file
+ *------------------------------------------------------------------------------------------*/
+
+ if ( arg.enableReferenceVectorTracking )
+ {
+ /* sanity check */
+ if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
+ {
+ fprintf( stderr, "\nError: Reference vector trajectory file cannot be used in this output configuration.\n\n" );
+ goto cleanup;
+ }
+
+ /* sanity check */
+ if ( arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF_VEC && arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV )
+ {
+ fprintf( stderr, "\nError: Reference trajectory file can be used in '-otr ref_vec' or '-otr ref_vec_lev' mode only.\n\n" );
+ goto cleanup;
+ }
+
+ if ( ( error = Vector3PairFileReader_open( arg.referenceVectorTrajFileName, &referenceVectorReader ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError: Can't open reference vector trajectory file %s \n\n", arg.referenceVectorTrajFileName );
+ goto cleanup;
+ }
+ }
+
/*------------------------------------------------------------------------------------------*
* Open custom loudspeaker layout file
*------------------------------------------------------------------------------------------*/
@@ -289,14 +343,12 @@ int main(
if ( arg.renderConfigEnabled )
{
-#ifdef FIX_351_HRTF_COMMAND
/* sanity check */
if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
{
fprintf( stderr, "\nError: Renderer configuration file cannot be used in this output configuration.\n\n" );
goto cleanup;
}
-#endif
if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )
{
@@ -309,23 +361,7 @@ int main(
* Configure the decoder
*------------------------------------------------------------------------------------------*/
-#ifdef REMOVE_FORCE_SUBFRAME_BIN
if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK )
-#else
-#ifdef DEBUGGING
-#ifdef FIX_351_HRTF_COMMAND
- if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled, arg.forceSubframeBinauralization ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.forceSubframeBinauralization ) ) != IVAS_ERR_OK )
-#endif
-#else
-#ifdef FIX_351_HRTF_COMMAND
- if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation ) ) != IVAS_ERR_OK )
-#endif
-#endif
-#endif
{
fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
goto cleanup;
@@ -431,9 +467,9 @@ int main(
IVAS_RENDER_CONFIG_DATA renderConfig;
/* sanity check */
- if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
+ if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL )
{
- fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL_ROOM is used as output. Exiting. \n\n" );
+ fprintf( stderr, "\nExternal Renderer Config is supported only for BINAURAL and BINAURAL_ROOM. Exiting. \n\n" );
goto cleanup;
}
@@ -547,7 +583,7 @@ int main(
}
else
{
- error = decodeG192( arg, hBsReader, headRotReader, hIvasDec, pcmBuf );
+ error = decodeG192( arg, hBsReader, headRotReader, refRotReader, referenceVectorReader, hIvasDec, pcmBuf );
}
if ( error == IVAS_ERR_OK || error == IVAS_ERR_END_OF_FILE )
@@ -603,7 +639,8 @@ cleanup:
CustomLsReader_close( &hLsCustomReader );
hrtfFileReader_close( &hrtfReader );
HeadRotationFileReader_close( &headRotReader );
-
+ HeadRotationFileReader_close( &refRotReader );
+ Vector3PairFileReader_close( &referenceVectorReader );
RenderConfigReader_close( &renderConfigReader );
if ( BS_Reader_Close( &hBsReader ) != IVAS_ERR_OK )
@@ -730,9 +767,6 @@ static bool parseCmdlIVAS_dec(
float ftmp;
arg->forcedRendMode = IVAS_DEC_FORCE_REND_UNFORCED;
-#ifndef REMOVE_FORCE_SUBFRAME_BIN
- arg->forceSubframeBinauralization = false;
-#endif
#ifdef DEBUG_FOA_AGC
arg->agcBitstream = NULL;
#endif
@@ -746,7 +780,11 @@ static bool parseCmdlIVAS_dec(
arg->enableHeadRotation = false;
arg->headrotTrajFileName = NULL;
- arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF;
+ arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_NONE;
+ arg->enableReferenceRotation = false;
+ arg->headrotTrajFileName = NULL;
+ arg->enableReferenceVectorTracking = false;
+ arg->referenceVectorTrajFileName = NULL;
#ifdef SUPPORT_JBM_TRACEFILE
arg->jbmTraceFilename = NULL;
@@ -891,18 +929,9 @@ static bool parseCmdlIVAS_dec(
i++;
}
}
-#ifndef REMOVE_FORCE_SUBFRAME_BIN
- else if ( strcmp( argv_to_upper, "-FORCE_SUBFRAME_BIN" ) == 0 ) /* Force binauralization to subframe (5 ms) resolution */
- {
- arg->forceSubframeBinauralization = true;
- i++;
- }
-#endif
#ifdef DEBUG_MODE_INFO
#ifdef DEBUG_MODE_INFO_TWEAK
- /*-----------------------------------------------------------------*
- * Define additional subfolder for debug info output in ./res
- *-----------------------------------------------------------------*/
+ /* Define additional subfolder for debug info output in ./res */
else if ( strcmp( argv_to_upper, "-INFO" ) == 0 )
{
extern char infoFolder[FILENAME_MAX];
@@ -935,18 +964,16 @@ static bool parseCmdlIVAS_dec(
}
else if ( strcmp( argv_to_upper, "-OTR" ) == 0 )
{
- if ( strlen( argv[i + 1] ) > 3 )
- {
- fprintf( stderr, "Error: Invalid orientation tracking type %s \n\n", argv[i + 1] );
- usage_dec();
- return false;
- }
strncpy( argv_to_upper, argv[i + 1], sizeof( argv_to_upper ) - 1 );
argv_to_upper[sizeof( argv_to_upper ) - 1] = '\0';
to_upper( argv_to_upper );
- if ( strcmp( argv_to_upper, "REF" ) == 0 )
+ if ( strcmp( argv_to_upper, "NONE" ) == 0 )
+ {
+ arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_NONE;
+ }
+ else if ( strcmp( argv_to_upper, "REF" ) == 0 )
{
arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF;
}
@@ -954,6 +981,14 @@ static bool parseCmdlIVAS_dec(
{
arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_AVG;
}
+ else if ( strcmp( argv_to_upper, "REF_VEC" ) == 0 )
+ {
+ arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF_VEC;
+ }
+ else if ( strcmp( argv_to_upper, "REF_VEC_LEV" ) == 0 )
+ {
+ arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV;
+ }
else
{
fprintf( stderr, "Error: Invalid orientation tracking type %s \n\n", argv[i + 1] );
@@ -962,6 +997,36 @@ static bool parseCmdlIVAS_dec(
}
i += 2;
}
+ else if ( strcmp( argv_to_upper, "-RF" ) == 0 )
+ {
+ arg->enableReferenceRotation = true;
+ i++;
+
+ if ( argc - i <= 4 || argv[i][0] == '-' )
+ {
+ fprintf( stderr, "Error: Reference rotation file name not specified!\n\n" );
+ usage_dec();
+ return false;
+ }
+
+ arg->refrotTrajFileName = argv[i];
+ i++;
+ }
+ else if ( strcmp( argv_to_upper, "-RVF" ) == 0 )
+ {
+ arg->enableReferenceVectorTracking = true;
+ i++;
+
+ if ( argc - i <= 4 || argv[i][0] == '-' )
+ {
+ fprintf( stderr, "Error: reference vector trajectory file name not specified!\n\n" );
+ usage_dec();
+ return false;
+ }
+
+ arg->referenceVectorTrajFileName = argv[i];
+ i++;
+ }
else if ( strcmp( argv_to_upper, "-RENDER_CONFIG" ) == 0 )
{
arg->renderConfigEnabled = true;
@@ -1176,13 +1241,20 @@ static void usage_dec( void )
fprintf( stdout, " Format files, the magic word in the mime file is used to determine\n" );
fprintf( stdout, " which of the two supported formats is in use.\n" );
fprintf( stdout, " default bitstream file format is G.192\n" );
- fprintf( stdout, "-T File : Head rotation specified by external trajectory File\n" );
fprintf( stdout, "-hrtf File : HRTF filter File used in BINAURAL output configuration\n" );
+ fprintf( stdout, "-T File : Head rotation specified by external trajectory File\n" );
+ fprintf( stdout, "-otr tracking_type : Head orientation tracking type: 'none', 'ref', 'avg', 'ref_vec' \n" );
+ fprintf( stdout, " or 'ref_vec_lev' (only for binaural rendering)\n" );
+ fprintf( stdout, "-rf File : Reference rotation specified by external trajectory file\n" );
+ fprintf( stdout, " works only in combination with '-otr ref' mode \n" );
+ fprintf( stdout, "-rvf File : Reference vector specified by external trajectory file\n" );
+ fprintf( stdout, " works only in combination with '-otr ref_vec' and 'ref_vec_lev' modes\n" );
+ fprintf( stdout, "-render_config File : Renderer configuration File\n" );
+ fprintf( stdout, "-no_diegetic_pan : panning mono non-diegetic sound to stereo -1<= pan <=1,\n" );
+ fprintf( stdout, " left or l or 1->left, right or r or -1->right, center or c or 0->middle\n" );
+ fprintf( stdout, "-q : Quiet mode, no frame counter\n" );
+ fprintf( stdout, " default is deactivated\n" );
#ifdef DEBUGGING
-#ifndef REMOVE_FORCE_SUBFRAME_BIN
- fprintf( stdout, "-force_subframe_bin : Forces parametric binauralizer code to use 5 ms time resolution even when\n" );
- fprintf( stdout, " output time resolution is larger.\n" );
-#endif
fprintf( stdout, "-FEC X : Insert frame erasures, X = 0-10 is the percentage\n" );
fprintf( stdout, " of erased frames, or X may be the name of binary file or \n" );
fprintf( stdout, " file with G192 headers indicating GOOD FRAME or BAD FRAME\n" );
@@ -1190,12 +1262,6 @@ static void usage_dec( void )
fprintf( stdout, " default is OFF, if this option is not used\n" );
fprintf( stdout, "-force R : Force specific binaural rendering mode, R = (TDREND, CLDFBREND),\n" );
#endif
- fprintf( stdout, "-otr tracking_type : head orientation tracking type: 'ref' or 'avg' (only for binaural rendering)\n" );
- fprintf( stdout, "-render_config file : Renderer configuration file\n" );
- fprintf( stdout, "-no_diegetic_pan : panning mono no dietic sound to stereo -1<= pan <=1,\n" );
- fprintf( stdout, " left or l or 1->left, right or r or -1->right, center or c or 0->middle\n" );
- fprintf( stdout, "-q : Quiet mode, no frame counter\n" );
- fprintf( stdout, " default is deactivated\n" );
#ifdef DEBUG_MODE_INFO
#ifdef DEBUG_MODE_INFO_TWEAK
fprintf( stdout, "-info : specify subfolder name for debug output\n" );
@@ -1240,27 +1306,17 @@ static ivas_error initOnFirstGoodFrame(
ivas_error error = IVAS_ERR_UNKNOWN;
/* Now delay, number of output channels and frame size are known */
- if ( arg.delayCompensationEnabled )
+ if ( ( error = IVAS_DEC_GetDelay( hIvasDec, pFullDelayNumSamples, delayTimeScale ) ) != IVAS_ERR_OK )
{
- if ( ( error = IVAS_DEC_GetDelay( hIvasDec, pFullDelayNumSamples, delayTimeScale ) ) != IVAS_ERR_OK )
- {
- fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
- return error;
- }
+ fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
+ return error;
}
- else
+
+ if ( !arg.delayCompensationEnabled )
{
-#ifdef BINAURALIZATION_DELAY_REPORT
pFullDelayNumSamples[0] = 0;
-#else
- *pFullDelayNumSamples = 0;
-#endif
}
-#ifdef BINAURALIZATION_DELAY_REPORT
*pRemainingDelayNumSamples = pFullDelayNumSamples[0];
-#else
- *pRemainingDelayNumSamples = *pFullDelayNumSamples;
-#endif
if ( ( error = IVAS_DEC_GetNumOutputChannels( hIvasDec, pNumOutChannels ) ) != IVAS_ERR_OK )
{
@@ -1356,15 +1412,24 @@ static ivas_error initOnFirstGoodFrame(
/* If outputting MASA, open output file and write metadata for initial bad frames */
else if ( *pBsFormat == IVAS_DEC_BS_MASA )
{
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( ( error = MasaFileWriter_open( arg.outputWavFilename, arg.delayCompensationEnabled, ppMasaWriter ) ) != IVAS_ERR_OK )
+#else
if ( ( error = MasaFileWriter_open( arg.outputWavFilename, ppMasaWriter ) ) != IVAS_ERR_OK )
+#endif
{
fprintf( stderr, "\nError: Error opening MASA decoded metadata file %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );
return error;
}
/* Duplicate good first frame metadata to fill the beginning of stream. */
+#ifdef FIX_350_MASA_DELAY_COMP
+ MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL;
+ if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )
+#else
IVAS_MASA_QMETADATA_HANDLE qMetadata = NULL;
if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &qMetadata ) ) != IVAS_ERR_OK )
+#endif
{
fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
return error;
@@ -1372,7 +1437,11 @@ static ivas_error initOnFirstGoodFrame(
for ( int16_t j = 0; j < numInitialBadFrames; ++j )
{
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
+#else
if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, qMetadata ) ) != IVAS_ERR_OK )
+#endif
{
fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );
return error;
@@ -1394,6 +1463,8 @@ static ivas_error decodeG192(
DecArguments arg,
BS_READER_HANDLE hBsReader,
HeadRotFileReader *headRotReader,
+ HeadRotFileReader *refRotReader,
+ Vector3PairFileReader *referenceVectorReader,
IVAS_DEC_HANDLE hIvasDec,
int16_t *pcmBuf )
@@ -1411,16 +1482,13 @@ static ivas_error decodeG192(
int16_t numInitialBadFrames = 0; /* Number of bad frames received until first good frame is decoded */
int16_t nOutChannels = 0;
int16_t delayNumSamples = -1;
-#ifdef BINAURALIZATION_DELAY_REPORT
int16_t delayNumSamples_orig[3]; /* stores: overall delay, dec+rend delay, and binauralization delay */
-#else
- int16_t delayNumSamples_orig = 0;
-#endif
int16_t nOutSamples = 0;
int32_t delayTimeScale = 0;
ivas_error error = IVAS_ERR_UNKNOWN;
uint16_t numObj = 0;
IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN;
+ IVAS_POSITION Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];
for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
@@ -1438,9 +1506,7 @@ static ivas_error decodeG192(
fprintf( stdout, "\n-- Start the decoder (quiet mode) --\n\n" );
}
-#ifdef BINAURALIZATION_DELAY_REPORT
delayNumSamples_orig[0] = -1;
-#endif
#ifdef WMOPS
reset_stack();
@@ -1490,24 +1556,58 @@ static ivas_error decodeG192(
goto cleanup;
}
+ /* reference vector */
+ if ( arg.enableReferenceVectorTracking )
+ {
+ IVAS_VECTOR3 listenerPosition, referencePosition;
+ if ( ( error = Vector3PairFileReader_read( referenceVectorReader, &listenerPosition, &referencePosition ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError %s while reading listener and reference positions from %s\n", IVAS_DEC_GetErrorMessage( error ), Vector3PairFileReader_getFilePath( referenceVectorReader ) );
+ goto cleanup;
+ }
+
+ if ( ( error = IVAS_DEC_FeedRefVectorData( hIvasDec, listenerPosition, referencePosition ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nIVAS_DEC_FeedRefVectorData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
+ goto cleanup;
+ }
+ }
+ /* Reference rotation */
+ if ( arg.enableReferenceRotation )
+ {
+ IVAS_QUATERNION quaternion;
+ if ( ( error = HeadRotationFileReading( refRotReader, &quaternion, NULL ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError %s while reading reference rotation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( refRotReader ) );
+ goto cleanup;
+ }
+
+ if ( ( error = IVAS_DEC_FeedRefRotData( hIvasDec, quaternion ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nIVAS_DEC_FeedRefRotData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
+ goto cleanup;
+ }
+ }
/* Head-tracking input simulation */
if ( arg.enableHeadRotation )
{
IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
- if ( ( error = HeadRotationFileReading( headRotReader, Quaternions, frame ) ) != IVAS_ERR_OK )
+ for ( i = 0; i < IVAS_MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
{
- fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( headRotReader ) );
- goto cleanup;
+ if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[i], &Pos[i] ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( headRotReader ) );
+ goto cleanup;
+ }
}
- if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions ) ) != IVAS_ERR_OK )
+ if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions, Pos ) ) != IVAS_ERR_OK )
{
fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
goto cleanup;
}
}
-
/* Run decoder for one frame (get rendered output) */
if ( ( error = IVAS_DEC_GetSamples( hIvasDec, pcmBuf, &nOutSamples ) ) != IVAS_ERR_OK )
{
@@ -1532,11 +1632,7 @@ static ivas_error decodeG192(
arg,
numInitialBadFrames,
nOutSamples,
-#ifdef BINAURALIZATION_DELAY_REPORT
delayNumSamples_orig,
-#else
- &delayNumSamples_orig,
-#endif
&delayNumSamples,
&delayTimeScale,
&bsFormat,
@@ -1575,7 +1671,7 @@ static ivas_error decodeG192(
}
}
- /* Write ISm metadata to external file(s) */
+ /* Write ISM metadata to external file(s) */
if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT )
{
if ( bsFormat == IVAS_DEC_BS_OBJ )
@@ -1605,14 +1701,23 @@ static ivas_error decodeG192(
}
else if ( bsFormat == IVAS_DEC_BS_MASA )
{
+#ifdef FIX_350_MASA_DELAY_COMP
+ MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
+ if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )
+#else
IVAS_MASA_QMETADATA_HANDLE qMetadata;
if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &qMetadata ) ) != IVAS_ERR_OK )
+#endif
{
fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
goto cleanup;
}
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
+#else
if ( ( error = MasaFileWriter_writeFrame( masaWriter, qMetadata ) ) != IVAS_ERR_OK )
+#endif
{
fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
goto cleanup;
@@ -1632,8 +1737,8 @@ static ivas_error decodeG192(
#endif
}
#ifdef WMOPS
- update_wmops();
update_mem();
+ update_wmops();
#endif
}
@@ -1641,13 +1746,8 @@ static ivas_error decodeG192(
* Add zeros at the end to have equal length of synthesized signals
*------------------------------------------------------------------------------------------*/
-#ifdef BINAURALIZATION_DELAY_REPORT
memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) );
if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig[0] * nOutChannels ) ) != IVAS_ERR_OK )
-#else
- memset( pcmBuf, 0, delayNumSamples_orig * nOutChannels * sizeof( int16_t ) );
- if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig * nOutChannels ) ) != IVAS_ERR_OK )
-#endif
{
fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) );
goto cleanup;
@@ -1659,17 +1759,13 @@ static ivas_error decodeG192(
if ( !arg.quietModeEnabled )
{
-#ifdef BINAURALIZATION_DELAY_REPORT
printf( "\n\nDecoder+renderer delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[1] / (float) delayTimeScale, delayNumSamples_orig[1], delayTimeScale );
if ( delayNumSamples_orig[2] > 0 )
{
printf( "HRIR/BRIR delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[2] / (float) delayTimeScale, delayNumSamples_orig[2], delayTimeScale );
- printf( "Total delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[0] / (float) delayTimeScale, delayNumSamples_orig[0], delayTimeScale );
+ printf( "Total delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * ( delayNumSamples_orig[1] + delayNumSamples_orig[2] ) / (float) delayTimeScale, delayNumSamples_orig[1] + delayNumSamples_orig[2], delayTimeScale );
}
-#else
- fprintf( stdout, "\nDecoder delay: %-5u [samples] - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale );
-#endif
}
/* Print output metadata file name(s) */
@@ -1858,11 +1954,7 @@ static ivas_error decodeVoIP(
#endif
JbmOffsetFileWriter *jbmOffsetWriter = NULL;
-#ifdef BINAURALIZATION_DELAY_REPORT
int16_t delayNumSamples_orig[3]; /* stores: overall delay, dec+rend delay, and binauralization delay */
-#else
- int16_t delayNumSamples_orig = -1;
-#endif
int16_t delayNumSamples = -1;
int32_t delayTimeScale = -1;
@@ -1882,9 +1974,7 @@ static ivas_error decodeVoIP(
ismWriters[i] = NULL;
}
-#ifdef BINAURALIZATION_DELAY_REPORT
delayNumSamples_orig[0] = -1;
-#endif
rtpdumpDepacker.rtpdump = NULL;
switch ( arg.inputFormat )
@@ -2081,11 +2171,7 @@ static ivas_error decodeVoIP(
arg,
numInitialBadFrames,
nOutSamples,
-#ifdef BINAURALIZATION_DELAY_REPORT
delayNumSamples_orig,
-#else
- &delayNumSamples_orig,
-#endif
&delayNumSamples,
&delayTimeScale,
&bsFormat,
@@ -2133,8 +2219,8 @@ static ivas_error decodeVoIP(
systemTime_ms += 20;
#ifdef WMOPS
- update_wmops();
update_mem();
+ update_wmops();
#endif
}
@@ -2142,13 +2228,8 @@ static ivas_error decodeVoIP(
* Add zeros at the end to have equal length of synthesized signals
*------------------------------------------------------------------------------------------*/
-#ifdef BINAURALIZATION_DELAY_REPORT
memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) );
if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig[0] * nOutChannels ) ) != IVAS_ERR_OK )
-#else
- memset( pcmBuf, 0, delayNumSamples_orig * nOutChannels * sizeof( int16_t ) );
- if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig * nOutChannels ) ) != IVAS_ERR_OK )
-#endif
{
fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) );
goto cleanup;
@@ -2160,17 +2241,13 @@ static ivas_error decodeVoIP(
if ( !arg.quietModeEnabled )
{
-#ifdef BINAURALIZATION_DELAY_REPORT
printf( "\n\nDecoder+renderer delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[1] / (float) delayTimeScale, delayNumSamples_orig[1], delayTimeScale );
if ( delayNumSamples_orig[2] > 0 )
{
printf( "HRIR/BRIR delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[2] / (float) delayTimeScale, delayNumSamples_orig[2], delayTimeScale );
- printf( "Total delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[0] / (float) delayTimeScale, delayNumSamples_orig[0], delayTimeScale );
+ printf( "Total delay: %4.2f ms (%3u samples at timescale %5u)\n", 1000.f * ( delayNumSamples_orig[1] + delayNumSamples_orig[2] ) / (float) delayTimeScale, delayNumSamples_orig[1] + delayNumSamples_orig[2], delayTimeScale );
}
-#else
- printf( "\nDecoder delay: %5u [samples] - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale );
-#endif
}
/*------------------------------------------------------------------------------------------*
diff --git a/apps/encoder.c b/apps/encoder.c
index cf3e86e530728e6b14181c543dc7cb5a07113daf..dae5701affb4c6bfa9ee7457a3d2c224aad95cfc 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -134,6 +134,7 @@ typedef struct
#endif
#endif
bool pca;
+ bool ism_extended_metadata;
} EncArguments;
@@ -221,23 +222,6 @@ int main(
goto cleanup;
}
-#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS
- /*------------------------------------------------------------------------------------------*
- * Open input audio file
- *------------------------------------------------------------------------------------------*/
- int32_t inFileSampleRate = 0;
- if ( AudioFileReader_open( &audioReader, arg.inputWavFilename, &inFileSampleRate ) != IVAS_ERR_OK )
- {
- fprintf( stderr, "\nCan't open %s\n\n", arg.inputWavFilename );
- goto cleanup;
- }
- if ( inFileSampleRate != 0 && /* inFileSampleRate will remain zero if input file is raw PCM */
- inFileSampleRate != arg.inputFs )
- {
- fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", arg.inputFs, inFileSampleRate, arg.inputWavFilename );
- goto cleanup;
- }
-#endif
/*------------------------------------------------------------------------------------------*
* Open output bitstream file
@@ -403,7 +387,7 @@ int main(
}
break;
case IVAS_ENC_INPUT_ISM:
- if ( ( error = IVAS_ENC_ConfigureForObjects( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.ism.numObjects ) ) != IVAS_ERR_OK )
+ if ( ( error = IVAS_ENC_ConfigureForObjects( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.ism.numObjects, arg.ism_extended_metadata ) ) != IVAS_ERR_OK )
{
fprintf( stderr, "\nIVAS_ENC_ConfigureForObjects failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
goto cleanup;
@@ -469,7 +453,6 @@ int main(
goto cleanup;
}
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
/*------------------------------------------------------------------------------------------*
* Open input audio file
*------------------------------------------------------------------------------------------*/
@@ -528,7 +511,6 @@ int main(
fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );
goto cleanup;
}
-#endif
/*------------------------------------------------------------------------------------------*
* Open input metadata files
@@ -740,7 +722,7 @@ int main(
}
#endif
- /* Read ISm input metadata */
+ /* Read ISM input metadata */
for ( i = 0; i < numIsmInputs; ++i )
{
if ( ismReaders[i] == NULL )
@@ -800,8 +782,8 @@ int main(
}
#ifdef WMOPS
- update_wmops();
update_mem();
+ update_wmops();
#endif
}
@@ -917,6 +899,7 @@ static void initArgStruct( EncArguments *arg )
arg->caConfig = IVAS_ENC_GetDefaultChannelAwareConfig();
arg->ca_config_file = NULL;
arg->mimeOutput = false;
+ arg->ism_extended_metadata = false;
#ifdef DEBUGGING
arg->forcedMode = IVAS_ENC_FORCE_UNFORCED;
@@ -1304,6 +1287,11 @@ static bool parseCmdlIVAS_enc(
if ( i < argc - 4 )
{
+ if ( argv[i][0] == '+' )
+ {
+ argv[i]++;
+ arg->ism_extended_metadata = true;
+ }
if ( !is_digits_only( argv[i] ) )
{
fprintf( stderr, "Error: Number of ISM channels must be an integer number!\n\n" );
@@ -1756,7 +1744,6 @@ static void usage_enc( void )
fprintf( stdout, " *VBR mode (average bitrate),\n" );
fprintf( stdout, " for AMR-WB IO modes R = (6600, 8850, 12650, 14250, 15850, 18250,\n" );
fprintf( stdout, " 19850, 23050, 23850) \n" );
-#ifdef ISM_HIGHEST_BITRATE
fprintf( stdout, " for IVAS stereo R = (13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" );
fprintf( stdout, " 96000, 128000, 160000, 192000, 256000) \n" );
fprintf( stdout, " for IVAS ISM R = 13200 for 1 ISM, 16400 for 1 ISM and 2 ISM, \n" );
@@ -1764,10 +1751,6 @@ static void usage_enc( void )
fprintf( stdout, " for 2 ISM, 3 ISM and 4 ISM also 160000, 192000, 256000) \n" );
fprintf( stdout, " for 3 ISM and 4 ISM also 384000 \n" );
fprintf( stdout, " for 4 ISM also 512000 \n" );
-#else
- fprintf( stdout, " for IVAS stereo & ISm R =(13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" );
- fprintf( stdout, " 96000, 128000, 160000, 192000, 256000) \n" );
-#endif
fprintf( stdout, " for IVAS SBA, MASA, MC R=(13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" );
fprintf( stdout, " 96000, 128000, 160000, 192000, 256000, 384000, 512000) \n" );
#ifdef MASA_AND_OBJECTS
@@ -1787,8 +1770,9 @@ static void usage_enc( void )
fprintf( stdout, "EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, -masa, -mc\n" );
fprintf( stdout, "-stereo [Mode] : Stereo format, default is unified stereo \n" );
fprintf( stdout, " optional for Mode: 1: DFT Stereo, 2: TD Stereo, 3: MDCT Stereo\n" );
- fprintf( stdout, "-ism Channels Files : ISM format \n" );
- fprintf( stdout, " where Channels specifies the number of ISMs (1-4)\n" );
+ fprintf( stdout, "-ism (+)Ch Files : ISM format \n" );
+ fprintf( stdout, " where Ch specifies the number of ISMs (1-4)\n" );
+ fprintf( stdout, " where positive (+) means extended metadata format is used (including orientation and radius) \n" );
fprintf( stdout, " and Files specify input files containing metadata, one file per object\n" );
fprintf( stdout, " (use NULL for no input metadata)\n" );
fprintf( stdout, "-sba +/-Order : Scene Based Audio input format (Ambisonics ACN/SN3D),\n" );
diff --git a/apps/renderer.c b/apps/renderer.c
index 6a9d7ccfc37fd3f87ae3c5da1b1f0317bd21571b..726eeb237b13c1e6f6f7b3c9b391b17373e213d0 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -42,6 +42,7 @@
#include "cmdl_tools.h"
#include "cmdln_parser.h"
#include "head_rotation_file_reader.h"
+#include "vector3_pair_file_reader.h"
#include "hrtf_file_reader.h"
#include "ism_file_reader.h"
#include "ls_custom_file_reader.h"
@@ -130,6 +131,8 @@ typedef struct
char inMetadataFilePaths[RENDERER_MAX_ISM_INPUTS][RENDERER_MAX_CLI_ARG_LENGTH];
int16_t numInMetadataFiles;
char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
+ char referenceVectorFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
+ char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
int8_t orientationTracking;
@@ -154,6 +157,7 @@ typedef enum
CmdLnOptionId_outputFormat,
CmdLnOptionId_sampleRate,
CmdLnOptionId_trajFile,
+ CmdLnOptionId_refRotFile,
CmdLnOptionId_customHrtfFile,
CmdLnOptionId_renderConfigFile,
CmdLnOptionId_noDiegeticPan,
@@ -165,6 +169,7 @@ typedef enum
CmdLnOptionId_inputMetadata,
CmdLnOptionId_listFormats,
CmdLnOptionId_inputGain,
+ CmdLnOptionId_referenceVectorFile,
} CmdLnOptionId;
static const CmdLnParser_Option cliOptions[] = {
@@ -210,6 +215,12 @@ static const CmdLnParser_Option cliOptions[] = {
.matchShort = "tf",
.description = "Head rotation trajectory file for simulation of head tracking (only for BINAURAL and BINAURAL_ROOM outputs)",
},
+ {
+ .id = CmdLnOptionId_refRotFile,
+ .match = "reference_rotation_file",
+ .matchShort = "rf",
+ .description = "Reference rotation trajectory file for simulation of head tracking (only for BINAURAL and BINAURAL_ROOM outputs)",
+ },
{
.id = CmdLnOptionId_customHrtfFile,
.match = "custom_hrtf",
@@ -232,7 +243,7 @@ static const CmdLnParser_Option cliOptions[] = {
.id = CmdLnOptionId_orientationTracking,
.match = "tracking_type",
.matchShort = "otr",
- .description = "Head orientation tracking type: 'ref' or 'avg' (only for BINAURAL and BINAURAL_ROOM) (todo: check implementation)",
+ .description = "Head orientation tracking type: 'none', 'ref', 'avg' or `ref_vec` or `ref_vec_lev` (only for BINAURAL and BINAURAL_ROOM)",
},
{
.id = CmdlnOptionId_lfePosition,
@@ -268,6 +279,12 @@ static const CmdLnParser_Option cliOptions[] = {
.matchShort = "l",
.description = "List supported audio formats",
},
+ {
+ .id = CmdLnOptionId_referenceVectorFile,
+ .match = "reference_vector_file",
+ .matchShort = "rvf",
+ .description = "Reference vector trajectory file for simulation of head tracking (only for BINAURAL and BINAURAL_ROOM outputs)",
+ },
};
@@ -494,6 +511,8 @@ int main(
{
IVAS_REND_HANDLE hIvasRend;
HeadRotFileReader *headRotReader = NULL;
+ Vector3PairFileReader *referenceVectorReader = NULL;
+ HeadRotFileReader *referenceRotReader = NULL;
hrtfFileReader *hrtfFileReader = NULL;
IsmPositionProvider *positionProvider;
RenderConfigReader *renderConfigReader = NULL;
@@ -517,6 +536,7 @@ int main(
int32_t delayTimeScale = 0;
int16_t i, numChannels;
ivas_error error = IVAS_ERR_OK;
+ IVAS_POSITION Pos[RENDERER_HEAD_POSITIONS_PER_FRAME];
#ifdef WMOPS
reset_wmops();
@@ -536,21 +556,52 @@ int main(
convert_backslash( args.inputFilePath );
convert_backslash( args.outputFilePath );
convert_backslash( args.headRotationFilePath );
+ convert_backslash( args.referenceVectorFilePath );
+ convert_backslash( args.referenceRotationFilePath );
convert_backslash( args.inLfePanningMatrixFile );
if ( !isEmptyString( args.headRotationFilePath ) )
{
- HeadRotationFileReader_open( args.headRotationFilePath, &headRotReader );
+ if ( HeadRotationFileReader_open( args.headRotationFilePath, &headRotReader ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error opening file: %s\n", args.headRotationFilePath );
+ exit( -1 );
+ }
+ }
+
+ if ( !isEmptyString( args.referenceRotationFilePath ) )
+ {
+ if ( HeadRotationFileReader_open( args.referenceRotationFilePath, &referenceRotReader ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error opening file: %s\n", args.referenceRotationFilePath );
+ exit( -1 );
+ }
+ }
+ if ( !isEmptyString( args.referenceVectorFilePath ) )
+ {
+ if ( Vector3PairFileReader_open( args.referenceVectorFilePath, &referenceVectorReader ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error opening file: %s\n", args.referenceVectorFilePath );
+ exit( -1 );
+ }
}
if ( !isEmptyString( args.customHrtfFilePath ) )
{
- hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader );
+ if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error opening file: %s\n", args.customHrtfFilePath );
+ exit( -1 );
+ }
}
if ( !isEmptyString( args.renderConfigFilePath ) )
{
- RenderConfigReader_open( args.renderConfigFilePath, &renderConfigReader );
+ if ( RenderConfigReader_open( args.renderConfigFilePath, &renderConfigReader ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error opening file: %s\n", args.renderConfigFilePath );
+ exit( -1 );
+ }
}
/* Initialize main input files, i.e. audio and metadata */
@@ -565,7 +616,6 @@ int main(
setupWithSingleFormatInput( args, audioFilePath, positionProvider, masaReaders );
}
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
if ( AudioFileReader_open( &audioReader, audioFilePath ) != IVAS_ERR_OK )
{
fprintf( stderr, "Error opening file: %s\n", audioFilePath );
@@ -595,7 +645,9 @@ int main(
fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" );
exit( -1 );
}
+#ifndef FIX_389_EXT_REND_PCM_SR
args.sampleRate = inFileSampleRate;
+#endif
break;
default:
fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
@@ -609,28 +661,6 @@ int main(
fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
exit( -1 );
}
-#else
- int32_t inFileSampleRate = 0;
- if ( AudioFileReader_open( &audioReader, audioFilePath, &inFileSampleRate ) != IVAS_ERR_OK )
- {
- fprintf( stderr, "Error opening file: %s\n", audioFilePath );
- exit( -1 );
- }
- if ( args.sampleRate == 0 && inFileSampleRate == 0 )
- {
- fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" );
- exit( -1 );
- }
- if ( args.sampleRate != 0 && inFileSampleRate != 0 && args.sampleRate != inFileSampleRate )
- {
- fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", args.sampleRate, inFileSampleRate, args.inputFilePath );
- exit( -1 );
- }
- if ( args.sampleRate == 0 )
- {
- args.sampleRate = inFileSampleRate;
- }
-#endif
const int16_t frameSize_smpls = (int16_t) ( 20 * args.sampleRate / 1000 );
IVAS_REND_InputId mcIds[RENDERER_MAX_MC_INPUTS] = { 0 };
@@ -645,8 +675,13 @@ int main(
}
/* === Configure === */
- if ( ( error = IVAS_REND_InitConfig( hIvasRend, strlen( args.renderConfigFilePath ) != 0 ) ) != IVAS_ERR_OK )
+#ifdef FIX_392_LATE_REVERB
+ if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )
+#else
+ if ( ( error = IVAS_REND_InitConfig( hIvasRend, ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) || ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL ) ) ) != IVAS_ERR_OK )
+#endif
{
+ fprintf( stderr, "Error in Renderer Config Init\n" );
exit( -1 );
}
@@ -655,9 +690,9 @@ int main(
IVAS_RENDER_CONFIG_DATA renderConfig;
/* sanity check */
- if ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM )
+ if ( ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) && ( args.outConfig.audioConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL ) )
{
- fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL_ROOM is used as output. Exiting. \n" );
+ fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL or BINAURAL_ROOM is used as output. Exiting. \n" );
exit( -1 );
}
@@ -680,6 +715,11 @@ int main(
}
}
+ if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientationTracking ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
/* Set up output custom layout configuration */
if ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM )
{
@@ -798,12 +838,7 @@ int main(
const int16_t totalNumInChannels = getTotalNumInChannels( hIvasRend, mcIds, ismIds, sbaIds, masaIds );
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
if ( inFileNumChannels != 0 /* inFileNumChannels is 0 with raw PCM input */ && totalNumInChannels != inFileNumChannels )
-#else
- if ( AudioFileReader_getNumChannels( audioReader ) != 0 /* If input file is raw PCM, audio reader has no info about number of channels */
- && totalNumInChannels != AudioFileReader_getNumChannels( audioReader ) )
-#endif
{
fprintf( stderr, "Number of channels in input file does not match selected configuration\n" );
exit( -1 );
@@ -884,16 +919,68 @@ int main(
ObjectPositionBuffer mtdBuffer;
IsmPositionProvider_getNextFrame( positionProvider, &mtdBuffer );
+ if ( referenceVectorReader != NULL )
+ {
+ IVAS_VECTOR3 listenerPos, refPos;
+ if ( ( error = Vector3PairFileReader_read( referenceVectorReader, &listenerPos, &refPos ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
+ exit( -1 );
+ }
+ if ( ( error = IVAS_REND_SetReferenceVector( hIvasRend, listenerPos, refPos ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
+ exit( -1 );
+ }
+ }
+ /* Read from reference rotation trajectory file if specified */
+ if ( referenceRotReader != NULL )
+ {
+ IVAS_QUATERNION quaternion;
+ if ( ( error = HeadRotationFileReading( referenceRotReader, &quaternion, NULL ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) );
+ exit( -1 );
+ }
+
+ if ( ( error = IVAS_REND_SetReferenceRotation( hIvasRend, quaternion ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error setting Reference Rotation: %s\n", ivas_error_to_string( error ) );
+ exit( -1 );
+ }
+ }
+
/* Read from head rotation trajectory file if specified */
if ( headRotReader != NULL )
{
IVAS_QUATERNION quatBuffer[RENDERER_HEAD_POSITIONS_PER_FRAME];
- HeadRotationFileReading( headRotReader, quatBuffer, frame );
- IVAS_REND_SetHeadRotation( hIvasRend, quatBuffer );
+
+ for ( i = 0; i < RENDERER_HEAD_POSITIONS_PER_FRAME; i++ )
+ {
+ if ( ( error = HeadRotationFileReading( headRotReader, &quatBuffer[i], &Pos[i] ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) );
+ exit( -1 );
+ }
+ }
+ if ( ( error = IVAS_REND_SetHeadRotation( hIvasRend, quatBuffer, Pos ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) );
+ exit( -1 );
+ }
}
else
{
- IVAS_REND_SetHeadRotation( hIvasRend, NULL );
+#ifdef FIX_379_EXT_METADATA
+ error = IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL );
+ if ( ( error != IVAS_ERR_OK ) && ( error != IVAS_ERR_INVALID_OUTPUT_FORMAT ) ) // VE: TBC
+#else
+ if ( ( ( error = IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ) ) != IVAS_ERR_OK ) && ( IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ) != IVAS_ERR_INVALID_OUTPUT_FORMAT ) ) // VE: TBC
+#endif
+ {
+ fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) );
+ exit( -1 );
+ }
}
for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )
@@ -973,7 +1060,11 @@ int main(
}
}
- IVAS_REND_GetSamples( hIvasRend, outBuffer );
+ if ( IVAS_REND_GetSamples( hIvasRend, outBuffer ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "Error in getting samples\n" );
+ exit( -1 );
+ }
int16_t num_out_channels;
num_out_channels = outBuffer.config.numChannels;
@@ -1021,8 +1112,8 @@ int main(
}
#ifdef WMOPS
- update_wmops();
update_mem();
+ update_wmops();
#endif
}
@@ -1065,6 +1156,8 @@ int main(
AudioFileReader_close( &audioReader );
AudioFileWriter_close( &audioWriter );
HeadRotationFileReader_close( &headRotReader );
+ Vector3PairFileReader_close( &referenceVectorReader );
+ HeadRotationFileReader_close( &referenceRotReader );
hrtfFileReader_close( &hrtfFileReader );
IVAS_REND_Close( &hIvasRend );
IsmPositionProvider_close( positionProvider );
@@ -1290,7 +1383,11 @@ static bool parseOrientationTracking(
to_upper( value );
- if ( strcmp( value, "REF" ) == 0 )
+ if ( strcmp( value, "NONE" ) == 0 )
+ {
+ *tracking_type = IVAS_ORIENT_TRK_NONE;
+ }
+ else if ( strcmp( value, "REF" ) == 0 )
{
*tracking_type = IVAS_ORIENT_TRK_REF;
}
@@ -1298,6 +1395,14 @@ static bool parseOrientationTracking(
{
*tracking_type = IVAS_ORIENT_TRK_AVG;
}
+ else if ( strcmp( value, "REF_VEC" ) == 0 )
+ {
+ *tracking_type = IVAS_ORIENT_TRK_REF_VEC;
+ }
+ else if ( strcmp( value, "REF_VEC_LEV" ) == 0 )
+ {
+ *tracking_type = IVAS_ORIENT_TRK_REF_VEC_LEV;
+ }
else
{
fprintf( stderr, "Error: Invalid orientation tracking type %s \n\n", value );
@@ -1515,10 +1620,12 @@ static CmdlnArgs defaultArgs(
args.numInMetadataFiles = 0;
clearString( args.headRotationFilePath );
+ clearString( args.referenceVectorFilePath );
+ clearString( args.referenceRotationFilePath );
clearString( args.customHrtfFilePath );
clearString( args.renderConfigFilePath );
- args.orientationTracking = IVAS_ORIENT_TRK_REF;
+ args.orientationTracking = IVAS_ORIENT_TRK_NONE;
args.noDiegeticPan = 0.0f;
args.delayCompensationEnabled = true;
@@ -1593,6 +1700,14 @@ static void parseOption(
assert( numOptionValues == 1 );
strncpy( args->headRotationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
break;
+ case CmdLnOptionId_referenceVectorFile:
+ assert( numOptionValues == 1 );
+ strncpy( args->referenceVectorFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
+ break;
+ case CmdLnOptionId_refRotFile:
+ assert( numOptionValues == 1 );
+ strncpy( args->referenceRotationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
+ break;
case CmdLnOptionId_customHrtfFile:
assert( numOptionValues == 1 );
strncpy( args->customHrtfFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
@@ -1709,12 +1824,15 @@ void getMetadataFromFileReader(
if ( ( error = IsmFileReader_readNextFrame( ismReader, &ismMetadata ) ) != IVAS_ERR_OK )
{
- fprintf( stderr, "\nError (%s) while reading ism metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) );
+ fprintf( stderr, "\nError (%s) while reading ISM metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) );
exit( -1 );
}
objectMetadataBuffer->positions[objIdx].azimuth = ismMetadata.azimuth;
objectMetadataBuffer->positions[objIdx].elevation = ismMetadata.elevation;
+ objectMetadataBuffer->positions[objIdx].radius = ismMetadata.radius;
+ objectMetadataBuffer->positions[objIdx].yaw = ismMetadata.yaw;
+ objectMetadataBuffer->positions[objIdx].pitch = ismMetadata.pitch;
return;
}
@@ -1769,6 +1887,9 @@ static void IsmPositionProvider_getNextFrame(
{
objectMetadataBuffer->positions[objIdx].azimuth = 0.0f;
objectMetadataBuffer->positions[objIdx].elevation = 0.0f;
+ objectMetadataBuffer->positions[objIdx].radius = 1.0f;
+ objectMetadataBuffer->positions[objIdx].yaw = 0.0f;
+ objectMetadataBuffer->positions[objIdx].pitch = 0.0f;
}
/* Wrap azimuth to lie within (-180, 180] range */
@@ -1783,6 +1904,18 @@ static void IsmPositionProvider_getNextFrame(
/* Clamp elevation to lie within [-90, 90] range (can't be wrapped easily) */
objectMetadataBuffer->positions[objIdx].elevation = min( max( objectMetadataBuffer->positions[objIdx].elevation, -90 ), 90 );
+ /* Wrap yaw to lie within (-180, 180] range */
+ while ( objectMetadataBuffer->positions[objIdx].yaw < 0.0f )
+ {
+ objectMetadataBuffer->positions[objIdx].yaw += 360.0f;
+ }
+ while ( objectMetadataBuffer->positions[objIdx].yaw >= 360.0f )
+ {
+ objectMetadataBuffer->positions[objIdx].yaw -= 360.0f;
+ }
+
+ /* Clamp pitch to lie within [-90, 90] range (can't be wrapped easily) */
+ objectMetadataBuffer->positions[objIdx].pitch = min( max( objectMetadataBuffer->positions[objIdx].pitch, -90 ), 90 );
}
++positionProvider->frameCounter;
@@ -2017,33 +2150,26 @@ static void parseObjectPosition(
uint16_t *positionDuration )
{
char *endptr;
+ int16_t read_values;
+ float meta_prm[7] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f };
readNextMetadataChunk( line, "," );
*positionDuration = (uint16_t) strtol( line, &endptr, 10 );
+ readNextMetadataChunk( line, "\n" );
- if ( *endptr != '\0' )
- {
- fprintf( stderr, "Error reading metadata\n" );
- exit( -1 );
- }
-
- readNextMetadataChunk( line, "," );
- position->azimuth = strtof( line, &endptr );
-
- if ( *endptr != '\0' )
- {
- fprintf( stderr, "Error reading metadata\n" );
- exit( -1 );
- }
+ read_values = (int16_t) sscanf( line, "%f,%f,%f,%f,%f,%f,%f", &meta_prm[0], &meta_prm[1], &meta_prm[2], &meta_prm[3], &meta_prm[4], &meta_prm[5], &meta_prm[6] );
- readNextMetadataChunk( line, "\n" );
- position->elevation = strtof( line, &endptr );
- if ( *endptr != '\0' )
+ if ( read_values < 2 )
{
fprintf( stderr, "Error reading metadata\n" );
exit( -1 );
}
+ position->azimuth = meta_prm[0];
+ position->elevation = meta_prm[1];
+ position->radius = meta_prm[2];
+ position->yaw = meta_prm[5];
+ position->pitch = meta_prm[6];
return;
}
diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c
index 6cd20c8831fed072124e4252d20c791412b139ba..3b11ab8c3d72e5ee229452fbae27efe2355dc04e 100644
--- a/lib_com/bitstream.c
+++ b/lib_com/bitstream.c
@@ -833,12 +833,13 @@ static ivas_error write_indices_element(
/* restore previous pointer position */
pt_stream_loc = pt_stream_backup;
}
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
/* TODO implemented only for MCT for now */
if ( ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT ) && ( st_ivas->mc_mode == MC_MODE_MCT ) && ( element_id * CPE_CHANNELS + n == LFE_CHANNEL ) )
{
continue;
}
+#endif
#ifdef ENABLE_BITRATE_VERIFICATION
total_nb_bits =
#endif
diff --git a/lib_com/cldfb.c b/lib_com/cldfb.c
index 61539e2355ec5d9db3603452ca0f257c09c449ed..1490703aeed53e88f6c690fa27b9118425d87ca0 100644
--- a/lib_com/cldfb.c
+++ b/lib_com/cldfb.c
@@ -706,8 +706,7 @@ ivas_error openCldfb(
HANDLE_CLDFB_FILTER_BANK hs;
int16_t buf_len;
- hs = (HANDLE_CLDFB_FILTER_BANK) malloc( sizeof( CLDFB_FILTER_BANK ) );
- if ( hs == NULL )
+ if ( ( hs = (HANDLE_CLDFB_FILTER_BANK) malloc( sizeof( CLDFB_FILTER_BANK ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
}
@@ -728,8 +727,7 @@ ivas_error openCldfb(
buf_len = hs->p_filter_length;
}
- hs->cldfb_state = (float *) malloc( buf_len * sizeof( float ) );
- if ( hs->cldfb_state == NULL )
+ if ( ( hs->cldfb_state = (float *) malloc( buf_len * sizeof( float ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
}
@@ -885,16 +883,19 @@ void deleteCldfb(
{
HANDLE_CLDFB_FILTER_BANK hs = *h_cldfb;
- if ( hs )
+ if ( h_cldfb == NULL || *h_cldfb == NULL )
{
- if ( hs->cldfb_state )
- {
- free( hs->cldfb_state );
- }
- free( hs );
- *h_cldfb = NULL;
+ return;
}
+ if ( hs->cldfb_state )
+ {
+ free( hs->cldfb_state );
+ }
+
+ free( hs );
+ *h_cldfb = NULL;
+
return;
}
@@ -1148,8 +1149,7 @@ ivas_error cldfb_save_memory(
hs->memory_length = hs->p_filter_length;
}
- hs->memory = (float *) malloc( hs->memory_length * sizeof( float ) );
- if ( hs->memory == NULL )
+ if ( ( hs->memory = (float *) malloc( hs->memory_length * sizeof( float ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB\n" );
}
diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h
index 893bf6b265b141435359c3ea71ff93c773cff49b..3e012a6f99685c080760cade2d1e15a90874970a 100644
--- a/lib_com/common_api_types.h
+++ b/lib_com/common_api_types.h
@@ -78,6 +78,8 @@ typedef struct _IVAS_ISM_METADATA
float radius;
float spread;
float gainFactor;
+ float yaw;
+ float pitch;
} IVAS_ISM_METADATA;
typedef struct
@@ -86,8 +88,23 @@ typedef struct
} IVAS_QUATERNION;
+typedef struct
+{
+ float x, y, z;
+} IVAS_VECTOR3;
+
+typedef struct
+{
+ float x, y, z;
+
+} IVAS_POSITION;
+
typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;
+#ifdef FIX_350_MASA_DELAY_COMP
+typedef struct ivas_masa_decoder_ext_out_meta_struct *MASA_DECODER_EXT_OUT_META_HANDLE;
+#else
typedef struct ivas_masa_qmetadata_frame_struct *IVAS_MASA_QMETADATA_HANDLE;
+#endif
typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;
typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;
@@ -107,6 +124,9 @@ typedef struct
{
float azimuth;
float elevation;
+ float radius;
+ float yaw;
+ float pitch;
} IVAS_REND_AudioObjectPosition;
typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
@@ -128,6 +148,7 @@ typedef struct _IVAS_RENDER_CONFIG
IVAS_RENDER_TYPE_OVERRIDE renderer_type_override;
#endif
IVAS_ROOM_ACOUSTICS_CONFIG_DATA room_acoustics;
+ float directivity[3];
} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;
typedef struct _IVAS_LS_CUSTOM_LAYOUT
diff --git a/lib_com/core_com_config.c b/lib_com/core_com_config.c
index 120d0876d1f32569cf4bd8afe3b5089af9924789..d138fe1a1ed28c2dc77f12c855af07457a843319 100644
--- a/lib_com/core_com_config.c
+++ b/lib_com/core_com_config.c
@@ -247,16 +247,21 @@ int16_t getResq(
*-------------------------------------------------------------------*/
int16_t getTnsAllowed(
- const int32_t total_brate, /* i : total bitrate */
- const int16_t igf, /* i : flag indicating IGF activity*/
- const int16_t element_mode, /* i : IVAS element mode */
+ const int32_t total_brate, /* i : total bitrate */
+ const int16_t igf, /* i : flag indicating IGF activity*/
+ const int16_t element_mode /* i : IVAS element mode */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */
+#endif
)
{
int16_t tnsAllowed = 0;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( mct_chan_mode != MCT_CHAN_MODE_LFE )
{
+#endif
if ( igf )
{
if ( total_brate > HQ_16k40 || ( ( total_brate > HQ_13k20 ) && element_mode == IVAS_CPE_DFT ) )
@@ -268,7 +273,9 @@ int16_t getTnsAllowed(
{
tnsAllowed = 1;
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
return tnsAllowed;
}
@@ -411,16 +418,21 @@ int16_t getIgfPresent(
const int16_t element_mode, /* i : IVAS element mode */
const int32_t total_brate, /* i : total bitrate */
const int16_t bwidth, /* i : audio bandwidth */
- const int16_t rf_mode, /* i : flag to signal the RF mode */
+ const int16_t rf_mode /* i : flag to signal the RF mode */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
const int16_t mct_chan_mode /* i : MCT channel mode */
+#endif
)
{
int16_t igfPresent = 0;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( mct_chan_mode == MCT_CHAN_MODE_LFE )
{
return igfPresent;
}
+#endif
if ( bwidth == SWB )
{
@@ -808,8 +820,11 @@ void init_tcx_cfg(
const int16_t infoIGFStopFreq,
const int16_t element_mode,
const int16_t ini_frame,
- const int16_t MCT_flag,
+ const int16_t MCT_flag
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
const MCT_CHAN_MODE mct_chan_mode /* i : MDCT channel mode */
+#endif
)
{
int16_t i;
@@ -840,13 +855,20 @@ void init_tcx_cfg(
/* set number of coded lines */
hTcxCfg->tcx_coded_lines = getNumTcxCodedLines( bwidth );
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( mct_chan_mode == MCT_CHAN_MODE_LFE )
{
hTcxCfg->tcx_coded_lines = MCT_LFE_MAX_LINE;
}
+#endif
/* TNS in TCX */
hTcxCfg->pCurrentTnsConfig = NULL;
- hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, igf, element_mode, mct_chan_mode );
+ hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, igf, element_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ mct_chan_mode
+#endif
+ );
if ( hTcxCfg->fIsTNSAllowed )
{
diff --git a/lib_com/delay_comp.c b/lib_com/delay_comp.c
index 09a642bbaa4c558048ce79077430ac8de01ea25b..b96798815e46592f6a4bf3194e248c1145b7bc30 100644
--- a/lib_com/delay_comp.c
+++ b/lib_com/delay_comp.c
@@ -55,10 +55,6 @@ int32_t get_delay(
const int32_t io_fs, /* i : input/output sampling frequency */
const IVAS_FORMAT ivas_format, /* i : IVAS format */
HANDLE_CLDFB_FILTER_BANK hCldfb /* i : Handle of Cldfb analysis */
-#ifndef BINAURALIZATION_DELAY_REPORT
- ,
- const int32_t binaural_latency_ns /* i : binaural renderer HRTF delay in ns */
-#endif
)
{
int32_t delay = 0;
@@ -72,6 +68,13 @@ int32_t get_delay(
else /* IVAS */
{
delay = IVAS_ENC_DELAY_NS;
+
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( ivas_format == MASA_FORMAT )
+ {
+ delay = 0; /* All delay is compensated in the decoder with MASA */
+ }
+#endif
}
if ( ivas_format == SBA_FORMAT )
@@ -103,9 +106,12 @@ int32_t get_delay(
delay += IVAS_FB_DEC_DELAY_NS;
}
-#ifndef BINAURALIZATION_DELAY_REPORT
- /* compensate for binauralization delay */
- delay += binaural_latency_ns;
+
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( ivas_format == MASA_FORMAT )
+ {
+ delay += IVAS_ENC_DELAY_NS; /* Compensate also the encoder delay in the decoder with MASA */
+ }
#endif
}
}
diff --git a/lib_com/fd_cng_com.c b/lib_com/fd_cng_com.c
index 0203cd4fb75dd6eeb234c7fddcf30a3d692d34e3..f2dbf746b6f18d5e6b9fc07aaa570384733702be 100644
--- a/lib_com/fd_cng_com.c
+++ b/lib_com/fd_cng_com.c
@@ -68,9 +68,7 @@ ivas_error createFdCngCom(
HANDLE_FD_CNG_COM hs;
/* Allocate memory */
- hs = (HANDLE_FD_CNG_COM) malloc( sizeof( FD_CNG_COM ) );
-
- if ( hs == NULL )
+ if ( ( hs = (HANDLE_FD_CNG_COM) malloc( sizeof( FD_CNG_COM ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD CNG COM" );
}
diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index 2474eee778073407b70d710a837628137c14fc0f..4024f003ea9ebae1224d5db088ac342be0a61b42 100644
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -334,6 +334,15 @@ typedef enum
#define ISM_Q_STEP 2.5f
#define ISM_Q_STEP_BORDER 5.0f
+#define ISM_RADIUS_NBITS 6
+#define ISM_RADIUS_MIN 0.0f
+#define ISM_RADIUS_DELTA 0.25f /* Max radius = (2^ISM_RADIUS_NBITS-1)*0.25 = 15.75 */
+#define ISM_EXTENDED_METADATA_BRATE IVAS_64k
+#define ISM_EXTENDED_METADATA_BITS 1
+#ifdef FIX_379_EXT_METADATA
+#define ISM_METADATA_RS_MAX_FRAMES 5 /* Number of frames with opposite extended metadata flags before switching */
+#endif
+
/* Parametric ISM */
#define MAX_PARAM_ISM_NBANDS 11
#define MAX_PARAM_ISM_NBANDS_WB 9
@@ -347,12 +356,27 @@ typedef enum
#define PARAM_ISM_MAX_CHAN 16
#define PARAM_ISM_HYS_BUF_SIZE 10
-#ifdef PARAM_ISM_DTX_CNG
+/* ISM DTX */
+#ifdef DISCRETE_ISM_DTX_CNG
+#define ISM_DTX_COH_SCA_BITS 4
+#else
#define PARAM_ISM_DTX_COH_SCA_BITS 4
-#define PARAM_ISM_DTX_AZI_BITS 5
+#endif
+#ifdef DISCRETE_ISM_DTX_CNG
+#define ISM_DTX_AZI_BITS_HIGH 8
+#define ISM_DTX_ELE_BITS_HIGH 7
+#define ISM_Q_STEP_HIGH (ISM_Q_STEP / 2)
+#define ISM_Q_STEP_BORDER_HIGH (ISM_Q_STEP_BORDER / 2)
+#define ISM_DTX_AZI_BITS_LOW 6
+#define ISM_DTX_ELE_BITS_LOW 5
+#define ISM_Q_STEP_LOW (ISM_Q_STEP * 2)
+#define ISM_Q_STEP_BORDER_LOW (ISM_Q_STEP_BORDER * 2)
+#else
+#define PARAM_ISM_DTX_AZI_BITS 5
#define PARAM_ISM_DTX_ELE_BITS 4
#endif
+
typedef enum
{
ISM_MODE_NONE,
@@ -372,28 +396,34 @@ typedef enum
} ISM_MODE;
-/* ISm metadata bitstream */
+/* ISM metadata bitstream */
enum
{
IND_ISM_NUM_OBJECTS,
- IND_ISM_METADATA_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS,
+ IND_ISM_EXTENDED_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS,
+#ifdef FIX_379_EXT_METADATA
+ IND_ISM_METADATA_FLAG,
+#else
+ IND_ISM_METADATA_FLAG = IND_ISM_EXTENDED_FLAG + MAX_NUM_OBJECTS, /* EN2VE: Is this not supposed to be in the loop part below, since it is one per ISM? */
+#endif
IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,
-#ifdef PARAM_ISM_DTX_CNG
+#ifdef DISCRETE_ISM_DTX_CNG
+ IND_ISM_NOISY_SPEECH_FLAG = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS,
+ IND_ISM_SCE_ID_DTX,
+#else
IND_ISM_SCE_ID_DTX = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS,
IND_ISM_NOISY_SPEECH_FLAG,
- IND_ISM_DTX_COH_SCA,
#endif
+ IND_ISM_DTX_COH_SCA,
/* ------------- loop for objects -------------- */
-#ifdef PARAM_ISM_DTX_CNG
TAG_ISM_LOOP_START = IND_ISM_DTX_COH_SCA + MAX_NUM_OBJECTS,
-#else
- TAG_ISM_LOOP_START = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS,
- #endif
IND_ISM_AZIMUTH_DIFF_FLAG = TAG_ISM_LOOP_START,
IND_ISM_AZIMUTH = TAG_ISM_LOOP_START,
IND_ISM_ELEVATION_DIFF_FLAG = TAG_ISM_LOOP_START,
IND_ISM_ELEVATION = TAG_ISM_LOOP_START,
+ IND_ISM_RADIUS_DIFF_FLAG = TAG_ISM_LOOP_START,
+ IND_ISM_RADIUS = TAG_ISM_LOOP_START,
TAG_ISM_LOOP_END = TAG_ISM_LOOP_START + 100, /* IVAS_fmToDo: to be reviewed once the final metadata are defined */
/* --------- end of loop for objects ----------- */
@@ -960,6 +990,11 @@ typedef enum
#define DELAY_DIRAC_SPAR_ENC_CMP_NS 500000L /* here we may set the 24 samples (at 48 kHz) additional delay to something else, leave as is for now*/
#define DELAY_DIRAC_PARAM_DEC_SFR 2 /* Delay to be compensation for DirAC parameters in the decoder (subframes) */
+#ifdef FIX_350_MASA_DELAY_COMP
+#define DELAY_MASA_PARAM_DEC_SFR 2 /* Delay to be compensation for MASA parameters in the decoder (subframes) */
+#define SPH_IDX_FRONT ( MASA_NO_POINTS_EQUATOR / 2 ) /* Spherical index corresponding to front direction for setting as default value */
+#endif
+
#define DIRAC_SLOT_NS 1250000L /* time duration of a time slot, 1.25ms (==DELAY_RENERER_NS/MAX_PARAM_SPATIAL_SUBFRAMES) */
#define DIRAC_SLOT_ENC_NS 5000000L
@@ -1129,7 +1164,11 @@ enum
#define MASA_MAXIMUM_CODING_SUBBANDS 24
#define MASA_MAXIMUM_DIRECTIONS 2
#define MASA_MAX_TRANSPORT_CHANNELS 2
+
+#ifndef FIX_350_MASA_DELAY_COMP
#define MASA_ENC_DELAY_SLOTS 7
+#endif
+
#define MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS 5
#define MASA_DELTA_AZI_DCT0 30
@@ -1211,6 +1250,13 @@ typedef enum
MASA_STEREO_DOWNMIX
} MASA_TRANSPORT_SIGNAL_TYPE;
+#ifdef FIX_382_MASA_META_FRAMING_ASYNC
+typedef enum
+{
+ MASA_FRAME_1SF,
+ MASA_FRAME_4SF
+} MASA_FRAME_MODE;
+#endif
/*----------------------------------------------------------------------------------*
* Multichannel format
@@ -1276,18 +1322,26 @@ typedef enum
#define NBBITS_MCT_RATIO 4
#define BITRATE_MCT_RATIO_RANGE ( 1 << NBBITS_MCT_RATIO ) /* Range of the coded bitrate distribution ratio */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
#define LFE_BITS 180
-
#define MCT_LFE_MAX_LINE 24
+#endif
#define MCT_NUM_BLOCK_DATA_BITS 4
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
typedef enum
{
MCT_CHAN_MODE_REGULAR,
MCT_CHAN_MODE_LFE,
MCT_CHAN_MODE_IGNORE
} MCT_CHAN_MODE;
-
+#else
+typedef enum
+{
+ MCT_CHAN_MODE_REGULAR,
+ MCT_CHAN_MODE_IGNORE
+} MCT_CHAN_MODE;
+#endif
/*----------------------------------------------------------------------------------*
* Parametric MC Constants
@@ -1505,15 +1559,20 @@ typedef enum
*----------------------------------------------------------------------------------*/
/* Orientation tracking types */
-#define IVAS_ORIENT_TRK_REF 0
-#define IVAS_ORIENT_TRK_AVG 1
+#define IVAS_ORIENT_TRK_NONE 0
+#define IVAS_ORIENT_TRK_REF 1
+#define IVAS_ORIENT_TRK_AVG 2
+#define IVAS_ORIENT_TRK_REF_VEC 3
+#define IVAS_ORIENT_TRK_REF_VEC_LEV 4
typedef enum
{
- OTR_TRACKING_NONE = IVAS_ORIENT_TRK_REF-1, /* track orientation relative to external reference orientation (default: yaw=pitch=roll=0) */ // VE: not really used in IVAS (only in unit-test)
- OTR_TRACKING_REF_ORIENT = IVAS_ORIENT_TRK_REF, /* track orientation relative to external reference orientation (default: yaw=pitch=roll=0) */
+ OTR_TRACKING_NONE = IVAS_ORIENT_TRK_NONE,
+ OTR_TRACKING_REF_ORIENT = IVAS_ORIENT_TRK_REF, /* track orientation relative to external reference orientation (default: no rotation) */
OTR_TRACKING_AVG_ORIENT = IVAS_ORIENT_TRK_AVG /* track orientation relative to average orientation */
-
+ ,
+ OTR_TRACKING_REF_VEC = IVAS_ORIENT_TRK_REF_VEC, /* track orientation relative to external reference vector */
+ OTR_TRACKING_REF_VEC_LEV = IVAS_ORIENT_TRK_REF_VEC_LEV /* track orientation relative to level component of external reference vector */
} OTR_TRACKING_T;
diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c
index 57f74fb70ed95ad09f9ab9f5a22ba28f1915015b..35ce6b85465eca6da931f068f4dbeb384f25fe1f 100644
--- a/lib_com/ivas_cov_smooth.c
+++ b/lib_com/ivas_cov_smooth.c
@@ -39,9 +39,7 @@
#include "wmc_auto.h"
#include "prot.h"
-#ifdef SMOOTH_WITH_TRANS_DET
#define BAND_SMOOTH_REST_START_IDX ( 2 )
-#endif
/*-----------------------------------------------------------------------------------------*
* Function ivas_set_up_cov_smoothing()
*
@@ -52,19 +50,14 @@ static void ivas_set_up_cov_smoothing(
ivas_cov_smooth_state_t *hCovState,
ivas_filterbank_t *pFb,
const float max_update_rate,
- const int16_t min_pool_size
-#ifdef COV_SMOOTH_TUNING
- ,
+ const int16_t min_pool_size,
const int16_t nchan_inp /* i : number of input channels */
-#endif
)
{
int16_t j, k;
-#ifdef COV_SMOOTH_TUNING
if ( nchan_inp <= FOA_CHANNELS )
{
-#endif
for ( j = 0; j < pFb->filterbank_num_bands; j++ )
{
float update_factor;
@@ -82,8 +75,6 @@ static void ivas_set_up_cov_smoothing(
hCovState->pSmoothing_factor[j] = max_update_rate;
}
}
-
-#ifdef COV_SMOOTH_TUNING
}
else
{
@@ -107,7 +98,6 @@ static void ivas_set_up_cov_smoothing(
}
}
}
-#endif
hCovState->prior_bank_idx = -1;
return;
@@ -152,12 +142,8 @@ ivas_error ivas_spar_covar_smooth_enc_open(
}
}
- ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size
-#ifdef COV_SMOOTH_TUNING
- ,
- nchan_inp
-#endif
- );
+ ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size,
+ nchan_inp );
*hCovState_out = hCovState;
@@ -218,25 +204,17 @@ static void ivas_compute_smooth_cov(
const int16_t start_band,
const int16_t end_band,
const int16_t num_ch,
-#ifdef SMOOTH_WITH_TRANS_DET
- const int16_t transient_det[2]
-#else
- const int16_t transient_det
-#endif
-)
+ const int16_t transient_det[2] )
{
int16_t i, j, k;
int16_t prev_idx = hCovState->prior_bank_idx;
float factor = 0;
-#ifdef SMOOTH_WITH_TRANS_DET
int16_t sm_b;
int16_t non_sm_b_idx;
sm_b = BAND_SMOOTH_REST_START_IDX;
-#endif
assert( end_band <= pFb->filterbank_num_bands );
-#ifdef SMOOTH_WITH_TRANS_DET
if ( prev_idx == -1 || transient_det[1] == 1 )
{
for ( i = 0; i < num_ch; i++ )
@@ -277,18 +255,6 @@ static void ivas_compute_smooth_cov(
}
}
}
-#else
- if ( prev_idx == -1 || transient_det == 1 )
- {
- for ( i = 0; i < num_ch; i++ )
- {
- for ( k = start_band; k < end_band; k++ )
- {
- pCov_buf[i][i][k] += ( hCovState->pSmoothing_factor[k] * fac );
- }
- }
- }
-#endif
else if ( prev_idx == 0 )
{
for ( i = 0; i < num_ch; i++ )
@@ -329,12 +295,7 @@ void ivas_cov_smooth_process(
const int16_t start_band,
const int16_t end_band,
const int16_t num_ch,
-#ifdef SMOOTH_WITH_TRANS_DET
- const int16_t transient_det[2]
-#else
- const int16_t transient_det
-#endif
-)
+ const int16_t transient_det[2] )
{
int16_t i, j;
int16_t num_bands = end_band - start_band;
diff --git a/lib_com/ivas_error.h b/lib_com/ivas_error.h
index 735086a7c14c79dc80e6b4d748155890738548db..9438ad44a1d309ca433de3e9a420f441e2245dad 100644
--- a/lib_com/ivas_error.h
+++ b/lib_com/ivas_error.h
@@ -86,6 +86,7 @@ typedef enum
IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT,
IVAS_ERR_ISM_INVALID_METADATA_VALUE,
IVAS_ERR_INVALID_MASA_FORMAT_METADATA_FILE,
+ IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED,
#ifdef DEBUGGING
IVAS_ERR_INVALID_FORCE_MODE,
#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
@@ -120,10 +121,8 @@ typedef enum
IVAS_ERR_BITSTREAM_WRITER_INVALID_FORMAT,
IVAS_ERR_BITSTREAM_READER_INVALID_DATA,
IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT,
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
IVAS_ERR_NO_FILE_OPEN,
IVAS_ERR_SAMPLING_RATE_UNKNOWN,
-#endif
/*----------------------------------------*
* renderer (lib_rend only) *
@@ -145,18 +144,7 @@ typedef enum
static inline const char *ivas_error_to_string( ivas_error error_code )
{
- /* For error categories that are likely to still have many changes to
- * specific error codes, return one string per category */
- if ( ( error_code & 0xF000 ) == 0x1000 )
- {
- return "API error";
- }
- if ( ( error_code & 0xF000 ) == 0x2000 )
- {
- return "data error";
- }
-
- /* For categories that are unlikely to change, use more specific strings */
+ /* Try to match to a specific string */
switch ( error_code )
{
case IVAS_ERR_OK:
@@ -179,6 +167,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
return "Wrong number of channels";
case IVAS_ERR_INVALID_BUFFER_SIZE:
return "Invalid buffer size";
+ case IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED:
+ return "Unsupported input/output config pair";
case IVAS_ERR_FAILED_FILE_OPEN:
return "File open error";
case IVAS_ERR_FAILED_FILE_WRITE:
@@ -193,6 +183,17 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
break;
}
+ /* For error categories that are likely to still have many changes to
+ * specific error codes, return one string per category */
+ if ( ( error_code & 0xF000 ) == 0x1000 )
+ {
+ return "API error";
+ }
+ if ( ( error_code & 0xF000 ) == 0x2000 )
+ {
+ return "data error";
+ }
+
return "Unknown error";
}
diff --git a/lib_com/ivas_fb_mixer.c b/lib_com/ivas_fb_mixer.c
index 5787470e0fbfef766b2b14b562e2800f60befd75..3e0d68049a882a32013c749048d986c11953b09f 100644
--- a/lib_com/ivas_fb_mixer.c
+++ b/lib_com/ivas_fb_mixer.c
@@ -174,7 +174,8 @@ ivas_error ivas_fb_set_cfg(
ivas_error ivas_FB_mixer_open(
IVAS_FB_MIXER_HANDLE *hFbMixer_out, /* i/o: FB mixer handle */
const int32_t sampling_rate, /* i : sampling rate */
- IVAS_FB_CFG *fb_cfg /* i : FB config. handle */
+ IVAS_FB_CFG *fb_cfg, /* i : FB config. handle */
+ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
)
{
IVAS_FB_MIXER_HANDLE hFbMixer;
@@ -186,23 +187,28 @@ ivas_error ivas_FB_mixer_open(
frame_len = (int16_t) ( sampling_rate / FRAMES_PER_SEC );
+ hFbMixer = *hFbMixer_out;
- if ( ( hFbMixer = (IVAS_FB_MIXER_HANDLE) malloc( sizeof( IVAS_FB_MIXER_DATA ) ) ) == NULL )
+ if ( !spar_reconfig_flag )
{
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
- }
-
- if ( fb_cfg->num_out_chans > 0 )
- {
- if ( ( hFbMixer->pFb = (ivas_filterbank_t *) malloc( sizeof( ivas_filterbank_t ) ) ) == NULL )
+ if ( ( hFbMixer = (IVAS_FB_MIXER_HANDLE) malloc( sizeof( IVAS_FB_MIXER_DATA ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
}
+
+ if ( fb_cfg->num_out_chans > 0 )
+ {
+ if ( ( hFbMixer->pFb = (ivas_filterbank_t *) malloc( sizeof( ivas_filterbank_t ) ) ) == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
+ }
+ }
+ else
+ {
+ hFbMixer->pFb = NULL;
+ }
}
- else
- {
- hFbMixer->pFb = NULL;
- }
+
if ( fb_cfg->active_w_mixing == -1 )
{
num_chs_alloc = 0;
@@ -247,6 +253,7 @@ ivas_error ivas_FB_mixer_open(
{
num_chs_alloc = fb_cfg->num_in_chans;
}
+
for ( i = 0; i < num_chs_alloc; i++ )
{
if ( ( hFbMixer->ppFilterbank_prior_input[i] = (float *) malloc( sizeof( float ) * fb_cfg->prior_input_length ) ) == NULL )
@@ -275,60 +282,68 @@ ivas_error ivas_FB_mixer_open(
}
}
- if ( fb_cfg->num_out_chans > 0 )
+ if ( !spar_reconfig_flag )
{
- const int16_t *pActive_bins_per_band, *pActive_bins_per_band_abs, *pStart_offset, *pStart_offset_abs;
+ if ( fb_cfg->num_out_chans > 0 )
+ {
+ const int16_t *pActive_bins_per_band, *pActive_bins_per_band_abs, *pStart_offset, *pStart_offset_abs;
- num_bands = ivas_get_num_bands( sampling_rate );
+ num_bands = ivas_get_num_bands( sampling_rate );
- ivas_get_active_bins( &pActive_bins_per_band, &pActive_bins_per_band_abs, &pStart_offset, &pStart_offset_abs, sampling_rate );
+ ivas_get_active_bins( &pActive_bins_per_band, &pActive_bins_per_band_abs, &pStart_offset, &pStart_offset_abs, sampling_rate );
- if ( fb_cfg->active_w_mixing != -1 )
- {
- for ( i = 0; i < num_bands; i++ )
+ if ( fb_cfg->active_w_mixing != -1 )
{
- if ( ( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = (float *) malloc( sizeof( float ) * pActive_bins_per_band_abs[i] ) ) == NULL )
+ for ( i = 0; i < num_bands; i++ )
{
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
+ if ( ( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = (float *) malloc( sizeof( float ) * pActive_bins_per_band_abs[i] ) ) == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
+ }
}
}
- }
- if ( sampling_rate != 48000 )
- {
- int16_t num_diff_bands, start_diff_band_non48k;
+ if ( sampling_rate != 48000 )
+ {
+ int16_t num_diff_bands, start_diff_band_non48k;
- num_diff_bands = MAX_NUM_BANDS_DIFF_NON48K;
- start_diff_band_non48k = num_bands - num_diff_bands;
+ num_diff_bands = MAX_NUM_BANDS_DIFF_NON48K;
+ start_diff_band_non48k = num_bands - num_diff_bands;
- hFbMixer->num_diff_bands = num_diff_bands;
+ hFbMixer->num_diff_bands = num_diff_bands;
- for ( j = start_diff_band_non48k; j < num_bands; j++ )
- {
- if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] = (float *) malloc( sizeof( float ) * pActive_bins_per_band[j] ) ) == NULL )
+ for ( j = start_diff_band_non48k; j < num_bands; j++ )
{
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
- }
+ if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] = (float *) malloc( sizeof( float ) * pActive_bins_per_band[j] ) ) == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
+ }
- if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] = (float *) malloc( sizeof( float ) * pActive_bins_per_band[j] ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
+ if ( ( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] = (float *) malloc( sizeof( float ) * pActive_bins_per_band[j] ) ) == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FB mixer encoder" );
+ }
}
}
}
- }
- else
- {
+ else
+ {
- /* ignore all the deeper filter bank stuff for now */
- hFbMixer->num_diff_bands = 0;
+ /* ignore all the deeper filter bank stuff for now */
+ hFbMixer->num_diff_bands = 0;
+ }
}
hFbMixer->fb_cfg = fb_cfg;
+ set_s( hFbMixer->first_frame, 1, hFbMixer->fb_cfg->num_out_chans );
+ set_s( hFbMixer->first_frame + hFbMixer->fb_cfg->num_out_chans, 0, IVAS_SPAR_MAX_CH - hFbMixer->fb_cfg->num_out_chans );
- if ( ( error = ivas_filterbank_setup( hFbMixer, sampling_rate ) ) != IVAS_ERR_OK )
+ if ( !spar_reconfig_flag )
{
- return error;
+ if ( ( error = ivas_filterbank_setup( hFbMixer, sampling_rate ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
*hFbMixer_out = hFbMixer;
@@ -344,8 +359,9 @@ ivas_error ivas_FB_mixer_open(
*------------------------------------------------------------------------*/
void ivas_FB_mixer_close(
- IVAS_FB_MIXER_HANDLE *hFbMixer_in, /* i/o: FB mixer handle */
- const int32_t sampling_rate /* i : sampling rate in Hz */
+ IVAS_FB_MIXER_HANDLE *hFbMixer_in, /* i/o: FB mixer handle */
+ const int32_t sampling_rate, /* i : sampling rate in Hz */
+ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
)
{
IVAS_FB_MIXER_HANDLE hFbMixer;
@@ -405,39 +421,41 @@ void ivas_FB_mixer_close(
hFbMixer->prior_mixer[0][0] = NULL;
}
- if ( fb_cfg->num_out_chans > 0 )
+ if ( !spar_reconfig_flag )
{
- num_bands = hFbMixer->pFb->filterbank_num_bands;
-
- if ( fb_cfg->active_w_mixing != -1 )
+ if ( fb_cfg->num_out_chans > 0 )
{
- for ( i = 0; i < num_bands; i++ )
+ num_bands = hFbMixer->pFb->filterbank_num_bands;
+
+ if ( fb_cfg->active_w_mixing != -1 )
{
- free( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] );
- hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = NULL;
+ for ( i = 0; i < num_bands; i++ )
+ {
+ free( hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] );
+ hFbMixer->pFb->fb_bin_to_band.pFb_bin_to_band[i] = NULL;
+ }
}
- }
-
- if ( sampling_rate != 48000 )
- {
- int16_t start_diff_band_non48k;
- start_diff_band_non48k = num_bands - hFbMixer->num_diff_bands;
- for ( j = start_diff_band_non48k; j < num_bands; j++ )
+ if ( sampling_rate != 48000 )
{
- free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] );
- hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] = NULL;
+ int16_t start_diff_band_non48k;
+ start_diff_band_non48k = num_bands - hFbMixer->num_diff_bands;
+
+ for ( j = start_diff_band_non48k; j < num_bands; j++ )
+ {
+ free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] );
+ hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[0][j] = NULL;
- free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] );
- hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] = NULL;
+ free( hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] );
+ hFbMixer->pFb->fb_consts.ppFilterbank_FRs_non48k[1][j] = NULL;
+ }
}
}
- }
-
- if ( hFbMixer->pFb != NULL )
- {
- free( hFbMixer->pFb );
- hFbMixer->pFb = NULL;
+ if ( hFbMixer->pFb != NULL )
+ {
+ free( hFbMixer->pFb );
+ hFbMixer->pFb = NULL;
+ }
}
if ( hFbMixer->fb_cfg != NULL )
@@ -446,8 +464,11 @@ void ivas_FB_mixer_close(
hFbMixer->fb_cfg = NULL;
}
- free( hFbMixer );
- hFbMixer = NULL;
+ if ( !spar_reconfig_flag )
+ {
+ free( hFbMixer );
+ hFbMixer = NULL;
+ }
}
return;
@@ -1028,10 +1049,6 @@ static ivas_error ivas_filterbank_setup(
error = IVAS_ERR_OK;
- set_s( hFbMixer->first_frame, 1, pCfg->num_out_chans );
- set_s( hFbMixer->first_frame + pCfg->num_out_chans, 0, IVAS_SPAR_MAX_CH - pCfg->num_out_chans );
-
-
if ( pCfg->num_out_chans > 0 )
{
hFbMixer->pFb->filterbank_num_bands = ivas_get_num_bands( sampling_rate );
diff --git a/lib_com/ivas_ism_config.c b/lib_com/ivas_ism_com.c
similarity index 75%
rename from lib_com/ivas_ism_config.c
rename to lib_com/ivas_ism_com.c
index 4f2ace5b2acffff7b495dc6521c669f83af4a710..80e188d52a82e3c9f37d7737a7c0f6fc00ba3874 100644
--- a/lib_com/ivas_ism_config.c
+++ b/lib_com/ivas_ism_com.c
@@ -37,6 +37,7 @@
#include "rom_com.h"
#include "prot.h"
#include "ivas_prot.h"
+#include "ivas_stat_com.h"
#include "ivas_rom_com.h"
#ifdef DEBUGGING
#include "debug.h"
@@ -51,7 +52,7 @@
#define FRMS_PER_SECOND ( 1000000000 / FRAME_SIZE_NS )
#ifndef MASA_AND_OBJECTS
-#define BRATE_ISM_INACTIVE 2450 /* CoreCoder bitrate in ISm inactive frames */
+#define BRATE_ISM_INACTIVE 2450 /* CoreCoder bitrate in ISM inactive frames */
#define BITS_ISM_INACTIVE ( BRATE_ISM_INACTIVE / FRMS_PER_SECOND )
#endif
@@ -93,15 +94,15 @@ static void bitbudget_to_brate(
*-------------------------------------------------------------------*/
ivas_error ivas_ism_config(
- const int32_t ism_total_brate, /* i : ISms total bitrate */
- const int16_t nchan_transport, /* i : number of transport channels */
- const int16_t num_obj, /* i : number of objects */
- ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
- const int16_t localVAD[MAX_NUM_OBJECTS], /* i : local VAD flag */
- const int16_t ism_imp[], /* i : ISM importance flags */
- int32_t element_brate[], /* o : element bitrate per object */
- int32_t total_brate[], /* o : total bitrate per object */
- int16_t nb_bits_metadata[] /* i/o: number of metadata bits */
+ const int32_t ism_total_brate, /* i : ISM total bitrate */
+ const int16_t nchan_transport, /* i : number of transport channels */
+ const int16_t nchan_ism, /* i : number of objects */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ const int16_t localVAD[MAX_NUM_OBJECTS], /* i : local VAD flag */
+ const int16_t ism_imp[], /* i : ISM importance flags */
+ int32_t element_brate[], /* o : element bitrate per object */
+ int32_t total_brate[], /* o : total bitrate per object */
+ int16_t nb_bits_metadata[] /* i/o: number of metadata bits */
#ifdef MASA_AND_OBJECTS
,
const int16_t combined_format_flag /* i : flag indicating combined format */
@@ -121,7 +122,7 @@ ivas_error ivas_ism_config(
#ifdef MASA_AND_OBJECTS
if ( combined_format_flag == 1 )
{
- n_ISms = num_obj;
+ n_ISms = nchan_ism;
}
else
{
@@ -164,7 +165,12 @@ ivas_error ivas_ism_config(
/* count ISm common signaling bits */
if ( hIsmMeta != NULL )
{
- nb_bits_metadata[0] += n_ISms * ISM_METADATA_FLAG_BITS + num_obj;
+ nb_bits_metadata[0] += n_ISms * ISM_METADATA_FLAG_BITS + nchan_ism;
+
+ if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE )
+ {
+ nb_bits_metadata[0] += ISM_EXTENDED_METADATA_BITS;
+ }
for ( ch = 0; ch < n_ISms; ch++ )
{
@@ -182,10 +188,15 @@ ivas_error ivas_ism_config(
bits_element[n_ISms - 1] += bits_ism % n_ISms;
bitbudget_to_brate( bits_element, element_brate, n_ISms );
- /* count ISm common signaling bits */
+ /* count ISM common signaling bits */
if ( hIsmMeta != NULL )
{
- nb_bits_metadata[0] += n_ISms * ISM_METADATA_FLAG_BITS + num_obj;
+ if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE )
+ {
+ nb_bits_metadata[0] += ISM_EXTENDED_METADATA_BITS;
+ }
+ nb_bits_metadata[0] += n_ISms * ISM_METADATA_FLAG_BITS + nchan_ism;
+
for ( ch = 0; ch < n_ISms; ch++ )
{
if ( hIsmMeta[ch]->ism_metadata_flag == 0 )
@@ -343,7 +354,7 @@ ivas_error ivas_ism_config(
#ifdef DEBUGGING
if ( bits_CoreCoder[ch] == SID_2k40 / FRAMES_PER_SEC )
{
- printf( "\nWarning: ISm bitbudget equal to SID!\n" );
+ printf( "\nWarning: ISM bitbudget equal to SID!\n" );
}
#endif
break;
@@ -392,7 +403,7 @@ ivas_error ivas_ism_config(
if ( sum_l( element_brate, n_ISms ) != tmpL )
#endif
{
- return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "\nError: Mismatch in ISm bit-budget distribution. Exiting!\n" );
+ return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "\nError: Mismatch in ISM bit-budget distribution. Exiting!\n" );
}
}
#endif
@@ -404,7 +415,7 @@ ivas_error ivas_ism_config(
/*-------------------------------------------------------------------*
* ivas_ism_reset_metadata()
*
- * Reset ISm metadata parameters
+ * Reset ISM metadata parameters
*-------------------------------------------------------------------*/
void ivas_ism_reset_metadata(
@@ -413,6 +424,9 @@ void ivas_ism_reset_metadata(
{
hIsmMeta->azimuth = 0.0f;
hIsmMeta->elevation = 0.0f;
+ hIsmMeta->yaw = 0.0f;
+ hIsmMeta->pitch = 0.0f;
+ hIsmMeta->radius = 1.0f;
return;
}
@@ -421,7 +435,7 @@ void ivas_ism_reset_metadata(
/*-------------------------------------------------------------------*
* ivas_ism_reset_metadata_API()
*
- * Reset ISm metadata parameters
+ * Reset ISM metadata parameters
*-------------------------------------------------------------------*/
void ivas_ism_reset_metadata_API(
@@ -443,10 +457,12 @@ void ivas_ism_reset_metadata_API(
/*! r: index of the winning codeword */
int16_t ism_quant_meta(
- const float val, /* i : scalar value to quantize */
- float *valQ, /* o : quantized value */
- const float borders[], /* i : level borders */
- const int16_t cbsize /* i : codebook size */
+ const float val, /* i : scalar value to quantize */
+ float *valQ, /* o : quantized value */
+ const float borders[], /* i : level borders */
+ const float q_step, /* i : quantization step */
+ const float q_step_border, /* i : quantization step at the border */
+ const int16_t cbsize /* i : codebook size */
)
{
int16_t idx, idx_start;
@@ -456,19 +472,19 @@ int16_t ism_quant_meta(
{
qlow = borders[0];
idx_start = 0;
- step = ISM_Q_STEP_BORDER;
+ step = q_step_border;
}
else if ( val <= borders[2] )
{
qlow = borders[1];
- idx_start = (int16_t) ( ( borders[1] - borders[0] ) / ISM_Q_STEP_BORDER );
- step = ISM_Q_STEP;
+ idx_start = (int16_t) ( ( borders[1] - borders[0] ) / q_step_border );
+ step = q_step;
}
else
{
qlow = borders[2];
- idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / ISM_Q_STEP_BORDER );
- step = ISM_Q_STEP_BORDER;
+ idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / q_step_border );
+ step = q_step_border;
}
idx = idx_start + (int16_t) max( 0.f, min( cbsize - 1, ( ( val - qlow ) / step + 0.5f ) ) );
@@ -486,31 +502,33 @@ int16_t ism_quant_meta(
/*! r: dequantized value */
float ism_dequant_meta(
- const int16_t idx, /* i : quantizer index */
- const float borders[], /* i : level borders */
- const int16_t cbsize /* i : codebook size */
+ const int16_t idx, /* i : quantizer index */
+ const float borders[], /* i : level borders */
+ const float q_step, /* i : quantization step */
+ const float q_step_border, /* i : quantization step at the border */
+ const int16_t cbsize /* i : codebook size */
)
{
int16_t idx_start;
float qlow, step, valQ;
- if ( idx <= ( borders[1] - borders[0] ) / ISM_Q_STEP_BORDER )
+ if ( idx <= ( borders[1] - borders[0] ) / q_step_border )
{
qlow = borders[0];
idx_start = 0;
- step = ISM_Q_STEP_BORDER;
+ step = q_step_border;
}
- else if ( idx <= cbsize - 1 - ( borders[3] - borders[2] ) / ISM_Q_STEP_BORDER )
+ else if ( idx <= cbsize - 1 - ( borders[3] - borders[2] ) / q_step_border )
{
qlow = borders[1];
- idx_start = (int16_t) ( ( borders[1] - borders[0] ) / ISM_Q_STEP_BORDER );
- step = ISM_Q_STEP;
+ idx_start = (int16_t) ( ( borders[1] - borders[0] ) / q_step_border );
+ step = q_step;
}
else
{
qlow = borders[2];
- idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / ISM_Q_STEP_BORDER );
- step = ISM_Q_STEP_BORDER;
+ idx_start = (int16_t) ( cbsize - 1 - ( borders[3] - borders[2] ) / q_step_border );
+ step = q_step_border;
}
valQ = ( idx - idx_start ) * step + qlow;
@@ -527,12 +545,22 @@ float ism_dequant_meta(
void ivas_param_ism_config(
PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: IVAS Param ISM Config Structure */
+#ifdef NCHAN_ISM_PARAMETER
+ ,
+ const int16_t nchan_obj /* i : number of ISM channels */
+#endif
)
{
+#ifdef NCHAN_ISM_PARAMETER
+ int16_t i;
+
+ hParamIsm->nbands = MAX_PARAM_ISM_NBANDS;
+#else
int16_t i, num_obj;
hParamIsm->nbands = MAX_PARAM_ISM_NBANDS;
num_obj = hParamIsm->num_obj;
+#endif
for ( i = 0; i < hParamIsm->nbands; i++ )
{
@@ -540,7 +568,11 @@ void ivas_param_ism_config(
}
/* for elevation zero compute the max azi quantization indices */
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < nchan_obj; i++ )
+#else
for ( i = 0; i < num_obj; i++ )
+#endif
{
hParamIsm->last_az_diff[i] = 0;
hParamIsm->last_az_sgn[i] = 1;
@@ -577,3 +609,106 @@ ISM_MODE ivas_ism_mode_select(
return ism_mode;
}
+
+
+/*---------------------------------------------------------------
+ * ivas_ism_metadata_close()
+ *
+ * Deallocate ISM metadata handles
+ * ---------------------------------------------------------------*/
+
+void ivas_ism_metadata_close(
+ ISM_METADATA_HANDLE hIsmMetaData[] /* i/o : object metadata handles */
+#ifdef OMASA_BRATE_SW
+ ,
+ const int16_t first_idx /* i : index of first handle to deallocate */
+#endif
+)
+{
+ int16_t n;
+
+ if ( hIsmMetaData == NULL || hIsmMetaData == NULL )
+ {
+ return;
+ }
+
+#ifdef OMASA_BRATE_SW
+ for ( n = first_idx; n < MAX_NUM_OBJECTS; n++ )
+#else
+ for ( n = 0; n < MAX_NUM_OBJECTS; n++ )
+#endif
+ {
+ if ( hIsmMetaData[n] != NULL )
+ {
+ free( hIsmMetaData[n] );
+ hIsmMetaData[n] = NULL;
+ }
+ }
+
+ return;
+}
+
+
+#ifdef DISCRETE_ISM_DTX_CNG
+/*-------------------------------------------------------------------*
+ * update_last_metadata()
+ *
+ * Store last metadata values
+ *-------------------------------------------------------------------*/
+
+void update_last_metadata(
+ const int16_t nchan_ism, /* i : number of objects */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ const int16_t updt_flag[] /* i : last metadata update flag */
+)
+{
+ int16_t ch;
+
+ for ( ch = 0; ch < nchan_ism; ch++ )
+ {
+ if ( updt_flag[ch] == 1 )
+ {
+ hIsmMeta[ch]->last_azimuth = hIsmMeta[ch]->azimuth;
+ hIsmMeta[ch]->last_elevation = hIsmMeta[ch]->elevation;
+ }
+ }
+
+ return;
+}
+
+
+/*----------------------------------------------------------------*
+ * ivas_get_ism_sid_quan_bitbudget()
+ *
+ * Set quantization bits based on the number of coded objects
+ *----------------------------------------------------------------*/
+
+void ivas_get_ism_sid_quan_bitbudget(
+ const int16_t nchan_ism, /* i : number of objects */
+ int16_t *nBits_azimuth, /* o : number of Q bits for azimuth */
+ int16_t *nBits_elevation, /* o : number of Q bits for elevation */
+ float *q_step, /* o : quantization step */
+ float *q_step_border, /* o : quantization step at the border */
+ int16_t *nBits_coh, /* o : number of Q bits for coherence */
+ int16_t *nBits_sce_id /* o : number of Q bits for sce_id_dtx */
+)
+{
+ *nBits_azimuth = ISM_DTX_AZI_BITS_HIGH;
+ *nBits_elevation = ISM_DTX_ELE_BITS_HIGH;
+ *q_step = ISM_Q_STEP_HIGH;
+ *q_step_border = ISM_Q_STEP_BORDER_HIGH;
+ *nBits_coh = ISM_DTX_COH_SCA_BITS;
+ *nBits_sce_id = 1;
+
+ if ( nchan_ism >= 3 )
+ {
+ *nBits_azimuth = ISM_DTX_AZI_BITS_LOW;
+ *nBits_elevation = ISM_DTX_ELE_BITS_LOW;
+ *q_step = ISM_Q_STEP_LOW;
+ *q_step_border = ISM_Q_STEP_BORDER_LOW;
+ *nBits_sce_id = 2;
+ }
+
+ return;
+}
+#endif
diff --git a/lib_com/ivas_masa_com.c b/lib_com/ivas_masa_com.c
index d5aa835e8d681c90d80ac527d769b92df2283f34..a7b17b6e67d030a0403a3f69d07c9d82af468637 100644
--- a/lib_com/ivas_masa_com.c
+++ b/lib_com/ivas_masa_com.c
@@ -354,6 +354,10 @@ void masa_sample_rate_band_correction(
int16_t *band_mapping, /* i/o: Band mapping used and modified */
IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: QMetadata structure for modification */
const int32_t sampling_rate /* i : Sampling rate */
+#ifdef FIX_350_MASA_DELAY_COMP
+ ,
+ MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */
+#endif
)
{
uint8_t band, sf;
@@ -426,6 +430,28 @@ void masa_sample_rate_band_correction(
hQMetaData->twoDirBands[band] = 0;
}
}
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( hExtOutMeta != NULL )
+ {
+ /* in decoder, zero the EXT out MASA meta buffer */
+ for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )
+ {
+ for ( band = config->numCodingBands; band < MASA_FREQUENCY_BANDS; band++ )
+ {
+ hExtOutMeta->directionIndex[0][sf][band] = SPH_IDX_FRONT;
+ hExtOutMeta->directToTotalRatio[0][sf][band] = 0u;
+ hExtOutMeta->spreadCoherence[0][sf][band] = 0u;
+
+ hExtOutMeta->directionIndex[1][sf][band] = SPH_IDX_FRONT;
+ hExtOutMeta->directToTotalRatio[1][sf][band] = 0u;
+ hExtOutMeta->spreadCoherence[1][sf][band] = 0u;
+
+ hExtOutMeta->surroundCoherence[sf][band] = 0u;
+ hExtOutMeta->diffuseToTotalRatio[sf][band] = UINT8_MAX;
+ }
+ }
+ }
+#endif
return;
}
diff --git a/lib_com/ivas_mc_param_com.c b/lib_com/ivas_mc_param_com.c
index c6cfe0ed8f6f1760d356351405ea5e4d4c53f276..acf7a8eae2c97e5a2a5092ad5d970c734f126de7 100644
--- a/lib_com/ivas_mc_param_com.c
+++ b/lib_com/ivas_mc_param_com.c
@@ -141,7 +141,6 @@ void ivas_param_mc_metadata_open(
ivas_param_mc_default_icc_map( hMetadataPMC->icc_mapping_conf, hMetadataPMC->icc_mapping[i] );
}
-
/* init remaining flags and indices */
hMetadataPMC->param_frame_idx = 0;
hMetadataPMC->flag_use_adaptive_icc_map = 0;
diff --git a/lib_com/ivas_mct_com.c b/lib_com/ivas_mct_com.c
index 5ef4d294781b5027c1db1eeeeca326c40078784f..5a6eafed5be5d31471155dbc1311509a506c7a51 100644
--- a/lib_com/ivas_mct_com.c
+++ b/lib_com/ivas_mct_com.c
@@ -66,11 +66,13 @@ void splitAvailableBitsMCT(
int16_t min_chan_bits[MCT_MAX_CHANNELS], min_bits_tot, remaining_bits;
int16_t core[MCT_MAX_CHANNELS];
MCT_CHAN_MODE mct_chan_mode[MCT_MAX_CHANNELS];
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
int16_t num_lfe;
int16_t lfe_channel;
num_lfe = 0;
lfe_channel = -1;
+#endif
min_bits_tot = 0;
for ( i = 0; i < nchan; i++ )
@@ -85,18 +87,23 @@ void splitAvailableBitsMCT(
mct_chan_mode[i] = ( (Decoder_State *) sts[i] )->mct_chan_mode;
core[i] = ( (Decoder_State *) sts[i] )->core;
}
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( mct_chan_mode[i] == MCT_CHAN_MODE_LFE )
{
num_lfe++;
lfe_channel = i;
assert( lfe_channel == LFE_CHANNEL );
}
+#endif
}
for ( i = 0; i < nchan; i++ )
{
- if ( mct_chan_mode[i] != MCT_CHAN_MODE_LFE && mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ mct_chan_mode[i] != MCT_CHAN_MODE_LFE &&
+#endif
+ mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE )
{
min_chan_bits[i] = 0;
@@ -128,7 +135,11 @@ void splitAvailableBitsMCT(
bits_frame_channel = &( (Decoder_State *) sts[i] )->bits_frame_channel;
}
- if ( mct_chan_mode[i] != MCT_CHAN_MODE_LFE && mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ mct_chan_mode[i] != MCT_CHAN_MODE_LFE &&
+#endif
+ mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE )
{
assert( split_ratio[i] >= 1 && split_ratio[i] < BITRATE_MCT_RATIO_RANGE );
*bits_frame_channel = split_ratio[i] * remaining_bits / BITRATE_MCT_RATIO_RANGE + min_chan_bits[i];
@@ -162,7 +173,11 @@ void splitAvailableBitsMCT(
bits_frame_channel = &( (Decoder_State *) sts[i] )->bits_frame_channel;
}
- if ( mct_chan_mode[i] != MCT_CHAN_MODE_LFE && mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ mct_chan_mode[i] != MCT_CHAN_MODE_LFE &&
+#endif
+ mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE )
{
*bits_frame_channel -= diff * split_ratio[i] / BITRATE_MCT_RATIO_RANGE;
*bits_frame_channel = max( min_chan_bits[i], *bits_frame_channel );
diff --git a/lib_com/ivas_omasa_com.c b/lib_com/ivas_omasa_com.c
index 101afcbc87ea04a726e556e7c9533ba8bf548283..57618c9540f11b765ad29a620b322467d09bd650 100644
--- a/lib_com/ivas_omasa_com.c
+++ b/lib_com/ivas_omasa_com.c
@@ -178,6 +178,52 @@ ISM_MODE ivas_omasa_ism_mode_select(
}
+#ifdef OMASA_BRATE_SW
+/*---------------------------------------------------------------
+ * ivas_set_omasa_TC()
+ *
+ * set number of transport channels in OMASA format
+ * ---------------------------------------------------------------*/
+
+void ivas_set_omasa_TC(
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ const int16_t nchan_ism, /* i : number of input ISMs */
+ int16_t *nSCE, /* o : number of SCEs */
+ int16_t *nCPE /* o : number of CPEs */
+)
+{
+ switch ( ism_mode )
+ {
+ case ISM_MASA_MODE_PARAM:
+ *nCPE = 1;
+ *nSCE = 0;
+ break;
+#ifdef OMASA_UPDATES
+ case ISM_MASA_MODE_MASA_ONE_OBJ:
+ case ISM_MASA_MODE_PARAM_ONE_OBJ:
+#else
+ case ISM_MASA_MODE_ONE_OBJ:
+#endif
+ *nCPE = 1;
+ *nSCE = 1;
+ break;
+ case ISM_MASA_MODE_DISC:
+ *nCPE = 1;
+ *nSCE = nchan_ism;
+ break;
+ case ISM_MODE_NONE:
+ *nCPE = 1;
+ *nSCE = 0;
+ break;
+ default:
+ break;
+ }
+
+ return;
+}
+#endif
+
+
/*---------------------------------------------------------------
* ivas_interformat_brate()
*
@@ -484,7 +530,18 @@ void ivas_get_stereo_panning_gains(
return;
}
-int16_t calculate_brate_limit_flag( int16_t *ism_imp, int16_t num_obj )
+
+/*---------------------------------------------------------------
+ * calculate_brate_limit_flag()
+ *
+ *
+ *---------------------------------------------------------------*/
+
+/*! r: limitation flag */
+int16_t calculate_brate_limit_flag(
+ const int16_t ism_imp[], /* i : ISM importance flags */
+ const int16_t nchan_ism /* i : number of objects */
+)
{
int16_t n;
int16_t brate_limit_flag;
@@ -492,7 +549,7 @@ int16_t calculate_brate_limit_flag( int16_t *ism_imp, int16_t num_obj )
brate_limit_flag = 0;
nzeros = 0;
- for ( n = 0; n < num_obj; n++ )
+ for ( n = 0; n < nchan_ism; n++ )
{
brate_limit_flag += ism_imp[n];
if ( ism_imp[n] == 0 )
@@ -500,17 +557,19 @@ int16_t calculate_brate_limit_flag( int16_t *ism_imp, int16_t num_obj )
nzeros++;
}
}
- if ( brate_limit_flag >= (int16_t) ( num_obj * 2.5f ) )
+
+ if ( brate_limit_flag >= (int16_t) ( nchan_ism * 2.5f ) )
{
brate_limit_flag = 1;
}
else
{
- if ( nzeros / (float) num_obj >= 0.5f )
+ if ( nzeros / (float) nchan_ism >= 0.5f )
{
brate_limit_flag = -1; /* there is no limitation, on the contrary */
}
}
+
return brate_limit_flag;
}
#endif
diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
old mode 100644
new mode 100755
index 7ad36a7cc2150756bd56c16764a56c27fce0e9ef..1bc5b19ea4e80c658fa997c9894bb3feafc48fb9
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -124,7 +124,7 @@ void destroy_cpe_enc(
);
void ivas_mct_enc_close(
- MCT_ENC_HANDLE hMCT /* i/o: MCT encoder structure */
+ MCT_ENC_HANDLE *hMCT /* i/o: MCT encoder structure */
);
ivas_error ivas_corecoder_enc_reconfig(
@@ -202,12 +202,7 @@ ivas_error pre_proc_front_ivas(
const int16_t front_vad_flag, /* i : front-VAD flag to overwrite VAD decision */
const int16_t force_front_vad, /* i : flag to force VAD decision */
const int16_t front_vad_dtx_flag, /* i : front-VAD DTX flag to overwrite VAD decision*/
-#ifdef LOW_RATE_TRANS_CORE_CODER
const int32_t ivas_total_brate /* i : IVAS total bitrate */
-#else
- const int32_t ivas_total_brate, /* i : IVAS total bitrate */
- const int16_t ivas_format /* i : IVAS format */
-#endif
);
ivas_error pre_proc_ivas(
@@ -294,7 +289,7 @@ ivas_error stereo_dmx_evs_init_encoder(
);
void stereo_dmx_evs_close_encoder(
- STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */
+ STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */
);
ivas_error ivas_dec(
@@ -504,11 +499,10 @@ void stereo_tcx_core_dec(
const int16_t last_element_mode, /* i : last element mode */
const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */
STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */
- const int16_t nchan_out /* i : number of output channels */
-#ifdef PARAM_ISM_DTX_CNG
- ,
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- const ISM_MODE ism_mode /* i : ISM mode (only needed if format is ISM) */
+ const int16_t nchan_out, /* i : number of output channels */
+ const IVAS_FORMAT ivas_format /* i : IVAS format */
+#ifndef DISCRETE_ISM_DTX_CNG
+ ,const ISM_MODE ism_mode /* i : ISM mode (only needed if format is ISM) */
#endif
);
@@ -747,13 +741,13 @@ void dtx_read_padding_bits(
/*----------------------------------------------------------------------------------*
- * ISm prototypes
+ * ISM prototypes
*----------------------------------------------------------------------------------*/
ivas_error ivas_ism_config(
- const int32_t ism_total_brate, /* i : ISms total bitrate */
- const int16_t num_trans_ch, /* i : number of trans channels */
- const int16_t num_obj, /* i : number of objects */
+ const int32_t ism_total_brate, /* i : ISM total bitrate */
+ const int16_t nchan_transport, /* i : number of transport channels */
+ const int16_t nchan_ism, /* i : number of objects */
ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
const int16_t localVAD[MAX_NUM_OBJECTS], /* i : local VAD flag */
const int16_t ism_imp[], /* i : ISM importance flags */
@@ -786,6 +780,8 @@ int16_t ism_quant_meta(
const float val, /* i : scalar value to quantize */
float *valQ, /* o : quantized value */
const float borders[], /* i : level borders */
+ const float q_step, /* i : quantization step */
+ const float q_step_border, /* i : quantization step at the border */
const int16_t cbsize /* i : codebook size */
);
@@ -793,22 +789,27 @@ int16_t ism_quant_meta(
float ism_dequant_meta(
const int16_t idx, /* i : quantizer index */
const float borders[], /* i : level borders */
+ const float q_step, /* i : quantization step */
+ const float q_step_border, /* i : quantization step at the border */
const int16_t cbsize /* i : codebook size */
);
-ivas_error set_ism_metadata(
- ISM_METADATA_HANDLE hIsmMeta, /* i/o: ISM metadata handle */
- float azimuth, /* i : azimuth */
- float elevation /* i : elevation */
+ivas_error ivas_set_ism_metadata(
+ ISM_METADATA_HANDLE hIsmMeta, /* o : ISM metadata handle */
+ const float azimuth, /* i : azimuth value */
+ const float elevation, /* i : elevation value */
+ const float radius_meta, /* i : radius */
+ const float yaw, /* i : yaw */
+ const float pitch /* i : pitch */
);
-ivas_error create_ism_metadata_enc(
+ivas_error ivas_ism_metadata_enc_create(
Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
const int16_t n_ISms, /* i : number of objects */
int32_t element_brate_tmp[] /* o : element bitrate per object */
);
-ivas_error create_ism_metadata_dec(
+ivas_error ivas_ism_metadata_dec_create(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const int16_t n_ISms, /* i : number of objects */
int32_t element_brate_tmp[] /* o : element bitrate per object */
@@ -823,9 +824,12 @@ ivas_error ivas_ism_enc(
ivas_error ivas_ism_metadata_enc(
#ifdef MASA_AND_OBJECTS
- int32_t *ism_total_brate, /* i/o: ISms total bitrate */
+ int32_t *ism_total_brate, /* i/o: ISM total bitrate */
#else
- const int32_t ism_total_brate, /* i : ISms total bitrate */
+ const int32_t ism_total_brate, /* i : ISM total bitrate */
+#endif
+#ifdef NCHAN_ISM_PARAMETER
+ const int16_t nchan_ism, /* i : number of ISM channels */
#endif
const int16_t nchan_transport, /* i : number of transport channels */
ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
@@ -834,25 +838,34 @@ ivas_error ivas_ism_metadata_enc(
int16_t nb_bits_metadata[], /* o : number of metadata bits */
const int16_t localVAD[], /* i : VAD flag */
const int16_t ism_mode, /* i : ISM mode */
- const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Config Handle */
-#ifdef MASA_AND_OBJECTS
- ,
- const int16_t n_ism /* i : number of objects */
+ const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
+ const int16_t ism_extended_metadata_flag /* i : Extended metadata flag */
#ifdef MASA_AND_OBJECTS
,const float lp_noise_CPE /* i : LP filterend total noise estimation */
#endif
-#endif
);
ivas_error ivas_ism_metadata_dec(
- const int32_t ism_total_brate, /* i : ISms total bitrate */
+ const int32_t ism_total_brate, /* i : ISM total bitrate */
+#ifdef NCHAN_ISM_PARAMETER
+ const int16_t nchan_ism, /* i : number of ISM channels */
+#endif
int16_t *nchan_transport, /* o : number of transport channels */
ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder handles */
const int16_t bfi, /* i : bfi flag */
- int16_t nb_bits_metadata[], /* o : number of metadata bits */
+ int16_t nb_bits_metadata[], /* o : number of metadata bits */
ISM_MODE ism_mode, /* i : ISM mode */
+#ifdef DISCRETE_ISM_DTX_CNG
+ ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */
+#endif
+#ifdef FIX_379_EXT_METADATA
+ const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
+ int16_t *ism_extended_metadata_flag, /* i/o: Extended metadata active in renderer */
+ int16_t *ism_extmeta_cnt /* i/o: Number of change frames observed */
+#else
const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Config Handle */
+#endif
);
@@ -877,10 +890,18 @@ void ivas_param_ism_enc(
);
void ivas_param_ism_enc_close(
- DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */
+ DIRAC_ENC_HANDLE *hDirAC, /* i/o: encoder DirAC handle */
const int32_t input_Fs /* i : input sampling_rate */
);
+void ivas_ism_metadata_close(
+ ISM_METADATA_HANDLE hIsmMetaData[] /* i/o : object metadata handles */
+#ifdef OMASA_BRATE_SW
+ ,
+ const int16_t first_idx /* i : index of first handle to deallocate */
+#endif
+);
+
void ivas_param_ism_stereo_dmx(
Encoder_Struct *st_ivas, /* i : IVAS encoder structure */
float data[MAX_NUM_OBJECTS][L_FRAME48k], /* i/o: input signal/stereo dmx */
@@ -889,6 +910,10 @@ void ivas_param_ism_stereo_dmx(
void ivas_param_ism_config(
PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: IVAS Param ISM Config Structure */
+#ifdef NCHAN_ISM_PARAMETER
+ ,
+ const int16_t nchan_ism /* i : number of ISM channels */
+#endif
);
ivas_error ivas_ism_enc_config(
@@ -896,8 +921,14 @@ ivas_error ivas_ism_enc_config(
);
ivas_error ivas_ism_dec_config(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const int16_t num_obj /* i : number of objects in the bitstream */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+#ifdef DISCRETE_ISM_DTX_CNG
+ ,
+ const ISM_MODE last_ism_mode /* i/o: last ISM mode */
+#endif
+#ifndef NCHAN_ISM_PARAMETER
+ ,const int16_t num_obj /* i : number of objects in the bitstream */
+#endif
);
ivas_error ivas_param_ism_dec_open(
@@ -905,7 +936,7 @@ ivas_error ivas_param_ism_dec_open(
);
void ivas_param_ism_dec_close(
- DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */
+ DIRAC_DEC_HANDLE *hDirAC, /* i/o: decoder DirAC handle */
const AUDIO_CONFIG output_config /* i : output audio configuration */
);
@@ -919,7 +950,6 @@ void ivas_param_ism_params_to_masa_param_mapping(
);
-#ifdef PARAM_ISM_DTX_CNG
/*----------------------------------------------------------------------------------*
* ISM DTX prototypes
*----------------------------------------------------------------------------------*/
@@ -928,21 +958,75 @@ ivas_error ivas_ism_dtx_open(
Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
);
+#ifdef DISCRETE_ISM_DTX_CNG
+/*! r: indication of DTX frame */
+int16_t ivas_ism_dtx_enc(
+ ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
+ SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */
+ const int32_t ivas_total_brate, /* i : IVAS total bitrate */
+ const int16_t nchan_ism, /* i : number of objects */
+ const int16_t nchan_transport, /* i : number of transport channels */
+ int16_t vad_flag[MAX_NUM_OBJECTS], /* i : VAD flag */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ int16_t md_diff_flag[], /* o : metadata differential flag */
+ int16_t *sid_flag /* o : indication of SID frame */
+);
+#else
+/*! r: indication of DTX frame */
+int16_t ivas_ism_dtx_enc(
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ int16_t *sid_flag /* o : indication of SID frame */
+);
+#endif
+
ivas_error ivas_ism_dtx_dec(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
int16_t *nb_bits_metadata /* o : number of metadata bits */
);
+#ifdef DISCRETE_ISM_DTX_CNG
+void ivas_ism_metadata_sid_enc(
+ ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
+ const int16_t flag_noisy_speech, /* i : noisy speech flag */
+ const int16_t nchan_ism, /* i : number of objects */
+ const int16_t nchan_transport, /* i : number of transport channels */
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ const int16_t sid_flag, /* i : indication of SID frame */
+ const int16_t md_diff_flag[], /* i : metadata differental flag */
+ BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
+ int16_t nb_bits_metadata[] /* o : number of metadata bits */
+);
+#else
void ivas_param_ism_metadata_dtx_enc(
BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
ISM_METADATA_HANDLE hIsmMeta[], /* i : ISM metadata handles */
ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Enc Handle */
+#ifdef NCHAN_ISM_PARAMETER
+ ,const int16_t nchan_ism /* i : number of ISM channels */
+#endif
);
+#endif
+#ifdef DISCRETE_ISM_DTX_CNG
+void ivas_ism_metadata_sid_dec(
+ SCE_DEC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */
+ const int32_t ism_total_brate, /* i : ISms total bitrate */
+ const int16_t bfi, /* i : bfi flag */
+ const int16_t nchan_ism, /* i : number of objects */
+ const int16_t nchan_transport, /* i : number of transport channels */
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ int16_t *flag_noisy_speech, /* o : noisy speech flag */
+ int16_t *sce_id_dtx, /* o : SCE DTX ID */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ int16_t nb_bits_metadata[] /* o : number of metadata bits */
+);
+#else
void ivas_param_ism_metadata_dtx_dec(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
+#endif
void ivas_ism_get_sce_id_dtx(
ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
@@ -951,14 +1035,8 @@ void ivas_ism_get_sce_id_dtx(
const int16_t input_frame /* i : input frame length per channel */
);
-void ivas_param_ism_compute_noisy_speech_flag(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
-);
-
-/*! r: indication of DTX frame */
-int16_t ivas_ism_dtx_enc(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- int16_t *sid_flag /* o : indication of SID frame */
+void ivas_param_ism_compute_noisy_speech_flag(
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
);
void ivas_ism_coh_estim_dtx_enc(
@@ -967,8 +1045,26 @@ void ivas_ism_coh_estim_dtx_enc(
const int16_t nchan_transport, /* i : number of transport channels */
const int16_t input_frame /* i : input frame length */
);
+
+#ifdef DISCRETE_ISM_DTX_CNG
+void update_last_metadata(
+ const int16_t nchan_ism, /* i : number of objects */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ const int16_t updt_flag[] /* i : last metadata update flag */
+);
+
+void ivas_get_ism_sid_quan_bitbudget(
+ const int16_t nchan_ism, /* i : number of objects */
+ int16_t *nBits_azimuth, /* o : number of Q bits for azimuth */
+ int16_t *nBits_elevation, /* o : number of Q bits for elevation */
+ float *q_step, /* o : quantization step */
+ float *q_step_border, /* o : quantization step at the border */
+ int16_t *nBits_coh, /* o : number of Q bits for coherence */
+ int16_t *nBits_sce_id /* o : number of Q bits for sce_id_dtx */
+);
#endif
+
/*----------------------------------------------------------------------------------*
* DFT Stereo prototypes
*----------------------------------------------------------------------------------*/
@@ -1137,6 +1233,9 @@ void stereo_dft_dec(
float *input_mem, /* i/o: mem of buffer DFT analysis */
STEREO_CNG_DEC_HANDLE hStereoCng, /* i/o: Stereo CNG data structure */
const int16_t sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
+#ifdef SBA2MONO
+ const int16_t sba_mono_flag, /* i : signal mono output for SBA DirAC */
+#endif
ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD handle for upmixing */
const int16_t cross_fade_start_offset, /* i : SPAR mixer delay compensation */
const int32_t output_Fs, /* i : Fs for delay calculation */
@@ -1732,6 +1831,9 @@ int16_t stereo_tdm_ener_analysis(
const int16_t input_frame, /* i : Number of samples */
int16_t *tdm_SM_or_LRTD_Pri, /* o : channel combination scheme flag in TD stereo OR LRTD primary channel */
int16_t *tdm_ratio_idx_SM /* o : TDM ratio index for SM mode */
+#ifdef OMASA_TUNING_TD_STEREO
+ ,const int16_t isOmasa /* i : flag that indicates OMASA format */
+#endif
);
void stereo_tdm_downmix(
@@ -1753,6 +1855,10 @@ void tdm_configure_dec(
CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
int16_t *tdm_ratio_idx, /* o : ratio index */
const int16_t nb_bits_metadata /* i : number of metadata bits */
+#ifdef OMASA_TUNING_TD_STEREO
+ ,const int16_t IsOmasa /* i : flag that indicates OMASA format */
+#endif
+
);
void tdm_upmix_plain(
@@ -1806,6 +1912,9 @@ void tdm_configure_enc(
const int16_t tdm_ratio_idx_SM, /* i : ratio index in SM mode */
const int16_t attack_flag, /* i : Primary channel attack flag */
const int16_t nb_bits_metadata /* i : number of metadata bits */
+#ifdef OMASA_TUNING_TD_STEREO
+ ,const int16_t IsOmasa /* i : flag that indicates OMASA format */
+#endif
);
ivas_error signaling_enc_secondary(
@@ -1829,6 +1938,9 @@ void tdm_bit_alloc(
const int16_t tdm_LRTD_flag, /* i : LRTD stereo mode flag */
const int16_t coder_type0, /* i : coder type (temporary in the encoder, from bitstream in decoder) */
const int16_t tdm_inst_ratio_idx /* i : instantaneous correlation ratio index */
+#ifdef OMASA_TUNING_TD_STEREO
+ ,const int16_t IsOmasa /* i : flag that indicates OMASA format */
+#endif
);
void td_stereo_param_updt(
@@ -2156,7 +2268,9 @@ void decoder_tcx_imdct(
float synthFB[],
const int16_t bfi, /* i : Bad frame indicator */
const int16_t frame_cnt, /* i : frame counter in the super frame */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
const int16_t isLFE, /* i : is LFE */
+#endif
const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
);
@@ -2721,7 +2835,9 @@ void ivas_mdct_core_whitening_enc(
int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* o : size of TNS */
int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to parameter array */
BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
int16_t *LFE_off, /* o : flag if LFE has content */
+#endif
const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */
const int16_t nChannels /* i : total number of coded channels */
);
@@ -2739,7 +2855,9 @@ void ivas_mct_core_enc(
void ivas_mdct_quant_coder(
CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
const int16_t LFE_off, /* i : flag if LFE has content */
+#endif
int16_t tnsBits[CPE_CHANNELS][NB_DIV], /* i : bits needed for TNS parameters */
int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* i : size of TNS */
int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to parameter array */
@@ -2790,7 +2908,9 @@ void ivas_mdct_dec_side_bits_frame_channel(
int16_t param_lpc[MCT_MAX_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */
int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */
Decoder_State *st0, /* i : pointer to bitstream handle */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
int16_t *LFE_off, /* o : flag if LFE has content */
+#endif
int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* o : number of bits for TNS */
int16_t param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV], /* i/o: parameters buffer */
const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
@@ -2810,7 +2930,9 @@ void ivas_mct_side_bits(
void ivas_mdct_core_invQ(
CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
const int16_t LFE_off, /* i : flag if LFE content */
+#endif
int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* i : number of TNS bits */
int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to param buffer */
int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* i : lpc parameters */
@@ -2828,14 +2950,18 @@ void ivas_mdct_core_reconstruct(
CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
float *x[][NB_DIV], /* i/o: pointers to synthesis @internal_FS */
float signal_outFB[CPE_CHANNELS][L_FRAME_PLUS], /* o : synthesis @output_FS */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
const int16_t LFE_off, /* i : flag if LFE content */
+#endif
int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : flage TNS enabled */
const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */
);
void ivas_mdct_core_tns_ns(
CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
const int16_t LFE_off, /* i : flag if LFE has content */
+#endif
int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : two entries for each channel in TCX10 */
STnsData tnsData[CPE_CHANNELS][NB_DIV], /* o : TNS parameter */
float *x[CPE_CHANNELS][NB_DIV], /* o : synthesis @internal_FS */
@@ -3136,6 +3262,7 @@ void ivas_dirac_param_est_enc(
const SBA_MODE sba_mode
);
+
/*----------------------------------------------------------------------------------*
* SBA format prototypes
*----------------------------------------------------------------------------------*/
@@ -3156,6 +3283,12 @@ void ivas_sba_config(
int16_t *element_mode /* o : element mode of the core coder */
);
+#ifdef FIX_386_CORECODER_RECONFIG
+void ivas_sba_set_cna_cng_flag(
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+);
+#endif
+
ivas_error ivas_sba_dec_reconfigure(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
@@ -3172,6 +3305,7 @@ ivas_error ivas_cldfb_dec_reconfig(
int16_t numCldfbAnalyses_old, /* i : number of CLDFB analysis instances in previous frame */
const int16_t numCldfbSyntheses_old /* i : number of CLDFB synthesis instances in previous frame */
);
+
/*! r: Ambisonic (SBA) order */
int16_t ivas_sba_get_order(
const int16_t nb_channels, /* i : Number of ambisonic channels */
@@ -3231,6 +3365,12 @@ void ivas_sba_dirac_stereo_config(
STEREO_DFT_CONFIG_DATA_HANDLE hConfig /* o : DFT stereo configuration */
);
+#ifdef SBA2MONO
+int16_t ivas_get_sba_dirac_stereo_flag(
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+);
+#endif
+
void ivas_sba_dirac_stereo_smooth_parameters(
STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: encoder DFT stereo handle */
ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD handle for upmixing */
@@ -3261,7 +3401,7 @@ ivas_error ivas_dirac_enc_reconfigure(
);
void ivas_dirac_enc_close(
- DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */
+ DIRAC_ENC_HANDLE *hDirAC, /* i/o: encoder DirAC handle */
const int32_t input_Fs /* i : input sampling_rate */
);
@@ -3313,7 +3453,7 @@ ivas_error ivas_dirac_dec_config(
);
void ivas_dirac_dec_close(
- DIRAC_DEC_HANDLE hDirAC /* i/o: decoder DirAC handle */
+ DIRAC_DEC_HANDLE *hDirAC /* i/o: decoder DirAC handle */
);
void ivas_dirac_dec_read_BS(
@@ -3361,7 +3501,7 @@ void computeDiffuseness(
float *diffuseness
);
-void ivas_dirac_dec_onset_detection_open(
+ivas_error ivas_dirac_dec_onset_detection_open(
const int16_t num_channels,
const int16_t num_freq_bands,
const int16_t max_band_decorr,
@@ -3377,7 +3517,7 @@ void ivas_dirac_dec_onset_detection_process(
DIRAC_ONSET_DETECTION_STATE h_dirac_onset_detection_state
);
-void ivas_dirac_dec_decorr_open(
+ivas_error ivas_dirac_dec_decorr_open(
DIRAC_DECORR_PARAMS **ph_freq_domain_decorr_ap_params,
DIRAC_DECORR_STATE **ph_freq_domain_decorr_ap_state,
const int16_t num_freq_bands,
@@ -3410,7 +3550,7 @@ void ivas_dirac_dec_decorr_close(
);
-void ivas_dirac_dec_output_synthesis_open(
+ivas_error ivas_dirac_dec_output_synthesis_open(
DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */
const RENDERER_TYPE renderer_type, /* i : renderer type */
const int16_t nchan_transport, /* i : number of transport channels */
@@ -3539,7 +3679,7 @@ ivas_error ivas_param_mc_enc_reconfig(
);
void ivas_param_mc_enc_close(
- PARAM_MC_ENC_HANDLE hParamMC, /* i/o: Parametric MC encoder handle */
+ PARAM_MC_ENC_HANDLE *hParamMC, /* i/o: Parametric MC encoder handle */
const int32_t input_Fs /* i : input sampling rate */
);
@@ -3690,7 +3830,7 @@ int16_t svd(
const int16_t nChannelsC /* i : number of columns in the matrix to be decomposed */
);
-void ivas_dirac_dec_output_synthesis_cov_open(
+ivas_error ivas_dirac_dec_output_synthesis_cov_open(
DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params, /* i/o: handle for the covariance synthesis parameters */
DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state, /* i/o: handle for the covariance synthesis state */
const int16_t max_band_decorr, /* i : uppermost frequency band where decorrelation is applied */
@@ -3769,12 +3909,14 @@ void FdCngDecodeDiracMDCTStereoSID(
ivas_error ivas_spar_enc_open(
Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
+ ,const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
);
void ivas_spar_enc_close(
- SPAR_ENC_HANDLE hSpar, /* i/o: SPAR encoder handle */
+ SPAR_ENC_HANDLE *hSpar, /* i/o: SPAR encoder handle */
const int32_t input_Fs, /* i : input sampling rate */
- const int16_t nchan_inp /* i : number of input channels */
+ const int16_t nchan_inp, /* i : number of input channels */
+ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
);
ivas_error ivas_spar_enc(
@@ -3786,12 +3928,14 @@ ivas_error ivas_spar_enc(
);
ivas_error ivas_spar_dec_open(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
);
void ivas_spar_dec_close(
- SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */
- const int32_t output_Fs /* i : output sampling rate */
+ SPAR_DEC_HANDLE *hSpar, /* i/o: SPAR decoder handle */
+ const int32_t output_Fs, /* i : output sampling rate */
+ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
);
ivas_error ivas_spar_dec(
@@ -3939,11 +4083,41 @@ void ivas_spar_bitrate_dist(
const int16_t bwidth /* i : audio bandwidth */
);
-void ivas_mdct( const float *pIn, float *pOut, const int16_t length );
-void ivas_dct_windowing( const int16_t fade_len, const int16_t full_len, const int16_t dct_len, const int16_t zero_pad_len, const float *pWindow_coeffs, const int16_t frame_len, float *pOut_buf, float *pBuffer_prev, float *pTemp_lfe );
-void ivas_tda( const float *pIn, float *pOut, const int16_t length );
-void ivas_imdct( const float *pIn, float *pOut, const int16_t length );
-void ivas_itda( const float *re, float *pOut, const int16_t length );
+void ivas_mdct(
+ const float *pIn,
+ float *pOut,
+ const int16_t length
+);
+
+void ivas_dct_windowing(
+ const int16_t fade_len,
+ const int16_t full_len,
+ const int16_t dct_len,
+ const int16_t zero_pad_len,
+ const float *pWindow_coeffs,
+ const int16_t frame_len,
+ float *pOut_buf,
+ float *pBuffer_prev,
+ float *pTemp_lfe
+);
+
+void ivas_tda(
+ const float *pIn,
+ float *pOut,
+ const int16_t length
+);
+
+void ivas_imdct(
+ const float *pIn,
+ float *pOut,
+ const int16_t length
+);
+
+void ivas_itda(
+ const float *re,
+ float *pOut,
+ const int16_t length
+);
void ivas_spar_get_cldfb_gains(
SPAR_DEC_HANDLE hSpar,
@@ -4131,11 +4305,7 @@ void ivas_enc_cov_handler_process(
const int16_t end_band,
const int16_t nchan_inp,
const int16_t dtx_vad,
-#ifdef SMOOTH_WITH_TRANS_DET
const int16_t transient_det[2]
-#else
- const int16_t transient_det
-#endif
);
ivas_error ivas_spar_covar_smooth_enc_open(
@@ -4157,37 +4327,25 @@ void ivas_cov_smooth_process(
const int16_t start_band,
const int16_t end_band,
const int16_t num_ch,
-#ifdef SMOOTH_WITH_TRANS_DET
const int16_t transient_det[2]
-#else
- const int16_t transient_det
-#endif
);
/* Transient detector module */
-ivas_error ivas_transient_det_open(
+ivas_error ivas_transient_det_open(
ivas_trans_det_state_t **hTranDet, /* i/o: Transient detector handle */
const int32_t sampling_rate /* i : sampling rate */
);
-void ivas_transient_det_close(
+void ivas_transient_det_close(
ivas_trans_det_state_t **hTranDet /* i/o: Transient detector handle */
);
-#ifdef SMOOTH_WITH_TRANS_DET
void ivas_transient_det_process(
ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */
float *pIn_pcm, /* i : input audio channels */
const int16_t frame_len, /* i : frame length in samples */
- int16_t transient_det[2] /* o: transient det outputs */
+ int16_t transient_det[2] /* o : transient det outputs */
);
-#else
-int16_t ivas_transient_det_process(
- ivas_trans_det_state_t *hTranDet, /* i/o: Transient detector handle */
- float *pIn_pcm, /* i : input audio channels */
- const int16_t frame_len /* i : frame length in samples */
-);
-#endif
void ivas_td_decorr_get_ducking_gains(
ivas_trans_det_state_t *hTranDet, /* i/o: Transient detector handle */
@@ -4198,14 +4356,14 @@ void ivas_td_decorr_get_ducking_gains(
const int16_t tdet_flag
);
-ivas_error ivas_td_decorr_dec_open(
+ivas_error ivas_td_decorr_dec_open(
ivas_td_decorr_state_t **hTdDecorr, /* i/o: TD decorrelator handle */
const int32_t output_Fs, /* i : output sampling rate */
const int16_t nchan_internal, /* i : number of internal channels */
const int16_t ducking_flag /* i : ducking flag */
);
-void ivas_td_decorr_dec_close(
+void ivas_td_decorr_dec_close(
ivas_td_decorr_state_t **hTdDecorr /* i/o: TD decorrelator handle */
);
@@ -4424,7 +4582,7 @@ ivas_error ivas_masa_dec_open(
);
void ivas_masa_dec_close(
- MASA_DECODER_HANDLE hMasa /* i/o: MASA metadata structure */
+ MASA_DECODER_HANDLE *hMasa /* i/o: MASA metadata structure */
);
ivas_error ivas_masa_decode(
@@ -4442,9 +4600,12 @@ ivas_error ivas_masa_enc_open(
);
void ivas_masa_enc_close(
- MASA_ENCODER_HANDLE hMasa, /* i/o: MASA metadata structure */
+ MASA_ENCODER_HANDLE *hMasa /* i/o: MASA metadata structure */
+ #ifndef FIX_350_MASA_DELAY_COMP
+ ,
const int16_t nchan_transport, /* i : Number of transport channels */
const IVAS_FORMAT ivas_format /* i : IVAS format */
+ #endif
);
void ivas_masa_enc_reconfigure(
@@ -4455,7 +4616,7 @@ ivas_error ivas_masa_dec_reconfigure(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
-void ivas_masa_encode(
+ivas_error ivas_masa_encode(
MASA_ENCODER_HANDLE hMasa, /* i/o: MASA encoder structure */
IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */
@@ -4471,8 +4632,8 @@ void ivas_masa_encode(
const int16_t nchan_ism, /* i : number of ISM channels */
ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS], /* i : ISM metadata handle */
const int16_t idx_separated_object, /* i : index of the separated object */
- OMASA_ENC_HANDLE hOMasa, /* i : OMASA encoder handle */
- int16_t ism_imp /* i: importance of separated object */
+ OMASA_ENC_HANDLE hOMasa, /* i : OMASA encoder handle */
+ const int16_t ism_imp /* i : importance of separated object */
#endif
);
@@ -4549,19 +4710,18 @@ int32_t calculate_cpe_brate_MASA_ISM(
const int16_t nchan_ism /* i : number of objects */
);
-
void ivas_merge_masa_metadata(
- MASA_ENCODER_HANDLE hMasa, /* i/o: MASA enc handle. source for MASA metadata and combined metadata will be here */
- OMASA_SPATIAL_META_HANDLE hOMasaMeta /* i : ISM-object metadata to be merged with the MASA metadata */
+ MASA_ENCODER_HANDLE hMasa, /* i/o: MASA enc handle. source for MASA metadata and combined metadata will be here */
+ OMASA_SPATIAL_META_HANDLE hOMasaMeta /* i : ISM-object metadata to be merged with the MASA metadata */
);
void ivas_masa_combine_directions(
- MASA_ENCODER_HANDLE hMasa /* i/o: MASA encoder handle */
+ MASA_ENCODER_HANDLE hMasa /* i/o: MASA encoder handle */
);
/*!r : number of bits for ISM ratio index */
int16_t bits_index_ism_ratio(
- const int16_t nchan_ism /* i : number of objects */
+ const int16_t nchan_ism /* i : number of objects */
);
void calculate_nbits_meta(
@@ -4575,9 +4735,10 @@ void calculate_nbits_meta(
const int16_t ism_imp
);
+/*! r: limitation flag */
int16_t calculate_brate_limit_flag(
- int16_t * ism_imp,
- int16_t num_obj
+ const int16_t ism_imp[], /* i : ISM importance flags */
+ const int16_t nchan_ism /* i : number of objects */
);
void ivas_get_stereo_panning_gains(
@@ -4625,6 +4786,9 @@ void masa_sample_rate_band_correction(
int16_t *band_mapping, /* i/o: Band mapping used and modified */
IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: QMetadata structure for modification */
const int32_t sampling_rate /* i : sampling rate */
+#ifdef FIX_350_MASA_DELAY_COMP
+ , MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */
+#endif
);
void invdct4_transform(
@@ -4722,7 +4886,7 @@ void ivas_ism2sba(
float buffer_td[][L_FRAME48k], /* i/o: TD signal buffers */
ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */
const ISM_METADATA_HANDLE hIsmMetaData[], /* i : object metadata */
- const int16_t num_objects, /* i : number of objects */
+ const int16_t nchan_ism, /* i : number of objects */
const int16_t output_frame, /* i : output frame length per channel */
const int16_t sba_order /* i : SBA order */
);
@@ -4834,7 +4998,7 @@ ivas_error ivas_mcmasa_enc_open(
);
void ivas_mcmasa_enc_close(
- MCMASA_ENC_HANDLE hMcMasa, /* i/o: encoder McMASA handle */
+ MCMASA_ENC_HANDLE *hMcMasa, /* i/o: encoder McMASA handle */
const int32_t input_Fs /* i : input sampling rate */
);
@@ -4957,7 +5121,7 @@ ivas_error ivas_create_lfe_enc(
);
void ivas_lfe_enc_close(
- LFE_ENC_HANDLE hLFE /* i/o: LFE encoder handle */
+ LFE_ENC_HANDLE *hLFE /* i/o: LFE encoder handle */
);
void ivas_lfe_enc(
@@ -4974,7 +5138,7 @@ ivas_error ivas_create_lfe_dec(
);
void ivas_lfe_dec_close(
- LFE_DEC_HANDLE hLFE /* i/o: LFE encoder handle */
+ LFE_DEC_HANDLE *hLFE /* i/o: LFE encoder handle */
);
void ivas_lfe_dec(
@@ -5031,11 +5195,21 @@ void ivas_omasa_enc_close(
const int16_t nchan_ism /* i : number of objects */
);
+#ifdef OMASA_BRATE_SW
+ivas_error ivas_omasa_enc_config(
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
+);
+
+ivas_error ivas_omasa_dec_config(
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+);
+#endif
+
void ivas_omasa_set_config(
OMASA_ENC_HANDLE hOMasa, /* i/o: OMASA encoder handle */
MASA_ENCODER_HANDLE hMasa, /* i : MASA encoder handle */
const int32_t input_Fs, /* i : Input sample rate */
- ISM_MODE ismMode /* i : ISM mode */
+ const ISM_MODE ismMode /* i : ISM mode */
);
void ivas_omasa_enc(
@@ -5061,7 +5235,7 @@ void ivas_set_surplus_brate_enc(
void ivas_set_surplus_brate_dec(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- int32_t *ism_total_brate /* i : ISM total bit-rate */
+ int32_t *ism_total_brate /* i : ISM total bitrate */
);
void set_ism_importance_interformat(
@@ -5097,6 +5271,15 @@ ISM_MODE ivas_omasa_ism_mode_select(
const int16_t nchan_ism /* i : number of input ISM's */
);
+#ifdef OMASA_BRATE_SW
+void ivas_set_omasa_TC(
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ const int16_t nchan_ism, /* i : number of input ISMs */
+ int16_t *nSCE, /* o : number of SCEs */
+ int16_t *nCPE /* o : number of CPEs */
+);
+#endif
+
void ivas_merge_masa_transports(
float data_in_f1[][L_FRAME48k], /* i : Transport audio signals 1 */
float data_in_f2[][L_FRAME48k], /* i : Transport audio signals 2 */
@@ -5109,6 +5292,12 @@ ivas_error ivas_masa_ism_data_open(
Decoder_Struct* st_ivas /* i/o: IVAS decoder handle */
);
+#ifdef OMASA_BRATE_SW
+void ivas_masa_ism_data_close(
+ MASA_ISM_DATA_HANDLE *hMasaIsmData /* i/o: MASA_ISM rendering handle */
+);
+#endif
+
void preProcessStereoTransportsForMovedObjects(
Decoder_Struct* st_ivas,
float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
@@ -5163,7 +5352,7 @@ ivas_error ivas_td_binaural_open(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
-void ivas_td_binaural_renderer(
+ivas_error ivas_td_binaural_renderer(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */
const int16_t output_frame /* i : output frame length */
@@ -5187,12 +5376,14 @@ ivas_error ivas_fb_set_cfg(
ivas_error ivas_FB_mixer_open(
IVAS_FB_MIXER_HANDLE *hFbMixer, /* i/o: FB mixer handle */
const int32_t sampling_rate, /* i : sampling rate */
- IVAS_FB_CFG *fb_cfg /* i : FB config. handle */
+ IVAS_FB_CFG *fb_cfg, /* i : FB config. handle */
+ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
);
void ivas_FB_mixer_close(
IVAS_FB_MIXER_HANDLE *hFbMixer, /* i/o: FB mixer handle */
- const int32_t sampling_rate /* i : sampling rate in Hz */
+ const int32_t sampling_rate, /* i : sampling rate in Hz */
+ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
);
void ivas_fb_mixer_pcm_ingest(
diff --git a/lib_com/ivas_qmetadata_com.c b/lib_com/ivas_qmetadata_com.c
index 4f1fe47a1ea9e78eb92fbe5ed017e2088652237f..0f2491bad3545e1dcfe9a785d208aa1f702f3eb1 100644
--- a/lib_com/ivas_qmetadata_com.c
+++ b/lib_com/ivas_qmetadata_com.c
@@ -98,9 +98,8 @@ ivas_error ivas_qmetadata_allocate_memory(
const int16_t coherence_flag /* i : new coherence coding status */
)
{
- int16_t dir;
+ int16_t j, dir;
uint8_t do_realloc;
- uint8_t reservationFailed = 0;
#ifdef DEBUGGING
assert( hQMetaData != NULL );
@@ -126,68 +125,63 @@ ivas_error ivas_qmetadata_allocate_memory(
hQMetaData->no_directions = ndirs;
hQMetaData->coherence_flag = coherence_flag;
- hQMetaData->q_direction = (IVAS_QDIRECTION *) malloc( sizeof( IVAS_QDIRECTION ) * ndirs );
- reservationFailed = hQMetaData->q_direction == NULL;
+ if ( ( hQMetaData->q_direction = (IVAS_QDIRECTION *) malloc( sizeof( IVAS_QDIRECTION ) * ndirs ) ) == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Q MetaData" );
+ }
+
- if ( !reservationFailed )
+ for ( dir = 0; dir < hQMetaData->no_directions; dir++ )
{
- for ( dir = 0; dir < hQMetaData->no_directions; dir++ )
+ hQMetaData->q_direction[dir].cfg.nbands = nbands;
+ if ( nbands == 0 )
{
- hQMetaData->q_direction[dir].cfg.nbands = nbands;
- if ( nbands == 0 )
- {
- hQMetaData->q_direction[dir].band_data = NULL;
- }
- else
+ hQMetaData->q_direction[dir].band_data = NULL;
+ }
+ else
+ {
+ if ( ( hQMetaData->q_direction[dir].band_data = (IVAS_QDIRECTION_BAND_DATA *) malloc( sizeof( IVAS_QDIRECTION_BAND_DATA ) * hQMetaData->q_direction[dir].cfg.nbands ) ) == NULL )
{
- hQMetaData->q_direction[dir].band_data = (IVAS_QDIRECTION_BAND_DATA *) malloc( sizeof( IVAS_QDIRECTION_BAND_DATA ) * hQMetaData->q_direction[dir].cfg.nbands );
- {
- int16_t j;
- for ( j = 0; j < nbands; j++ )
- {
- set_zero( hQMetaData->q_direction[dir].band_data[j].elevation, MAX_PARAM_SPATIAL_SUBFRAMES );
- set_zero( hQMetaData->q_direction[dir].band_data[j].azimuth, MAX_PARAM_SPATIAL_SUBFRAMES );
- }
- }
-
-
- reservationFailed |= hQMetaData->q_direction[dir].band_data == NULL;
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Q MetaData" );
}
- if ( coherence_flag )
+ for ( j = 0; j < nbands; j++ )
{
- hQMetaData->q_direction[dir].coherence_band_data = (IVAS_QDIRECTION_BAND_COHERENCE_DATA *) malloc( sizeof( IVAS_QDIRECTION_BAND_COHERENCE_DATA ) * hQMetaData->q_direction[dir].cfg.nbands );
- reservationFailed |= hQMetaData->q_direction[dir].coherence_band_data == NULL;
+ set_zero( hQMetaData->q_direction[dir].band_data[j].elevation, MAX_PARAM_SPATIAL_SUBFRAMES );
+ set_zero( hQMetaData->q_direction[dir].band_data[j].azimuth, MAX_PARAM_SPATIAL_SUBFRAMES );
}
- else
- {
- hQMetaData->q_direction[dir].coherence_band_data = NULL;
- }
-
- /* These default values are set here to get them conveniently in one place */
- hQMetaData->q_direction[dir].cfg.nblocks = MAX_PARAM_SPATIAL_SUBFRAMES;
- hQMetaData->q_direction[dir].cfg.search_effort = 3;
- hQMetaData->q_direction[dir].cfg.start_band = 0;
- hQMetaData->q_direction[dir].cfg.mc_ls_setup = MC_LS_SETUP_INVALID;
}
if ( coherence_flag )
{
- hQMetaData->surcoh_band_data = (IVAS_SURROUND_COHERENCE_BAND_DATA *) malloc( sizeof( IVAS_SURROUND_COHERENCE_BAND_DATA ) * hQMetaData->q_direction[0].cfg.nbands );
- reservationFailed |= hQMetaData->surcoh_band_data == NULL;
+ hQMetaData->q_direction[dir].coherence_band_data = (IVAS_QDIRECTION_BAND_COHERENCE_DATA *) malloc( sizeof( IVAS_QDIRECTION_BAND_COHERENCE_DATA ) * hQMetaData->q_direction[dir].cfg.nbands );
}
else
{
- hQMetaData->surcoh_band_data = NULL;
+ hQMetaData->q_direction[dir].coherence_band_data = NULL;
}
+
+ /* These default values are set here to get them conveniently in one place */
+ hQMetaData->q_direction[dir].cfg.nblocks = MAX_PARAM_SPATIAL_SUBFRAMES;
+ hQMetaData->q_direction[dir].cfg.search_effort = 3;
+ hQMetaData->q_direction[dir].cfg.start_band = 0;
+ hQMetaData->q_direction[dir].cfg.mc_ls_setup = MC_LS_SETUP_INVALID;
}
- }
- if ( reservationFailed )
- {
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Q MetaData\n" ) );
+ if ( coherence_flag )
+ {
+ if ( ( hQMetaData->surcoh_band_data = (IVAS_SURROUND_COHERENCE_BAND_DATA *) malloc( sizeof( IVAS_SURROUND_COHERENCE_BAND_DATA ) * hQMetaData->q_direction[0].cfg.nbands ) ) == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Q MetaData" );
+ }
+ }
+ else
+ {
+ hQMetaData->surcoh_band_data = NULL;
+ }
}
+
return IVAS_ERR_OK;
}
diff --git a/lib_com/ivas_rom_com.h b/lib_com/ivas_rom_com.h
index 41101bd9b184b0aa433378fc78675f9c98c8168c..4f106824a517522e151ac59b08207500c369d4fc 100644
--- a/lib_com/ivas_rom_com.h
+++ b/lib_com/ivas_rom_com.h
@@ -329,6 +329,7 @@ extern const float dct12[];
extern const float ism_azimuth_borders[4];
extern const float ism_elevation_borders[4];
+
/*----------------------------------------------------------------------------------*
* Param ISM ROM tables
*----------------------------------------------------------------------------------*/
diff --git a/lib_com/ivas_stat_com.h b/lib_com/ivas_stat_com.h
index 224d26bbea56a56803410f34a0b24704c5494690..1a18be9a4022b5309646a3349a85c8754c3dd160 100644
--- a/lib_com/ivas_stat_com.h
+++ b/lib_com/ivas_stat_com.h
@@ -41,9 +41,26 @@
/*----------------------------------------------------------------------------------*
- * Declaration of ISm common (encoder & decoder) structure
+ * Declaration of ISM common (encoder & decoder) structure
*----------------------------------------------------------------------------------*/
+#ifdef FIX_379_ANGLE
+typedef struct
+{
+ int16_t last_angle1_idx; /* last frame index of coded azimuth/yaw */
+ int16_t angle1_diff_cnt; /* FEC counter of consecutive differentially azimuth/yaw coded frames */
+ int16_t last_angle2_idx; /* last frame index of coded elevation/pitch */
+ int16_t angle2_diff_cnt; /* FEC counter of consecutive differentially elevation/pitch coded frames */
+} ISM_METADATA_ANGLE, *ISM_METADATA_ANGLE_HANDLE;
+#else
+typedef struct
+{
+ int16_t last_azimuth_idx; /* last frame index of coded azimuth */
+ int16_t azimuth_diff_cnt; /* FEC counter of consecutive differentially azimuth coded frames */
+ int16_t last_elevation_idx; /* last frame index of coded elevation */
+ int16_t elevation_diff_cnt; /* FEC counter of consecutive differentially elevation coded frames */
+} ISM_METADATA_ANGLE, *ISM_METADATA_ANGLE_HANDLE;
+#endif
/* ISM metadata handle (storage for one frame of read ISM metadata) */
typedef struct
{
@@ -52,11 +69,24 @@ typedef struct
float azimuth; /* azimuth value read from the input metadata file */
float elevation; /* azimuth value read from the input metadata file */
-
- int16_t last_azimuth_idx; /* last frame index of coded azimuth */
- int16_t azimuth_diff_cnt; /* FEC counter of consecutive differentially azimuth coded frames */
- int16_t last_elevation_idx; /* last frame index of coded elevation */
- int16_t elevation_diff_cnt; /* FEC counter of consecutive differentially elevation coded frames */
+ float radius;
+ float yaw; /* azimuth orientation value read from the input metadata file */
+ float pitch; /* elevation orientation value read from the input metadata file */
+#ifdef FIX_379_ANGLE
+ ISM_METADATA_ANGLE position_angle; /* Angle structs for azimuth and elevation */
+ ISM_METADATA_ANGLE orientation_angle; /* Angle structs for yaw and pitch */
+#else
+ ISM_METADATA_ANGLE angle[2]; /* Angle structs for [0] azimuth/elevation and [1] yaw/pitch */
+#endif
+ int16_t last_radius_idx; /* last frame index of coded radius */
+ int16_t radius_diff_cnt; /* FEC counter of consecutive differentially radius coded frames */
+
+#ifdef DISCRETE_ISM_DTX_CNG
+ float last_azimuth; /* MD smoothing in DTX- last Q azimuth value */
+ float last_elevation; /* MD smoothing in DTX - last Q elevation value */
+ float last_true_azimuth; /* MD smoothing in DTX- last true Q azimuth value */
+ float last_true_elevation; /* MD smoothing in DTX- last true Q elevation value */
+#endif
#ifdef MASA_AND_OBJECTS
int16_t ism_imp; /* ISM importance flag */
@@ -139,7 +169,9 @@ typedef struct ivas_param_ism_data_structure
int16_t nbands;
int16_t nblocks[MAX_PARAM_ISM_NBANDS];
int16_t band_grouping[MAX_PARAM_ISM_NBANDS + 1];
+#ifndef NCHAN_ISM_PARAMETER
int16_t num_obj;
+#endif
int16_t azi_index[MAX_NUM_OBJECTS];
int16_t ele_index[MAX_NUM_OBJECTS];
diff --git a/lib_com/ivas_stereo_td_bit_alloc.c b/lib_com/ivas_stereo_td_bit_alloc.c
index 8b93558b219ea63fce4c737e2436d6221ff40ad0..ac56cd65377c768b6f02308ea67e65b5b162cc03 100644
--- a/lib_com/ivas_stereo_td_bit_alloc.c
+++ b/lib_com/ivas_stereo_td_bit_alloc.c
@@ -88,6 +88,10 @@ void tdm_bit_alloc(
const int16_t tdm_LRTD_flag, /* i : LRTD stereo mode flag */
const int16_t coder_type0, /* i : coder type (temporary in the encoder, from bitstream in decoder) */
const int16_t tdm_inst_ratio_idx_ref /* i : instantaneous correlation ratio idx */
+#ifdef OMASA_TUNING_TD_STEREO
+ ,
+ const int16_t IsOmasa /* i : flag that indicates OMASA format */
+#endif
)
{
int16_t idx, four_subfr_fcb, two_subfr_fcb;
@@ -136,7 +140,11 @@ void tdm_bit_alloc(
*total_brate_sec = tdm_bit_allc_tbl[idx][coder_type];
/* secondary channel bitrate allocation based on the energy scaling ratio */
+#ifdef OMASA_TUNING_TD_STEREO
+ if ( ( IsOmasa == 0 && ( ( coder_type != UNVOICED ) || tdm_LRTD_flag == 1 ) ) || ( IsOmasa == 1 && coder_type > UNVOICED ) )
+#else
if ( ( coder_type != UNVOICED ) || tdm_LRTD_flag == 1 )
+#endif
{
bit_rate_diff = (float) ( element_brate_wo_meta - 2 * *total_brate_sec );
@@ -416,7 +424,6 @@ void tdm_bit_alloc(
*total_brate_sec += 100;
}
}
-
*total_brate_pri = element_brate_wo_meta - *total_brate_sec;
return;
diff --git a/lib_com/ivas_transient_det.c b/lib_com/ivas_transient_det.c
index e2f2dfb7660404862618811be812c79de2c3b4e2..1e8f53c7ca5a1d17b7d49501169deaf7634914a6 100644
--- a/lib_com/ivas_transient_det.c
+++ b/lib_com/ivas_transient_det.c
@@ -211,43 +211,17 @@ void ivas_transient_det_close(
*
* Transient detection process call
*-----------------------------------------------------------------------------------------*/
-#ifdef SMOOTH_WITH_TRANS_DET
void ivas_transient_det_process(
ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */
float *pIn_pcm, /* i : input audio channels */
const int16_t frame_len, /* i : frame length in samples */
int16_t transient_det[2] /* o: transient det outputs */
)
-#else
-int16_t ivas_transient_det_process(
- ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */
- float *pIn_pcm, /* i : input audio channels */
- const int16_t frame_len /* i : frame length in samples */
-)
-#endif
{
-#ifdef SMOOTH_WITH_TRANS_DET
float in_duck_gain[L_FRAME48k];
int16_t num_sf, sf, sf_samp, idx;
-#else
- int16_t trans;
-#endif
float mem = hTranDet->in_duck_gain;
-#ifndef SMOOTH_WITH_TRANS_DET
- ivas_td_decorr_get_ducking_gains( hTranDet, pIn_pcm, NULL, NULL, frame_len, IVAS_TDET_ONLY );
-
- if ( mem - hTranDet->in_duck_gain > IVAS_TDET_PARM_TRANS_THR )
- {
- trans = 1;
- }
- else
- {
- trans = 0;
- }
-
- return trans;
-#else
ivas_td_decorr_get_ducking_gains( hTranDet, pIn_pcm, in_duck_gain, NULL, frame_len, IVAS_TDET_ONLY );
transient_det[0] = 0;
@@ -270,7 +244,6 @@ int16_t ivas_transient_det_process(
}
return;
-#endif
}
@@ -344,9 +317,7 @@ void ivas_td_decorr_get_ducking_gains(
for ( i = 0; i < frame_len; i++ )
{
in_duck_gain = ivas_calc_duck_gain( in_duck_gain, in_duck_coeff, e_slow[i], e_fast[i], duck_mult_fac );
-#ifdef SMOOTH_WITH_TRANS_DET
pIn_duck_gains[i] = in_duck_gain;
-#endif
}
hTranDet->in_duck_gain = in_duck_gain;
}
diff --git a/lib_com/options.h b/lib_com/options.h
old mode 100644
new mode 100755
index 442a0004d78f5a575f37a1b96eb03780150c741c..29d3c3340e0da58d7c4205cd56b004661f286974
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -58,13 +58,13 @@
#ifdef DEBUGGING
-/*#define DEBUG_MODE_INFO*/ /* output most important parameters to the subdirectory "res/" */
+#define DEBUG_MODE_INFO /* output most important parameters to the subdirectory "res/" */
#ifdef DEBUG_MODE_INFO
-/*#define DEBUG_MODE_ACELP*/ /* output most important ACELP core parameters to the subdirectory "res/" */
+#define DEBUG_MODE_ACELP /* output most important ACELP core parameters to the subdirectory "res/" */
/*#define DEBUG_MODE_TCX*/ /* output most important TCX core parameters to the subdirectory "res/" */
/*#define DEBUG_MODE_DFT */ /* output most important DFT stereo parameters to the subdirectory "res/" */
-/*#define DEBUG_MODE_TD*/ /* output most important TD stereo parameters to the subdirectory "res/ */
-/*#define DEBUG_MODE_DIRAC*/ /* output most important DIRAC parameters to the subdirectory "res/" */
+#define DEBUG_MODE_TD /* output most important TD stereo parameters to the subdirectory "res/ */
+//#define DEBUG_MODE_DIRAC /* output most important DIRAC parameters to the subdirectory "res/" */
/*#define DEBUG_MODE_MDCT*/ /* output most important MDCT parameters to the subdirectory "res/" */
/*#define DEBUG_MODE_PARAM_MC */ /* output Parametric MC paramters to the subdirectory "res/" */
/*#define DEBUG_MODE_PARAM_ISM*/ /* output Parametric ISM paramters to the subdirectory "res/" */
@@ -141,36 +141,43 @@
#define DISABLE_ADAP_RES_COD_TMP /* temporary fix for IVAS-403, disables adaptive residual coding */
/*#define ITD_WINNER_GAIN_MODIFY */ /* ITD optimization - WORK IN PROGRESS */
/*#define FIX_I4_OL_PITCH*/ /* fix open-loop pitch used for EVS core switching */
+#define FIX_103_RA_PARAMS_PARAM_BIN_REND /* Issue 103: Digest room acoustics parameters for Parametric Binaural Renderer*/
+/*#define SBA_HPF_TUNING_DEC*/
-#define LOW_RATE_TRANS_CORE_CODER /* Eri: Activate low-rate-encoding-of-transients contribution for core coder, affects MC, MASA and SBA */
-#define FIX_197_CREND_INTERFACE
-#define FIX_329_ENABLE_TD_RENDERER_REVERB_MC /* Eri: Enable reverb for TD renderer for 5.1 and 7.1 with headtracking enabled for IVAS_dec */
-#define FIX_347_DTX_CRASH /* FhG: Fix crash that can happen with DTX */
-#define DISABLE_RES_CHANNELS_MCT /* decode only W and residual for Y when outputting to stereo */
-#define FIX_107_5MS_SUBFRAME_RENDERING
-#define REMOVE_FORCE_SUBFRAME_BIN /* Issue 355: remove obsolete "-force_subframe_bin" command-line option. */
+#define FIX_350_MASA_DELAY_COMP /* Nokia: Issue 350: MASA audio/meta delay compensation */
+#define FIX_MDCT_BASED_BWD /* FhG: fixes for BWD for issues with reaction to transients for MDCT-stereo and MCT */
+#define DISCRETE_ISM_DTX_CNG /* FhG/VA: contribution 15 - DTX/CNG for (discrete) ISM */
+#define NCHAN_ISM_PARAMETER /* VA: make 'nchan_ism' parameter part of st_ivas/hEncoderConfig */
+#define FIX_382_MASA_META_FRAMING_ASYNC /* Nokia: Issue 382: detect potential MASA metadata framing offset */
+#define FIX_386_CORECODER_RECONFIG /* VA: Issue 386: Resolve ToDo comments in CoreCoder reconfig. */
-#define PARAM_ISM_DTX_CNG /* FhG: contribution 9 - DTX-CNG for ParamISM */
-#define FIX_331_SBA_HBR_HOA_FIXES /* DLB: issue 331 - fix addressing low frequency stuttering with HOA inputs at high bitrates */
-#ifdef FIX_331_SBA_HBR_HOA_FIXES
-#define COV_SMOOTH_TUNING
-#define SBA_HPF_TUNING_ENC
-/*#define SBA_HPF_TUNING_DEC*/
-#define SMOOTH_WITH_TRANS_DET
-#endif
+#define SBA2MONO /* FhG: Issue 365: Adapt processing of SBA mono output to be in line with stereo output (less delay, lower complexity) */
+#define FIX_379_EXT_METADATA /* Eri: Extended metadata issues */
+#define FIX_379_ANGLE /* Eri: Extended metadata issues related to angle structure */
+
-#define BINAURALIZATION_DELAY_REPORT /* VA: Issue 255 - Changes the way the decoder delay is reported */
-#define FIX_351_HRTF_COMMAND /* VA: Issue 354 - improve "-hrtf" command-line option */
+#define NOKIA_PARAMBIN_REQULARIZATION /* Nokia: Contribution - Configured reqularization factor for parametric binauralizer. */
+#define NOKIA_ADAPTIVE_BINAURAL_PROTOS /* Nokia: Contribution 28: Adaptive binaural prototypes */
+#define NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT /* Nokia: enable adaptive binaural prototype complexity optimizations */
-#define FIX_94_VERIFY_WAV_NUM_CHANNELS /* FhG: Issue 94 - Check if number of channels in input wav file matches encoder/renderer configuration */
-#define ISM_HIGHEST_BITRATE /* VA: Issue 284: Update highest bitrate limit in ISM format */
+#define FIX_389_EXT_REND_PCM_SR /* Nokia: Issue 389: Fix assignment of sample rate with PCM input. */
+#define FIX_390_EXT_REND_MASA_META_COPY /* Nokia: Issue 390: Fixes MASA metadata copying to renderer. */
+#define FIX_392_LATE_REVERB /* DLB : Issue 392: keep late reverb by default off when output config is not BINAURAL_ROOM*/
+
+#define FIX_ISM_DTX_CLICKS /* FhG: fix for clicks in ISM DTX for inactive to active TCX transitions */
+
+#define ISSUE_24_CLEANUP_MCT_LFE /* Issue 24: Cleanup LFE path withing MCT */
#define MASA_AND_OBJECTS /* Nokia: Combination of MASA and objects */
#ifdef MASA_AND_OBJECTS
#define MASAISM_EDIT_OBJECTS /* Nokia: Temporary command line editing of object directions in the decoder */
#define OMASA_UPDATES /* Nokia: Updates to the OMASA processing */
+#define OMASA_BRATE_SW /* VA: support of bitrate switching in OMASA format */
+#define FIX_TD5_IN_OMASA // do not transmit extended MD in OMASA
+#define OMASA_TUNING_TD_STEREO /* VA: tuning of TD stereo in OMASA format */
+
#endif /* MASA_AND_OBJECTS */
diff --git a/lib_com/prot.h b/lib_com/prot.h
index f9ec0e4b9f62a5f51cc1274429021a200ce5586f..65846708efb7b3d9dfb6e7fb2c665299a3a223ad 100644
--- a/lib_com/prot.h
+++ b/lib_com/prot.h
@@ -681,10 +681,6 @@ int32_t get_delay(
const int32_t io_fs, /* i : input/output sampling frequency */
const IVAS_FORMAT ivas_format, /* i : IVAS format */
HANDLE_CLDFB_FILTER_BANK hCldfb /* i : Handle of Cldfb analysis */
-#ifndef BINAURALIZATION_DELAY_REPORT
- ,
- const int32_t binaural_latency_ns /* i : binauralization delay in ns */
-#endif
);
void decision_matrix_enc(
@@ -2228,18 +2224,15 @@ ivas_error init_encoder(
const int16_t idchan, /* i : channel ID */
const int16_t var_SID_rate_flag, /* i : flag for variable SID update rate */
const int16_t interval_SID, /* i : interval for SID update */
- const int16_t vad_only_flag /* i : flag to indicate front-VAD structure */
-#ifdef PARAM_ISM_DTX_CNG
- ,
- const ISM_MODE ism_mode /* i : ISM mode */
-#endif
+ const int16_t vad_only_flag, /* i : flag to indicate front-VAD structure */
+ const ISM_MODE ism_mode /* i : ISM mode */
);
void LPDmem_enc_init(
LPD_state_HANDLE hLPDmem /* i/o: LP memories */
);
-void destroy_encoder(
+void destroy_cldfb_encoder(
Encoder_State *st /* i/o: state structure */
);
ivas_error evs_enc(
@@ -3830,8 +3823,13 @@ void bw_detect(
const float signal_in[], /* i : input signal */
float *spectrum, /* i : MDCT spectrum */
const float *enerBuffer /* i : energy buffer */
+#ifdef FIX_MDCT_BASED_BWD
+ ,
+ const int16_t mct_on /* i : flag MCT mode */
+#endif
);
+
void set_bw(
const int16_t element_mode, /* i : element mode */
const int32_t element_brate, /* i : element bitrate */
@@ -5123,7 +5121,7 @@ ivas_error init_decoder(
const MC_MODE mc_mode /* i : MC mode */
);
-void destroy_decoder(
+void destroy_cldfb_decoder(
Decoder_State *st /* o : Decoder static variables structure */
);
@@ -5858,10 +5856,13 @@ void core_switching_post_enc(
);
ivas_error core_switching_post_dec(
- Decoder_State *st, /* i/o: decoder state structure */
- float *synth, /* i/o: output synthesis */
- float *output, /* i/o: LB synth/upsampled LB synth */
- float output_mem[], /* i : OLA memory from last TCX/HQ frame */
+ Decoder_State *st, /* i/o: decoder state structure */
+ float *synth, /* i/o: output synthesis */
+ float *output, /* i/o: LB synth/upsampled LB synth */
+ float output_mem[], /* i : OLA memory from last TCX/HQ frame */
+#ifdef FIX_ISM_DTX_CLICKS
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+#endif
const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */
const int16_t output_frame, /* i : frame length */
const int16_t core_switching_flag, /* i : ACELP->HQ switching frame flag */
@@ -7152,8 +7153,11 @@ void WindowSignal(
int16_t *L_frame, /* i/o: frame length */
float out[], /* o : output windowed signal */
const int16_t truncate_aldo, /* i : nonzero to truncate long ALDO slope */
- const int16_t fullband, /* i : fullband flag */
- const int16_t isLfe /* i : LFE flag */
+ const int16_t fullband /* i : fullband flag */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ const int16_t isLfe /* i : LFE flag */
+#endif
);
void HBAutocorrelation(
@@ -7306,8 +7310,11 @@ void tcx_get_windows(
const float **left_win, /* o : left overlap window */
int16_t *right_overlap, /* o : right overlap length */
const float **right_win, /* o : right overlap window */
- const int16_t fullband, /* i : fullband flag */
- const int16_t isLfe /* i : LFE flag */
+ const int16_t fullband /* i : fullband flag */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ const int16_t isLfe /* i : LFE flag */
+#endif
);
void tcx_windowing_analysis(
@@ -8521,13 +8528,10 @@ void generate_comfort_noise_dec(
);
void generate_comfort_noise_dec_hf(
- float **bufferReal, /* o : Real part of input bands */
- float **bufferImag, /* o : Imaginary part of input bands */
- HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */
-#ifdef PARAM_ISM_DTX_CNG
- ,
- const int16_t cng_flag /*i : CNG Flag */
-#endif
+ float **bufferReal, /* o : Real part of input bands */
+ float **bufferImag, /* o : Imaginary part of input bands */
+ HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
+ const int16_t cng_flag /* i : CNG Flag */
);
void generate_masking_noise(
@@ -8663,17 +8667,13 @@ void ApplyFdCng(
const int16_t concealWholeFrame, /* i : binary flag indicating frame loss */
const int16_t is_music );
-void perform_noise_estimation_dec(
- const float *timeDomainInput,
- float *power_spectrum,
- HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: FD_CNG structure */
- const int16_t element_mode, /* i : element mode type */
- const int16_t bwidth, /* i : audio bandwidth */
- const int16_t L_frame, /* i : frame length at internal Fs */
- const int16_t last_L_frame, /* i : frame length of the last frame at internal Fs */
- const int32_t last_core_brate, /* i : previous frame core bitrate */
- const int16_t VAD /* i : VAD flag in the decoder */
+void generate_comfort_noise_dec(
+ float **bufferReal, /* o : Real part of input bands */
+ float **bufferImag, /* o : Imaginary part of input bands */
+ Decoder_State *st, /* i/o: decoder state structure */
+ const int16_t nchan_out /* i : number of output channels */
);
+
/*! r: CNG energy */
float cng_energy(
const int16_t element_mode, /* i : element mode */
@@ -8777,40 +8777,40 @@ void ReadFromBitstream(
int16_t **pStream,
int16_t *pnSize );
-void const *GetTnsFilterOrder( void const *p, int16_t index, int16_t *pValue );
-void *SetTnsFilterOrder( void *p, int16_t index, int16_t value );
-void const *GetNumOfTnsFilters( void const *p, int16_t index, int16_t *pValue );
-void *SetNumOfTnsFilters( void *p, int16_t index, int16_t value );
-void const *GetTnsEnabled( void const *p, int16_t index, int16_t *pValue );
-void *SetTnsEnabled( void *p, int16_t index, int16_t value );
-void const *GetTnsEnabledSingleFilter( void const *p, int16_t index, int16_t *pValue );
-void *SetTnsEnabledSingleFilter( void *p, int16_t index, int16_t value );
-void const *GetTnsFilterCoeff( void const *p, int16_t index, int16_t *pValue );
-void *SetTnsFilterCoeff( void *p, int16_t index, int16_t value );
-
-void const *GetTnsOnWhite( void const *p, int16_t index, int16_t *pValue );
-void *SetTnsOnWhite( void *p, int16_t index, int16_t value );
-
-int16_t GetSWBTCX10TnsFilterCoeffBits( int16_t value, int16_t index );
-int16_t EncodeSWBTCX10TnsFilterCoeff( int16_t value, int16_t index );
-int16_t DecodeSWBTCX10TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue );
-int16_t GetSWBTCX20TnsFilterCoeffBits( int16_t value, int16_t index );
-int16_t EncodeSWBTCX20TnsFilterCoeff( int16_t value, int16_t index );
-int16_t DecodeSWBTCX20TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue );
-
-int16_t GetWBTCX20TnsFilterCoeffBits( int16_t value, int16_t index );
-int16_t EncodeWBTCX20TnsFilterCoeff( int16_t, int16_t index );
-int16_t DecodeWBTCX20TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue );
-
-int16_t GetTnsFilterOrderBitsSWBTCX10( int16_t value, int16_t index );
-int16_t EncodeTnsFilterOrderSWBTCX10( int16_t value, int16_t index );
-int16_t DecodeTnsFilterOrderSWBTCX10( Decoder_State *st, int16_t index, int16_t *pValue );
-int16_t GetTnsFilterOrderBitsSWBTCX20( int16_t value, int16_t index );
-int16_t EncodeTnsFilterOrderSWBTCX20( int16_t value, int16_t index );
-int16_t DecodeTnsFilterOrderSWBTCX20( Decoder_State *st, int16_t index, int16_t *pValue );
-int16_t GetTnsFilterOrderBits( int16_t value, int16_t index );
-int16_t EncodeTnsFilterOrder( int16_t value, int16_t index );
-int16_t DecodeTnsFilterOrder( Decoder_State *st, int16_t index, int16_t *pValue );
+void const *GetTnsFilterOrder( void const *p, const int16_t index, int16_t *pValue );
+void *SetTnsFilterOrder( void *p, const int16_t index, const int16_t value );
+void const *GetNumOfTnsFilters( void const *p, const int16_t index, int16_t *pValue );
+void *SetNumOfTnsFilters( void *p, const int16_t index, const int16_t value );
+void const *GetTnsEnabled( void const *p, const int16_t index, int16_t *pValue );
+void *SetTnsEnabled( void *p, const int16_t index, const int16_t value );
+void const *GetTnsEnabledSingleFilter( void const *p, const int16_t index, int16_t *pValue );
+void *SetTnsEnabledSingleFilter( void *p, const int16_t index, const int16_t value );
+void const *GetTnsFilterCoeff( void const *p, const int16_t index, int16_t *pValue );
+void *SetTnsFilterCoeff( void *p, const int16_t index, const int16_t value );
+
+void const *GetTnsOnWhite( void const *p, const int16_t index, int16_t *pValue );
+void *SetTnsOnWhite( void *p, const int16_t index, const int16_t value );
+
+int16_t GetSWBTCX10TnsFilterCoeffBits( const int16_t value, const int16_t index );
+int16_t EncodeSWBTCX10TnsFilterCoeff( const int16_t value, const int16_t index );
+int16_t DecodeSWBTCX10TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue );
+int16_t GetSWBTCX20TnsFilterCoeffBits( const int16_t value, const int16_t index );
+int16_t EncodeSWBTCX20TnsFilterCoeff( const int16_t value, const int16_t index );
+int16_t DecodeSWBTCX20TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue );
+
+int16_t GetWBTCX20TnsFilterCoeffBits( const int16_t value, const int16_t index );
+int16_t EncodeWBTCX20TnsFilterCoeff( const int16_t, const int16_t index );
+int16_t DecodeWBTCX20TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue );
+
+int16_t GetTnsFilterOrderBitsSWBTCX10( const int16_t value, const int16_t index );
+int16_t EncodeTnsFilterOrderSWBTCX10( const int16_t value, const int16_t index );
+int16_t DecodeTnsFilterOrderSWBTCX10( Decoder_State *st, const int16_t index, int16_t *pValue );
+int16_t GetTnsFilterOrderBitsSWBTCX20( const int16_t value, const int16_t index );
+int16_t EncodeTnsFilterOrderSWBTCX20( const int16_t value, const int16_t index );
+int16_t DecodeTnsFilterOrderSWBTCX20( Decoder_State *st, const int16_t index, int16_t *pValue );
+int16_t GetTnsFilterOrderBits( const int16_t value, const int16_t index );
+int16_t EncodeTnsFilterOrder( const int16_t value, const int16_t index );
+int16_t DecodeTnsFilterOrder( Decoder_State *st, const int16_t index, int16_t *pValue );
void ResetTnsData(
STnsData *pTnsData );
@@ -9501,11 +9501,15 @@ void TonalMDCTConceal_SaveTimeSignal(
const int16_t numSamples );
void TonalMDCTConceal_Detect(
- const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */
- const float pitchLag, /*IN */
- int16_t *umIndices, /*OUT*/
- const PsychoacousticParameters *psychParamsCurrent, /*IN*/
- const int16_t isLfe );
+ const TonalMDCTConcealPtr hTonalMDCTConc, /*IN */
+ const float pitchLag, /*IN */
+ int16_t *umIndices, /*OUT*/
+ const PsychoacousticParameters *psychParamsCurrent /*IN*/
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ const int16_t isLfe
+#endif
+);
void TonalMDCTConceal_Apply(
TonalMDCTConcealPtr hTonalMDCTConc, /*IN */
@@ -9637,10 +9641,13 @@ int16_t getTcxonly(
);
int16_t getTnsAllowed(
- const int32_t total_brate, /* i : total bitrate */
- const int16_t igf, /* i : flag indicating IGF activity*/
- const int16_t element_mode, /* i : IVAS element mode */
+ const int32_t total_brate, /* i : total bitrate */
+ const int16_t igf, /* i : flag indicating IGF activity*/
+ const int16_t element_mode /* i : IVAS element mode */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */
+#endif
);
int16_t getCtxHm(
@@ -9682,8 +9689,11 @@ int16_t getIgfPresent(
const int16_t element_mode, /* i : IVAS element mode */
const int32_t total_brate, /* i : total bitrate */
const int16_t bwidth, /* i : audio bandwidth */
- const int16_t rf_mode, /* i : flag to signal the RF mode */
+ const int16_t rf_mode /* i : flag to signal the RF mode */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
const int16_t mct_chan_mode /* i : MCT channel mode */
+#endif
);
int16_t getCnaPresent(
@@ -9980,6 +9990,9 @@ void init_tcx_cfg(
const int16_t infoIGFStopFreq,
const int16_t element_mode,
const int16_t ini_frame,
- const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
+ const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0) */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
const MCT_CHAN_MODE mct_chan_mode /* i : MCT channel mode */
+#endif
);
diff --git a/lib_com/tcx_utils.c b/lib_com/tcx_utils.c
index 07618c7cd21ce15d5a3de2c053159ac4509b1636..7eede5ae650d3c9033968ca70034a6c1e38ce3ca 100644
--- a/lib_com/tcx_utils.c
+++ b/lib_com/tcx_utils.c
@@ -59,16 +59,20 @@ void tcx_get_windows(
const float **left_win, /* o : left overlap window */
int16_t *right_overlap, /* o : right overlap length */
const float **right_win, /* o : right overlap window */
- const int16_t fullband, /* i : fullband flag */
- const int16_t isLfe /* i : LFE flag */
+ const int16_t fullband /* i : fullband flag */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ const int16_t isLfe /* i : LFE flag */
+#endif
)
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
/* LFE is only FULL_OVERLAP*/
if ( isLfe )
{
assert( left_mode == FULL_OVERLAP && right_mode == FULL_OVERLAP );
}
-
+#endif
if ( !fullband )
{
/* Left part */
@@ -91,6 +95,7 @@ void tcx_get_windows(
}
else if ( left_mode == FULL_OVERLAP )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( isLfe )
{
*left_overlap = hTcxCfg->tcx_mdct_window_length;
@@ -98,9 +103,12 @@ void tcx_get_windows(
}
else
{
+#endif
*left_overlap = hTcxCfg->tcx_mdct_window_length;
*left_win = hTcxCfg->tcx_aldo_window_1_trunc;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
}
else
{
@@ -121,6 +129,7 @@ void tcx_get_windows(
}
else if ( right_mode == FULL_OVERLAP )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( isLfe )
{
*right_overlap = hTcxCfg->tcx_mdct_window_length;
@@ -128,9 +137,12 @@ void tcx_get_windows(
}
else
{
+#endif
*right_overlap = hTcxCfg->tcx_mdct_window_delay;
*right_win = hTcxCfg->tcx_aldo_window_2;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
}
else
{
@@ -164,6 +176,7 @@ void tcx_get_windows(
}
else if ( left_mode == FULL_OVERLAP )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( isLfe )
{
*left_overlap = hTcxCfg->tcx_mdct_window_lengthFB;
@@ -171,9 +184,12 @@ void tcx_get_windows(
}
else
{
+#endif
*left_overlap = hTcxCfg->tcx_mdct_window_lengthFB;
*left_win = hTcxCfg->tcx_aldo_window_1_FB_trunc;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
}
else
{
@@ -199,6 +215,7 @@ void tcx_get_windows(
}
else if ( right_mode == FULL_OVERLAP )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( isLfe )
{
*right_overlap = hTcxCfg->tcx_mdct_window_lengthFB;
@@ -206,9 +223,12 @@ void tcx_get_windows(
}
else
{
+#endif
*right_overlap = hTcxCfg->tcx_mdct_window_delayFB;
*right_win = hTcxCfg->tcx_aldo_window_2_FB;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
}
else
{
@@ -276,8 +296,11 @@ void WindowSignal(
int16_t *L_frame, /* i/o: frame length */
float out[], /* o : output windowed signal */
const int16_t truncate_aldo, /* i : nonzero to truncate long ALDO slope */
- const int16_t fullband, /* i : fullband flag */
- const int16_t isLfe /* i : LFE flag */
+ const int16_t fullband /* i : fullband flag */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ const int16_t isLfe /* i : LFE flag */
+#endif
)
{
int16_t l, r;
@@ -288,7 +311,12 @@ void WindowSignal(
* Init *
*-----------------------------------------------------------*/
- tcx_get_windows( hTcxCfg, left_overlap_mode, right_overlap_mode, &l, &left_win, &r, &right_win, fullband, isLfe );
+ tcx_get_windows( hTcxCfg, left_overlap_mode, right_overlap_mode, &l, &left_win, &r, &right_win, fullband
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ isLfe
+#endif
+ );
/* Init lengths */
@@ -314,7 +342,11 @@ void WindowSignal(
tcx_windowing_analysis( in - l / 2 + offset, *L_frame, l, left_win, r, right_win, out );
- if ( left_overlap_mode == FULL_OVERLAP && truncate_aldo && !isLfe )
+ if ( left_overlap_mode == FULL_OVERLAP && truncate_aldo
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && !isLfe
+#endif
+ )
{
/* fade truncated ALDO window to avoid discontinuities */
if ( !fullband )
diff --git a/lib_com/tns_base.c b/lib_com/tns_base.c
index 881d7845cacfc257f4aff3225a8c129a81f0f9ca..20e679c3167406981d5131f6f325e9defa87e545 100644
--- a/lib_com/tns_base.c
+++ b/lib_com/tns_base.c
@@ -287,67 +287,67 @@ static int16_t DecodeUsingTable( Decoder_State *st, int16_t *pValue, const Codin
/* TNS filter coefficients */
-void const *GetTnsFilterCoeff( void const *p, int16_t index, int16_t *pValue )
+void const *GetTnsFilterCoeff( void const *p, const int16_t index, int16_t *pValue )
{
*pValue = ( (int16_t const *) p )[index] + INDEX_SHIFT;
return NULL;
}
-void *SetTnsFilterCoeff( void *p, int16_t index, int16_t value )
+void *SetTnsFilterCoeff( void *p, const int16_t index, const int16_t value )
{
( (int16_t *) p )[index] = value - INDEX_SHIFT;
return NULL;
}
-int16_t GetSWBTCX20TnsFilterCoeffBits( int16_t value, int16_t index )
+int16_t GetSWBTCX20TnsFilterCoeffBits( const int16_t value, const int16_t index )
{
assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
return GetBitsFromTable( value, codesTnsCoeffSWBTCX20[index], nTnsCoeffCodes );
}
-int16_t EncodeSWBTCX20TnsFilterCoeff( int16_t value, int16_t index )
+int16_t EncodeSWBTCX20TnsFilterCoeff( const int16_t value, const int16_t index )
{
assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
return EncodeUsingTable( value, codesTnsCoeffSWBTCX20[index], nTnsCoeffCodes );
}
-int16_t DecodeSWBTCX20TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue )
+int16_t DecodeSWBTCX20TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue )
{
assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
return DecodeUsingTable( st, pValue, codesTnsCoeffSWBTCX20[index], nTnsCoeffCodes );
}
-int16_t GetSWBTCX10TnsFilterCoeffBits( int16_t value, int16_t index )
+int16_t GetSWBTCX10TnsFilterCoeffBits( const int16_t value, const int16_t index )
{
assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
return GetBitsFromTable( value, codesTnsCoeffSWBTCX10[index], nTnsCoeffCodes );
}
-int16_t EncodeSWBTCX10TnsFilterCoeff( int16_t value, int16_t index )
+int16_t EncodeSWBTCX10TnsFilterCoeff( const int16_t value, const int16_t index )
{
assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
return EncodeUsingTable( value, codesTnsCoeffSWBTCX10[index], nTnsCoeffCodes );
}
-int16_t DecodeSWBTCX10TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue )
+int16_t DecodeSWBTCX10TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue )
{
assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
return DecodeUsingTable( st, pValue, codesTnsCoeffSWBTCX10[index], nTnsCoeffCodes );
}
-int16_t GetWBTCX20TnsFilterCoeffBits( int16_t value, int16_t index )
+int16_t GetWBTCX20TnsFilterCoeffBits( const int16_t value, const int16_t index )
{
assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
return GetBitsFromTable( value, codesTnsCoeffWBTCX20[index], nTnsCoeffCodes );
}
-int16_t EncodeWBTCX20TnsFilterCoeff( int16_t value, int16_t index )
+int16_t EncodeWBTCX20TnsFilterCoeff( const int16_t value, const int16_t index )
{
assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
return EncodeUsingTable( value, codesTnsCoeffWBTCX20[index], nTnsCoeffCodes );
}
-int16_t DecodeWBTCX20TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *pValue )
+int16_t DecodeWBTCX20TnsFilterCoeff( Decoder_State *st, const int16_t index, int16_t *pValue )
{
assert( ( index >= 0 ) && ( index < nTnsCoeffTables ) );
return DecodeUsingTable( st, pValue, codesTnsCoeffWBTCX20[index], nTnsCoeffCodes );
@@ -356,67 +356,67 @@ int16_t DecodeWBTCX20TnsFilterCoeff( Decoder_State *st, int16_t index, int16_t *
/* TNS filter order */
-void const *GetTnsFilterOrder( void const *p, int16_t index, int16_t *pValue )
+void const *GetTnsFilterOrder( void const *p, const int16_t index, int16_t *pValue )
{
*pValue = ( (STnsFilter const *) p )[index].order;
return ( (STnsFilter const *) p )[index].coefIndex;
}
-void *SetTnsFilterOrder( void *p, int16_t index, int16_t value )
+void *SetTnsFilterOrder( void *p, const int16_t index, const int16_t value )
{
( (STnsFilter *) p )[index].order = value;
return ( (STnsFilter *) p )[index].coefIndex;
}
-int16_t GetTnsFilterOrderBitsSWBTCX20( int16_t value, int16_t index )
+int16_t GetTnsFilterOrderBitsSWBTCX20( const int16_t value, const int16_t index )
{
(void) index;
return GetBitsFromTable( value - 1, codesTnsOrderTCX20, nTnsOrderCodes );
}
-int16_t EncodeTnsFilterOrderSWBTCX20( int16_t value, int16_t index )
+int16_t EncodeTnsFilterOrderSWBTCX20( const int16_t value, const int16_t index )
{
(void) index;
return EncodeUsingTable( value - 1, codesTnsOrderTCX20, nTnsOrderCodes );
}
-int16_t DecodeTnsFilterOrderSWBTCX20( Decoder_State *st, int16_t index, int16_t *pValue )
+int16_t DecodeTnsFilterOrderSWBTCX20( Decoder_State *st, const int16_t index, int16_t *pValue )
{
(void) index;
return DecodeUsingTable( st, pValue, codesTnsOrderTCX20, nTnsOrderCodes );
}
-int16_t GetTnsFilterOrderBitsSWBTCX10( int16_t value, int16_t index )
+int16_t GetTnsFilterOrderBitsSWBTCX10( const int16_t value, const int16_t index )
{
(void) index;
return GetBitsFromTable( value - 1, codesTnsOrderTCX10, nTnsOrderCodes );
}
-int16_t EncodeTnsFilterOrderSWBTCX10( int16_t value, int16_t index )
+int16_t EncodeTnsFilterOrderSWBTCX10( const int16_t value, const int16_t index )
{
(void) index;
return EncodeUsingTable( value - 1, codesTnsOrderTCX10, nTnsOrderCodes );
}
-int16_t DecodeTnsFilterOrderSWBTCX10( Decoder_State *st, int16_t index, int16_t *pValue )
+int16_t DecodeTnsFilterOrderSWBTCX10( Decoder_State *st, const int16_t index, int16_t *pValue )
{
(void) index;
return DecodeUsingTable( st, pValue, codesTnsOrderTCX10, nTnsOrderCodes );
}
-int16_t GetTnsFilterOrderBits( int16_t value, int16_t index )
+int16_t GetTnsFilterOrderBits( const int16_t value, const int16_t index )
{
(void) index;
return GetBitsFromTable( value - 1, codesTnsOrder, nTnsOrderCodes );
}
-int16_t EncodeTnsFilterOrder( int16_t value, int16_t index )
+int16_t EncodeTnsFilterOrder( const int16_t value, const int16_t index )
{
(void) index;
return EncodeUsingTable( value - 1, codesTnsOrder, nTnsOrderCodes );
}
-int16_t DecodeTnsFilterOrder( Decoder_State *st, int16_t index, int16_t *pValue )
+int16_t DecodeTnsFilterOrder( Decoder_State *st, const int16_t index, int16_t *pValue )
{
(void) index;
return DecodeUsingTable( st, pValue, codesTnsOrder, nTnsOrderCodes );
@@ -424,13 +424,13 @@ int16_t DecodeTnsFilterOrder( Decoder_State *st, int16_t index, int16_t *pValue
/* Number of TNS filters */
-void const *GetNumOfTnsFilters( void const *p, int16_t index, int16_t *pValue )
+void const *GetNumOfTnsFilters( void const *p, const int16_t index, int16_t *pValue )
{
*pValue = (int16_t) abs( ( (STnsData const *) p )[index].nFilters );
return ( (STnsData const *) p )[index].filter;
}
-void *SetNumOfTnsFilters( void *p, int16_t index, int16_t value )
+void *SetNumOfTnsFilters( void *p, const int16_t index, const int16_t value )
{
( (STnsData *) p )[index].nFilters = (int16_t) abs( value );
return ( (STnsData *) p )[index].filter;
@@ -438,13 +438,13 @@ void *SetNumOfTnsFilters( void *p, int16_t index, int16_t value )
/* TNS enabled/disabled flag */
-void const *GetTnsEnabled( void const *p, int16_t index, int16_t *pValue )
+void const *GetTnsEnabled( void const *p, const int16_t index, int16_t *pValue )
{
*pValue = ( (STnsData const *) p )[index].nFilters != 0 ? 1 : 0;
return NULL;
}
-void *SetTnsEnabled( void *p, int16_t index, int16_t value )
+void *SetTnsEnabled( void *p, const int16_t index, const int16_t value )
{
(void) p, (void) index, (void) value;
return NULL;
@@ -452,25 +452,25 @@ void *SetTnsEnabled( void *p, int16_t index, int16_t value )
/* TNS on whitened spectra flag */
-void const *GetTnsOnWhite( void const *p, int16_t index, int16_t *pValue )
+void const *GetTnsOnWhite( void const *p, const int16_t index, int16_t *pValue )
{
*pValue = ( (STnsData const *) p )[index].tnsOnWhitenedSpectra > 0 ? 1 : 0;
return NULL;
}
-void *SetTnsOnWhite( void *p, int16_t index, int16_t value )
+void *SetTnsOnWhite( void *p, const int16_t index, const int16_t value )
{
( (STnsData *) p )[index].tnsOnWhitenedSpectra = value;
return NULL;
}
-void const *GetTnsEnabledSingleFilter( void const *p, int16_t index, int16_t *pValue )
+void const *GetTnsEnabledSingleFilter( void const *p, const int16_t index, int16_t *pValue )
{
*pValue = ( (STnsData const *) p )[index].nFilters != 0 ? 1 : 0;
return ( (STnsData const *) p )[index].filter;
}
-void *SetTnsEnabledSingleFilter( void *p, int16_t index, int16_t value )
+void *SetTnsEnabledSingleFilter( void *p, const int16_t index, const int16_t value )
{
( (STnsData *) p )[index].nFilters = value;
return ( (STnsData *) p )[index].filter;
diff --git a/lib_com/wi.c b/lib_com/wi.c
index 7710f75789516faae113d2ffaa8b69cda4e42a83..7ec30010fe0365b2eb6a84cc8a295790afd98ca8 100644
--- a/lib_com/wi.c
+++ b/lib_com/wi.c
@@ -73,9 +73,7 @@ ivas_error DTFS_new(
int16_t i;
DTFS_STRUCTURE *dtfs = NULL;
- dtfs = (DTFS_STRUCTURE *) malloc( sizeof( DTFS_STRUCTURE ) );
-
- if ( dtfs == NULL )
+ if ( ( dtfs = (DTFS_STRUCTURE *) malloc( sizeof( DTFS_STRUCTURE ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTFS (SC-VBR) structure\n" ) );
}
diff --git a/lib_debug/wmc_auto.c b/lib_debug/wmc_auto.c
index 112336225fd2a838c769f623a126ddfcbcb9108e..029640a1dba8bce33cafd82907ef5bb5e5d5dabe 100644
--- a/lib_debug/wmc_auto.c
+++ b/lib_debug/wmc_auto.c
@@ -381,7 +381,7 @@ void print_wmops( void )
}
fprintf( stdout, sfmts, "---------------", "------", "------", "------", "------" );
- fprintf( stdout, dfmts, "total", (float) update_cnt, FAC * min_cnt, FAC * max_cnt, update_cnt == 0 ? 0 : FAC * ops_cnt / update_cnt );
+ fprintf( stdout, dfmts, "total", (float) update_cnt, update_cnt == 0 ? 0 : FAC * min_cnt, FAC * max_cnt, update_cnt == 0 ? 0 : FAC * ops_cnt / update_cnt );
fprintf( stdout, "\n" );
#ifdef WMOPS_WC_FRAME_ANALYSIS
@@ -1361,11 +1361,11 @@ void mem_free( const char *func_name, int func_lineno, void *ptr )
void update_mem( void )
{
int i, j, flag_alloc = -1, i_record;
- int32_t size_current_intra_frame_heap;
+ int size_current_intra_frame_heap;
int *list_current_intra_frame_heap = NULL, n_items_current_intra_frame_heap;
allocator_record *ptr_record;
- /* process the heap allocation call tree */
+ /* process the heap allocation call tree and prepare lists of intra-frame and inter-frame heap memory blocks for this frame */
n_items_current_intra_frame_heap = 0;
size_current_intra_frame_heap = 0;
for ( i = 0; i < heap_allocation_call_tree_size; i++ )
@@ -1393,7 +1393,7 @@ void update_mem( void )
memset( list_current_intra_frame_heap, -1, heap_allocation_call_tree_size * sizeof( int ) );
}
- /* zero index doesn't have sign to determine whether it's allocated or de-allocated -> we need to search the list */
+ /* zero index doesn't have sign to determine whether it's allocated or de-allocated -> we need to search the list */
if ( i_record == 0 )
{
flag_alloc = 1;
@@ -1413,23 +1413,7 @@ void update_mem( void )
list_current_intra_frame_heap[n_items_current_intra_frame_heap++] = i_record;
size_current_intra_frame_heap += ptr_record->block_size;
- /* check, if this is the new worst-case */
- if ( size_current_intra_frame_heap > size_wc_intra_frame_heap )
- {
- if ( n_items_current_intra_frame_heap >= max_items_wc_intra_frame_heap )
- {
- /* resize list, if needed */
- max_items_wc_intra_frame_heap = n_items_current_intra_frame_heap + MAX_NUM_RECORDS_REALLOC_STEP;
- list_wc_intra_frame_heap = realloc( list_wc_intra_frame_heap, max_items_wc_intra_frame_heap * sizeof( int ) );
- }
-
- /* save to wc list */
- memmove( list_wc_intra_frame_heap, list_current_intra_frame_heap, n_items_current_intra_frame_heap * sizeof( int ) );
- n_items_wc_intra_frame_heap = n_items_current_intra_frame_heap;
- size_wc_intra_frame_heap = size_current_intra_frame_heap;
- location_wc_intra_frame_heap = update_cnt;
- ptr_record->wc_heap_size_intra_frame = ptr_record->block_size;
- }
+ /* no need to re-size the list -> the initially allocated size should be large enough */
}
else
{
@@ -1480,23 +1464,6 @@ void update_mem( void )
list_current_inter_frame_heap[n_items_current_inter_frame_heap++] = i_record;
size_current_inter_frame_heap += ptr_record->block_size;
-
- /* check, if this is the new worst-case */
- if ( size_current_inter_frame_heap > size_wc_inter_frame_heap )
- {
- if ( n_items_current_inter_frame_heap >= max_items_wc_inter_frame_heap )
- {
- /* resize list, if needed */
- max_items_wc_inter_frame_heap = n_items_current_inter_frame_heap + MAX_NUM_RECORDS_REALLOC_STEP;
- list_wc_inter_frame_heap = realloc( list_wc_inter_frame_heap, max_items_wc_inter_frame_heap * sizeof( int ) );
- }
-
- memmove( list_wc_inter_frame_heap, list_current_inter_frame_heap, n_items_current_inter_frame_heap * sizeof( int ) );
- n_items_wc_inter_frame_heap = n_items_current_inter_frame_heap;
- size_wc_inter_frame_heap = size_current_inter_frame_heap;
- location_wc_inter_frame_heap = update_cnt;
- ptr_record->wc_heap_size_inter_frame = ptr_record->block_size;
- }
}
else
{
@@ -1519,9 +1486,60 @@ void update_mem( void )
}
}
+ /* check, if this is the new worst-case for intra-frame heap memory */
+ if ( size_current_intra_frame_heap > size_wc_intra_frame_heap )
+ {
+ if ( n_items_current_intra_frame_heap >= max_items_wc_intra_frame_heap )
+ {
+ /* resize the list, if needed */
+ max_items_wc_intra_frame_heap = n_items_current_intra_frame_heap + MAX_NUM_RECORDS_REALLOC_STEP;
+ list_wc_intra_frame_heap = realloc( list_wc_intra_frame_heap, max_items_wc_intra_frame_heap * sizeof( int ) );
+ }
+
+ /* copy current-frame list to worst-case list */
+ memmove( list_wc_intra_frame_heap, list_current_intra_frame_heap, n_items_current_intra_frame_heap * sizeof( int ) );
+ n_items_wc_intra_frame_heap = n_items_current_intra_frame_heap;
+ size_wc_intra_frame_heap = size_current_intra_frame_heap;
+ location_wc_intra_frame_heap = update_cnt;
+
+ /* update the wc numbers in all individual records */
+ for ( i = 0; i < n_items_wc_intra_frame_heap; i++ )
+ {
+ i_record = list_wc_intra_frame_heap[i];
+ ptr_record = &( allocation_list[i_record] );
+ ptr_record->wc_heap_size_intra_frame = ptr_record->block_size;
+ }
+ }
+
+ /* check, if this is the new worst-case for inter-frame heap memory */
+ if ( size_current_inter_frame_heap > size_wc_inter_frame_heap )
+ {
+ if ( n_items_current_inter_frame_heap >= max_items_wc_inter_frame_heap )
+ {
+ /* resize list, if needed */
+ max_items_wc_inter_frame_heap = n_items_current_inter_frame_heap + MAX_NUM_RECORDS_REALLOC_STEP;
+ list_wc_inter_frame_heap = realloc( list_wc_inter_frame_heap, max_items_wc_inter_frame_heap * sizeof( int ) );
+ }
+
+ /* copy current-frame list to worst-case list */
+ memmove( list_wc_inter_frame_heap, list_current_inter_frame_heap, n_items_current_inter_frame_heap * sizeof( int ) );
+ n_items_wc_inter_frame_heap = n_items_current_inter_frame_heap;
+ size_wc_inter_frame_heap = size_current_inter_frame_heap;
+ location_wc_inter_frame_heap = update_cnt;
+
+ /* update the wc numbers in all individual records */
+ for ( i = 0; i < n_items_wc_inter_frame_heap; i++ )
+ {
+ i_record = list_wc_inter_frame_heap[i];
+ ptr_record = &( allocation_list[i_record] );
+ ptr_record->wc_heap_size_inter_frame = ptr_record->block_size;
+ }
+ }
+
/* reset heap allocation call tree */
heap_allocation_call_tree_size = 0;
+ /* de-allocate list of intra-frame heap memory blocks in the current fraeme - it's needed only inside this function */
if ( list_current_intra_frame_heap )
{
free( list_current_intra_frame_heap );
@@ -1636,7 +1654,7 @@ static void mem_count_summary( void )
if ( ptr_record->noccurances > 1 )
{
- sprintf( size_str, "%dx%d %s", ptr_record->noccurances, (int) ( ( ptr_record->noccurances * ptr_record->wc_heap_size_intra_frame ) >> Stat_Cnt_Size ), Count_Unit[Stat_Cnt_Size] );
+ sprintf( size_str, "%dx%d %s", ptr_record->noccurances, (int) ( ptr_record->wc_heap_size_intra_frame >> Stat_Cnt_Size ), Count_Unit[Stat_Cnt_Size] );
}
else
{
@@ -1665,7 +1683,7 @@ static void mem_count_summary( void )
continue;
}
ptr_record = &( allocation_list[index_record] );
- ptr_record->noccurances = 1; /* reset the counter because som blocks may be both, intra-frame and inter-frame */
+ ptr_record->noccurances = 1; /* reset the counter as some blocks may have been both, intra-frame and inter-frame */
for ( j = i + 1; j < n_items_wc_inter_frame_heap; j++ )
{
index = list_wc_inter_frame_heap[j];
@@ -1684,7 +1702,7 @@ static void mem_count_summary( void )
}
/* Print Header */
- sprintf( buf, format_str, "Function Name", "Line", "Type", "Function Parameters", "Maximum Size", "Usage" );
+ sprintf( buf, format_str, "Function Name", "Line", "Type", "Function Parameters", "Memory Size", "Usage" );
puts( buf );
length = strlen( buf );
sprintf( buf, "%0*d\n", (int) length - 1, 0 );
@@ -1719,11 +1737,11 @@ static void mem_count_summary( void )
sprintf( line_str, "%d", ptr_record->lineno );
/* prepare average usage & memory size strings */
- sprintf( usage_str, "%d%%", (int) ( ( (float) ptr_record->total_used_size / ( ptr_record->total_block_size + 1 ) ) * 100.0f ) );
+ sprintf( usage_str, "%d%%", (int) ( ( (float) ptr_record->total_used_size / ( ptr_record->total_block_size + 0.1f ) ) * 100.0f + 0.5f ) );
if ( ptr_record->noccurances > 1 )
{
- sprintf( size_str, "%dx%d %s", ptr_record->noccurances, (int) ( ( ptr_record->noccurances * ptr_record->wc_heap_size_inter_frame ) >> Stat_Cnt_Size ), Count_Unit[Stat_Cnt_Size] );
+ sprintf( size_str, "%dx%d %s", ptr_record->noccurances, (int) ( ptr_record->wc_heap_size_inter_frame >> Stat_Cnt_Size ), Count_Unit[Stat_Cnt_Size] );
}
else
{
diff --git a/lib_dec/acelp_core_dec.c b/lib_dec/acelp_core_dec.c
index 571311ed124250ec488242fa3d6acb6e56a19652..eb53379d6683c5d05f178ae3f0d2b4aef0dac910 100644
--- a/lib_dec/acelp_core_dec.c
+++ b/lib_dec/acelp_core_dec.c
@@ -512,11 +512,7 @@ ivas_error acelp_core_dec(
}
else
{
-#ifdef PARAM_ISM_DTX_CNG
if ( st->core_brate == SID_2k40 && st->element_mode != IVAS_CPE_MDCT && st->read_sid_info )
-#else
- if ( st->core_brate == SID_2k40 && st->element_mode != IVAS_CPE_MDCT )
-#endif
{
FdCng_decodeSID( st );
*sid_bw = 0;
@@ -532,9 +528,8 @@ ivas_error acelp_core_dec(
}
ApplyFdCng( syn, NULL, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
}
-#ifdef PARAM_ISM_DTX_CNG
if ( !st->read_sid_info )
- // if (!st->read_sid_info && st->cng_paramISM_flag) /* read_sid_info can only be 0 in ParamISM mode */
+ // if (!st->read_sid_info && st->cng_ism_flag) /* read_sid_info can only be 0 in ParamISM mode */
{
float noise_lvl_highest;
@@ -544,7 +539,6 @@ ivas_error acelp_core_dec(
st->hFdCngDec->hFdCngCom->cngNoiseLevel[b] = noise_lvl_highest;
}
}
-#endif
generate_comfort_noise_dec( NULL, NULL, st, nchan_out );
@@ -1131,11 +1125,7 @@ ivas_error acelp_core_dec(
st->lp_noise = st->hFdCngDec->lp_noise;
}
-#ifdef PARAM_ISM_DTX_CNG
- if ( st->element_mode != IVAS_CPE_TD && !st->cng_paramISM_flag )
-#else
- if ( st->element_mode != IVAS_CPE_TD )
-#endif
+ if ( st->element_mode != IVAS_CPE_TD && !st->cng_ism_flag )
{
/*Noise estimate*/
ApplyFdCng( syn, NULL, realBuffer, imagBuffer, st, 0, ( st->coder_type == AUDIO && !st->GSC_noisy_speech ) );
@@ -1311,11 +1301,7 @@ ivas_error acelp_core_dec(
/*WB/SWB-FD_CNG*/
if ( ( st->core_brate == FRAME_NO_DATA || st->core_brate == SID_2k40 ) && ( st->cng_type == FD_CNG ) && ( st->hFdCngDec->hFdCngCom->numCoreBands < st->cldfbSyn->no_channels ) )
{
-#ifdef PARAM_ISM_DTX_CNG
- generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom, st->cng_paramISM_flag );
-#else
- generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom );
-#endif
+ generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom, st->cng_ism_flag );
if ( st->hFdCngDec->hFdCngCom->regularStopBand < st->cldfbSyn->no_channels )
{
diff --git a/lib_dec/core_dec_init.c b/lib_dec/core_dec_init.c
index 1e238fb52f1603f5638fa7ece5dce5031f73a830..6d6ebeef86800182fbee4d5992066fd405956581 100644
--- a/lib_dec/core_dec_init.c
+++ b/lib_dec/core_dec_init.c
@@ -190,7 +190,12 @@ void open_decoder_LPD(
{
if ( !is_init || st->element_mode != IVAS_CPE_MDCT )
{
- init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->output_Fs, st->L_frame, st->bwidth, st->hTcxDec->L_frameTCX, st->fscale, encoderLookahead, encoderLookaheadFB, st->preemph_fac, st->tcxonly, st->rf_flag, st->igf, st->hIGFDec->infoIGFStopFreq, st->element_mode, st->ini_frame, MCT_flag, st->mct_chan_mode );
+ init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->output_Fs, st->L_frame, st->bwidth, st->hTcxDec->L_frameTCX, st->fscale, encoderLookahead, encoderLookaheadFB, st->preemph_fac, st->tcxonly, st->rf_flag, st->igf, st->hIGFDec->infoIGFStopFreq, st->element_mode, st->ini_frame, MCT_flag
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
}
else
{
@@ -670,10 +675,19 @@ void open_decoder_LPD(
st->last_tns_active = 0;
st->second_last_tns_active = 0;
st->second_last_core = -1;
- /* TODO: also apply for MCT modes, once issue #24 is solved */
- if ( st->hTcxCfg != NULL && !MCT_flag && st->element_mode != EVS_MONO )
+
+ if ( st->hTcxCfg != NULL &&
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ !MCT_flag &&
+#endif
+ st->element_mode != EVS_MONO )
{
- st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode );
+ st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
}
if ( hTcxDec != NULL )
{
diff --git a/lib_dec/core_dec_switch.c b/lib_dec/core_dec_switch.c
index a092255a38897557b1260d1cd9860907a810aa15..b02d0a78f5ae2ba639ec634ce3c99d389ec565af 100644
--- a/lib_dec/core_dec_switch.c
+++ b/lib_dec/core_dec_switch.c
@@ -91,7 +91,12 @@ void mode_switch_decoder_LPD(
switchWB = 1; /*force init when coming from MODE1*/
}
- st->igf = getIgfPresent( st->element_mode, total_brate, bwidth, st->rf_flag, st->mct_chan_mode );
+ st->igf = getIgfPresent( st->element_mode, total_brate, bwidth, st->rf_flag
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
if ( st->hIGFDec != NULL )
{
@@ -140,7 +145,12 @@ void mode_switch_decoder_LPD(
if ( st->hTcxCfg != NULL )
{
st->hTcxCfg->pCurrentTnsConfig = NULL;
- st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, st->igf, st->element_mode, st->mct_chan_mode );
+ st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( total_brate, st->igf, st->element_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
}
if ( st->hTcxCfg->fIsTNSAllowed && st->hIGFDec != NULL && st->hTcxCfg != NULL )
diff --git a/lib_dec/core_switching_dec.c b/lib_dec/core_switching_dec.c
index c2a3955afba78484d27ac1a564e75a6a9f4d6113..fc331a2e9feddf5613d7087db069c065ce0e6b09 100644
--- a/lib_dec/core_switching_dec.c
+++ b/lib_dec/core_switching_dec.c
@@ -51,7 +51,7 @@
*---------------------------------------------------------------------*/
static void core_switch_lb_upsamp( Decoder_State *st, float *output );
-static void smoothTransitionMdctStereoDtx( float synth[], const int16_t output_frame, const int16_t delay_comp );
+static void smoothTransitionDtxToTcx( float synth[], const int16_t output_frame, const int16_t delay_comp );
/*---------------------------------------------------------------------*
* core_switching_pre_dec()
@@ -552,10 +552,13 @@ ivas_error core_switching_pre_dec(
*---------------------------------------------------------------------*/
ivas_error core_switching_post_dec(
- Decoder_State *st, /* i/o: decoder state structure */
- float *synth, /* i/o: output synthesis */
- float *output, /* i/o: LB synth/upsampled LB synth */
- float output_mem[], /* i : OLA memory from last TCX/HQ frame */
+ Decoder_State *st, /* i/o: decoder state structure */
+ float *synth, /* i/o: output synthesis */
+ float *output, /* i/o: LB synth/upsampled LB synth */
+ float output_mem[], /* i : OLA memory from last TCX/HQ frame */
+#ifdef FIX_ISM_DTX_CLICKS
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+#endif
const int16_t use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */
const int16_t output_frame, /* i : frame length */
const int16_t core_switching_flag, /* i : ACELP->HQ switching flag */
@@ -677,10 +680,14 @@ ivas_error core_switching_post_dec(
synth[i + delay_comp] = ( synth[i + delay_comp] * i + ( tmpDelta - i ) * st->previoussynth[i + delay_comp] ) / tmpDelta;
}
+#ifdef FIX_ISM_DTX_CLICKS
+ if ( ( st->element_mode == IVAS_CPE_MDCT || ( ivas_format == ISM_FORMAT && st->core == TCX_20_CORE /* <- means TCX in general, TCX10 is forbidden after ACELP */ ) ) && st->last_core_brate <= SID_2k40 && st->core_brate > SID_2k40 )
+#else
if ( st->element_mode == IVAS_CPE_MDCT && st->last_core_brate <= SID_2k40 && st->core_brate > SID_2k40 )
+#endif
{
/* smooth transitions to avoid pops in car noise items */
- smoothTransitionMdctStereoDtx( synth, output_frame, delay_comp );
+ smoothTransitionDtxToTcx( synth, output_frame, delay_comp );
}
/* Reset memories of CLDFBs */
@@ -1245,16 +1252,16 @@ static void core_switch_lb_upsamp(
}
/*---------------------------------------------------------------------*
- * smoothTransitionMdctStereoDtx()
+ * smoothTransitionDtxToTcx()
*
- * apply smoothing to the transition part for MDCT-Stereo DTX
+ * apply smoothing to the transition part for inactive to active transitions in DTX
*---------------------------------------------------------------------*/
#define TRANSITION_SMOOTHING_LEN_16k 15
#define TRANSITION_SMOOTHING_LEN_32k 31
#define TRANSITION_SMOOTHING_LEN_48k 47
-static void smoothTransitionMdctStereoDtx(
+static void smoothTransitionDtxToTcx(
float synth[], /* i/o: synthesis */
const int16_t output_frame, /* i : output frame length */
const int16_t delay_comp /* i : delay compensation in samples */
diff --git a/lib_dec/dec_tcx.c b/lib_dec/dec_tcx.c
index 9c8172589405790afab9bd795820260975bbb10b..fbdd150217ff246abdd3ca4cbe898278b5ef06d2 100644
--- a/lib_dec/dec_tcx.c
+++ b/lib_dec/dec_tcx.c
@@ -107,7 +107,11 @@ void decoder_tcx(
decoder_tcx_tns( st, L_frame_glob, L_spec, L_frame, L_frameTCX, &x[0], fUseTns, &tnsData, bfi, frame_cnt, 0 );
decoder_tcx_imdct( st, L_frame_glob, L_frameTCX_glob, L_spec, tcx_offset, tcx_offsetFB, L_frame, L_frameTCX, left_rect, &x[0], &xn_buf[0], MDCT_IV,
- fUseTns, &synth[0], &synthFB[0], bfi, frame_cnt, 0, sba_dirac_stereo_flag );
+ fUseTns, &synth[0], &synthFB[0], bfi, frame_cnt,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ 0,
+#endif
+ sba_dirac_stereo_flag );
return;
}
@@ -335,7 +339,12 @@ void IMDCT(
v_multc( old_syn_overl, hTcxDec->conceal_eof_gain * st->last_concealed_gain_syn_deemph, old_syn_overl, overlap );
}
- if ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 || st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && ( st->tcxonly ) )
+ if ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || st->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ ) &&
+ ( st->tcxonly ) )
{
/* Mode decision in PLC
@@ -354,7 +363,9 @@ void IMDCT(
if ( ( !bfi && hTcxCfg->tcx_last_overlap_mode != FULL_OVERLAP ) || ( bfi && ( hTcxCfg->tcx_last_overlap_mode != FULL_OVERLAP ) && ( hTcxCfg->tcx_curr_overlap_mode != FULL_OVERLAP ) ) )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE );
+#endif
/* minimum or half overlap, two transforms, grouping into one window */
L_win = L_frame >> 1;
L_ola = ( hTcxCfg->tcx_last_overlap_mode == MIN_OVERLAP ) ? tcx_mdct_window_min_length : tcx_mdct_window_half_length;
@@ -392,7 +403,11 @@ void IMDCT(
/* To assure that no garbage values are passed to overlap */
set_zero( xn_buf + L_frame + tcx_offset + ( L_ola >> 1 ), overlap - tcx_offset - ( L_ola >> 1 ) );
}
- else if ( !bfi && ( frame_cnt == 0 ) && ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ else if ( !bfi && ( frame_cnt == 0 ) && ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
/* special overlap attempt, two transforms, grouping into one window */
@@ -553,7 +568,13 @@ void IMDCT(
/* Window and overlap-add past frame if past frame is TCX */
if ( ( frame_cnt != 0 ) || ( st->last_core_bfi > ACELP_CORE ) )
{
- if ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 || st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && ( st->tcxonly ) ) || ( hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) )
+ if ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || st->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ ) &&
+ ( st->tcxonly ) ) ||
+ ( hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) )
{
if ( !bfi && ( frame_cnt > 0 ) && ( index == 0 ) && ( hTcxCfg->tcx_curr_overlap_mode == FULL_OVERLAP ) && ( st->last_core != ACELP_CORE ) )
{
@@ -616,7 +637,11 @@ void IMDCT(
}
}
- if ( !aldo && ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && frame_cnt > 0 ) || L_frameTCX != ( hTcxDec->L_frameTCX >> 1 ) ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( !aldo && ( ( ( L_frameTCX == hTcxDec->L_frameTCX >> 1 ) && frame_cnt > 0 ) || L_frameTCX != ( hTcxDec->L_frameTCX >> 1 ) )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
/* Compute windowed synthesis in case of switching to ALDO windows in next frame */
mvr2r( xn_buf + L_frame - nz, old_out, nz + overlap );
@@ -1557,9 +1582,11 @@ void decoder_tcx_imdct(
const int16_t fUseTns, /* i : flag that is set if TNS data is present */
float synth[], /* i/o: synth[-M..L_frame] */
float synthFB[],
- const int16_t bfi, /* i : Bad frame indicator */
- const int16_t frame_cnt, /* i : frame counter in the super frame */
- const int16_t isLFE, /* i : is LFE */
+ const int16_t bfi, /* i : Bad frame indicator */
+ const int16_t frame_cnt, /* i : frame counter in the super frame */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ const int16_t isLFE, /* i : is LFE */
+#endif
const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
)
{
@@ -1591,7 +1618,11 @@ void decoder_tcx_imdct(
hTcxCfg->tcx_last_overlap_mode = hTcxCfg->tcx_curr_overlap_mode;
}
- if ( !isLFE && st->igf )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ !isLFE &&
+#endif
+ st->igf )
{
proc = st->hIGFDec->flatteningTrigger;
@@ -1689,7 +1720,18 @@ void decoder_tcx_imdct(
if ( st->element_mode != IVAS_CPE_DFT && !sba_dirac_stereo_flag )
{
- IMDCT( xn_bufFB, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_window : hTcxCfg->tcx_aldo_window_1_trunc, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_window : hTcxCfg->tcx_aldo_window_2, hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index,
+ IMDCT( xn_bufFB, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_window : hTcxCfg->tcx_aldo_window_1_trunc,
+#else
+ hTcxCfg->tcx_aldo_window_1_trunc,
+#endif
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_window : hTcxCfg->tcx_aldo_window_2,
+#else
+ hTcxCfg->tcx_aldo_window_2,
+#endif
+ hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index,
kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_outLB, 0, st, 0, acelp_zir );
}
@@ -1709,7 +1751,13 @@ void decoder_tcx_imdct(
if ( st->element_mode != EVS_MONO )
{
- IMDCT( x_tmp, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_windowFB : hTcxCfg->tcx_aldo_window_1_FB_trunc, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_windowFB : hTcxCfg->tcx_aldo_window_2_FB, hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index,
+ IMDCT( x_tmp, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_windowFB : hTcxCfg->tcx_aldo_window_1_FB_trunc, st->mct_chan_mode == MCT_CHAN_MODE_LFE ? hTcxCfg->tcx_mdct_windowFB : hTcxCfg->tcx_aldo_window_2_FB,
+#else
+ hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB,
+#endif
+ hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index,
kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, max( L_frameTCX, L_spec ) >> 1, L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out, 1, st, FSCALE_DENOM * L_frameTCX_glob / L_frame_glob, acelp_zir );
}
else
diff --git a/lib_dec/er_util.c b/lib_dec/er_util.c
index 809b0134d9653d91a028804f78eee5468a801782..75f553f1e83602560ac49cbedfb048e4710b23d9 100644
--- a/lib_dec/er_util.c
+++ b/lib_dec/er_util.c
@@ -318,8 +318,12 @@ int16_t GetPLCModeDecision(
{
TonalMDCTConceal_Detect( st->hTonalMDCTConc, ( hTcxDec->tcxltp_last_gain_unmodified > 0 ) ? st->old_fpitch : 0, &numIndices,
- ( st->element_mode == IVAS_CPE_MDCT ? &( st->hTcxCfg->psychParamsTCX20 ) : st->hTcxCfg->psychParamsCurrent ),
- st->mct_chan_mode == MCT_CHAN_MODE_LFE );
+ ( st->element_mode == IVAS_CPE_MDCT ? &( st->hTcxCfg->psychParamsTCX20 ) : st->hTcxCfg->psychParamsCurrent )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ );
if ( ( numIndices > 10 ) || ( ( numIndices > 5 ) && ( fabs( hTcxDec->tcxltp_third_last_pitch - hTcxDec->tcxltp_second_last_pitch ) < 0.5f ) ) || ( ( numIndices > 0 ) && ( ( st->last_good <= UNVOICED_TRANSITION ) || ( hTcxDec->tcxltp_last_gain_unmodified <= 0.4f ) ) && ( fabs( hTcxDec->tcxltp_third_last_pitch - hTcxDec->tcxltp_second_last_pitch ) < 0.5f ) ) )
{
diff --git a/lib_dec/evs_dec.c b/lib_dec/evs_dec.c
index 23914302375ae1e39dd2cf8bccdc03c1a485d997..0dbc0feafc07ebb98963d8314b762d5e20de0e76 100644
--- a/lib_dec/evs_dec.c
+++ b/lib_dec/evs_dec.c
@@ -276,7 +276,11 @@ ivas_error evs_dec(
* Postprocessing for ACELP/MDCT core switching
*---------------------------------------------------------------------*/
+#ifdef FIX_ISM_DTX_CLICKS
+ if ( ( error = core_switching_post_dec( st, synth, NULL, NULL, 0, MONO_FORMAT, output_frame, core_switching_flag, 0, -1, EVS_MONO ) ) != IVAS_ERR_OK )
+#else
if ( ( error = core_switching_post_dec( st, synth, NULL, NULL, 0, output_frame, core_switching_flag, 0, -1, EVS_MONO ) ) != IVAS_ERR_OK )
+#endif
{
return error;
}
diff --git a/lib_dec/fd_cng_dec.c b/lib_dec/fd_cng_dec.c
index 971841e26a2a04b057a9ef218432104100abb360..ab9465a93a246c2251e998f544b2b28f501cc084 100644
--- a/lib_dec/fd_cng_dec.c
+++ b/lib_dec/fd_cng_dec.c
@@ -58,6 +58,14 @@
#define CNA_ACT_DN_FACT 0.7 /* downward updating factor for CNA during active frames */
#define FIRST_CNA_NOISE_UPD_FRAMES 5 /* minimum number of CN initialization frames */
+
+/*-------------------------------------------------------------------
+ * Local fucntions declarations
+ *-------------------------------------------------------------------*/
+
+static void perform_noise_estimation_dec( const float *timeDomainInput, float *power_spectrum, HANDLE_FD_CNG_DEC hFdCngDec, const int16_t element_mode, const int16_t bwidth, const int16_t L_frame, const int16_t last_L_frame, const int32_t last_core_brate, const int16_t VAD );
+
+
/*-------------------------------------------------------------------
* createFdCngDec()
*
@@ -75,8 +83,7 @@ ivas_error createFdCngDec(
*hFdCngDec = NULL;
/* Allocate memory */
- hs = (HANDLE_FD_CNG_DEC) malloc( sizeof( FD_CNG_DEC ) );
- if ( hs == NULL )
+ if ( ( hs = (HANDLE_FD_CNG_DEC) malloc( sizeof( FD_CNG_DEC ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for FD CNG DEC structure" );
}
@@ -413,6 +420,7 @@ void ApplyFdCng(
hFdCngCom->sid_frame_counter = 0;
/* set noise estimation inactive during concealment, as no update with noise generated by concealment should be performed. */
/* set noise estimation inactive when we have bit errors, as no update with noise generated by corrupt frame (biterror) should be performed. */
+#ifndef DISCRETE_ISM_DTX_CNG
if ( concealWholeFrame == 0 &&
( timeDomainInput == NULL ||
( *timeDomainInput( -FLT_MAX ) &&
@@ -422,6 +430,17 @@ void ApplyFdCng(
!( st->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) ||
( st->element_mode == IVAS_CPE_TD ) ) &&
( !st->BER_detect ) )
+#else
+ if ( concealWholeFrame == 0 &&
+ ( timeDomainInput == NULL ||
+ ( *timeDomainInput( -FLT_MAX ) &&
+ *( timeDomainInput + hFdCngCom->frameSize - 1 ) < FLT_MAX &&
+ *( timeDomainInput + hFdCngCom->frameSize - 1 ) > ( -FLT_MAX ) ) ) &&
+ ( ( ( ( st->element_mode != IVAS_CPE_TD && st->element_mode != IVAS_CPE_DFT && hFdCngDec->flag_dtx_mode ) || !st->VAD || ( st->ini_frame < 100 && st->is_ism_format ) ) &&
+ !( st->cng_type == LP_CNG && hFdCngDec->flag_dtx_mode ) && ( is_music == 0 ) ) ||
+ ( st->element_mode == IVAS_CPE_TD ) ) &&
+ ( !st->BER_detect ) )
+#endif
{
/* Perform noise estimation at the decoder */
perform_noise_estimation_dec( timeDomainInput, powerSpectrum, hFdCngDec, st->element_mode, st->bwidth, L_frame, last_L_frame, st->last_core_brate, st->VAD );
@@ -619,7 +638,7 @@ void ApplyFdCng(
* Perform noise estimation at the decoder
*-------------------------------------------------------------------*/
-void perform_noise_estimation_dec(
+static void perform_noise_estimation_dec(
const float *timeDomainInput,
float *power_spectrum,
HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: FD_CNG structure containing all buffers and variables */
@@ -1084,11 +1103,7 @@ void generate_comfort_noise_dec(
c2 = (float) sqrt( 1 - hFdCngCom->coherence );
seed2 = &( hFdCngCom->seed2 );
-#ifdef PARAM_ISM_DTX_CNG
- if ( ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )
-#else
- if ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 )
-#endif
+ if ( ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )
{
seed2 = &( hFdCngCom->seed3 );
}
@@ -1098,11 +1113,7 @@ void generate_comfort_noise_dec(
if ( hFdCngCom->startBand == 0 )
{
-#ifdef PARAM_ISM_DTX_CNG
- if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )
-#else
- if ( st->element_mode == IVAS_CPE_MDCT )
-#endif
+ if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )
{
rand_gauss( &tmp1, seed );
rand_gauss( &tmp2, seed2 );
@@ -1127,11 +1138,7 @@ void generate_comfort_noise_dec(
for ( ; ptr_level < cngNoiseLevel + hFdCngCom->stopFFTbin - hFdCngCom->startBand; ptr_level++ )
{
/* Real part in FFT bins */
-#ifdef PARAM_ISM_DTX_CNG
- if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )
-#else
- if ( st->element_mode == IVAS_CPE_MDCT )
-#endif
+ if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )
{
rand_gauss( &tmp1, seed );
rand_gauss( &tmp2, seed2 );
@@ -1145,11 +1152,7 @@ void generate_comfort_noise_dec(
ptr_r += 2;
/* Imaginary part in FFT bins */
-#ifdef PARAM_ISM_DTX_CNG
- if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )
-#else
- if ( st->element_mode == IVAS_CPE_MDCT )
-#endif
+ if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )
{
rand_gauss( &tmp1, seed );
rand_gauss( &tmp2, seed2 );
@@ -1227,11 +1230,7 @@ void generate_comfort_noise_dec(
for ( i = 0; i < hFdCngCom->numSlots; i++ )
{
/* Real part in CLDFB band */
-#ifdef PARAM_ISM_DTX_CNG
- if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )
-#else
- if ( st->element_mode == IVAS_CPE_MDCT )
-#endif
+ if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )
{
rand_gauss( &tmp1, seed );
rand_gauss( &tmp2, seed2 );
@@ -1244,11 +1243,7 @@ void generate_comfort_noise_dec(
bufferReal[i][j] *= (float) sqrt( ( scaleCldfb * *ptr_level ) * 0.5f );
/* Imaginary part in CLDFB band */
-#ifdef PARAM_ISM_DTX_CNG
- if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )
-#else
- if ( st->element_mode == IVAS_CPE_MDCT )
-#endif
+ if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )
{
rand_gauss( &tmp1, seed );
rand_gauss( &tmp2, seed2 );
@@ -1345,13 +1340,10 @@ void generate_comfort_noise_dec(
*-------------------------------------------------------------------*/
void generate_comfort_noise_dec_hf(
- float **bufferReal, /* o : Real part of input bands */
- float **bufferImag, /* o : Imaginary part of input bands */
- HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */
-#ifdef PARAM_ISM_DTX_CNG
- ,
- const int16_t cng_coh_flag /* i : CNG Flag for coherence handling */
-#endif
+ float **bufferReal, /* o : Real part of input bands */
+ float **bufferImag, /* o : Imaginary part of input bands */
+ HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
+ const int16_t cng_coh_flag /* i : CNG Flag for coherence handling */
)
{
int16_t i, j;
@@ -1360,7 +1352,6 @@ void generate_comfort_noise_dec_hf(
int16_t *seed = &( hFdCngCom->seed );
float scale = CLDFB_SCALING / hFdCngCom->scalingFactor;
-#ifdef PARAM_ISM_DTX_CNG
int16_t *seed2 = &( hFdCngCom->seed );
float tmp1, tmp2, c1 = 0.f, c2 = 0.f;
@@ -1368,10 +1359,9 @@ void generate_comfort_noise_dec_hf(
{
seed2 = &( hFdCngCom->seed3 );
- c1 = (float) sqrt( hFdCngCom->coherence );
+ c1 = (float) sqrt( hFdCngCom->coherence ); // VE!!!!! all occurences of "(float) sqrt()" should be replaced by "sqrtf()"
c2 = (float) sqrt( 1 - hFdCngCom->coherence );
}
-#endif
ptr_level = hFdCngCom->cngNoiseLevel + hFdCngCom->stopFFTbin - hFdCngCom->startBand;
/*
@@ -1384,7 +1374,6 @@ void generate_comfort_noise_dec_hf(
{
for ( i = 0; i < hFdCngCom->numSlots; i++ )
{
-#ifdef PARAM_ISM_DTX_CNG
if ( cng_coh_flag )
{
/* Real part in CLDFB band */
@@ -1408,14 +1397,6 @@ void generate_comfort_noise_dec_hf(
rand_gauss( &bufferImag[i][j], seed );
bufferImag[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f );
}
-#else
- /* Real part in CLDFB band */
- rand_gauss( &bufferReal[i][j], seed );
- bufferReal[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f );
- /* Imaginary part in CLDFB band */
- rand_gauss( &bufferImag[i][j], seed );
- bufferImag[i][j] *= (float) sqrt( ( scale * *ptr_level ) * 0.5f );
-#endif
}
ptr_level++;
}
diff --git a/lib_dec/hq_lr_dec.c b/lib_dec/hq_lr_dec.c
index 81f4c1b284460f451ce60e2b6b367250089a34a4..774720844c56abf7a28ea7cd13c4c312153f9077 100644
--- a/lib_dec/hq_lr_dec.c
+++ b/lib_dec/hq_lr_dec.c
@@ -238,7 +238,7 @@ void hq_lr_dec(
if ( flag_spt == 1 )
{
- /* initalize the desired parameters for SPT */
+ /* initialize the desired parameters for SPT */
spt_shorten_domain_band_save( bands, band_start, band_end, band_width, org_band_start, org_band_end, org_band_width );
spt_shorten_domain_pre( band_start, band_end, hHQ_core->prev_SWB_peak_pos, bands, bwe_br, new_band_start, new_band_end, new_band_width );
spt_shorten_domain_set_dec( st, p2a_flags, new_band_start, new_band_end, new_band_width, bands, band_start, band_end, band_width, &bit_budget );
diff --git a/lib_dec/init_dec.c b/lib_dec/init_dec.c
index 402fdc78f5449592d418d2baf9ffdacb270d793d..97aa4a0fc836bf20a7ed38cf339df8a1268d307e 100644
--- a/lib_dec/init_dec.c
+++ b/lib_dec/init_dec.c
@@ -326,7 +326,11 @@ ivas_error init_decoder(
set_f( st->old_synth_sw, 0.0f, NS2SA( 48000, FRAME_SIZE_NS - ACELP_LOOK_NS - DELAY_BWE_TOTAL_NS ) );
}
- if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT || st->element_mode == IVAS_SCE || st->element_mode == EVS_MONO ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT || st->element_mode == IVAS_SCE || st->element_mode == EVS_MONO )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
if ( ( st->hHQ_core = (HQ_DEC_HANDLE) malloc( sizeof( HQ_DEC_DATA ) ) ) == NULL )
{
@@ -519,17 +523,21 @@ ivas_error init_decoder(
}
/* open synthesis for output sampling rate */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE )
{
+#endif
if ( ( error = openCldfb( &st->cldfbSyn, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK )
{
return error;
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
else
{
st->cldfbSyn = NULL;
}
+#endif
st->cldfbSynHB = NULL;
@@ -585,7 +593,11 @@ ivas_error init_decoder(
*-----------------------------------------------------------------*/
/* TCX-LTP */
- if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
if ( ( st->hTcxLtpDec = (TCX_LTP_DEC_HANDLE) malloc( sizeof( TCX_LTP_DEC_DATA ) ) ) == NULL )
{
@@ -598,7 +610,7 @@ ivas_error init_decoder(
}
/* TCX core */
- // VE: reduction possible for MCT_CHAN_MODE_LFE channel - see I1-172
+
if ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT )
{
if ( ( st->hTcxDec = (TCX_DEC_HANDLE) malloc( sizeof( TCX_DEC_DATA ) ) ) == NULL )
@@ -617,7 +629,11 @@ ivas_error init_decoder(
}
/* TCX config. data structure */
- if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
if ( ( st->hTcxCfg = (TCX_CONFIG_HANDLE) malloc( sizeof( TCX_config ) ) ) == NULL )
{
@@ -630,7 +646,11 @@ ivas_error init_decoder(
}
/* Tonal MDCT concealment data structure */
- if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
if ( ( st->hTonalMDCTConc = (TonalMDCTConcealPtr) malloc( sizeof( TonalMDCTConceal_INSTANCE ) ) ) == NULL )
{
@@ -646,7 +666,11 @@ ivas_error init_decoder(
* IGF
*-----------------------------------------------------------------*/
- if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
if ( ( st->hIGFDec = (IGF_DEC_INSTANCE_HANDLE) malloc( sizeof( IGFDEC_INSTANCE ) ) ) == NULL )
{
@@ -738,9 +762,10 @@ ivas_error init_decoder(
st->tdm_LRTD_flag = 0;
st->cna_dirac_flag = 0;
st->cng_sba_flag = 0;
-#ifdef PARAM_ISM_DTX_CNG
- st->cng_paramISM_flag = 0;
+ st->cng_ism_flag = 0;
st->read_sid_info = 1; /* by default read the sid info from bitstream */
+#ifdef DISCRETE_ISM_DTX_CNG
+ st->is_ism_format = 0;
#endif
@@ -772,12 +797,12 @@ void reset_preecho_dec(
/*----------------------------------------------------------------------*
- * destroy_decoder()
+ * destroy_cldfb_decoder()
*
* Free memory which was allocated in init_decoder()
*----------------------------------------------------------------------*/
-void destroy_decoder(
+void destroy_cldfb_decoder(
Decoder_State *st /* o : Decoder static variables structure */
)
{
diff --git a/lib_dec/ivas_agc_dec.c b/lib_dec/ivas_agc_dec.c
index 1397ce1111f4aadbcc1f3898e427cf742530bf95..72ae68a57b34d61132eee2944adf4b6f27e52a4f 100644
--- a/lib_dec/ivas_agc_dec.c
+++ b/lib_dec/ivas_agc_dec.c
@@ -142,22 +142,24 @@ void ivas_spar_agc_dec_close(
{
ivas_agc_dec_state_t *hAgc;
+ if ( hAgcDec == NULL || *hAgcDec == NULL )
+ {
+ return;
+ }
+
hAgc = *hAgcDec;
- if ( hAgc != NULL )
- {
- free( hAgc->agc_com.winFunc );
- hAgc->agc_com.winFunc = NULL;
+ free( hAgc->agc_com.winFunc );
+ hAgc->agc_com.winFunc = NULL;
- free( hAgc->gain_state );
- hAgc->gain_state = NULL;
+ free( hAgc->gain_state );
+ hAgc->gain_state = NULL;
- free( hAgc->gain_data );
- hAgc->gain_data = NULL;
+ free( hAgc->gain_data );
+ hAgc->gain_data = NULL;
- free( hAgc );
- *hAgcDec = NULL;
- }
+ free( *hAgcDec );
+ *hAgcDec = NULL;
return;
}
diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c
index 9fcb85ac0c43033df7f1152c8d0eb171fcdfee96..2db5602519dd28b45f9741760b409d062bfc4d8c 100644
--- a/lib_dec/ivas_binRenderer_internal.c
+++ b/lib_dec/ivas_binRenderer_internal.c
@@ -866,8 +866,6 @@ void ivas_binaural_add_LFE(
if ( render_lfe )
{
-#ifdef FIX_197_CREND_INTERFACE
-#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )
{
gain = GAIN_LFE;
@@ -876,12 +874,6 @@ void ivas_binaural_add_LFE(
{
gain = ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hHrtfCrend != NULL ) ) ? st_ivas->hCrendWrapper->hHrtfCrend->gain_lfe : GAIN_LFE;
}
-#else
- gain = ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hHrtfCrend != NULL ) ) ? st_ivas->hCrendWrapper->hHrtfCrend->gain_lfe : GAIN_LFE;
-#endif
-#else
- gain = st_ivas->hHrtf != NULL ? st_ivas->hHrtf->gain_lfe : GAIN_LFE;
-#endif
for ( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ )
{
v_multc( output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain, output_f[st_ivas->hIntSetup.index_lfe[idx_lfe]], output_frame );
@@ -1012,7 +1004,6 @@ void ivas_binRenderer(
if ( hHeadTrackData->shd_rot_max_order == -1 )
{
QuatToRotMat( hHeadTrackData->Quaternions[hHeadTrackData->num_quaternions++], hHeadTrackData->Rmat );
-
rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hHeadTrackData->Rmat, hBinRenderer->hInputSetup->nchan_out_woLFE, 3 );
}
else if ( hHeadTrackData->shd_rot_max_order > 0 )
diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec.c
index 171ecbfafea669da8c58c762b0ab9a20a287d66d..613941e5260e3bb8d8ef7a354aa98a3e814a82c0 100644
--- a/lib_dec/ivas_core_dec.c
+++ b/lib_dec/ivas_core_dec.c
@@ -240,11 +240,7 @@ ivas_error ivas_core_dec(
hCPE->hStereoCng->flag_cna_fade = 0;
}
-#ifdef FIX_347_DTX_CRASH
if ( sba_dirac_stereo_flag && hSCE && sts[0]->total_brate <= SID_2k40 && sts[0]->cng_type == FD_CNG )
-#else
- if ( sba_dirac_stereo_flag && sts[0]->total_brate <= SID_2k40 && sts[0]->cng_type == FD_CNG )
-#endif
{
save_hb_synth = hSCE->save_hb_synth;
}
@@ -356,11 +352,12 @@ ivas_error ivas_core_dec(
if ( ( st->core == TCX_20_CORE || st->core == TCX_10_CORE ) && st->element_mode != IVAS_CPE_MDCT )
{
/* TCX decoder */
-#ifdef PARAM_ISM_DTX_CNG
- stereo_tcx_core_dec( st, frameMode[n], output[n], synth[n], pitch_buf[n], sba_dirac_stereo_flag, hStereoTD, last_element_mode, flag_sec_CNA, hCPE == NULL ? NULL : hCPE->hStereoCng, nchan_out, st_ivas == NULL ? 0 : st_ivas->ivas_format, st_ivas == NULL ? 0 : st_ivas->ism_mode );
-#else
- stereo_tcx_core_dec( st, frameMode[n], output[n], synth[n], pitch_buf[n], sba_dirac_stereo_flag, hStereoTD, last_element_mode, flag_sec_CNA, hCPE == NULL ? NULL : hCPE->hStereoCng, nchan_out );
+ stereo_tcx_core_dec( st, frameMode[n], output[n], synth[n], pitch_buf[n], sba_dirac_stereo_flag, hStereoTD, last_element_mode, flag_sec_CNA, hCPE == NULL ? NULL : hCPE->hStereoCng, nchan_out, st_ivas == NULL ? 0 : st_ivas->ivas_format
+#ifndef DISCRETE_ISM_DTX_CNG
+ ,
+ st_ivas == NULL ? 0 : st_ivas->ism_mode
#endif
+ );
}
if ( st->core == HQ_CORE )
@@ -465,18 +462,18 @@ ivas_error ivas_core_dec(
mvr2r( synth[n], hSCE->save_synth, output_frame );
}
+#ifdef FIX_ISM_DTX_CLICKS
+ if ( ( error = core_switching_post_dec( st, synth[n], output[n], p_output_mem, ( st_ivas != NULL ) ? st_ivas->ivas_format : UNDEFINED_FORMAT, use_cldfb_for_dft, output_frame, 0 /*core_switching_flag*/, sba_dirac_stereo_flag, nchan_out, ( hCPE != NULL ) ? hCPE->last_element_mode : IVAS_SCE ) ) != IVAS_ERR_OK )
+#else
if ( ( error = core_switching_post_dec( st, synth[n], output[n], p_output_mem, use_cldfb_for_dft, output_frame, 0 /*core_switching_flag*/, sba_dirac_stereo_flag, nchan_out, ( hCPE != NULL ) ? hCPE->last_element_mode : IVAS_SCE ) ) != IVAS_ERR_OK )
+#endif
{
return error;
}
/* for FD-CNG we need the delay compensation in the synth, so do this afterwards */
-#ifdef FIX_347_DTX_CRASH
if ( sba_dirac_stereo_flag && hSCE && st->core_brate == SID_2k40 && st->cng_type == FD_CNG )
-#else
- if ( sba_dirac_stereo_flag && st->core_brate == SID_2k40 && st->cng_type == FD_CNG )
-#endif
{
mvr2r( synth[n], hSCE->save_synth, output_frame );
}
diff --git a/lib_dec/ivas_corecoder_dec_reconfig.c b/lib_dec/ivas_corecoder_dec_reconfig.c
index bb2b75318116177bc34c6ed300d93135de535430..d2cf408dce3bafcd1208a8aaa89c1e0692e1e2fb 100644
--- a/lib_dec/ivas_corecoder_dec_reconfig.c
+++ b/lib_dec/ivas_corecoder_dec_reconfig.c
@@ -33,11 +33,7 @@
#include "options.h"
#include "ivas_cnst.h"
#include "ivas_prot.h"
-#include "ivas_rom_com.h"
-#include "ivas_stat_enc.h"
#include "prot.h"
-#include
-#include
#include
#ifdef DEBUGGING
#include "debug.h"
@@ -74,9 +70,9 @@ ivas_error ivas_corecoder_dec_reconfig(
hDecoderConfig = st_ivas->hDecoderConfig;
ivas_total_brate = hDecoderConfig->ivas_total_brate;
+ output_frame = (int16_t) ( hDecoderConfig->output_Fs / FRAMES_PER_SEC );
error = IVAS_ERR_OK;
- output_frame = (int16_t) ( hDecoderConfig->output_Fs / FRAMES_PER_SEC );
if ( st_ivas->ivas_format == MC_FORMAT )
{
last_mc_mode = ivas_mc_mode_select( ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config ), st_ivas->hDecoderConfig->last_ivas_total_brate ); /* NB: this assumes that LS config remains the same between frames */
@@ -85,13 +81,19 @@ ivas_error ivas_corecoder_dec_reconfig(
{
last_mc_mode = MC_MODE_NONE;
}
+
/*-----------------------------------------------------------------*
- * Allocate, initalize, and configure SCE/CPE/MCT handles
+ * Allocate, initialize, and configure SCE/CPE/MCT handles
*-----------------------------------------------------------------*/
/* remove dummy CPE element for DFT stereo-like upmix */
+#ifdef SBA2MONO
+ if ( ( st_ivas->ivas_format == SBA_FORMAT && sba_dirac_stereo_flag_old && nchan_transport_old == 1 && ( !st_ivas->sba_dirac_stereo_flag || st_ivas->nchan_transport > 1 ) ) ||
+ ( st_ivas->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA && sba_dirac_stereo_flag_old && nchan_transport_old == 1 && ( !st_ivas->sba_dirac_stereo_flag || st_ivas->nchan_transport > 1 ) ) )
+#else
if ( ( st_ivas->ivas_format == SBA_FORMAT && sba_dirac_stereo_flag_old && !st_ivas->sba_dirac_stereo_flag ) ||
( st_ivas->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA && sba_dirac_stereo_flag_old && !st_ivas->sba_dirac_stereo_flag ) )
+#endif
{
st_ivas->hCPE[0]->hCoreCoder[0] = NULL;
st_ivas->hCPE[0]->hCoreCoder[1] = NULL;
@@ -119,6 +121,7 @@ ivas_error ivas_corecoder_dec_reconfig(
for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )
{
st_ivas->hCPE[cpe_id]->element_brate = brate_CPE;
+
/* prepare bitstream buffers */
for ( n = 0; n < CPE_CHANNELS; n++ )
{
@@ -139,7 +142,6 @@ ivas_error ivas_corecoder_dec_reconfig(
nSCE_existing = min( nSCE_old, st_ivas->nSCE );
nCPE_existing = min( nCPE_old, st_ivas->nCPE );
- // VE: TBV - try to reuse the CoreCoder
/* destroy superfluous core coder elements */
for ( sce_id = st_ivas->nSCE; sce_id < nSCE_old; sce_id++ )
{
@@ -149,6 +151,23 @@ ivas_error ivas_corecoder_dec_reconfig(
for ( cpe_id = st_ivas->nCPE; cpe_id < nCPE_old; cpe_id++ )
{
+#ifdef SBA2MONO
+ /* don't deallocate first CPE in case of mono/stereo output of 1 TC SBA, only deallocate core coder */
+ if ( cpe_id == 0 && st_ivas->sba_dirac_stereo_flag && sba_dirac_stereo_flag_old )
+ {
+ for ( n = 0; n < CPE_CHANNELS; n++ )
+ {
+ if ( st_ivas->hCPE[cpe_id]->hCoreCoder[n] != NULL )
+ {
+ destroy_core_dec( st_ivas->hCPE[cpe_id]->hCoreCoder[n] );
+
+ free( st_ivas->hCPE[cpe_id]->hCoreCoder[n] );
+ st_ivas->hCPE[cpe_id]->hCoreCoder[n] = NULL;
+ }
+ }
+ continue;
+ }
+#endif
destroy_cpe_dec( st_ivas->hCPE[cpe_id] );
st_ivas->hCPE[cpe_id] = NULL;
}
@@ -188,10 +207,18 @@ ivas_error ivas_corecoder_dec_reconfig(
return error;
}
}
+#ifdef SBA2MONO
+ if ( st_ivas->sba_dirac_stereo_flag && sba_dirac_stereo_flag_old && st_ivas->nchan_transport == 1 && nSCE_old == 0 )
+ {
+ st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */
+ st_ivas->hCPE[0]->hCoreCoder[1] = NULL;
+ }
+#endif
for ( cpe_id = 0; cpe_id < nCPE_existing; cpe_id++ )
{
st_ivas->hCPE[cpe_id]->element_brate = brate_CPE;
+
/* prepare bitstream buffers */
for ( n = 0; n < CPE_CHANNELS; n++ )
{
@@ -266,12 +293,30 @@ ivas_error ivas_corecoder_dec_reconfig(
if ( ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_dirac_stereo_flag && !sba_dirac_stereo_flag_old ) ||
( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA && st_ivas->sba_dirac_stereo_flag && !sba_dirac_stereo_flag_old ) )
{
+#ifdef SBA2MONO
+ /* if at least one CPE is already available, only allocate DFT Stereo struct */
+ if ( st_ivas->nCPE > 0 )
+ {
+ if ( ( error = stereo_dft_dec_create( &( st_ivas->hCPE[0]->hStereoDft ), st_ivas->hCPE[0]->element_brate, st_ivas->hDecoderConfig->output_Fs, st_ivas->sba_dirac_stereo_flag, st_ivas->nchan_transport ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ /* otherwise create extra dummy CPE */
+ else
+ {
+ if ( ( error = create_cpe_dec( st_ivas, 0, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+#else
if ( ( error = create_cpe_dec( st_ivas, 0, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK )
{
return error;
}
+#endif
- // VE: TBV - just reset for now
set_f( st_ivas->hCPE[0]->hStereoDft->buff_LBTCX_mem, 0, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ) );
st_ivas->hCPE[0]->hCoreCoder[0] = st_ivas->hSCE[0]->hCoreCoder[0]; /* don't allocate unnecessary core coder, simply point to core coder of SCE element */
@@ -300,6 +345,12 @@ ivas_error ivas_corecoder_dec_reconfig(
* Set CNA/CNG flags
*-----------------------------------------------------------------*/
+#ifdef FIX_386_CORECODER_RECONFIG
+ if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT )
+ {
+ ivas_sba_set_cna_cng_flag( st_ivas );
+ }
+#else
/// VE: this could be merged with part of ivas_init_decoder()
if ( st_ivas->ivas_format == SBA_FORMAT )
{
@@ -332,6 +383,7 @@ ivas_error ivas_corecoder_dec_reconfig(
}
}
}
+#endif
/* special case, if the decoder goes from 1TC DTX to 2TC active frame (in case the bitstream started with an SBA SID frame), allocate DTX memories */
if ( hDecoderConfig->last_ivas_total_brate <= IVAS_SID_5k2 && st_ivas->nCPE >= 1 )
@@ -456,7 +508,6 @@ ivas_error ivas_cldfb_dec_reconfig(
if ( st_ivas->ivas_format == SBA_FORMAT && nchan_transport_old == 1 && numCldfbAnalyses_old == 2 && st_ivas->nchan_transport > 1 )
{
deleteCldfb( &( st_ivas->cldfbAnaDec[1] ) );
- st_ivas->cldfbAnaDec[1] = NULL;
numCldfbAnalyses_old--;
}
@@ -476,7 +527,6 @@ ivas_error ivas_cldfb_dec_reconfig(
for ( i = numCldfbAnalyses; i < numCldfbAnalyses_old; i++ )
{
deleteCldfb( &( st_ivas->cldfbAnaDec[i] ) );
- st_ivas->cldfbAnaDec[i] = NULL;
}
}
else if ( numCldfbAnalyses_old < numCldfbAnalyses )
@@ -498,7 +548,6 @@ ivas_error ivas_cldfb_dec_reconfig(
for ( i = numCldfbSyntheses; i < numCldfbSyntheses_old; i++ )
{
deleteCldfb( &( st_ivas->cldfbSynDec[i] ) );
- st_ivas->cldfbSynDec[i] = NULL;
}
}
else if ( numCldfbSyntheses_old < numCldfbSyntheses )
@@ -512,10 +561,16 @@ ivas_error ivas_cldfb_dec_reconfig(
}
}
}
+
/* CLDFB Interpolation weights */
+#ifdef SBA2MONO
+ if ( st_ivas->sba_mode == SBA_MODE_SPAR && ( numCldfbAnalyses_old != numCldfbAnalyses || numCldfbSyntheses_old != numCldfbSyntheses || nchan_transport_old != st_ivas->nchan_transport ) && numCldfbAnalyses != 0 && numCldfbSyntheses != 0 )
+#else
if ( st_ivas->sba_mode == SBA_MODE_SPAR && ( numCldfbAnalyses_old != numCldfbAnalyses || numCldfbSyntheses_old != numCldfbSyntheses || nchan_transport_old != st_ivas->nchan_transport ) )
+#endif
{
ivas_spar_get_cldfb_gains( st_ivas->hSpar, st_ivas->cldfbAnaDec[0], st_ivas->cldfbSynDec[0], hDecoderConfig );
}
+
return IVAS_ERR_OK;
}
diff --git a/lib_dec/ivas_cpe_dec.c b/lib_dec/ivas_cpe_dec.c
old mode 100644
new mode 100755
index 1ba5c68f5aa8e481c2a350e5059b2d178c21643b..f78f5f08c86e8f660b8cb964084f169249d2e26b
--- a/lib_dec/ivas_cpe_dec.c
+++ b/lib_dec/ivas_cpe_dec.c
@@ -249,11 +249,9 @@ ivas_error ivas_cpe_dec(
nb_bits -= SID_FORMAT_NBITS;
sts[1]->bit_stream -= SID_FORMAT_NBITS;
}
-#ifdef MASA_AND_OBJECTS
- if ( ( ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE ) ||
- ( st_ivas->ivas_format == MASA_ISM_FORMAT && ( cpe_brate < MASA_STEREO_MIN_BITRATE ) ) ) &&
- ivas_total_brate > IVAS_SID_5k2 )
+#ifdef MASA_AND_OBJECTS
+ if ( ( ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE ) || ( st_ivas->ivas_format == MASA_ISM_FORMAT && cpe_brate < MASA_STEREO_MIN_BITRATE ) ) && ivas_total_brate > IVAS_SID_5k2 )
#else
if ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE && ivas_total_brate > IVAS_SID_5k2 )
#endif
@@ -373,6 +371,7 @@ ivas_error ivas_cpe_dec(
/*----------------------------------------------------------------*
* Core codec configuration
*----------------------------------------------------------------*/
+
for ( n = 0; n < n_channels; n++ )
{
/* set ACELP12k8 / ACELP16k flag for flexible ACELP core */
@@ -414,7 +413,12 @@ ivas_error ivas_cpe_dec(
{
if ( !st_ivas->bfi )
{
- tdm_configure_dec( hCPE, &tdm_ratio_idx, nb_bits_metadata );
+ tdm_configure_dec( hCPE, &tdm_ratio_idx, nb_bits_metadata
+#ifdef OMASA_TUNING_TD_STEREO
+ ,
+ ( st_ivas->ivas_format == MASA_ISM_FORMAT || ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hDecoderConfig->ivas_total_brate == IVAS_24k4 ) )
+#endif
+ );
sts[1]->bit_stream = sts[0]->bit_stream + ( sts[0]->total_brate / FRAMES_PER_SEC );
}
@@ -476,7 +480,11 @@ ivas_error ivas_cpe_dec(
}
else
{
+#ifdef SBA2MONO
+ stereo_dft_dec( hCPE->hStereoDft, sts[0], DFT, hCPE->input_mem[1], hCPE->hStereoCng, 0, 0, 0, 0, 0, 0 );
+#else
stereo_dft_dec( hCPE->hStereoDft, sts[0], DFT, hCPE->input_mem[1], hCPE->hStereoCng, 0, 0, 0, 0, 0 );
+#endif
}
/* synthesis iFFT */
@@ -717,10 +725,11 @@ ivas_error create_cpe_dec(
{
#ifdef MASA_AND_OBJECTS
if ( st_ivas->ivas_format == STEREO_FORMAT || st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ||
+ ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) || st_ivas->sba_dirac_stereo_flag )
#else
if ( st_ivas->ivas_format == STEREO_FORMAT || st_ivas->ivas_format == MASA_FORMAT ||
-#endif
( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) || st_ivas->sba_dirac_stereo_flag )
+#endif
{
if ( ( hCPE->input_mem[i] = (float *) malloc( sizeof( float ) * NS2SA( output_Fs, STEREO_DFT32MS_OVL_NS ) ) ) == NULL )
{
@@ -796,10 +805,12 @@ ivas_error create_cpe_dec(
st->total_brate = hCPE->element_brate / ( CPE_CHANNELS ); /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */
st->mct_chan_mode = MCT_CHAN_MODE_REGULAR;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT && ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL )
{
st->mct_chan_mode = MCT_CHAN_MODE_LFE;
}
+#endif
if ( ( error = init_decoder( st, n, st_ivas->mc_mode ) ) != IVAS_ERR_OK )
{
@@ -940,8 +951,12 @@ void destroy_cpe_dec(
int16_t n;
Decoder_State *st;
- /* make sure we deallocate a potential distinct hTcxCfg for a MCT LFE channel (can only happen in rs) */
- if ( hCPE->hCoreCoder[1] != NULL && hCPE->hCoreCoder[1]->mct_chan_mode == MCT_CHAN_MODE_LFE && hCPE->hCoreCoder[1]->hTcxCfg != hCPE->hCoreCoder[0]->hTcxCfg )
+ /* make sure we deallocate a potential distinct hTcxCfg for a MCT LFE channel (can only happen in rs) */ /*TODO Check this again with LFE clean up!*/
+ if ( hCPE->hCoreCoder[1] != NULL
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && hCPE->hCoreCoder[1]->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ && hCPE->hCoreCoder[1]->hTcxCfg != hCPE->hCoreCoder[0]->hTcxCfg )
{
hCPE->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE;
}
diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c
index 8c5a9b47167c75e92fe66c0588750c7c4eec18b8..4b885ea217f83d97b6e62eeaf1968ace2a3cc782 100644
--- a/lib_dec/ivas_dec.c
+++ b/lib_dec/ivas_dec.c
@@ -146,7 +146,6 @@ ivas_error ivas_dec(
else if ( st_ivas->ivas_format == ISM_FORMAT )
{
/* Metadata decoding and configuration */
-#ifdef PARAM_ISM_DTX_CNG
if ( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA )
{
if ( ( error = ivas_ism_dtx_dec( st_ivas, nb_bits_metadata ) ) != IVAS_ERR_OK )
@@ -154,15 +153,76 @@ ivas_error ivas_dec(
return error;
}
}
- else
-#endif
- if ( st_ivas->ism_mode == ISM_MODE_PARAM )
+ else if ( st_ivas->ism_mode == ISM_MODE_PARAM )
{
+ // VE: call ivas_ism_metadata_dec() with 'st_ivas' - TBD
+#ifdef DISCRETE_ISM_DTX_CNG
+#ifdef NCHAN_ISM_PARAMETER
+#ifdef FIX_379_EXT_METADATA
+ if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )
+#else
+ if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm ) ) != IVAS_ERR_OK )
+#endif
+#else
+#ifdef FIX_379_EXT_METADATA
+ if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )
+#else
+ if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm ) ) != IVAS_ERR_OK )
+#endif
+#endif
+ {
+ return error;
+ }
+#else
+#ifdef NCHAN_ISM_PARAMETER
+#ifdef FIX_379_EXT_METADATA
+ ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt );
+#else
+ ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm );
+#endif
+#else
+#ifdef FIX_379_EXT_METADATA
+ ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt );
+#else
ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm );
+#endif
+#endif
+#endif
}
else /* ISM_MODE_DISC */
{
+#ifdef DISCRETE_ISM_DTX_CNG
+#ifdef NCHAN_ISM_PARAMETER
+#ifdef FIX_379_EXT_METADATA
+ if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )
+#else
+ if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL ) ) != IVAS_ERR_OK )
+#endif
+#else
+#ifdef FIX_379_EXT_METADATA
+ if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )
+#else
+ if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL ) ) != IVAS_ERR_OK )
+#endif
+#endif
+ {
+ return error;
+ }
+#else
+#ifdef NCHAN_ISM_PARAMETER
+#ifdef FIX_379_EXT_METADATA
+ ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt );
+#else
+ ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, NULL );
+#endif
+#else
+#ifdef FIX_379_EXT_METADATA
+ ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt );
+#else
ivas_ism_metadata_dec( ivas_total_brate, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, NULL );
+#endif
+#endif
+#endif
}
for ( n = 0; n < st_ivas->nchan_transport; n++ )
@@ -215,24 +275,27 @@ ivas_error ivas_dec(
else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )
{
/* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */
+#ifdef NCHAN_ISM_PARAMETER
+ ivas_ism2sba( output, st_ivas->hIsmRendererData, st_ivas->hIsmMetaData, st_ivas->nchan_ism, output_frame, st_ivas->hIntSetup.ambisonics_order );
+#else
ivas_ism2sba( output, st_ivas->hIsmRendererData, st_ivas->hIsmMetaData, st_ivas->nchan_transport, output_frame, st_ivas->hIntSetup.ambisonics_order );
+#endif
}
/* Binaural rendering */
if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )
{
- ivas_td_binaural_renderer( st_ivas, output, output_frame );
+ if ( ( ivas_td_binaural_renderer( st_ivas, output, output_frame ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
{
-#ifdef FIX_197_CREND_INTERFACE
if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM, NULL, NULL, NULL, NULL, output, output_Fs ) ) != IVAS_ERR_OK )
{
return error;
}
-#else
- ivas_crend_process( st_ivas, output );
-#endif
ivas_binaural_add_LFE( st_ivas, output_frame, output );
}
#ifdef DEBUGGING
@@ -314,10 +377,23 @@ ivas_error ivas_dec(
nchan_remapped = st_ivas->nchan_transport;
if ( st_ivas->sba_dirac_stereo_flag )
{
+#ifdef SBA2MONO
+ nchan_remapped = nchan_out;
+#else
nchan_remapped = CPE_CHANNELS;
+#endif
if ( st_ivas->sba_mode == SBA_MODE_SPAR )
{
+#ifdef SBA2MONO
+ ivas_agc_dec_process( st_ivas->hSpar->hAgcDec, output, output, st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, output_frame );
+
+ if ( st_ivas->hSpar->hPCA != NULL )
+ {
+ ivas_pca_dec( st_ivas->hSpar->hPCA, output_frame, st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->hDecoderConfig->last_ivas_total_brate, st_ivas->bfi, output );
+ }
+
+#endif
ivas_spar_dec_gen_umx_mat( st_ivas->hSpar->hMdDec, st_ivas->nchan_transport, IVAS_MAX_NUM_BANDS, st_ivas->bfi );
}
@@ -391,7 +467,11 @@ ivas_error ivas_dec(
ivas_dirac_dec( st_ivas, output, nchan_remapped, NULL, NULL, -1 );
}
}
+#ifdef SBA2MONO
+ else if ( !st_ivas->sba_dirac_stereo_flag && nchan_out != 1 )
+#else
else if ( !st_ivas->sba_dirac_stereo_flag )
+#endif
{
ivas_sba_upmixer_renderer( st_ivas, output, output_frame ); /* Note: ivas_sba_linear_renderer() or ivas_dirac_dec() are called internally */
}
@@ -420,7 +500,7 @@ ivas_error ivas_dec(
}
}
- /* MASA decoding */
+ /* MASA metadata decoding */
if ( ( error = ivas_masa_decode( st_ivas, st, &nb_bits_metadata[0] ) ) != IVAS_ERR_OK )
{
return error;
@@ -431,12 +511,26 @@ ivas_error ivas_dec(
st->bit_stream = &( st_ivas->bit_stream[( ism_total_brate / FRAMES_PER_SEC )] );
- /* Audio signal decoding */
#ifdef OMASA_UPDATES
- if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ )
-#else
- if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC )
+ /* set ISM parameters */
+ int16_t nchan_ism, nchan_transport_ism;
+ nchan_ism = st_ivas->nchan_ism;
+ nchan_transport_ism = st_ivas->nchan_ism;
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
+ {
+ nchan_ism = 1;
+ nchan_transport_ism = 1;
+ }
+ else if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
+ {
+ nchan_ism = 0;
+ nchan_transport_ism = 1;
+ }
#endif
+
+ /* decode ISM metadata */
+#ifndef OMASA_UPDATES
+ if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC )
{
if ( st_ivas->nSCE == 1 )
{
@@ -450,22 +544,27 @@ ivas_error ivas_dec(
}
}
else
+#else
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
+#endif
{
- /* decode ISM format */
- ivas_ism_metadata_dec( ism_total_brate, &( st_ivas->nSCE ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, &nb_bits_metadata[1], st_ivas->ism_mode, NULL );
-
- for ( n = 0; n < st_ivas->nSCE - 1; n++ )
- {
- if ( ( error = ivas_sce_dec( st_ivas, n, &output[2 * st_ivas->nCPE + n], output_frame, 0 ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
- if ( ( error = ivas_sce_dec( st_ivas, n, &output[2 * st_ivas->nCPE + n], output_frame, sum_s( &nb_bits_metadata[1], st_ivas->nSCE ) ) ) != IVAS_ERR_OK )
+ /* decode ISM metadata */
+#ifdef NCHAN_ISM_PARAMETER
+ if ( ( error = ivas_ism_metadata_dec( ism_total_brate,
+#ifdef OMASA_UPDATES
+ nchan_ism, &nchan_transport_ism,
+#else
+ st_ivas->nchan_ism, &( st_ivas->nSCE ),
+#endif
+ st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, &nb_bits_metadata[1], st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )
+#else
+ if ( ( error = ivas_ism_metadata_dec( ism_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, &nb_bits_metadata[1], st_ivas->ism_mode, NULL, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )
+#endif
{
return error;
}
+ // VE: move the following updates into ivas_ism_metadata_dec()
#ifdef OMASA_UPDATES
if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
{
@@ -475,7 +574,7 @@ ivas_error ivas_dec(
st_ivas->hMasaIsmData->elevation_ism[n] = (int16_t) ( st_ivas->hIsmMetaData[n]->elevation + 0.5f );
}
}
- else
+ else /* ISM_MASA_MODE_MASA_ONE_OBJ */
{
st_ivas->hMasaIsmData->azimuth_separated_ism = (int16_t) ( st_ivas->hIsmMetaData[0]->azimuth + 0.5f );
st_ivas->hMasaIsmData->elevation_separated_ism = (int16_t) ( st_ivas->hIsmMetaData[0]->elevation + 0.5f );
@@ -487,8 +586,35 @@ ivas_error ivas_dec(
st_ivas->hMasaIsmData->elevation_ism[n] = (int16_t) ( st_ivas->hIsmMetaData[n]->elevation + 0.5f );
}
#endif
+
+#ifndef OMASA_UPDATES
+ for ( n = 0; n < st_ivas->nSCE - 1; n++ )
+ {
+ if ( ( error = ivas_sce_dec( st_ivas, n, &output[2 * st_ivas->nCPE + n], output_frame, 0 ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+
+ if ( ( error = ivas_sce_dec( st_ivas, n, &output[2 * st_ivas->nCPE + n], output_frame, sum_s( &nb_bits_metadata[1], st_ivas->nSCE ) ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+#endif
}
+#ifdef OMASA_UPDATES
+ /* decode ISM channels */
+ for ( n = 0; n < nchan_transport_ism; n++ )
+ {
+ if ( ( error = ivas_sce_dec( st_ivas, n, &output[st_ivas->nchan_transport + n], output_frame, nb_bits_metadata[1] ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+#endif
+
+ /* decode MASA channels */
if ( ( error = ivas_cpe_dec( st_ivas, 0, output, output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK )
{
return error;
@@ -519,7 +645,7 @@ ivas_error ivas_dec(
for ( n = 0; n < st_ivas->nchan_ism; n++ )
{
- mvr2r( output[n + 2], data_separated_objects[n], output_frame );
+ mvr2r( output[2 + n], data_separated_objects[n], output_frame );
v_multc( data_separated_objects[n], gain, data_separated_objects[n], output_frame );
}
@@ -529,11 +655,11 @@ ivas_error ivas_dec(
}
ivas_dirac_dec_binaural( st_ivas, output, st_ivas->nchan_transport );
- ivas_td_binaural_renderer_unwrap( st_ivas->hRenderConfig, st_ivas->ini_frame, st_ivas->hCrendWrapper,
- st_ivas->transport_config, st_ivas->hDecoderConfig->output_Fs, st_ivas->hBinRendererTd,
- st_ivas->nchan_ism, LFE_CHANNEL, st_ivas->ivas_format,
- st_ivas->hIsmMetaData, st_ivas->hDecoderConfig->Opt_Headrotation,
- ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Quaternions : NULL, data_separated_objects, output_frame );
+
+ if ( ( error = ivas_td_binaural_renderer( st_ivas, data_separated_objects, output_frame ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
for ( n = 0; n < BINAURAL_CHANNELS; n++ )
{
@@ -595,10 +721,12 @@ ivas_error ivas_dec(
/* LFE channel decoder */
if ( st_ivas->mc_mode == MC_MODE_MCT )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg == NULL )
{
st_ivas->hCPE[1]->hCoreCoder[1]->hTcxCfg = st_ivas->hCPE[1]->hCoreCoder[0]->hTcxCfg;
}
+#endif
ivas_lfe_dec( st_ivas->hLFE, st, output_frame, st_ivas->bfi, output_lfe_ch );
}
@@ -628,14 +756,10 @@ ivas_error ivas_dec(
/* Rendering */
if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
{
-#ifdef FIX_197_CREND_INTERFACE
if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hHeadTrackData, &st_ivas->hIntSetup, st_ivas->hEFAPdata, output, output_Fs ) ) != IVAS_ERR_OK )
{
return error;
}
-#else
- ivas_crend_process( st_ivas, output );
-#endif
ivas_binaural_add_LFE( st_ivas, output_frame, output );
}
@@ -649,7 +773,10 @@ ivas_error ivas_dec(
}
else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )
{
- ivas_td_binaural_renderer( st_ivas, output, output_frame );
+ if ( ( ivas_td_binaural_renderer( st_ivas, output, output_frame ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
ivas_binaural_add_LFE( st_ivas, output_frame, output );
}
@@ -824,6 +951,10 @@ ivas_error ivas_dec(
st_ivas->ini_active_frame++;
}
+#ifdef OMASA_BRATE_SW
+ st_ivas->last_ivas_format = st_ivas->ivas_format;
+#endif
+
#ifdef DEBUG_MODE_INFO
dbgwrite( &st_ivas->bfi, sizeof( int16_t ), 1, output_frame, "res/bfi" );
dbgwrite( &st_ivas->BER_detect, sizeof( int16_t ), 1, output_frame, "res/BER_detect" );
diff --git a/lib_dec/ivas_decision_matrix_dec.c b/lib_dec/ivas_decision_matrix_dec.c
index 2a99953d23d441566b52f8058d4aaf3194202dce..e5be65ae24dc7204e3eb20cf21e643f4f150f566 100644
--- a/lib_dec/ivas_decision_matrix_dec.c
+++ b/lib_dec/ivas_decision_matrix_dec.c
@@ -134,7 +134,7 @@ void ivas_decision_matrix_dec(
}
else if ( st->element_mode == IVAS_SCE && st->low_rate_mode )
{
- /* ISm Low-rate mode -> always WB, ACELP core, IC coder_type */
+ /* ISM Low-rate mode -> always WB, ACELP core, IC coder_type */
st->core = ACELP_CORE;
}
else if ( st->element_mode == IVAS_CPE_MDCT )
@@ -167,7 +167,7 @@ void ivas_decision_matrix_dec(
{
if ( st->element_mode == IVAS_SCE && st->low_rate_mode )
{
- /* ISm Low-rate mode */
+ /* ISM Low-rate mode */
st->bwidth = WB;
st->coder_type = INACTIVE;
*sharpFlag = 0;
diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c
index b3c097c3a4cfa0a5575b4099f5f60c605fd17fa5..e471738ca39813a80a1075181c86ca614ec4fd7e 100644
--- a/lib_dec/ivas_dirac_dec.c
+++ b/lib_dec/ivas_dirac_dec.c
@@ -51,7 +51,7 @@
* Local function prototypes
*-----------------------------------------------------------------------*/
-static void ivas_dirac_alloc_mem( DIRAC_DEC_HANDLE hDirAC, const RENDERER_TYPE renderer_type, DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem );
+static ivas_error ivas_dirac_alloc_mem( DIRAC_DEC_HANDLE hDirAC, const RENDERER_TYPE renderer_type, DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem );
static void ivas_dirac_free_mem( DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem );
@@ -305,7 +305,10 @@ ivas_error ivas_dirac_dec_config(
if ( flag_config == DIRAC_OPEN )
{
hDirAC->num_freq_bands = (int16_t) ( output_Fs * INV_CLDFB_BANDWIDTH + 0.5f );
- hDirAC->frequency_axis = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+ if ( ( hDirAC->frequency_axis = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_f( hDirAC->frequency_axis, 0.0f, hDirAC->num_freq_bands );
ivas_dirac_dec_get_frequency_axis( hDirAC->frequency_axis, output_Fs, hDirAC->num_freq_bands );
@@ -315,7 +318,10 @@ ivas_error ivas_dirac_dec_config(
{
if ( ( flag_config == DIRAC_RECONFIGURE && hDirAC->masa_stereo_type_detect == NULL ) || flag_config == DIRAC_OPEN )
{
- hDirAC->masa_stereo_type_detect = (MASA_STEREO_TYPE_DETECT *) malloc( sizeof( MASA_STEREO_TYPE_DETECT ) );
+ if ( ( hDirAC->masa_stereo_type_detect = (MASA_STEREO_TYPE_DETECT *) malloc( sizeof( MASA_STEREO_TYPE_DETECT ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
}
ivas_masa_init_stereotype_detection( hDirAC->masa_stereo_type_detect );
}
@@ -387,22 +393,34 @@ ivas_error ivas_dirac_dec_config(
if ( flag_config == DIRAC_OPEN )
{
num_outputs_dir_old = hDirAC->num_outputs_dir;
- hDirAC->proto_index_dir = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_dir );
+ if ( ( hDirAC->proto_index_dir = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_dir ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
num_outputs_diff_old = hDirAC->num_outputs_diff;
- hDirAC->proto_index_diff = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_diff );
+ if ( ( hDirAC->proto_index_diff = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_diff ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
}
if ( hDirAC->num_outputs_dir != num_outputs_dir_old && flag_config == DIRAC_RECONFIGURE )
{
free( hDirAC->proto_index_dir );
- hDirAC->proto_index_dir = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_dir );
+ if ( ( hDirAC->proto_index_dir = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_dir ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
}
set_s( hDirAC->proto_index_dir, 0, hDirAC->num_outputs_dir );
if ( hDirAC->num_outputs_diff != num_outputs_diff_old && flag_config == DIRAC_RECONFIGURE )
{
free( hDirAC->proto_index_diff );
- hDirAC->proto_index_diff = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_diff );
+ if ( ( hDirAC->proto_index_diff = (int16_t *) malloc( sizeof( int16_t ) * hDirAC->num_outputs_diff ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
}
set_s( hDirAC->proto_index_diff, 0, hDirAC->num_outputs_diff );
@@ -522,14 +540,20 @@ ivas_error ivas_dirac_dec_config(
/* direct/diffuse responses */
if ( flag_config == DIRAC_OPEN )
{
- hDirAC->diffuse_response_function = (float *) malloc( sizeof( float ) * hDirAC->num_outputs_dir );
+ if ( ( hDirAC->diffuse_response_function = (float *) malloc( sizeof( float ) * hDirAC->num_outputs_dir ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
}
/* reallocate static memory */
else if ( flag_config == DIRAC_RECONFIGURE && hDirAC->num_outputs_dir != num_outputs_dir_old )
{
free( hDirAC->diffuse_response_function );
hDirAC->diffuse_response_function = NULL;
- hDirAC->diffuse_response_function = (float *) malloc( sizeof( float ) * hDirAC->num_outputs_dir );
+ if ( ( hDirAC->diffuse_response_function = (float *) malloc( sizeof( float ) * hDirAC->num_outputs_dir ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
}
if ( ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_LS ) || ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD ) || ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO ) )
@@ -547,13 +571,19 @@ ivas_error ivas_dirac_dec_config(
{
if ( flag_config == DIRAC_OPEN )
{
- hDirAC->hoa_encoder = (float *) malloc( nchan_out_woLFE * hDirAC->num_outputs_diff * sizeof( float ) );
+ if ( ( hDirAC->hoa_encoder = (float *) malloc( nchan_out_woLFE * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
}
else if ( flag_config == DIRAC_RECONFIGURE && hDirAC->hoa_encoder && ( hDirAC->num_outputs_diff != num_outputs_diff_old ) )
{
free( hDirAC->hoa_encoder );
hDirAC->hoa_encoder = NULL;
- hDirAC->hoa_encoder = (float *) malloc( nchan_out_woLFE * hDirAC->num_outputs_diff * sizeof( float ) );
+ if ( ( hDirAC->hoa_encoder = (float *) malloc( nchan_out_woLFE * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
}
set_f( hDirAC->hoa_encoder, 0.0f, nchan_out_woLFE * hDirAC->num_outputs_diff );
compute_hoa_encoder_mtx( ls_azimuth, ls_elevation, hDirAC->hoa_encoder, hDirAC->num_outputs_diff, hDirAC->hOutSetup.ambisonics_order );
@@ -575,7 +605,7 @@ ivas_error ivas_dirac_dec_config(
if ( hDirAC->panningConf == DIRAC_PANNING_VBAP )
{
- if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata )
+ if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata != NULL )
{
vbap_free_data( &( st_ivas->hVBAPdata ) );
}
@@ -593,13 +623,13 @@ ivas_error ivas_dirac_dec_config(
}
else if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO )
{
- if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata )
+ if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata != NULL )
{
vbap_free_data( &( st_ivas->hVBAPdata ) );
}
hDirAC->hoa_decoder = NULL;
}
- else if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata )
+ else if ( flag_config == DIRAC_RECONFIGURE && st_ivas->hVBAPdata != NULL )
{
vbap_free_data( &( st_ivas->hVBAPdata ) );
}
@@ -642,7 +672,7 @@ ivas_error ivas_dirac_dec_config(
if ( ( flag_config == DIRAC_OPEN && hDirAC->proto_signal_decorr_on ) || ( flag_config == DIRAC_RECONFIGURE && ( hDirAC->proto_signal_decorr_on && !proto_signal_decorr_on_old ) ) )
{
- ivas_dirac_dec_decorr_open( &( hDirAC->h_freq_domain_decorr_ap_params ),
+ if ( ( error = ivas_dirac_dec_decorr_open( &( hDirAC->h_freq_domain_decorr_ap_params ),
&( hDirAC->h_freq_domain_decorr_ap_state ),
hDirAC->num_freq_bands,
hDirAC->num_outputs_diff,
@@ -650,7 +680,10 @@ ivas_error ivas_dirac_dec_config(
hDirAC->synthesisConf,
hDirAC->frequency_axis,
nchan_transport > 2 ? 4 : nchan_transport,
- output_Fs );
+ output_Fs ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else if ( flag_config == DIRAC_RECONFIGURE && ( !hDirAC->proto_signal_decorr_on && proto_signal_decorr_on_old ) )
{
@@ -663,7 +696,7 @@ ivas_error ivas_dirac_dec_config(
/* close and reopen the decorrelator */
ivas_dirac_dec_decorr_close( &hDirAC->h_freq_domain_decorr_ap_params, &hDirAC->h_freq_domain_decorr_ap_state );
- ivas_dirac_dec_decorr_open( &( hDirAC->h_freq_domain_decorr_ap_params ),
+ if ( ( error = ivas_dirac_dec_decorr_open( &( hDirAC->h_freq_domain_decorr_ap_params ),
&( hDirAC->h_freq_domain_decorr_ap_state ),
hDirAC->num_freq_bands,
hDirAC->num_outputs_diff,
@@ -671,20 +704,30 @@ ivas_error ivas_dirac_dec_config(
hDirAC->synthesisConf,
hDirAC->frequency_axis,
nchan_transport > 2 ? 4 : nchan_transport,
- output_Fs );
+ output_Fs ) ) != IVAS_ERR_OK )
+ {
+ return error;
}
}
+ }
/* output synthesis */
if ( flag_config == DIRAC_OPEN )
{
- ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs );
+ if ( ( ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
hDirAC->h_output_synthesis_psd_params.use_onset_filters = hDirAC->proto_signal_decorr_on;
}
else if ( ( flag_config == DIRAC_RECONFIGURE ) && ( ( nchan_transport != nchan_transport_old ) || ( hDirAC->num_outputs_diff != num_outputs_diff_old ) ) )
{
ivas_dirac_dec_output_synthesis_close( hDirAC );
- ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs );
+
+ if ( ( ivas_dirac_dec_output_synthesis_open( hDirAC, st_ivas->renderer_type, nchan_transport, output_Fs ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
hDirAC->h_output_synthesis_psd_params.use_onset_filters = hDirAC->proto_signal_decorr_on;
}
@@ -709,15 +752,21 @@ ivas_error ivas_dirac_dec_config(
{
if ( flag_config == DIRAC_OPEN || ( flag_config == DIRAC_RECONFIGURE && hDirAC->proto_frame_f == NULL ) )
{
- hDirAC->proto_frame_f = (float *) malloc( sizeof( float ) * 2 * hDirAC->num_protos_diff * hDirAC->num_freq_bands );
+ if ( ( hDirAC->proto_frame_f = (float *) malloc( sizeof( float ) * 2 * hDirAC->num_protos_diff * hDirAC->num_freq_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
}
else if ( flag_config == DIRAC_RECONFIGURE && ( hDirAC->num_protos_diff != num_protos_diff_old ) )
{
proto_frame_f_old = hDirAC->proto_frame_f;
free( proto_frame_f_old );
- hDirAC->proto_frame_f = (float *) malloc( sizeof( float ) * 2 * hDirAC->num_protos_diff * hDirAC->num_freq_bands );
+ if ( ( hDirAC->proto_frame_f = (float *) malloc( sizeof( float ) * 2 * hDirAC->num_protos_diff * hDirAC->num_freq_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
}
}
+ }
if ( flag_config == DIRAC_OPEN )
@@ -732,13 +781,19 @@ ivas_error ivas_dirac_dec_config(
{
for ( j = 0; j < DIRAC_NO_COL_AVG_DIFF; j++ )
{
- hDirAC->buffer_intensity_real[i][j] = (float *) malloc( CLDFB_NO_CHANNELS_MAX * sizeof( float ) );
+ if ( ( hDirAC->buffer_intensity_real[i][j] = (float *) malloc( CLDFB_NO_CHANNELS_MAX * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_f( hDirAC->buffer_intensity_real[i][j], 0.0f, CLDFB_NO_CHANNELS_MAX );
}
}
if ( hDirAC->buffer_energy == NULL )
{
- hDirAC->buffer_energy = (float *) malloc( DIRAC_NO_COL_AVG_DIFF * CLDFB_NO_CHANNELS_MAX * sizeof( float ) );
+ if ( ( hDirAC->buffer_energy = (float *) malloc( DIRAC_NO_COL_AVG_DIFF * CLDFB_NO_CHANNELS_MAX * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
}
set_f( hDirAC->buffer_energy, 0.0f, DIRAC_NO_COL_AVG_DIFF * CLDFB_NO_CHANNELS_MAX );
}
@@ -770,7 +825,10 @@ ivas_error ivas_dirac_dec_config(
{
ivas_dirac_free_mem( &( hDirAC->stack_mem ) );
}
- ivas_dirac_alloc_mem( hDirAC, st_ivas->renderer_type, &( hDirAC->stack_mem ) );
+ if ( ( error = ivas_dirac_alloc_mem( hDirAC, st_ivas->renderer_type, &( hDirAC->stack_mem ) ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
mvs2s( DirAC_block_grouping, hDirAC->block_grouping, MAX_PARAM_SPATIAL_SUBFRAMES + 1 );
@@ -782,6 +840,17 @@ ivas_error ivas_dirac_dec_config(
hDirAC->dirac_read_idx = 0;
hDirAC->spar_to_dirac_write_idx = 0;
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( st_ivas->mc_mode == MC_MODE_MCMASA )
+ {
+ hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES;
+ }
+ else if ( st_ivas->ivas_format == MASA_FORMAT )
+ {
+ hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR;
+ hDirAC->dirac_bs_md_write_idx = DELAY_MASA_PARAM_DEC_SFR;
+ }
+#else
#ifdef MASA_AND_OBJECTS
if ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT || st_ivas->mc_mode == MC_MODE_MCMASA )
@@ -791,6 +860,7 @@ ivas_error ivas_dirac_dec_config(
{
hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES;
}
+#endif
else
{
int16_t num_slots_in_subfr;
@@ -814,26 +884,72 @@ ivas_error ivas_dirac_dec_config(
}
}
- hDirAC->azimuth = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) );
- hDirAC->elevation = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) );
- hDirAC->diffuseness_vector = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) );
- hDirAC->energy_ratio1 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) );
- hDirAC->spreadCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) );
- hDirAC->surroundingCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) );
+ if ( ( hDirAC->azimuth = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
+
+ if ( ( hDirAC->elevation = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
+
+ if ( ( hDirAC->diffuseness_vector = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
+
+ if ( ( hDirAC->energy_ratio1 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
+
+ if ( ( hDirAC->spreadCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
+
+ if ( ( hDirAC->surroundingCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
+
for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ )
{
- hDirAC->azimuth[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) );
+ if ( ( hDirAC->azimuth[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_s( hDirAC->azimuth[i], 0, hDirAC->num_freq_bands );
- hDirAC->elevation[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) );
+
+ if ( ( hDirAC->elevation[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_s( hDirAC->elevation[i], 0, hDirAC->num_freq_bands );
- hDirAC->diffuseness_vector[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+
+ if ( ( hDirAC->diffuseness_vector[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_f( hDirAC->diffuseness_vector[i], 1.0f, hDirAC->num_freq_bands );
- hDirAC->energy_ratio1[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+ if ( ( hDirAC->energy_ratio1[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_f( hDirAC->energy_ratio1[i], 0.0f, hDirAC->num_freq_bands );
- hDirAC->spreadCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+
+ if ( ( hDirAC->spreadCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_f( hDirAC->spreadCoherence[i], 0.0f, hDirAC->num_freq_bands );
- hDirAC->surroundingCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+
+ if ( ( hDirAC->surroundingCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_f( hDirAC->surroundingCoherence[i], 0.0f, hDirAC->num_freq_bands );
}
#ifdef MASA_AND_OBJECTS
@@ -842,20 +958,50 @@ ivas_error ivas_dirac_dec_config(
if ( st_ivas->ivas_format == MASA_FORMAT )
#endif
{
- hDirAC->azimuth2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) );
- hDirAC->elevation2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) );
- hDirAC->energy_ratio2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) );
- hDirAC->spreadCoherence2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) );
+ if ( ( hDirAC->azimuth2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
+
+ if ( ( hDirAC->elevation2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
+
+ if ( ( hDirAC->energy_ratio2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
+
+ if ( ( hDirAC->spreadCoherence2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
+
for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ )
{
- hDirAC->azimuth2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) );
+ if ( ( hDirAC->azimuth2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_s( hDirAC->azimuth2[i], 0, hDirAC->num_freq_bands );
- hDirAC->elevation2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) );
+
+ if ( ( hDirAC->elevation2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_s( hDirAC->elevation2[i], 0, hDirAC->num_freq_bands );
- hDirAC->energy_ratio2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+ if ( ( hDirAC->energy_ratio2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_f( hDirAC->energy_ratio2[i], 0.0f, hDirAC->num_freq_bands );
- hDirAC->spreadCoherence2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+
+ if ( ( hDirAC->spreadCoherence2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_f( hDirAC->spreadCoherence2[i], 0.0f, hDirAC->num_freq_bands );
}
}
@@ -884,10 +1030,18 @@ ivas_error ivas_dirac_dec_config(
*------------------------------------------------------------------------*/
void ivas_dirac_dec_close(
- DIRAC_DEC_HANDLE hDirAC /* i/o: decoder DirAC handle */
+ DIRAC_DEC_HANDLE *hDirAC_out /* i/o: decoder DirAC handle */
)
{
int16_t i, j;
+ DIRAC_DEC_HANDLE hDirAC;
+
+ if ( hDirAC_out == NULL || *hDirAC_out == NULL )
+ {
+ return;
+ }
+
+ hDirAC = *hDirAC_out;
/* Config & CLDFB */
if ( hDirAC->hConfig != NULL )
@@ -1107,7 +1261,8 @@ void ivas_dirac_dec_close(
ivas_dirac_free_mem( &( hDirAC->stack_mem ) );
- free( hDirAC );
+ free( *hDirAC_out );
+ *hDirAC_out = NULL;
return;
}
@@ -1119,7 +1274,7 @@ void ivas_dirac_dec_close(
* Allocate stack memory for DirAC renderer
*------------------------------------------------------------------------*/
-static void ivas_dirac_alloc_mem(
+static ivas_error ivas_dirac_alloc_mem(
DIRAC_DEC_HANDLE hDirAC,
const RENDERER_TYPE renderer_type,
DIRAC_DEC_STACK_MEM_HANDLE hDirAC_mem )
@@ -1146,42 +1301,73 @@ static void ivas_dirac_alloc_mem(
hDirAC_mem->frame_dec_f = NULL;
if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD )
{
- hDirAC_mem->cy_auto_dir_smooth = (float *) malloc( sizeof( float ) * size );
+ if ( ( hDirAC_mem->cy_auto_dir_smooth = (float *) malloc( sizeof( float ) * size ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
set_zero( hDirAC_mem->cy_auto_dir_smooth, size );
- hDirAC_mem->proto_power_smooth = (float *) malloc( sizeof( float ) * size );
+
+ if ( ( hDirAC_mem->proto_power_smooth = (float *) malloc( sizeof( float ) * size ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
set_zero( hDirAC_mem->proto_power_smooth, size );
- hDirAC_mem->proto_power_diff_smooth = (float *) malloc( sizeof( float ) * size );
+
+ if ( ( hDirAC_mem->proto_power_diff_smooth = (float *) malloc( sizeof( float ) * size ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
set_zero( hDirAC_mem->proto_power_diff_smooth, size );
- hDirAC_mem->direct_responses_square = (float *) malloc( sizeof( float ) * size );
+
+ if ( ( hDirAC_mem->direct_responses_square = (float *) malloc( sizeof( float ) * size ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
set_zero( hDirAC_mem->direct_responses_square, size );
if ( hDirAC->proto_signal_decorr_on && ( renderer_type != RENDERER_BINAURAL_PARAMETRIC && renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && renderer_type != RENDERER_STEREO_PARAMETRIC ) )
{
- hDirAC_mem->frame_dec_f = (float *) malloc( sizeof( float ) * 2 * num_outputs_diff * num_freq_bands );
+ if ( ( hDirAC_mem->frame_dec_f = (float *) malloc( sizeof( float ) * 2 * num_outputs_diff * num_freq_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
}
}
+ }
hDirAC->h_output_synthesis_psd_state.proto_power_smooth = hDirAC_mem->proto_power_smooth;
hDirAC->h_output_synthesis_psd_state.proto_power_diff_smooth = hDirAC_mem->proto_power_diff_smooth;
hDirAC->h_output_synthesis_psd_state.cy_auto_dir_smooth = hDirAC_mem->cy_auto_dir_smooth;
hDirAC->h_output_synthesis_psd_state.direct_responses_square = hDirAC_mem->direct_responses_square;
/* Target and smoothed nrg factors/gains */
- hDirAC_mem->cy_cross_dir_smooth = (float *) malloc( sizeof( float ) * size );
+ if ( ( hDirAC_mem->cy_cross_dir_smooth = (float *) malloc( sizeof( float ) * size ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
set_zero( hDirAC_mem->cy_cross_dir_smooth, size );
+
if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD )
{
- hDirAC_mem->cy_auto_diff_smooth = (float *) malloc( sizeof( float ) * size );
+ if ( ( hDirAC_mem->cy_auto_diff_smooth = (float *) malloc( sizeof( float ) * size ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
set_zero( hDirAC_mem->cy_auto_diff_smooth, size );
}
else
{
- hDirAC_mem->cy_auto_diff_smooth = (float *) malloc( sizeof( float ) * num_outputs_diff * num_freq_bands_diff );
+ if ( ( hDirAC_mem->cy_auto_diff_smooth = (float *) malloc( sizeof( float ) * num_outputs_diff * num_freq_bands_diff ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
set_zero( hDirAC_mem->cy_auto_diff_smooth, num_outputs_diff * num_freq_bands_diff );
}
hDirAC->h_output_synthesis_psd_state.cy_cross_dir_smooth = hDirAC_mem->cy_cross_dir_smooth;
hDirAC->h_output_synthesis_psd_state.cy_auto_diff_smooth = hDirAC_mem->cy_auto_diff_smooth;
/*Responses (gains/factors)*/
- hDirAC_mem->direct_responses = (float *) malloc( sizeof( float ) * size );
+ if ( ( hDirAC_mem->direct_responses = (float *) malloc( sizeof( float ) * size ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
set_zero( hDirAC_mem->direct_responses, size );
hDirAC->h_output_synthesis_psd_state.direct_responses = hDirAC_mem->direct_responses;
@@ -1190,19 +1376,29 @@ static void ivas_dirac_alloc_mem(
hDirAC_mem->proto_diffuse_buffer_f = NULL;
if ( renderer_type != RENDERER_BINAURAL_PARAMETRIC && renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && renderer_type != RENDERER_STEREO_PARAMETRIC )
{
- hDirAC_mem->proto_direct_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * num_protos_dir * num_freq_bands );
+ if ( ( hDirAC_mem->proto_direct_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * num_protos_dir * num_freq_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
+
if ( hDirAC->proto_signal_decorr_on )
{
if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD )
{
- hDirAC_mem->proto_diffuse_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * size );
+ if ( ( hDirAC_mem->proto_diffuse_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * size ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
}
else
{
- hDirAC_mem->proto_diffuse_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * num_outputs_diff * num_freq_bands );
+ if ( ( hDirAC_mem->proto_diffuse_buffer_f = (float *) malloc( sizeof( float ) * 2 * MAX_PARAM_SPATIAL_SUBFRAMES * num_outputs_diff * num_freq_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
}
}
}
+ }
hDirAC->h_output_synthesis_psd_state.proto_direct_buffer_f = hDirAC_mem->proto_direct_buffer_f;
hDirAC->h_output_synthesis_psd_state.proto_diffuse_buffer_f = hDirAC_mem->proto_diffuse_buffer_f;
@@ -1211,8 +1407,15 @@ static void ivas_dirac_alloc_mem(
hDirAC_mem->diffuse_power_factor = NULL;
if ( renderer_type != RENDERER_BINAURAL_PARAMETRIC && renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && renderer_type != RENDERER_STEREO_PARAMETRIC )
{
- hDirAC_mem->direct_power_factor = (float *) malloc( sizeof( float ) * num_freq_bands );
- hDirAC_mem->diffuse_power_factor = (float *) malloc( sizeof( float ) * num_freq_bands );
+ if ( ( hDirAC_mem->direct_power_factor = (float *) malloc( sizeof( float ) * num_freq_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
+
+ if ( ( hDirAC_mem->diffuse_power_factor = (float *) malloc( sizeof( float ) * num_freq_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
}
hDirAC->h_output_synthesis_psd_state.direct_power_factor = hDirAC_mem->direct_power_factor;
hDirAC->h_output_synthesis_psd_state.diffuse_power_factor = hDirAC_mem->diffuse_power_factor;
@@ -1223,26 +1426,39 @@ static void ivas_dirac_alloc_mem(
{
if ( renderer_type != RENDERER_BINAURAL_PARAMETRIC && renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && renderer_type != RENDERER_STEREO_PARAMETRIC )
{
- hDirAC_mem->reference_power = (float *) malloc( sizeof( float ) * 2 * num_freq_bands );
+ if ( ( hDirAC_mem->reference_power = (float *) malloc( sizeof( float ) * 2 * num_freq_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
if ( hDirAC->proto_signal_decorr_on )
{
- hDirAC_mem->onset_filter = (float *) malloc( sizeof( float ) * num_outputs_diff * num_freq_bands );
+ if ( ( hDirAC_mem->onset_filter = (float *) malloc( sizeof( float ) * num_outputs_diff * num_freq_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
}
}
}
+ }
else
{
if ( num_protos_dir > 2 )
{
- hDirAC_mem->reference_power = (float *) malloc( sizeof( float ) * 5 * num_freq_bands );
+ if ( ( hDirAC_mem->reference_power = (float *) malloc( sizeof( float ) * 5 * num_freq_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
+ }
}
+
if ( hDirAC->proto_signal_decorr_on )
{
- hDirAC_mem->onset_filter = (float *) malloc( sizeof( float ) * 2 * num_freq_bands );
+ if ( ( hDirAC_mem->onset_filter = (float *) malloc( sizeof( float ) * 2 * num_freq_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate stack memory for DirAC\n" ) );
}
}
+ }
- return;
+ return IVAS_ERR_OK;
}
@@ -1531,8 +1747,45 @@ void ivas_qmetadata_to_dirac(
if ( hMasa != NULL && ivas_total_brate > IVAS_SID_5k2 )
{
+#ifdef FIX_350_MASA_DELAY_COMP
+ int16_t meta_write_index;
band_mapping = hMasa->data.band_mapping;
+ for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; ++block )
+ {
+ meta_write_index = ( hDirAC->dirac_bs_md_write_idx + block ) % hDirAC->dirac_md_buffer_length;
+
+ for ( band = 0; band < hMasa->config.numCodingBands; ++band )
+ {
+ for ( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b )
+ {
+ hDirAC->azimuth[meta_write_index][b] = (int16_t) q_direction->band_data[band].azimuth[block];
+ hDirAC->elevation[meta_write_index][b] = (int16_t) q_direction->band_data[band].elevation[block];
+ hDirAC->energy_ratio1[meta_write_index][b] = q_direction->band_data[band].energy_ratio[block];
+ hDirAC->diffuseness_vector[meta_write_index][b] = 1.0f - q_direction->band_data[band].energy_ratio[block];
+
+ if ( q_direction->coherence_band_data != NULL )
+ {
+ hDirAC->spreadCoherence[meta_write_index][b] = q_direction->coherence_band_data[band].spread_coherence[block] / 255.0f;
+ }
+ else
+ {
+ hDirAC->spreadCoherence[meta_write_index][b] = 0.0f;
+ }
+
+ if ( hQMetaData->surcoh_band_data != NULL )
+ {
+ hDirAC->surroundingCoherence[meta_write_index][b] = hQMetaData->surcoh_band_data[band].surround_coherence[block] / 255.0f;
+ }
+ else
+ {
+ hDirAC->surroundingCoherence[meta_write_index][b] = 0.0f;
+ }
+ }
+ }
+ }
+#else
+ band_mapping = hMasa->data.band_mapping;
for ( band = 0; band < hMasa->config.numCodingBands; ++band )
{
for ( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b )
@@ -1564,10 +1817,37 @@ void ivas_qmetadata_to_dirac(
}
}
}
+#endif
if ( hQMetaData->no_directions == 2 )
{
q_direction = &( hQMetaData->q_direction[1] );
+#ifdef FIX_350_MASA_DELAY_COMP
+ for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; ++block )
+ {
+ meta_write_index = ( hDirAC->dirac_bs_md_write_idx + block ) % hDirAC->dirac_md_buffer_length;
+
+ for ( band = 0; band < hMasa->config.numCodingBands; ++band )
+ {
+ for ( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b )
+ {
+ hDirAC->azimuth2[meta_write_index][b] = (int16_t) q_direction->band_data[band].azimuth[block];
+ hDirAC->elevation2[meta_write_index][b] = (int16_t) q_direction->band_data[band].elevation[block];
+ hDirAC->energy_ratio2[meta_write_index][b] = q_direction->band_data[band].energy_ratio[block];
+ hDirAC->diffuseness_vector[meta_write_index][b] -= q_direction->band_data[band].energy_ratio[block];
+
+ if ( q_direction->coherence_band_data != NULL )
+ {
+ hDirAC->spreadCoherence2[meta_write_index][b] = q_direction->coherence_band_data[band].spread_coherence[block] / 255.0f;
+ }
+ else
+ {
+ hDirAC->spreadCoherence2[meta_write_index][b] = 0.0f;
+ }
+ }
+ }
+ }
+#else
for ( band = 0; band < hMasa->config.numCodingBands; ++band )
{
for ( b = MASA_band_grouping_24[band_mapping[band]]; b < MASA_band_grouping_24[band_mapping[band + 1]]; ++b )
@@ -1590,7 +1870,22 @@ void ivas_qmetadata_to_dirac(
}
}
}
+#endif
}
+#ifdef FIX_350_MASA_DELAY_COMP
+ else if ( hDirAC->azimuth2 != NULL && hDirAC->elevation2 != NULL && hDirAC->energy_ratio2 != NULL && hDirAC->spreadCoherence2 != NULL )
+ {
+ /* zero out old dir2 data */
+ for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; ++block )
+ {
+ meta_write_index = ( hDirAC->dirac_bs_md_write_idx + block ) % hDirAC->dirac_md_buffer_length;
+ set_s( hDirAC->azimuth2[meta_write_index], 0, hDirAC->num_freq_bands );
+ set_s( hDirAC->elevation2[meta_write_index], 0, hDirAC->num_freq_bands );
+ set_zero( hDirAC->energy_ratio2[meta_write_index], hDirAC->num_freq_bands );
+ set_zero( hDirAC->spreadCoherence2[meta_write_index], hDirAC->num_freq_bands );
+ }
+ }
+#endif
}
else /* SBA mode/SID/Zero frame*/
{
@@ -1847,6 +2142,7 @@ void ivas_dirac_dec(
float *reference_power, *reference_power_smooth;
float *onset_filter, *onset_filter_subframe, *p_onset_filter = NULL;
uint16_t coherence_flag;
+
push_wmops( "ivas_dirac_dec" );
/* Initialize aux buffers */
diff --git a/lib_dec/ivas_dirac_decorr_dec.c b/lib_dec/ivas_dirac_decorr_dec.c
index 2d82bb0a3a6f334c13d22682272c7f653d138c1b..bcaa6cf2a13916ccb0b68bd275d0f243ba4df33d 100644
--- a/lib_dec/ivas_dirac_decorr_dec.c
+++ b/lib_dec/ivas_dirac_decorr_dec.c
@@ -70,10 +70,10 @@ static void lattice2allpass( const int16_t filter_length, const float *lattice_c
/*-------------------------------------------------------------------------
* ivas_dirac_dec_decorr_open()
*
- *
+ * Allocate and initialize TD decorrelator decoder handle
*------------------------------------------------------------------------*/
-void ivas_dirac_dec_decorr_open(
+ivas_error ivas_dirac_dec_decorr_open(
DIRAC_DECORR_PARAMS **ph_freq_domain_decorr_ap_params,
DIRAC_DECORR_STATE **ph_freq_domain_decorr_ap_state,
const int16_t num_freq_bands,
@@ -91,6 +91,7 @@ void ivas_dirac_dec_decorr_open(
int16_t split_frequencies_bands[DIRAC_DECORR_NUM_SPLIT_BANDS + 1] = { 0, 0, 0, 23768 };
int16_t *split_freq_ptr;
float cur_lattice_delta_phi, lattice_coeffs[2 * DIRAC_MAX_DECORR_FILTER_LEN];
+ ivas_error error;
/* pointers to structs for allocation */
DIRAC_DECORR_PARAMS *freq_domain_decorr_ap_params = NULL;
@@ -101,8 +102,15 @@ void ivas_dirac_dec_decorr_open(
*-----------------------------------------------------------------*/
/* allocate structs */
- freq_domain_decorr_ap_params = (DIRAC_DECORR_PARAMS *) malloc( sizeof( DIRAC_DECORR_PARAMS ) );
- freq_domain_decorr_ap_state = (DIRAC_DECORR_STATE *) malloc( sizeof( DIRAC_DECORR_STATE ) );
+ if ( ( freq_domain_decorr_ap_params = (DIRAC_DECORR_PARAMS *) malloc( sizeof( DIRAC_DECORR_PARAMS ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
+
+ if ( ( freq_domain_decorr_ap_state = (DIRAC_DECORR_STATE *) malloc( sizeof( DIRAC_DECORR_STATE ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
/*-----------------------------------------------------------------*
* check input parameters
@@ -164,7 +172,6 @@ void ivas_dirac_dec_decorr_open(
}
}
-
/*-----------------------------------------------------------------*
* open sub-modules
*-----------------------------------------------------------------*/
@@ -173,21 +180,17 @@ void ivas_dirac_dec_decorr_open(
if ( synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD )
{
/*Onset detector up to Nyquist and not only up to max_band_decorr*/
- ivas_dirac_dec_onset_detection_open(
- num_protos_diff,
- num_freq_bands,
- num_freq_bands,
- &freq_domain_decorr_ap_params->h_onset_detection_power_params,
- &freq_domain_decorr_ap_state->h_onset_detection_power_state );
+ if ( ( error = ivas_dirac_dec_onset_detection_open( num_protos_diff, num_freq_bands, num_freq_bands, &freq_domain_decorr_ap_params->h_onset_detection_power_params, &freq_domain_decorr_ap_state->h_onset_detection_power_state ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else
{
- ivas_dirac_dec_onset_detection_open(
- num_protos_diff,
- num_freq_bands,
- freq_domain_decorr_ap_params->max_band_decorr,
- &freq_domain_decorr_ap_params->h_onset_detection_power_params,
- &freq_domain_decorr_ap_state->h_onset_detection_power_state );
+ if ( ( error = ivas_dirac_dec_onset_detection_open( num_protos_diff, num_freq_bands, freq_domain_decorr_ap_params->max_band_decorr, &freq_domain_decorr_ap_params->h_onset_detection_power_params, &freq_domain_decorr_ap_state->h_onset_detection_power_state ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
/*-----------------------------------------------------------------*
@@ -215,7 +218,10 @@ void ivas_dirac_dec_decorr_open(
}
}
- freq_domain_decorr_ap_params->split_frequency_bands = (int16_t *) malloc( sizeof( int16_t ) * ( freq_domain_decorr_ap_params->num_split_frequency_bands + 1 ) );
+ if ( ( freq_domain_decorr_ap_params->split_frequency_bands = (int16_t *) malloc( sizeof( int16_t ) * ( freq_domain_decorr_ap_params->num_split_frequency_bands + 1 ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
mvs2s( &split_frequencies_bands[0], freq_domain_decorr_ap_params->split_frequency_bands, freq_domain_decorr_ap_params->num_split_frequency_bands + 1 );
/* calc buffer size and allocate arrays */
@@ -232,18 +238,50 @@ void ivas_dirac_dec_decorr_open(
if ( num_outputs_diff > 0 )
{
buffer_size_decorr = ( ap_pre_delay[split_band_index_start] + ap_filter_length[split_band_index_start] );
- freq_domain_decorr_ap_state->decorr_buffer = (float *) malloc( sizeof( float ) * 2 * buffer_size_decorr * num_outputs_diff * freq_domain_decorr_ap_params->max_band_decorr );
+ if ( ( freq_domain_decorr_ap_state->decorr_buffer = (float *) malloc( sizeof( float ) * 2 * buffer_size_decorr * num_outputs_diff * freq_domain_decorr_ap_params->max_band_decorr ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
set_f( freq_domain_decorr_ap_state->decorr_buffer, 0.0f, 2 * buffer_size_decorr * num_outputs_diff * freq_domain_decorr_ap_params->max_band_decorr );
- freq_domain_decorr_ap_params->filter_coeff_num_real = (float *) malloc( sizeof( float ) * ( ap_filter_length[split_band_index_start] + 1 ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff );
- freq_domain_decorr_ap_params->filter_coeff_den_real = (float *) malloc( sizeof( float ) * ( ap_filter_length[split_band_index_start] + 1 ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff );
- freq_domain_decorr_ap_params->phase_coeff_real = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff );
- freq_domain_decorr_ap_params->phase_coeff_imag = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff );
- freq_domain_decorr_ap_state->direct_energy_smooth = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff );
- freq_domain_decorr_ap_state->reverb_energy_smooth = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff );
+ if ( ( freq_domain_decorr_ap_params->filter_coeff_num_real = (float *) malloc( sizeof( float ) * ( ap_filter_length[split_band_index_start] + 1 ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
- freq_domain_decorr_ap_params->pre_delay = (int16_t *) malloc( sizeof( int16_t ) * freq_domain_decorr_ap_params->num_split_frequency_bands );
- freq_domain_decorr_ap_params->filter_length = (int16_t *) malloc( sizeof( int16_t ) * freq_domain_decorr_ap_params->num_split_frequency_bands );
+ if ( ( freq_domain_decorr_ap_params->filter_coeff_den_real = (float *) malloc( sizeof( float ) * ( ap_filter_length[split_band_index_start] + 1 ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
+
+ if ( ( freq_domain_decorr_ap_params->phase_coeff_real = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
+
+ if ( ( freq_domain_decorr_ap_params->phase_coeff_imag = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
+
+ if ( ( freq_domain_decorr_ap_state->direct_energy_smooth = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
+
+ if ( ( freq_domain_decorr_ap_state->reverb_energy_smooth = (float *) malloc( sizeof( float ) * freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
+
+ if ( ( freq_domain_decorr_ap_params->pre_delay = (int16_t *) malloc( sizeof( int16_t ) * freq_domain_decorr_ap_params->num_split_frequency_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
+ if ( ( freq_domain_decorr_ap_params->filter_length = (int16_t *) malloc( sizeof( int16_t ) * freq_domain_decorr_ap_params->num_split_frequency_bands ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for TD decorrelator\n" ) );
+ }
set_f( freq_domain_decorr_ap_state->direct_energy_smooth, 0.0f, freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff );
set_f( freq_domain_decorr_ap_state->reverb_energy_smooth, 0.0f, freq_domain_decorr_ap_params->max_band_decorr * num_outputs_diff );
@@ -280,7 +318,7 @@ void ivas_dirac_dec_decorr_open(
*ph_freq_domain_decorr_ap_params = freq_domain_decorr_ap_params;
*ph_freq_domain_decorr_ap_state = freq_domain_decorr_ap_state;
- return;
+ return IVAS_ERR_OK;
}
diff --git a/lib_dec/ivas_dirac_onsets_dec.c b/lib_dec/ivas_dirac_onsets_dec.c
index 050ec5acddaf17a39a0492972f1b1b0d84106fb7..c094b45ff68aa32a7770f677b3c61e70b763f127 100644
--- a/lib_dec/ivas_dirac_onsets_dec.c
+++ b/lib_dec/ivas_dirac_onsets_dec.c
@@ -51,7 +51,7 @@
* onset detection
*------------------------------------------------------------------------*/
-void ivas_dirac_dec_onset_detection_open(
+ivas_error ivas_dirac_dec_onset_detection_open(
const int16_t num_protos_diff,
const int16_t num_freq_bands,
const int16_t max_band_decorr,
@@ -69,14 +69,20 @@ void ivas_dirac_dec_onset_detection_open(
dirac_onset_detection_params->max_band_decorr = max_band_decorr;
/* memory allocation */
- dirac_onset_detection_state->onset_detector_1 = (float *) malloc( sizeof( float ) * num_protos_diff * dirac_onset_detection_params->max_band_decorr );
- dirac_onset_detection_state->onset_detector_2 = (float *) malloc( sizeof( float ) * num_protos_diff * dirac_onset_detection_params->max_band_decorr );
+ if ( ( dirac_onset_detection_state->onset_detector_1 = (float *) malloc( sizeof( float ) * num_protos_diff * dirac_onset_detection_params->max_band_decorr ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for onset detection\n" ) );
+ }
+ if ( ( dirac_onset_detection_state->onset_detector_2 = (float *) malloc( sizeof( float ) * num_protos_diff * dirac_onset_detection_params->max_band_decorr ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for onset detection\n" ) );
+ }
/* init to zero */
set_zero( dirac_onset_detection_state->onset_detector_1, num_protos_diff * dirac_onset_detection_params->max_band_decorr );
set_zero( dirac_onset_detection_state->onset_detector_2, num_protos_diff * dirac_onset_detection_params->max_band_decorr );
- return;
+ return IVAS_ERR_OK;
}
diff --git a/lib_dec/ivas_dirac_output_synthesis_cov.c b/lib_dec/ivas_dirac_output_synthesis_cov.c
index 79560aae63f2ffd3ef2e0a7511ea0be63a025989..a2fc9ee8210be12378d3175c808075fd88ebcd8d 100644
--- a/lib_dec/ivas_dirac_output_synthesis_cov.c
+++ b/lib_dec/ivas_dirac_output_synthesis_cov.c
@@ -58,7 +58,7 @@
* Sets up the state and parameters for the Covariance Synthesis
*-------------------------------------------------------------------*/
-void ivas_dirac_dec_output_synthesis_cov_open(
+ivas_error ivas_dirac_dec_output_synthesis_cov_open(
DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params, /* i/o: handle for the covariance synthesis parameters */
DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state, /* i/o: hanlde for the covariance synthesis state */
const int16_t max_band_decorr, /* i : uppermost frequency band where decorrelation is applied */
@@ -80,15 +80,27 @@ void ivas_dirac_dec_output_synthesis_cov_open(
/* buffer length and interpolator */
h_dirac_output_synthesis_params->alpha_synthesis = NULL;
- h_dirac_output_synthesis_params->proto_matrix = (float *) malloc( nchan_out * nchan_in * sizeof( float ) );
+ if ( ( h_dirac_output_synthesis_params->proto_matrix = (float *) malloc( nchan_out * nchan_in * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) );
+ }
/* cov buffers */
for ( idx = 0; idx < num_param_bands; idx++ )
{
- h_dirac_output_synthesis_state->cx_old[idx] = (float *) malloc( nchan_in * nchan_in * sizeof( float ) );
- h_dirac_output_synthesis_state->cy_old[idx] = (float *) malloc( nchan_out * nchan_out * sizeof( float ) );
- h_dirac_output_synthesis_state->mixing_matrix_old[idx] = (float *) malloc( nchan_out * nchan_in * sizeof( float ) );
+ if ( ( h_dirac_output_synthesis_state->cx_old[idx] = (float *) malloc( nchan_in * nchan_in * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) );
+ }
+ if ( ( h_dirac_output_synthesis_state->cy_old[idx] = (float *) malloc( nchan_out * nchan_out * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) );
+ }
+ if ( ( h_dirac_output_synthesis_state->mixing_matrix_old[idx] = (float *) malloc( nchan_out * nchan_in * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) );
+ }
set_zero( h_dirac_output_synthesis_state->cx_old[idx], nchan_in * nchan_in );
set_zero( h_dirac_output_synthesis_state->cy_old[idx], nchan_out * nchan_out );
set_zero( h_dirac_output_synthesis_state->mixing_matrix_old[idx], nchan_out * nchan_in );
@@ -101,7 +113,10 @@ void ivas_dirac_dec_output_synthesis_cov_open(
}
for ( idx = 0; idx < num_param_bands_residual; idx++ )
{
- h_dirac_output_synthesis_state->mixing_matrix_res_old[idx] = (float *) malloc( nchan_out * nchan_out * sizeof( float ) );
+ if ( ( h_dirac_output_synthesis_state->mixing_matrix_res_old[idx] = (float *) malloc( nchan_out * nchan_out * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) );
+ }
set_zero( h_dirac_output_synthesis_state->mixing_matrix_res_old[idx], nchan_out * nchan_out );
}
for ( ; idx < CLDFB_NO_CHANNELS_MAX; idx++ )
@@ -114,7 +129,11 @@ void ivas_dirac_dec_output_synthesis_cov_open(
*-----------------------------------------------------------------*/
/* compute interpolator */
- h_dirac_output_synthesis_params->interpolator = (float *) malloc( interp_length * sizeof( float ) );
+ if ( ( h_dirac_output_synthesis_params->interpolator = (float *) malloc( interp_length * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis covariance\n" ) );
+ }
+
for ( idx = 1; idx <= interp_length; ++idx )
{
h_dirac_output_synthesis_params->interpolator[idx - 1] = (float) idx / (float) interp_length;
@@ -122,7 +141,7 @@ void ivas_dirac_dec_output_synthesis_cov_open(
mvr2r( proto_matrix, h_dirac_output_synthesis_params->proto_matrix, nchan_in * nchan_out );
- return;
+ return IVAS_ERR_OK;
}
@@ -171,7 +190,6 @@ void ivas_dirac_dec_output_synthesis_cov_close(
DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state /* i/o: handle for the covariance synthesis state */
)
{
-
int16_t idx;
/*-----------------------------------------------------------------*
diff --git a/lib_dec/ivas_dirac_output_synthesis_dec.c b/lib_dec/ivas_dirac_output_synthesis_dec.c
index 2ef79bfc45de812c04c09b6544735ef19dc8e890..40883784bd7911ae4cf70ea5af3a56430ac4448e 100644
--- a/lib_dec/ivas_dirac_output_synthesis_dec.c
+++ b/lib_dec/ivas_dirac_output_synthesis_dec.c
@@ -86,7 +86,7 @@ static void normalizePanningGains( float *direct_response, const int16_t num_cha
*
*------------------------------------------------------------------------*/
-void ivas_dirac_dec_output_synthesis_open(
+ivas_error ivas_dirac_dec_output_synthesis_open(
DIRAC_DEC_HANDLE hDirAC, /* i/o: DirAC handle */
RENDERER_TYPE renderer_type, /* i : renderer type */
const int16_t nchan_transport, /* i : number of transport channels*/
@@ -126,22 +126,34 @@ void ivas_dirac_dec_output_synthesis_open(
dirac_output_synthesis_state->diffuse_responses_square = NULL;
if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_MONO )
{
- dirac_output_synthesis_state->diffuse_responses_square = (float *) malloc( 2 * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->diffuse_responses_square = (float *) malloc( 2 * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
}
else if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD )
{
- dirac_output_synthesis_state->diffuse_responses_square = (float *) malloc( hDirAC->hOutSetup.nchan_out_woLFE * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->diffuse_responses_square = (float *) malloc( hDirAC->hOutSetup.nchan_out_woLFE * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
}
/* prototype power buffers */
dirac_output_synthesis_state->proto_power_smooth_prev = NULL;
if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_GAIN_SHD )
{
- dirac_output_synthesis_state->proto_power_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_protos_dir * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->proto_power_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_protos_dir * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
}
if ( dirac_output_synthesis_params->max_band_decorr > 0 && ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_LS || hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD ) )
{
- dirac_output_synthesis_state->proto_power_diff_smooth_prev = (float *) malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->hOutSetup.nchan_out_woLFE * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->proto_power_diff_smooth_prev = (float *) malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->hOutSetup.nchan_out_woLFE * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
}
else
{
@@ -149,41 +161,74 @@ void ivas_dirac_dec_output_synthesis_open(
}
/* buffer length and interpolator */
- dirac_output_synthesis_params->interpolator = (float *) malloc( hDirAC->subframe_nbslots * sizeof( float ) );
+ if ( ( dirac_output_synthesis_params->interpolator = (float *) malloc( hDirAC->subframe_nbslots * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
/* target PSD buffers */
- dirac_output_synthesis_state->cy_cross_dir_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->cy_cross_dir_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
+
if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD )
{
dirac_output_synthesis_state->cy_auto_dir_smooth_prev = NULL;
- dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->num_outputs_diff * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
}
else
{
- dirac_output_synthesis_state->cy_auto_dir_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->cy_auto_dir_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
+
if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_PSD_SHD )
{
- dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
}
else
{
- dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_diff * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->cy_auto_diff_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
}
}
/* direct and diffuse gain buffers */
- dirac_output_synthesis_state->gains_dir_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->gains_dir_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
+
if ( hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD )
{
- dirac_output_synthesis_state->gains_diff_prev = (float *) malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->num_outputs_diff * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->gains_diff_prev = (float *) malloc( dirac_output_synthesis_params->max_band_decorr * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
}
else if ( hDirAC->synthesisConf != DIRAC_SYNTHESIS_PSD_SHD && hDirAC->synthesisConf != DIRAC_SYNTHESIS_MONO )
{
- dirac_output_synthesis_state->gains_diff_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_diff * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->gains_diff_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_diff * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
}
else
{
- dirac_output_synthesis_state->gains_diff_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->gains_diff_prev = (float *) malloc( hDirAC->num_freq_bands * hDirAC->num_outputs_dir * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
}
/*-----------------------------------------------------------------*
@@ -194,15 +239,27 @@ void ivas_dirac_dec_output_synthesis_open(
if ( !( renderer_type == RENDERER_BINAURAL_PARAMETRIC || renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) )
{
computeAlphaSynthesis( temp_alpha_synthesis, DIRAC_AVG_LENGTH_SYNTH_MS, DIRAC_ALPHA_MAX, &dirac_output_synthesis_params->numAlphas, hDirAC->slot_size, hDirAC->num_freq_bands, hDirAC->frequency_axis, output_Fs );
- dirac_output_synthesis_params->alpha_synthesis = (float *) malloc( dirac_output_synthesis_params->numAlphas * sizeof( float ) );
+ if ( ( dirac_output_synthesis_params->alpha_synthesis = (float *) malloc( dirac_output_synthesis_params->numAlphas * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
mvr2r( temp_alpha_synthesis, dirac_output_synthesis_params->alpha_synthesis, dirac_output_synthesis_params->numAlphas );
computeAlphaSynthesis( temp_alpha_synthesis, DIRAC_AVG_LENGTH_SYNTH_MS_FAST, DIRAC_ALPHA_MAX_FAST, &dirac_output_synthesis_params->numAlphasFast, hDirAC->slot_size, hDirAC->num_freq_bands, hDirAC->frequency_axis, output_Fs );
- dirac_output_synthesis_params->alpha_synthesis_fast = (float *) malloc( dirac_output_synthesis_params->numAlphasFast * sizeof( float ) );
+ if ( ( dirac_output_synthesis_params->alpha_synthesis_fast = (float *) malloc( dirac_output_synthesis_params->numAlphasFast * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
mvr2r( temp_alpha_synthesis, dirac_output_synthesis_params->alpha_synthesis_fast, dirac_output_synthesis_params->numAlphasFast );
- dirac_output_synthesis_state->reference_power_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
- dirac_output_synthesis_state->direction_smoothness_prev = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+ if ( ( dirac_output_synthesis_state->reference_power_smooth_prev = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
+ if ( ( dirac_output_synthesis_state->direction_smoothness_prev = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC synthesis\n" ) );
+ }
set_zero( dirac_output_synthesis_state->reference_power_smooth_prev, hDirAC->num_freq_bands );
set_zero( dirac_output_synthesis_state->direction_smoothness_prev, hDirAC->num_freq_bands );
}
@@ -276,7 +333,7 @@ void ivas_dirac_dec_output_synthesis_open(
dirac_output_synthesis_params->diffuse_compensation_factor_decorr = 0.f;
}
- return;
+ return IVAS_ERR_OK;
}
diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
old mode 100644
new mode 100755
index 16ed84c257eeb9bd18725c7a41933515298fc2cb..98216fec33d9ee12fd144e0f7639e83fa6242212
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -66,12 +66,14 @@ ivas_error ivas_dec_setup(
)
{
int16_t k, idx, num_bits_read;
- int16_t num_obj, element_mode_flag;
+ int16_t nchan_ism, element_mode_flag;
Decoder_State *st;
int32_t ivas_total_brate;
ivas_error error;
#ifdef MASA_AND_OBJECTS
+#ifndef OMASA_BRATE_SW
int32_t cpe_brate;
+#endif
#endif
error = IVAS_ERR_OK;
@@ -105,15 +107,34 @@ ivas_error ivas_dec_setup(
{
/* read the number of objects */
st_ivas->nchan_transport = 1;
- num_obj = 1;
+ nchan_ism = 1;
k = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC ) - 1 );
- while ( st_ivas->bit_stream[k] && num_obj < MAX_NUM_OBJECTS )
+ while ( st_ivas->bit_stream[k] && nchan_ism < MAX_NUM_OBJECTS )
{
- num_obj++;
+ nchan_ism++;
k--;
}
- ivas_ism_dec_config( st_ivas, num_obj );
+#ifdef NCHAN_ISM_PARAMETER
+ st_ivas->nchan_ism = nchan_ism;
+#endif
+
+#ifdef DISCRETE_ISM_DTX_CNG
+#ifdef NCHAN_ISM_PARAMETER
+ if ( ( error = ivas_ism_dec_config( st_ivas, st_ivas->ism_mode ) ) != IVAS_ERR_OK )
+#else
+ if ( ( error = ivas_ism_dec_config( st_ivas, st_ivas->ism_mode, nchan_ism ) ) != IVAS_ERR_OK )
+#endif
+ {
+ return error;
+ }
+#else
+#ifdef NCHAN_ISM_PARAMETER
+ ivas_ism_dec_config( st_ivas );
+#else
+ ivas_ism_dec_config( st_ivas, nchan_ism );
+#endif
+#endif
}
else if ( st_ivas->ivas_format == SBA_FORMAT )
{
@@ -159,17 +180,31 @@ ivas_error ivas_dec_setup(
/* reconfigure in case a change of operation mode is detected */
if ( ( ivas_total_brate > IVAS_SID_5k2 && ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate ) || ( st_ivas->ini_active_frame == 0 ) )
{
- if ( st_ivas->ini_active_frame == 0 && ivas_total_brate != FRAME_NO_DATA && ivas_total_brate < MASA_STEREO_MIN_BITRATE && st_ivas->nCPE == 1 )
+#ifdef OMASA_BRATE_SW
+ if ( st_ivas->last_ivas_format == MASA_FORMAT )
{
- st_ivas->hCPE[0]->nchan_out = 1;
+#endif
+ if ( st_ivas->ini_active_frame == 0 && ivas_total_brate != FRAME_NO_DATA && ivas_total_brate < MASA_STEREO_MIN_BITRATE && st_ivas->nCPE == 1 )
+ {
+ st_ivas->hCPE[0]->nchan_out = 1;
+ }
+ else
+ {
+ if ( ( error = ivas_masa_dec_reconfigure( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+#ifdef OMASA_BRATE_SW
}
else
{
- if ( ( error = ivas_masa_dec_reconfigure( st_ivas ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_omasa_dec_config( st_ivas ) ) != IVAS_ERR_OK )
{
return error;
}
}
+#endif
}
}
}
@@ -177,8 +212,8 @@ ivas_error ivas_dec_setup(
else if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
{
st_ivas->nchan_transport = 2; /* always 2 MASA transport channels */
- /* for the DISC mode the number of objects are written at the end of the bitstream, in the MASA metadata*/
+ /* for the DISC mode the number of objects are written at the end of the bitstream, in the MASA metadata */
st_ivas->nchan_ism = 2 * st_ivas->bit_stream[ivas_total_brate / FRAMES_PER_SEC - 1] + st_ivas->bit_stream[ivas_total_brate / FRAMES_PER_SEC - 2] + 1;
st_ivas->ism_mode = ivas_omasa_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism );
@@ -187,6 +222,12 @@ ivas_error ivas_dec_setup(
/* reconfigure in case a change of operation mode is detected */
if ( ( ivas_total_brate > IVAS_SID_5k2 && ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate ) || ( st_ivas->ini_active_frame == 0 ) )
{
+#ifdef OMASA_BRATE_SW
+ if ( ( error = ivas_omasa_dec_config( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+#else
cpe_brate = calculate_cpe_brate_MASA_ISM( st_ivas->ism_mode, ivas_total_brate, st_ivas->nchan_ism );
if ( st_ivas->ini_active_frame == 0 && ivas_total_brate != FRAME_NO_DATA && ( cpe_brate < MASA_STEREO_MIN_BITRATE ) && st_ivas->nCPE == 1 )
{
@@ -196,6 +237,7 @@ ivas_error ivas_dec_setup(
{
return error;
}
+#endif
}
}
}
@@ -253,6 +295,11 @@ ivas_error ivas_dec_setup(
case SID_MDCT_STEREO:
st_ivas->element_mode_init = IVAS_CPE_MDCT;
break;
+#ifdef DISCRETE_ISM_DTX_CNG
+ case SID_ISM:
+ st_ivas->element_mode_init = IVAS_SCE;
+ break;
+#endif
case SID_MASA_1TC:
st_ivas->element_mode_init = IVAS_SCE;
st_ivas->nchan_transport = 1;
@@ -441,19 +488,26 @@ static ivas_error ivas_read_format(
break;
case SID_ISM:
st_ivas->ivas_format = ISM_FORMAT;
-#ifdef PARAM_ISM_DTX_CNG
-
+#ifndef DISCRETE_ISM_DTX_CNG
if ( st_ivas->ism_mode == ISM_MODE_DISC )
{
- ivas_ism_dec_config( st_ivas, 1 ); /* currently DTX supported for 1 ISM when ISM Mode is DISC_ISM */
+ ivas_ism_dec_config( st_ivas
+#ifndef NCHAN_ISM_PARAMETER
+ ,
+ 1
+#endif
+ ); /* currently DTX supported for 1 ISM when ISM Mode is DISC_ISM */
}
if ( st_ivas->ism_mode == ISM_MODE_PARAM )
{
- ivas_ism_dec_config( st_ivas, st_ivas->nSCE ); /* for Param-ISM, we need to generate 2 TCs */
+ ivas_ism_dec_config( st_ivas
+#ifndef NCHAN_ISM_PARAMETER
+ ,
+ st_ivas->nSCE
+#endif
+ ); /* for Param-ISM, we need to generate 2 TCs */
}
-#else
- ivas_ism_dec_config( st_ivas, 1 ); /* currently DTX supported for 1ISM only */
#endif
break;
case SID_MULTICHANNEL:
@@ -797,6 +851,53 @@ ivas_error ivas_init_decoder(
}
}
+ /*-----------------------------------------------------------------*
+ * Set head/orientation tracking
+ *-----------------------------------------------------------------*/
+
+ if ( st_ivas->hDecoderConfig->Opt_Headrotation )
+ {
+ if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_NONE )
+ {
+ if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_NONE ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_AVG )
+ {
+ if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_AVG_ORIENT ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_REF )
+ {
+ if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_REF_ORIENT ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_REF_VEC )
+ {
+ if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_REF_VEC ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ else if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_REF_VEC_LEV )
+ {
+ if ( ( error = ivas_orient_trk_SetTrackingType( st_ivas->hHeadTrackData->OrientationTracker, OTR_TRACKING_REF_VEC_LEV ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ else
+ {
+ return IVAS_ERR_WRONG_MODE;
+ }
+ }
+
/*-----------------------------------------------------------------*
* Allocate and initialize SCE/CPE and other handles
*-----------------------------------------------------------------*/
@@ -851,11 +952,15 @@ ivas_error ivas_init_decoder(
st_ivas->nSCE = st_ivas->nchan_transport; /* "st_ivas->nchan_transport" is known from ivas_dec_setup */
st_ivas->nCPE = 0;
+#ifdef FIX_379_EXT_METADATA
+ st_ivas->ism_extmeta_active = -1;
+ st_ivas->ism_extmeta_cnt = 0;
+#endif
if ( st_ivas->ism_mode == ISM_MODE_PARAM )
{
- st_ivas->nchan_transport = 2;
- st_ivas->nSCE = 2;
+ st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE;
+ st_ivas->nSCE = MAX_PARAM_ISM_WAVE;
if ( ( error = ivas_param_ism_dec_open( st_ivas ) ) != IVAS_ERR_OK )
{
@@ -863,7 +968,7 @@ ivas_error ivas_init_decoder(
}
}
- if ( ( error = create_ism_metadata_dec( st_ivas, st_ivas->nSCE, element_brate_tmp ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_ism_metadata_dec_create( st_ivas, st_ivas->nSCE, element_brate_tmp ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -876,14 +981,16 @@ ivas_error ivas_init_decoder(
}
reset_indices_dec( st_ivas->hSCE[sce_id]->hCoreCoder[0] );
+
+#ifdef DISCRETE_ISM_DTX_CNG
+ st_ivas->hSCE[sce_id]->hCoreCoder[0]->is_ism_format = 1;
+#endif
}
-#ifdef PARAM_ISM_DTX_CNG
if ( st_ivas->ism_mode == ISM_MODE_PARAM )
{
st_ivas->hSCE[1]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed3 = st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed2;
}
-#endif
}
else if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT )
{
@@ -904,7 +1011,7 @@ ivas_error ivas_init_decoder(
{
if ( st_ivas->sba_mode == SBA_MODE_SPAR )
{
- if ( ( error = ivas_spar_dec_open( st_ivas ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_spar_dec_open( st_ivas, 0 ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -944,7 +1051,11 @@ ivas_error ivas_init_decoder(
ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ),
st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 );
}
+#ifdef SBA2MONO
+ st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );
+#else
st_ivas->sba_dirac_stereo_flag = ( output_config == AUDIO_CONFIG_STEREO );
+#endif
}
else /* SBA_MODE_DIRAC */
{
@@ -953,7 +1064,11 @@ ivas_error ivas_init_decoder(
return error;
}
+#ifdef SBA2MONO
+ st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );
+#else
st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO );
+#endif
}
}
@@ -990,7 +1105,11 @@ ivas_error ivas_init_decoder(
}
/* create CPE element for DFT Stereo like upmix */
+#ifdef SBA2MONO
+ if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nCPE == 0 )
+#else
if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nchan_transport == 1 )
+#endif
{
if ( ( error = create_cpe_dec( st_ivas, cpe_id, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK )
{
@@ -1010,6 +1129,9 @@ ivas_error ivas_init_decoder(
}
/* set CNA/CNG flags */
+#ifdef FIX_386_CORECODER_RECONFIG
+ ivas_sba_set_cna_cng_flag( st_ivas );
+#else
if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->nchan_transport == 1 )
{
st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 0; /* Todo: Check if these can be enabled */
@@ -1028,11 +1150,15 @@ ivas_error ivas_init_decoder(
st_ivas->hCPE[0]->hCoreCoder[n]->cng_sba_flag = 1;
}
}
+#endif
}
#ifdef MASA_AND_OBJECTS
else if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
{
- ivas_qmetadata_open( &( st_ivas->hQMetaData ) );
+ if ( ( error = ivas_qmetadata_open( &( st_ivas->hQMetaData ) ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
k = 0;
ism_total_brate = 0;
@@ -1050,16 +1176,25 @@ ivas_error ivas_init_decoder(
st_ivas->nSCE = 1;
ism_total_brate = sep_object_brate[k - 2][0];
- create_sce_dec( st_ivas, 0, ism_total_brate );
+ if ( ( error = create_sce_dec( st_ivas, 0, ism_total_brate ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
reset_indices_dec( st_ivas->hSCE[0]->hCoreCoder[0] );
+#ifdef OMASA_BRATE_SW
+ if ( ( error = ivas_ism_metadata_dec_create( st_ivas, 1, NULL ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+#else
#ifdef OMASA_UPDATES
if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
{
int32_t temp_brate[MAX_SCE];
- if ( ( error = create_ism_metadata_dec( st_ivas, 1, temp_brate ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_ism_metadata_dec_create( st_ivas, 1, temp_brate ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -1076,6 +1211,7 @@ ivas_error ivas_init_decoder(
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISm MetaData\n" ) );
}
+#endif
#endif
}
else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
@@ -1096,7 +1232,7 @@ ivas_error ivas_init_decoder(
reset_indices_dec( st_ivas->hSCE[sce_id]->hCoreCoder[0] );
}
- if ( ( error = create_ism_metadata_dec( st_ivas, st_ivas->nchan_ism, temp_brate ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_ism_metadata_dec_create( st_ivas, st_ivas->nchan_ism, temp_brate ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -1114,7 +1250,10 @@ ivas_error ivas_init_decoder(
if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_MONO_DOWNMIX )
{
- ivas_dirac_dec_open( st_ivas );
+ if ( ( error = ivas_dirac_dec_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
if ( ( error = create_cpe_dec( st_ivas, 0, ivas_total_brate - ism_total_brate ) ) != IVAS_ERR_OK )
@@ -1126,18 +1265,6 @@ ivas_error ivas_init_decoder(
{
reset_indices_dec( st_ivas->hCPE[0]->hCoreCoder[n] );
}
-
-#ifdef OMASA_UPDATES
- if ( st_ivas->renderer_type == RENDERER_DIRAC && ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_DISC ) )
-#else
- if ( st_ivas->renderer_type == RENDERER_DIRAC && ( st_ivas->ism_mode == ISM_MASA_MODE_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_DISC ) )
-#endif
- {
- if ( ( error = ivas_masa_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
}
#endif
else if ( st_ivas->ivas_format == MC_FORMAT )
@@ -1230,7 +1357,11 @@ ivas_error ivas_init_decoder(
return error;
}
+#ifdef SBA2MONO
+ st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );
+#else
st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO );
+#endif
if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_MCMASA_MONO_STEREO )
{
@@ -1378,21 +1509,9 @@ ivas_error ivas_init_decoder(
if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )
{
-#ifdef FIX_197_CREND_INTERFACE
-#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
- if ( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper ) ) != IVAS_ERR_OK )
-#else
- if ( ( st_ivas->hCrendWrapper = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" );
- }
- if ( ( st_ivas->hCrendWrapper->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )
-#endif
-#else
- if ( ( st_ivas->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )
-#endif
+ if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
{
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend\n" );
+ return error;
}
}
}
@@ -1412,7 +1531,6 @@ ivas_error ivas_init_decoder(
}
else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
{
-#ifdef FIX_197_CREND_INTERFACE
if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT && st_ivas->hDecoderConfig->Opt_Headrotation )
{
if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK )
@@ -1422,35 +1540,41 @@ ivas_error ivas_init_decoder(
}
if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config,
- st_ivas->hRenderConfig, st_ivas->hDecoderConfig->Opt_Headrotation, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
+ st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
{
return error;
}
st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;
-#else
- if ( ivas_crend_open( st_ivas ) != IVAS_ERR_OK )
- {
- return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "ivas_crend_open failed" );
- }
-#endif
}
#ifdef OMASA_UPDATES
- if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->ism_mode == ISM_MASA_MODE_DISC && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL )
+ if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
{
- /* Use td renderer for the objects in DISC mode */
- error = ivas_td_binaural_open_unwrap( &st_ivas->hHrtfTD, st_ivas->hDecoderConfig->output_Fs, st_ivas->nchan_ism, st_ivas->ivas_format,
- st_ivas->transport_config, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns );
- if ( ( error ) != IVAS_ERR_OK )
+ // VE: introduce a new renderer_type for this case
+ if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode == ISM_MASA_MODE_DISC )
{
- return error;
+ /* Allocate TD renderer for the objects in DISC mode */
+ if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
+ if ( ( error = ivas_masa_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
- /* Reserve memory for delay buffer */
- if ( ( error = ivas_masa_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
+ // VE: introduce a new renderer_type for this case
+ if ( st_ivas->renderer_type == RENDERER_DIRAC && ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_DISC ) )
{
- return error;
+ /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
+ if ( ( error = ivas_masa_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
}
#endif
@@ -1494,13 +1618,14 @@ ivas_error ivas_init_decoder(
return error;
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
/* reuse core-coder buffers for LFE decoder */
cpe_id = LFE_CHANNEL / CPE_CHANNELS;
n = LFE_CHANNEL % CPE_CHANNELS;
st_ivas->hLFE->prevsynth_buf = &st_ivas->hCPE[cpe_id]->hCoreCoder[n]->old_synth_sw[0];
st_ivas->hLFE->prior_out_buffer = &st_ivas->hCPE[cpe_id]->hCoreCoder[n]->previoussynth[0];
-
+#endif
set_zero( st_ivas->hLFE->prevsynth_buf, LFE_PLC_BUFLEN );
set_zero( st_ivas->hLFE->prior_out_buffer, L_FRAME48k );
}
@@ -1536,7 +1661,11 @@ ivas_error ivas_init_decoder(
}
/* CLDFB Interpolation weights */
+#ifdef SBA2MONO
+ if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && !st_ivas->sba_dirac_stereo_flag && st_ivas->hDecoderConfig->nchan_out != 1 )
+#else
if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR && !st_ivas->sba_dirac_stereo_flag )
+#endif
{
ivas_spar_get_cldfb_gains( st_ivas->hSpar, st_ivas->cldfbAnaDec[0], st_ivas->cldfbSynDec[0], hDecoderConfig );
}
@@ -1545,7 +1674,10 @@ ivas_error ivas_init_decoder(
* Allocate and initialize limiter struct
*-----------------------------------------------------------------*/
- st_ivas->hLimiter = ivas_limiter_open( hDecoderConfig->nchan_out, output_Fs );
+ if ( ( st_ivas->hLimiter = ivas_limiter_open( hDecoderConfig->nchan_out, output_Fs ) ) == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Failed to open limiter handle" );
+ }
return error;
}
@@ -1561,7 +1693,7 @@ void destroy_core_dec(
DEC_CORE_HANDLE hCoreCoder /* i/o: core decoder structure */
)
{
- destroy_decoder( hCoreCoder );
+ destroy_cldfb_decoder( hCoreCoder );
if ( hCoreCoder->hGSCDec != NULL )
{
@@ -1653,7 +1785,11 @@ void destroy_core_dec(
hCoreCoder->hTcxDec = NULL;
}
- if ( hCoreCoder->hTcxCfg != NULL && hCoreCoder->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( hCoreCoder->hTcxCfg != NULL
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && hCoreCoder->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
free( hCoreCoder->hTcxCfg );
hCoreCoder->hTcxCfg = NULL;
@@ -1755,12 +1891,8 @@ void ivas_initialize_handles_dec(
st_ivas->hIsmRendererData = NULL;
st_ivas->hBinRendererTd = NULL;
st_ivas->hMonoDmxRenderer = NULL;
-#ifdef FIX_197_CREND_INTERFACE
st_ivas->hCrendWrapper = NULL;
-#else
- st_ivas->hCrend = NULL;
- st_ivas->hHrtf = NULL;
-#endif
+ st_ivas->hReverb = NULL;
st_ivas->hSetOfHRTF = NULL;
st_ivas->hHrtfFastConv = NULL;
st_ivas->hHrtfParambin = NULL;
@@ -1788,7 +1920,7 @@ void ivas_destroy_dec(
Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
)
{
- int16_t i, n;
+ int16_t i;
/* CLDFB handles */
for ( i = 0; i < MAX_INTERN_CHANNELS; i++ )
@@ -1796,7 +1928,6 @@ void ivas_destroy_dec(
if ( st_ivas->cldfbAnaDec[i] != NULL )
{
deleteCldfb( &( st_ivas->cldfbAnaDec[i] ) );
- st_ivas->cldfbAnaDec[i] = NULL;
}
}
@@ -1805,7 +1936,6 @@ void ivas_destroy_dec(
if ( st_ivas->cldfbSynDec[i] != NULL )
{
deleteCldfb( &( st_ivas->cldfbSynDec[i] ) );
- st_ivas->cldfbSynDec[i] = NULL;
}
}
@@ -1835,13 +1965,6 @@ void ivas_destroy_dec(
}
}
- /* LFE handle */
- if ( st_ivas->hLFE != NULL )
- {
- ivas_lfe_dec_close( st_ivas->hLFE );
- st_ivas->hLFE = NULL;
- }
-
/* HP20 filter handles */
if ( st_ivas->mem_hp20_out != NULL )
{
@@ -1855,16 +1978,13 @@ void ivas_destroy_dec(
}
/* ISM metadata handles */
- for ( n = 0; n < MAX_NUM_OBJECTS; n++ )
- {
- if ( st_ivas->hIsmMetaData[n] != NULL )
- {
- free( st_ivas->hIsmMetaData[n] );
- st_ivas->hIsmMetaData[n] = NULL;
- }
- }
+#ifdef OMASA_BRATE_SW
+ ivas_ism_metadata_close( st_ivas->hIsmMetaData, 0 );
+#else
+ ivas_ism_metadata_close( st_ivas->hIsmMetaData );
+#endif
- /* ISm renderer handle */
+ /* ISM renderer handle */
if ( st_ivas->hIsmRendererData != NULL )
{
free( st_ivas->hIsmRendererData );
@@ -1872,26 +1992,18 @@ void ivas_destroy_dec(
}
/* DirAC handle */
- if ( st_ivas->hDirAC != NULL )
+ if ( st_ivas->ivas_format == ISM_FORMAT )
{
- if ( st_ivas->ivas_format == ISM_FORMAT )
- {
- ivas_param_ism_dec_close( st_ivas->hDirAC, st_ivas->hDecoderConfig->output_config );
- }
- else
- {
- ivas_dirac_dec_close( st_ivas->hDirAC );
- }
- st_ivas->hDirAC = NULL;
+ ivas_param_ism_dec_close( &( st_ivas->hDirAC ), st_ivas->hDecoderConfig->output_config );
}
-
- /* Spar handle */
- if ( st_ivas->hSpar != NULL )
+ else
{
- ivas_spar_dec_close( st_ivas->hSpar, st_ivas->hDecoderConfig->output_Fs );
- st_ivas->hSpar = NULL;
+ ivas_dirac_dec_close( &( st_ivas->hDirAC ) );
}
+ /* SPAR handle */
+ ivas_spar_dec_close( &( st_ivas->hSpar ), st_ivas->hDecoderConfig->output_Fs, 0 );
+
/* HOA decoder matrix */
if ( st_ivas->hoa_dec_mtx != NULL )
{
@@ -1899,12 +2011,18 @@ void ivas_destroy_dec(
st_ivas->hoa_dec_mtx = NULL;
}
+ /* MASA decoder structure */
+ ivas_masa_dec_close( &( st_ivas->hMasa ) );
+
/* Qmetadata handle */
ivas_qmetadata_close( &st_ivas->hQMetaData );
/* MCT handle */
ivas_mct_dec_close( &st_ivas->hMCT );
+ /* LFE handle */
+ ivas_lfe_dec_close( &( st_ivas->hLFE ) );
+
/* Parametric MC handle */
ivas_param_mc_dec_close( &st_ivas->hParamMC );
@@ -1921,11 +2039,10 @@ void ivas_destroy_dec(
ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );
/* Crend handle */
-#ifdef FIX_197_CREND_INTERFACE
ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );
-#else
- ivas_crend_close( st_ivas );
-#endif
+
+ /* Reverb handle */
+ ivas_reverb_close( &st_ivas->hReverb );
/* LS config converter handle */
ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion );
@@ -1937,21 +2054,18 @@ void ivas_destroy_dec(
st_ivas->hLsSetupCustom = NULL;
}
- /* MASA decoder structure */
- if ( st_ivas->hMasa != NULL )
- {
- ivas_masa_dec_close( st_ivas->hMasa );
- st_ivas->hMasa = NULL;
- }
-
/* Downmix structure */
if ( st_ivas->hMonoDmxRenderer != NULL )
{
free( st_ivas->hMonoDmxRenderer );
st_ivas->hMonoDmxRenderer = NULL;
}
+
#ifdef MASA_AND_OBJECTS
/* MASA ISM structure */
+#ifdef OMASA_BRATE_SW
+ ivas_masa_ism_data_close( &st_ivas->hMasaIsmData );
+#else
if ( st_ivas->hMasaIsmData != NULL )
{
if ( st_ivas->hMasaIsmData->delayBuffer != NULL )
@@ -1967,12 +2081,10 @@ void ivas_destroy_dec(
st_ivas->hMasaIsmData = NULL;
}
#endif
+#endif
+
/* Head track data handle */
- if ( st_ivas->hHeadTrackData != NULL )
- {
- free( st_ivas->hHeadTrackData );
- st_ivas->hHeadTrackData = NULL;
- }
+ ivas_headTrack_close( &st_ivas->hHeadTrackData );
/* Time Domain binaural renderer handle */
if ( st_ivas->hBinRendererTd != NULL )
@@ -1987,22 +2099,13 @@ void ivas_destroy_dec(
}
/* CRend binaural renderer handle */
- if ( st_ivas->hSetOfHRTF != NULL )
- {
- ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF );
- }
+ ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF );
/* Fastconv HRTF filters */
- if ( st_ivas->hHrtfFastConv != NULL )
- {
- ivas_HRTF_fastconv_binary_close( &st_ivas->hHrtfFastConv );
- }
+ ivas_HRTF_fastconv_binary_close( &st_ivas->hHrtfFastConv );
/* Parametric binauralizer HRTF filters */
- if ( st_ivas->hHrtfParambin != NULL )
- {
- ivas_HRTF_parambin_binary_close( &st_ivas->hHrtfParambin );
- }
+ ivas_HRTF_parambin_binary_close( &st_ivas->hHrtfParambin );
/* Config. Renderer */
ivas_render_config_close( &( st_ivas->hRenderConfig ) );
@@ -2275,7 +2378,7 @@ static ivas_error doSanityChecks_IVAS(
/* Verify ISM output configuration */
if ( output_config == AUDIO_CONFIG_INVALID )
{
- return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for ISm" );
+ return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for ISM" );
}
}
else if ( st_ivas->ivas_format == SBA_FORMAT )
@@ -2311,20 +2414,6 @@ static ivas_error doSanityChecks_IVAS(
}
#ifdef DEBUGGING
-#ifndef REMOVE_FORCE_SUBFRAME_BIN
- if ( st_ivas->hDecoderConfig->forceSubframeBinauralization )
- {
- /* Note about resolution of Binaural Renderers: *
- * - Parametric Binaural Renderer: 20 ms by default, can be forced to subframe (5 ms) resolution *
- * - FastConv Binaural Renderer: 5 ms by default *
- * - TD objects Binaural Renderer: 20 ms by default */
-
- if ( !( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM ) || !( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MC_FORMAT || st_ivas->ivas_format == ISM_FORMAT ) )
- {
- return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Wrong set-up: Forced subframe resolution parametric binauralization activated for non-binaural output." );
- }
- }
-#endif
if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || output_config != AUDIO_CONFIG_BINAURAL || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) )
{
return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration: Time Domain object renderer not supported in this configuration" );
diff --git a/lib_dec/ivas_ism_dec.c b/lib_dec/ivas_ism_dec.c
index af5dfa3dc64c87bd9a38ff4d0d4fbf2f037cc51e..5f9c1fff0b656635ade9f24643dbfdcc546d07f6 100644
--- a/lib_dec/ivas_ism_dec.c
+++ b/lib_dec/ivas_ism_dec.c
@@ -49,8 +49,11 @@
static ivas_error ivas_ism_bitrate_switching(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const int16_t nchan_transport_old, /* i : last number of transport channels */
- const ISM_MODE last_ism_mode, /* i : last ISM mode */
- const int16_t num_obj /* i : number of objects in the bitstream */
+ const ISM_MODE last_ism_mode /* i : last ISM mode */
+#ifndef NCHAN_ISM_PARAMETER
+ ,
+ const int16_t num_obj /* i : number of objects in the bitstream */
+#endif
)
{
ivas_error error;
@@ -62,18 +65,48 @@ static ivas_error ivas_ism_bitrate_switching(
nCPE_old = st_ivas->nCPE;
nSCE_old = st_ivas->nSCE;
+#ifdef NCHAN_ISM_PARAMETER
+ if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, NULL, NULL, element_brate_tmp, NULL, NULL
#ifdef MASA_AND_OBJECTS
- ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, num_obj, NULL, NULL, NULL, element_brate_tmp, NULL, NULL, 0 );
+ ,
+ 0
+#endif
+ ) ) != IVAS_ERR_OK )
#else
- ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, num_obj, NULL, NULL, NULL, element_brate_tmp, NULL, NULL );
+ if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, num_obj, NULL, NULL, NULL, element_brate_tmp, NULL, NULL
+#ifdef MASA_AND_OBJECTS
+ ,
+ 0
#endif
+ ) ) != IVAS_ERR_OK )
+#endif
+ {
+ return error;
+ }
+
st_ivas->nSCE = st_ivas->nchan_transport;
- ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, 0, st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport, ( st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS );
+ /*-----------------------------------------------------------------*
+ * Allocate, initialize, and configure SCE/CPE/MCT handles
+ *-----------------------------------------------------------------*/
+
+ if ( ( error = ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, 0, st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport, ( st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
- ivas_hp20_dec_reconfig( st_ivas, nchan_transport_old );
+ /*-----------------------------------------------------------------*
+ * HP20 memories
+ *-----------------------------------------------------------------*/
- /* Initialize the needed renderer struct and destroy the unnecessary renderer struct */
+ if ( ( error = ivas_hp20_dec_reconfig( st_ivas, nchan_transport_old ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ /*-----------------------------------------------------------------*
+ * Initialize the needed renderer struct and destroy the unnecessary renderer struct
+ *-----------------------------------------------------------------*/
/* select the renderer */
ivas_renderer_select( st_ivas );
@@ -89,16 +122,15 @@ static ivas_error ivas_ism_bitrate_switching(
efap_free_data( &st_ivas->hEFAPdata );
}
+ /*-----------------------------------------------------------------*
+ * Switching between ParamISM and DiscISM
+ *-----------------------------------------------------------------*/
+
+ /* switching from ParamISM to DiscISM */
if ( st_ivas->ism_mode == ISM_MODE_DISC && last_ism_mode == ISM_MODE_PARAM )
{
- /* switching from ParamISM to DiscISM */
-
/* Deallocate the ParamISM struct */
- if ( st_ivas->hDirAC != NULL )
- {
- ivas_param_ism_dec_close( st_ivas->hDirAC, st_ivas->hDecoderConfig->output_config );
- st_ivas->hDirAC = NULL;
- }
+ ivas_param_ism_dec_close( &( st_ivas->hDirAC ), st_ivas->hDecoderConfig->output_config );
if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL )
{
@@ -106,7 +138,10 @@ static ivas_error ivas_ism_bitrate_switching(
ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );
/* Open the TD Binaural renderer */
- ivas_td_binaural_open( st_ivas );
+ if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else
{
@@ -116,7 +151,11 @@ static ivas_error ivas_ism_bitrate_switching(
free( st_ivas->hIsmRendererData );
st_ivas->hIsmRendererData = NULL;
}
- ivas_ism_renderer_open( st_ivas );
+
+ if ( ( error = ivas_ism_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM )
@@ -125,36 +164,41 @@ static ivas_error ivas_ism_bitrate_switching(
ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );
/* Open Crend Binaural renderer */
-#ifdef FIX_197_CREND_INTERFACE
if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ),
st_ivas->intern_config,
st_ivas->hOutSetup.output_config,
st_ivas->hRenderConfig,
- st_ivas->hDecoderConfig->Opt_Headrotation,
st_ivas->hSetOfHRTF,
st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
{
return error;
}
+
st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;
-#else
- ivas_crend_open( st_ivas );
-#endif
}
}
+ /* switching from Discrete ISM to ParamISM */
if ( st_ivas->ism_mode == ISM_MODE_PARAM && last_ism_mode == ISM_MODE_DISC )
{
- /* switching from Discrete ISM to ParamISM */
-
/* Allocate and initialize the ParamISM struct */
- ivas_param_ism_dec_open( st_ivas );
+ if ( ( error = ivas_param_ism_dec_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL )
{
/* open the parametric binaural renderer */
- ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin );
- ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin );
+ if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* Close the TD Binaural renderer */
if ( st_ivas->hBinRendererTd != NULL )
@@ -162,7 +206,7 @@ static ivas_error ivas_ism_bitrate_switching(
ivas_td_binaural_close( &st_ivas->hBinRendererTd );
}
- if ( st_ivas->hHrtfTD != NULL )
+ if ( st_ivas->hHrtfTD != NULL ) // VE: this looks suspicious
{
st_ivas->hHrtfTD = NULL;
}
@@ -180,20 +224,18 @@ static ivas_error ivas_ism_bitrate_switching(
if ( st_ivas->hOutSetup.output_config == AUDIO_CONFIG_BINAURAL_ROOM )
{
/* open the parametric binaural renderer */
- ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin );
- ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin );
-
- /* close the crend binaural renderer */
-#ifdef FIX_197_CREND_INTERFACE
- ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );
-#else
- ivas_crend_close( st_ivas );
+ if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
- if ( st_ivas->hHrtf != NULL )
+ if ( ( error = ivas_dirac_dec_init_binaural_data( st_ivas, st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )
{
- st_ivas->hHrtf = NULL;
+ return error;
}
-#endif
+
+ /* close the crend binaural renderer */
+ ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );
}
}
@@ -208,14 +250,22 @@ static ivas_error ivas_ism_bitrate_switching(
* - reconfigure the ISM format decoder
*-------------------------------------------------------------------------*/
-/*! r : ISM format mode */
ivas_error ivas_ism_dec_config(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const int16_t num_obj /* i : number of objects in the bitstream */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+#ifdef DISCRETE_ISM_DTX_CNG
+ ,
+ const ISM_MODE last_ism_mode /* i/o: last ISM mode */
+#endif
+#ifndef NCHAN_ISM_PARAMETER
+ ,
+ const int16_t num_obj /* i : number of objects in the bitstream */
+#endif
)
{
int32_t ivas_total_brate;
+#ifndef DISCRETE_ISM_DTX_CNG
ISM_MODE last_ism_mode;
+#endif
ivas_error error;
int16_t nchan_transport_old;
@@ -223,11 +273,17 @@ ivas_error ivas_ism_dec_config(
ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
+#ifndef DISCRETE_ISM_DTX_CNG
/* store last frame ISM mode */
last_ism_mode = st_ivas->ism_mode;
+#endif
/* Assumes that num of input objects are constant */
+#ifdef NCHAN_ISM_PARAMETER
+ nchan_transport_old = st_ivas->nchan_ism;
+#else
nchan_transport_old = num_obj;
+#endif
if ( last_ism_mode == ISM_MODE_PARAM )
{
@@ -237,45 +293,103 @@ ivas_error ivas_ism_dec_config(
if ( !st_ivas->bfi && ivas_total_brate != IVAS_SID_5k2 && ivas_total_brate != FRAME_NO_DATA )
{
/* select ISM format mode */
+#ifdef NCHAN_ISM_PARAMETER
+ st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->nchan_ism, ivas_total_brate );
+
+ st_ivas->nchan_transport = st_ivas->nchan_ism;
+#else
st_ivas->ism_mode = ivas_ism_mode_select( num_obj, ivas_total_brate );
st_ivas->nchan_transport = num_obj;
+#endif
if ( st_ivas->ism_mode == ISM_MODE_PARAM )
{
- st_ivas->nchan_transport = 2;
+ st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE;
if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )
{
+#ifdef NCHAN_ISM_PARAMETER
+ st_ivas->hDecoderConfig->nchan_out = st_ivas->nchan_ism;
+#else
st_ivas->hDecoderConfig->nchan_out = num_obj;
+#endif
}
}
if ( st_ivas->ini_active_frame != 0 )
{
/* ISM bit-rate switching */
+#ifndef DISCRETE_ISM_DTX_CNG
if ( st_ivas->hDecoderConfig->last_ivas_total_brate != IVAS_SID_5k2 && st_ivas->hDecoderConfig->last_ivas_total_brate != FRAME_NO_DATA )
+#endif
{
if ( ( st_ivas->ism_mode != last_ism_mode ) || ( st_ivas->hDecoderConfig->ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate ) )
{
- ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, num_obj );
+#ifdef NCHAN_ISM_PARAMETER
+ if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK )
+#else
+ if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, num_obj ) ) != IVAS_ERR_OK )
+#endif
+ {
+ return error;
+ }
}
}
}
}
else if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 )
{
-#ifdef PARAM_ISM_DTX_CNG
+#ifdef DISCRETE_ISM_DTX_CNG
+#ifdef NCHAN_ISM_PARAMETER
+ st_ivas->nchan_transport = st_ivas->nchan_ism;
+#else
+ st_ivas->nchan_transport = num_obj;
+#endif
+ if ( st_ivas->ism_mode == ISM_MODE_PARAM )
+ {
+ st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE;
+ if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )
+ {
+#ifdef NCHAN_ISM_PARAMETER
+ st_ivas->hDecoderConfig->nchan_out = st_ivas->nchan_ism;
+#else
+ st_ivas->hDecoderConfig->nchan_out = num_obj;
+#endif
+ }
+ }
+
+ /* ISM mode switching */
+ if ( st_ivas->ism_mode != last_ism_mode )
+ {
+#ifdef NCHAN_ISM_PARAMETER
+ if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode ) ) != IVAS_ERR_OK )
+#else
+ if ( ( error = ivas_ism_bitrate_switching( st_ivas, nchan_transport_old, last_ism_mode, num_obj ) ) != IVAS_ERR_OK )
+#endif
+ {
+ return error;
+ }
+ }
+#else
if ( last_ism_mode == ISM_MODE_PARAM )
{
nchan_transport_old = MAX_PARAM_ISM_WAVE;
}
else
-#endif
{
+#ifdef NCHAN_ISM_PARAMETER
+ st_ivas->nchan_transport = st_ivas->nchan_ism;
+#else
st_ivas->nchan_transport = num_obj;
+#endif
}
+#endif
}
+#ifdef NCHAN_ISM_PARAMETER
+ switch ( st_ivas->nchan_ism )
+#else
switch ( num_obj )
+#endif
{
case 1:
st_ivas->transport_config = AUDIO_CONFIG_ISM1;
diff --git a/lib_dec/ivas_ism_dtx_dec.c b/lib_dec/ivas_ism_dtx_dec.c
index bd15569f9e26884d2b51cdf78a6ed8909e27b759..ef52c082b7330adf6f3b478ca4f0d98f8ef314a1 100644
--- a/lib_dec/ivas_ism_dtx_dec.c
+++ b/lib_dec/ivas_ism_dtx_dec.c
@@ -40,7 +40,6 @@
#include "wmc_auto.h"
-#ifdef PARAM_ISM_DTX_CNG
/*-------------------------------------------------------------------*
* ivas_ism_preprocessing()
*
@@ -52,19 +51,24 @@ static void ivas_ism_preprocessing(
const int16_t sce_id /* i : SCE # identifier */
)
{
+#ifndef DISCRETE_ISM_DTX_CNG
int32_t ivas_total_brate;
- SCE_DEC_HANDLE hSCE;
+#endif
Decoder_State *st;
- hSCE = st_ivas->hSCE[sce_id];
- st = hSCE->hCoreCoder[0];
+ st = st_ivas->hSCE[sce_id]->hCoreCoder[0];
+#ifndef DISCRETE_ISM_DTX_CNG
ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
if ( ( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) )
+#endif
{
- /* reset the bitstream to atleast read the cng type and bandwidth for non transmitted SCE */
+ /* reset the bitstream to at least read the cng type and bandwidth for non transmitted SCE */
st->bit_stream = st_ivas->hSCE[0]->hCoreCoder[0]->bit_stream;
+#ifdef DISCRETE_ISM_DTX_CNG
+ st->next_bit_pos = 0; /* note: needed in paramISM -> discISM switching */
+#endif
if ( sce_id == st_ivas->hISMDTX.sce_id_dtx )
{
@@ -75,12 +79,14 @@ static void ivas_ism_preprocessing(
st->read_sid_info = 0; /* do not read the sid info from bitstream but use the estimated noise */
}
- st->cng_paramISM_flag = 1;
+ st->cng_ism_flag = 1;
}
+#ifndef DISCRETE_ISM_DTX_CNG
else
{
- st->cng_paramISM_flag = 0;
+ st->cng_ism_flag = 0;
}
+#endif
return;
}
@@ -97,77 +103,168 @@ ivas_error ivas_ism_dtx_dec(
int16_t *nb_bits_metadata /* o : number of metadata bits */
)
{
- int16_t ch, pos, num_obj, num_obj_prev;
+ int16_t ch, pos, nchan_ism, nchan_ism_prev;
int32_t ivas_total_brate;
+#ifdef DISCRETE_ISM_DTX_CNG
+ int16_t md_diff_flag[MAX_NUM_OBJECTS];
+ int16_t idx, flag_noisy_speech, sce_id_dtx;
+ ISM_MODE last_ism_mode, ism_mode_bstr;
+ ivas_error error;
+#endif
ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
+#ifndef DISCRETE_ISM_DTX_CNG
if ( st_ivas->nchan_transport == 1 )
{
nb_bits_metadata[0] = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC;
return IVAS_ERR_OK;
}
+#endif
+#ifdef NCHAN_ISM_PARAMETER
+ nchan_ism_prev = st_ivas->nchan_ism;
+#else
if ( st_ivas->ism_mode == ISM_MODE_PARAM )
{
- num_obj_prev = st_ivas->hDirAC->hParamIsm->num_obj;
+ nchan_ism_prev = st_ivas->hDirAC->hParamIsm->num_obj;
}
else /* ism_mode == ISM_MODE_DISC */
{
- num_obj_prev = st_ivas->nchan_transport;
+ nchan_ism_prev = st_ivas->nchan_transport;
}
+#endif
- /* read number of objects */
if ( !st_ivas->bfi && ivas_total_brate == IVAS_SID_5k2 )
{
- num_obj = 1;
+ /* read number of objects */
+ nchan_ism = 1;
pos = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC ) - 1 - SID_FORMAT_NBITS );
- while ( get_indice( st_ivas->hSCE[0]->hCoreCoder[0], pos, 1 ) == 1 && num_obj < MAX_NUM_OBJECTS )
+ while ( get_indice( st_ivas->hSCE[0]->hCoreCoder[0], pos, 1 ) == 1 && nchan_ism < MAX_NUM_OBJECTS )
{
- ( num_obj )++;
+ ( nchan_ism )++;
pos--;
}
+#ifdef NCHAN_ISM_PARAMETER
+ st_ivas->nchan_ism = nchan_ism;
+#endif
+#ifdef DISCRETE_ISM_DTX_CNG
+ pos--;
+#endif
- if ( num_obj != num_obj_prev )
+ if ( nchan_ism != nchan_ism_prev )
{
/* IVAS_fmToDo: more work needed when the number of transported objects is not constant */
return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "wrong number of objects signalled!" );
}
- ivas_ism_dec_config( st_ivas, num_obj );
+#ifdef DISCRETE_ISM_DTX_CNG
+ last_ism_mode = st_ivas->ism_mode;
+
+ /* read ism_mode */
+ if ( nchan_ism > 2 )
+ {
+ pos -= nchan_ism; /* SID metadata flags */
+
+ idx = get_indice( st_ivas->hSCE[0]->hCoreCoder[0], pos, 1 );
+ ism_mode_bstr = (ISM_MODE) ( idx + 1 );
+ st_ivas->ism_mode = ism_mode_bstr;
+ }
+
+#ifdef NCHAN_ISM_PARAMETER
+ if ( ( error = ivas_ism_dec_config( st_ivas, last_ism_mode ) ) != IVAS_ERR_OK )
+#else
+ if ( ( error = ivas_ism_dec_config( st_ivas, last_ism_mode, nchan_ism ) ) != IVAS_ERR_OK )
+#endif
+ {
+ return error;
+ }
+#else
+#ifdef NCHAN_ISM_PARAMETER
+ ivas_ism_dec_config( st_ivas );
+#else
+ ivas_ism_dec_config( st_ivas, nchan_ism );
+#endif
if ( st_ivas->ism_mode == ISM_MODE_PARAM )
{
- st_ivas->hDirAC->hParamIsm->num_obj = num_obj;
+#ifdef NCHAN_ISM_PARAMETER
+ st_ivas->nchan_transport = 2;
+#else
+ st_ivas->hDirAC->hParamIsm->num_obj = nchan_ism;
+#endif
}
else /* ism_mode == ISM_MODE_DISC */
{
- st_ivas->nchan_transport = num_obj;
+ st_ivas->nchan_transport = nchan_ism;
}
+#endif
}
else
{
- num_obj = num_obj_prev;
+ nchan_ism = nchan_ism_prev;
}
/* Metadata decoding and dequantization */
+#ifdef DISCRETE_ISM_DTX_CNG
+ ivas_ism_metadata_sid_dec( st_ivas->hSCE, ivas_total_brate, st_ivas->bfi, nchan_ism, st_ivas->nchan_transport, st_ivas->ism_mode,
+ &flag_noisy_speech, &sce_id_dtx, st_ivas->hIsmMetaData, nb_bits_metadata );
+
+ if ( ivas_total_brate == IVAS_SID_5k2 && !st_ivas->bfi )
+ {
+ if ( st_ivas->hDirAC != NULL )
+ {
+ st_ivas->hDirAC->hParamIsm->flag_noisy_speech = flag_noisy_speech;
+ }
+
+ st_ivas->hISMDTX.sce_id_dtx = sce_id_dtx;
+ }
+#else
ivas_param_ism_metadata_dtx_dec( st_ivas );
+#endif
+
+#ifdef DISCRETE_ISM_DTX_CNG
+ set_s( md_diff_flag, 1, nchan_ism );
- for ( ch = 0; ch < st_ivas->nchan_transport; ch++ )
+ if ( st_ivas->ism_mode == ISM_MODE_PARAM )
{
- nb_bits_metadata[ch] = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC;
+ for ( ch = 0; ch < nchan_ism; ch++ )
+ {
+ st_ivas->hDirAC->azimuth_values[ch] = st_ivas->hIsmMetaData[ch]->azimuth;
+ st_ivas->hDirAC->elevation_values[ch] = st_ivas->hIsmMetaData[ch]->elevation;
+ }
}
+ update_last_metadata( nchan_ism, st_ivas->hIsmMetaData, md_diff_flag );
+
+ st_ivas->hISMDTX.ism_dtx_hangover_cnt = 0;
+#endif
+
+ if ( ivas_total_brate == IVAS_SID_5k2 && !st_ivas->bfi )
+ {
+ for ( ch = 0; ch < st_ivas->nchan_transport; ch++ )
+ {
+#ifdef DISCRETE_ISM_DTX_CNG
+ nb_bits_metadata[ch] = nb_bits_metadata[sce_id_dtx];
+#else
+ nb_bits_metadata[ch] = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC;
+#endif
+ }
+ }
+
+#ifdef DISCRETE_ISM_DTX_CNG
+ if ( !st_ivas->bfi )
+#else
if ( st_ivas->ism_mode == ISM_MODE_PARAM )
+#endif
{
for ( ch = 0; ch < st_ivas->nchan_transport; ch++ )
{
- ivas_ism_preprocessing( st_ivas, ch );
+ ivas_ism_preprocessing( st_ivas, ch ); // VE: after the acceptance of switches, replace the function call by its content
}
}
return IVAS_ERR_OK;
}
-#endif
diff --git a/lib_dec/ivas_ism_metadata_dec.c b/lib_dec/ivas_ism_metadata_dec.c
index 4bb56b0b8256fb4df2ad5438af39cff8b8274de6..1cc7028c55ceeaec5c7c39c273a70f8c317f9493 100644
--- a/lib_dec/ivas_ism_metadata_dec.c
+++ b/lib_dec/ivas_ism_metadata_dec.c
@@ -37,47 +37,173 @@
#include "ivas_rom_com.h"
#include "prot.h"
#include "ivas_stat_enc.h"
+#ifdef DISCRETE_ISM_DTX_CNG
+#include
+#endif
#ifdef DEBUGGING
#include "debug.h"
#endif
#include "wmc_auto.h"
+/*-----------------------------------------------------------------------*
+ * Local functions
+ *-----------------------------------------------------------------------*/
+
+static void decode_angle_indices( DEC_CORE_HANDLE st0, ISM_METADATA_ANGLE_HANDLE angle, int16_t *flag_abs_azimuth );
+
+static int16_t decode_radius( DEC_CORE_HANDLE st0, int16_t *last_radius_idx, int16_t *flag_abs_radius );
+
+#ifdef DISCRETE_ISM_DTX_CNG
+/*-------------------------------------------------------------------------*
+ * Local constants
+ *-------------------------------------------------------------------------*/
+
+#define IVAS_ISM_DTX_HO_MAX 5
+
+#define CNG_MD_MAX_DIFF_AZIMUTH 5
+#define CNG_MD_MAX_DIFF_ELEVATION 5
+
+
+/*-------------------------------------------------------------------*
+ * ism_metadata_smooth()
+ *
+ * Smooth the metadata evolution
+ *-------------------------------------------------------------------*/
+
+static void ism_metadata_smooth(
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ const int32_t ism_total_brate, /* i : ISms total bitrate */
+ const int16_t nchan_ism /* i : number of objects */
+)
+{
+ ISM_METADATA_HANDLE hIsmMetaData;
+ int16_t ch;
+ float diff;
+
+ for ( ch = 0; ch < nchan_ism; ch++ )
+ {
+ hIsmMetaData = hIsmMeta[ch];
+
+ /* smooth azimuth */
+ diff = hIsmMetaData->last_true_azimuth - hIsmMetaData->last_azimuth;
+
+ if ( diff > ISM_AZIMUTH_MAX )
+ {
+ diff -= ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN );
+ hIsmMetaData->last_azimuth += ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN );
+ }
+ else if ( diff < ISM_AZIMUTH_MIN )
+ {
+ diff += ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN );
+ }
+
+ if ( ism_total_brate > IVAS_SID_5k2 && fabsf( diff ) > IVAS_ISM_DTX_HO_MAX * CNG_MD_MAX_DIFF_AZIMUTH )
+ {
+ /* skip the smoothing */
+ }
+ else if ( fabsf( diff ) > CNG_MD_MAX_DIFF_AZIMUTH )
+ {
+ hIsmMetaData->azimuth = hIsmMetaData->last_azimuth + sign( diff ) * CNG_MD_MAX_DIFF_AZIMUTH;
+ }
+ else if ( diff != 0 )
+ {
+ hIsmMetaData->azimuth = hIsmMetaData->last_true_azimuth;
+ }
+
+ if ( hIsmMetaData->azimuth > ISM_AZIMUTH_MAX )
+ {
+ hIsmMetaData->azimuth -= ( ISM_AZIMUTH_MAX - ISM_AZIMUTH_MIN );
+ }
+
+ /* smooth elevation */
+ diff = hIsmMetaData->last_true_elevation - hIsmMetaData->last_elevation;
+
+ if ( ism_total_brate > IVAS_SID_5k2 && diff > IVAS_ISM_DTX_HO_MAX * CNG_MD_MAX_DIFF_ELEVATION )
+ {
+ /* skip the smoothing */
+ }
+ else if ( fabsf( diff ) > CNG_MD_MAX_DIFF_ELEVATION )
+ {
+ hIsmMetaData->elevation = hIsmMetaData->last_elevation + sign( diff ) * CNG_MD_MAX_DIFF_ELEVATION;
+ }
+ }
+
+ return;
+}
+#endif
+
+
/*-------------------------------------------------------------------------*
* ivas_ism_metadata_dec()
*
- * decode and dequantize ISm metadata
+ * decode and dequantize ISM metadata
*-------------------------------------------------------------------------*/
ivas_error ivas_ism_metadata_dec(
- const int32_t ism_total_brate, /* i : ISms total bitrate */
- int16_t *nchan_transport, /* o : number of transport channels */
- ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
- SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder handles */
- const int16_t bfi, /* i : bfi flag */
- int16_t nb_bits_metadata[], /* o : number of metadata bits */
- ISM_MODE ism_mode, /* i : ISM mode */
+ const int32_t ism_total_brate, /* i : ISM total bitrate */
+#ifdef NCHAN_ISM_PARAMETER
+ const int16_t nchan_ism, /* i : number of ISM channels */
+#endif
+ int16_t *nchan_transport, /* o : number of transport channels */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder handles */
+ const int16_t bfi, /* i : bfi flag */
+ int16_t nb_bits_metadata[], /* o : number of metadata bits */
+ ISM_MODE ism_mode, /* i : ISM mode */
+#ifdef DISCRETE_ISM_DTX_CNG
+ ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */
+#endif
+#ifdef FIX_379_EXT_METADATA
+ const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
+ int16_t *ism_extmeta_active, /* i/o: Extended metadata active in renderer*/
+ int16_t *ism_extmeta_cnt /* i/o: Number of change frames observed*/
+#else
const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Config Handle */
+#endif
)
{
- int16_t ch, nb_bits_start = 0, last_bit_pos, sgn, diff;
+ int16_t ch, nb_bits_start = 0, last_bit_pos;
+ int16_t idx_radius;
int32_t element_brate[MAX_NUM_OBJECTS], total_brate[MAX_NUM_OBJECTS];
DEC_CORE_HANDLE st0;
- int16_t idx_azimuth, nbits_diff_azimuth, flag_abs_azimuth;
- int16_t idx_elevation, nbits_diff_elevation;
+#ifdef FIX_379_EXT_METADATA
+ int16_t ism_extmeta_bitstream;
+ float yaw, pitch, radius;
+#else
+ int16_t ism_extended_metadata_flag;
+#endif
+ int16_t flag_abs_radius;
+ int16_t flag_abs_orientation;
+#ifdef FIX_379_ANGLE
+ int16_t flag_abs_position;
+ int16_t idx_angle1;
+ int16_t idx_angle2;
+#else
+ int16_t idx_azimuth, flag_abs_azimuth;
+ int16_t idx_elevation;
+#endif
int16_t next_bit_pos_orig;
uint16_t i, bstr_meta[MAX_BITS_METADATA], *bstr_orig;
ISM_METADATA_HANDLE hIsmMetaData;
int16_t nchan_transport_prev, ism_metadata_flag_global;
int16_t localVAD[MAX_NUM_OBJECTS];
int16_t ism_imp[MAX_NUM_OBJECTS];
- int16_t num_obj = 0, nbands, nblocks;
+#ifdef NCHAN_ISM_PARAMETER
+ int16_t nbands, nblocks;
+#else
+ int16_t nchan_ism = 0, nbands, nblocks;
+#endif
+#ifdef DISCRETE_ISM_DTX_CNG
+ int16_t md_diff_flag[MAX_NUM_OBJECTS];
+#endif
+#ifdef MASA_AND_OBJECTS
ivas_error error;
-
- error = IVAS_ERR_OK;
+#endif
push_wmops( "ism_meta_dec" );
+#ifndef DISCRETE_ISM_DTX_CNG
if ( ism_total_brate == IVAS_SID_5k2 || ism_total_brate == FRAME_NO_DATA )
{
/* no metadata decoding in CNG */
@@ -98,8 +224,9 @@ ivas_error ivas_ism_metadata_dec(
#endif
pop_wmops();
- return error;
+ return IVAS_ERR_OK;
}
+#endif
/* initialization */
st0 = hSCE[0]->hCoreCoder[0];
@@ -110,6 +237,11 @@ ivas_error ivas_ism_metadata_dec(
bstr_orig = st0->bit_stream;
next_bit_pos_orig = st0->next_bit_pos;
st0->next_bit_pos = 0;
+#ifdef FIX_379_EXT_METADATA
+ ism_extmeta_bitstream = 0;
+#else
+ ism_extended_metadata_flag = 0;
+#endif
/* reverse the bitstream for easier reading of indices */
for ( i = 0; i < min( MAX_BITS_METADATA, last_bit_pos ); i++ )
@@ -122,41 +254,42 @@ ivas_error ivas_ism_metadata_dec(
if ( !bfi )
{
/*----------------------------------------------------------------*
- * Read ISm common signaling
+ * Read ISM common signaling
*----------------------------------------------------------------*/
- /* read number of objects */
#ifdef MASA_AND_OBJECTS
#ifdef OMASA_UPDATES
if ( ism_mode != ISM_MASA_MODE_DISC && ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ )
#else
if ( ism_mode != ISM_MASA_MODE_DISC )
#endif
- {
#endif
- num_obj = 1;
- while ( get_next_indice( st0, 1 ) == 1 && num_obj < MAX_NUM_OBJECTS )
+ {
+#ifdef NCHAN_ISM_PARAMETER
+ /* number of objects was read in ivas_dec_setup() */
+ st0->next_bit_pos += nchan_ism;
+#else
+ nchan_ism = 1;
+ while ( get_next_indice( st0, 1 ) == 1 && nchan_ism < MAX_NUM_OBJECTS )
{
- ( num_obj )++;
+ ( nchan_ism )++;
}
- ism_mode = ivas_ism_mode_select( num_obj, ism_total_brate );
-#ifdef MASA_AND_OBJECTS
- }
- else
- {
- num_obj = *nchan_transport;
- }
-
#endif
+ ism_mode = ivas_ism_mode_select( nchan_ism, ism_total_brate );
+ }
if ( ism_mode == ISM_MODE_PARAM )
{
- hParamIsm->num_obj = num_obj;
+#ifdef NCHAN_ISM_PARAMETER
+ *nchan_transport = MAX_PARAM_ISM_WAVE;
+#else
+ hParamIsm->num_obj = nchan_ism;
+#endif
}
else if ( ism_mode == ISM_MODE_DISC )
{
- *nchan_transport = num_obj;
+ *nchan_transport = nchan_ism;
}
if ( *nchan_transport != nchan_transport_prev )
@@ -165,7 +298,38 @@ ivas_error ivas_ism_metadata_dec(
return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "wrong number of objects signalled!" );
}
- /* Read ISm present flags (one per object) */
+ /* read extended metadata presence flag */
+#ifdef FIX_TD5_IN_OMASA
+ if ( ism_mode == ISM_MODE_DISC && ism_total_brate >= ISM_EXTENDED_METADATA_BRATE )
+#else
+ if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE )
+#endif
+ {
+#ifdef FIX_379_EXT_METADATA
+ ism_extmeta_bitstream = get_next_indice( st0, ISM_EXTENDED_METADATA_BITS );
+#else
+ ism_extended_metadata_flag = get_next_indice( st0, ISM_EXTENDED_METADATA_BITS );
+#endif
+ }
+#ifdef FIX_379_EXT_METADATA
+ /* Apply hysteresis in case rate switching causes fluctuation in presence of extended metadata */
+ if ( *ism_extmeta_active == -1 || *ism_extmeta_active == ism_extmeta_bitstream ) /* If first frame or bitstream matches internal state */
+ {
+ *ism_extmeta_active = ism_extmeta_bitstream;
+ *ism_extmeta_cnt = 0;
+ }
+ else
+ {
+ ( *ism_extmeta_cnt )++;
+ if ( *ism_extmeta_cnt == ISM_METADATA_RS_MAX_FRAMES ) /* ISM_METADATA_RS_MAX_FRAMES change frames observed - update state */
+ {
+ *ism_extmeta_active = ism_extmeta_bitstream;
+ *ism_extmeta_cnt = 0;
+ }
+ }
+#endif
+
+ /* Read ISM present flags (one per object) */
for ( ch = 0; ch < *nchan_transport; ch++ )
{
#ifdef MASA_AND_OBJECTS
@@ -196,7 +360,7 @@ ivas_error ivas_ism_metadata_dec(
ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag;
}
- for ( ; ch < num_obj; ch++ )
+ for ( ; ch < nchan_ism; ch++ )
{
hIsmMeta[ch]->ism_metadata_flag = 1;
ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag;
@@ -232,8 +396,8 @@ ivas_error ivas_ism_metadata_dec(
if ( ism_metadata_flag_global )
{
/*----------------------------------------------------------------*
- * Metadata decoding and dequantization, loop over all objects
- *----------------------------------------------------------------*/
+ * Metadata decoding and dequantization, loop over all objects
+ *----------------------------------------------------------------*/
int16_t total_bits_metadata = 0, bits_metadata_ism = 0;
int16_t nb_bits_objcod_read;
@@ -243,7 +407,7 @@ ivas_error ivas_ism_metadata_dec(
nb_bits_start = st0->next_bit_pos;
}
- for ( ch = 0; ch < num_obj; ch++ )
+ for ( ch = 0; ch < nchan_ism; ch++ )
{
hIsmMetaData = hIsmMeta[ch];
#ifdef MASA_AND_OBJECTS
@@ -258,159 +422,109 @@ ivas_error ivas_ism_metadata_dec(
{
nb_bits_start = st0->next_bit_pos;
}
-
+#ifdef FIX_379_ANGLE
+ flag_abs_position = 0;
+#else
flag_abs_azimuth = 0;
+#endif
+ flag_abs_orientation = 0;
+ flag_abs_radius = 0;
if ( hIsmMeta[ch]->ism_metadata_flag )
{
- /*----------------------------------------------------------------*
- * Azimuth decoding and dequantization
- *----------------------------------------------------------------*/
-
- /* Decode azimuth index */
- if ( get_next_indice( st0, 1 ) == 1 ) /* azimuth_abs_flag */
- {
- idx_azimuth = get_next_indice( st0, ISM_AZIMUTH_NBITS );
- flag_abs_azimuth = 1;
- }
- else
- {
- diff = 0;
- sgn = 1;
-
- if ( get_next_indice( st0, 1 ) == 0 )
- {
- nbits_diff_azimuth = 1;
- }
- else
- {
- nbits_diff_azimuth = 1;
-
- if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */
- {
- sgn = -1;
- }
-
- nbits_diff_azimuth++;
-
- /* read until the stop bit */
- while ( ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 ) && ( get_next_indice( st0, 1 ) == 1 ) )
- {
- diff++;
- nbits_diff_azimuth++;
- }
-
- if ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 )
- {
- /* count stop bit */
- nbits_diff_azimuth++;
- }
- }
-
- idx_azimuth = hIsmMetaData->last_azimuth_idx + sgn * diff;
- }
-
- /* azimuth is on a circle - check for diff coding for -180° -> 180° and vice versa changes */
- if ( idx_azimuth > ( 1 << ISM_AZIMUTH_NBITS ) - 1 )
- {
- idx_azimuth -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* +180° -> -180° */
- }
- else if ( idx_azimuth < 0 )
- {
- idx_azimuth += ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* -180° -> +180° */
- }
-
- /* +180° == -180° */
- if ( idx_azimuth == ( 1 << ISM_AZIMUTH_NBITS ) - 1 )
- {
- idx_azimuth = 0;
- }
-
- /* sanity check in case of FER or BER */
- if ( idx_azimuth < 0 || idx_azimuth > ( 1 << ISM_AZIMUTH_NBITS ) - 1 )
- {
- idx_azimuth = hIsmMetaData->last_azimuth_idx;
- }
-
- /* Azimuth dequantization */
+#ifdef FIX_379_ANGLE
+ decode_angle_indices( st0, &( hIsmMetaData->position_angle ), &flag_abs_position );
+ idx_angle1 = hIsmMetaData->position_angle.last_angle1_idx;
+ idx_angle2 = hIsmMetaData->position_angle.last_angle2_idx;
+#else
+ decode_angle_indices( st0, &( hIsmMetaData->angle[0] ), &flag_abs_azimuth );
+ idx_azimuth = hIsmMetaData->angle[0].last_azimuth_idx;
+ idx_elevation = hIsmMetaData->angle[0].last_elevation_idx;
+#endif
+ /* Azimuth/Elevation dequantization */
if ( ism_mode == ISM_MODE_PARAM )
{
+#ifdef FIX_379_ANGLE
+ hParamIsm->azi_index[ch] = idx_angle1;
+ hParamIsm->ele_index[ch] = idx_angle2;
+#else
hParamIsm->azi_index[ch] = idx_azimuth;
+ hParamIsm->ele_index[ch] = idx_elevation;
+#endif
}
else /* ISM_MODE_DISC */
{
- hIsmMetaData->azimuth = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS );
- }
-
- /*----------------------------------------------------------------*
- * Elevation decoding and dequantization
- *----------------------------------------------------------------*/
-
- /* Decode elevation index */
- if ( flag_abs_azimuth == 0 && get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */
- {
- idx_elevation = get_next_indice( st0, ISM_ELEVATION_NBITS );
- }
- else
- {
- diff = 0;
- sgn = 1;
+#ifdef FIX_379_ANGLE
+ hIsmMetaData->azimuth = ism_dequant_meta( idx_angle1, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS );
+ hIsmMetaData->elevation = ism_dequant_meta( idx_angle2, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS );
+#else
+ hIsmMetaData->azimuth = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS );
+ hIsmMetaData->elevation = ism_dequant_meta( idx_elevation, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS );
+#endif
- if ( get_next_indice( st0, 1 ) == 0 )
- {
- nbits_diff_elevation = 1;
- }
- else
+ /* radius/raw/pitch dequantization */
+#ifdef FIX_379_EXT_METADATA
+ if ( ism_extmeta_bitstream )
+#else
+ if ( ism_extended_metadata_flag )
+#endif
{
- nbits_diff_elevation = 1;
-
- if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */
- {
- sgn = -1;
- }
-
- nbits_diff_elevation++;
+#ifdef FIX_379_ANGLE
+ decode_angle_indices( st0, &( hIsmMetaData->orientation_angle ), &flag_abs_orientation );
+ idx_angle1 = hIsmMetaData->orientation_angle.last_angle1_idx;
+ idx_angle2 = hIsmMetaData->orientation_angle.last_angle2_idx;
+#else
+ decode_angle_indices( st0, &( hIsmMetaData->angle[1] ), &flag_abs_orientation );
+ idx_azimuth = hIsmMetaData->angle[1].last_azimuth_idx;
+ idx_elevation = hIsmMetaData->angle[1].last_elevation_idx;
+#endif
+#ifdef FIX_379_EXT_METADATA
+#ifdef FIX_379_ANGLE
+ yaw = ism_dequant_meta( idx_angle1, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS );
+ pitch = ism_dequant_meta( idx_angle2, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS );
+#else
+ yaw = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS );
+ pitch = ism_dequant_meta( idx_elevation, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS );
+#endif
+#else
+ hIsmMetaData->yaw = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS );
+ hIsmMetaData->pitch = ism_dequant_meta( idx_elevation, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS );
+#endif
- /* read until the stop bit */
- while ( ( nbits_diff_elevation < ISM_ELEVATION_NBITS ) && ( get_next_indice( st0, 1 ) == 1 ) )
+ idx_radius = decode_radius( st0, &hIsmMetaData->last_radius_idx, &flag_abs_radius );
+#ifdef FIX_379_EXT_METADATA
+ radius = usdequant( idx_radius, ISM_RADIUS_MIN, ISM_RADIUS_DELTA );
+#else
+ hIsmMetaData->radius = usdequant( idx_radius, ISM_RADIUS_MIN, ISM_RADIUS_DELTA );
+#endif
+#ifdef FIX_379_EXT_METADATA
+ if ( *ism_extmeta_active == 1 )
{
- diff++;
- nbits_diff_elevation++;
+ hIsmMetaData->yaw = yaw;
+ hIsmMetaData->pitch = pitch;
+ hIsmMetaData->radius = radius;
}
-
- if ( nbits_diff_elevation < ISM_ELEVATION_NBITS )
+#endif
+ }
+ else
+ {
+#ifdef FIX_379_EXT_METADATA
+ if ( *ism_extmeta_active == 0 )
{
- /* count stop bit */
- nbits_diff_elevation++;
+ hIsmMetaData->yaw = 0.0f;
+ hIsmMetaData->pitch = 0.0f;
+ hIsmMetaData->radius = 1.0f;
}
+#else
+ hIsmMetaData->radius = 1.0f;
+#endif
}
-
- idx_elevation = hIsmMetaData->last_elevation_idx + sgn * diff;
- }
-
- /* sanity check in case of FER or BER */
- if ( idx_elevation < 0 || idx_elevation > ( 1 << ISM_ELEVATION_NBITS ) - 1 )
- {
- idx_elevation = hIsmMetaData->last_elevation_idx;
- }
-
- /* Elevation dequantization */
- if ( ism_mode == ISM_MODE_PARAM )
- {
- hParamIsm->ele_index[ch] = idx_elevation;
- }
- else /* ISM_MODE_DISC */
- {
- hIsmMetaData->elevation = ism_dequant_meta( idx_elevation, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS );
}
-
- /*----------------------------------------------------------------*
- * Final updates
- *----------------------------------------------------------------*/
-
- /* updates */
- hIsmMetaData->last_azimuth_idx = idx_azimuth;
- hIsmMetaData->last_elevation_idx = idx_elevation;
+#ifdef DISCRETE_ISM_DTX_CNG
+ /* save for smoothing metadata evolution */
+ hIsmMetaData->last_true_azimuth = hIsmMetaData->azimuth;
+ hIsmMetaData->last_true_elevation = hIsmMetaData->elevation;
+#endif
}
/* save number of metadata bits read */
@@ -481,12 +595,18 @@ ivas_error ivas_ism_metadata_dec(
}
else /* BFI */
{
- /* "*nISms", "hIsmMeta->azimuth" and "hIsmMeta->elevation" are recycled from the last frame */
- for ( ch = 0; ch < *nchan_transport; ch++ )
+#ifndef NCHAN_ISM_PARAMETER
+ /* "nchan_ism", "hIsmMeta->azimuth" and "hIsmMeta->elevation" are recycled from the last frame */
+ if ( ism_mode == ISM_MODE_PARAM )
+ {
+ nchan_ism = hParamIsm->num_obj;
+ }
+ else if ( ism_mode == ISM_MODE_DISC )
{
- hIsmMeta[ch]->ism_metadata_flag = hIsmMeta[ch]->last_ism_metadata_flag;
+ nchan_ism = *nchan_transport;
}
- for ( ; ch < num_obj; ch++ )
+#endif
+ for ( ch = 0; ch < nchan_ism; ch++ )
{
hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag;
}
@@ -495,20 +615,29 @@ ivas_error ivas_ism_metadata_dec(
if ( ism_mode == ISM_MODE_PARAM )
{
- for ( ch = 0; ch < num_obj; ch++ )
+ for ( ch = 0; ch < nchan_ism; ch++ )
{
hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] + hParamIsm->last_az_sgn[ch] * hParamIsm->last_az_diff[ch];
- /*hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch] % hParamIsm->az_alpha[ch];*/
- hParamIsm->azi_index[ch] = hParamIsm->azi_index[ch];
hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] + hParamIsm->last_el_sgn[ch] * hParamIsm->last_el_diff[ch];
- /*hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch] % hParamIsm->ele_alpha;*/
- hParamIsm->ele_index[ch] = hParamIsm->ele_index[ch];
- hIsmMeta[ch]->last_azimuth_idx = hParamIsm->azi_index[ch];
- hIsmMeta[ch]->last_elevation_idx = hParamIsm->ele_index[ch];
+#ifdef FIX_379_ANGLE
+ hIsmMeta[ch]->position_angle.last_angle1_idx = hParamIsm->azi_index[ch];
+ hIsmMeta[ch]->position_angle.last_angle2_idx = hParamIsm->ele_index[ch];
+#else
+ hIsmMeta[ch]->angle[0].last_azimuth_idx = hParamIsm->azi_index[ch];
+ hIsmMeta[ch]->angle[0].last_elevation_idx = hParamIsm->ele_index[ch];
+#endif
}
}
}
+#ifdef DISCRETE_ISM_DTX_CNG
+ if ( hISMDTX.ism_dtx_hangover_cnt < IVAS_ISM_DTX_HO_MAX )
+ {
+ ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism );
+ hISMDTX.ism_dtx_hangover_cnt += 1;
+ }
+#endif
+
#ifdef MASA_AND_OBJECTS
#ifdef OMASA_UPDATES
if ( ism_mode == ISM_MASA_MODE_DISC || ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
@@ -541,9 +670,18 @@ ivas_error ivas_ism_metadata_dec(
element_brate[ch] = hSCE[ch]->element_brate;
}
}
- ivas_ism_config( ism_total_brate, *nchan_transport, num_obj, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata, masa_ism_flag );
+
+ if ( ( error = ivas_ism_config( ism_total_brate, *nchan_transport, nchan_ism, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata
+#ifdef MASA_AND_OBJECTS
+ ,
+ masa_ism_flag
+#endif
+ ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
#else
- ivas_ism_config( ism_total_brate, *nchan_transport, num_obj, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata );
+ ivas_ism_config( ism_total_brate, *nchan_transport, nchan_ism, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata );
#endif
for ( ch = 0; ch < *nchan_transport; ch++ )
@@ -579,7 +717,7 @@ ivas_error ivas_ism_metadata_dec(
hSCE[ch]->hCoreCoder[0]->total_brate = total_brate[ch];
}
- for ( ; ch < num_obj; ch++ )
+ for ( ; ch < nchan_ism; ch++ )
{
hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag;
}
@@ -588,60 +726,87 @@ ivas_error ivas_ism_metadata_dec(
{
for ( ch = 0; ch < *nchan_transport; ch++ )
{
-
hSCE[ch]->element_brate = hSCE[ch]->last_element_brate;
hSCE[ch]->hCoreCoder[0]->total_brate = hSCE[ch]->hCoreCoder[0]->last_total_brate;
}
}
+ /*----------------------------------------------------------------*
+ * Set bitsream pointers
+ *----------------------------------------------------------------*/
+
/* set the bitstream pointer to its original position */
st0->bit_stream = bstr_orig;
st0->next_bit_pos = next_bit_pos_orig;
- /* set bitstream pointers for each ISm */
+ /* set bitstream pointers for each ISM */
for ( ch = 1; ch < *nchan_transport; ch++ )
{
hSCE[ch]->hCoreCoder[0]->bit_stream = hSCE[ch - 1]->hCoreCoder[0]->bit_stream + ( hSCE[ch - 1]->hCoreCoder[0]->total_brate / FRAMES_PER_SEC );
}
-#ifdef PARAM_ISM_DTX_CNG
+#ifdef DISCRETE_ISM_DTX_CNG
+ /*----------------------------------------------------------------*
+ * Updates
+ *----------------------------------------------------------------*/
+
+ set_s( md_diff_flag, 1, nchan_ism );
+
+ update_last_metadata( nchan_ism, hIsmMeta, md_diff_flag );
+#endif
+
for ( ch = 0; ch < *nchan_transport; ch++ )
{
- hSCE[ch]->hCoreCoder[0]->cng_paramISM_flag = 0;
+ hSCE[ch]->hCoreCoder[0]->cng_ism_flag = 0;
}
-#endif
pop_wmops();
- return error;
+ return IVAS_ERR_OK;
}
/*-------------------------------------------------------------------------
- * create_ism_metadata_dec()
+ * ivas_ism_metadata_dec_create()
*
- * Create, allocate, initialize and configure IVAS decoder ISM handles
+ * Create, allocate, initialize and configure IVAS decoder ISM metadata handles
*-------------------------------------------------------------------------*/
-ivas_error create_ism_metadata_dec(
+ivas_error ivas_ism_metadata_dec_create(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const int16_t n_ISms, /* i : number of objects */
int32_t element_brate_tmp[] /* o : element bitrate per object */
)
{
int16_t ch;
+ ivas_error error;
- /* allocate ISm metadata handles */
+ /* allocate ISM metadata handles */
for ( ch = 0; ch < MAX_NUM_OBJECTS; ch++ )
{
if ( ( st_ivas->hIsmMetaData[ch] = (ISM_METADATA_HANDLE) malloc( sizeof( ISM_METADATA_FRAME ) ) ) == NULL )
{
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISm MetaData\n" ) );
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM MetaData\n" ) );
}
st_ivas->hIsmMetaData[ch]->last_ism_metadata_flag = 0;
- st_ivas->hIsmMetaData[ch]->last_azimuth_idx = 0;
- st_ivas->hIsmMetaData[ch]->last_elevation_idx = 1 << ( ISM_ELEVATION_NBITS - 1 );
+#ifdef FIX_379_ANGLE
+ st_ivas->hIsmMetaData[ch]->position_angle.last_angle1_idx = 0;
+ st_ivas->hIsmMetaData[ch]->position_angle.last_angle2_idx = 1 << ( ISM_ELEVATION_NBITS - 1 );
+ st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle1_idx = 0;
+ st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle2_idx = 1 << ( ISM_ELEVATION_NBITS - 1 );
+#else
+ st_ivas->hIsmMetaData[ch]->angle[0].last_azimuth_idx = 0;
+ st_ivas->hIsmMetaData[ch]->angle[0].last_elevation_idx = 1 << ( ISM_ELEVATION_NBITS - 1 );
+ st_ivas->hIsmMetaData[ch]->angle[1].last_azimuth_idx = 0;
+ st_ivas->hIsmMetaData[ch]->angle[1].last_elevation_idx = 1 << ( ISM_ELEVATION_NBITS - 1 );
+#endif
+ st_ivas->hIsmMetaData[ch]->last_radius_idx = 8; /* Init to radius 1.0 */
+
+#ifdef DISCRETE_ISM_DTX_CNG
+ st_ivas->hIsmMetaData[ch]->last_true_azimuth = 0;
+ st_ivas->hIsmMetaData[ch]->last_true_elevation = 0;
+#endif
#ifdef MASA_AND_OBJECTS
st_ivas->hIsmMetaData[ch]->ism_imp = -1;
@@ -651,13 +816,574 @@ ivas_error create_ism_metadata_dec(
ivas_ism_reset_metadata( st_ivas->hIsmMetaData[ch] );
}
-
- ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, n_ISms, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL
+#ifdef OMASA_BRATE_SW
+ if ( element_brate_tmp != NULL )
+ {
+#endif
+ if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, n_ISms, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL
#ifdef MASA_AND_OBJECTS
- ,
- 0
+ ,
+ 0
+#endif
+ ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+#ifdef OMASA_BRATE_SW
+ }
+#endif
+
+#ifdef DISCRETE_ISM_DTX_CNG
+ st_ivas->hISMDTX.ism_dtx_hangover_cnt = IVAS_ISM_DTX_HO_MAX;
#endif
- );
return IVAS_ERR_OK;
}
+
+
+/*-------------------------------------------------------------------------
+ * decode_angle_indices()
+ *
+ * Decoding of an angle
+ *-------------------------------------------------------------------------*/
+#ifdef FIX_379_ANGLE
+
+static void decode_angle_indices(
+ DEC_CORE_HANDLE st0, /* i/o: bitstream handle */
+ ISM_METADATA_ANGLE_HANDLE angle, /* i/o: angle handle */
+ int16_t *flag_abs_angle1 /* o : Azimuth/yaw encoding mode */
+)
+{
+ int16_t idx_angle1, nbits_diff_angle1, diff, sgn;
+ int16_t idx_angle2, nbits_diff_angle2;
+
+ /*----------------------------------------------------------------*
+ * Azimuth/yaw decoding and dequantization
+ *----------------------------------------------------------------*/
+
+ /* Decode azimuth/yaw index */
+ if ( get_next_indice( st0, 1 ) == 1 ) /* azimuth_abs_flag */
+ {
+ idx_angle1 = get_next_indice( st0, ISM_AZIMUTH_NBITS );
+ *flag_abs_angle1 = 1;
+ }
+ else
+ {
+ diff = 0;
+ sgn = 1;
+
+ if ( get_next_indice( st0, 1 ) == 0 )
+ {
+ nbits_diff_angle1 = 1;
+ }
+ else
+ {
+ nbits_diff_angle1 = 1;
+
+ if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */
+ {
+ sgn = -1;
+ }
+
+ nbits_diff_angle1++;
+
+ /* read until the stop bit */
+ while ( ( nbits_diff_angle1 < ISM_AZIMUTH_NBITS - 1 ) && ( get_next_indice( st0, 1 ) == 1 ) )
+ {
+ diff++;
+ nbits_diff_angle1++;
+ }
+
+ if ( nbits_diff_angle1 < ISM_AZIMUTH_NBITS - 1 )
+ {
+ /* count stop bit */
+ nbits_diff_angle1++;
+ }
+ }
+ idx_angle1 = angle->last_angle1_idx + sgn * diff;
+ }
+
+ /* azimuth/yaw is on a circle - check for diff coding for -180° -> 180° and vice versa changes */
+ if ( idx_angle1 > ( 1 << ISM_AZIMUTH_NBITS ) - 1 )
+ {
+ idx_angle1 -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* +180° -> -180° */
+ }
+ else if ( idx_angle1 < 0 )
+ {
+ idx_angle1 += ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* -180° -> +180° */
+ }
+
+ /* +180° == -180° */
+ if ( idx_angle1 == ( 1 << ISM_AZIMUTH_NBITS ) - 1 )
+ {
+ idx_angle1 = 0;
+ }
+
+ /* sanity check in case of FER or BER */
+ if ( idx_angle1 < 0 || idx_angle1 > ( 1 << ISM_AZIMUTH_NBITS ) - 1 )
+ {
+ idx_angle1 = angle->last_angle1_idx;
+ }
+
+ /*----------------------------------------------------------------*
+ * Elevation/pitch decoding and dequantization
+ *----------------------------------------------------------------*/
+
+ /* Decode elevation/pitch index */
+ if ( *flag_abs_angle1 == 0 && get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */
+ {
+ idx_angle2 = get_next_indice( st0, ISM_ELEVATION_NBITS );
+ }
+ else
+ {
+ diff = 0;
+ sgn = 1;
+
+ if ( get_next_indice( st0, 1 ) == 0 )
+ {
+ nbits_diff_angle2 = 1;
+ }
+ else
+ {
+ nbits_diff_angle2 = 1;
+
+ if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */
+ {
+ sgn = -1;
+ }
+
+ nbits_diff_angle2++;
+
+ /* read until the stop bit */
+ while ( ( nbits_diff_angle2 < ISM_ELEVATION_NBITS ) && ( get_next_indice( st0, 1 ) == 1 ) )
+ {
+ diff++;
+ nbits_diff_angle2++;
+ }
+
+ if ( nbits_diff_angle2 < ISM_ELEVATION_NBITS )
+ {
+ /* count stop bit */
+ nbits_diff_angle2++;
+ }
+ }
+
+ idx_angle2 = angle->last_angle2_idx + sgn * diff;
+ }
+
+ /* sanity check in case of FER or BER */
+ if ( idx_angle2 < 0 || idx_angle2 > ( 1 << ISM_ELEVATION_NBITS ) - 1 )
+ {
+ idx_angle2 = angle->last_angle2_idx;
+ }
+
+ /*----------------------------------------------------------------*
+ * Final updates
+ *----------------------------------------------------------------*/
+
+ angle->last_angle1_idx = idx_angle1;
+ angle->last_angle2_idx = idx_angle2;
+
+ return;
+}
+
+#else
+
+static void decode_angle_indices(
+ DEC_CORE_HANDLE st0, /* i/o: bitstream handle */
+ ISM_METADATA_ANGLE_HANDLE angle, /* i/o: angle handle */
+ int16_t *flag_abs_azimuth /* o : Azimuth encoding mode */
+)
+{
+ int16_t idx_azimuth, nbits_diff_azimuth, diff, sgn;
+ int16_t idx_elevation, nbits_diff_elevation;
+
+ /*----------------------------------------------------------------*
+ * Azimuth decoding and dequantization
+ *----------------------------------------------------------------*/
+
+ /* Decode azimuth index */
+ if ( get_next_indice( st0, 1 ) == 1 ) /* azimuth_abs_flag */
+ {
+ idx_azimuth = get_next_indice( st0, ISM_AZIMUTH_NBITS );
+ *flag_abs_azimuth = 1;
+ }
+ else
+ {
+ diff = 0;
+ sgn = 1;
+
+ if ( get_next_indice( st0, 1 ) == 0 )
+ {
+ nbits_diff_azimuth = 1;
+ }
+ else
+ {
+ nbits_diff_azimuth = 1;
+
+ if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */
+ {
+ sgn = -1;
+ }
+
+ nbits_diff_azimuth++;
+
+ /* read until the stop bit */
+ while ( ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 ) && ( get_next_indice( st0, 1 ) == 1 ) )
+ {
+ diff++;
+ nbits_diff_azimuth++;
+ }
+
+ if ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 )
+ {
+ /* count stop bit */
+ nbits_diff_azimuth++;
+ }
+ }
+ idx_azimuth = angle->last_azimuth_idx + sgn * diff;
+ }
+
+ /* azimuth is on a circle - check for diff coding for -180° -> 180° and vice versa changes */
+ if ( idx_azimuth > ( 1 << ISM_AZIMUTH_NBITS ) - 1 )
+ {
+ idx_azimuth -= ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* +180° -> -180° */
+ }
+ else if ( idx_azimuth < 0 )
+ {
+ idx_azimuth += ( 1 << ISM_AZIMUTH_NBITS ) - 1; /* -180° -> +180° */
+ }
+
+ /* +180° == -180° */
+ if ( idx_azimuth == ( 1 << ISM_AZIMUTH_NBITS ) - 1 )
+ {
+ idx_azimuth = 0;
+ }
+
+ /* sanity check in case of FER or BER */
+ if ( idx_azimuth < 0 || idx_azimuth > ( 1 << ISM_AZIMUTH_NBITS ) - 1 )
+ {
+ idx_azimuth = angle->last_azimuth_idx;
+ }
+
+ /*----------------------------------------------------------------*
+ * Elevation decoding and dequantization
+ *----------------------------------------------------------------*/
+
+ /* Decode elevation index */
+ if ( *flag_abs_azimuth == 0 && get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */
+ {
+ idx_elevation = get_next_indice( st0, ISM_ELEVATION_NBITS );
+ }
+ else
+ {
+ diff = 0;
+ sgn = 1;
+
+ if ( get_next_indice( st0, 1 ) == 0 )
+ {
+ nbits_diff_elevation = 1;
+ }
+ else
+ {
+ nbits_diff_elevation = 1;
+
+ if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */
+ {
+ sgn = -1;
+ }
+
+ nbits_diff_elevation++;
+
+ /* read until the stop bit */
+ while ( ( nbits_diff_elevation < ISM_ELEVATION_NBITS ) && ( get_next_indice( st0, 1 ) == 1 ) )
+ {
+ diff++;
+ nbits_diff_elevation++;
+ }
+
+ if ( nbits_diff_elevation < ISM_ELEVATION_NBITS )
+ {
+ /* count stop bit */
+ nbits_diff_elevation++;
+ }
+ }
+
+ idx_elevation = angle->last_elevation_idx + sgn * diff;
+ }
+
+ /* sanity check in case of FER or BER */
+ if ( idx_elevation < 0 || idx_elevation > ( 1 << ISM_ELEVATION_NBITS ) - 1 )
+ {
+ idx_elevation = angle->last_elevation_idx;
+ }
+
+ /*----------------------------------------------------------------*
+ * Final updates
+ *----------------------------------------------------------------*/
+
+ angle->last_azimuth_idx = idx_azimuth;
+ angle->last_elevation_idx = idx_elevation;
+
+ return;
+}
+
+#endif
+
+
+/*-------------------------------------------------------------------------
+ * decode_radius()
+ *
+ * Radius decoding and dequantization
+ *-------------------------------------------------------------------------*/
+
+static int16_t decode_radius(
+ DEC_CORE_HANDLE st0, /* i/o: bitstream handle */
+ int16_t *last_radius_idx, /* i/o: last radius index */
+ int16_t *flag_abs_radius /* o : Radius encoding mode */
+)
+{
+ int16_t idx_radius, nbits_diff_radius, diff, sgn;
+
+ /* Decode radius index */
+ if ( get_next_indice( st0, 1 ) == 1 ) /* elevation_abs_flag */
+ {
+ *flag_abs_radius = 1;
+ idx_radius = get_next_indice( st0, ISM_RADIUS_NBITS );
+ }
+ else
+ {
+ diff = 0;
+ sgn = 1;
+
+ if ( get_next_indice( st0, 1 ) == 0 )
+ {
+ nbits_diff_radius = 1;
+ }
+ else
+ {
+ nbits_diff_radius = 1;
+
+ if ( get_next_indice( st0, 1 ) == 1 ) /* negative sign */
+ {
+ sgn = -1;
+ }
+
+ nbits_diff_radius++;
+
+ /* read until the stop bit */
+ while ( ( nbits_diff_radius < ISM_RADIUS_NBITS ) && ( get_next_indice( st0, 1 ) == 1 ) )
+ {
+ diff++;
+ nbits_diff_radius++;
+ }
+
+ if ( nbits_diff_radius < ISM_RADIUS_NBITS )
+ {
+ /* count stop bit */
+ nbits_diff_radius++;
+ }
+ }
+ idx_radius = *last_radius_idx + sgn * diff;
+ }
+
+ /* sanity check in case of FER or BER */
+ if ( idx_radius < 0 || idx_radius > ( 1 << ISM_RADIUS_NBITS ) - 1 )
+ {
+ idx_radius = *last_radius_idx;
+ }
+
+ /* Final updates */
+ *last_radius_idx = idx_radius;
+
+ return idx_radius;
+}
+
+
+#ifdef DISCRETE_ISM_DTX_CNG
+/*-------------------------------------------------------------------*
+ * ivas_ism_metadata_sid_dec()
+ *
+ * Decode ISM metadata in SID frame
+ *-------------------------------------------------------------------*/
+
+void ivas_ism_metadata_sid_dec(
+ SCE_DEC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */
+ const int32_t ism_total_brate, /* i : ISms total bitrate */
+ const int16_t bfi, /* i : bfi flag */
+ const int16_t nchan_ism, /* i : number of objects */
+ const int16_t nchan_transport, /* i : number of transport channels*/
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ int16_t *flag_noisy_speech, /* o : noisy speech flag */
+ int16_t *sce_id_dtx, /* o : SCE DTX ID */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ int16_t nb_bits_metadata[] /* o : number of metadata bits */
+)
+{
+ int16_t i, ch, last_bit_pos;
+ float q_step, q_step_border;
+ int16_t idx, idx_azimuth, idx_elevation;
+ int16_t nBits_azimuth, nBits_elevation, nBits_coh, nBits_sce_id;
+ int16_t md_diff_flag[MAX_NUM_OBJECTS];
+ ISM_MODE ism_mode_bstr;
+ DEC_CORE_HANDLE st0;
+ ISM_METADATA_HANDLE hIsmMetaData;
+ int16_t next_bit_pos_orig;
+ uint16_t bstr_meta[IVAS_SID_5k2 / FRAMES_PER_SEC], *bstr_orig;
+
+ if ( ism_total_brate == FRAME_NO_DATA )
+ {
+ ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism );
+
+ return;
+ }
+
+ /* initialization */
+ st0 = hSCE[0]->hCoreCoder[0];
+
+ last_bit_pos = (int16_t) ( ( ism_total_brate / FRAMES_PER_SEC ) - 1 - SID_FORMAT_NBITS );
+ bstr_orig = st0->bit_stream;
+ next_bit_pos_orig = st0->next_bit_pos;
+ st0->next_bit_pos = 0;
+
+ /* reverse the bitstream for easier reading of indices */
+ for ( i = 0; i < min( MAX_BITS_METADATA, last_bit_pos ); i++ )
+ {
+ bstr_meta[i] = st0->bit_stream[last_bit_pos - i];
+ }
+ st0->bit_stream = bstr_meta;
+ st0->total_brate = ism_total_brate; /* needed for BER detection in get_next_indice() */
+
+ if ( !bfi )
+ {
+ /*----------------------------------------------------------------*
+ * ISm common signaling
+ *----------------------------------------------------------------*/
+
+ /* number of objects was already read in ivas_ism_get_dtx_dec() */
+ /* update the position in the bitstream */
+ st0->next_bit_pos += nchan_ism;
+
+ /* read SID metadata flag( one per object ) */
+ for ( ch = 0; ch < nchan_ism; ch++ )
+ {
+ md_diff_flag[ch] = get_next_indice( st0, 1 );
+ }
+
+ /*----------------------------------------------------------------*
+ * Set quantization bits based on the number of coded objects
+ *----------------------------------------------------------------*/
+
+ ivas_get_ism_sid_quan_bitbudget( nchan_ism, &nBits_azimuth, &nBits_elevation, &q_step, &q_step_border, &nBits_coh, &nBits_sce_id );
+
+ /*----------------------------------------------------------------*
+ * Spatial parameters, loop over TCs - 1
+ *----------------------------------------------------------------*/
+
+ *flag_noisy_speech = 0;
+ *sce_id_dtx = 0;
+
+ /* write ISM mode flag to explicitly signal number of spatial parameters */
+ if ( nchan_ism > 2 )
+ {
+ idx = get_next_indice( st0, 1 );
+ ism_mode_bstr = (ISM_MODE) ( idx + 1 );
+ /* note: ISM mode was already read and used for configuration in in ivas_ism_dtx_dec() */
+
+ if ( ism_mode_bstr == ISM_MODE_PARAM )
+ {
+ /* read noisy speech flag */
+ *flag_noisy_speech = get_next_indice( st0, 1 );
+ nBits_sce_id = 1;
+ }
+ }
+
+ if ( nchan_transport > 1 )
+ {
+ /* read sce id */
+ *sce_id_dtx = get_next_indice( st0, nBits_sce_id );
+
+ /* decode the coherence */
+ for ( ch = 0; ch < nchan_transport; ch++ )
+ {
+ if ( ch == *sce_id_dtx )
+ {
+ hSCE[ch]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = 1.0f;
+ continue;
+ }
+
+ idx = get_next_indice( st0, nBits_coh );
+ hSCE[ch]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = (float) ( idx ) / (float) ( ( 1 << nBits_coh ) - 1 );
+ }
+ }
+ else
+ {
+ *sce_id_dtx = 0;
+ }
+
+ if ( ism_mode == ISM_MODE_PARAM )
+ {
+ hSCE[*sce_id_dtx]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = hSCE[!*sce_id_dtx]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence;
+ }
+
+ /*----------------------------------------------------------------*
+ * Metadata decoding and dequantization, loop over all objects
+ *----------------------------------------------------------------*/
+
+ for ( ch = 0; ch < nchan_ism; ch++ )
+ {
+ hIsmMetaData = hIsmMeta[ch];
+
+ if ( md_diff_flag[ch] == 1 )
+ {
+ /* Azimuth decoding */
+ idx_azimuth = get_next_indice( st0, nBits_azimuth );
+ hIsmMetaData->azimuth = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, q_step, q_step_border, 1 << nBits_azimuth );
+
+ /* Elevation decoding */
+ idx_elevation = get_next_indice( st0, nBits_elevation );
+ hIsmMetaData->elevation = ism_dequant_meta( idx_elevation, ism_elevation_borders, q_step, q_step_border, 1 << nBits_elevation );
+
+ /* update last indexes to correspond to active frames coding */
+ if ( nBits_azimuth > ISM_AZIMUTH_NBITS )
+ {
+#ifdef FIX_379_ANGLE
+ hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS );
+ hIsmMetaData->position_angle.last_angle2_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS );
+#else
+ hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS );
+ hIsmMetaData->angle[0].last_elevation_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS );
+#endif
+ }
+ else
+ {
+#ifdef FIX_379_ANGLE
+ hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth );
+ hIsmMetaData->position_angle.last_angle2_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation );
+#else
+ hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth );
+ hIsmMetaData->angle[0].last_elevation_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation );
+
+#endif
+ }
+
+ /* save for smoothing metadata evolution */
+ hIsmMetaData->last_true_azimuth = hIsmMetaData->azimuth;
+ hIsmMetaData->last_true_elevation = hIsmMetaData->elevation;
+ }
+ }
+
+ /* take into account padding bits as metadata bits to keep later bitrate checks valid */
+ nb_bits_metadata[*sce_id_dtx] = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC;
+
+ /* set the bitstream pointer to its original position */
+ st0->bit_stream = bstr_orig;
+ st0->next_bit_pos = next_bit_pos_orig;
+ }
+
+ /* smooth the metadata evolution */
+ ism_metadata_smooth( hIsmMeta, ism_total_brate, nchan_ism );
+
+ return;
+}
+#endif
diff --git a/lib_dec/ivas_ism_param_dec.c b/lib_dec/ivas_ism_param_dec.c
index dea3e6d6f86d3020472a03d26a96664f83d94954..f66323d8a4f038b0a054d6678302cc758603f7cd 100644
--- a/lib_dec/ivas_ism_param_dec.c
+++ b/lib_dec/ivas_ism_param_dec.c
@@ -51,6 +51,10 @@
static void ivas_param_ism_dec_dequant_DOA(
DIRAC_DEC_HANDLE hDirAC /* i/o: decoder DirAC handle */
+#ifdef NCHAN_ISM_PARAMETER
+ ,
+ const int16_t nchan_ism /* i : number of ISM channels */
+#endif
)
{
int16_t i;
@@ -58,13 +62,21 @@ static void ivas_param_ism_dec_dequant_DOA(
hParamIsm = hDirAC->hParamIsm;
+#ifdef NCHAN_ISM_PARAMETER
+ assert( nchan_ism <= MAX_NUM_OBJECTS );
+#else
assert( hParamIsm->num_obj <= MAX_NUM_OBJECTS );
+#endif
/* Get the azimuth and elevation values */
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < nchan_ism; i++ )
+#else
for ( i = 0; i < hParamIsm->num_obj; i++ )
+#endif
{
- hDirAC->azimuth_values[i] = ism_dequant_meta( hParamIsm->azi_index[i], ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS );
- hDirAC->elevation_values[i] = ism_dequant_meta( hParamIsm->ele_index[i], ism_elevation_borders, 1 << ISM_ELEVATION_NBITS );
+ hDirAC->azimuth_values[i] = ism_dequant_meta( hParamIsm->azi_index[i], ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS );
+ hDirAC->elevation_values[i] = ism_dequant_meta( hParamIsm->ele_index[i], ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS );
}
return;
@@ -157,10 +169,11 @@ static void ivas_ism_get_proto_matrix(
static void ivas_param_ism_compute_mixing_matrix(
- DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */
-#ifdef PARAM_ISM_DTX_CNG
- ISM_DTX_DATA_DEC hISMDTX, /* i : ISM DTX handle */
+#ifdef NCHAN_ISM_PARAMETER
+ const int16_t nchan_ism, /* i : number of ISM channels */
#endif
+ DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */
+ ISM_DTX_DATA_DEC hISMDTX, /* i : ISM DTX handle */
float Cldfb_RealBuffer_in[PARAM_ISM_MAX_DMX][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
float Cldfb_ImagBuffer_in[PARAM_ISM_MAX_DMX][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
float direct_response[MAX_NUM_OBJECTS][PARAM_ISM_MAX_CHAN],
@@ -185,16 +198,20 @@ static void ivas_param_ism_compute_mixing_matrix(
proto_matrix = hDirAC->hParamIsmRendering->proto_matrix;
+#ifdef NCHAN_ISM_PARAMETER
+ assert( ( nchan_ism == 3 ) || ( nchan_ism == 4 ) );
+#else
assert( ( hDirAC->hParamIsm->num_obj == 3 ) || ( hDirAC->hParamIsm->num_obj == 4 ) );
+#endif
assert( nchan_transport == 2 );
-#ifdef PARAM_ISM_DTX_CNG
if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag )
-#else
- if ( hDirAC->hParamIsm->flag_noisy_speech )
-#endif
{
+#ifdef NCHAN_ISM_PARAMETER
+ num_wave = nchan_ism;
+#else
num_wave = hDirAC->hParamIsm->num_obj;
+#endif
}
else
{
@@ -214,11 +231,7 @@ static void ivas_param_ism_compute_mixing_matrix(
{
set_zero( cy_diag_tmp[w], nchan_out_woLFE );
-#ifdef PARAM_ISM_DTX_CNG
if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag )
-#else
- if ( hDirAC->hParamIsm->flag_noisy_speech )
-#endif
{
dir_res_ptr = direct_response[w];
}
@@ -257,13 +270,13 @@ static void ivas_param_ism_compute_mixing_matrix(
set_zero( cy_diag, nchan_out_woLFE );
for ( w = 0; w < num_wave; w++ )
{
-#ifdef PARAM_ISM_DTX_CNG
if ( hDirAC->hParamIsm->flag_noisy_speech || hISMDTX.dtx_flag )
-#else
- if ( hDirAC->hParamIsm->flag_noisy_speech )
-#endif
{
+#ifdef NCHAN_ISM_PARAMETER
+ direct_power[w] = ( 1.0f / nchan_ism ) * ref_power;
+#else
direct_power[w] = ( 1.0f / hDirAC->hParamIsm->num_obj ) * ref_power;
+#endif
}
else
{
@@ -409,7 +422,9 @@ ivas_error ivas_param_ism_dec_open(
IVAS_OUTPUT_SETUP hOutSetup;
AUDIO_CONFIG output_config;
int32_t output_Fs;
+#ifndef NCHAN_ISM_PARAMETER
int16_t nchan_out;
+#endif
ivas_error error;
error = IVAS_ERR_OK;
@@ -438,6 +453,10 @@ ivas_error ivas_param_ism_dec_open(
output_Fs = st_ivas->hDecoderConfig->output_Fs;
output_config = st_ivas->hDecoderConfig->output_config;
+#ifdef NCHAN_ISM_PARAMETER
+
+ ivas_param_ism_config( hDirAC->hParamIsm, st_ivas->nchan_ism );
+#else
nchan_out = st_ivas->hDecoderConfig->nchan_out;
if ( output_config == AUDIO_CONFIG_EXTERNAL )
@@ -449,6 +468,7 @@ ivas_error ivas_param_ism_dec_open(
hDirAC->hParamIsm->num_obj = MAX_NUM_OBJECTS;
}
ivas_param_ism_config( hDirAC->hParamIsm );
+#endif
/*-----------------------------------------------------------------*
* set input parameters
@@ -480,7 +500,11 @@ ivas_error ivas_param_ism_dec_open(
if ( output_config == AUDIO_CONFIG_EXTERNAL )
{
/* nchan_out is essential for memory initialization for CLDFB Synthesis */
+#ifdef NCHAN_ISM_PARAMETER
+ st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->nchan_ism;
+#else
st_ivas->hIntSetup.nchan_out_woLFE = hDirAC->hParamIsm->num_obj;
+#endif
st_ivas->hIntSetup.is_loudspeaker_setup = 1;
}
@@ -516,41 +540,110 @@ ivas_error ivas_param_ism_dec_open(
if ( ( output_config == AUDIO_CONFIG_BINAURAL || output_config == AUDIO_CONFIG_BINAURAL_ROOM ) )
{
hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES;
- hDirAC->azimuth = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) );
- hDirAC->elevation = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) );
- hDirAC->azimuth2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) );
- hDirAC->elevation2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) );
- hDirAC->energy_ratio1 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) );
- hDirAC->spreadCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) );
- hDirAC->energy_ratio2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) );
- hDirAC->spreadCoherence2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) );
- hDirAC->surroundingCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) );
+ if ( ( hDirAC->azimuth = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
+
+ if ( ( hDirAC->elevation = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
+
+ if ( ( hDirAC->azimuth2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
+
+ if ( ( hDirAC->elevation2 = (int16_t **) malloc( hDirAC->dirac_md_buffer_length * sizeof( int16_t * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
+
+ if ( ( hDirAC->energy_ratio1 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
+
+ if ( ( hDirAC->spreadCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
+
+ if ( ( hDirAC->energy_ratio2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
+
+ if ( ( hDirAC->spreadCoherence2 = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
+
+ if ( ( hDirAC->surroundingCoherence = (float **) malloc( hDirAC->dirac_md_buffer_length * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
+
for ( i = 0; i < hDirAC->dirac_md_buffer_length; i++ )
{
- hDirAC->azimuth[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) );
+ if ( ( hDirAC->azimuth[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
set_s( hDirAC->azimuth[i], 0, hDirAC->num_freq_bands );
- hDirAC->elevation[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) );
+
+ if ( ( hDirAC->elevation[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
set_s( hDirAC->elevation[i], 0, hDirAC->num_freq_bands );
- hDirAC->azimuth2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) );
+
+ if ( ( hDirAC->azimuth2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
set_s( hDirAC->azimuth2[i], 0, hDirAC->num_freq_bands );
- hDirAC->elevation2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) );
+
+ if ( ( hDirAC->elevation2[i] = (int16_t *) malloc( hDirAC->num_freq_bands * sizeof( int16_t ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
set_s( hDirAC->elevation2[i], 0, hDirAC->num_freq_bands );
- hDirAC->energy_ratio1[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+
+ if ( ( hDirAC->energy_ratio1[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
set_f( hDirAC->energy_ratio1[i], 0.0f, hDirAC->num_freq_bands );
- hDirAC->spreadCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+
+ if ( ( hDirAC->spreadCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
set_f( hDirAC->spreadCoherence[i], 0.0f, hDirAC->num_freq_bands );
- hDirAC->energy_ratio2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+
+ if ( ( hDirAC->energy_ratio2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
set_f( hDirAC->energy_ratio2[i], 0.0f, hDirAC->num_freq_bands );
- hDirAC->spreadCoherence2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+
+ if ( ( hDirAC->spreadCoherence2[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
set_f( hDirAC->spreadCoherence2[i], 0.0f, hDirAC->num_freq_bands );
- hDirAC->surroundingCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) );
+
+ if ( ( hDirAC->surroundingCoherence[i] = (float *) malloc( hDirAC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Param ISM Rendering handle\n" ) );
+ }
set_f( hDirAC->surroundingCoherence[i], 0.0f, hDirAC->num_freq_bands );
}
}
-#ifdef PARAM_ISM_DTX_CNG
st_ivas->hISMDTX.dtx_flag = 0;
-#endif
st_ivas->hDirAC = hDirAC;
@@ -566,11 +659,19 @@ ivas_error ivas_param_ism_dec_open(
*-------------------------------------------------------------------------*/
void ivas_param_ism_dec_close(
- DIRAC_DEC_HANDLE hDirAC, /* i/o: decoder DirAC handle */
- AUDIO_CONFIG output_config /* i : output audio configuration */
+ DIRAC_DEC_HANDLE *hDirAC_out, /* i/o: decoder DirAC handle */
+ AUDIO_CONFIG output_config /* i : output audio configuration */
)
{
int16_t i;
+ DIRAC_DEC_HANDLE hDirAC;
+
+ if ( hDirAC_out == NULL || *hDirAC_out == NULL )
+ {
+ return;
+ }
+
+ hDirAC = *hDirAC_out;
/* Config & CLDFB */
if ( hDirAC->hParamIsm != NULL )
@@ -727,7 +828,8 @@ void ivas_param_ism_dec_close(
hDirAC->hParamIsmRendering = NULL;
}
- free( hDirAC );
+ free( *hDirAC_out );
+ *hDirAC_out = NULL;
return;
}
@@ -746,9 +848,7 @@ void ivas_param_ism_dec(
{
int16_t ch, nchan_transport, nchan_out, nchan_out_woLFE, i;
int16_t subframe_idx, slot_idx, index_slot, bin_idx;
-#ifdef PARAM_ISM_DTX_CNG
int32_t ivas_total_brate;
-#endif
/* CLDFB Input Buffers */
float Cldfb_RealBuffer_in[PARAM_ISM_MAX_DMX][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
@@ -775,7 +875,11 @@ void ivas_param_ism_dec(
nchan_transport = st_ivas->nchan_transport;
if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )
{
+#ifdef NCHAN_ISM_PARAMETER
+ nchan_out = st_ivas->nchan_ism;
+#else
nchan_out = st_ivas->hDirAC->hParamIsm->num_obj;
+#endif
nchan_out_woLFE = nchan_out;
st_ivas->hDecoderConfig->nchan_out = nchan_out;
}
@@ -785,9 +889,7 @@ void ivas_param_ism_dec(
nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;
}
-#ifdef PARAM_ISM_DTX_CNG
ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
-#endif
hSetup = st_ivas->hIntSetup;
@@ -795,10 +897,13 @@ void ivas_param_ism_dec(
/* Frame-level Processing */
/* De-quantization */
-#ifdef PARAM_ISM_DTX_CNG
if ( !( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) )
{
+#ifdef NCHAN_ISM_PARAMETER
+ ivas_param_ism_dec_dequant_DOA( hDirAC, st_ivas->nchan_ism );
+#else
ivas_param_ism_dec_dequant_DOA( hDirAC );
+#endif
ivas_param_ism_dec_dequant_powrat( hDirAC );
st_ivas->hISMDTX.dtx_flag = 0;
}
@@ -806,15 +911,15 @@ void ivas_param_ism_dec(
{
st_ivas->hISMDTX.dtx_flag = 1;
}
-#else
- ivas_param_ism_dec_dequant_DOA( hDirAC );
- ivas_param_ism_dec_dequant_powrat( hDirAC );
-#endif
/* obtain the direct response using EFAP */
if ( !( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL ) )
{
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < st_ivas->nchan_ism; i++ )
+#else
for ( i = 0; i < hDirAC->hParamIsm->num_obj; i++ )
+#endif
{
efap_determine_gains( st_ivas->hEFAPdata, direct_response[i], hDirAC->azimuth_values[i], hDirAC->elevation_values[i], EFAP_MODE_EFAP );
}
@@ -823,7 +928,11 @@ void ivas_param_ism_dec(
{
int16_t j;
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < st_ivas->nchan_ism; i++ )
+#else
for ( i = 0; i < hDirAC->hParamIsm->num_obj; i++ )
+#endif
{
for ( j = 0; j < nchan_out_woLFE; j++ )
{
@@ -872,10 +981,10 @@ void ivas_param_ism_dec(
}
/* Compute mixing matrix */
-#ifdef PARAM_ISM_DTX_CNG
- ivas_param_ism_compute_mixing_matrix( hDirAC, st_ivas->hISMDTX, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, direct_response, nchan_transport, nchan_out_woLFE, 0, CLDFB_NO_COL_MAX, mixing_matrix );
+#ifdef NCHAN_ISM_PARAMETER
+ ivas_param_ism_compute_mixing_matrix( st_ivas->nchan_ism, hDirAC, st_ivas->hISMDTX, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, direct_response, nchan_transport, nchan_out_woLFE, 0, CLDFB_NO_COL_MAX, mixing_matrix );
#else
- ivas_param_ism_compute_mixing_matrix( hDirAC, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, direct_response, nchan_transport, nchan_out_woLFE, 0, CLDFB_NO_COL_MAX, mixing_matrix );
+ ivas_param_ism_compute_mixing_matrix( hDirAC, st_ivas->hISMDTX, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, direct_response, nchan_transport, nchan_out_woLFE, 0, CLDFB_NO_COL_MAX, mixing_matrix );
#endif
/* subframe loop for synthesis*/
@@ -945,7 +1054,11 @@ void ivas_param_ism_dec(
ivas_param_ism_update_mixing_matrix( hDirAC, mixing_matrix, nchan_transport, nchan_out_woLFE );
/* store MetaData parameters */
+#ifdef NCHAN_ISM_PARAMETER
+ for ( ch = 0; ch < st_ivas->nchan_ism; ch++ )
+#else
for ( ch = 0; ch < hDirAC->hParamIsm->num_obj; ch++ )
+#endif
{
if ( st_ivas->hDirAC->azimuth_values[ch] > 180.0f )
{
@@ -982,19 +1095,20 @@ void ivas_param_ism_params_to_masa_param_mapping(
int16_t azimuth[2];
int16_t elevation[2];
float power_ratio[2];
-#ifdef PARAM_ISM_DTX_CNG
int32_t ivas_total_brate;
-#endif
hDirAC = st_ivas->hDirAC;
nBins = hDirAC->num_freq_bands;
-#ifdef PARAM_ISM_DTX_CNG
ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
if ( !( ivas_total_brate == IVAS_SID_5k2 || ivas_total_brate == FRAME_NO_DATA ) )
{
+#ifdef NCHAN_ISM_PARAMETER
+ ivas_param_ism_dec_dequant_DOA( hDirAC, st_ivas->nchan_ism );
+#else
ivas_param_ism_dec_dequant_DOA( hDirAC );
+#endif
ivas_param_ism_dec_dequant_powrat( hDirAC );
st_ivas->hISMDTX.dtx_flag = 0;
}
@@ -1002,14 +1116,13 @@ void ivas_param_ism_params_to_masa_param_mapping(
{
st_ivas->hISMDTX.dtx_flag = 1;
}
-#else
- ivas_param_ism_dec_dequant_DOA( hDirAC );
- ivas_param_ism_dec_dequant_powrat( hDirAC );
-#endif
+#ifdef NCHAN_ISM_PARAMETER
+ if ( st_ivas->nchan_ism > 1 )
+#else
if ( hDirAC->hParamIsm->num_obj > 1 )
+#endif
{
-#ifdef PARAM_ISM_DTX_CNG
if ( st_ivas->hISMDTX.dtx_flag )
{
float energy_ratio;
@@ -1071,44 +1184,6 @@ void ivas_param_ism_params_to_masa_param_mapping(
}
}
}
-#else
- hDirAC->numSimultaneousDirections = 2;
- for ( band_idx = 0; band_idx < hDirAC->hParamIsm->nbands; band_idx++ )
- {
- brange[0] = hDirAC->hParamIsm->band_grouping[band_idx];
- brange[1] = hDirAC->hParamIsm->band_grouping[band_idx + 1];
-
- azimuth[0] = (int16_t) roundf( hDirAC->azimuth_values[hDirAC->hParamIsm->obj_indices[band_idx][0][0]] );
- elevation[0] = (int16_t) roundf( hDirAC->elevation_values[hDirAC->hParamIsm->obj_indices[band_idx][0][0]] );
- power_ratio[0] = hDirAC->power_ratios[band_idx][0][0];
-
- azimuth[1] = (int16_t) roundf( hDirAC->azimuth_values[hDirAC->hParamIsm->obj_indices[band_idx][0][1]] );
- elevation[1] = (int16_t) roundf( hDirAC->elevation_values[hDirAC->hParamIsm->obj_indices[band_idx][0][1]] );
- power_ratio[1] = hDirAC->power_ratios[band_idx][0][1];
-
- for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
- {
- for ( bin_idx = brange[0]; bin_idx < brange[1]; bin_idx++ )
- {
- hDirAC->azimuth[sf_idx][bin_idx] = azimuth[0];
- hDirAC->elevation[sf_idx][bin_idx] = elevation[0];
- hDirAC->energy_ratio1[sf_idx][bin_idx] = power_ratio[0];
- hDirAC->azimuth2[sf_idx][bin_idx] = azimuth[1];
- hDirAC->elevation2[sf_idx][bin_idx] = elevation[1];
- hDirAC->energy_ratio2[sf_idx][bin_idx] = power_ratio[1];
- }
- }
- }
- for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
- {
- for ( bin_idx = 0; bin_idx < nBins; bin_idx++ )
- {
- hDirAC->spreadCoherence[sf_idx][bin_idx] = 0.0f;
- hDirAC->spreadCoherence2[sf_idx][bin_idx] = 0.0f;
- hDirAC->surroundingCoherence[sf_idx][bin_idx] = 0.0;
- }
- }
-#endif
}
else
{
@@ -1131,8 +1206,7 @@ void ivas_param_ism_params_to_masa_param_mapping(
return;
}
-
-#ifdef PARAM_ISM_DTX_CNG
+#ifndef DISCRETE_ISM_DTX_CNG
static void ivas_param_ism_dec_dequantize_DOA_dtx(
int16_t azi_bits,
int16_t ele_bits,
@@ -1230,7 +1304,11 @@ void ivas_param_ism_metadata_dtx_dec(
/* number of objects was already read in ivas_ism_get_dtx_dec() */
/* update the position in the bitstream */
+#ifdef NCHAN_ISM_PARAMETER
+ st0->next_bit_pos += st_ivas->nchan_ism;
+#else
st0->next_bit_pos += hParamIsm->num_obj;
+#endif
/* read sce id */
st_ivas->hISMDTX.sce_id_dtx = get_next_indice( st0, 1 );
@@ -1244,7 +1322,11 @@ void ivas_param_ism_metadata_dtx_dec(
st_ivas->hSCE[1]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence = st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence;
/* get the DOA'S */
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < st_ivas->nchan_ism; i++ )
+#else
for ( i = 0; i < hParamIsm->num_obj; i++ )
+#endif
{
/* read from bitstream and dequantize */
azi_idx = get_next_indice( st0, PARAM_ISM_DTX_AZI_BITS );
diff --git a/lib_dec/ivas_ism_renderer.c b/lib_dec/ivas_ism_renderer.c
index feca51b696986bcf86f0fc40da859bee19b36c56..00d93d15b63d44abd181739bec8ab929d3436144 100644
--- a/lib_dec/ivas_ism_renderer.c
+++ b/lib_dec/ivas_ism_renderer.c
@@ -107,11 +107,15 @@ void ivas_ism_render(
float tmp_output_f[MAX_OUTPUT_CHANNELS][L_FRAME48k];
float gains[MAX_NUM_OBJECTS][MAX_OUTPUT_CHANNELS];
float g1, g2;
- int16_t num_objects, nchan_out_woLFE, lfe_index;
+ int16_t nchan_ism, nchan_out_woLFE, lfe_index;
int16_t azimuth, elevation;
float Rmat[3][3];
- num_objects = st_ivas->nchan_transport;
+#ifdef NCHAN_ISM_PARAMETER
+ nchan_ism = st_ivas->nchan_ism;
+#else
+ nchan_ism = st_ivas->nchan_transport;
+#endif
nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;
lfe_index = 0;
@@ -121,7 +125,7 @@ void ivas_ism_render(
set_f( tmp_output_f[j], 0.0f, output_frame );
}
- for ( i = 0; i < num_objects; i++ )
+ for ( i = 0; i < nchan_ism; i++ )
{
mvr2r( output_f[i], input_f[i], output_frame );
}
@@ -137,7 +141,7 @@ void ivas_ism_render(
QuatToRotMat( st_ivas->hHeadTrackData->Quaternions[st_ivas->hHeadTrackData->num_quaternions++], Rmat );
}
- for ( i = 0; i < num_objects; i++ )
+ for ( i = 0; i < nchan_ism; i++ )
{
if ( st_ivas->intern_config == AUDIO_CONFIG_STEREO )
{
@@ -252,8 +256,8 @@ void ivas_ism_get_stereo_gains(
#ifdef MASA_AND_OBJECTS
/*-------------------------------------------------------------------------*
- * ivas_masa_ism_separate_object_renderer_open()
- *
+* ivas_masa_ism_separate_object_renderer_open()
+*
* Open structures, reserve memory, and init values.
*-------------------------------------------------------------------------*/
@@ -266,10 +270,9 @@ ivas_error ivas_masa_ism_separate_object_renderer_open(
if ( ( st_ivas->hIsmRendererData = (ISM_RENDERER_HANDLE) malloc( sizeof( ISM_RENDERER_DATA ) ) ) == NULL )
{
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM renderer \n" ) );
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for MASA ISM renderer \n" ) );
}
-
for ( i = 0; i < MAX_NUM_OBJECTS; i++ )
{
set_f( st_ivas->hIsmRendererData->prev_gains[i], 0.0f, MAX_OUTPUT_CHANNELS );
@@ -300,6 +303,7 @@ ivas_error ivas_masa_ism_separate_object_renderer_open(
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for MASA ISM delay buffer \n" ) );
}
+
for ( i = 0; i < st_ivas->hMasaIsmData->delayBuffer_nchan; i++ )
{
if ( ( st_ivas->hMasaIsmData->delayBuffer[i] = (float *) malloc( st_ivas->hMasaIsmData->delayBuffer_size * sizeof( float ) ) ) == NULL )
@@ -344,7 +348,7 @@ void ivas_masa_ism_separate_object_render(
lfe_index = st_ivas->hDirAC->hOutSetup.index_lfe[0];
#ifdef OMASA_UPDATES
- if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
#else
if ( st_ivas->ism_mode == ISM_MASA_MODE_ONE_OBJ )
#endif
diff --git a/lib_dec/ivas_lfe_dec.c b/lib_dec/ivas_lfe_dec.c
index 55a68d892ba73518aaad01b8ba2e7c8ea9f569c1..5c250286eedfd2291b691c92b3587f71ea484674 100644
--- a/lib_dec/ivas_lfe_dec.c
+++ b/lib_dec/ivas_lfe_dec.c
@@ -477,19 +477,25 @@ ivas_error ivas_create_lfe_dec(
*-------------------------------------------------------------------------*/
void ivas_lfe_dec_close(
- LFE_DEC_HANDLE hLFE /* i/o: LFE decoder handle */
+ LFE_DEC_HANDLE *hLFE /* i/o: LFE decoder handle */
)
{
- free( hLFE->pWindow_state );
- hLFE->pWindow_state = NULL;
+ if ( hLFE == NULL || *hLFE == NULL )
+ {
+ return;
+ }
- if ( hLFE->lfe_delay_buf != NULL )
+ free( ( *hLFE )->pWindow_state );
+ ( *hLFE )->pWindow_state = NULL;
+
+ if ( ( *hLFE )->lfe_delay_buf != NULL )
{
- free( hLFE->lfe_delay_buf );
- hLFE->lfe_delay_buf = NULL;
+ free( ( *hLFE )->lfe_delay_buf );
+ ( *hLFE )->lfe_delay_buf = NULL;
}
- free( hLFE );
+ free( ( *hLFE ) );
+ ( *hLFE ) = NULL;
return;
}
diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c
index e7ae03055533904889928fee9f096799f8e7e17d..38ef2a4c064b518b32bdc4d3d37a846f66a01e20 100644
--- a/lib_dec/ivas_masa_dec.c
+++ b/lib_dec/ivas_masa_dec.c
@@ -48,6 +48,9 @@
* Local constants
*-----------------------------------------------------------------------*/
#define SPAR_META_DELAY_SUBFRAMES 2 /* Number of subframes to delay the SPAR metadata */
+#ifdef FIX_350_MASA_DELAY_COMP
+#define SPH_IDX_FRONT ( MASA_NO_POINTS_EQUATOR / 2 ) /* Spherical index corresponding to front direction for setting as default value */
+#endif
/*-----------------------------------------------------------------------*
* Local function prototypes
@@ -60,12 +63,15 @@ static uint16_t index_theta_phi_16( float theta, float phi, SPHERICAL_GRID_DATA
static int16_t quantize_phi_masa( float phi, int16_t flag_delta, float *phi_hat, const int16_t n );
static void index_16bits( IVAS_QMETADATA_HANDLE hQMetaData, SPHERICAL_GRID_DATA *Sph_Grid16 );
+#ifdef FIX_350_MASA_DELAY_COMP
+static void create_masa_ext_out_meta( MASA_DECODER *hMasa, IVAS_QMETADATA_HANDLE hQMetaData, const int16_t nchan_transport );
+#endif
static void replicate_subframes( IVAS_QMETADATA_HANDLE hQMetaData );
static void restore_lowbitrate_masa( IVAS_QMETADATA_HANDLE hQMetaData, const int16_t low_bitrate_mode, const int16_t numCodingBands );
-static void init_lfe_synth_data( Decoder_Struct *st_ivas, MASA_DECODER_HANDLE hMasa );
+static ivas_error init_lfe_synth_data( Decoder_Struct *st_ivas, MASA_DECODER_HANDLE hMasa );
static void compute_foa_cov_matrix( float foaCov[FOA_CHANNELS][FOA_CHANNELS], float inCov[FOA_CHANNELS][FOA_CHANNELS], float mixMtx[FOA_CHANNELS][FOA_CHANNELS] );
@@ -441,10 +447,12 @@ ivas_error ivas_masa_decode(
}
}
}
+
if ( st_ivas->hDirAC != NULL )
{
ivas_qmetadata_to_dirac( hQMetaData, st_ivas->hDirAC, hMasa, ivas_total_brate, SBA_MODE_NONE, 0 );
}
+
#ifdef MASA_AND_OBJECTS
if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
{
@@ -455,6 +463,7 @@ ivas_error ivas_masa_decode(
return error;
}
}
+
if ( st_ivas->hDirAC != NULL )
{
int16_t b;
@@ -480,7 +489,9 @@ ivas_error ivas_masa_decode(
}
}
#endif
+
st->next_bit_pos = next_bit_pos_orig;
+
#ifdef MASA_AND_OBJECTS
if ( ivas_format == MASA_ISM_FORMAT )
{
@@ -528,6 +539,13 @@ ivas_error ivas_masa_decode(
}
}
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )
+ {
+ create_masa_ext_out_meta( hMasa, hQMetaData, st_ivas->nchan_transport );
+ }
+#endif
+
return error /* *nb_bits_read*/;
}
@@ -543,11 +561,14 @@ ivas_error ivas_masa_dec_open(
)
{
MASA_DECODER_HANDLE hMasa;
+ ivas_error error;
#ifdef MASA_AND_OBJECTS
int16_t i;
int32_t ism_total_brate;
#endif
+ error = IVAS_ERR_OK;
+
if ( ( hMasa = (MASA_DECODER_HANDLE) malloc( sizeof( MASA_DECODER ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) );
@@ -567,6 +588,7 @@ ivas_error ivas_masa_dec_open(
}
}
#endif
+
ivas_masa_set_elements( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &st_ivas->element_mode_init, &st_ivas->nSCE, &st_ivas->nCPE
#ifdef MASA_AND_OBJECTS
,
@@ -582,17 +604,30 @@ ivas_error ivas_masa_dec_open(
/* Create spherical grid only for external output */
if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )
{
- hMasa->data.sph_grid16 = (SPHERICAL_GRID_DATA *) malloc( sizeof( SPHERICAL_GRID_DATA ) );
+ if ( ( hMasa->data.sph_grid16 = (SPHERICAL_GRID_DATA *) malloc( sizeof( SPHERICAL_GRID_DATA ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) );
+ }
+
generate_gridEq( hMasa->data.sph_grid16 );
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( ( hMasa->data.extOutMeta = (MASA_DECODER_EXT_OUT_META *) malloc( sizeof( MASA_DECODER_EXT_OUT_META ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) );
+ }
+#endif
}
else
{
hMasa->data.sph_grid16 = NULL;
+#ifdef FIX_350_MASA_DELAY_COMP
+ hMasa->data.extOutMeta = NULL;
+#endif
}
if ( st_ivas->mc_mode == MC_MODE_MCMASA )
{
- init_lfe_synth_data( st_ivas, hMasa );
+ error = init_lfe_synth_data( st_ivas, hMasa );
}
else
{
@@ -601,54 +636,8 @@ ivas_error ivas_masa_dec_open(
st_ivas->hMasa = hMasa;
- return IVAS_ERR_OK;
-}
-
-#ifdef MASA_AND_OBJECTS
-/*-------------------------------------------------------------------*
- * ivas_masa_ism_data_open()
- *
- *
- *-------------------------------------------------------------------*/
-
-ivas_error ivas_masa_ism_data_open(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
-)
-{
- MASA_ISM_DATA_HANDLE hMasaIsmData;
- int16_t ch, bin;
-
- if ( ( hMasaIsmData = (MASA_ISM_DATA_HANDLE) malloc( sizeof( MASA_ISM_DATA ) ) ) == NULL )
- {
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA ISM data\n" ) );
- }
-
- for ( bin = 0; bin < CLDFB_NO_CHANNELS_MAX; bin++ )
- {
- for ( ch = 0; ch < 2; ch++ )
- {
- hMasaIsmData->ismPreprocMatrix[ch][ch][bin] = 1.0f;
- hMasaIsmData->ismPreprocMatrix[1 - ch][ch][bin] = 0.0f;
- hMasaIsmData->eneMoveIIR[ch][bin] = 0.0f;
- hMasaIsmData->enePreserveIIR[ch][bin] = 0.0f;
- }
- hMasaIsmData->preprocEneTarget[bin] = 0.0f;
- hMasaIsmData->preprocEneRealized[bin] = 0.0f;
- }
- hMasaIsmData->objectsMoved = 0;
- hMasaIsmData->delayBuffer = NULL;
- st_ivas->hMasaIsmData = hMasaIsmData;
-#ifdef OMASA_UPDATES
- for ( ch = 0; ch < st_ivas->nchan_ism; ch++ )
- {
- hMasaIsmData->q_elevation_old[ch] = 0.0f;
- hMasaIsmData->q_azimuth_old[ch] = 0.0f;
- }
-#endif
-
- return IVAS_ERR_OK;
+ return error;
}
-#endif
/*-----------------------------------------------------------------------*
@@ -658,9 +647,18 @@ ivas_error ivas_masa_ism_data_open(
*-----------------------------------------------------------------------*/
void ivas_masa_dec_close(
- MASA_DECODER_HANDLE hMasa /* i/o: MASA metadata structure */
+ MASA_DECODER_HANDLE *hMasa_out /* i/o: MASA metadata structure */
)
{
+ MASA_DECODER_HANDLE hMasa;
+
+ if ( hMasa_out == NULL || *hMasa_out == NULL )
+ {
+ return;
+ }
+
+ hMasa = *hMasa_out;
+
/* Free spherical grid memory if in use */
if ( hMasa->data.sph_grid16 != NULL )
{
@@ -668,6 +666,14 @@ void ivas_masa_dec_close(
hMasa->data.sph_grid16 = NULL;
}
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( hMasa->data.extOutMeta != NULL )
+ {
+ free( hMasa->data.extOutMeta );
+ hMasa->data.extOutMeta = NULL;
+ }
+#endif
+
if ( hMasa->hMasaLfeSynth != NULL )
{
if ( hMasa->hMasaLfeSynth->lfeSynthRingBuffer != NULL )
@@ -694,8 +700,8 @@ void ivas_masa_dec_close(
hMasa->hMasaLfeSynth = NULL;
}
- free( hMasa );
- hMasa = NULL;
+ free( *hMasa_out );
+ *hMasa_out = NULL;
return;
}
@@ -791,7 +797,19 @@ static ivas_error ivas_masa_dec_config(
ivas_set_qmetadata_maxbit_req( st_ivas->hQMetaData, st_ivas->ivas_format );
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )
+ {
+ /* need to apply the sampling rate correction also for the EXT output MASA meta buffer */
+ masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, st_ivas->hDecoderConfig->output_Fs, hMasa->data.extOutMeta );
+ }
+ else
+ {
+ masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, st_ivas->hDecoderConfig->output_Fs, NULL );
+ }
+#else
masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, st_ivas->hQMetaData, st_ivas->hDecoderConfig->output_Fs );
+#endif
return error;
}
@@ -1122,7 +1140,7 @@ static void restore_lowbitrate_masa(
}
-static void init_lfe_synth_data(
+static ivas_error init_lfe_synth_data(
Decoder_Struct *st_ivas, /* i : IVAS decoder struct */
MASA_DECODER_HANDLE hMasa /* i/o: MASA decoder structure */
)
@@ -1133,7 +1151,10 @@ static void init_lfe_synth_data(
output_Fs = st_ivas->hDecoderConfig->output_Fs;
output_config = st_ivas->hDecoderConfig->output_config;
- hMasa->hMasaLfeSynth = (MCMASA_LFE_SYNTH_DATA_HANDLE) malloc( sizeof( MCMASA_LFE_SYNTH_DATA ) );
+ if ( ( hMasa->hMasaLfeSynth = (MCMASA_LFE_SYNTH_DATA_HANDLE) malloc( sizeof( MCMASA_LFE_SYNTH_DATA ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) );
+ }
hMasa->hMasaLfeSynth->transportEneSmooth = 0.0f;
hMasa->hMasaLfeSynth->protoLfeEneSmooth = 0.0f;
@@ -1157,7 +1178,10 @@ static void init_lfe_synth_data(
/* Ring buffer for the filterbank of the LFE synthesis.
* The filterbank is using moving average lowpass filter with the crossover of 120 Hz. */
bufferSize = (int16_t) ( ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES );
- hMasa->hMasaLfeSynth->lfeSynthRingBuffer = (float *) malloc( bufferSize * sizeof( float ) );
+ if ( ( hMasa->hMasaLfeSynth->lfeSynthRingBuffer = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) );
+ }
set_zero( hMasa->hMasaLfeSynth->lfeSynthRingBuffer, bufferSize );
hMasa->hMasaLfeSynth->ringBufferLoPointer = 0;
hMasa->hMasaLfeSynth->ringBufferHiPointer = bufferSize / 2;
@@ -1167,7 +1191,10 @@ static void init_lfe_synth_data(
/* Ring buffer for additional lowpass filter for the LFE signal.
* Moving average lowpass filter with the crossover of 240 Hz. */
bufferSize /= 2;
- hMasa->hMasaLfeSynth->lfeSynthRingBuffer2 = (float *) malloc( bufferSize * sizeof( float ) );
+ if ( ( hMasa->hMasaLfeSynth->lfeSynthRingBuffer2 = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) );
+ }
set_zero( hMasa->hMasaLfeSynth->lfeSynthRingBuffer2, bufferSize );
hMasa->hMasaLfeSynth->ringBufferLoPointer2 = 0;
hMasa->hMasaLfeSynth->lowpassSum2 = 0.0f;
@@ -1175,13 +1202,19 @@ static void init_lfe_synth_data(
/* Delay buffer for matching the delay of the lowpass filter */
bufferSize /= 2; /* The delay of the moving average lowpass filter is bufferSize / 2 */
- hMasa->hMasaLfeSynth->delayBuffer_syncLp = (float *) malloc( bufferSize * sizeof( float ) );
+ if ( ( hMasa->hMasaLfeSynth->delayBuffer_syncLp = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) );
+ }
set_zero( hMasa->hMasaLfeSynth->delayBuffer_syncLp, bufferSize );
hMasa->hMasaLfeSynth->delayBuffer_syncLp_size = bufferSize;
/* Delay buffer for syncing with DirAC rendering */
bufferSize = NS2SA( output_Fs, IVAS_FB_DEC_DELAY_NS ) - hMasa->hMasaLfeSynth->ringBufferSize / 2 - hMasa->hMasaLfeSynth->ringBufferSize2 / 2;
- hMasa->hMasaLfeSynth->delayBuffer_syncDirAC = (float *) malloc( bufferSize * sizeof( float ) );
+ if ( ( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) );
+ }
set_zero( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC, bufferSize );
hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_size = bufferSize;
@@ -1200,7 +1233,10 @@ static void init_lfe_synth_data(
/* Delay buffer for syncing with DirAC rendering */
bufferSize = NS2SA( output_Fs, IVAS_FB_DEC_DELAY_NS );
- hMasa->hMasaLfeSynth->delayBuffer_syncDirAC = (float *) malloc( bufferSize * sizeof( float ) );
+ if ( ( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) );
+ }
set_zero( hMasa->hMasaLfeSynth->delayBuffer_syncDirAC, bufferSize );
hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_size = bufferSize;
@@ -1216,7 +1252,7 @@ static void init_lfe_synth_data(
hMasa->hMasaLfeSynth->delayBuffer_syncDirAC = NULL;
}
- return;
+ return IVAS_ERR_OK;
}
@@ -1419,6 +1455,7 @@ ivas_error ivas_masa_dec_reconfigure(
}
}
}
+
#ifdef MASA_AND_OBJECTS
ism_total_brate = 0;
#ifdef OMASA_UPDATES
@@ -1441,6 +1478,14 @@ ivas_error ivas_masa_dec_reconfigure(
#endif
);
+#ifdef OMASA_BRATE_SW
+ if ( st_ivas->ivas_format == MASA_FORMAT )
+ {
+ st_ivas->nchan_ism = 0;
+ st_ivas->ism_mode = ISM_MODE_NONE;
+ }
+#endif
+
return error;
}
@@ -1710,6 +1755,140 @@ static void compute_foa_cov_matrix(
return;
}
+#ifdef FIX_350_MASA_DELAY_COMP
+static void create_masa_ext_out_meta(
+ MASA_DECODER *hMasa,
+ IVAS_QMETADATA_HANDLE hQMetaData,
+ const int16_t nchan_transport )
+{
+ const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */
+ int16_t i, sf, b_old, b_new, dir;
+ MASA_DECRIPTIVE_META *descMeta;
+ int16_t *bandMap;
+ uint8_t numCodingBands;
+ uint8_t numDirections;
+ MASA_DECODER_EXT_OUT_META *extOutMeta;
+
+ numDirections = hMasa->config.numberOfDirections;
+ numCodingBands = hMasa->config.numCodingBands;
+ bandMap = hMasa->data.band_mapping;
+ extOutMeta = hMasa->data.extOutMeta;
+ descMeta = &hMasa->data.extOutMeta->descriptiveMeta;
+
+ /* Construct descriptive meta */
+ for ( i = 0; i < 8; i++ )
+ {
+ descMeta->formatDescriptor[i] = ivasmasaFormatDescriptor[i];
+ }
+ descMeta->numberOfDirections = numDirections - 1;
+ descMeta->numberOfChannels = (uint8_t) ( nchan_transport - 1 );
+ /* Following correspond to "unknown" values until transmission is implemented */
+ descMeta->sourceFormat = 0x0u;
+ descMeta->transportDefinition = 0x0u;
+ descMeta->channelAngle = 0x0u;
+ descMeta->channelDistance = 0x0u;
+ descMeta->channelLayout = 0x0u;
+
+ /* Construct spatial metadata from qmetadata */
+ for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )
+ {
+ for ( dir = 0; dir < numDirections; dir++ )
+ {
+ /* Spherical index */
+ for ( b_old = 0; b_old < numCodingBands; b_old++ )
+ {
+ for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ )
+ {
+ extOutMeta->directionIndex[dir][sf][b_new] = hQMetaData->q_direction[dir].band_data[b_old].spherical_index[sf];
+ }
+ }
+
+ /* Direct-to-total ratio */
+ for ( b_old = 0; b_old < numCodingBands; b_old++ )
+ {
+ for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ )
+ {
+ extOutMeta->directToTotalRatio[dir][sf][b_new] = (uint8_t) floorf( hQMetaData->q_direction[dir].band_data[b_old].energy_ratio[sf] * UINT8_MAX );
+ }
+ }
+
+ /* Spread coherence */
+ if ( hQMetaData->q_direction[dir].coherence_band_data != NULL )
+ {
+ for ( b_old = 0; b_old < numCodingBands; b_old++ )
+ {
+ for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ )
+ {
+ extOutMeta->spreadCoherence[dir][sf][b_new] = hQMetaData->q_direction[dir].coherence_band_data[b_old].spread_coherence[sf];
+ }
+ }
+ }
+ else
+ {
+ for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ )
+ {
+ extOutMeta->spreadCoherence[dir][sf][i] = 0;
+ }
+ }
+ }
+
+ /* Fill second direction with zero energy data for EXT output */
+ if ( numDirections == 1 )
+ {
+ for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ )
+ {
+ extOutMeta->directionIndex[1][sf][i] = SPH_IDX_FRONT;
+ }
+
+ for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ )
+ {
+ extOutMeta->directToTotalRatio[1][sf][i] = 0;
+ }
+
+ for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ )
+ {
+ extOutMeta->spreadCoherence[1][sf][i] = 0;
+ }
+ }
+
+ /* Common spatial meta */
+ /* Diffuse-to-total ratio = 1 - sum(direct-to-total ratios) */
+ for ( b_old = 0; b_old < numCodingBands; b_old++ )
+ {
+ for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ )
+ {
+ extOutMeta->diffuseToTotalRatio[sf][b_new] = UINT8_MAX;
+ for ( dir = 0; dir < numDirections; dir++ )
+ {
+ extOutMeta->diffuseToTotalRatio[sf][b_new] -= (uint8_t) floorf( hQMetaData->q_direction[dir].band_data[b_old].energy_ratio[sf] * UINT8_MAX );
+ }
+ }
+ }
+
+ /* Surround coherence */
+ if ( hQMetaData->surcoh_band_data != NULL )
+ {
+ for ( b_old = 0; b_old < numCodingBands; b_old++ )
+ {
+ for ( b_new = bandMap[b_old]; b_new < bandMap[b_old + 1]; b_new++ )
+ {
+ extOutMeta->surroundCoherence[sf][b_new] = hQMetaData->surcoh_band_data[b_old].surround_coherence[sf];
+ }
+ }
+ }
+ else
+ {
+ for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ )
+ {
+ extOutMeta->surroundCoherence[sf][i] = 0;
+ }
+ }
+ }
+
+ return;
+}
+#endif
+
#ifdef MASA_AND_OBJECTS
static void decode_index_slice(
diff --git a/lib_dec/ivas_mc_param_dec.c b/lib_dec/ivas_mc_param_dec.c
index 803ccdf86c51b382113afbcaf19e3921c0ce361e..a6637ed1f2d306d2cbd52ef130f7755d848582f9 100644
--- a/lib_dec/ivas_mc_param_dec.c
+++ b/lib_dec/ivas_mc_param_dec.c
@@ -96,7 +96,7 @@ static void param_mc_compute_interpolator( const uint16_t bAttackPresent, const
static void param_mc_set_num_synth_bands( const int32_t output_Fs, PARAM_MC_DEC_HANDLE hParamMC );
-static void param_mc_get_diff_proto_info( const float *proto_mtx, const uint16_t nchan_transport, const uint16_t nchan_out_cov, PARAM_MC_DIFF_PROTO_INFO *p_diff_proto_info );
+static ivas_error param_mc_get_diff_proto_info( const float *proto_mtx, const uint16_t nchan_transport, const uint16_t nchan_out_cov, PARAM_MC_DIFF_PROTO_INFO *p_diff_proto_info );
static void ivas_param_mc_mc2sba_cldfb( IVAS_OUTPUT_SETUP hTransSetup, float *hoa_encoder, const int16_t slot_idx, float Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], float Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], const int16_t nBands, const float gain_lfe );
@@ -231,8 +231,14 @@ ivas_error ivas_param_mc_dec_open(
ivas_param_mc_metadata_open( mc_ls_setup, hTransportSetup.index_lfe[0], ivas_total_brate, hParamMC->hMetadataPMC );
/* init arrays for quantized parameters */
- hParamMC->icc_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( float ) );
- hParamMC->icld_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe * sizeof( float ) );
+ if ( ( hParamMC->icc_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
+ if ( ( hParamMC->icld_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
set_f( hParamMC->icld_q, PARAM_MC_DEFAULT_MIN_ILD, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe );
set_f( hParamMC->icc_q, 0.0f, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe );
@@ -280,11 +286,16 @@ ivas_error ivas_param_mc_dec_open(
/* convert the ls conv dmx matrix into column order matrix format (nchan_out_cldfb x nchan_out) */
if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_COV || hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO )
{
- hParamMC->ls_conv_dmx_matrix = (float *) malloc( nchan_out_transport * nchan_out_cov * sizeof( float ) );
+ if ( ( hParamMC->ls_conv_dmx_matrix = (float *) malloc( nchan_out_transport * nchan_out_cov * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
+
for ( k = 0; k < nchan_out_transport; k++ )
{
mvr2r( st_ivas->hLsSetUpConversion->dmxMtx[k], &hParamMC->ls_conv_dmx_matrix[k * nchan_out_cov], nchan_out_cov );
}
+
/* convert ParamMC parameter bands to SFB */
if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO )
{
@@ -302,7 +313,10 @@ ivas_error ivas_param_mc_dec_open(
}
}
- hParamMC->proto_matrix_int = (float *) malloc( nchan_out_transport * nchan_transport * sizeof( float ) );
+ if ( ( hParamMC->proto_matrix_int = (float *) malloc( nchan_out_transport * nchan_transport * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
mvr2r( ivas_param_mc_conf[config_index].dmx_fac, hParamMC->proto_matrix_int, nchan_transport * nchan_out_transport );
if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_COV || hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO )
@@ -347,9 +361,15 @@ ivas_error ivas_param_mc_dec_open(
else
{
hParamMC->num_outputs_diff = nchan_out_cov;
- hParamMC->diff_proto_info = (PARAM_MC_DIFF_PROTO_INFO *) malloc( sizeof( PARAM_MC_DIFF_PROTO_INFO ) );
+ if ( ( hParamMC->diff_proto_info = (PARAM_MC_DIFF_PROTO_INFO *) malloc( sizeof( PARAM_MC_DIFF_PROTO_INFO ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
- param_mc_get_diff_proto_info( proto_matrix, nchan_transport, nchan_out_cov, hParamMC->diff_proto_info );
+ if ( ( error = param_mc_get_diff_proto_info( proto_matrix, nchan_transport, nchan_out_cov, hParamMC->diff_proto_info ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* decorrelation */
hParamMC->h_freq_domain_decorr_ap_params = NULL;
@@ -357,15 +377,18 @@ ivas_error ivas_param_mc_dec_open(
ivas_dirac_dec_get_frequency_axis( frequency_axis, output_Fs, hParamMC->num_freq_bands );
- ivas_dirac_dec_decorr_open( &( hParamMC->h_freq_domain_decorr_ap_params ),
- &( hParamMC->h_freq_domain_decorr_ap_state ),
- hParamMC->num_freq_bands,
- hParamMC->num_outputs_diff,
- hParamMC->diff_proto_info->num_protos_diff,
- DIRAC_SYNTHESIS_COV_MC_LS,
- frequency_axis,
- nchan_transport,
- output_Fs );
+ if ( ( error = ivas_dirac_dec_decorr_open( &( hParamMC->h_freq_domain_decorr_ap_params ),
+ &( hParamMC->h_freq_domain_decorr_ap_state ),
+ hParamMC->num_freq_bands,
+ hParamMC->num_outputs_diff,
+ hParamMC->diff_proto_info->num_protos_diff,
+ DIRAC_SYNTHESIS_COV_MC_LS,
+ frequency_axis,
+ nchan_transport,
+ output_Fs ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
hParamMC->h_output_synthesis_params.use_onset_filters = 0;
hParamMC->max_band_decorr = hParamMC->h_freq_domain_decorr_ap_params->max_band_decorr;
@@ -384,21 +407,27 @@ ivas_error ivas_param_mc_dec_open(
}
/* output synthesis */
- ivas_dirac_dec_output_synthesis_cov_open( &( hParamMC->h_output_synthesis_params ),
- &( hParamMC->h_output_synthesis_cov_state ),
- hParamMC->max_band_decorr,
- PARAM_MC_MAX_NSLOTS,
- hParamMC->hMetadataPMC->num_parameter_bands,
- max_param_band_residual,
- nchan_transport,
- nchan_out_cov,
- proto_matrix );
+ if ( ( error = ivas_dirac_dec_output_synthesis_cov_open( &( hParamMC->h_output_synthesis_params ),
+ &( hParamMC->h_output_synthesis_cov_state ),
+ hParamMC->max_band_decorr,
+ PARAM_MC_MAX_NSLOTS,
+ hParamMC->hMetadataPMC->num_parameter_bands,
+ max_param_band_residual,
+ nchan_transport,
+ nchan_out_cov,
+ proto_matrix ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* Head rotation */
if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && st_ivas->hDecoderConfig->Opt_Headrotation )
{
- hParamMC->hoa_encoder = (float *) malloc( st_ivas->hTransSetup.nchan_out_woLFE * MAX_INTERN_CHANNELS * sizeof( float ) );
+ if ( ( hParamMC->hoa_encoder = (float *) malloc( st_ivas->hTransSetup.nchan_out_woLFE * MAX_INTERN_CHANNELS * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
compute_hoa_encoder_mtx( st_ivas->hTransSetup.ls_azimuth, st_ivas->hTransSetup.ls_elevation, hParamMC->hoa_encoder, st_ivas->hTransSetup.nchan_out_woLFE, HEAD_ROTATION_HOA_ORDER );
}
@@ -408,8 +437,15 @@ ivas_error ivas_param_mc_dec_open(
if ( hParamMC->max_band_decorr > 0 )
{
- hParamMC->proto_frame_f = (float *) malloc( 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands * sizeof( float ) );
- hParamMC->proto_frame_dec_f = (float *) malloc( 2 * nchan_out_cov * hParamMC->num_freq_bands * sizeof( float ) );
+ if ( ( hParamMC->proto_frame_f = (float *) malloc( 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
+
+ if ( ( hParamMC->proto_frame_dec_f = (float *) malloc( 2 * nchan_out_cov * hParamMC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
}
else
{
@@ -616,8 +652,14 @@ ivas_error ivas_param_mc_dec_reconfig(
/* init arrays for the quantized parameters */
- hParamMC->icc_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( float ) );
- hParamMC->icld_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe * sizeof( float ) );
+ if ( ( hParamMC->icc_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
+ if ( ( hParamMC->icld_q = (float *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
set_f( hParamMC->icld_q, PARAM_MC_DEFAULT_MIN_ILD, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->ild_mapping_conf->ild_map_size_lfe );
set_f( hParamMC->icc_q, 0.0f, hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe );
@@ -696,7 +738,10 @@ ivas_error ivas_param_mc_dec_reconfig(
/* convert the ls conv dmx matrix into column order matrix format (nchan_out_cldfb x nchan_out) */
free( hParamMC->ls_conv_dmx_matrix );
- hParamMC->ls_conv_dmx_matrix = (float *) malloc( nchan_out_transport * nchan_out_cov * sizeof( float ) );
+ if ( ( hParamMC->ls_conv_dmx_matrix = (float *) malloc( nchan_out_transport * nchan_out_cov * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
for ( k = 0; k < nchan_out_transport; k++ )
{
mvr2r( st_ivas->hLsSetUpConversion->dmxMtx[k], &hParamMC->ls_conv_dmx_matrix[k * nchan_out_cov], nchan_out_cov );
@@ -718,7 +763,10 @@ ivas_error ivas_param_mc_dec_reconfig(
if ( nchan_transport_old != nchan_transport )
{
free( hParamMC->proto_matrix_int );
- hParamMC->proto_matrix_int = (float *) malloc( nchan_out_transport * nchan_transport * sizeof( float ) );
+ if ( ( hParamMC->proto_matrix_int = (float *) malloc( nchan_out_transport * nchan_transport * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
mvr2r( ivas_param_mc_conf[config_index].dmx_fac, hParamMC->proto_matrix_int, nchan_transport * nchan_out_transport );
}
@@ -789,9 +837,15 @@ ivas_error ivas_param_mc_dec_reconfig(
}
hParamMC->num_outputs_diff = nchan_out_cov;
- hParamMC->diff_proto_info = (PARAM_MC_DIFF_PROTO_INFO *) malloc( sizeof( PARAM_MC_DIFF_PROTO_INFO ) );
+ if ( ( hParamMC->diff_proto_info = (PARAM_MC_DIFF_PROTO_INFO *) malloc( sizeof( PARAM_MC_DIFF_PROTO_INFO ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
- param_mc_get_diff_proto_info( proto_matrix, nchan_transport, nchan_out_cov, hParamMC->diff_proto_info );
+ if ( ( param_mc_get_diff_proto_info( proto_matrix, nchan_transport, nchan_out_cov, hParamMC->diff_proto_info ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* decorrelation */
hParamMC->h_freq_domain_decorr_ap_params = NULL;
@@ -799,15 +853,18 @@ ivas_error ivas_param_mc_dec_reconfig(
ivas_dirac_dec_get_frequency_axis( frequency_axis, output_Fs, hParamMC->num_freq_bands );
- ivas_dirac_dec_decorr_open( &( hParamMC->h_freq_domain_decorr_ap_params ),
- &( hParamMC->h_freq_domain_decorr_ap_state ),
- hParamMC->num_freq_bands,
- hParamMC->num_outputs_diff,
- hParamMC->diff_proto_info->num_protos_diff,
- DIRAC_SYNTHESIS_COV_MC_LS,
- frequency_axis,
- nchan_transport,
- output_Fs );
+ if ( ( error = ivas_dirac_dec_decorr_open( &( hParamMC->h_freq_domain_decorr_ap_params ),
+ &( hParamMC->h_freq_domain_decorr_ap_state ),
+ hParamMC->num_freq_bands,
+ hParamMC->num_outputs_diff,
+ hParamMC->diff_proto_info->num_protos_diff,
+ DIRAC_SYNTHESIS_COV_MC_LS,
+ frequency_axis,
+ nchan_transport,
+ output_Fs ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
hParamMC->h_output_synthesis_params.use_onset_filters = 0;
hParamMC->max_band_decorr = hParamMC->h_freq_domain_decorr_ap_params->max_band_decorr;
@@ -842,16 +899,20 @@ ivas_error ivas_param_mc_dec_reconfig(
float tmp_buf[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
set_zero( tmp_buf, MAX_CICP_CHANNELS * MAX_CICP_CHANNELS );
+
/* output synthesis */
- ivas_dirac_dec_output_synthesis_cov_open( &( hParamMC->h_output_synthesis_params ),
- &( hParamMC->h_output_synthesis_cov_state ),
- hParamMC->max_band_decorr,
- PARAM_MC_MAX_NSLOTS,
- hParamMC->hMetadataPMC->num_parameter_bands,
- max_param_band_residual,
- nchan_transport,
- nchan_out_cov,
- proto_matrix );
+ if ( ( error = ivas_dirac_dec_output_synthesis_cov_open( &( hParamMC->h_output_synthesis_params ),
+ &( hParamMC->h_output_synthesis_cov_state ),
+ hParamMC->max_band_decorr,
+ PARAM_MC_MAX_NSLOTS,
+ hParamMC->hMetadataPMC->num_parameter_bands,
+ max_param_band_residual,
+ nchan_transport,
+ nchan_out_cov,
+ proto_matrix ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
ivas_dirac_dec_output_synthesis_cov_init( &( hParamMC->h_output_synthesis_cov_state ), nchan_transport, nchan_out_cov, hParamMC->hMetadataPMC->num_parameter_bands, max_param_band_residual );
@@ -898,7 +959,10 @@ ivas_error ivas_param_mc_dec_reconfig(
if ( hParamMC->max_band_decorr > 0 && nchan_transport_old != nchan_transport )
{
free( hParamMC->proto_frame_f );
- hParamMC->proto_frame_f = (float *) malloc( 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands * sizeof( float ) );
+ if ( ( hParamMC->proto_frame_f = (float *) malloc( 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
set_zero( hParamMC->proto_frame_f, 2 * hParamMC->diff_proto_info->num_protos_diff * hParamMC->num_freq_bands );
}
@@ -1060,8 +1124,8 @@ void ivas_param_mc_dec_close(
hParamMC->hoa_encoder = NULL;
}
- free( hParamMC );
- hParamMC = NULL;
+ free( *hParamMC_out );
+ *hParamMC_out = NULL;
return;
}
@@ -2575,7 +2639,7 @@ static void param_mc_set_num_synth_bands(
* calculated the diffuse prototype information
*-------------------------------------------------------------------------*/
-static void param_mc_get_diff_proto_info(
+static ivas_error param_mc_get_diff_proto_info(
const float *proto_mtx, /* i : protoype matrix for the synthesis */
const uint16_t nchan_transport, /* i : number of transport channels */
const uint16_t nchan_out_cov, /* i : number if output channels of the covariance synthesis */
@@ -2591,9 +2655,16 @@ static void param_mc_get_diff_proto_info(
/* Initializations */
max_num_src_chan = 0;
set_zero( proto_fac, MAX_CICP_CHANNELS * PARAM_MC_MAX_TRANSPORT_CHANS );
- p_diff_proto_info->proto_index_diff = (int16_t *) malloc( nchan_out_cov * sizeof( int16_t ) );
+ if ( ( p_diff_proto_info->proto_index_diff = (int16_t *) malloc( nchan_out_cov * sizeof( int16_t ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
set_s( p_diff_proto_info->proto_index_diff, 0, nchan_out_cov );
- p_diff_proto_info->num_source_chan_diff = (int16_t *) malloc( nchan_out_cov * sizeof( int16_t ) );
+
+ if ( ( p_diff_proto_info->num_source_chan_diff = (int16_t *) malloc( nchan_out_cov * sizeof( int16_t ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
set_s( p_diff_proto_info->num_source_chan_diff, 0, nchan_out_cov );
/* we have at least one prototype, copy the first one */
@@ -2653,15 +2724,27 @@ static void param_mc_get_diff_proto_info(
}
/* set up the prototype info struct */
- p_diff_proto_info->source_chan_idx = (int16_t **) malloc( p_diff_proto_info->num_protos_diff * sizeof( int16_t * ) );
- p_diff_proto_info->proto_fac = (float **) malloc( p_diff_proto_info->num_protos_diff * sizeof( float * ) );
+ if ( ( p_diff_proto_info->source_chan_idx = (int16_t **) malloc( p_diff_proto_info->num_protos_diff * sizeof( int16_t * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
+ if ( ( p_diff_proto_info->proto_fac = (float **) malloc( p_diff_proto_info->num_protos_diff * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
for ( cur_diff_proto = 0; cur_diff_proto < p_diff_proto_info->num_protos_diff; cur_diff_proto++ )
{
float *proto_fac_ptr;
- p_diff_proto_info->source_chan_idx[cur_diff_proto] = (int16_t *) malloc( max_num_src_chan * sizeof( int16_t ) );
- p_diff_proto_info->proto_fac[cur_diff_proto] = (float *) malloc( max_num_src_chan * sizeof( float ) );
+ if ( ( p_diff_proto_info->source_chan_idx[cur_diff_proto] = (int16_t *) malloc( max_num_src_chan * sizeof( int16_t ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
+ if ( ( p_diff_proto_info->proto_fac[cur_diff_proto] = (float *) malloc( max_num_src_chan * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
+ }
proto_fac_ptr = proto_fac + cur_diff_proto;
for ( cur_transport_ch = 0; cur_transport_ch < nchan_transport; cur_transport_ch++ )
@@ -2676,7 +2759,7 @@ static void param_mc_get_diff_proto_info(
}
}
- return;
+ return IVAS_ERR_OK;
}
diff --git a/lib_dec/ivas_mcmasa_dec.c b/lib_dec/ivas_mcmasa_dec.c
old mode 100644
new mode 100755
index f6d159083baa56a75cce8d2ae1d633d2dfc85979..d075bf61da999ff97a6a1b29b2b627b72780fa3d
--- a/lib_dec/ivas_mcmasa_dec.c
+++ b/lib_dec/ivas_mcmasa_dec.c
@@ -58,10 +58,7 @@ ivas_error ivas_mcmasa_dec_reconfig(
ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
/* close the old MASA instance */
- if ( st_ivas->hMasa != NULL )
- {
- ivas_masa_dec_close( st_ivas->hMasa );
- }
+ ivas_masa_dec_close( &( st_ivas->hMasa ) );
/* get new McMASA settings */
ivas_mcmasa_setNumTransportChannels( &( st_ivas->nchan_transport ), &( st_ivas->element_mode_init ), ivas_total_brate );
@@ -79,7 +76,11 @@ ivas_error ivas_mcmasa_dec_reconfig(
return error;
}
+#ifdef SBA2MONO
+ st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );
+#else
st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && st_ivas->hOutSetup.output_config == AUDIO_CONFIG_STEREO );
+#endif
if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_MCMASA_MONO_STEREO )
{
diff --git a/lib_dec/ivas_mct_core_dec.c b/lib_dec/ivas_mct_core_dec.c
index 7e11b23c9a91da28664cd07c259ea63e26b6e429..5222d39b6436c2c2e4ae3563eec0235a3fa968e6 100644
--- a/lib_dec/ivas_mct_core_dec.c
+++ b/lib_dec/ivas_mct_core_dec.c
@@ -70,7 +70,11 @@ void ivas_mct_side_bits(
Decoder_State *st, *sts[MCT_MAX_CHANNELS];
nf_side_bits = 0;
- nChannels = hMCT->nchan_out_woLFE + hMCT->num_lfe;
+ nChannels = hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ ;
/*initializations */
for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ )
@@ -88,7 +92,11 @@ void ivas_mct_side_bits(
for ( ch = 0; ch < nChannels; ch++ )
{
st = sts[ch];
- if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ st->mct_chan_mode == MCT_CHAN_MODE_LFE ||
+#endif
+ st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
@@ -108,15 +116,17 @@ void ivas_mct_side_bits(
availableBits = 0;
ivas_mct_dec_mct( hMCT, sts, nChannels );
- /* availableBits = ((hMCT->mc_bitrate/50) - sts[0]->next_bit_pos);
- availableBits -= NBBITS_MCT_RATIO * nChannels;*/
/*read channel bitrate ratios from bitstream*/
for ( ch = 0; ch < nChannels; ch++ )
{
st = sts[ch];
- if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && hMCT->LFE_off ) || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && hMCT->LFE_off ) ||
+#endif
+ st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
chBitRatios[ch] = 0;
st->bits_frame_channel = 0;
@@ -189,7 +199,11 @@ void ivas_mct_core_dec(
* Initializations
*--------------------------------------------------------------------------------*/
- nChannels = hMCT->nchan_out_woLFE + hMCT->num_lfe;
+ nChannels = hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ ;
/*initializations */
for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ )
@@ -203,7 +217,11 @@ void ivas_mct_core_dec(
for ( ch = 0, i = 0; ch < nChannels; ch++ )
{
- if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ||
+#endif
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
@@ -232,7 +250,11 @@ void ivas_mct_core_dec(
{
st = sts[ch];
- if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) /*indicates LFE */
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ st->mct_chan_mode == MCT_CHAN_MODE_LFE ||
+#endif
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) /*indicates LFE */
{
continue;
}
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c
old mode 100644
new mode 100755
index 1623aad0239fffe7014c0b57b6d87ad0935c9bf1..4492968ad8e32902084ae90566a379fbfabf6ae1
--- a/lib_dec/ivas_mct_dec.c
+++ b/lib_dec/ivas_mct_dec.c
@@ -106,10 +106,12 @@ ivas_error ivas_mct_dec(
}
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( !st_ivas->bfi )
{
hMCT->LFE_off = 0; /* in case of PLC, stick to LFE_off of previous frame; otherwise, the update happens in ivas_mdct_dec_side_bits_frame_channel() */
}
+#endif
for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ )
{
@@ -131,9 +133,14 @@ ivas_error ivas_mct_dec(
if ( !st_ivas->bfi )
{
- ivas_mdct_dec_side_bits_frame_channel( st_ivas->hCPE[cpe_id], param_lpc[cpe_id], p_param[cpe_id], st_ivas->hCPE[0]->hCoreCoder[0],
- &hMCT->LFE_off, nTnsBitsTCX10[cpe_id], param[cpe_id], 1,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ivas_mdct_dec_side_bits_frame_channel( st_ivas->hCPE[cpe_id], param_lpc[cpe_id], p_param[cpe_id], st_ivas->hCPE[0]->hCoreCoder[0], &hMCT->LFE_off, nTnsBitsTCX10[cpe_id], param[cpe_id], 1,
( ( cpe_id + 1 ) * CPE_CHANNELS > st_ivas->nchan_transport ) );
+#else
+ ivas_mdct_dec_side_bits_frame_channel( st_ivas->hCPE[cpe_id], param_lpc[cpe_id], p_param[cpe_id], st_ivas->hCPE[0]->hCoreCoder[0], nTnsBitsTCX10[cpe_id], param[cpe_id], 1,
+ ( ( cpe_id + 1 ) * CPE_CHANNELS > hMCT->nchan_out_woLFE ) );
+#endif
+
st_ivas->BER_detect |= st_ivas->hCPE[cpe_id]->hCoreCoder[0]->BER_detect;
st_ivas->BER_detect |= st_ivas->hCPE[cpe_id]->hCoreCoder[1]->BER_detect;
@@ -156,7 +163,13 @@ ivas_error ivas_mct_dec(
set_zero( x[n][1], L_FRAME48k / 2 );
}
- ivas_mdct_core_invQ( st_ivas->hCPE[cpe_id], hMCT->LFE_off, nTnsBitsTCX10[cpe_id], p_param[cpe_id], param_lpc[cpe_id], param[cpe_id],
+ ivas_mdct_core_invQ( st_ivas->hCPE[cpe_id]
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ hMCT->LFE_off
+#endif
+ ,
+ nTnsBitsTCX10[cpe_id], p_param[cpe_id], param_lpc[cpe_id], param[cpe_id],
fUseTns[cpe_id], tnsData[cpe_id], x, x, Aq[cpe_id], NULL, 1 );
st_ivas->BER_detect |= st_ivas->hCPE[cpe_id]->hCoreCoder[0]->BER_detect;
@@ -166,7 +179,6 @@ ivas_error ivas_mct_dec(
/* MCT core decoder */
ivas_mct_core_dec( hMCT, st_ivas->hCPE, nCPE, output );
-#ifdef DISABLE_RES_CHANNELS_MCT
/* for sba to stereo output disable any further processing for TCs > 2 as it is not needed*/
if ( st_ivas->sba_dirac_stereo_flag )
{
@@ -178,7 +190,6 @@ ivas_error ivas_mct_dec(
}
}
}
-#endif
/* MCT reconstruction and CoreCoder updates */
for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ )
@@ -191,7 +202,11 @@ ivas_error ivas_mct_dec(
x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2];
}
- ivas_mdct_core_tns_ns( hCPE, hMCT->LFE_off, fUseTns[cpe_id], tnsData[cpe_id], x, Aq[cpe_id], 1 );
+ ivas_mdct_core_tns_ns( hCPE,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ hMCT->LFE_off,
+#endif
+ fUseTns[cpe_id], tnsData[cpe_id], x, Aq[cpe_id], 1 );
}
if ( st_ivas->renderer_type == RENDERER_MC )
@@ -226,7 +241,11 @@ ivas_error ivas_mct_dec(
x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2];
}
- ivas_mdct_core_reconstruct( hCPE, x, synth, hMCT->LFE_off, fUseTns[cpe_id], 1 );
+ ivas_mdct_core_reconstruct( hCPE, x, synth,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ hMCT->LFE_off,
+#endif
+ fUseTns[cpe_id], 1 );
/*----------------------------------------------------------------*
* CoreCoder Post-processing and updates
@@ -234,10 +253,12 @@ ivas_error ivas_mct_dec(
for ( n = 0; n < CPE_CHANNELS; n++ )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( sts[n]->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
break;
}
+#endif
if ( st_ivas->sba_dirac_stereo_flag )
{
@@ -245,7 +266,11 @@ ivas_error ivas_mct_dec(
}
/* Postprocessing for ACELP/MDCT core switching and synchronization */
+#ifdef FIX_ISM_DTX_CLICKS
+ if ( ( error = core_switching_post_dec( sts[n], synth[n], output[cpe_id * CPE_CHANNELS + n], hCPE->output_mem[1], st_ivas->ivas_format, 0, output_frame, 0 /*core_switching_flag*/, st_ivas->sba_dirac_stereo_flag, -1, hCPE->last_element_mode ) ) != IVAS_ERR_OK )
+#else
if ( ( error = core_switching_post_dec( sts[n], synth[n], output[cpe_id * CPE_CHANNELS + n], hCPE->output_mem[1], 0, output_frame, 0 /*core_switching_flag*/, st_ivas->sba_dirac_stereo_flag, -1, hCPE->last_element_mode ) ) != IVAS_ERR_OK )
+#endif
{
return error;
}
@@ -279,6 +304,23 @@ ivas_error ivas_mct_dec(
}
#endif
}
+#ifdef ISSUE_24_CLEANUP_MCT_LFE
+ /* move channels after LFE to correct output for multi-channel MCT */
+ if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT )
+ {
+ float tmp[L_FRAME48k];
+
+ /*save center channel output*/
+ mvr2r( output[hMCT->nchan_out_woLFE - 1], tmp, output_frame );
+
+ for ( n = hMCT->nchan_out_woLFE - 1; n >= LFE_CHANNEL; n-- )
+ {
+ mvr2r( output[n - 1], output[n + 1], output_frame );
+ }
+ mvr2r( tmp, output[LFE_CHANNEL - 1], output_frame );
+ set_zero( output[LFE_CHANNEL], output_frame );
+ }
+#endif
#ifdef DEBUG_MODE_INFO
for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ )
@@ -314,7 +356,7 @@ ivas_error create_mct_dec(
int16_t max_blocks;
int16_t cpe_id;
- /*-----------------------------------------------------------------*
+ /*--------------------------------------------------------- --------*
* Allocate MCT handle
*-----------------------------------------------------------------*/
@@ -328,6 +370,7 @@ ivas_error create_mct_dec(
*-----------------------------------------------------------------*/
/* Determine active channels */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT )
{
hMCT->num_lfe = st_ivas->hTransSetup.num_lfe;
@@ -343,6 +386,16 @@ ivas_error create_mct_dec(
hMCT->num_lfe = 0;
hMCT->nchan_out_woLFE = st_ivas->nchan_transport;
}
+#else
+ if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT )
+ {
+ hMCT->nchan_out_woLFE = st_ivas->nchan_transport;
+ }
+ else if ( st_ivas->mc_mode == MC_MODE_MCT )
+ {
+ hMCT->nchan_out_woLFE = st_ivas->nchan_transport - st_ivas->hTransSetup.num_lfe;
+ }
+#endif
else
{
assert( !"IVAS format currently not supported for MCT" );
@@ -356,14 +409,21 @@ ivas_error create_mct_dec(
for ( n = 0; n < CPE_CHANNELS; n++ )
{
st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) )
{
st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE;
}
+#endif
}
}
/* in case we have an uneven number of transport channels, indicate last channel ID as inactive */
- if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 )
+ if ( ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ ) %
+ 2 )
{
st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE;
}
@@ -443,6 +503,7 @@ ivas_error mct_dec_reconfigure(
if ( b_nchan_change )
{
/* Determine active channels */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT )
{
hMCT->num_lfe = st_ivas->hTransSetup.num_lfe;
@@ -458,6 +519,16 @@ ivas_error mct_dec_reconfigure(
hMCT->num_lfe = 0;
hMCT->nchan_out_woLFE = st_ivas->nchan_transport;
}
+#else
+ if ( ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC ) || st_ivas->ivas_format == SBA_FORMAT )
+ {
+ hMCT->nchan_out_woLFE = st_ivas->nchan_transport;
+ }
+ else if ( st_ivas->mc_mode == MC_MODE_MCT )
+ {
+ hMCT->nchan_out_woLFE = st_ivas->nchan_transport - st_ivas->hTransSetup.num_lfe;
+ }
+#endif
else
{
assert( !"IVAS format currently not supported for MCT" );
@@ -470,15 +541,22 @@ ivas_error mct_dec_reconfigure(
for ( n = 0; n < CPE_CHANNELS; n++ )
{
st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) )
{
st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE;
}
+#endif
}
}
/* in case we have an uneven number of transport channels, indicate last channel ID as inactive */
- if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 )
+ if ( ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ ) %
+ 2 )
{
st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE;
}
@@ -495,10 +573,19 @@ ivas_error mct_dec_reconfigure(
st->total_brate = st_ivas->hCPE[cpe_id]->element_brate;
- if ( !( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) )
+ if ( !(
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) ||
+#endif
+ ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) )
{
st->bits_frame_nominal = (int16_t) ( st_ivas->hCPE[cpe_id]->element_brate / FRAMES_PER_SEC );
- st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag, st->mct_chan_mode );
+ st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
if ( st->igf )
{
IGFDecSetMode( st->hIGFDec, st_ivas->hCPE[cpe_id]->element_brate, st->bwidth, st->element_mode, -1, -1, st->rf_flag );
@@ -671,13 +758,14 @@ ivas_error ivas_mc_dec_config(
*-------------------------------------------------------------------------*/
static ivas_error ivas_mc_dec_reconfig(
- Decoder_Struct *st_ivas /* i/o: IVAS encoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
{
int16_t nchan_transport_old, nSCE_old, nCPE_old, sba_dirac_stereo_flag_old, nchan_hp20_old;
int16_t numCldfbAnalyses_old, numCldfbSyntheses_old;
int32_t new_brate_SCE, new_brate_CPE, ivas_total_brate;
RENDERER_TYPE renderer_type_old;
+ Decoder_State *st;
ivas_error error;
MC_MODE mc_mode, last_mc_mode;
@@ -708,7 +796,11 @@ static ivas_error ivas_mc_dec_reconfig(
{
nchan_hp20_old = nchan_transport_old;
}
+#ifdef SBA2MONO
+ st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );
+#else
st_ivas->sba_dirac_stereo_flag = 0; /* needs to be after getNumChanSynthesis() */
+#endif
/* renderer might have changed, reselect */
renderer_type_old = st_ivas->renderer_type;
@@ -729,23 +821,14 @@ static ivas_error ivas_mc_dec_reconfig(
if ( st_ivas->hParamMC != NULL )
{
ivas_param_mc_dec_close( &st_ivas->hParamMC );
- st_ivas->hParamMC = NULL;
+
/* remove ls conversion if it was allocated by ParamMC */
ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion );
}
/* De-allocate McMasa-related handles */
- if ( st_ivas->hMasa != NULL )
- {
- ivas_masa_dec_close( st_ivas->hMasa );
- st_ivas->hMasa = NULL;
- }
-
- if ( st_ivas->hQMetaData != NULL )
- {
- ivas_qmetadata_close( &st_ivas->hQMetaData );
- st_ivas->hQMetaData = NULL;
- }
+ ivas_masa_dec_close( &( st_ivas->hMasa ) );
+ ivas_qmetadata_close( &st_ivas->hQMetaData );
/* init LS conversion if the renderer type asks for it */
if ( st_ivas->renderer_type == RENDERER_MC && st_ivas->hLsSetUpConversion == NULL )
@@ -774,36 +857,25 @@ static ivas_error ivas_mc_dec_reconfig(
}
else
{
- ivas_param_mc_dec_reconfig( st_ivas );
+ if ( ( error = ivas_param_mc_dec_reconfig( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
/* De-allocate McMasa-related handles */
- if ( st_ivas->hMasa != NULL )
- {
- ivas_masa_dec_close( st_ivas->hMasa );
- st_ivas->hMasa = NULL;
- }
-
- if ( st_ivas->hQMetaData != NULL )
- {
- ivas_qmetadata_close( &st_ivas->hQMetaData );
- st_ivas->hQMetaData = NULL;
- }
+ ivas_masa_dec_close( &( st_ivas->hMasa ) );
+ ivas_qmetadata_close( &st_ivas->hQMetaData );
if ( last_mc_mode == MC_MODE_MCT )
{
if ( st_ivas->hMCT != NULL && st_ivas->nchan_transport <= CPE_CHANNELS )
{
ivas_mct_dec_close( &st_ivas->hMCT );
- st_ivas->hMCT = NULL;
}
/* LFE handle */
- if ( st_ivas->hLFE != NULL )
- {
- ivas_lfe_dec_close( st_ivas->hLFE );
- st_ivas->hLFE = NULL;
- }
+ ivas_lfe_dec_close( &( st_ivas->hLFE ) );
}
}
else if ( st_ivas->mc_mode == MC_MODE_MCMASA )
@@ -837,18 +909,10 @@ static ivas_error ivas_mc_dec_reconfig(
if ( last_mc_mode == MC_MODE_MCT )
{
- if ( st_ivas->hMCT != NULL )
- {
- ivas_mct_dec_close( &st_ivas->hMCT );
- st_ivas->hMCT = NULL;
- }
+ ivas_mct_dec_close( &st_ivas->hMCT );
/* LFE handle */
- if ( st_ivas->hLFE != NULL )
- {
- ivas_lfe_dec_close( st_ivas->hLFE );
- st_ivas->hLFE = NULL;
- }
+ ivas_lfe_dec_close( &( st_ivas->hLFE ) );
}
}
@@ -873,7 +937,7 @@ static ivas_error ivas_mc_dec_reconfig(
set correct mct_chan_mode and init missing static mem (IGF, HQ) and some config (TNS) do it here since it is _very_ MC specific */
if ( last_mc_mode == MC_MODE_MCT && st_ivas->mc_mode == MC_MODE_PARAMMC && st_ivas->nchan_transport > CPE_CHANNELS )
{
- Decoder_State *st = st_ivas->hCPE[1]->hCoreCoder[1];
+ st = st_ivas->hCPE[1]->hCoreCoder[1];
if ( st_ivas->nchan_transport == 3 )
{
@@ -916,18 +980,24 @@ static ivas_error ivas_mc_dec_reconfig(
}
}
- st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( ivas_total_brate, st->igf, st->element_mode, st->mct_chan_mode );
+ st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( ivas_total_brate, st->igf, st->element_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
else if ( last_mc_mode == MC_MODE_PARAMMC && st_ivas->mc_mode == MC_MODE_MCT && nchan_transport_old > 2 )
{
#ifdef DEBUGGING
assert( st_ivas->hCPE[1] != NULL );
#endif
- Decoder_State *st = st_ivas->hCPE[1]->hCoreCoder[1];
+ st = st_ivas->hCPE[1]->hCoreCoder[1];
st->mct_chan_mode = MCT_CHAN_MODE_LFE;
st->hTcxCfg->fIsTNSAllowed = 0;
}
-
+#endif
if ( st_ivas->mc_mode == MC_MODE_MCMASA )
{
uint8_t separateChannelEnabled;
@@ -953,7 +1023,7 @@ static ivas_error ivas_mc_dec_reconfig(
if ( last_mc_mode == MC_MODE_MCT && st_ivas->mc_mode == MC_MODE_PARAMMC && st_ivas->nchan_transport > CPE_CHANNELS )
{
- Decoder_State *st = st_ivas->hCPE[1]->hCoreCoder[1];
+ st = st_ivas->hCPE[1]->hCoreCoder[1];
/* TCX-LTP */
if ( st->hTcxLtpDec == NULL )
@@ -966,15 +1036,24 @@ static ivas_error ivas_mc_dec_reconfig(
}
}
- /* re-configure hp20 memories */
- ivas_hp20_dec_reconfig( st_ivas, nchan_hp20_old );
/*-----------------------------------------------------------------*
- * CLDFB instances
+ * re-configure HP20 memories
*-----------------------------------------------------------------*/
- ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old );
+ if ( ( error = ivas_hp20_dec_reconfig( st_ivas, nchan_hp20_old ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ /*-----------------------------------------------------------------*
+ * CLDFB instances
+ *-----------------------------------------------------------------*/
+
+ if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/*-----------------------------------------------------------------*
* Allocate the LFE handle that is coded seperately after the allocation of the core coders
@@ -1001,9 +1080,11 @@ static ivas_error ivas_mc_dec_reconfig(
return error;
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
/* reuse core-coder buffers for LFE decoder */
st_ivas->hLFE->prevsynth_buf = &st_ivas->hCPE[1]->hCoreCoder[1]->old_synth_sw[0];
st_ivas->hLFE->prior_out_buffer = &st_ivas->hCPE[1]->hCoreCoder[1]->previoussynth[0];
+#endif
set_zero( st_ivas->hLFE->prevsynth_buf, LFE_PLC_BUFLEN );
set_zero( st_ivas->hLFE->prior_out_buffer, L_FRAME48k );
@@ -1034,10 +1115,9 @@ static ivas_error ivas_mc_dec_reconfig(
}
}
}
- else if ( ( st_ivas->renderer_type == RENDERER_DISABLE ) && ( st_ivas->hDirAC != NULL ) )
+ else if ( st_ivas->renderer_type == RENDERER_DISABLE && st_ivas->hDirAC != NULL )
{
- ivas_dirac_dec_close( st_ivas->hDirAC );
- st_ivas->hDirAC = NULL;
+ ivas_dirac_dec_close( &( st_ivas->hDirAC ) );
}
}
@@ -1056,17 +1136,9 @@ static ivas_error ivas_mc_dec_reconfig(
ivas_binRenderer_close( &st_ivas->hBinRenderer );
}
-#ifdef FIX_197_CREND_INTERFACE
if ( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hCrend != NULL ) && ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD || st_ivas->hRenderConfig->roomAcoustics.late_reverb_on == 0 ) ) )
-#else
- if ( st_ivas->hCrend != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD || st_ivas->hRenderConfig->roomAcoustics.late_reverb_on == 0 ) ) )
-#endif
{
-#ifdef FIX_197_CREND_INTERFACE
ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );
-#else
- ivas_crend_close( st_ivas );
-#endif
}
if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) )
@@ -1122,43 +1194,26 @@ static ivas_error ivas_mc_dec_reconfig(
return error;
}
-#ifdef FIX_197_CREND_INTERFACE
if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )
{
-#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
if ( ( error = ivas_rend_initCrendWrapper( &st_ivas->hCrendWrapper ) ) != IVAS_ERR_OK )
-#else
- if ( ( st_ivas->hCrendWrapper = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL )
-#endif
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" );
}
-#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
st_ivas->hCrendWrapper->hCrend = NULL;
st_ivas->hCrendWrapper->hHrtfCrend = NULL;
-#endif
if ( ( st_ivas->hCrendWrapper->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend\n" );
}
}
-#else
- if ( st_ivas->hCrend == NULL && st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )
- {
- if ( ( st_ivas->hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend\n" );
- }
- }
-#endif
}
-#ifdef FIX_197_CREND_INTERFACE
else if ( st_ivas->hCrendWrapper == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) )
{
if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ),
st_ivas->intern_config,
st_ivas->hDecoderConfig->output_config,
- st_ivas->hRenderConfig, st_ivas->hDecoderConfig->Opt_Headrotation,
+ st_ivas->hRenderConfig,
st_ivas->hSetOfHRTF,
st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
{
@@ -1166,15 +1221,6 @@ static ivas_error ivas_mc_dec_reconfig(
}
st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;
}
-#else
- else if ( st_ivas->hCrend == NULL && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) )
- {
- if ( ivas_crend_open( st_ivas ) != IVAS_ERR_OK )
- {
- return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "ivas_crend_open failed" );
- }
- }
-#endif
}
/* mono/stereo */
else if ( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO )
diff --git a/lib_dec/ivas_mct_dec_mct.c b/lib_dec/ivas_mct_dec_mct.c
index 7177785984335e307778d3166401851188d13e81..68a846b876dea6667e43abe6365e0dfc60e4498b 100644
--- a/lib_dec/ivas_mct_dec_mct.c
+++ b/lib_dec/ivas_mct_dec_mct.c
@@ -49,8 +49,11 @@
static void indexToChannelPair(
MCT_DEC_BLOCK_DATA_HANDLE hBlock,
const int16_t nChannels,
- const int16_t pairIdx,
+ const int16_t pairIdx
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
Decoder_State **sts /* i/o: decoder state structure */
+#endif
)
{
int16_t ch1, ch2;
@@ -60,10 +63,12 @@ static void indexToChannelPair(
{
for ( ch1 = 0; ch1 < ch2; ch1++ )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( sts[ch1]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch2]->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
continue;
}
+#endif
if ( tmpIdx == pairIdx )
{
@@ -105,7 +110,11 @@ void ivas_mct_dec_mct(
/*first get core and overlap info for all channels*/
for ( ch = 0; ch < nchan; ch++ )
{
- if ( ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) && hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) &&
+#endif
+ hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE )
{
hMCT->mc_global_ild[ch] = get_next_indice( sts[0], SMDCT_GLOBAL_ILD_BITS );
}
@@ -119,7 +128,11 @@ void ivas_mct_dec_mct(
{
for ( ch = 0; ch < nchan; ch++ )
{
- if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE &&
+#endif
+ sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE )
{
hMCT->lowE_ch[ch] = get_next_indice( sts[0], 1 );
}
@@ -128,7 +141,11 @@ void ivas_mct_dec_mct(
for ( ch = 0; ch < nchan; ch++ )
{
- if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE &&
+#endif
+ sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE )
{
nchan_active++;
}
@@ -141,7 +158,12 @@ void ivas_mct_dec_mct(
/*get channel pair index from BS*/
channelPairIndex = get_next_indice( sts[0], hMCT->bitsChannelPairIndex );
- indexToChannelPair( hBlock, nchan, channelPairIndex, sts );
+ indexToChannelPair( hBlock, nchan, channelPairIndex
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ sts
+#endif
+ );
/*point to decoder states of actual channels to read block pair bits*/
p_st[0] = sts[hBlock->ch1];
@@ -170,7 +192,12 @@ static void applyGlobalILD(
int16_t nSubframes, L_subframeTCX;
float qratio;
- for ( ch = 0; ch < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch++ )
+ for ( ch = 0; ch < ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ );
+ ch++ )
{
nSubframes = ( sts[ch]->core == TCX_20_CORE ) ? 1 : NB_DIV;
L_subframeTCX = sts[ch]->hTcxDec->L_frameTCX / nSubframes;
@@ -252,7 +279,11 @@ void mctStereoIGF_dec(
float *p_x[CPE_CHANNELS][NB_DIV];
int16_t singleChEle[MCT_MAX_CHANNELS];
- set_s( singleChEle, 1, ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) );
+ set_s( singleChEle, 1, ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ ) );
for ( b = 0; b < hMCT->currBlockDataCnt; b++ )
{
@@ -305,9 +336,18 @@ void mctStereoIGF_dec(
}
- if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) ) != 0 )
+ if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ ) ) != 0 )
{
- for ( ch = 0; ch < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch++ )
+ for ( ch = 0; ch < ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ );
+ ch++ )
{
if ( singleChEle[ch] )
{
@@ -316,7 +356,11 @@ void mctStereoIGF_dec(
{
continue;
}
- if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE || st->mct_chan_mode == MCT_CHAN_MODE_LFE )
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || st->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ )
{
continue;
}
diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c
index 7763290f8718b03ab40211b3ce781899be1b1996..83aac5cbc1a915310f4603de74638960595879be 100644
--- a/lib_dec/ivas_mdct_core_dec.c
+++ b/lib_dec/ivas_mdct_core_dec.c
@@ -162,22 +162,26 @@ static void dec_prm_tcx_sidebits(
getTCXWindowing( st->core, st->last_core, st->element_mode, st->hTcxCfg, st0 );
st->hTcxDec->kernel_type[0] = st->hTcxDec->kernel_type[1] = MDCT_IV;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->element_mode == IVAS_CPE_MDCT && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
{
+#endif
st->hTcxDec->kernel_type[0] = get_next_indice( st0, st->last_core_from_bs != ACELP_CORE ? 2 : 1 );
if ( st->core == TCX_10_CORE )
{
st->hTcxDec->kernel_type[1] = 2 * ( st->hTcxDec->kernel_type[0] & 1 ) + get_next_indice( st0, 1 );
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
st->hTcxCfg->tcx_curr_overlap_mode = FULL_OVERLAP;
st->hTcxCfg->tcx_last_overlap_mode = FULL_OVERLAP;
st->hTcxCfg->last_aldo = 0;
}
-
+#endif
if ( st->core == TCX_20_CORE )
{
st->transform_type[0] = st->transform_type[1] = TCX_20;
@@ -294,11 +298,13 @@ static void dec_prm_tcx_spec(
*-----------------------------------------------------------------*/
void ivas_mdct_dec_side_bits_frame_channel(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- int16_t param_lpc[MCT_MAX_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */
- int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */
- Decoder_State *st0, /* i : pointer to bitstream handle */
- int16_t *LFE_off, /* o : flag if LFE has content */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ int16_t param_lpc[MCT_MAX_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */
+ int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */
+ Decoder_State *st0, /* i : pointer to bitstream handle */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ int16_t *LFE_off, /* o : flag if LFE has content */
+#endif
int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* o : number of bits for TNS */
int16_t param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV], /* i/o: parameters buffer */
const int16_t MCT_flag, /* i : hMCT handle allocated (1) or not (0)*/
@@ -340,11 +346,14 @@ void ivas_mdct_dec_side_bits_frame_channel(
continue;
}
st = sts[ch];
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
*LFE_off = get_next_indice( st0, 1 );
}
- else if ( MCT_flag )
+ else
+#endif
+ if ( MCT_flag )
{
tmp = get_next_indice( st0, 1 );
if ( tmp )
@@ -362,7 +371,11 @@ void ivas_mdct_dec_side_bits_frame_channel(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
st = sts[ch];
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && *LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
sts[ch]->coder_type = INACTIVE;
sts[ch]->side_bits_frame_channel = 0;
@@ -390,7 +403,11 @@ void ivas_mdct_dec_side_bits_frame_channel(
{
st = sts[ch];
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && *LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
skipped_first_channel = 1;
continue;
@@ -404,7 +421,11 @@ void ivas_mdct_dec_side_bits_frame_channel(
param_lpc[0][0] = get_next_indice( st0, 1 ) << 1;
/* read low br mode flag (if it is possible to be non-zero) */
- if ( sts[0]->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE ) )
+ if ( sts[0]->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ ) )
{
sns_low_br_mode = get_next_indice( st0, 1 );
}
@@ -433,8 +454,10 @@ void ivas_mdct_dec_side_bits_frame_channel(
*-----------------------------------------------------------------*/
void ivas_mdct_core_invQ(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */
- const int16_t LFE_off, /* i : flag if LFE content */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ const int16_t LFE_off, /* i : flag if LFE content */
+#endif
int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* i : number of TNS bits */
int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to param buffer */
int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* i : lpc parameters */
@@ -521,7 +544,11 @@ void ivas_mdct_core_invQ(
{
st = sts[ch];
- if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) /* indicates LFE with no content, or odd number of channels */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
st->total_brate = st->bits_frame_channel;
continue;
@@ -575,12 +602,13 @@ void ivas_mdct_core_invQ(
/* PLC: [Common: mode decision]
* PLC: Decide which Concealment to use. Update pitch lags if needed */
st->core = GetPLCModeDecision( st );
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
/*disable ACELP_PLC for LFE channel */
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
st->core = st->last_core;
}
+#endif
}
if ( ( !st->bfi || st->hTcxCfg->psychParamsCurrent == NULL ) && st->core > ACELP_CORE )
@@ -670,7 +698,11 @@ void ivas_mdct_core_invQ(
{
st = sts[ch];
- if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) /* indicates LFE with no content, or odd number of channels */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
set_f( x[ch][0], 0.f, st->hTcxCfg->tcx_coded_lines );
/* usually set in decoder_tcx_invQ(), needed for concealment */
@@ -727,10 +759,12 @@ void ivas_mdct_core_invQ(
}
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) /*indicates LFE with no content*/
{
set_f( &x[ch][0][MCT_LFE_MAX_LINE], 0.f, st->hTcxCfg->tcx_coded_lines - MCT_LFE_MAX_LINE );
}
+#endif
}
pop_wmops();
@@ -748,9 +782,11 @@ void ivas_mdct_core_reconstruct(
CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
float *x[][NB_DIV], /* i/o: synthesis @internal_FS */
float signal_outFB[CPE_CHANNELS][L_FRAME_PLUS], /* o : synthesis @output_FS */
- const int16_t LFE_off, /* i : flag if LFE content */
- int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : flage TNS enabled */
- const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ const int16_t LFE_off, /* i : flag if LFE content */
+#endif
+ int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : flage TNS enabled */
+ const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/
)
{
int16_t ch, k, bfi;
@@ -772,7 +808,9 @@ void ivas_mdct_core_reconstruct(
int16_t pitch[CPE_CHANNELS][NB_SUBFR16k];
float pit_gain[CPE_CHANNELS][NB_SUBFR16k];
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
int16_t isLFE;
+#endif
int16_t skip_decoding;
set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );
@@ -787,16 +825,21 @@ void ivas_mdct_core_reconstruct(
st = sts[ch];
skip_decoding = 0;
- if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) /* indicates LFE with no content, or odd number of channels */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
skip_decoding = 1;
}
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
isLFE = 0;
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
isLFE = 1;
}
+#endif
nSubframes[ch] = ( st->core == TCX_20_CORE ) ? 1 : NB_DIV;
synth = synth_buf + st->hTcxDec->old_synth_len;
@@ -822,7 +865,11 @@ void ivas_mdct_core_reconstruct(
decoder_tcx_imdct( st, L_frame_global[ch], L_frame_globalTCX[ch], L_spec[ch], tcx_offset[ch],
tcx_offsetFB[ch], L_frame[ch], L_frameTCX[ch], left_rect[ch], &x[ch][k][0], xn_buf,
( ( hCPE->nchan_out == 1 && st->hTcxDec->kernel_type[k] == MDST_IV ) || st->hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) ? MDCT_IV : st->hTcxDec->kernel_type[k],
- fUseTns[ch][k], &synth[k * L_frame[ch]], &synthFB[k * L_frameTCX[ch]], bfi, k, isLFE, 0 );
+ fUseTns[ch][k], &synth[k * L_frame[ch]], &synthFB[k * L_frameTCX[ch]], bfi, k,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ isLFE,
+#endif
+ 0 );
}
else
{
@@ -968,8 +1015,10 @@ void ivas_mdct_core_reconstruct(
*-----------------------------------------------------------------*/
void ivas_mdct_core_tns_ns(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- const int16_t LFE_off, /* i : flag if LFE has content */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ const int16_t LFE_off, /* i : flag if LFE has content */
+#endif
int16_t fUseTns[CPE_CHANNELS][NB_DIV], /* i : two entries for each channel in TCX10 */
STnsData tnsData[CPE_CHANNELS][NB_DIV], /* o : TNS parameter */
float *x[CPE_CHANNELS][NB_DIV], /* o : synthesis @internal_FS */
@@ -1006,7 +1055,11 @@ void ivas_mdct_core_tns_ns(
L_frameTCX_glob[ch] = st->hTcxDec->L_frameTCX / nSubframes[ch];
L_spec[ch] = st->hTcxCfg->tcx_coded_lines / nSubframes[ch];
- if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) || ( st->bfi && st->core == ACELP_CORE ) ) /* indicates LFE with no content, or odd number of channels */
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) ||
+#endif
+ ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) || ( st->bfi && st->core == ACELP_CORE ) ) /* indicates LFE with no content, or odd number of channels */
{
if ( st->hTonalMDCTConc != NULL )
{
diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c
index d2f08ffdd62086f599ca2e7ce1d552d5db2a83d0..2b24b08398ee4031b72a54b1d40c129b8019370d 100644
--- a/lib_dec/ivas_objectRenderer_internal.c
+++ b/lib_dec/ivas_objectRenderer_internal.c
@@ -53,8 +53,22 @@ ivas_error ivas_td_binaural_open(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
{
+#ifdef MASA_AND_OBJECTS
+ int16_t num_src;
+
+ num_src = st_ivas->nchan_transport;
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
+ {
+ num_src = st_ivas->nchan_ism;
+ }
+
+ return ivas_td_binaural_open_unwrap( &st_ivas->hHrtfTD, st_ivas->hDecoderConfig->output_Fs, num_src, st_ivas->ivas_format,
+ st_ivas->transport_config, st_ivas->hRenderConfig->directivity, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns );
+#else
+
return ivas_td_binaural_open_unwrap( &st_ivas->hHrtfTD, st_ivas->hDecoderConfig->output_Fs, st_ivas->nchan_transport, st_ivas->ivas_format,
- st_ivas->transport_config, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns );
+ st_ivas->transport_config, st_ivas->hRenderConfig->directivity, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns );
+#endif
}
@@ -65,19 +79,27 @@ ivas_error ivas_td_binaural_open(
* and renders the current frame.
*---------------------------------------------------------------------*/
-void ivas_td_binaural_renderer(
+ivas_error ivas_td_binaural_renderer(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */
const int16_t output_frame /* i : output frame length */
)
{
- ivas_td_binaural_renderer_unwrap( st_ivas->hRenderConfig, st_ivas->ini_frame,
-#ifdef FIX_197_CREND_INTERFACE
- st_ivas->hCrendWrapper,
+#ifdef MASA_AND_OBJECTS
+ int16_t num_src;
+
+ num_src = st_ivas->nchan_transport;
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
+ {
+ num_src = st_ivas->nchan_ism;
+ }
+
+ return ivas_td_binaural_renderer_unwrap( st_ivas->hReverb, st_ivas->transport_config, st_ivas->hBinRendererTd, num_src, LFE_CHANNEL, st_ivas->ivas_format,
+ st_ivas->hIsmMetaData, st_ivas->hDecoderConfig->Opt_Headrotation, ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Quaternions : NULL,
+ ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Pos : NULL, output, output_frame );
#else
- st_ivas->hCrend,
+ return ivas_td_binaural_renderer_unwrap( st_ivas->hReverb, st_ivas->transport_config, st_ivas->hBinRendererTd, st_ivas->nchan_transport, LFE_CHANNEL, st_ivas->ivas_format,
+ st_ivas->hIsmMetaData, st_ivas->hDecoderConfig->Opt_Headrotation, ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Quaternions : NULL,
+ ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Pos : NULL, output, output_frame );
#endif
- st_ivas->transport_config,
- st_ivas->hDecoderConfig->output_Fs, st_ivas->hBinRendererTd, st_ivas->nchan_transport, LFE_CHANNEL, st_ivas->ivas_format,
- st_ivas->hIsmMetaData, st_ivas->hDecoderConfig->Opt_Headrotation, ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Quaternions : NULL, output, output_frame );
}
diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec.c
index 9233e4be99ddd81a7d50f5506763b0b17cc24ee6..a688e0062f8f63394174a222f07940aa6a9b5aff 100644
--- a/lib_dec/ivas_omasa_dec.c
+++ b/lib_dec/ivas_omasa_dec.c
@@ -35,11 +35,313 @@
#include "ivas_cnst.h"
#include "ivas_prot.h"
#include "prot.h"
+#ifdef OMASA_UPDATES
+#include "ivas_prot_rend.h"
+#endif
+#ifdef OMASA_BRATE_SW
+#include "ivas_rom_com.h"
+#endif
#ifdef DEBUGGING
#include "debug.h"
#endif
+#ifdef MASA_AND_OBJECTS
+/*-------------------------------------------------------------------*
+ * ivas_masa_ism_data_open()
+ *
+ * Allocate and initialize MASA_ISM rendering handle
+ *-------------------------------------------------------------------*/
+
+ivas_error ivas_masa_ism_data_open(
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
+)
+{
+ MASA_ISM_DATA_HANDLE hMasaIsmData;
+ int16_t ch, bin;
+
+ if ( ( hMasaIsmData = (MASA_ISM_DATA_HANDLE) malloc( sizeof( MASA_ISM_DATA ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA ISM data\n" ) );
+ }
+
+ for ( bin = 0; bin < CLDFB_NO_CHANNELS_MAX; bin++ )
+ {
+ for ( ch = 0; ch < 2; ch++ )
+ {
+ hMasaIsmData->ismPreprocMatrix[ch][ch][bin] = 1.0f;
+ hMasaIsmData->ismPreprocMatrix[1 - ch][ch][bin] = 0.0f;
+ hMasaIsmData->eneMoveIIR[ch][bin] = 0.0f;
+ hMasaIsmData->enePreserveIIR[ch][bin] = 0.0f;
+ }
+ hMasaIsmData->preprocEneTarget[bin] = 0.0f;
+ hMasaIsmData->preprocEneRealized[bin] = 0.0f;
+ }
+
+ hMasaIsmData->objectsMoved = 0;
+ hMasaIsmData->delayBuffer = NULL;
+
+#ifdef OMASA_UPDATES
+ for ( ch = 0; ch < st_ivas->nchan_ism; ch++ )
+ {
+ hMasaIsmData->q_elevation_old[ch] = 0.0f;
+ hMasaIsmData->q_azimuth_old[ch] = 0.0f;
+ }
+#endif
+
+ st_ivas->hMasaIsmData = hMasaIsmData;
+
+ return IVAS_ERR_OK;
+}
+
+
+#ifdef OMASA_BRATE_SW
+/*-------------------------------------------------------------------*
+ * ivas_masa_ism_data_close()
+ *
+ * Deallocate MASA_ISM rendering handle
+ *-------------------------------------------------------------------*/
+
+void ivas_masa_ism_data_close(
+ MASA_ISM_DATA_HANDLE *hMasaIsmData /* i/o: MASA_ISM rendering handle */
+)
+{
+ int16_t i;
+
+ if ( hMasaIsmData == NULL || *hMasaIsmData == NULL )
+ {
+ return;
+ }
+
+ if ( ( *hMasaIsmData )->delayBuffer != NULL )
+ {
+ for ( i = 0; i < ( *hMasaIsmData )->delayBuffer_nchan; i++ )
+ {
+ free( ( *hMasaIsmData )->delayBuffer[i] );
+ }
+ free( ( *hMasaIsmData )->delayBuffer );
+ ( *hMasaIsmData )->delayBuffer = NULL;
+ }
+
+ free( *hMasaIsmData );
+ *hMasaIsmData = NULL;
+
+ return;
+}
+#endif
+#endif
+
+
+#ifdef OMASA_BRATE_SW
+/*--------------------------------------------------------------------------*
+ * ivas_omasa_dec_config()
+ *
+ * oMASA decoder configuration
+ *--------------------------------------------------------------------------*/
+
+ivas_error ivas_omasa_dec_config(
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+)
+{
+ int16_t k, sce_id, nSCE_old, nchan_hp20_old, numCldfbAnalyses_old, numCldfbSyntheses_old, n_MD;
+ int32_t ivas_total_brate, ism_total_brate, cpe_brate;
+ ISM_MODE ism_mode_old;
+ ivas_error error;
+
+ /* initializations */
+ ism_total_brate = 0;
+ ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
+
+ /* save previous frame parameters */
+ ism_mode_old = ivas_omasa_ism_mode_select( st_ivas->hDecoderConfig->last_ivas_total_brate, st_ivas->nchan_ism );
+ st_ivas->ism_mode = ism_mode_old;
+
+ ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );
+ nSCE_old = st_ivas->nSCE;
+ nchan_hp20_old = getNumChanSynthesis( st_ivas );
+
+ /* set ism_mode of current frame */
+ st_ivas->ism_mode = ivas_omasa_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism );
+
+ /* MASA reconfig. */
+ cpe_brate = calculate_cpe_brate_MASA_ISM( st_ivas->ism_mode, ivas_total_brate, st_ivas->nchan_ism );
+ if ( st_ivas->ini_active_frame == 0 && ivas_total_brate != FRAME_NO_DATA && ( cpe_brate < MASA_STEREO_MIN_BITRATE ) && st_ivas->nCPE == 1 )
+ {
+ st_ivas->hCPE[0]->nchan_out = 1;
+ }
+ else if ( ( error = ivas_masa_dec_reconfigure( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ if ( cpe_brate < MASA_STEREO_MIN_BITRATE )
+ {
+ st_ivas->hCPE[0]->nchan_out = 1;
+ }
+ else
+ {
+ st_ivas->hCPE[0]->nchan_out = 2;
+ }
+
+ /* OMASA reconfig. */
+ if ( st_ivas->hMasaIsmData == NULL && st_ivas->ivas_format == MASA_ISM_FORMAT )
+ {
+ if ( ( error = ivas_masa_ism_data_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+
+ ivas_set_omasa_TC( st_ivas->ism_mode, st_ivas->nchan_ism, &st_ivas->nSCE, &st_ivas->nCPE );
+
+ /* re-configure hp20 memories */
+ if ( ( error = ivas_hp20_dec_reconfig( st_ivas, nchan_hp20_old ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ /* reconfigure core-coders for ISMs */
+ k = 0;
+ while ( k < SIZE_IVAS_BRATE_TBL && ivas_total_brate != ivas_brate_tbl[k] )
+ {
+ k++;
+ }
+
+ for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ )
+ {
+ ism_total_brate += sep_object_brate[k - 2][st_ivas->nSCE - 1];
+ }
+
+ if ( ( error = ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, 1, 2, 0, sep_object_brate[k - 2][st_ivas->nSCE - 1], ivas_total_brate - ism_total_brate ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ if ( ism_mode_old != st_ivas->ism_mode )
+ {
+ /* ISM MD reconfig. */
+ n_MD = 0;
+
+#ifdef OMASA_UPDATES
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
+#else
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
+#endif
+ {
+ n_MD = 1;
+
+ if ( st_ivas->hIsmMetaData[0] == NULL )
+ {
+ if ( ( error = ivas_ism_metadata_dec_create( st_ivas, 1, NULL ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ }
+ else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
+ {
+ n_MD = st_ivas->nchan_ism;
+
+ ivas_ism_metadata_close( st_ivas->hIsmMetaData, 0 );
+
+ if ( ( error = ivas_ism_metadata_dec_create( st_ivas, st_ivas->nchan_ism, NULL ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+
+ ivas_ism_metadata_close( st_ivas->hIsmMetaData, n_MD );
+
+ /* CLDFB instances */
+ if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, 2, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ st_ivas->hCPE[0]->element_brate = ivas_total_brate - ism_total_brate;
+
+ /* objects renderer reconfig. */
+#ifdef OMASA_UPDATES
+ if ( st_ivas->ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ && st_ivas->ism_mode != ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->hIsmRendererData != NULL )
+#else
+ if ( st_ivas->ism_mode != ISM_MASA_MODE_PARAM_ONE_OBJ && st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->hIsmRendererData != NULL )
+#endif
+ {
+ ivas_masa_ism_data_close( &( st_ivas->hMasaIsmData ) );
+ }
+
+#ifdef OMASA_UPDATES
+ if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC )
+ {
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
+ {
+ /* Allocate TD renderer for the objects in DISC mode */
+ if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
+ if ( ( error = ivas_masa_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ else
+ {
+ /* TD renderer handle */
+ if ( st_ivas->hBinRendererTd != NULL )
+ {
+ ivas_td_binaural_close( &st_ivas->hBinRendererTd );
+ }
+
+ if ( st_ivas->hHrtfTD != NULL ) // VE: this is copied from ivas_ism_bitrate_switching() but a review is needed
+ {
+ st_ivas->hHrtfTD = NULL;
+ }
+
+ /* ISM renderer handle */
+ if ( st_ivas->hIsmRendererData != NULL )
+ {
+ free( st_ivas->hIsmRendererData );
+ st_ivas->hIsmRendererData = NULL;
+ }
+ }
+ }
+
+ if ( st_ivas->renderer_type == RENDERER_DIRAC )
+ {
+ if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_DISC )
+ {
+ /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
+ if ( ( error = ivas_masa_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ else
+ {
+ /* ISM renderer handle */
+ if ( st_ivas->hIsmRendererData != NULL )
+ {
+ free( st_ivas->hIsmRendererData );
+ st_ivas->hIsmRendererData = NULL;
+ }
+ }
+ }
+#endif
+ }
+
+ return IVAS_ERR_OK;
+}
+#endif
+
+
#ifdef MASA_AND_OBJECTS
/*--------------------------------------------------------------------------*
* ivas_set_surplus_brate_dec()
@@ -49,7 +351,7 @@
void ivas_set_surplus_brate_dec(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- int32_t *ism_total_brate /* i/o: ISM total bit-rate */
+ int32_t *ism_total_brate /* i/o: ISM total bitrate */
)
{
int16_t n, bits_ism, bits_element[MAX_NUM_OBJECTS];
diff --git a/lib_dec/ivas_out_setup_conversion.c b/lib_dec/ivas_out_setup_conversion.c
index 787ceaaf44ac7fe6059d334b85d545214aaf240c..b396fa415cd01ad0317602d5a58df9ce417d48b0 100644
--- a/lib_dec/ivas_out_setup_conversion.c
+++ b/lib_dec/ivas_out_setup_conversion.c
@@ -332,8 +332,14 @@ ivas_error ivas_ls_setup_conversion_open(
hLsSetUpConversion->sfbCnt = (int16_t) ( output_Fs * INV_CLDFB_BANDWIDTH + 0.5f );
for ( chIdx = 0; chIdx < outChannels; chIdx++ )
{
- hLsSetUpConversion->targetEnergyPrev[chIdx] = (float *) malloc( ( hLsSetUpConversion->sfbCnt ) * sizeof( float ) );
- hLsSetUpConversion->dmxEnergyPrev[chIdx] = (float *) malloc( ( hLsSetUpConversion->sfbCnt ) * sizeof( float ) );
+ if ( ( hLsSetUpConversion->targetEnergyPrev[chIdx] = (float *) malloc( ( hLsSetUpConversion->sfbCnt ) * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LS configuration Conversion Handle \n" ) );
+ }
+ if ( ( hLsSetUpConversion->dmxEnergyPrev[chIdx] = (float *) malloc( ( hLsSetUpConversion->sfbCnt ) * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LS configuration Conversion Handle \n" ) );
+ }
set_f( hLsSetUpConversion->targetEnergyPrev[chIdx], 0.0f, hLsSetUpConversion->sfbCnt );
set_f( hLsSetUpConversion->dmxEnergyPrev[chIdx], 0.0f, hLsSetUpConversion->sfbCnt );
}
@@ -348,8 +354,15 @@ ivas_error ivas_ls_setup_conversion_open(
inChannels = st_ivas->nchan_transport;
/*Initialization of MDCT bands with TCX20 resolution */
ivas_lssetupconversion_mdct_init_bands( output_frame, TCX_20_CORE, &hLsSetUpConversion->sfbOffset[0], &hLsSetUpConversion->sfbCnt );
- hLsSetUpConversion->targetEnergyPrev[0] = (float *) malloc( ( MAX_SFB + 2 ) * sizeof( float ) );
- hLsSetUpConversion->dmxEnergyPrev[0] = (float *) malloc( ( MAX_SFB + 2 ) * sizeof( float ) );
+ if ( ( hLsSetUpConversion->targetEnergyPrev[0] = (float *) malloc( ( MAX_SFB + 2 ) * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LS configuration Conversion Handle \n" ) );
+ }
+ if ( ( hLsSetUpConversion->dmxEnergyPrev[0] = (float *) malloc( ( MAX_SFB + 2 ) * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LS configuration Conversion Handle \n" ) );
+ }
+
for ( chIdx = 1; chIdx < MAX_CICP_CHANNELS; chIdx++ )
{
hLsSetUpConversion->targetEnergyPrev[chIdx] = NULL;
@@ -587,7 +600,13 @@ void ivas_ls_setup_conversion_process_mdct(
{
dmxCoeff = hLsSetUpConversion->dmxMtx[chInIdx][chOutIdx];
- if ( !( chInIdx == LFE_CHANNEL && st_ivas->hMCT->LFE_off ) && mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ !( chInIdx == LFE_CHANNEL && st_ivas->hMCT->LFE_off ) &&
+#else
+ chInIdx != LFE_CHANNEL &&
+#endif
+ mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE )
{
/* Step 1: Compute the target energy and DMX signal (possible since we have all signals in TCX20 resolution) */
if ( dmxCoeff )
@@ -680,7 +699,13 @@ void ivas_ls_setup_conversion_process_mdct(
/* Step 4: Perform equalization */
for ( chInIdx = 0; chInIdx < inChannels; chInIdx++ )
{
- if ( !( chInIdx == LFE_CHANNEL && st_ivas->hMCT->LFE_off ) && mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ !( chInIdx == LFE_CHANNEL && st_ivas->hMCT->LFE_off ) &&
+#else
+ chInIdx != LFE_CHANNEL &&
+#endif
+ mct_chan_mode[chInIdx] != MCT_CHAN_MODE_IGNORE )
{
if ( transform_type[chInIdx][0] == TCX_20 )
{
diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config.c
index 4890daebc4102bc350cf014da3d11a994460e2d1..bd195b945b2984db1522b198c91126cf2f1f3cd8 100644
--- a/lib_dec/ivas_output_config.c
+++ b/lib_dec/ivas_output_config.c
@@ -307,7 +307,11 @@ void ivas_renderer_select(
*renderer_type = RENDERER_DIRAC;
if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR &&
+#ifdef SBA2MONO
+ ( output_config != AUDIO_CONFIG_5_1 && output_config != AUDIO_CONFIG_5_1_2 && output_config != AUDIO_CONFIG_5_1_4 && output_config != AUDIO_CONFIG_7_1 && output_config != AUDIO_CONFIG_7_1_4 && output_config != AUDIO_CONFIG_LS_CUSTOM && output_config != AUDIO_CONFIG_MONO && output_config != AUDIO_CONFIG_STEREO ) )
+#else
( output_config != AUDIO_CONFIG_5_1 && output_config != AUDIO_CONFIG_5_1_2 && output_config != AUDIO_CONFIG_5_1_4 && output_config != AUDIO_CONFIG_7_1 && output_config != AUDIO_CONFIG_7_1_4 && output_config != AUDIO_CONFIG_LS_CUSTOM ) )
+#endif
{
if ( output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_FOA )
{
@@ -324,7 +328,11 @@ void ivas_renderer_select(
st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC;
}
else if ( ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ||
+#ifdef SBA2MONO
+ ( st_ivas->ivas_format == SBA_FORMAT && ( output_config == AUDIO_CONFIG_STEREO || output_config == AUDIO_CONFIG_MONO ) ) )
+#else
( st_ivas->ivas_format == SBA_FORMAT && output_config == AUDIO_CONFIG_STEREO && st_ivas->nchan_transport == 1 ) )
+#endif
{
*renderer_type = RENDERER_DISABLE;
}
diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c
old mode 100644
new mode 100755
index 98fad8c094ce9346f5f52e3a63edf8a3057231ed..5377ad9402f4e5362be22a3aaed0a35bcd1bcbc8
--- a/lib_dec/ivas_sba_dec.c
+++ b/lib_dec/ivas_sba_dec.c
@@ -46,8 +46,58 @@
#endif
#include "wmc_auto.h"
+
+#ifdef FIX_386_CORECODER_RECONFIG
+/*-------------------------------------------------------------------*
+ * ivas_sba_set_cna_cng_flag()
+ *
+ * Set CNA/CNG flags in IVAS SBA decoder
+ *-------------------------------------------------------------------*/
+
+void ivas_sba_set_cna_cng_flag(
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+)
+{
+ int16_t n, cpe_id;
+
+ if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->nchan_transport == 1 )
+ {
+ /* skip as done in init function */
+ /* st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 0; */ /* Todo: Check if these can be enabled */
+ /* st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 0; */
+ }
+ else if ( st_ivas->nchan_transport == 1 && ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) ) )
+ {
+ st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 1;
+ st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 1;
+ }
+ else if ( st_ivas->nchan_transport == 2 )
+ {
+ for ( n = 0; n < CPE_CHANNELS; n++ )
+ {
+ st_ivas->hCPE[0]->hCoreCoder[n]->cna_dirac_flag = 0; /* Todo: Check if these can be enabled */
+ st_ivas->hCPE[0]->hCoreCoder[n]->cng_sba_flag = 1;
+ }
+ }
+ else
+ {
+ for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )
+ {
+ for ( n = 0; n < CPE_CHANNELS; n++ )
+ {
+ st_ivas->hCPE[cpe_id]->hCoreCoder[n]->cna_dirac_flag = 0;
+ st_ivas->hCPE[cpe_id]->hCoreCoder[n]->cng_sba_flag = 0;
+ }
+ }
+ }
+
+ return;
+}
+#endif
+
+
/*-------------------------------------------------------------------*
- * ivas_sba_dec_decoder()
+ * ivas_sba_dec_reconfigure()
*
* Reconfigure IVAS SBA decoder
*-------------------------------------------------------------------*/
@@ -62,8 +112,10 @@ ivas_error ivas_sba_dec_reconfigure(
int16_t sba_dirac_stereo_flag_old;
SBA_MODE sba_mode_old;
int32_t ivas_total_brate, last_ivas_total_brate;
+ RENDERER_TYPE old_renderer_type;
DECODER_CONFIG_HANDLE hDecoderConfig;
ivas_error error;
+ int16_t band_grouping[IVAS_MAX_NUM_BANDS + 1];
error = IVAS_ERR_OK;
@@ -103,142 +155,66 @@ ivas_error ivas_sba_dec_reconfigure(
st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate );
/*-----------------------------------------------------------------*
- * Allocate, initalize, and configure SBA handles
+ * Allocate, initialize, and configure SBA handles
*-----------------------------------------------------------------*/
if ( st_ivas->sba_mode != SBA_MODE_SPAR )
{
- ivas_spar_dec_close( st_ivas->hSpar, hDecoderConfig->output_Fs );
- st_ivas->hSpar = NULL;
+ ivas_spar_dec_close( &( st_ivas->hSpar ), hDecoderConfig->output_Fs, 0 );
if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, -1 ) ) != IVAS_ERR_OK )
{
return error;
}
+#ifdef SBA2MONO
+ st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );
+#else
st_ivas->sba_dirac_stereo_flag = ( st_ivas->nchan_transport == 1 && hDecoderConfig->output_config == AUDIO_CONFIG_STEREO );
+#endif
}
else
{
- int16_t i, sba_order_internal, nchan_internal;
- DIRAC_DEC_HANDLE hDirAC = st_ivas->hDirAC;
+ int16_t sba_order_internal;
SPAR_DEC_HANDLE hSpar = st_ivas->hSpar;
sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER );
- nchan_internal = ivas_sba_get_nchan_metadata( sba_order_internal );
- if ( hSpar != NULL && nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) )
+ if ( hSpar != NULL )
{
- // VE: dirty patch -> reconfiguration of SPAR modules should be used instead !!
- IVAS_FB_CFG *fb_cfg;
- int16_t active_w_mixing;
-
- /* MD handle */
- ivas_spar_md_dec_close( &hSpar->hMdDec );
-
- if ( ( error = ivas_spar_md_dec_open( &hSpar->hMdDec, st_ivas->hDecoderConfig, nchan_internal, sba_order_internal, st_ivas->sid_format ) ) != IVAS_ERR_OK )
+ if ( ( hSpar->hPCA != NULL ) && ( ( hDecoderConfig->ivas_total_brate != PCA_BRATE ) || ( sba_order_internal != 1 ) ) )
{
- return error;
- }
- hSpar->hMdDec->td_decorr_flag = 1;
- hSpar->hMdDec->table_idx = -1;
-
- /* TD decorr. */
- ivas_td_decorr_dec_close( &hSpar->hTdDecorr );
-
- if ( ( error = ivas_td_decorr_dec_open( &hSpar->hTdDecorr, hDecoderConfig->output_Fs, nchan_internal, 1 ) ) != IVAS_ERR_OK )
- {
- return error;
+ free( st_ivas->hSpar->hPCA );
+ hSpar->hPCA = NULL;
}
- /* FB mixer handle */
- ivas_FB_mixer_close( &hSpar->hFbMixer, hDecoderConfig->output_Fs );
-
- /* set FB config. */
- active_w_mixing = -1;
- if ( ( error = ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_SPAR, nchan_internal, nchan_internal, active_w_mixing, hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
+ if ( nchan_transport_old != ivas_get_sba_num_TCs( ivas_total_brate, sba_order_internal ) )
{
- return error;
- }
- fb_cfg->pcm_offset = NS2SA( hDecoderConfig->output_Fs, DELAY_FB_1_NS + IVAS_ENC_DELAY_NS + IVAS_DEC_DELAY_NS );
- fb_cfg->remix_order = remix_order_set[hSpar->hMdDec->spar_md_cfg.remix_unmix_order];
- /* FB mixer handle */
- if ( ( error = ivas_FB_mixer_open( &hSpar->hFbMixer, hDecoderConfig->output_Fs, fb_cfg ) ) != IVAS_ERR_OK )
- {
- return error;
- }
+ ivas_spar_dec_close( &( st_ivas->hSpar ), hDecoderConfig->output_Fs, 1 );
- /* mixer_mat intitialization */
- for ( i = 0; i < nchan_internal; i++ )
- {
- for ( int16_t j = 0; j < nchan_internal; j++ )
+ if ( ( error = ivas_spar_dec_open( st_ivas, 1 ) ) != IVAS_ERR_OK )
{
- for ( int16_t b = 0; b < IVAS_MAX_NUM_BANDS; b++ )
- {
- hSpar->hMdDec->mixer_mat[i][j][b] = 0.0f;
- for ( int16_t i_ts = 0; i_ts < ( MAX_PARAM_SPATIAL_SUBFRAMES + 1 ); i_ts++ )
- {
- hSpar->hMdDec->mixer_mat_prev[i_ts][i][j][b] = 0.0f;
- }
- }
- }
- }
- hSpar->i_subframe = 0;
- }
-
- /* PCA handle */
- if ( hSpar != NULL )
- {
- if ( hDecoderConfig->ivas_total_brate == PCA_BRATE && sba_order_internal == 1 )
- {
- if ( ( hSpar->hPCA = (PCA_DEC_STATE *) malloc( sizeof( PCA_DEC_STATE ) ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for PCA decoder" );
+ return error;
}
-
- ivas_pca_dec_init( hSpar->hPCA );
- }
- else if ( hSpar->hPCA != NULL )
- {
- free( st_ivas->hSpar->hPCA );
- hSpar->hPCA = NULL;
- }
- }
-
- if ( hSpar == NULL && st_ivas->sba_mode == SBA_MODE_SPAR )
- {
- if ( ( error = ivas_spar_dec_open( st_ivas ) ) != IVAS_ERR_OK )
- {
- return error;
}
- hSpar = st_ivas->hSpar;
+ ivas_spar_config( ivas_total_brate, sba_order_internal, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &hSpar->core_nominal_brate, st_ivas->sid_format );
}
- st_ivas->sba_dirac_stereo_flag = 0;
-
- sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER );
- ivas_spar_config( ivas_total_brate, sba_order_internal, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &hSpar->core_nominal_brate, st_ivas->sid_format );
-
- if ( hDirAC == NULL && st_ivas->sba_mode == SBA_MODE_DIRAC )
+ else
{
- if ( ( error = ivas_dirac_dec_open( st_ivas ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_spar_dec_open( st_ivas, 0 ) ) != IVAS_ERR_OK )
{
return error;
}
-
- hDirAC = st_ivas->hDirAC;
- }
-
- if ( hDirAC != NULL && sba_mode_old == st_ivas->sba_mode )
- {
- ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE_MODE );
}
- if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK )
- {
- return error;
- }
+ hSpar = st_ivas->hSpar;
+#ifdef SBA2MONO
+ st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );
+#else
+ st_ivas->sba_dirac_stereo_flag = 0;
+#endif
}
if ( st_ivas->nchan_transport == 1 )
@@ -256,7 +232,6 @@ ivas_error ivas_sba_dec_reconfigure(
/* renderer might have changed */
intern_config_old = st_ivas->intern_config;
- RENDERER_TYPE old_renderer_type;
old_renderer_type = st_ivas->renderer_type;
ivas_renderer_select( st_ivas );
@@ -282,6 +257,7 @@ ivas_error ivas_sba_dec_reconfigure(
{
ivas_binRenderer_close( &st_ivas->hBinRenderer );
}
+
if ( st_ivas->renderer_type != old_renderer_type )
{
if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )
@@ -304,17 +280,18 @@ ivas_error ivas_sba_dec_reconfigure(
{
ivas_dirac_dec_close_binaural_data( &st_ivas->hDiracDecBin );
}
- if ( ( ( st_ivas->renderer_type != RENDERER_DISABLE ) && ( st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC ) ) || ( sba_mode_old != st_ivas->sba_mode ) )
+
+ if ( ( ( st_ivas->renderer_type != RENDERER_DISABLE ) && ( st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC ) ) || ( sba_mode_old != st_ivas->sba_mode ) || ( ( st_ivas->sba_mode == SBA_MODE_SPAR ) && ( ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA ) && ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO ) && ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO ) ) ) )
{
DIRAC_CONFIG_FLAG flag_config;
flag_config = DIRAC_OPEN;
if ( st_ivas->hDirAC != NULL )
{
- flag_config = DIRAC_RECONFIGURE;
- if ( sba_mode_old != st_ivas->sba_mode && st_ivas->sba_mode != SBA_MODE_SPAR )
+ flag_config = DIRAC_RECONFIGURE_MODE;
+ if ( ( sba_mode_old == st_ivas->sba_mode ) && ( st_ivas->sba_mode != SBA_MODE_SPAR ) )
{
- flag_config = DIRAC_RECONFIGURE_MODE;
+ flag_config = DIRAC_RECONFIGURE;
}
}
@@ -323,18 +300,30 @@ ivas_error ivas_sba_dec_reconfigure(
return error;
}
}
- else if ( st_ivas->renderer_type == RENDERER_DISABLE || ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC && st_ivas->sba_mode != SBA_MODE_SPAR ) )
+
+ if ( st_ivas->sba_mode == SBA_MODE_SPAR )
{
- if ( st_ivas->hDirAC != NULL )
+ if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK )
{
- ivas_dirac_dec_close( st_ivas->hDirAC );
- st_ivas->hDirAC = NULL;
+ return error;
}
+ }
- if ( st_ivas->hVBAPdata != NULL )
- {
- vbap_free_data( &( st_ivas->hVBAPdata ) );
- }
+ if ( ( ( hDecoderConfig->output_config == AUDIO_CONFIG_FOA ) || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO ) ) && ( ( sba_mode_old != st_ivas->sba_mode ) && ( st_ivas->sba_mode == SBA_MODE_SPAR ) ) )
+ {
+ ivas_dirac_dec_close( &( st_ivas->hDirAC ) );
+
+ st_ivas->hSpar->enc_param_start_band = min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND );
+
+ ivas_dirac_config_bands( band_grouping, IVAS_MAX_NUM_BANDS, (int16_t) ( st_ivas->hDecoderConfig->output_Fs * INV_CLDFB_BANDWIDTH + 0.5f ),
+ st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 );
+ }
+
+ else if ( st_ivas->renderer_type == RENDERER_DISABLE || ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC && st_ivas->sba_mode != SBA_MODE_SPAR ) )
+ {
+ ivas_dirac_dec_close( &( st_ivas->hDirAC ) );
+
+ vbap_free_data( &( st_ivas->hVBAPdata ) );
}
if ( st_ivas->hDirAC != NULL && st_ivas->sba_mode == SBA_MODE_SPAR )
@@ -344,23 +333,31 @@ ivas_error ivas_sba_dec_reconfigure(
}
/*-----------------------------------------------------------------*
- * Allocate, initalize, and configure SCE/CPE/MCT handles
+ * Allocate, initialize, and configure SCE/CPE/MCT handles
*-----------------------------------------------------------------*/
- ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, sba_dirac_stereo_flag_old, st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport, ( st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS );
+ if ( ( error = ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, sba_dirac_stereo_flag_old, st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport, ( st_ivas->hDecoderConfig->ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/*-----------------------------------------------------------------*
* HP20 memories
*-----------------------------------------------------------------*/
- ivas_hp20_dec_reconfig( st_ivas, nchan_hp20_old );
+ if ( ( error = ivas_hp20_dec_reconfig( st_ivas, nchan_hp20_old ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/*-----------------------------------------------------------------*
* CLDFB instances
*-----------------------------------------------------------------*/
- ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old );
-
+ if ( ( error = ivas_cldfb_dec_reconfig( st_ivas, nchan_transport_old, numCldfbAnalyses_old, numCldfbSyntheses_old ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
return error;
}
diff --git a/lib_dec/ivas_sba_dirac_stereo_dec.c b/lib_dec/ivas_sba_dirac_stereo_dec.c
index e184654eaa1d36a2c7d0c1da9b82558746a46176..82ccaceea92e266ab569af6a080a9cb4cebebf76 100644
--- a/lib_dec/ivas_sba_dirac_stereo_dec.c
+++ b/lib_dec/ivas_sba_dirac_stereo_dec.c
@@ -45,6 +45,46 @@
#include "wmc_auto.h"
+#ifdef SBA2MONO
+/*-------------------------------------------------------------------*
+ * ivas_get_sba_dirac_stereo_flag()
+ *
+ * Set sba_dirac_stereo_flag
+ *-------------------------------------------------------------------*/
+
+int16_t ivas_get_sba_dirac_stereo_flag(
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+)
+{
+ int16_t sba_dirac_stereo_flag;
+ AUDIO_CONFIG output_config;
+
+ sba_dirac_stereo_flag = 0;
+ output_config = st_ivas->hDecoderConfig->output_config;
+
+ if ( st_ivas->ivas_format == SBA_FORMAT || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) )
+ {
+ if ( st_ivas->sba_mode == SBA_MODE_SPAR )
+ {
+ if ( output_config == AUDIO_CONFIG_STEREO || ( output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) )
+ {
+ sba_dirac_stereo_flag = 1;
+ }
+ }
+ else
+ {
+ if ( st_ivas->nchan_transport == 1 && output_config == AUDIO_CONFIG_STEREO )
+ {
+ sba_dirac_stereo_flag = 1;
+ }
+ }
+ }
+
+ return sba_dirac_stereo_flag;
+}
+#endif
+
+
/*-------------------------------------------------------------------*
* ivas_sba_dirac_stereo_config()
*
@@ -453,13 +493,93 @@ static void ivas_sba_dirac_stereo_upmix_hb(
float hb_gain[NB_DIV], /* i : side gains for HB signal */
const int16_t output_frame, /* i : output frame length per channel */
const int16_t mcmasa, /* i : McMASA flag */
- const STEREO_DFT_DEC_DATA_HANDLE hStereoDft /* i : Stereo DFT handle for mixing matrix */
+#ifdef SBA2MONO
+ const int16_t sba_mono_flag, /* i : flag for mono output */
+ const int16_t bwidth, /* i : bandwidth of signal */
+#endif
+ const STEREO_DFT_DEC_DATA_HANDLE hStereoDft /* i : Stereo DFT handle for mixing matrix */
)
{
int16_t i;
+#ifdef SBA2MONO
+ float gp, gm;
+ float gain_fac;
+#endif
if ( !mcmasa )
{
+#ifdef SBA2MONO
+ gain_fac = ( bwidth == FB ) ? 0.25f : 0.33f; /* last matrix element not used for SWB, divide by 3 instead of 4*/
+ if ( sba_mono_flag )
+ {
+ gp = hStereoDft->mixer_mat_smooth[0][0][8] + hStereoDft->mixer_mat_smooth[0][0][9] +
+ hStereoDft->mixer_mat_smooth[0][0][10];
+ if ( bwidth == FB )
+ {
+ gp += hStereoDft->mixer_mat_smooth[0][0][11];
+ }
+ for ( i = 0; i < output_frame / 2; i++ )
+ {
+ hb_stereo_synth[0][i] = hb_synth[i] * gain_fac * gp;
+ }
+ gp = hStereoDft->mixer_mat_smooth[0][0][8 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][0][9 + IVAS_MAX_NUM_BANDS] +
+ hStereoDft->mixer_mat_smooth[0][0][10 + IVAS_MAX_NUM_BANDS];
+ if ( bwidth == FB )
+ {
+ gp += hStereoDft->mixer_mat_smooth[0][0][11 + IVAS_MAX_NUM_BANDS];
+ }
+ for ( i = output_frame / 2; i < output_frame; i++ )
+ {
+ hb_stereo_synth[0][i] = hb_synth[i] * gain_fac * gp;
+ }
+ }
+ else
+ {
+ gp = hStereoDft->mixer_mat_smooth[0][0][8] + hStereoDft->mixer_mat_smooth[1][0][8] +
+ hStereoDft->mixer_mat_smooth[0][0][9] + hStereoDft->mixer_mat_smooth[1][0][9] +
+ hStereoDft->mixer_mat_smooth[0][0][10] + hStereoDft->mixer_mat_smooth[1][0][10];
+ if ( bwidth == FB )
+ {
+ gp += hStereoDft->mixer_mat_smooth[0][0][11] + hStereoDft->mixer_mat_smooth[1][0][11];
+ }
+
+ gm = hStereoDft->mixer_mat_smooth[0][0][8] - hStereoDft->mixer_mat_smooth[1][0][8] +
+ hStereoDft->mixer_mat_smooth[0][0][9] - hStereoDft->mixer_mat_smooth[1][0][9] +
+ hStereoDft->mixer_mat_smooth[0][0][10] - hStereoDft->mixer_mat_smooth[1][0][10];
+ if ( bwidth == FB )
+ {
+ gm += hStereoDft->mixer_mat_smooth[0][0][11] - hStereoDft->mixer_mat_smooth[1][0][11];
+ }
+
+ for ( i = 0; i < output_frame / 2; i++ )
+ {
+ hb_stereo_synth[0][i] = 0.5f * hb_synth[i] * gain_fac * gp;
+ hb_stereo_synth[1][i] = 0.5f * hb_synth[i] * gain_fac * gm;
+ }
+
+ gp = hStereoDft->mixer_mat_smooth[0][0][8 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][8 + IVAS_MAX_NUM_BANDS] +
+ hStereoDft->mixer_mat_smooth[0][0][9 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][9 + IVAS_MAX_NUM_BANDS] +
+ hStereoDft->mixer_mat_smooth[0][0][10 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][10 + IVAS_MAX_NUM_BANDS];
+ if ( bwidth == FB )
+ {
+ gp += hStereoDft->mixer_mat_smooth[0][0][11 + IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][0][11 + IVAS_MAX_NUM_BANDS];
+ }
+
+ gm = hStereoDft->mixer_mat_smooth[0][0][8 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][8 + IVAS_MAX_NUM_BANDS] +
+ hStereoDft->mixer_mat_smooth[0][0][9 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][9 + IVAS_MAX_NUM_BANDS] +
+ hStereoDft->mixer_mat_smooth[0][0][10 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][10 + IVAS_MAX_NUM_BANDS];
+ if ( bwidth == FB )
+ {
+ gm += hStereoDft->mixer_mat_smooth[0][0][11 + IVAS_MAX_NUM_BANDS] - hStereoDft->mixer_mat_smooth[1][0][11 + IVAS_MAX_NUM_BANDS];
+ }
+
+ for ( i = output_frame / 2; i < output_frame; i++ )
+ {
+ hb_stereo_synth[0][i] = 0.5f * hb_synth[i] * gain_fac * gp;
+ hb_stereo_synth[1][i] = 0.5f * hb_synth[i] * gain_fac * gm;
+ }
+ }
+#else
for ( i = 0; i < output_frame / 2; i++ )
{
float gp = hStereoDft->mixer_mat_smooth[0][0][8] + hStereoDft->mixer_mat_smooth[1][0][8] +
@@ -490,6 +610,7 @@ static void ivas_sba_dirac_stereo_upmix_hb(
hb_stereo_synth[0][i] = 0.5f * hb_synth[i] * 0.25f * gp;
hb_stereo_synth[1][i] = 0.5f * hb_synth[i] * 0.25f * gm;
}
+#endif
}
else
{
@@ -732,6 +853,9 @@ void ivas_sba_dirac_stereo_dec(
)
{
int16_t dtx_flag, fd_cng_flag;
+#ifdef SBA2MONO
+ int16_t sba_mono_flag;
+#endif
int16_t memOffset;
float tmp_buf[NS2SA( 48000, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS )];
float tmp_synth[L_FRAME16k];
@@ -756,6 +880,9 @@ void ivas_sba_dirac_stereo_dec(
dtx_flag = ( hSCE->hCoreCoder[0]->core_brate <= SID_2k40 );
fd_cng_flag = ( dtx_flag && hSCE->hCoreCoder[0]->cng_type == FD_CNG );
}
+#ifdef SBA2MONO
+ sba_mono_flag = ( st_ivas->hDecoderConfig->nchan_out == 1 ) ? 1 : 0;
+#endif
memOffset = NS2SA( output_frame * FRAMES_PER_SEC, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS );
@@ -794,20 +921,39 @@ void ivas_sba_dirac_stereo_dec(
}
/* DFT Stereo upmix */
+#ifdef SBA2MONO
+ stereo_dft_dec( hStereoDft, hCPE->hCoreCoder[0], DFT, NULL, NULL, 1 /*st_ivas->sba_dirac_stereo_flag*/, sba_mono_flag,
+#else
stereo_dft_dec( hStereoDft, hCPE->hCoreCoder[0], DFT, NULL, NULL, 1, /*st_ivas->sba_dirac_stereo_flag*/
+#endif
( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hMdDec : 0,
( st_ivas->hSpar != NULL && !mcmasa ) ? st_ivas->hSpar->hFbMixer->cross_fade_start_offset : 0,
st_ivas->hDecoderConfig->output_Fs, st_ivas->nchan_transport );
/* DFT synthesis */
stereo_dft_dec_synthesize( hCPE, DFT, 0, output[0], output_frame );
+#ifdef SBA2MONO
+ if ( !sba_mono_flag )
+ {
+ stereo_dft_dec_synthesize( hCPE, DFT, 1, output[1], output_frame );
+ }
+#else
stereo_dft_dec_synthesize( hCPE, DFT, 1, output[1], output_frame );
+#endif
synchro_synthesis( st_ivas->hDecoderConfig->ivas_total_brate, hCPE, output, output_frame, 1 /*st_ivas->sba_dirac_stereo_flag*/ );
/* output scaling */
+#ifdef SBA2MONO
+ if ( !sba_mono_flag )
+ {
+ v_multc( output[0], 0.5f, output[0], output_frame );
+ v_multc( output[1], 0.5f, output[1], output_frame );
+ }
+#else
v_multc( output[0], 0.5f, output[0], output_frame );
v_multc( output[1], 0.5f, output[1], output_frame );
+#endif
/* delay HB synth */
if ( st_ivas->nchan_transport == 1 )
@@ -824,15 +970,26 @@ void ivas_sba_dirac_stereo_dec(
ivas_sba_dirac_stereo_compute_hb_gain( hStereoDft, hb_gain );
ivas_sba_dirac_stereo_upmix_hb( hb_synth_stereo, hSCE->save_hb_synth, hb_gain, output_frame,
+#ifdef SBA2MONO
+ ( st_ivas->sba_mode != SBA_MODE_SPAR || mcmasa ), sba_mono_flag, hSCE->hCoreCoder[0]->bwidth, hStereoDft );
+#else
( st_ivas->sba_mode != SBA_MODE_SPAR || mcmasa ), hStereoDft );
+#endif
/* add HB to ACELP core */
v_add( output[0], hb_synth_stereo[0], output[0], output_frame );
- v_add( output[1], hb_synth_stereo[1], output[1], output_frame );
+#ifdef SBA2MONO
+ if ( !sba_mono_flag )
+ {
+#endif
+ v_add( output[1], hb_synth_stereo[1], output[1], output_frame );
- /* apply TD Stereo Filling as is done in ICBWE */
- ivas_sba_dirac_stereo_apply_td_stefi( hStereoDft, output, output_frame, ( st_ivas->sba_mode == SBA_MODE_SPAR && !mcmasa ) );
+ /* apply TD Stereo Filling as is done in ICBWE */
+ ivas_sba_dirac_stereo_apply_td_stefi( hStereoDft, output, output_frame, ( st_ivas->sba_mode == SBA_MODE_SPAR && !mcmasa ) );
+#ifdef SBA2MONO
+ }
+#endif
}
return;
diff --git a/lib_dec/ivas_sba_rendering_internal.c b/lib_dec/ivas_sba_rendering_internal.c
index bd799f9d5fbff0499d68a83b4c26734f0a779ab9..a80986b39e7a41caf4b8a0844ac63951e90517a0 100644
--- a/lib_dec/ivas_sba_rendering_internal.c
+++ b/lib_dec/ivas_sba_rendering_internal.c
@@ -282,7 +282,7 @@ void ivas_ism2sba(
float buffer_td[][L_FRAME48k], /* i/o: TD signal buffers */
ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */
const ISM_METADATA_HANDLE hIsmMetaData[], /* i : object metadata */
- const int16_t num_objects, /* i : number of objects */
+ const int16_t nchan_ism, /* i : number of objects */
const int16_t output_frame, /* i : output frame length per channel */
const int16_t sba_order /* i : Ambisonic (SBA) order */
)
@@ -304,7 +304,7 @@ void ivas_ism2sba(
set_zero( buffer_tmp[j], output_frame );
}
- for ( i = 0; i < num_objects; i++ )
+ for ( i = 0; i < nchan_ism; i++ )
{
// TODO tmu review when #215 is resolved
azimuth = (int16_t) floorf( hIsmMetaData[i]->azimuth + 0.5f );
diff --git a/lib_dec/ivas_sce_dec.c b/lib_dec/ivas_sce_dec.c
old mode 100644
new mode 100755
index 2072f25460b964dd538a29a86d0cfc65bfcc360b..ccb5fcca897687c9b335b3e2ef6036b86fe6c40b
--- a/lib_dec/ivas_sce_dec.c
+++ b/lib_dec/ivas_sce_dec.c
@@ -77,12 +77,14 @@ ivas_error ivas_sce_dec(
ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
last_ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate;
-#ifdef PARAM_ISM_DTX_CNG
+#ifdef DISCRETE_ISM_DTX_CNG
+ if ( st_ivas->ivas_format == ISM_FORMAT )
+#else
if ( st_ivas->ism_mode == ISM_MODE_PARAM )
+#endif
{
- st->cng_type = FD_CNG; /* TODO: move to init if possible */
+ st->cng_type = FD_CNG;
}
-#endif
/*------------------------------------------------------------------*
* Read audio bandwidth info
@@ -98,18 +100,21 @@ ivas_error ivas_sce_dec(
{
st->total_brate = ivas_total_brate;
}
+#ifdef DISCRETE_ISM_DTX_CNG
+ else if ( !st_ivas->bfi && st_ivas->ivas_format != ISM_FORMAT && last_ivas_total_brate <= IVAS_SID_5k2 )
+ {
+ st->total_brate = hSCE->element_brate - nb_bits_metadata * FRAMES_PER_SEC;
+ }
+#else
else if ( !st_ivas->bfi && ( last_ivas_total_brate <= SID_2k40 || last_ivas_total_brate == IVAS_SID_5k2 ) )
{
-#ifdef PARAM_ISM_DTX_CNG
/* check if this is indeed needed? */
if ( st_ivas->ivas_format != ISM_FORMAT )
{
st->total_brate = hSCE->element_brate - nb_bits_metadata * FRAMES_PER_SEC;
}
-#else
- st->total_brate = hSCE->element_brate - nb_bits_metadata * FRAMES_PER_SEC;
-#endif
}
+#endif
/* read the bandwidth */
if ( st_ivas->bfi || st->total_brate <= SID_2k40 )
@@ -120,7 +125,7 @@ ivas_error ivas_sce_dec(
{
if ( st->low_rate_mode )
{
- /* ISm Low-rate mode -> always WB */
+ /* ISM Low-rate mode -> always WB */
st->bwidth = WB;
}
else if ( hSCE->element_brate < MIN_BRATE_SWB_SCE )
@@ -219,11 +224,7 @@ ivas_error ivas_sce_dec(
#ifdef OMASA_UPDATES
if ( ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ism_mode == ISM_MASA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ ) &&
#else
- if ( ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ism_mode == ISM_MASA_MODE_DISC
-#ifdef OMASA_BRATE
- || st_ivas->ism_mode == ISM_MASA_MODE_ONE_OBJ
-#endif
- ) &&
+ if ( ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ism_mode == ISM_MASA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_ONE_OBJ ) &&
#endif
st->low_rate_mode && !( st->total_brate == SID_2k40 || st->total_brate == FRAME_NO_DATA ) )
#else
@@ -263,11 +264,7 @@ ivas_error ivas_sce_dec(
* Decoder
*----------------------------------------------------------------*/
-#ifdef PARAM_ISM_DTX_CNG
if ( ( error = ivas_core_dec( st_ivas, hSCE, NULL, NULL, 1, output, outputHB, NULL, st_ivas->sba_dirac_stereo_flag ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = ivas_core_dec( NULL, hSCE, NULL, NULL, 1, output, outputHB, NULL, st_ivas->sba_dirac_stereo_flag ) ) != IVAS_ERR_OK )
-#endif
{
return error;
}
@@ -402,7 +399,11 @@ ivas_error create_sce_dec(
return error;
}
+#ifdef SBA2MONO
+ if ( st_ivas->ivas_format == SBA_FORMAT && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO || ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ) )
+#else
if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO )
+#endif
{
if ( ( error = openCldfb( &st->cldfbSynHB, CLDFB_SYNTHESIS, st->output_Fs, CLDFB_PROTOTYPE_1_25MS ) ) != IVAS_ERR_OK )
{
diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder.c
index 329391dfcd7022e2cfd8d19b054d0c9f86928c08..01e4db2ed40c3764b0b9d07e375cb255767d39c2 100644
--- a/lib_dec/ivas_spar_decoder.c
+++ b/lib_dec/ivas_spar_decoder.c
@@ -61,7 +61,8 @@ static void ivas_spar_dec_MD( Decoder_Struct *st_ivas, Decoder_State *st0 );
*------------------------------------------------------------------------*/
ivas_error ivas_spar_dec_open(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
)
{
SPAR_DEC_HANDLE hSpar;
@@ -74,11 +75,15 @@ ivas_error ivas_spar_dec_open(
error = IVAS_ERR_OK;
sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER );
num_channels_internal = ivas_sba_get_nchan_metadata( sba_order_internal );
+ hSpar = st_ivas->hSpar;
- /* SPAR decoder handle */
- if ( ( hSpar = (SPAR_DEC_HANDLE) malloc( sizeof( SPAR_DEC_DATA ) ) ) == NULL )
+ if ( !spar_reconfig_flag )
{
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR decoder" );
+ /* SPAR decoder handle */
+ if ( ( hSpar = (SPAR_DEC_HANDLE) malloc( sizeof( SPAR_DEC_DATA ) ) ) == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR decoder" );
+ }
}
output_Fs = st_ivas->hDecoderConfig->output_Fs;
@@ -107,7 +112,7 @@ ivas_error ivas_spar_dec_open(
fb_cfg->remix_order = remix_order_set[hSpar->hMdDec->spar_md_cfg.remix_unmix_order];
/* FB mixer handle */
- if ( ( error = ivas_FB_mixer_open( &hSpar->hFbMixer, output_Fs, fb_cfg ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_FB_mixer_open( &hSpar->hFbMixer, output_Fs, fb_cfg, spar_reconfig_flag ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -181,33 +186,39 @@ ivas_error ivas_spar_dec_open(
*------------------------------------------------------------------------*/
void ivas_spar_dec_close(
- SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */
- const int32_t output_Fs /* i : output sampling rate */
+ SPAR_DEC_HANDLE *hSpar, /* i/o: SPAR decoder handle */
+ const int32_t output_Fs, /* i : output sampling rate */
+ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
)
{
- if ( hSpar != NULL )
+ if ( *hSpar == NULL || hSpar == NULL )
{
- /* MD handle */
- ivas_spar_md_dec_close( &hSpar->hMdDec );
+ return;
+ }
- /* TD decorrelator handle */
- ivas_td_decorr_dec_close( &hSpar->hTdDecorr );
+ /* MD handle */
+ ivas_spar_md_dec_close( &( *hSpar )->hMdDec );
- /* FB mixer handle */
- ivas_FB_mixer_close( &hSpar->hFbMixer, output_Fs );
+ /* TD decorrelator handle */
+ ivas_td_decorr_dec_close( &( *hSpar )->hTdDecorr );
- /* AGC */
- ivas_spar_agc_dec_close( &hSpar->hAgcDec );
+ /* FB mixer handle */
+ ivas_FB_mixer_close( &( *hSpar )->hFbMixer, output_Fs, spar_reconfig_flag );
- /* PCA */
- if ( hSpar->hPCA != NULL )
- {
- free( hSpar->hPCA );
- hSpar->hPCA = NULL;
- }
+ /* AGC */
+ ivas_spar_agc_dec_close( &( *hSpar )->hAgcDec );
+
+ /* PCA */
+ if ( ( *hSpar )->hPCA != NULL )
+ {
+ free( ( *hSpar )->hPCA );
+ ( *hSpar )->hPCA = NULL;
+ }
- free( hSpar );
- hSpar = NULL;
+ if ( !spar_reconfig_flag )
+ {
+ free( ( *hSpar ) );
+ ( *hSpar ) = NULL;
}
return;
@@ -795,57 +806,38 @@ void ivas_spar_get_parameters(
weight = ivas_spar_get_cldfb_slot_gain( hSpar, hDecoderConfig, ts, &ts0, &ts1, &weight_20ms );
-#ifdef COV_SMOOTH_TUNING
split_band = SPAR_DIRAC_SPLIT_START_BAND;
-#else
- split_band = hSpar->hMdDec->spar_md.num_bands;
-#endif
for ( spar_band = 0; spar_band < num_spar_bands; spar_band++ )
{
for ( out_ch = 0; out_ch < num_ch_out; out_ch++ )
{
-#ifndef COV_SMOOTH_TUNING
- for ( in_ch = 0; in_ch < num_ch_in; in_ch++ )
+ if ( split_band < IVAS_MAX_NUM_BANDS
+ /* 20ms cross-fade for Transport channels in all frequency bands */
+ && ( 0 == ivas_is_res_channel( out_ch, hSpar->hMdDec->spar_md_cfg.nchan_transport ) ) /* sub-frame processing for missing channels in all frequency bands*/
+ )
{
-#endif
- if ( split_band < IVAS_MAX_NUM_BANDS
- /* 20ms cross-fade for Transport channels in all frequency bands */
- && ( 0 == ivas_is_res_channel( out_ch, hSpar->hMdDec->spar_md_cfg.nchan_transport ) ) /* sub-frame processing for missing channels in all frequency bands*/
- )
+ for ( in_ch = 0; in_ch < num_ch_in; in_ch++ )
{
-#ifdef COV_SMOOTH_TUNING
- for ( in_ch = 0; in_ch < num_ch_in; in_ch++ )
+ if ( hSpar->i_subframe > 3 )
{
-#endif
- if ( hSpar->i_subframe > 3 )
- {
- par_mat[out_ch][in_ch][spar_band] = ( 1.0f - weight ) * hSpar->hMdDec->mixer_mat_prev[ts0][out_ch][in_ch][spar_band] +
- weight * hSpar->hMdDec->mixer_mat_prev[ts1][out_ch][in_ch][spar_band];
- }
- else
- {
- par_mat[out_ch][in_ch][spar_band] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band];
- }
-#ifdef COV_SMOOTH_TUNING
+ par_mat[out_ch][in_ch][spar_band] = ( 1.0f - weight ) * hSpar->hMdDec->mixer_mat_prev[ts0][out_ch][in_ch][spar_band] +
+ weight * hSpar->hMdDec->mixer_mat_prev[ts1][out_ch][in_ch][spar_band];
}
-#endif
- }
- else
- {
-#ifdef COV_SMOOTH_TUNING
- for ( in_ch = 0; in_ch < num_ch_in; in_ch++ )
+ else
{
-#endif
- /* 20ms Transport channel reconstruction with matching encoder/decoder processing */
- int16_t prev_idx = SPAR_DIRAC_SPLIT_START_BAND < IVAS_MAX_NUM_BANDS ? 1 : 0; /* if SPAR_DIRAC_SPLIT_START_BAND == IVAS_MAX_NUM_BANDS, then the sub-frame mixer_mat delay line is not active */
- par_mat[out_ch][in_ch][spar_band] = ( 1.0f - weight_20ms ) * hSpar->hMdDec->mixer_mat_prev[prev_idx][out_ch][in_ch][spar_band] + weight_20ms * hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band];
-#ifdef COV_SMOOTH_TUNING
+ par_mat[out_ch][in_ch][spar_band] = hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band];
}
-#endif
}
-#ifndef COV_SMOOTH_TUNING
}
-#endif
+ else
+ {
+ for ( in_ch = 0; in_ch < num_ch_in; in_ch++ )
+ {
+ /* 20ms Transport channel reconstruction with matching encoder/decoder processing */
+ int16_t prev_idx = SPAR_DIRAC_SPLIT_START_BAND < IVAS_MAX_NUM_BANDS ? 1 : 0; /* if SPAR_DIRAC_SPLIT_START_BAND == IVAS_MAX_NUM_BANDS, then the sub-frame mixer_mat delay line is not active */
+ par_mat[out_ch][in_ch][spar_band] = ( 1.0f - weight_20ms ) * hSpar->hMdDec->mixer_mat_prev[prev_idx][out_ch][in_ch][spar_band] + weight_20ms * hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band];
+ }
+ }
}
}
diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec.c
index ff6f858d3142e11d5c1e00179b0ff2cd4d1fe721..3b47d6500e1ab98d6a3bcdca8da23c7fcccbfb47 100644
--- a/lib_dec/ivas_spar_md_dec.c
+++ b/lib_dec/ivas_spar_md_dec.c
@@ -305,6 +305,7 @@ static void ivas_spar_md_dec_matrix_close(
free( hMdDecoder->spar_md.band_coeffs );
hMdDecoder->spar_md.band_coeffs = NULL;
}
+
if ( hMdDecoder->mixer_mat != NULL )
{
for ( i = 0; i < num_channels; i++ )
@@ -418,11 +419,8 @@ void ivas_spar_md_dec_close(
ivas_spar_md_dec_matrix_close( hMdDecoder, num_channels );
- if ( *hMdDec != NULL )
- {
- free( *hMdDec );
- *hMdDec = NULL;
- }
+ free( *hMdDec );
+ *hMdDec = NULL;
return;
}
diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h
index ff1f264e46da3908aea58c6dad3e61b8f804ab70..ccaed09898185d1e496d3d94c4ff411cf91dcf9a 100644
--- a/lib_dec/ivas_stat_dec.h
+++ b/lib_dec/ivas_stat_dec.h
@@ -382,7 +382,6 @@ typedef struct stereo_icbwe_dec_data_structure
} STEREO_ICBWE_DEC_DATA, *STEREO_ICBWE_DEC_HANDLE;
-#ifdef PARAM_ISM_DTX_CNG
/*----------------------------------------------------------------------------------*
* ISM DTX structure
*----------------------------------------------------------------------------------*/
@@ -392,9 +391,12 @@ typedef struct
int16_t dtx_flag;
int16_t sce_id_dtx;
-} ISM_DTX_DATA_DEC;
+#ifdef DISCRETE_ISM_DTX_CNG
+ int16_t ism_dtx_hangover_cnt; /* hangover counter for ISM DTX decoder */
#endif
+} ISM_DTX_DATA_DEC;
+
/*----------------------------------------------------------------------------------*
* DirAC decoder structure
*----------------------------------------------------------------------------------*/
@@ -813,6 +815,7 @@ typedef struct ivas_spar_md_dec_state_t
int16_t table_idx;
int16_t dtx_vad;
int16_t spar_hoa_md_flag;
+
} ivas_spar_md_dec_state_t;
@@ -961,10 +964,13 @@ typedef struct mct_dec_data_structure
int16_t chBitRatios[MCT_MAX_CHANNELS];
int16_t lowE_ch[MCT_MAX_CHANNELS]; /* note: pointer to local parameter */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
int16_t LFE_off;
+#endif
uint16_t mc_global_ild[MCT_MAX_CHANNELS]; /* note: pointer to local parameter */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
int16_t num_lfe;
-
+#endif
} MCT_DEC_DATA, *MCT_DEC_HANDLE;
@@ -980,9 +986,15 @@ typedef struct ivas_lfe_dec_data_structure
int16_t lfe_dec_indices_coeffs_tbl[IVAS_MAX_NUM_QUANT_STRATS][IVAS_MAX_NUM_DCT_COEF_GROUPS];
float lfe_block_delay_s;
int16_t lfe_prior_buf_len;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
float *prior_out_buffer;
float *prevsynth_buf;
+#else
+ float prior_out_buffer[L_FRAME48k];
+
+ float prevsynth_buf[LFE_PLC_BUFLEN];
+#endif
float *lfe_delay_buf;
int16_t lfe_addl_delay;
int16_t bfi_count;
@@ -1067,7 +1079,7 @@ typedef struct ivas_binaural_rendering_struct
/* Convolution module structure */
BINRENDERER_CONV_MODULE_HANDLE hBinRenConvModule;
- /* Variables related to reverb module */
+ /* Variables related to reverberator module */
float earlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX];
REVERB_STRUCT_HANDLE hReverb;
@@ -1111,11 +1123,29 @@ typedef struct ivas_mcmasa_lfe_synth_struct
} MCMASA_LFE_SYNTH_DATA, *MCMASA_LFE_SYNTH_DATA_HANDLE;
+#ifdef FIX_350_MASA_DELAY_COMP
+typedef struct ivas_masa_decoder_ext_out_meta_struct
+{
+ MASA_DECRIPTIVE_META descriptiveMeta;
+
+ uint16_t directionIndex[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
+ uint8_t directToTotalRatio[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
+ uint8_t spreadCoherence[MASA_MAXIMUM_DIRECTIONS][MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
+
+ uint8_t surroundCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
+ uint8_t diffuseToTotalRatio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
+
+} MASA_DECODER_EXT_OUT_META;
+#endif
+
typedef struct ivas_masa_decoder_data_struct
{
int16_t band_mapping[MASA_FREQUENCY_BANDS + 1];
SPHERICAL_GRID_DATA *sph_grid16;
+#ifdef FIX_350_MASA_DELAY_COMP
+ MASA_DECODER_EXT_OUT_META *extOutMeta;
+#endif
float dir_decode_quality;
} MASA_DECODER_DATA;
@@ -1177,18 +1207,13 @@ typedef struct decoder_config_structure
int16_t Opt_LsCustom; /* indicates whether loudspeaker custom setup is used */
int16_t Opt_HRTF_binary; /* indicates whether HRTF binary file is used */
int16_t Opt_Headrotation; /* indicates whether head-rotation is used */
-#ifdef FIX_351_HRTF_COMMAND
- int16_t Opt_RendConfigCustom; /* indicates whether Renderer configuration custom setup is used */
-#endif
- int16_t orientation_tracking; /* indicates orientation tracking type */
+ int16_t Opt_RendConfigCustom; /* indicates whether Renderer configuration custom setup is used */
+ int16_t orientation_tracking; /* indicates orientation tracking type */
float no_diegetic_pan;
int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */
/* temp. development parameters */
#ifdef DEBUGGING
-#ifndef REMOVE_FORCE_SUBFRAME_BIN
- int16_t forceSubframeBinauralization; /* Flag for forcing Parametric binauralizer to subframe mode */
-#endif
int16_t force_rend; /* forced TD/CLDFB binaural renderer (for ISM and MC) */
#endif
@@ -1207,6 +1232,9 @@ typedef struct Decoder_Struct
DECODER_CONFIG_HANDLE hDecoderConfig; /* Decoder configuration structure */
IVAS_FORMAT ivas_format; /* IVAS format */
+#ifdef OMASA_BRATE_SW
+ IVAS_FORMAT last_ivas_format; /* last frame IVAS format */
+#endif
int16_t sid_format; /* IVAS format indicator from SID frame */
int16_t nchan_transport; /* number of transport channels */
IVAS_OUTPUT_SETUP hOutSetup; /* output setup structure */
@@ -1238,9 +1266,7 @@ typedef struct Decoder_Struct
/* multichannel modules */
ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS]; /* ISM metadata handles (storage for one frame of read ISM metadata) */
-#ifdef PARAM_ISM_DTX_CNG
ISM_DTX_DATA_DEC hISMDTX; /* ISM DTX structure */
-#endif
ISM_RENDERER_HANDLE hIsmRendererData; /* ISM renderer handle */
DIRAC_DEC_HANDLE hDirAC; /* DirAC handle */
SPAR_DEC_HANDLE hSpar; /* SPAR handle */
@@ -1251,6 +1277,9 @@ typedef struct Decoder_Struct
LFE_DEC_HANDLE hLFE; /* LFE handle */
ISM_MODE ism_mode; /* ISM format mode */
+#ifdef NCHAN_ISM_PARAMETER
+ int16_t nchan_ism; /* number of ISM channels */
+#endif
SBA_MODE sba_mode; /* SBA format mode */
MC_MODE mc_mode; /* MC format mode */
int16_t sba_order; /* Ambisonic (SBA) order */
@@ -1270,12 +1299,8 @@ typedef struct Decoder_Struct
EFAP_HANDLE hEFAPdata; /* EFAP structure */
VBAP_HANDLE hVBAPdata; /* VBAP structure */
MONO_DOWNMIX_RENDERER_HANDLE hMonoDmxRenderer; /* Mono downmix structure */
-#ifdef FIX_197_CREND_INTERFACE
CREND_WRAPPER_HANDLE hCrendWrapper;
-#else
- CREND_HANDLE hCrend; /* Convolution mixer renderer structure */
- HRTFS_HANDLE hHrtf; /* HRTFs handle */
-#endif
+ REVERB_HANDLE hReverb; /* Reverb handle */
HRTFS_CREND_HANDLE hSetOfHRTF; /* Set of HRTFs handle (CRend) */
HRTFS_FASTCONV_HANDLE hHrtfFastConv; /* FASTCONV HRTF tables for binaural rendering */
HRTFS_PARAMBIN_HANDLE hHrtfParambin; /* HRTF tables for parametric binauralizer */
@@ -1285,7 +1310,6 @@ typedef struct Decoder_Struct
RENDER_CONFIG_DATA *hRenderConfig; /* Renderer config pointer */
int32_t binaural_latency_ns; /* binauralization latency in ns */
#ifdef MASA_AND_OBJECTS
- int16_t nchan_ism; /* number of ism channels in combined input format mode */
MASA_ISM_DATA_HANDLE hMasaIsmData; /* MASA_ISM rendering structure */
uint8_t editing_ism_enabled; /* Todo Nokia: Temporary, used until proper ISM control available */
@@ -1299,6 +1323,11 @@ typedef struct Decoder_Struct
int32_t noClipping; /* number of clipped samples */
#endif
int32_t last_active_ivas_total_brate;
+#ifdef FIX_379_EXT_METADATA
+ int16_t ism_extmeta_active; /* Extended metadata active in decoder */
+ int16_t ism_extmeta_cnt; /* Change frame counter for extended metadata */
+#endif
+
} Decoder_Struct;
/* clang-format on */
diff --git a/lib_dec/ivas_stereo_dft_dec.c b/lib_dec/ivas_stereo_dft_dec.c
index f1cbf180bd1974567688e1471629750954237adb..769f6016b487b16c2f1824ad302af50b9a6136ee 100644
--- a/lib_dec/ivas_stereo_dft_dec.c
+++ b/lib_dec/ivas_stereo_dft_dec.c
@@ -1126,10 +1126,13 @@ void stereo_dft_dec(
float *input_mem, /* i/o: mem of buffer DFT analysis */
STEREO_CNG_DEC_HANDLE hStereoCng, /* i/o: Stereo CNG data structure */
const int16_t sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
- ivas_spar_md_dec_state_t *hMdDec, /* i : SPAR MD handle for upmixing */
- const int16_t cross_fade_start_offset, /* i : SPAR mixer delay compensation */
- const int32_t output_Fs, /* i : Fs for delay calculation */
- const int16_t nchan_transport /* i : number of transpor channels */
+#ifdef SBA2MONO
+ const int16_t sba_mono_flag, /* i : signal mono output for SBA DirAC */
+#endif
+ ivas_spar_md_dec_state_t *hMdDec, /* i : SPAR MD handle for upmixing */
+ const int16_t cross_fade_start_offset, /* i : SPAR mixer delay compensation */
+ const int32_t output_Fs, /* i : Fs for delay calculation */
+ const int16_t nchan_transport /* i : number of transpor channels */
)
{
int16_t i, k, b, N_div, stop;
@@ -1410,50 +1413,92 @@ void stereo_dft_dec(
if ( nchan_transport == 1 )
{
- if ( b == 0 )
+#ifdef SBA2MONO
+ if ( sba_mono_flag )
{
- i = 0;
+ if ( b == 0 )
+ {
+ i = 0;
- DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i];
- DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i];
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i];
+ DFT_L[2 * i] = DFT_W;
+ DFT_R[2 * i] = 0.f;
- DFT_L[2 * i] = DFT_W + DFT_Y;
- DFT_R[2 * i] = DFT_W - DFT_Y;
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1];
+ DFT_L[2 * i + 1] = DFT_W;
+ DFT_R[2 * i + 1] = 0.f;
+ }
+ for ( i = hStereoDft->band_limits[b]; i < min( stop, hStereoDft->band_limits[b + 1] ); i++ )
+ {
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i];
+ DFT_L[2 * i] = DFT_W;
+ DFT_R[2 * i] = 0.f;
- DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1];
- DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1];
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1];
+ DFT_L[2 * i + 1] = DFT_W;
+ DFT_R[2 * i + 1] = 0.f;
+ }
+ for ( ; i < hStereoDft->band_limits[b + 1]; i++ )
+ {
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i];
+ DFT_L[2 * i] = DFT_W;
+ DFT_R[2 * i] = 0.f;
- DFT_L[2 * i + 1] = DFT_W + DFT_Y;
- DFT_R[2 * i + 1] = DFT_W - DFT_Y;
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1];
+ DFT_L[2 * i + 1] = DFT_W;
+ DFT_R[2 * i + 1] = 0.f;
+ }
}
- for ( i = hStereoDft->band_limits[b]; i < min( stop, hStereoDft->band_limits[b + 1] ); i++ )
+ else
{
- DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i];
- DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[1][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i];
+#endif
+ if ( b == 0 )
+ {
+ i = 0;
- DFT_L[2 * i] = DFT_W + DFT_Y;
- DFT_R[2 * i] = DFT_W - DFT_Y;
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i];
+ DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i];
- DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1];
- DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[1][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1];
+ DFT_L[2 * i] = DFT_W + DFT_Y;
+ DFT_R[2 * i] = DFT_W - DFT_Y;
- DFT_L[2 * i + 1] = DFT_W + DFT_Y;
- DFT_R[2 * i + 1] = DFT_W - DFT_Y;
- }
- for ( ; i < hStereoDft->band_limits[b + 1]; i++ )
- {
- DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i];
- DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i];
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1];
+ DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1];
- DFT_L[2 * i] = DFT_W + DFT_Y;
- DFT_R[2 * i] = DFT_W - DFT_Y;
+ DFT_L[2 * i + 1] = DFT_W + DFT_Y;
+ DFT_R[2 * i + 1] = DFT_W - DFT_Y;
+ }
+ for ( i = hStereoDft->band_limits[b]; i < min( stop, hStereoDft->band_limits[b + 1] ); i++ )
+ {
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i];
+ DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i] + ( hStereoDft->mixer_mat_smooth[1][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i];
- DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1];
- DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1];
+ DFT_L[2 * i] = DFT_W + DFT_Y;
+ DFT_R[2 * i] = DFT_W - DFT_Y;
- DFT_L[2 * i + 1] = DFT_W + DFT_Y;
- DFT_R[2 * i + 1] = DFT_W - DFT_Y;
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[0][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[0][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1];
+ DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1] + ( hStereoDft->mixer_mat_smooth[1][1][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][2][b + k * IVAS_MAX_NUM_BANDS] + hStereoDft->mixer_mat_smooth[1][3][b + k * IVAS_MAX_NUM_BANDS] ) * DFT_PRED_RES[2 * i + 1];
+
+ DFT_L[2 * i + 1] = DFT_W + DFT_Y;
+ DFT_R[2 * i + 1] = DFT_W - DFT_Y;
+ }
+ for ( ; i < hStereoDft->band_limits[b + 1]; i++ )
+ {
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i];
+ DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i];
+
+ DFT_L[2 * i] = DFT_W + DFT_Y;
+ DFT_R[2 * i] = DFT_W - DFT_Y;
+
+ DFT_W = hStereoDft->mixer_mat_smooth[0][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1];
+ DFT_Y = hStereoDft->mixer_mat_smooth[1][0][b + k * IVAS_MAX_NUM_BANDS] * pDFT_DMX[2 * i + 1];
+
+ DFT_L[2 * i + 1] = DFT_W + DFT_Y;
+ DFT_R[2 * i + 1] = DFT_W - DFT_Y;
+ }
+#ifdef SBA2MONO
}
+#endif
}
else if ( nchan_transport >= 2 )
{
diff --git a/lib_dec/ivas_stereo_mdct_core_dec.c b/lib_dec/ivas_stereo_mdct_core_dec.c
index eb7c2df9dbfce7543509646a6930facb2f7420ce..ab8844c8e895bef1a7d5fe025b9e245b6cdee640 100644
--- a/lib_dec/ivas_stereo_mdct_core_dec.c
+++ b/lib_dec/ivas_stereo_mdct_core_dec.c
@@ -221,7 +221,11 @@ void stereo_mdct_core_dec(
if ( !bfi )
{
- ivas_mdct_dec_side_bits_frame_channel( hCPE, param_lpc, p_param, hCPE->hCoreCoder[0], NULL, nTnsBitsTCX10, param, 0, 0 );
+ ivas_mdct_dec_side_bits_frame_channel( hCPE, param_lpc, p_param, hCPE->hCoreCoder[0],
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ NULL,
+#endif
+ nTnsBitsTCX10, param, 0, 0 );
if ( sts[0]->igf )
{
@@ -252,7 +256,11 @@ void stereo_mdct_core_dec(
}
}
- ivas_mdct_core_invQ( hCPE, 0, nTnsBitsTCX10, p_param, param_lpc, param, fUseTns, tnsData, x_0, x, Aq, ms_mask, 0 );
+ ivas_mdct_core_invQ( hCPE,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ 0,
+#endif
+ nTnsBitsTCX10, p_param, param_lpc, param, fUseTns, tnsData, x_0, x, Aq, ms_mask, 0 );
for ( ch = 0; ch < nChannels; ch++ )
{
@@ -345,7 +353,11 @@ void stereo_mdct_core_dec(
stereo_decoder_tcx( hCPE->hStereoMdct, ms_mask, x_0[1], x[0], x[1], &hCPE->hStereoMdct->mdct_stereo_mode[0], sts[0]->core, sts[1]->core, sts[0]->igf, L_frameTCX[0], L_frameTCX[1], 0, sts[0]->last_core, sts[1]->last_core, 0 );
}
- ivas_mdct_core_tns_ns( hCPE, 0, fUseTns, tnsData, x, Aq, 0 );
+ ivas_mdct_core_tns_ns( hCPE,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ 0,
+#endif
+ fUseTns, tnsData, x, Aq, 0 );
if ( st_ivas->renderer_type == RENDERER_MC_PARAMMC && ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO ) )
{
@@ -359,7 +371,11 @@ void stereo_mdct_core_dec(
apply_dmx_weights( hCPE, x, sts[0]->transform_type, sts[1]->transform_type );
}
- ivas_mdct_core_reconstruct( hCPE, x, signal_outFB_tmp, 0, fUseTns, 0 );
+ ivas_mdct_core_reconstruct( hCPE, x, signal_outFB_tmp,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ 0,
+#endif
+ fUseTns, 0 );
mvr2r( signal_out_tmp[0], signal_out[0], L_FRAME48k );
mvr2r( signal_out_tmp[1], signal_out[1], L_FRAME48k );
@@ -649,4 +665,6 @@ static void run_min_stats(
/* restore VAD (see above) */
st->VAD = save_VAD[ch];
}
+
+ return;
}
diff --git a/lib_dec/ivas_stereo_switching_dec.c b/lib_dec/ivas_stereo_switching_dec.c
index 20a7d58bc25216ef5dafa79172672746300d4ff6..620fb8801d83ab3e348b5054de0d0da7e9283c96 100644
--- a/lib_dec/ivas_stereo_switching_dec.c
+++ b/lib_dec/ivas_stereo_switching_dec.c
@@ -880,7 +880,11 @@ ivas_error stereo_memory_dec(
* Bitrate switching in MASA format
*---------------------------------------------------------------*/
+#ifdef OMASA_BRATE_SW
+ if ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && nchan_transport == 2 )
+#else
if ( ivas_format == MASA_FORMAT && nchan_transport == 2 )
+#endif
{
if ( hCPE->nchan_out == 1 )
{
@@ -973,12 +977,13 @@ ivas_error stereo_memory_dec(
for ( i = 0; i < CPE_CHANNELS; ++i )
{
deleteFdCngDec( &hCPE->hCoreCoder[i]->hFdCngDec );
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
/* deallocate CLDFB synthesis for LFE channel */
if ( hCPE->hCoreCoder[i]->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
deleteCldfb( &hCPE->hCoreCoder[i]->cldfbSyn );
}
+#endif
}
}
else
diff --git a/lib_dec/ivas_stereo_td_dec.c b/lib_dec/ivas_stereo_td_dec.c
index 31b66044c652b2fb42ffc60fbac04317c12decc7..e613e8ea2e8dd96bda26f5a30bb8ef4a1392a2a5 100644
--- a/lib_dec/ivas_stereo_td_dec.c
+++ b/lib_dec/ivas_stereo_td_dec.c
@@ -87,6 +87,11 @@ void tdm_configure_dec(
CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
int16_t *tdm_ratio_idx, /* o : ratio index */
const int16_t nb_bits_metadata /* i : number of metadata bits */
+#ifdef OMASA_TUNING_TD_STEREO
+ ,
+ const int16_t IsOmasa /* i : flag that indicates OMASA format*/
+#endif
+
)
{
STEREO_TD_DEC_DATA_HANDLE hStereoTD;
@@ -308,7 +313,12 @@ void tdm_configure_dec(
tdm_bit_alloc( hCPE->element_brate - nb_bits_metadata * FRAMES_PER_SEC + hCPE->brate_surplus,
hStereoTD->tdm_lp_reuse_flag, &( sts[0]->total_brate ), &( sts[1]->total_brate ),
&hStereoTD->tdm_low_rate_mode, sts[1]->coder_type, *tdm_ratio_idx, hStereoTD->tdm_Pitch_reuse_flag,
- sts[0]->bwidth, sts[1]->bwidth, sts[0]->flag_ACELP16k, hStereoTD->tdm_LRTD_flag, mod_ct, tdm_inst_ratio_idx );
+ sts[0]->bwidth, sts[1]->bwidth, sts[0]->flag_ACELP16k, hStereoTD->tdm_LRTD_flag, mod_ct, tdm_inst_ratio_idx
+#ifdef OMASA_TUNING_TD_STEREO
+ ,
+ IsOmasa
+#endif
+ );
#else
tdm_bit_alloc( hCPE->element_brate - nb_bits_metadata * FRAMES_PER_SEC, hStereoTD->tdm_lp_reuse_flag, &( sts[0]->total_brate ), &( sts[1]->total_brate ), &hStereoTD->tdm_low_rate_mode, sts[1]->coder_type, *tdm_ratio_idx, hStereoTD->tdm_Pitch_reuse_flag, sts[0]->bwidth, sts[1]->bwidth, sts[0]->flag_ACELP16k, hStereoTD->tdm_LRTD_flag, mod_ct, tdm_inst_ratio_idx );
#endif
diff --git a/lib_dec/ivas_tcx_core_dec.c b/lib_dec/ivas_tcx_core_dec.c
index 378ddec9aa921002273f5e12022674cc1b4b9819..b5dcfd2bbede473d6a2ee5b8e5bbf6742162a994 100644
--- a/lib_dec/ivas_tcx_core_dec.c
+++ b/lib_dec/ivas_tcx_core_dec.c
@@ -95,11 +95,25 @@ void stereo_tcx_init_dec(
st->hTcxCfg->ctx_hm = getCtxHm( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_flag );
st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC );
hTcxDec->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_flag, st->element_mode );
- st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag, st->mct_chan_mode );
- /* TODO: also apply for MCT modes, once issue #24 is solved */
- if ( !MCT_flag && st->element_mode != EVS_MONO )
+ st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
+
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ !MCT_flag &&
+#endif
+ st->element_mode != EVS_MONO )
{
- st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode );
+ st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
}
if ( hTcxLtpDec != NULL )
{
@@ -160,11 +174,11 @@ void stereo_tcx_core_dec(
const int16_t last_element_mode, /* i : last element mode */
const int16_t flag_sec_CNA, /* i : CNA flag for secondary channel */
STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */
- const int16_t nchan_out /* i : number of output channels */
-#ifdef PARAM_ISM_DTX_CNG
+ const int16_t nchan_out, /* i : number of output channels */
+ const IVAS_FORMAT ivas_format /* i : IVAS format */
+#ifndef DISCRETE_ISM_DTX_CNG
,
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- const ISM_MODE ism_mode /* i : ISM mode (only needed if format is ISM) */
+ const ISM_MODE ism_mode /* i : ISM mode (only needed if format is ISM)*/
#endif
)
{
@@ -729,8 +743,11 @@ void stereo_tcx_core_dec(
if ( st->element_mode != IVAS_CPE_TD )
{
-#ifdef PARAM_ISM_DTX_CNG
+#ifndef DISCRETE_ISM_DTX_CNG
if ( ivas_format == ISM_FORMAT && ism_mode == ISM_MODE_PARAM )
+#else
+ if ( ivas_format == ISM_FORMAT )
+#endif
{
float buffer[L_FRAME16k];
lerp( signal_outFB, buffer, st->L_frame, hTcxDec->L_frameTCX );
@@ -740,9 +757,6 @@ void stereo_tcx_core_dec(
{
ApplyFdCng( signal_out, NULL, NULL, NULL, st, st->bfi, 0 );
}
-#else
- ApplyFdCng( signal_out, NULL, NULL, NULL, st, st->bfi, 0 );
-#endif
}
/* Generate additional comfort noise to mask potential coding artefacts */
diff --git a/lib_dec/ivas_vbap.c b/lib_dec/ivas_vbap.c
index d3ecedecfd587911ca7f30682cdf7e7e028cc968..37547deaad4d792644775683d89b5c7599da6f5a 100644
--- a/lib_dec/ivas_vbap.c
+++ b/lib_dec/ivas_vbap.c
@@ -127,13 +127,13 @@ static int16_t determine_virtual_surface_triplets( const int16_t num_speaker_nod
static void determine_initial_search_indices( const int16_t num_triplets, const float triplet_azidegs[VBAP_MAX_NUM_TRIPLETS], int16_t initial_search_indices[VBAP_NUM_SEARCH_SECTORS] );
-static void determine_connections( const int16_t num_speaker_nodes, const VBAP_SPEAKER_NODE *speaker_node_data, int16_t connections[][2], const int16_t max_num_connections, int16_t *group1_count, int16_t *group2_start, int16_t *group2_count );
+static ivas_error determine_connections( const int16_t num_speaker_nodes, const VBAP_SPEAKER_NODE *speaker_node_data, int16_t connections[][2], const int16_t max_num_connections, int16_t *group1_count, int16_t *group2_start, int16_t *group2_count );
static void formulate_horizontal_connections( const VBAP_SPEAKER_NODE *speaker_node_data, const int16_t num_speaker_nodes, int16_t connections[][2], int16_t *connection_write_index );
-static void get_half_sphere_connection_options( const VBAP_SPEAKER_NODE *speaker_node_data, const enum SpeakerNodeGroup group, const int16_t num_speaker_nodes, const int16_t num_non_crossing_planes, const float *non_crossing_plane_elevation_deg, ConnectionOption **connection_options_pr, int16_t *num_connection_options );
+static ivas_error get_half_sphere_connection_options( const VBAP_SPEAKER_NODE *speaker_node_data, const enum SpeakerNodeGroup group, const int16_t num_speaker_nodes, const int16_t num_non_crossing_planes, const float *non_crossing_plane_elevation_deg, ConnectionOption **connection_options_pr, int16_t *num_connection_options );
-static void formulate_half_sphere_connections( const VBAP_SPEAKER_NODE *speaker_node_data, const int16_t num_speaker_nodes, const enum SpeakerNodeGroup group, int16_t connections[][2], int16_t *connection_write_index, const int16_t max_num_connections, const int16_t num_non_crossing_planes, const float *non_crossing_plane_elevation_deg );
+static ivas_error formulate_half_sphere_connections( const VBAP_SPEAKER_NODE *speaker_node_data, const int16_t num_speaker_nodes, const enum SpeakerNodeGroup group, int16_t connections[][2], int16_t *connection_write_index, const int16_t max_num_connections, const int16_t num_non_crossing_planes, const float *non_crossing_plane_elevation_deg );
static int16_t determine_non_crossing_planes( const int16_t num_speaker_nodes, const VBAP_SPEAKER_NODE *node_data, float *non_crossing_plane_elevation_deg );
@@ -181,6 +181,7 @@ ivas_error vbap_init_data(
float speaker_node_ele_deg_internal[VBAP_MAX_NUM_SPEAKER_NODES];
VBAP_SPEAKER_NODE speaker_node_data[VBAP_MAX_NUM_SPEAKER_NODES];
VBAP_DATA *vbap;
+ ivas_error error;
push_wmops( "vbap_init" );
@@ -192,6 +193,7 @@ ivas_error vbap_init_data(
/* TODO: are these two paths correct behaviour or should and error be returned ? */
return IVAS_ERR_OK;
}
+
if ( !speaker_node_azi_deg || !speaker_node_ele_deg )
{
hVBAPdata = NULL;
@@ -219,7 +221,6 @@ ivas_error vbap_init_data(
vbap->num_speaker_nodes = num_speaker_nodes;
vbap->num_speaker_nodes_internal = num_speaker_nodes;
-
/* Check if the speaker node setup needs a virtual top or bottom node
(function also increments vbap->num_speaker_nodes_internal when necessary) */
virtual_bottom_type = check_need_of_virtual_speaker_node( vbap, speaker_node_azi_deg, speaker_node_ele_deg, SPEAKER_NODE_BOTTOM_HALF );
@@ -233,7 +234,10 @@ ivas_error vbap_init_data(
if ( is_success && virtual_bottom_type != NO_VIRTUAL_SPEAKER_NODE )
{
- vbap->bottom_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) );
+ if ( ( vbap->bottom_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) );
+ }
set_zero( vbap->bottom_virtual_speaker_node_division_gains, num_speaker_nodes );
is_success &= vbap->bottom_virtual_speaker_node_division_gains != NULL;
#ifdef OMASA_UPDATES
@@ -250,7 +254,10 @@ ivas_error vbap_init_data(
if ( is_success && virtual_top_type != NO_VIRTUAL_SPEAKER_NODE )
{
- vbap->top_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) );
+ if ( ( vbap->top_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) );
+ }
set_zero( vbap->top_virtual_speaker_node_division_gains, num_speaker_nodes );
is_success &= vbap->top_virtual_speaker_node_division_gains != NULL;
#ifdef OMASA_UPDATES
@@ -267,7 +274,10 @@ ivas_error vbap_init_data(
if ( is_success && virtual_back_type != NO_VIRTUAL_SPEAKER_NODE )
{
- vbap->back_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) );
+ if ( ( vbap->back_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) );
+ }
set_zero( vbap->back_virtual_speaker_node_division_gains, num_speaker_nodes );
is_success &= vbap->back_virtual_speaker_node_division_gains != NULL;
#ifdef OMASA_UPDATES
@@ -287,7 +297,10 @@ ivas_error vbap_init_data(
/* Allocate and determine node-node connections */
max_num_connections = ( vbap->num_speaker_nodes_internal - 2 ) * 3; /* Theoretical maximum */
- determine_connections( vbap->num_speaker_nodes_internal, speaker_node_data, connections, max_num_connections, &connection_group1_count, &connection_group2_start, &connection_group2_count );
+ if ( ( error = determine_connections( vbap->num_speaker_nodes_internal, speaker_node_data, connections, max_num_connections, &connection_group1_count, &connection_group2_start, &connection_group2_count ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* Allocate and determine virtual surface speaker node triplets */
if ( is_success )
@@ -323,12 +336,20 @@ ivas_error vbap_init_data(
break;
}
}
- vbap->search_struct[0].triplets = (VBAP_VS_TRIPLET *) malloc( ( ( speaker_nodes_group1_internal - 2 ) * 2 - ( max( 0, ( speaker_nodes_horiz_internal - 2 ) ) ) ) * sizeof( VBAP_VS_TRIPLET ) );
+
+ if ( ( vbap->search_struct[0].triplets = (VBAP_VS_TRIPLET *) malloc( ( ( speaker_nodes_group1_internal - 2 ) * 2 - ( max( 0, ( speaker_nodes_horiz_internal - 2 ) ) ) ) * sizeof( VBAP_VS_TRIPLET ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) );
+ }
is_success &= vbap->search_struct[0].triplets != NULL;
+
if ( speaker_nodes_group2_internal > 0 )
{
vbap->num_search_structs = 2;
- vbap->search_struct[1].triplets = (VBAP_VS_TRIPLET *) malloc( ( ( speaker_nodes_group2_internal - 2 ) * 2 - ( max( 0, ( speaker_nodes_horiz_internal - 2 ) ) ) ) * sizeof( VBAP_VS_TRIPLET ) );
+ if ( ( vbap->search_struct[1].triplets = (VBAP_VS_TRIPLET *) malloc( ( ( speaker_nodes_group2_internal - 2 ) * 2 - ( max( 0, ( speaker_nodes_horiz_internal - 2 ) ) ) ) * sizeof( VBAP_VS_TRIPLET ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) );
+ }
is_success &= vbap->search_struct[1].triplets != NULL;
}
else
@@ -1293,7 +1314,7 @@ static void determine_initial_search_indices(
* Determine all valid connections between all speaker nodes
*-------------------------------------------------------------------------*/
-static void determine_connections(
+static ivas_error determine_connections(
const int16_t num_speaker_nodes, /* i : number of speaker nodes */
const VBAP_SPEAKER_NODE *speaker_node_data, /* i : speaker node data */
int16_t connections[][2], /* o : vector of connections */
@@ -1307,6 +1328,7 @@ static void determine_connections(
int16_t c;
int16_t connection_write_index = 0;
float non_crossing_plane_elevation_deg[VBAP_MAX_PLANES];
+ ivas_error error;
set_f( non_crossing_plane_elevation_deg, 0.0f, VBAP_MAX_PLANES );
@@ -1322,20 +1344,31 @@ static void determine_connections(
/* Process in different mode based on the grouping. It is enough to check for first node. */
if ( speaker_node_data[0].group == SPEAKER_NODE_ALL )
{
- formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_ALL, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg );
+ if ( ( error = formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_ALL, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else
{
/* The node-node connections are determined in three stages: bottom, horizontal, and top. */
- formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_BOTTOM_HALF, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg );
+ if ( ( error = formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_BOTTOM_HALF, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
*group2_start = connection_write_index;
+
formulate_horizontal_connections( speaker_node_data, num_speaker_nodes, connections, &connection_write_index );
*group1_count = connection_write_index;
- formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_TOP_HALF, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg );
+
+ if ( ( error = formulate_half_sphere_connections( speaker_node_data, num_speaker_nodes, SPEAKER_NODE_TOP_HALF, connections, &connection_write_index, max_num_connections, num_non_crossing_planes, non_crossing_plane_elevation_deg ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
*group2_count = connection_write_index - *group2_start;
}
- return;
+ return IVAS_ERR_OK;
}
@@ -1538,7 +1571,7 @@ static int16_t check_plane_crossing(
* Get list of all potential connections at the half-sphere
*-------------------------------------------------------------------------*/
-static void get_half_sphere_connection_options(
+static ivas_error get_half_sphere_connection_options(
const VBAP_SPEAKER_NODE *speaker_node_data, /* i : speaker node data */
const enum SpeakerNodeGroup group, /* i : speaker node group */
const int16_t num_speaker_nodes, /* i : number of speaker nodes */
@@ -1564,7 +1597,11 @@ static void get_half_sphere_connection_options(
}
/* Init memory for connection options */
- c_options = (ConnectionOption *) malloc( sizeof( ConnectionOption ) * max_num_connection_options );
+ if ( ( c_options = (ConnectionOption *) malloc( sizeof( ConnectionOption ) * max_num_connection_options ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) );
+ }
+
for ( c = 0; c < max_num_connection_options; c++ )
{
c_options[c].chA = -1;
@@ -1619,7 +1656,11 @@ static void get_half_sphere_connection_options(
/* Init memory for reordered connection options and order by arc_weighted,
* which informs of the preference order of the connections in case they cross */
- c_options_reorder = (ConnectionOption *) malloc( sizeof( ConnectionOption ) * ( *num_connection_options ) );
+ if ( ( c_options_reorder = (ConnectionOption *) malloc( sizeof( ConnectionOption ) * ( *num_connection_options ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) );
+ }
+
for ( c = 0; c < *num_connection_options; c++ )
{
float min_arc_weighted;
@@ -1646,16 +1687,17 @@ static void get_half_sphere_connection_options(
*connection_options_pr = c_options_reorder;
free( c_options );
- return;
+ return IVAS_ERR_OK;
}
+
/*-------------------------------------------------------------------------*
* formulate_half_sphere_connections()
*
* Formulate half-sphere connections
*-------------------------------------------------------------------------*/
-static void formulate_half_sphere_connections(
+static ivas_error formulate_half_sphere_connections(
const VBAP_SPEAKER_NODE *speaker_node_data, /* i : speaker node data */
const int16_t num_speaker_nodes, /* i : number of speaker nodes */
const enum SpeakerNodeGroup group, /* i : speaker node group */
@@ -1682,19 +1724,23 @@ static void formulate_half_sphere_connections(
ConnectionOption *connection_options;
int16_t num_connection_options;
int16_t half_sphere_first_connection;
+ ivas_error error;
half_sphere_first_connection = *connection_write_index;
/* Obtain all connection options (i.e., channel pairs) at the half sphere. The function orders them
* in terms of which connection to keep if two connections would cross each other. */
- get_half_sphere_connection_options(
- speaker_node_data,
- group,
- num_speaker_nodes,
- num_non_crossing_planes,
- non_crossing_plane_elevation_deg,
- &connection_options,
- &num_connection_options );
+ if ( ( error = get_half_sphere_connection_options(
+ speaker_node_data,
+ group,
+ num_speaker_nodes,
+ num_non_crossing_planes,
+ non_crossing_plane_elevation_deg,
+ &connection_options,
+ &num_connection_options ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
set_f( connection_arc, 0.0f, max_num_connections );
for ( c = 0; c < max_num_connections; c++ )
@@ -1790,8 +1836,10 @@ static void formulate_half_sphere_connections(
}
c_opt++;
}
+
free( connection_options );
- return;
+
+ return IVAS_ERR_OK;
}
diff --git a/lib_dec/jbm_jb4_circularbuffer.c b/lib_dec/jbm_jb4_circularbuffer.c
index e272e21aa1cf0f265afea91511a2d324a8421d83..e68b3e170e2e71260d37eb05aeebec5e37984789 100644
--- a/lib_dec/jbm_jb4_circularbuffer.c
+++ b/lib_dec/jbm_jb4_circularbuffer.c
@@ -70,9 +70,14 @@ struct JB4_CIRCULARBUFFER
/* Creates a circular buffer (FIFO) */
-int16_t JB4_CIRCULARBUFFER_Create( JB4_CIRCULARBUFFER_HANDLE *ph )
+ivas_error JB4_CIRCULARBUFFER_Create( JB4_CIRCULARBUFFER_HANDLE *ph )
{
- JB4_CIRCULARBUFFER_HANDLE h = malloc( sizeof( struct JB4_CIRCULARBUFFER ) );
+ JB4_CIRCULARBUFFER_HANDLE h;
+
+ if ( ( h = malloc( sizeof( struct JB4_CIRCULARBUFFER ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) );
+ }
h->data = NULL;
h->capacity = 0;
@@ -81,7 +86,7 @@ int16_t JB4_CIRCULARBUFFER_Create( JB4_CIRCULARBUFFER_HANDLE *ph )
*ph = h;
- return 0;
+ return IVAS_ERR_OK;
}
@@ -119,13 +124,17 @@ int16_t JB4_CIRCULARBUFFER_Init(
{
/* keep one element free to be able to decide between full/empty buffer */
++capacity;
- h->data = malloc( capacity * sizeof( JB4_CIRCULARBUFFER_ELEMENT ) );
+
+ if ( ( h->data = malloc( capacity * sizeof( JB4_CIRCULARBUFFER_ELEMENT ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) );
+ }
h->capacity = capacity;
h->writePos = 0;
h->readPos = 0;
- return 0;
+ return IVAS_ERR_OK;
}
diff --git a/lib_dec/jbm_jb4_circularbuffer.h b/lib_dec/jbm_jb4_circularbuffer.h
index 0891cdfd116126e4d5a54ec2dce378806e2964f3..e14144b329e0984730809384e565db6c9b42b6ae 100644
--- a/lib_dec/jbm_jb4_circularbuffer.h
+++ b/lib_dec/jbm_jb4_circularbuffer.h
@@ -47,7 +47,7 @@ typedef struct JB4_CIRCULARBUFFER *JB4_CIRCULARBUFFER_HANDLE;
typedef int32_t JB4_CIRCULARBUFFER_ELEMENT;
-int16_t JB4_CIRCULARBUFFER_Create( JB4_CIRCULARBUFFER_HANDLE *ph );
+ivas_error JB4_CIRCULARBUFFER_Create( JB4_CIRCULARBUFFER_HANDLE *ph );
void JB4_CIRCULARBUFFER_Destroy( JB4_CIRCULARBUFFER_HANDLE *ph );
diff --git a/lib_dec/jbm_jb4_inputbuffer.c b/lib_dec/jbm_jb4_inputbuffer.c
index 8cec3bdf6120bcc58d027da44f89c4a1c8e84be2..925e35dfff2c23e7b28ad59f400d836f6cda0939 100644
--- a/lib_dec/jbm_jb4_inputbuffer.c
+++ b/lib_dec/jbm_jb4_inputbuffer.c
@@ -67,10 +67,15 @@ struct JB4_INPUTBUFFER
/* Creates a input buffer */
-int16_t JB4_INPUTBUFFER_Create(
+ivas_error JB4_INPUTBUFFER_Create(
JB4_INPUTBUFFER_HANDLE *ph )
{
- JB4_INPUTBUFFER_HANDLE h = malloc( sizeof( struct JB4_INPUTBUFFER ) );
+ JB4_INPUTBUFFER_HANDLE h;
+
+ if ( ( h = malloc( sizeof( struct JB4_INPUTBUFFER ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) );
+ }
h->data = NULL;
h->capacity = 0;
@@ -80,7 +85,7 @@ int16_t JB4_INPUTBUFFER_Create(
*ph = h;
- return 0;
+ return IVAS_ERR_OK;
}
@@ -99,8 +104,12 @@ void JB4_INPUTBUFFER_Destroy(
{
return;
}
+
if ( h->data )
+ {
free( h->data );
+ }
+
free( h );
*ph = NULL;
@@ -109,7 +118,7 @@ void JB4_INPUTBUFFER_Destroy(
/* Initializes a input buffer with a fixed maximum allowed number of elements */
-int16_t JB4_INPUTBUFFER_Init(
+ivas_error JB4_INPUTBUFFER_Init(
JB4_INPUTBUFFER_HANDLE h,
uint16_t capacity,
int16_t ( *compareFunction )( const JB4_INPUTBUFFER_ELEMENT first, const JB4_INPUTBUFFER_ELEMENT second, bool *replaceWithNewElementIfEqual ) )
@@ -117,13 +126,17 @@ int16_t JB4_INPUTBUFFER_Init(
/* keep one element free to be able to decide between full/empty buffer */
++capacity;
- h->data = malloc( capacity * sizeof( JB4_INPUTBUFFER_ELEMENT ) );
+ if ( ( h->data = malloc( capacity * sizeof( JB4_INPUTBUFFER_ELEMENT ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) );
+ }
+
h->capacity = capacity;
h->writePos = 0;
h->readPos = 0;
h->compareFunction = compareFunction;
- return 0;
+ return IVAS_ERR_OK;
}
diff --git a/lib_dec/jbm_jb4_inputbuffer.h b/lib_dec/jbm_jb4_inputbuffer.h
index 7af58a31d309f6dc09644bb3021861730386f17d..6087ecb20717b76c316e2349ca79a0e95131629e 100644
--- a/lib_dec/jbm_jb4_inputbuffer.h
+++ b/lib_dec/jbm_jb4_inputbuffer.h
@@ -48,14 +48,11 @@ typedef struct JB4_INPUTBUFFER *JB4_INPUTBUFFER_HANDLE;
typedef void *JB4_INPUTBUFFER_ELEMENT;
-int16_t JB4_INPUTBUFFER_Create( JB4_INPUTBUFFER_HANDLE *ph );
+ivas_error JB4_INPUTBUFFER_Create( JB4_INPUTBUFFER_HANDLE *ph );
void JB4_INPUTBUFFER_Destroy( JB4_INPUTBUFFER_HANDLE *ph );
-int16_t JB4_INPUTBUFFER_Init(
- JB4_INPUTBUFFER_HANDLE h,
- uint16_t capacity,
- int16_t ( *compareFunction )( const JB4_INPUTBUFFER_ELEMENT newElement, const JB4_INPUTBUFFER_ELEMENT arrayElement, bool *replaceWithNewElementIfEqual ) );
+ivas_error JB4_INPUTBUFFER_Init( JB4_INPUTBUFFER_HANDLE h, uint16_t capacity, int16_t ( *compareFunction )( const JB4_INPUTBUFFER_ELEMENT newElement, const JB4_INPUTBUFFER_ELEMENT arrayElement, bool *replaceWithNewElementIfEqual ) );
int16_t JB4_INPUTBUFFER_Enque( JB4_INPUTBUFFER_HANDLE h, JB4_INPUTBUFFER_ELEMENT element, JB4_INPUTBUFFER_ELEMENT *replacedElement );
diff --git a/lib_dec/jbm_jb4_jmf.c b/lib_dec/jbm_jb4_jmf.c
index 8ec24046f03c8b3e9d3254f23d9e13014bc22a74..85e9980e6ef8b11a2306f70f228227185034cfd0 100644
--- a/lib_dec/jbm_jb4_jmf.c
+++ b/lib_dec/jbm_jb4_jmf.c
@@ -84,19 +84,35 @@ struct JB4_JMF
/** helper function to add an entry at back of the buffer */
-static void JB4_JMF_pushBack( JB4_JMF_HANDLE h, int32_t delay, int32_t offset, uint32_t time );
+static void JB4_JMF_pushBack( JB4_JMF_HANDLE h, const int32_t delay, const int32_t offset, const uint32_t time );
+
/** helper function to remove an entry from the front of the buffer */
static void JB4_JMF_popFront( JB4_JMF_HANDLE h );
-int16_t JB4_JMF_Create(
+ivas_error JB4_JMF_Create(
JB4_JMF_HANDLE *ph )
{
- JB4_JMF_HANDLE h = malloc( sizeof( struct JB4_JMF ) );
+ JB4_JMF_HANDLE h;
+ ivas_error error;
+
+ if ( ( h = malloc( sizeof( struct JB4_JMF ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) );
+ }
- JB4_CIRCULARBUFFER_Create( &h->fifo );
- JB4_CIRCULARBUFFER_Create( &h->offsetFifo );
- JB4_CIRCULARBUFFER_Create( &h->timeStampFifo );
+ if ( ( error = JB4_CIRCULARBUFFER_Create( &h->fifo ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ if ( ( JB4_CIRCULARBUFFER_Create( &h->offsetFifo ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ if ( ( JB4_CIRCULARBUFFER_Create( &h->timeStampFifo ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
h->timeScale = 1000;
h->consideredFraction = 1000;
@@ -108,7 +124,7 @@ int16_t JB4_JMF_Create(
*ph = h;
- return 0;
+ return IVAS_ERR_OK;
}
@@ -141,10 +157,10 @@ void JB4_JMF_Destroy(
/* function to set the window size of the fifo and the fraction which will be considered */
int16_t JB4_JMF_Init(
JB4_JMF_HANDLE h,
- int16_t timeScale,
- uint16_t windowSize,
- uint16_t windowDuration,
- uint16_t consideredFraction )
+ const int16_t timeScale,
+ const uint16_t windowSize,
+ const uint16_t windowDuration,
+ const uint16_t consideredFraction )
{
/* check parameters */
@@ -175,8 +191,8 @@ int16_t JB4_JMF_Init(
/* function to calculate delay for the current packet */
int16_t JB4_JMF_PushPacket(
JB4_JMF_HANDLE h,
- uint32_t sysTime,
- uint32_t rtpTimeStamp )
+ const uint32_t sysTime,
+ const uint32_t rtpTimeStamp )
{
int32_t rtpTimeDiff, sysTimeDiff;
int32_t offset, delay;
@@ -267,9 +283,9 @@ int16_t JB4_JMF_MinOffset(
/* helper function to add entry at back of the buffer */
static void JB4_JMF_pushBack(
JB4_JMF_HANDLE h,
- int32_t delay,
- int32_t offset,
- uint32_t time )
+ const int32_t delay,
+ const int32_t offset,
+ const uint32_t time )
{
int32_t minTime, maxTime;
uint32_t duration;
diff --git a/lib_dec/jbm_jb4_jmf.h b/lib_dec/jbm_jb4_jmf.h
index 745d61ce92f3d2916ec7d6022a7c162efc5a0e8b..5efff7cd5ee36c4a91bf2f4cf0dc3b400161f590 100644
--- a/lib_dec/jbm_jb4_jmf.h
+++ b/lib_dec/jbm_jb4_jmf.h
@@ -45,13 +45,13 @@
/** handle for jitter measure fifo - a fifo used for windowed measure of network status */
typedef struct JB4_JMF *JB4_JMF_HANDLE;
-int16_t JB4_JMF_Create( JB4_JMF_HANDLE *ph );
+ivas_error JB4_JMF_Create( JB4_JMF_HANDLE *ph );
void JB4_JMF_Destroy( JB4_JMF_HANDLE *ph );
-int16_t JB4_JMF_Init( JB4_JMF_HANDLE h, int16_t timeScale, uint16_t windowSize, uint16_t windowDuration, uint16_t consideredFraction );
+int16_t JB4_JMF_Init( JB4_JMF_HANDLE h, const int16_t timeScale, const uint16_t windowSize, const uint16_t windowDuration, const uint16_t consideredFraction );
-int16_t JB4_JMF_PushPacket( JB4_JMF_HANDLE h, uint32_t sysTime, uint32_t rtpTimeStamp );
+int16_t JB4_JMF_PushPacket( JB4_JMF_HANDLE h, const uint32_t sysTime, const uint32_t rtpTimeStamp );
int16_t JB4_JMF_Jitter( const JB4_JMF_HANDLE h, uint32_t *jitter );
diff --git a/lib_dec/jbm_jb4sb.c b/lib_dec/jbm_jb4sb.c
index 07d6acce9371459da0ef00ec09423bbfe72f4f5a..755187b640347bd9d61a94b0fdb75342e636c13b 100644
--- a/lib_dec/jbm_jb4sb.c
+++ b/lib_dec/jbm_jb4sb.c
@@ -61,7 +61,7 @@
#define MAXOFFSET 10
/*! Calculates the difference between two RTP timestamps - the diff is positive, if B 'later', negative otherwise */
-static int32_t JB4_rtpTimeStampDiff( uint32_t tsA, uint32_t tsB );
+static int32_t JB4_rtpTimeStampDiff( const uint32_t tsA, const uint32_t tsB );
/* function to calculate different options for the target playout delay */
static void JB4_targetPlayoutDelay( const JB4_HANDLE h, uint32_t *targetMin, uint32_t *targetMax, uint32_t *targetDtx, uint32_t *targetStartUp );
/*! function to do playout adaptation before playing the next data unit */
@@ -88,18 +88,18 @@ static int16_t JB4_inspectBufferForDropping( const JB4_HANDLE h, bool *dropEarly
/* function to look into the buffer and check if it makes sense to drop a data unit during DTX */
static int16_t JB4_checkDtxDropping( const JB4_HANDLE h );
/*! function to estimate the short term jitter */
-static void JB4_estimateShortTermJitter( JB4_HANDLE h, uint32_t rcvTime, uint32_t rtpTimeStamp );
+static void JB4_estimateShortTermJitter( JB4_HANDLE h, const uint32_t rcvTime, const uint32_t rtpTimeStamp );
/*! function to pop a data unit from the buffer */
-static void JB4_popFromBuffer( JB4_HANDLE h, uint32_t sysTime, JB4_DATAUNIT_HANDLE *pDataUnit );
+static void JB4_popFromBuffer( JB4_HANDLE h, const uint32_t sysTime, JB4_DATAUNIT_HANDLE *pDataUnit );
/*! function to drop a data unit from the buffer - updates nShrinked */
static void JB4_dropFromBuffer( JB4_HANDLE h );
/*! function to calculate the playout delay based on the current jitter */
/*! @param[in] playTime the system time when the data unit will be played
* @param[in] timeStamp the time stamp of the data unit to played
* @param[out] delay the calculated playout delay */
-static int16_t JB4_playoutDelay( const JB4_HANDLE h, uint32_t playTime, uint32_t rtpTimeStamp, uint32_t *delay );
+static int16_t JB4_playoutDelay( const JB4_HANDLE h, const uint32_t playTime, const uint32_t rtpTimeStamp, uint32_t *delay );
/*! function to update lastPlayoutDelay and lastTargetTime after popFromBuffer() */
-static void JB4_updateLastTimingMembers( JB4_HANDLE h, uint32_t playTime, uint32_t rtpTimeStamp );
+static void JB4_updateLastTimingMembers( JB4_HANDLE h, const uint32_t playTime, const uint32_t rtpTimeStamp );
/*! function to compare the RTP time stamps of two data units: newElement==arrayElement ? 0 : (newElement>arrayElement ? +1 : -1) */
static int16_t JB4_inputBufferCompareFunction( const JB4_INPUTBUFFER_ELEMENT newElement, const JB4_INPUTBUFFER_ELEMENT arrayElement, bool *replaceWithNewElementIfEqual );
@@ -207,6 +207,7 @@ ivas_error JB4_Create(
{
int16_t iter;
JB4_HANDLE h;
+ ivas_error error;
if ( ( h = malloc( sizeof( struct JB4 ) ) ) == NULL )
{
@@ -228,12 +229,23 @@ ivas_error JB4_Create(
/* internal configuration values - do not change!!! */
h->timeScale = 0;
h->frameDuration = 0;
+
/* jitter buffer configuration values: done in JB4_Init() */
/* short term jitter evaluation */
- JB4_JMF_Create( &h->stJmf );
- JB4_CIRCULARBUFFER_Create( &h->stJitterFifo );
- JB4_CIRCULARBUFFER_Create( &h->stTimeStampFifo );
+ if ( ( error = JB4_JMF_Create( &h->stJmf ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ if ( ( error = JB4_CIRCULARBUFFER_Create( &h->stJitterFifo ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ if ( ( error = JB4_CIRCULARBUFFER_Create( &h->stTimeStampFifo ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
h->stJitter = 0;
+
/* jitter buffer data */
h->firstDataUnitPopped = false;
h->prevPopSysTime = 0;
@@ -266,11 +278,18 @@ ivas_error JB4_Create(
move32();
/* members to store the data units */
- JB4_INPUTBUFFER_Create( &h->inputBuffer );
+ if ( ( error = JB4_INPUTBUFFER_Create( &h->inputBuffer ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
/* allocate memory for data units */
for ( iter = 0; iter < MAX_JBM_SLOTS; ++iter )
{
- h->memorySlots[iter].data = malloc( MAX_AU_SIZE );
+ if ( ( h->memorySlots[iter].data = malloc( MAX_AU_SIZE ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JB4 structure\n" ) );
+ }
h->freeMemorySlots[iter] = &h->memorySlots[iter];
}
h->nFreeMemorySlots = MAX_JBM_SLOTS;
@@ -314,12 +333,13 @@ void JB4_Destroy(
}
-int16_t JB4_Init(
+ivas_error JB4_Init(
JB4_HANDLE h,
- int16_t safetyMargin )
+ const int16_t safetyMargin )
{
uint16_t ltJmfSize, stFifoSize, stJmfSize, stJmfAllowedLateLoss;
uint16_t inputBufferCapacity;
+ ivas_error error;
/* internal timescale is 1000, frame duration is 20ms */
h->timeScale = 1000; /* ms */
@@ -340,9 +360,13 @@ int16_t JB4_Init(
JB4_JMF_Init( h->stJmf, h->timeScale, stJmfSize, h->timeScale /* 1s */, (uint16_t) ( 1000 - stJmfAllowedLateLoss ) );
inputBufferCapacity = MAX_JBM_SLOTS - 2;
- JB4_INPUTBUFFER_Init( h->inputBuffer, inputBufferCapacity, JB4_inputBufferCompareFunction );
- return 0;
+ if ( ( error = JB4_INPUTBUFFER_Init( h->inputBuffer, inputBufferCapacity, JB4_inputBufferCompareFunction ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ return IVAS_ERR_OK;
}
@@ -383,7 +407,7 @@ void JB4_FreeDataUnit(
int16_t JB4_PushDataUnit(
JB4_HANDLE h,
JB4_DATAUNIT_HANDLE dataUnit,
- uint32_t rcvTime )
+ const uint32_t rcvTime )
{
JB4_DATAUNIT_HANDLE droppedDataUnit = NULL;
@@ -551,8 +575,8 @@ int16_t JB4_FECoffset(
int16_t JB4_PopDataUnit(
JB4_HANDLE h,
- uint32_t sysTime,
- uint32_t extBufferedTime,
+ const uint32_t sysTime,
+ const uint32_t extBufferedTime,
JB4_DATAUNIT_HANDLE *pDataUnit,
uint32_t *scale,
uint32_t *maxScaling )
@@ -574,8 +598,8 @@ int16_t JB4_PopDataUnit(
/* Calculates the difference between two RTP timestamps - the diff is positive, if B 'later', negative otherwise */
static int32_t JB4_rtpTimeStampDiff(
- uint32_t tsA,
- uint32_t tsB )
+ const uint32_t tsA,
+ const uint32_t tsB )
{
int32_t ret;
/* do not dare to inline this function, casting to int32_t is important here! */
@@ -1058,8 +1082,8 @@ static int16_t JB4_checkDtxDropping(
/* function to estimate the short term jitter */
static void JB4_estimateShortTermJitter(
JB4_HANDLE h,
- uint32_t rcvTime,
- uint32_t rtpTimeStamp )
+ const uint32_t rcvTime,
+ const uint32_t rtpTimeStamp )
{
uint32_t jitter, duration, maxDuration;
int32_t minTime, maxTime;
@@ -1121,7 +1145,7 @@ static void JB4_estimateShortTermJitter(
/* function to pop a data unit from the buffer */
static void JB4_popFromBuffer(
JB4_HANDLE h,
- uint32_t sysTime,
+ const uint32_t sysTime,
JB4_DATAUNIT_HANDLE *pDataUnit )
{
JB4_DATAUNIT_HANDLE nextDataUnit;
@@ -1430,8 +1454,8 @@ static void JB4_dropFromBuffer(
/* function to calculate the playout delay based on the current jitter */
static int16_t JB4_playoutDelay(
const JB4_HANDLE h,
- uint32_t playTime,
- uint32_t rtpTimeStamp,
+ const uint32_t playTime,
+ const uint32_t rtpTimeStamp,
uint32_t *delay )
{
int32_t minOffTicks;
@@ -1450,8 +1474,8 @@ static int16_t JB4_playoutDelay(
/* function to update lastPlayoutDelay and lastTargetTime after popFromBuffer() */
static void JB4_updateLastTimingMembers(
JB4_HANDLE h,
- uint32_t playTime,
- uint32_t rtpTimeStamp )
+ const uint32_t playTime,
+ const uint32_t rtpTimeStamp )
{
int32_t minOffTicks;
diff --git a/lib_dec/jbm_jb4sb.h b/lib_dec/jbm_jb4sb.h
index 6b31111670cc7c7a185d8284a710263e54131d98..54b873b006b1c9532794cae661a7f3c2aea031ad 100644
--- a/lib_dec/jbm_jb4sb.h
+++ b/lib_dec/jbm_jb4sb.h
@@ -85,15 +85,15 @@ ivas_error JB4_Create( JB4_HANDLE *ph );
void JB4_Destroy( JB4_HANDLE *ph );
-int16_t JB4_Init( JB4_HANDLE h, int16_t safetyMargin );
+ivas_error JB4_Init( JB4_HANDLE h, const int16_t safetyMargin );
JB4_DATAUNIT_HANDLE JB4_AllocDataUnit( JB4_HANDLE h );
void JB4_FreeDataUnit( JB4_HANDLE h, JB4_DATAUNIT_HANDLE dataUnit );
-int16_t JB4_PushDataUnit( JB4_HANDLE h, JB4_DATAUNIT_HANDLE dataUnit, uint32_t rcvTime );
+int16_t JB4_PushDataUnit( JB4_HANDLE h, JB4_DATAUNIT_HANDLE dataUnit, const uint32_t rcvTime );
-int16_t JB4_PopDataUnit( JB4_HANDLE h, uint32_t sysTime, uint32_t extBufferedTime, JB4_DATAUNIT_HANDLE *pDataUnit, uint32_t *scale, uint32_t *maxScaling );
+int16_t JB4_PopDataUnit( JB4_HANDLE h, const uint32_t sysTime, const uint32_t extBufferedTime, JB4_DATAUNIT_HANDLE *pDataUnit, uint32_t *scale, uint32_t *maxScaling );
int16_t JB4_getFECoffset( JB4_HANDLE h );
diff --git a/lib_dec/jbm_pcmdsp_apa.c b/lib_dec/jbm_pcmdsp_apa.c
index c09a21e790ea624e198d1fb0d1a756e13f92b728..c816a9d9c8b4fadbea3da7e1ccb7061dbc4cd677 100644
--- a/lib_dec/jbm_pcmdsp_apa.c
+++ b/lib_dec/jbm_pcmdsp_apa.c
@@ -139,9 +139,9 @@ static bool extend_frm( apa_state_t *ps, const int16_t frm_in[], int16_t frm_out
*---------------------------------------------------------------------*/
/* Allocates memory for state struct and initializes elements. */
-uint8_t apa_init(
+ivas_error apa_init(
apa_state_t **pps,
- int32_t num_channels )
+ const int32_t num_channels )
{
apa_state_t *ps = NULL;
@@ -152,22 +152,22 @@ uint8_t apa_init(
}
/* allocate state struct */
- ps = (apa_state_t *) malloc( sizeof( apa_state_t ) );
- if ( !ps )
+ if ( ( ps = (apa_state_t *) malloc( sizeof( apa_state_t ) ) ) == NULL )
{
- return 2;
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) );
}
+
ps->num_channels = (uint16_t) num_channels;
ps->buf_out_capacity = (uint16_t) ( APA_BUF_PER_CHANNEL * num_channels );
- ps->buf_out = malloc( sizeof( float ) * ps->buf_out_capacity );
- if ( !ps->buf_out )
+ if ( ( ps->buf_out = malloc( sizeof( float ) * ps->buf_out_capacity ) ) == NULL )
{
- return 2;
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) );
}
+
apa_reset( ps );
*pps = ps;
- return 0;
+ return IVAS_ERR_OK;
}
diff --git a/lib_dec/jbm_pcmdsp_apa.h b/lib_dec/jbm_pcmdsp_apa.h
index 2f0da13e9941abd012b4ac35db520d8e9d3c5eb4..543042f53b4301789af0eabe9fddee082254c8fa 100644
--- a/lib_dec/jbm_pcmdsp_apa.h
+++ b/lib_dec/jbm_pcmdsp_apa.h
@@ -91,8 +91,8 @@ typedef struct apa_state_t *PCMDSP_APA_HANDLE;
/*! Allocates memory for state struct and initializes elements.
* @return 0 on success, 1 on failure */
-uint8_t apa_init( apa_state_t **s,
- int32_t num_channels );
+ivas_error apa_init( apa_state_t **s,
+ const int32_t num_channels );
/*! Sets state variables to initial value. */
void apa_reset( apa_state_t *s );
diff --git a/lib_dec/jbm_pcmdsp_fifo.c b/lib_dec/jbm_pcmdsp_fifo.c
index 522da30dde0ef79caeb137be4003b1a831bb6711..81e833e5e56fc3860b7045c6b97405e52b71ae15 100644
--- a/lib_dec/jbm_pcmdsp_fifo.c
+++ b/lib_dec/jbm_pcmdsp_fifo.c
@@ -48,10 +48,15 @@
/* Creates a FIFO. */
-int16_t pcmdsp_fifo_create(
+ivas_error pcmdsp_fifo_create(
PCMDSP_FIFO_HANDLE *ph )
{
- PCMDSP_FIFO_HANDLE h = malloc( sizeof( struct PCMDSP_FIFO ) );
+ PCMDSP_FIFO_HANDLE h;
+
+ if ( ( h = malloc( sizeof( struct PCMDSP_FIFO ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) );
+ }
h->size = 0;
h->capacity = 0;
@@ -63,7 +68,7 @@ int16_t pcmdsp_fifo_create(
*ph = h;
- return 0;
+ return IVAS_ERR_OK;
}
@@ -95,7 +100,7 @@ void pcmdsp_fifo_destroy(
}
/* Initializes the FIFO with a fixed maximum allowed number audio samples. */
-int16_t pcmdsp_fifo_init(
+ivas_error pcmdsp_fifo_init(
PCMDSP_FIFO_HANDLE h,
uint16_t nSamplesPerChannel,
uint16_t nChannels,
@@ -106,12 +111,16 @@ int16_t pcmdsp_fifo_init(
h->capacity = nSamplesPerChannel;
h->nBytesPerSampleSet = nChannels * nBytesPerSample;
nDataBytes = nSamplesPerChannel * h->nBytesPerSampleSet;
- h->dataBegin = malloc( nDataBytes );
+ if ( ( h->dataBegin = malloc( nDataBytes ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM\n" ) );
+ }
+
h->dataEnd = h->dataBegin + nDataBytes;
h->dataWriteIterator = h->dataBegin;
h->dataReadIterator = h->dataBegin;
- return 0;
+ return IVAS_ERR_OK;
}
diff --git a/lib_dec/jbm_pcmdsp_fifo.h b/lib_dec/jbm_pcmdsp_fifo.h
index faa482e69538ca0b7ccfb0406b5e36b85bbedc05..13ffd146f871fb1b4d7c227b965a1931ba2f1e11 100644
--- a/lib_dec/jbm_pcmdsp_fifo.h
+++ b/lib_dec/jbm_pcmdsp_fifo.h
@@ -66,11 +66,11 @@ struct PCMDSP_FIFO
typedef struct PCMDSP_FIFO *PCMDSP_FIFO_HANDLE;
-int16_t pcmdsp_fifo_create( PCMDSP_FIFO_HANDLE *ph );
+ivas_error pcmdsp_fifo_create( PCMDSP_FIFO_HANDLE *ph );
void pcmdsp_fifo_destroy( PCMDSP_FIFO_HANDLE *ph );
-int16_t pcmdsp_fifo_init( PCMDSP_FIFO_HANDLE h, uint16_t nSamplesPerChannel, uint16_t nChannels, uint16_t nBytesPerSample );
+ivas_error pcmdsp_fifo_init( PCMDSP_FIFO_HANDLE h, uint16_t nSamplesPerChannel, uint16_t nChannels, uint16_t nBytesPerSample );
int16_t pcmdsp_fifo_write( PCMDSP_FIFO_HANDLE h, const uint8_t *samples, uint16_t nSamplesPerChannel );
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index 1040faa0d6eb44d908d291733683603cf09715d7..bcd93ece03947599c86eb6b50f2b881f39974c61 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -230,14 +230,7 @@ static void init_decoder_config(
hDecoderConfig->Opt_LsCustom = 0;
hDecoderConfig->Opt_HRTF_binary = 0;
hDecoderConfig->Opt_Headrotation = 0;
-#ifdef FIX_351_HRTF_COMMAND
hDecoderConfig->Opt_RendConfigCustom = 0;
-#endif
-#ifndef REMOVE_FORCE_SUBFRAME_BIN
-#ifdef DEBUGGING
- hDecoderConfig->forceSubframeBinauralization = 0;
-#endif
-#endif
hDecoderConfig->orientation_tracking = orientation_tracking;
hDecoderConfig->no_diegetic_pan = no_diegetic_pan;
@@ -401,17 +394,8 @@ ivas_error IVAS_DEC_Configure(
const IVAS_DEC_AUDIO_CONFIG outputFormat, /* i : output format */
const int16_t customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */
const int16_t hrtfReaderEnabled, /* i : enable HRTF binary file input */
- const int16_t enableHeadRotation /* i : enable head rotation for binaural output */
-#ifdef FIX_351_HRTF_COMMAND
- ,
- const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */
-#endif
-#ifndef REMOVE_FORCE_SUBFRAME_BIN
-#ifdef DEBUGGING
- ,
- const int16_t forceSubframeBinauralization /* i : enable subframe binauralization */
-#endif
-#endif
+ const int16_t enableHeadRotation, /* i : enable head rotation for binaural output */
+ const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */
)
{
Decoder_Struct *st_ivas;
@@ -457,17 +441,10 @@ ivas_error IVAS_DEC_Configure(
hDecoderConfig->nchan_out = audioCfg2channels( hDecoderConfig->output_config );
}
-#ifndef REMOVE_FORCE_SUBFRAME_BIN
-#ifdef DEBUGGING
- hDecoderConfig->forceSubframeBinauralization = forceSubframeBinauralization;
-#endif
-#endif
hDecoderConfig->Opt_LsCustom = customLsOutputEnabled;
hDecoderConfig->Opt_Headrotation = enableHeadRotation;
hDecoderConfig->Opt_HRTF_binary = hrtfReaderEnabled;
-#ifdef FIX_351_HRTF_COMMAND
hDecoderConfig->Opt_RendConfigCustom = renderConfigEnabled;
-#endif
/* Set decoder parameters to initial values */
if ( ( error = ivas_init_decoder_front( st_ivas ) ) != IVAS_ERR_OK )
@@ -554,9 +531,9 @@ ivas_error IVAS_DEC_EnableVoIP(
{
return error;
}
- if ( JB4_Init( hIvasDec->hVoIP->hJBM, jbmSafetyMargin ) != 0 )
+ if ( ( error = JB4_Init( hIvasDec->hVoIP->hJBM, jbmSafetyMargin ) ) != IVAS_ERR_OK )
{
- return IVAS_ERR_FAILED_ALLOC;
+ return error;
}
if ( hDecoderConfig->output_Fs == 8000 )
@@ -584,13 +561,12 @@ ivas_error IVAS_DEC_EnableVoIP(
return IVAS_ERR_INIT_ERROR;
}
- if ( apa_init( &hIvasDec->hVoIP->hTimeScaler,
- hDecoderConfig->nchan_out ) != 0 ||
+ if ( apa_init( &hIvasDec->hVoIP->hTimeScaler, hDecoderConfig->nchan_out ) != IVAS_ERR_OK ||
apa_set_rate( hIvasDec->hVoIP->hTimeScaler, hDecoderConfig->output_Fs ) != 0 ||
apa_set_complexity_options( hIvasDec->hVoIP->hTimeScaler, wss, css ) != 0 ||
apa_set_quality( hIvasDec->hVoIP->hTimeScaler, 1, 4, 4 ) != 0 ||
- pcmdsp_fifo_create( &hIvasDec->hVoIP->hFifoAfterTimeScaler ) != 0 ||
- pcmdsp_fifo_init( hIvasDec->hVoIP->hFifoAfterTimeScaler, (uint16_t) ( hDecoderConfig->output_Fs * 4 / FRAMES_PER_SEC ) /* 4 frames */, hDecoderConfig->nchan_out, sizeof( int16_t ) ) != 0 )
+ pcmdsp_fifo_create( &hIvasDec->hVoIP->hFifoAfterTimeScaler ) != IVAS_ERR_OK ||
+ pcmdsp_fifo_init( hIvasDec->hVoIP->hFifoAfterTimeScaler, (uint16_t) ( hDecoderConfig->output_Fs * 4 / FRAMES_PER_SEC ) /* 4 frames */, hDecoderConfig->nchan_out, sizeof( int16_t ) ) != IVAS_ERR_OK )
{
return IVAS_ERR_INIT_ERROR;
}
@@ -856,15 +832,25 @@ ivas_error IVAS_DEC_GetObjectMetadata(
{
metadata->azimuth = 0.f;
metadata->elevation = 0.f;
+#ifdef FIX_379_EXT_METADATA
+ metadata->radius = 1.f;
+ metadata->spread = 0.f;
+ metadata->gainFactor = 1.f;
+ metadata->yaw = 0.f;
+ metadata->pitch = 0.f;
+#else
metadata->radius = 0.f;
metadata->spread = 0.f;
metadata->gainFactor = 1.f;
+#endif
}
else
{
metadata->azimuth = hIsmMeta->azimuth;
metadata->elevation = hIsmMeta->elevation;
- metadata->radius = 0.f;
+ metadata->radius = hIsmMeta->radius;
+ metadata->yaw = hIsmMeta->yaw;
+ metadata->pitch = hIsmMeta->pitch;
metadata->spread = 0.f;
metadata->gainFactor = 1.f;
}
@@ -880,8 +866,12 @@ ivas_error IVAS_DEC_GetObjectMetadata(
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_GetMasaMetadata(
- IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+#ifdef FIX_350_MASA_DELAY_COMP
+ MASA_DECODER_EXT_OUT_META_HANDLE *hMasaExtOutMeta /* o : pointer to handle, which will be set to point to metadata from the most recently decoded frame */
+#else
IVAS_MASA_QMETADATA_HANDLE *hMasaMetadata /* o : pointer to handle, which will be set to point to metadata from the most recently decoded frame */
+#endif
)
{
if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )
@@ -894,7 +884,11 @@ ivas_error IVAS_DEC_GetMasaMetadata(
return IVAS_ERR_WRONG_MODE;
}
+#ifdef FIX_350_MASA_DELAY_COMP
+ *hMasaExtOutMeta = hIvasDec->st_ivas->hMasa->data.extOutMeta;
+#else
*hMasaMetadata = hIvasDec->st_ivas->hQMetaData;
+#endif
return IVAS_ERR_OK;
}
@@ -906,14 +900,15 @@ ivas_error IVAS_DEC_GetMasaMetadata(
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_FeedHeadTrackData(
- IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
- IVAS_QUATERNION *orientation /* i : head-tracking data */
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ IVAS_QUATERNION *orientation, /* i : head-tracking data, listener orientation */
+ IVAS_POSITION *Pos /* i : listener position */
)
{
HEAD_TRACK_DATA_HANDLE hHeadTrackData;
int16_t i;
- if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )
+ if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || orientation == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
}
@@ -928,10 +923,16 @@ ivas_error IVAS_DEC_FeedHeadTrackData(
/* Move head-tracking data to the decoder handle */
for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
{
- hHeadTrackData->Quaternions[i].w = orientation[i].w;
- hHeadTrackData->Quaternions[i].x = orientation[i].x;
- hHeadTrackData->Quaternions[i].y = orientation[i].y;
- hHeadTrackData->Quaternions[i].z = orientation[i].z;
+ /* check for Euler angle signaling */
+ if ( orientation[i].w == -3.0f )
+ {
+ Euler2Quat( deg2rad( orientation[i].x ), deg2rad( orientation[i].y ), deg2rad( orientation[i].z ), &orientation[i] );
+ }
+
+ ivas_orient_trk_Process( hHeadTrackData->OrientationTracker, orientation[i], FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES, &hHeadTrackData->Quaternions[i] );
+ hHeadTrackData->Pos[i].x = Pos[i].x;
+ hHeadTrackData->Pos[i].y = Pos[i].y;
+ hHeadTrackData->Pos[i].z = Pos[i].z;
}
hIvasDec->st_ivas->hHeadTrackData->num_quaternions = 0;
@@ -939,6 +940,58 @@ ivas_error IVAS_DEC_FeedHeadTrackData(
return IVAS_ERR_OK;
}
+/*---------------------------------------------------------------------*
+ * IVAS_DEC_FeedRefRotData( )
+ *
+ * Feed the decoder with the reference rotation
+ *---------------------------------------------------------------------*/
+
+ivas_error IVAS_DEC_FeedRefRotData(
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ IVAS_QUATERNION rotation /* i : reference rotation data */
+)
+{
+ ivas_orient_trk_state_t *pOtr;
+
+ if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHeadTrackData == NULL || hIvasDec->st_ivas->hHeadTrackData->OrientationTracker == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ pOtr = hIvasDec->st_ivas->hHeadTrackData->OrientationTracker;
+
+ pOtr->refRot.w = rotation.w;
+ pOtr->refRot.x = rotation.x;
+ pOtr->refRot.z = rotation.z;
+ pOtr->refRot.y = rotation.y;
+
+ return IVAS_ERR_OK;
+}
+
+/*---------------------------------------------------------------------*
+ * IVAS_DEC_FeedRefVectorData( )
+ *
+ * Feed the decoder with a reference vector spanning from listenerPos
+ * to refPos. Only available in OTR_TRACKING_REF_POS and
+ * OTR_TRACKING_REF_POS_LEV modes.
+ *---------------------------------------------------------------------*/
+
+ivas_error IVAS_DEC_FeedRefVectorData(
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ const IVAS_VECTOR3 listenerPos, /* i : Listener position */
+ const IVAS_VECTOR3 refPos /* i : Reference position */
+)
+{
+ ivas_orient_trk_state_t *pOtr;
+
+ if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHeadTrackData == NULL || hIvasDec->st_ivas->hHeadTrackData->OrientationTracker == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ pOtr = hIvasDec->st_ivas->hHeadTrackData->OrientationTracker;
+ return ivas_orient_trk_SetReferenceVector( pOtr, listenerPos, refPos );
+}
/*---------------------------------------------------------------------*
* IVAS_DEC_FeedCustomLsData( )
@@ -1154,6 +1207,7 @@ ivas_error IVAS_DEC_GetRenderConfig(
mvr2r( hRCin->roomAcoustics.pFc_input, hRCout->room_acoustics.pFc_input, CLDFB_NO_CHANNELS_MAX );
mvr2r( hRCin->roomAcoustics.pAcoustic_rt60, hRCout->room_acoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );
mvr2r( hRCin->roomAcoustics.pAcoustic_dsr, hRCout->room_acoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );
+ mvr2r( hRCin->directivity, hRCout->directivity, 3 );
return IVAS_ERR_OK;
}
@@ -1198,6 +1252,7 @@ ivas_error IVAS_DEC_FeedRenderConfig(
mvr2r( renderConfig.room_acoustics.pFc_input, hRenderConfig->roomAcoustics.pFc_input, CLDFB_NO_CHANNELS_MAX );
mvr2r( renderConfig.room_acoustics.pAcoustic_rt60, hRenderConfig->roomAcoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );
mvr2r( renderConfig.room_acoustics.pAcoustic_dsr, hRenderConfig->roomAcoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );
+ mvr2r( renderConfig.directivity, hRenderConfig->directivity, 3 );
return IVAS_ERR_OK;
}
@@ -1232,13 +1287,9 @@ ivas_error IVAS_DEC_GetDelay(
st_ivas = hIvasDec->st_ivas;
hDecoderConfig = st_ivas->hDecoderConfig;
-#ifdef BINAURALIZATION_DELAY_REPORT
nSamples[1] = NS2SA( hDecoderConfig->output_Fs, get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0] ) );
nSamples[2] = (int16_t) roundf( (float) st_ivas->binaural_latency_ns * hDecoderConfig->output_Fs / 1000000000.f );
nSamples[0] = nSamples[1] + nSamples[2];
-#else
- *nSamples = (int16_t) roundf( (float) get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->binaural_latency_ns ) * hDecoderConfig->output_Fs / 1000000000.f );
-#endif
*timeScale = hDecoderConfig->output_Fs;
@@ -1983,7 +2034,6 @@ static ivas_error printConfigInfo_dec(
get_channel_config( st_ivas->hDecoderConfig->output_config, &config_str[0] );
fprintf( stdout, "Output configuration: %s\n", config_str );
-#ifdef FIX_351_HRTF_COMMAND
if ( st_ivas->hDecoderConfig->Opt_HRTF_binary )
{
fprintf( stdout, "HRIR/BRIR file: ON\n" );
@@ -1993,12 +2043,30 @@ static ivas_error printConfigInfo_dec(
{
fprintf( stdout, "Renderer config. file: ON\n" );
}
-#endif
if ( st_ivas->hDecoderConfig->Opt_Headrotation )
{
fprintf( stdout, "Head rotation: ON\n" );
}
+
+ if ( st_ivas->hDecoderConfig->orientation_tracking != IVAS_ORIENT_TRK_NONE )
+ {
+ switch ( st_ivas->hDecoderConfig->orientation_tracking )
+ {
+ case IVAS_ORIENT_TRK_AVG:
+ fprintf( stdout, "Orientation tracking: AVG\n" );
+ break;
+ case IVAS_ORIENT_TRK_REF:
+ fprintf( stdout, "Orientation tracking: REF\n" );
+ break;
+ case IVAS_ORIENT_TRK_REF_VEC:
+ fprintf( stdout, "Orientation tracking: REF_VEC\n" );
+ break;
+ case IVAS_ORIENT_TRK_REF_VEC_LEV:
+ fprintf( stdout, "Orientation tracking: REF_VEC_LEV\n" );
+ break;
+ }
+ }
}
return IVAS_ERR_OK;
diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h
index f92cc7d96e9965f4e98a2de41ba43862b40ac09d..2ae4983801a0ccd682f26dc7bdb89e15e93b1197 100644
--- a/lib_dec/lib_dec.h
+++ b/lib_dec/lib_dec.h
@@ -129,17 +129,8 @@ ivas_error IVAS_DEC_Configure(
const IVAS_DEC_AUDIO_CONFIG outputFormat, /* i : output format */
const int16_t customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */
const int16_t hrtfReaderEnabled, /* i : enable HRTF binary file input */
- const int16_t enableHeadRotation /* i : enable head rotation for binaural output */
-#ifdef FIX_351_HRTF_COMMAND
- ,const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */
-#endif
-
-#ifndef REMOVE_FORCE_SUBFRAME_BIN
-#ifdef DEBUGGING
- ,
- const int16_t forceSubframeBinauralization /* i : enable subframe binauralization */
-#endif
-#endif
+ const int16_t enableHeadRotation, /* i : enable head rotation for binaural output */
+ const int16_t renderConfigEnabled /* i : enable Renderer config. file for binaural output */
);
void IVAS_DEC_Close(
@@ -174,14 +165,31 @@ ivas_error IVAS_DEC_GetObjectMetadata(
/*! r: error code */
ivas_error IVAS_DEC_GetMasaMetadata(
- IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
- IVAS_MASA_QMETADATA_HANDLE *hMasaMetadata /* o : pointer to handle, which will be set to point to metadata from the most recently decoded frame */
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+#ifdef FIX_350_MASA_DELAY_COMP
+ MASA_DECODER_EXT_OUT_META_HANDLE *hMasaExtOutMeta /* o : pointer to handle, which will be set to point to metadata from the most recently decoded frame */
+#else
+ IVAS_MASA_QMETADATA_HANDLE *hMasaMetadata /* o : pointer to handle, which will be set to point to metadata from the most recently decoded frame */
+#endif
);
/*! r: error code */
ivas_error IVAS_DEC_FeedHeadTrackData(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
- IVAS_QUATERNION *orientation /* i : head-tracking data */
+ IVAS_QUATERNION *orientation, /* i : head-tracking data */
+ IVAS_POSITION *Pos /* i : listener position */
+);
+
+/*! r: error code */
+ivas_error IVAS_DEC_FeedRefRotData(
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ IVAS_QUATERNION rotation /* i : reference rotation data */
+);
+/*! r: error code */
+ivas_error IVAS_DEC_FeedRefVectorData(
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ const IVAS_VECTOR3 listenerPos, /* i : Listener position */
+ const IVAS_VECTOR3 refPos /* i : Reference position */
);
/*! r: error code */
@@ -198,7 +206,7 @@ ivas_error IVAS_DEC_VoIP_FeedFrame(
/*! r: error code */
ivas_error IVAS_DEC_VoIP_GetSamples(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
- uint16_t nSamplesPerChannel, /* i : number of samples per channel requested to be written to output buffer */
+ uint16_t nSamplesPerChannel, /* i : number of samples per channel requested to be written to output buffer */
int16_t *pcmBuf, /* i/o: buffer for decoded PCM output. The memory must already be allocated and be able to hold the expected number of output samples, based on frame size and number of output channels */
const uint32_t systemTimestamp_ms /* i : current system timestamp */
#ifdef SUPPORT_JBM_TRACEFILE
diff --git a/lib_dec/stat_dec.h b/lib_dec/stat_dec.h
index 0950b529f67151e65578f61417c3e9eaae4cbfb7..1a82d45587c8cd0ff656a4342d75b2a54735e592 100644
--- a/lib_dec/stat_dec.h
+++ b/lib_dec/stat_dec.h
@@ -1345,9 +1345,10 @@ typedef struct Decoder_State
/* MCT Channel mode indication: LFE, ignore channel? */
MCT_CHAN_MODE mct_chan_mode;
-#ifdef PARAM_ISM_DTX_CNG
- int16_t cng_paramISM_flag; /* CNG in Param-ISM flag */
- int16_t read_sid_info; /* For ParamISM, use the transmitted noise */
+ int16_t cng_ism_flag; /* CNG in Param-ISM flag */
+ int16_t read_sid_info; /* For ParamISM, use the transmitted noise */
+#ifdef DISCRETE_ISM_DTX_CNG
+ int16_t is_ism_format; /* Indication whether the codec operates in ISM format */
#endif
} Decoder_State, *DEC_CORE_HANDLE;
diff --git a/lib_dec/tonalMDCTconcealment.c b/lib_dec/tonalMDCTconcealment.c
index cb27b57ebf852b74e91c4da7657f08a1be5c9cb4..81fa9fdf90606dad00025db95b6214a257b1259c 100644
--- a/lib_dec/tonalMDCTconcealment.c
+++ b/lib_dec/tonalMDCTconcealment.c
@@ -386,15 +386,24 @@ static void CalcMDXT(
const TonalMDCTConcealPtr hTonalMDCTConc,
const char type,
const float *timeSignal,
- float *mdxtOutput,
- const int16_t isLfe )
+ float *mdxtOutput
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ const int16_t isLfe
+#endif
+)
{
float windowedTimeSignal[L_FRAME_PLUS + 2 * L_MDCT_OVLP_MAX];
int16_t left_overlap, right_overlap;
int16_t L_frame;
L_frame = hTonalMDCTConc->nSamples;
- WindowSignal( hTonalMDCTConc->tcx_cfg, hTonalMDCTConc->tcx_cfg->tcx_offsetFB, FULL_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, timeSignal, &L_frame, windowedTimeSignal, 1, 1, isLfe );
+ WindowSignal( hTonalMDCTConc->tcx_cfg, hTonalMDCTConc->tcx_cfg->tcx_offsetFB, FULL_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, timeSignal, &L_frame, windowedTimeSignal, 1, 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ isLfe
+#endif
+ );
if ( type == 'S' )
{
@@ -413,8 +422,12 @@ void TonalMDCTConceal_Detect(
const TonalMDCTConcealPtr hTonalMDCTConc,
const float pitchLag,
int16_t *numIndices,
- const PsychoacousticParameters *psychParamsCurrent,
- const int16_t isLfe )
+ const PsychoacousticParameters *psychParamsCurrent
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ const int16_t isLfe
+#endif
+)
{
float secondLastMDST[L_FRAME_MAX]; /* 32 bits are required */
float secondLastMDCT[L_FRAME_MAX]; /* 32 bits are required */
@@ -431,10 +444,18 @@ void TonalMDCTConceal_Detect(
{
if ( !hTonalMDCTConc->secondLastBlockData.tonalConcealmentActive )
{
- CalcMDXT( hTonalMDCTConc, 'S', hTonalMDCTConc->secondLastPcmOut, secondLastMDST,
- isLfe );
- CalcMDXT( hTonalMDCTConc, 'C', hTonalMDCTConc->secondLastPcmOut, secondLastMDCT,
- isLfe );
+ CalcMDXT( hTonalMDCTConc, 'S', hTonalMDCTConc->secondLastPcmOut, secondLastMDST
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ isLfe
+#endif
+ );
+ CalcMDXT( hTonalMDCTConc, 'C', hTonalMDCTConc->secondLastPcmOut, secondLastMDCT
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ isLfe
+#endif
+ );
hTonalMDCTConc->nNonZeroSamples = 0;
for ( i = 0; i < hTonalMDCTConc->nSamples; i++ )
{
diff --git a/lib_enc/acelp_core_enc.c b/lib_enc/acelp_core_enc.c
index 272d36fb9c53484bf7bd4e564c7d5b7db96c42d2..48cdb5c53614619ab4a6e765bdb1450ef659d48a 100644
--- a/lib_enc/acelp_core_enc.c
+++ b/lib_enc/acelp_core_enc.c
@@ -314,17 +314,13 @@ ivas_error acelp_core_enc(
if ( st->core_brate == SID_2k40 )
{
-#ifdef PARAM_ISM_DTX_CNG
if ( st->hTdCngEnc != NULL )
{
-#endif
tmpF = cng_energy( st->element_mode, st->bwidth, st->hDtxEnc->CNG_mode, st->hTdCngEnc->CNG_att, exc, st->L_frame );
i = (int16_t) ( ( tmpF + 2.0f ) * STEP_SID );
i = min( max( i, 0 ), 127 );
st->hTdCngEnc->old_enr_index = i;
-#ifdef PARAM_ISM_DTX_CNG
}
-#endif
}
}
diff --git a/lib_enc/amr_wb_enc.c b/lib_enc/amr_wb_enc.c
old mode 100644
new mode 100755
index 80520d4c38d37b99a347b7262506eee0c39eb7ed..88b3faa5d6c16ffafa834706a7631fd915cf44fa
--- a/lib_enc/amr_wb_enc.c
+++ b/lib_enc/amr_wb_enc.c
@@ -342,7 +342,12 @@ void amr_wb_enc(
* WB, SWB and FB bandwidth detector
*----------------------------------------------------------------*/
- bw_detect( st, st->input, NULL, NULL );
+ bw_detect( st, st->input, NULL, NULL
+#ifdef FIX_MDCT_BASED_BWD
+ ,
+ 0
+#endif
+ );
/* in AMR_WB IO, limit the maximum band-width to WB */
if ( st->bwidth > WB )
diff --git a/lib_enc/bw_detect.c b/lib_enc/bw_detect.c
old mode 100644
new mode 100755
index 5f46910c57076190a267f7e8f8785b2460431e5b..810527e0ef2b6aab7f373d4fa5edbe02795c153a
--- a/lib_enc/bw_detect.c
+++ b/lib_enc/bw_detect.c
@@ -57,6 +57,9 @@
#define BWD_COUNT_MAX 100
#define BWD_COUNT_WIDER_BW 10
+#ifdef FIX_MDCT_BASED_BWD
+#define BWD_COUNT_WIDER_BW_MDCT 0
+#endif
#define CLDFB_ENER_OFFSET 1.6f
@@ -71,6 +74,10 @@ void bw_detect(
const float signal_in[], /* i : input signal */
float *spectrum, /* i : MDCT spectrum */
const float *enerBuffer /* i : energy buffer */
+#ifdef FIX_MDCT_BASED_BWD
+ ,
+ const int16_t mct_on /* i : flag MCT mode */
+#endif
)
{
int16_t i, j, k, bw_max, bin_width, n_bins;
@@ -80,6 +87,15 @@ void bw_detect(
const float *pt, *pt1;
float max_NB, max_WB, max_SWB, max_FB, mean_NB, mean_WB, mean_SWB, mean_FB;
int16_t cldfb_bin_width = 4;
+#ifdef FIX_MDCT_BASED_BWD
+ int16_t bwd_count_wider_bw, l_frame;
+
+ bwd_count_wider_bw = BWD_COUNT_WIDER_BW;
+ if ( st->element_mode == IVAS_CPE_MDCT && ( st->element_brate > IVAS_64k || mct_on ) )
+ {
+ bwd_count_wider_bw = BWD_COUNT_WIDER_BW_MDCT;
+ }
+#endif
if ( st->input_Fs > 8000 )
{
@@ -173,8 +189,19 @@ void bw_detect(
}
else
{
+#ifndef FIX_MDCT_BASED_BWD
bin_width *= (int16_t) ( ( st->input_Fs / FRAMES_PER_SEC ) / BWD_TOTAL_WIDTH );
mvr2r( spectrum, spect, (int16_t) ( st->input_Fs / FRAMES_PER_SEC ) );
+#else
+ l_frame = (int16_t) ( st->input_Fs / FRAMES_PER_SEC );
+ if ( st->core == TCX_10_CORE )
+ {
+ l_frame /= 2;
+ }
+
+ bin_width *= ( l_frame / BWD_TOTAL_WIDTH );
+ mvr2r( spectrum, spect, l_frame );
+#endif
}
/*---------------------------------------------------------------------*
* compute energy per spectral bins
@@ -392,17 +419,29 @@ void bw_detect(
/* switching to a higher BW */
if ( st->last_input_bwidth == NB )
{
+#ifdef FIX_MDCT_BASED_BWD
+ if ( st->count_WB > bwd_count_wider_bw )
+#else
if ( st->count_WB > BWD_COUNT_WIDER_BW )
+#endif
{
st->input_bwidth = WB;
st->count_WB = BWD_COUNT_MAX;
+#ifdef FIX_MDCT_BASED_BWD
+ if ( st->count_SWB > bwd_count_wider_bw )
+#else
if ( st->count_SWB > BWD_COUNT_WIDER_BW )
+#endif
{
st->input_bwidth = SWB;
st->count_SWB = BWD_COUNT_MAX;
+#ifdef FIX_MDCT_BASED_BWD
+ if ( st->count_FB > bwd_count_wider_bw )
+#else
if ( st->count_FB > BWD_COUNT_WIDER_BW )
+#endif
{
st->input_bwidth = FB;
st->count_FB = BWD_COUNT_MAX;
@@ -413,12 +452,20 @@ void bw_detect(
if ( st->last_input_bwidth == WB && st->input_Fs > 16000 )
{
+#ifdef FIX_MDCT_BASED_BWD
+ if ( st->count_SWB > bwd_count_wider_bw )
+#else
if ( st->count_SWB > BWD_COUNT_WIDER_BW )
+#endif
{
st->input_bwidth = SWB;
st->count_SWB = BWD_COUNT_MAX;
+#ifdef FIX_MDCT_BASED_BWD
+ if ( st->count_FB > bwd_count_wider_bw )
+#else
if ( st->count_FB > BWD_COUNT_WIDER_BW )
+#endif
{
st->input_bwidth = FB;
st->count_FB = BWD_COUNT_MAX;
@@ -428,7 +475,11 @@ void bw_detect(
if ( st->last_input_bwidth == SWB && st->input_Fs > 32000 )
{
+#ifdef FIX_MDCT_BASED_BWD
+ if ( st->count_FB > bwd_count_wider_bw )
+#else
if ( st->count_FB > BWD_COUNT_WIDER_BW )
+#endif
{
st->input_bwidth = FB;
st->count_FB = BWD_COUNT_MAX;
@@ -620,6 +671,7 @@ void set_bw_stereo(
if ( hCPE->element_mode == IVAS_CPE_MDCT )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
/* do not check bandwidth in LFE channel */
if ( sts[0]->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
@@ -640,6 +692,19 @@ void set_bw_stereo(
sts[0]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth );
sts[1]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth );
}
+#else
+ /* ensure that both CPE channels have the same audio band-width */
+ if ( sts[0]->input_bwidth == sts[1]->input_bwidth )
+ {
+ sts[0]->bwidth = sts[0]->input_bwidth;
+ sts[1]->bwidth = sts[0]->input_bwidth;
+ }
+ else
+ {
+ sts[0]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth );
+ sts[1]->bwidth = max( sts[0]->input_bwidth, sts[1]->input_bwidth );
+ }
+#endif
}
sts[0]->bwidth = max( sts[0]->bwidth, WB );
@@ -672,7 +737,11 @@ int16_t set_bw_mct(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
st = hCPE[cpe_id]->hCoreCoder[ch];
- if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ st->mct_chan_mode == MCT_CHAN_MODE_LFE ||
+#endif
+ st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
diff --git a/lib_enc/cod_tcx.c b/lib_enc/cod_tcx.c
index 8c647be38a0c3b96ea33b77f2c66f6e2c743ba9a..ee948998a1ac48fdfdc95cd728a559b9cb27bd81 100644
--- a/lib_enc/cod_tcx.c
+++ b/lib_enc/cod_tcx.c
@@ -73,7 +73,12 @@ void HBAutocorrelation(
* Windowing *
*-----------------------------------------------------------*/
- WindowSignal( hTcxCfg, hTcxCfg->tcx_offset, left_overlap_mode, right_overlap_mode, &left_overlap, &right_overlap, speech, &L_frame, xn_buf, 1, 0, 0 );
+ WindowSignal( hTcxCfg, hTcxCfg->tcx_offset, left_overlap_mode, right_overlap_mode, &left_overlap, &right_overlap, speech, &L_frame, xn_buf, 1, 0
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ 0
+#endif
+ );
/*-----------------------------------------------------------*
* Autocorrelation *
@@ -134,11 +139,15 @@ void TNSAnalysisStereo(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
st = sts[ch];
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
continue;
}
+
hTcxEnc = st->hTcxEnc;
nSubframes = ( hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
@@ -382,8 +391,11 @@ void TNSAnalysisStereo(
/* individual decision for each channel */
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE )
+#else
+ if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
continue;
}
@@ -465,10 +477,15 @@ void TNSAnalysisStereo(
/* we have the decision, set filter data accordingly */
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE )
+#else
+ if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
continue;
}
+
nSubframes = ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
for ( k = 0; k < nSubframes; k++ )
@@ -501,10 +518,15 @@ void TNSAnalysisStereo(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
st = sts[ch];
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
continue;
}
+
nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
for ( k = 0; k < nSubframes; k++ )
@@ -970,11 +992,12 @@ void EstimateStereoTCXNoiseLevel(
{
fac_ns_q = param_core[ch] + n * NPRM_DIV + 1;
maxNfCalcBw = min( noiseFillingBorder[ch][n], (int16_t) ( hTcxEnc->measuredBwRatio * (float) L_frame[ch][n] + 0.5f ) );
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
maxNfCalcBw = min( maxNfCalcBw, MCT_LFE_MAX_LINE );
}
-
+#endif
if ( ( total_brate >= HQ_96k && ( st->element_mode <= IVAS_SCE || st->bwidth < SWB ) ) || total_brate > IVAS_192k )
{
fac_ns[ch][n] = 0.0f;
@@ -2107,7 +2130,12 @@ void coder_tcx(
if ( st->hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP )
{
- WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, win, 1, 1, 0 );
+ WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, win, 1, 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ 0
+#endif
+ );
/* Compute MDCT for xn_buf[] */
TCX_MDCT( win, spectrum, left_overlap, L_frame - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode );
@@ -2116,7 +2144,12 @@ void coder_tcx(
{
wtda( st->hTcxEnc->new_speech_TCX, win, NULL, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, L_frame );
- WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, winMDST, 1, 1, 0 );
+ WindowSignal( hTcxCfg, hTcxCfg->tcx_offsetFB, hTcxCfg->tcx_last_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode == ALDO_WINDOW ? FULL_OVERLAP : hTcxCfg->tcx_curr_overlap_mode, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_frame, winMDST, 1, 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ 0
+#endif
+ );
edct( win, spectrum, L_frame, st->element_mode );
diff --git a/lib_enc/core_enc_init.c b/lib_enc/core_enc_init.c
index a87bfefb874d890f08f4f4258c3a964755a08753..f89f4a132c0b38ba00ea4697e83dc151ab8e1970 100644
--- a/lib_enc/core_enc_init.c
+++ b/lib_enc/core_enc_init.c
@@ -261,7 +261,12 @@ static void init_tcx(
hTcxEnc->spectrum[0] = hTcxEnc->spectrum_long;
hTcxEnc->spectrum[1] = hTcxEnc->spectrum_long + N_TCX10_MAX;
- init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->input_Fs, st->L_frame, st->bwidth, hTcxEnc->L_frameTCX, st->fscale, st->encoderLookahead_enc, st->encoderLookahead_FB, st->preemph_fac, st->tcxonly, st->rf_mode, st->igf, st->hIGFEnc != NULL ? st->hIGFEnc->infoStopFrequency : 0, st->element_mode, st->ini_frame, MCT_flag, st->mct_chan_mode );
+ init_tcx_cfg( st->hTcxCfg, total_brate, st->sr_core, st->input_Fs, st->L_frame, st->bwidth, hTcxEnc->L_frameTCX, st->fscale, st->encoderLookahead_enc, st->encoderLookahead_FB, st->preemph_fac, st->tcxonly, st->rf_mode, st->igf, st->hIGFEnc != NULL ? st->hIGFEnc->infoStopFrequency : 0, st->element_mode, st->ini_frame, MCT_flag
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
/* Init TCX target bits correction factor */
hTcxEnc->tcx_target_bits_fac = 1.0f;
diff --git a/lib_enc/core_enc_switch.c b/lib_enc/core_enc_switch.c
index 14fcac389443b9e5fd358353b5101959384e4292..806afd273bcc1ab4ad4e9cceb7f2cf8b2b60c3ee 100644
--- a/lib_enc/core_enc_switch.c
+++ b/lib_enc/core_enc_switch.c
@@ -95,7 +95,12 @@ void core_coder_mode_switch(
st->bits_frame_nominal = (int16_t) ( (float) st->L_frame / (float) st->fscale * (float) FSCALE_DENOM / 128.0f * (float) st->total_brate / 100.0f + 0.49f );
- st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode );
+ st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
/* switch IGF configuration */
if ( st->igf )
@@ -112,7 +117,12 @@ void core_coder_mode_switch(
hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->total_brate, st->rf_mode, st->element_mode );
st->hTcxCfg->tcxRateLoopOpt = ( st->hTcxCfg->resq && !st->tcxonly ) ? 1 : st->hTcxCfg->tcxRateLoopOpt;
- st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->total_brate, st->igf, st->element_mode, st->mct_chan_mode );
+ st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->total_brate, st->igf, st->element_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
if ( st->hTcxCfg->fIsTNSAllowed )
{
@@ -151,7 +161,12 @@ void core_coder_mode_switch(
}
else
{
- st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode );
+ st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
init_coder_ace_plus( st, last_total_brate, MCT_flag );
}
diff --git a/lib_enc/evs_enc.c b/lib_enc/evs_enc.c
index b90f10359b2eddf3bb4250e421fc41b8fc1bc7f2..44c34a2bd7a6942fc17bc938d5dca44f2c95f59f 100644
--- a/lib_enc/evs_enc.c
+++ b/lib_enc/evs_enc.c
@@ -686,7 +686,12 @@ static void configure_core_coder(
}
}
- st->igf = getIgfPresent( 0, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode );
+ st->igf = getIgfPresent( 0, st->total_brate, st->bwidth, st->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
if ( st->core_brate != SID_2k40 && st->core_brate != FRAME_NO_DATA )
{
diff --git a/lib_enc/ext_sig_ana.c b/lib_enc/ext_sig_ana.c
index 9e1ad869ab239d34105dbbc93b7573f34a75c87c..0588f0ddf1638c2610c24dba5e8b954548120da0 100644
--- a/lib_enc/ext_sig_ana.c
+++ b/lib_enc/ext_sig_ana.c
@@ -215,8 +215,10 @@ void core_signal_analysis_high_bitrate(
if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE )
{
+#endif
wtda( hTcxEnc->new_speech_TCX, tcx20Win, NULL, overlap_mode[frameno], overlap_mode[frameno + 1], L_frameTCX );
if ( windowed_samples != NULL ) /* store overlap data for later */
@@ -225,6 +227,7 @@ void core_signal_analysis_high_bitrate(
windowed_samples[0] = (float) overlap_mode[frameno];
windowed_samples[1] = (float) overlap_mode[frameno + 1];
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
else
{
@@ -233,17 +236,27 @@ void core_signal_analysis_high_bitrate(
st->element_mode != IVAS_CPE_MDCT /* truncate_aldo */,
1, 1 );
}
-
+#endif
if ( st->element_mode != IVAS_CPE_MDCT )
{
/* Windowing of the 2xTCX5 subframes or 1xTCX10 or 1xTCX20 */
- WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 1, 1, 0 );
+ WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 1, 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ 0
+#endif
+ );
}
}
else
{
/* Windowing of the 2xTCX5 subframes or 1xTCX10 or 1xTCX20 */
- WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno], overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, tcx20Win, st->element_mode != IVAS_CPE_MDCT, 1, 0 );
+ WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno], overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, tcx20Win, st->element_mode != IVAS_CPE_MDCT, 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ 0
+#endif
+ );
if ( windowed_samples != NULL ) /* save windowed speech_TCX samples */
{
@@ -282,8 +295,15 @@ void core_signal_analysis_high_bitrate(
for ( i = 0; i < 2; i++ )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE );
- WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, tcx20Win + i * tcx5SizeFB, &L_subframe, tcx5Win, st->element_mode != IVAS_CPE_MDCT, 1, 0 );
+#endif
+ WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, tcx20Win + i * tcx5SizeFB, &L_subframe, tcx5Win, st->element_mode != IVAS_CPE_MDCT, 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ 0
+#endif
+ );
TCX_MDCT( tcx5Win, hTcxEnc->spectrum[frameno] + i * tcx5SizeFB, left_overlap, L_subframe - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode );
@@ -298,7 +318,11 @@ void core_signal_analysis_high_bitrate(
{
assert( transform_type[frameno] == TCX_10 || transform_type[frameno] == TCX_20 );
- if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
edct( tcx20Win, hTcxEnc->spectrum[frameno], L_subframe, st->element_mode );
@@ -323,12 +347,13 @@ void core_signal_analysis_high_bitrate(
{
v_multc( hTcxEnc->spectrum[frameno] + L_FRAME16k / nSubframes, (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, hTcxEnc->spectrum[frameno] + L_FRAME16k / nSubframes, L_subframe - L_FRAME16k / nSubframes );
}
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
set_f( &hTcxEnc->spectrum[frameno][MCT_LFE_MAX_LINE], 0.f, L_subframe - MCT_LFE_MAX_LINE );
st->hTcxCfg->tcx_coded_lines = MCT_LFE_MAX_LINE;
}
+#endif
if ( st->element_mode != IVAS_CPE_MDCT )
{
@@ -345,14 +370,23 @@ void core_signal_analysis_high_bitrate(
{
L_subframe = L_frameTCX / nSubframes;
- if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
wtda_ext( hTcxEnc->new_speech_TCX, mdstWin, overlap_mode[frameno], overlap_mode[frameno + 1], L_frameTCX, 3 );
}
else
{
/* Windowing for the MDST */
- WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 0, 1, st->mct_chan_mode == MCT_CHAN_MODE_LFE );
+ WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, overlap_mode[frameno] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno], overlap_mode[frameno + 1] == ALDO_WINDOW ? FULL_OVERLAP : overlap_mode[frameno + 1], &left_overlap, &right_overlap, &hTcxEnc->speech_TCX[frameno * tcx10SizeFB], &L_subframe, mdstWin, 0, 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ );
}
if ( transform_type[frameno] == TCX_5 )
@@ -383,8 +417,15 @@ void core_signal_analysis_high_bitrate(
for ( i = 0; i < 2; i++ )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
assert( st->mct_chan_mode != MCT_CHAN_MODE_LFE );
- WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, mdstWin + i * tcx5SizeFB, &L_subframe, tcx5Win, 0, 1, 0 );
+#endif
+ WindowSignal( st->hTcxCfg, folding_offset, i == 0 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, i == 1 ? RECTANGULAR_OVERLAP : MIN_OVERLAP, &left_overlap, &right_overlap, mdstWin + i * tcx5SizeFB, &L_subframe, tcx5Win, 0, 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ 0
+#endif
+ );
TCX_MDST( tcx5Win, mdst_spectrum[frameno] + i * tcx5SizeFB, left_overlap, L_subframe - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode );
/* high-band gain control in case of BWS */
@@ -396,7 +437,11 @@ void core_signal_analysis_high_bitrate(
}
else /* transform_type[frameno] != TCX_5 */
{
- if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( transform_type[frameno] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
edst( mdstWin, mdst_spectrum[frameno], L_subframe, st->element_mode );
@@ -421,11 +466,12 @@ void core_signal_analysis_high_bitrate(
v_multc( mdst_spectrum[frameno] + L_FRAME16k / nSubframes, (float) ( st->bwidth_sw_cnt ) / (float) BWS_TRAN_PERIOD, mdst_spectrum[frameno] + L_FRAME16k / nSubframes, L_subframe - L_FRAME16k / nSubframes );
}
}
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
set_f( &mdst_spectrum[frameno][MCT_LFE_MAX_LINE], 0.f, L_subframe - MCT_LFE_MAX_LINE );
}
+#endif
}
if ( st->element_mode != IVAS_CPE_MDCT )
diff --git a/lib_enc/fd_cng_enc.c b/lib_enc/fd_cng_enc.c
index a17369923cc51b78f06940f41c6f70f1073afe2d..e43b65d56a88383a225e5228d77b2c06bf1d4018 100644
--- a/lib_enc/fd_cng_enc.c
+++ b/lib_enc/fd_cng_enc.c
@@ -66,8 +66,7 @@ ivas_error createFdCngEnc(
*hFdCngEnc = NULL;
/* Allocate memory */
- hs = (HANDLE_FD_CNG_ENC) malloc( sizeof( FD_CNG_ENC ) );
- if ( hs == NULL )
+ if ( ( hs = (HANDLE_FD_CNG_ENC) malloc( sizeof( FD_CNG_ENC ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for FD CNG ENC structure" );
}
@@ -709,18 +708,14 @@ void generate_comfort_noise_enc(
/* Perform STFT synthesis */
SynthesisSTFT( fftBuffer, timeDomainOutput, hFdCngCom->olapBufferSynth, hFdCngCom->olapWinSyn, tcx_transition, hFdCngCom, -1, -1 );
-#ifdef PARAM_ISM_DTX_CNG
if ( st->hTdCngEnc != NULL )
{
-#endif
/* update CNG excitation energy for LP_CNG */
/* calculate the residual signal energy */
enr = cng_energy( st->element_mode, st->bwidth, st->hDtxEnc->CNG_mode, st->hTdCngEnc->CNG_att, hFdCngCom->exc_cng, hFdCngCom->frameSize );
st->hTdCngEnc->lp_ener = (float) ( 0.8f * st->hTdCngEnc->lp_ener + 0.2f * pow( 2.0f, enr ) );
-#ifdef PARAM_ISM_DTX_CNG
}
-#endif
/* Overlap-add when previous frame is active */
if ( st->last_core_brate > SID_2k40 && st->codec_mode == MODE2 )
diff --git a/lib_enc/hq_core_enc.c b/lib_enc/hq_core_enc.c
index 4bc332fd5e39cbb7acdd1db5e1a9c74c40074127..43b5ebd68c7c377da7346e7ae6196ef414453108 100644
--- a/lib_enc/hq_core_enc.c
+++ b/lib_enc/hq_core_enc.c
@@ -116,7 +116,12 @@ void hq_core_enc(
left_overlap = -1;
right_overlap = -1;
- WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, TRANSITION_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_spec, wtda_audio, 1, 1, 0 );
+ WindowSignal( st->hTcxCfg, st->hTcxCfg->tcx_offsetFB, TRANSITION_OVERLAP, FULL_OVERLAP, &left_overlap, &right_overlap, st->hTcxEnc->speech_TCX, &L_spec, wtda_audio, 1, 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ 0
+#endif
+ );
TCX_MDCT( wtda_audio, t_audio, left_overlap, L_spec - ( left_overlap + right_overlap ) / 2, right_overlap, st->element_mode );
diff --git a/lib_enc/hq_lr_enc.c b/lib_enc/hq_lr_enc.c
index 9401a1bb573aebafa625d0b749975eca8f959385..e43baef59d23cc060f93c77123aca1117e194a97 100644
--- a/lib_enc/hq_lr_enc.c
+++ b/lib_enc/hq_lr_enc.c
@@ -320,7 +320,7 @@ void hq_lr_enc(
if ( flag_spt == 1 )
{
- /* initalize the desired parameters for SPT */
+ /* initialize the desired parameters for SPT */
spt_shorten_domain_band_save( bands, band_start, band_end, band_width, org_band_start, org_band_end, org_band_width );
spt_shorten_domain_pre( band_start, band_end, hHQ_core->prev_SWB_peak_pos, bands, bwe_br, new_band_start, new_band_end, new_band_width );
spt_shorten_domain_set( hBstr, hHQ_core, t_audio, p2a_flags, new_band_start, new_band_end, new_band_width, bands, band_start, band_end, band_width, &bit_budget );
diff --git a/lib_enc/init_enc.c b/lib_enc/init_enc.c
index 683356c6c084d7bb0abd5d72739d18835d46e4c8..d73434c15f54a1c9675d2b7e6d8b307ae8ee8225 100644
--- a/lib_enc/init_enc.c
+++ b/lib_enc/init_enc.c
@@ -58,11 +58,8 @@ ivas_error init_encoder(
const int16_t idchan, /* i : channel ID */
const int16_t var_SID_rate_flag, /* i : flag for variable SID update rate */
const int16_t interval_SID, /* i : interval for SID update */
- const int16_t vad_only_flag /* i : flag to indicate front-VAD structure */
-#ifdef PARAM_ISM_DTX_CNG
- ,
- const ISM_MODE ism_mode /* i : ISM mode */
-#endif
+ const int16_t vad_only_flag, /* i : flag to indicate front-VAD structure */
+ const ISM_MODE ism_mode /* i : ISM mode */
)
{
int16_t i;
@@ -466,10 +463,10 @@ ivas_error init_encoder(
* LP-CNG
*-----------------------------------------------------------------*/
-#ifdef PARAM_ISM_DTX_CNG
- if ( ( ( idchan == 0 && st->Opt_DTX_ON && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO ) && !( ism_mode == ISM_MODE_PARAM ) )
+#ifdef DISCRETE_ISM_DTX_CNG
+ if ( ( ( idchan == 0 && st->Opt_DTX_ON && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO ) && !( ism_mode == ISM_MODE_PARAM || ism_mode == ISM_MODE_DISC ) )
#else
- if ( ( ( idchan == 0 && st->Opt_DTX_ON && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO ) )
+ if ( ( ( idchan == 0 && st->Opt_DTX_ON && st->element_mode != IVAS_CPE_MDCT ) || st->element_mode == EVS_MONO ) && !( ism_mode == ISM_MODE_PARAM ) )
#endif
{
if ( ( st->hTdCngEnc = (TD_CNG_ENC_HANDLE) malloc( sizeof( TD_CNG_ENC_DATA ) ) ) == NULL )
@@ -734,7 +731,11 @@ ivas_error init_encoder(
* IGF
*-----------------------------------------------------------------*/
- if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT ) && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( ( idchan == 0 || st->element_mode == IVAS_CPE_MDCT )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
if ( ( st->hIGFEnc = (IGF_ENC_INSTANCE_HANDLE) malloc( sizeof( IGF_ENC_INSTANCE ) ) ) == NULL )
{
@@ -754,7 +755,12 @@ ivas_error init_encoder(
if ( st->codec_mode == MODE2 || st->element_mode > EVS_MONO )
{
- st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode );
+ st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
}
else
{
@@ -808,9 +814,10 @@ ivas_error init_encoder(
/*-----------------------------------------------------------------*
* Transient detector
*-----------------------------------------------------------------*/
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE )
{
+#endif
if ( ( st->hTranDet = (TRAN_DET_HANDLE) malloc( sizeof( TRAN_DET_DATA ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Transient Detection\n" ) );
@@ -824,11 +831,13 @@ ivas_error init_encoder(
{
InitTransientDetection( (int16_t) ( st->input_Fs / FRAMES_PER_SEC ), NS2SA( st->input_Fs, DELAY_FIR_RESAMPL_NS ), st->hTranDet, 0 );
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
else
{
st->hTranDet = NULL;
}
+#endif
/*-----------------------------------------------------------------*
* IVAS parameters
@@ -869,32 +878,22 @@ void LPDmem_enc_init(
return;
}
+
+
/*-----------------------------------------------------------------------*
- * destroy_encoder()
+ * destroy_cldfb_encoder()
*
* Free memory which was allocated in init_encoder()
*-----------------------------------------------------------------------*/
-void destroy_encoder(
+void destroy_cldfb_encoder(
Encoder_State *st /* i/o: Encoder static variables structure */
)
{
- if ( st->cldfbSynTd != NULL )
- {
- deleteCldfb( &st->cldfbSynTd );
- }
-
- if ( st->cldfbAnaEnc != NULL )
- {
- deleteCldfb( &st->cldfbAnaEnc );
- }
-
- if ( st->hFdCngEnc != NULL )
- {
- deleteFdCngEnc( &st->hFdCngEnc );
- }
+ deleteCldfb( &st->cldfbSynTd );
+ deleteCldfb( &st->cldfbAnaEnc );
- /* Close Core */
+ deleteFdCngEnc( &st->hFdCngEnc );
return;
}
diff --git a/lib_enc/ivas_agc_enc.c b/lib_enc/ivas_agc_enc.c
index f98c22b97e46d286c4a5be8e8df49c9c299d4c48..83dbdad1e183efb3bb5990657633b3c68323b389 100644
--- a/lib_enc/ivas_agc_enc.c
+++ b/lib_enc/ivas_agc_enc.c
@@ -195,22 +195,24 @@ void ivas_spar_agc_enc_close(
{
ivas_agc_enc_state_t *hAgc;
+ if ( hAgcEnc == NULL || *hAgcEnc == NULL )
+ {
+ return;
+ }
+
hAgc = *hAgcEnc;
- if ( hAgc != NULL )
- {
- free( hAgc->agc_com.winFunc );
- hAgc->agc_com.winFunc = NULL;
+ free( hAgc->agc_com.winFunc );
+ hAgc->agc_com.winFunc = NULL;
- free( hAgc->gain_state );
- hAgc->gain_state = NULL;
+ free( hAgc->gain_state );
+ hAgc->gain_state = NULL;
- free( hAgc->gain_data );
- hAgc->gain_data = NULL;
+ free( hAgc->gain_data );
+ hAgc->gain_data = NULL;
- free( hAgc );
- hAgc = NULL;
- }
+ free( *hAgcEnc );
+ *hAgcEnc = NULL;
return;
}
diff --git a/lib_enc/ivas_core_enc.c b/lib_enc/ivas_core_enc.c
index 579f74c6d6adb5d8fbfbb49a88c00836ca84e022..5314602091403ea8367437005dec651dde66a103 100644
--- a/lib_enc/ivas_core_enc.c
+++ b/lib_enc/ivas_core_enc.c
@@ -274,7 +274,15 @@ ivas_error ivas_core_enc(
if ( MCT_flag )
{
ivas_mdct_core_whitening_enc( hCPE, old_inp_16k, old_wsp, pitch_buf, hMCT->p_mdst_spectrum_long[cpe_id], hMCT->tnsBits[cpe_id], hMCT->p_orig_spectrum_long[cpe_id],
- hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], hMCT->hBstr, &hMCT->LFE_off, 1, hMCT->nchan_out_woLFE + hMCT->num_lfe );
+ hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], hMCT->hBstr,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ &hMCT->LFE_off,
+#endif
+ 1, hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ );
}
else
{
@@ -479,6 +487,8 @@ ivas_error ivas_core_enc(
dbgwrite( &st->sp_aud_decision1, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "sp_aud_decision1", n, id, ENC ) );
dbgwrite( &st->sp_aud_decision2, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "sp_aud_decision2", n, id, ENC ) );
+ dbgwrite( &st->lp_noise, sizeof( float ), 1, input_frame, fname( debug_dir, "lp_noise", n, id, ENC ) );
+
#if ( defined DEBUG_MODE_ACELP ) || ( defined DEBUG_MODE_TCX )
if ( st->coder_type == INACTIVE || st->coder_type == UNVOICED )
{
diff --git a/lib_enc/ivas_core_pre_proc_front.c b/lib_enc/ivas_core_pre_proc_front.c
old mode 100644
new mode 100755
index 000fbab33ebbabbaaba7787b9a47abc6181da856..85eba72f006b477315f626931811aceb8c5443f3
--- a/lib_enc/ivas_core_pre_proc_front.c
+++ b/lib_enc/ivas_core_pre_proc_front.c
@@ -107,12 +107,7 @@ ivas_error pre_proc_front_ivas(
const int16_t front_vad_flag, /* i : front-VAD flag to overwrite VAD decision */
const int16_t force_front_vad, /* i : flag to force VAD decision */
const int16_t front_vad_dtx_flag, /* i : front-VAD DTX flag to overwrite VAD decision*/
-#ifdef LOW_RATE_TRANS_CORE_CODER
- const int32_t ivas_total_brate /* i : IVAS total bitrate - for setting the DTX */
-#else
- const int32_t ivas_total_brate, /* i : IVAS total bitrate - for setting the DTX */
- const int16_t ivas_format /* i : IVAS format */
-#endif
+ const int32_t ivas_total_brate /* i : IVAS total bitrate - for setting the DTX */
)
{
@@ -491,7 +486,12 @@ ivas_error pre_proc_front_ivas(
if ( st->idchan == 0 && element_mode != IVAS_CPE_MDCT )
{
- bw_detect( st, st->input, NULL, enerBuffer );
+ bw_detect( st, st->input, NULL, enerBuffer
+#ifdef FIX_MDCT_BASED_BWD
+ ,
+ 0
+#endif
+ );
}
if ( element_mode != IVAS_CPE_MDCT ) /* in MDCT stereo, set_bw_stereo() is used instead */
@@ -811,11 +811,7 @@ ivas_error pre_proc_front_ivas(
}
}
/* Switch to ACELP for non-harmonic transient signals */
-#ifdef LOW_RATE_TRANS_CORE_CODER
else if ( ( ( element_mode >= IVAS_CPE_DFT && element_brate <= IVAS_16k4 ) || ( element_mode == IVAS_SCE && element_brate < SCE_SMC_THR ) ) && ( loc_harm[0] != 1 ) && smc_dec == MUSIC )
-#else
- else if ( ( ( ivas_format == STEREO_FORMAT && element_brate <= IVAS_16k4 ) || ( ivas_format == ISM_FORMAT && element_brate < SCE_SMC_THR ) ) && ( loc_harm[0] != 1 ) && smc_dec == MUSIC )
-#endif
{
if ( element_mode == IVAS_SCE )
{
diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c
index e8486d77382b95866009ae265498450d0b562af9..1a9d5c9abd9cf5e9028efee1ba3d662fe712ea48 100644
--- a/lib_enc/ivas_corecoder_enc_reconfig.c
+++ b/lib_enc/ivas_corecoder_enc_reconfig.c
@@ -30,15 +30,14 @@
*******************************************************************************************************/
-#include
#include
#include "options.h"
#include "ivas_cnst.h"
#include "prot.h"
#include "ivas_prot.h"
-#include "ivas_stat_enc.h"
#ifdef DEBUGGING
#include "debug.h"
+#include
#endif
#include "wmc_auto.h"
@@ -46,7 +45,7 @@
/*-------------------------------------------------------------------*
* ivas_corecoder_enc_reconfig()
*
- * Allocate, initalize, and configure SCE/CPE/MCT handles in case of bitrate switching
+ * Allocate, initialize, and configure SCE/CPE/MCT handles in case of bitrate switching
*-------------------------------------------------------------------*/
ivas_error ivas_corecoder_enc_reconfig(
@@ -97,6 +96,7 @@ ivas_error ivas_corecoder_enc_reconfig(
for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )
{
st_ivas->hCPE[cpe_id]->element_brate = brate_CPE;
+
/* prepare bitstream buffers */
for ( n = 0; n < CPE_CHANNELS; n++ )
{
@@ -120,11 +120,13 @@ ivas_error ivas_corecoder_enc_reconfig(
nchan_transport_old_real = nchan_transport_old;
nchan_transport_real = st_ivas->nchan_transport;
+
/* in SCE+CPE McMASA nchan_transport is still 2, fix the numbers */
if ( hEncoderConfig->ivas_format == MC_FORMAT && last_mc_mode == MC_MODE_MCMASA )
{
nchan_transport_old_real = nSCE_old + CPE_CHANNELS * nCPE_old;
}
+
if ( hEncoderConfig->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA )
{
nchan_transport_real = st_ivas->nSCE + CPE_CHANNELS * st_ivas->nCPE;
@@ -209,7 +211,11 @@ ivas_error ivas_corecoder_enc_reconfig(
{
if ( n_CoreCoder_existing > cpe_id * CPE_CHANNELS + n )
{
+#ifdef FIX_386_CORECODER_RECONFIG
+ mvr2r( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->input_buff, input_buff[( cpe_id - st_ivas->nCPE ) * CPE_CHANNELS + n], len_inp_memory );
+#else
mvr2r( st_ivas->hCPE[cpe_id]->hCoreCoder[0]->input_buff, input_buff[( cpe_id - st_ivas->nCPE ) * CPE_CHANNELS + n], len_inp_memory ); /* TODO VoiceAge: Please check if this should be hCoreCoder[n] */
+#endif
}
}
@@ -219,8 +225,7 @@ ivas_error ivas_corecoder_enc_reconfig(
if ( st_ivas->nCPE <= 1 && st_ivas->hMCT != NULL )
{
- ivas_mct_enc_close( st_ivas->hMCT );
- st_ivas->hMCT = NULL;
+ ivas_mct_enc_close( &( st_ivas->hMCT ) );
}
/* special case, if we have MCT now and had a single CPE before, remove the MDCT Stereo handles */
@@ -230,7 +235,7 @@ ivas_error ivas_corecoder_enc_reconfig(
st_ivas->hCPE[0]->hStereoMdct = NULL;
}
- /* create missing core coder elements and set element bitrates for alrady existing ones */
+ /* create missing core coder elements and set element bitrates for already existing ones */
if ( st_ivas->nSCE > 0 )
{
nSCE_existing = min( nSCE_old, st_ivas->nSCE );
@@ -250,7 +255,11 @@ ivas_error ivas_corecoder_enc_reconfig(
}
/* propagate input audio buffers */
+#ifdef OMASA_BRATE_SW
+ if ( n_CoreCoder_existing > sce_id && hEncoderConfig->ivas_format != MASA_ISM_FORMAT )
+#else
if ( n_CoreCoder_existing > sce_id )
+#endif
{
mvr2r( input_buff[sce_id], st_ivas->hSCE[sce_id]->hCoreCoder[0]->input_buff, len_inp_memory );
}
@@ -259,7 +268,11 @@ ivas_error ivas_corecoder_enc_reconfig(
st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr->ind_list = ind_list + sce_id * MAX_NUM_INDICES;
/* only reset indices if it is not the first index list, this already contains the IVAS format bits */
+#ifdef OMASA_BRATE_SW
+ if ( sce_id > 0 || hEncoderConfig->ivas_format == MASA_ISM_FORMAT )
+#else
if ( sce_id > 0 )
+#endif
{
reset_indices_enc( st_ivas->hSCE[sce_id]->hCoreCoder[0]->hBstr, MAX_NUM_INDICES );
}
@@ -282,6 +295,7 @@ ivas_error ivas_corecoder_enc_reconfig(
for ( cpe_id = 0; cpe_id < nCPE_existing; cpe_id++ )
{
st_ivas->hCPE[cpe_id]->element_brate = brate_CPE;
+
/* prepare bitstream buffers */
for ( n = 0; n < CPE_CHANNELS; n++ )
{
@@ -289,7 +303,13 @@ ivas_error ivas_corecoder_enc_reconfig(
st_ivas->hCPE[cpe_id]->hCoreCoder[n]->total_brate = st_ivas->hCPE[cpe_id]->element_brate / ( st_ivas->nCPE > 1 ? 1 : CPE_CHANNELS ); /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */
st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr->ind_list = ind_list + ( cpe_id * CPE_CHANNELS + n + st_ivas->nSCE ) * MAX_NUM_INDICES;
+#ifdef OMASA_BRATE_SW
+ if ( ( cpe_id * CPE_CHANNELS + n > 0 ) ||
+ ( st_ivas->mc_mode == MC_MODE_MCMASA && st_ivas->nSCE > 0 ) ||
+ ( hEncoderConfig->ivas_format == MASA_ISM_FORMAT && st_ivas->nSCE > 0 ) )
+#else
if ( cpe_id * CPE_CHANNELS + n > 0 || ( st_ivas->mc_mode == MC_MODE_MCMASA && st_ivas->nSCE > 0 ) )
+#endif
{
reset_indices_enc( st_ivas->hCPE[cpe_id]->hCoreCoder[n]->hBstr, MAX_NUM_INDICES );
}
@@ -375,8 +395,12 @@ ivas_error ivas_corecoder_enc_reconfig(
st_ivas->hCPE[0]->hCoreCoder[n]->igf = getIgfPresent( st_ivas->hCPE[0]->hCoreCoder[n]->element_mode,
st_ivas->hCPE[0]->hCoreCoder[n]->bits_frame_nominal * FRAMES_PER_SEC,
st_ivas->hCPE[0]->hCoreCoder[n]->bwidth,
- st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode,
- st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode );
+ st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode
+#endif
+ );
if ( st_ivas->hCPE[0]->hCoreCoder[n]->igf )
{
@@ -443,8 +467,12 @@ ivas_error ivas_corecoder_enc_reconfig(
st_ivas->hCPE[0]->hCoreCoder[n]->igf = getIgfPresent( st_ivas->hCPE[0]->hCoreCoder[n]->element_mode,
st_ivas->hCPE[0]->hCoreCoder[n]->bits_frame_nominal * FRAMES_PER_SEC,
st_ivas->hCPE[0]->hCoreCoder[n]->bwidth,
- st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode,
- st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode );
+ st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st_ivas->hCPE[0]->hCoreCoder[n]->mct_chan_mode
+#endif
+ );
if ( st_ivas->hCPE[0]->hCoreCoder[n]->igf )
{
diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc.c
index 861e1015c4df5f29aaa2a6ab50b31ae8451d40f0..490cd41d1e613f3f2ac2f6f456b68a66e61a089d 100644
--- a/lib_enc/ivas_cpe_enc.c
+++ b/lib_enc/ivas_cpe_enc.c
@@ -157,7 +157,14 @@ ivas_error ivas_cpe_enc(
}
mvr2r( data_f_ch0, sts[0]->input, input_frame );
+#ifdef ISSUE_24_CLEANUP_MCT_LFE
+ if ( data_f_ch1 != NULL ) /*this may happen for cases with odd number of channels*/
+ {
+ mvr2r( data_f_ch1, sts[1]->input, input_frame );
+ }
+#else
mvr2r( data_f_ch1, sts[1]->input, input_frame );
+#endif
/*----------------------------------------------------------------*
* Stereo technology selection
@@ -279,7 +286,11 @@ ivas_error ivas_cpe_enc(
if ( hCPE->element_mode != IVAS_CPE_MDCT && ( hCPE->element_brate != hCPE->last_element_brate || hCPE->last_element_mode != hCPE->element_mode ||
- sts[0]->ini_frame == 0 || sts[0]->last_core_brate <= SID_2k40 ) ) /* If the last frame was SID or NO_DATA, we need to run stereo_dft_config here since VAD decision is not known yet */
+ sts[0]->ini_frame == 0 ||
+#ifdef OMASA_BRATE_SW
+ ( ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate ) ||
+#endif
+ sts[0]->last_core_brate <= SID_2k40 ) ) /* If the last frame was SID or NO_DATA, we need to run stereo_dft_config here since VAD decision is not known yet */
{
if ( st_ivas->hQMetaData != NULL )
{
@@ -338,12 +349,27 @@ ivas_error ivas_cpe_enc(
{
if ( st_ivas->hMCT )
{
+#ifdef ISSUE_24_CLEANUP_MCT_LFE
+ int16_t lfe_bits;
+ lfe_bits = ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ? st_ivas->hLFE->lfe_bits : 0 );
+#endif
sts[n]->total_brate = hCPE->element_brate;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( sts[n]->mct_chan_mode != MCT_CHAN_MODE_LFE )
{
+#endif
sts[n]->bits_frame_nominal = (int16_t) ( hCPE->element_brate / FRAMES_PER_SEC );
- sts[n]->bits_frame_channel = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC - ( st_ivas->hMCT->num_lfe == FALSE ? 0 : LFE_BITS ) - nb_bits_metadata ) / st_ivas->hMCT->nchan_out_woLFE );
+ sts[n]->bits_frame_channel = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC -
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ( st_ivas->hMCT->num_lfe == FALSE ? 0 : LFE_BITS ) -
+#else
+ lfe_bits -
+#endif
+ nb_bits_metadata ) /
+ st_ivas->hMCT->nchan_out_woLFE );
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
}
else
{
@@ -409,7 +435,12 @@ ivas_error ivas_cpe_enc(
else if ( hCPE->element_mode == IVAS_CPE_TD )
{
/* Determine the energy ratio between the 2 channels */
- tdm_ratio_idx = stereo_tdm_ener_analysis( hCPE, input_frame, &tdm_SM_or_LRTD_Pri, &tdm_ratio_idx_SM );
+ tdm_ratio_idx = stereo_tdm_ener_analysis( hCPE, input_frame, &tdm_SM_or_LRTD_Pri, &tdm_ratio_idx_SM
+#ifdef OMASA_TUNING_TD_STEREO
+ ,
+ st_ivas->hOMasa != NULL
+#endif
+ );
/* Compute the downmix signal based on the ratio index */
stereo_tdm_downmix( hCPE->hStereoTD, sts[0]->input, sts[1]->input, input_frame, tdm_ratio_idx, ( ( hCPE->hStereoTD->tdm_LRTD_flag == 0 ) ? tdm_SM_or_LRTD_Pri : 0 ), tdm_ratio_idx_SM );
@@ -487,19 +518,11 @@ ivas_error ivas_cpe_enc(
for ( n = 0; n < n_CoreChannels; n++ )
{
-#ifdef LOW_RATE_TRANS_CORE_CODER
error = pre_proc_front_ivas( NULL, hCPE, hCPE->element_brate, nb_bits_metadata, input_frame, n, old_inp_12k8[n], old_inp_16k[n],
&ener[n], &relE[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n],
&vad_hover_flag[n], &attack_flag[n], realBuffer[n], imagBuffer[n], old_wsp[n], pitch_fr[n], voicing_fr[n], &loc_harm[n], &cor_map_sum[n], &vad_flag_dtx[n], enerBuffer[n],
fft_buff[n], A[0], lsp_new[0], currFlatness[n], tdm_ratio_idx, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, band_energies_LR, 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, 0, 0,
ivas_total_brate );
-#else
- error = pre_proc_front_ivas( NULL, hCPE, hCPE->element_brate, nb_bits_metadata, input_frame, n, old_inp_12k8[n], old_inp_16k[n],
- &ener[n], &relE[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n],
- &vad_hover_flag[n], &attack_flag[n], realBuffer[n], imagBuffer[n], old_wsp[n], pitch_fr[n], voicing_fr[n], &loc_harm[n], &cor_map_sum[n], &vad_flag_dtx[n], enerBuffer[n],
- fft_buff[n], A[0], lsp_new[0], currFlatness[n], tdm_ratio_idx, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, band_energies_LR, 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, 0, 0,
- ivas_total_brate, st_ivas->hEncoderConfig->ivas_format );
-#endif
if ( error != IVAS_ERR_OK )
{
return error;
@@ -583,7 +606,12 @@ ivas_error ivas_cpe_enc(
{
tdm_ol_pitch_comparison( hCPE, pitch_fr, voicing_fr );
- tdm_configure_enc( hCPE, Etot_last, tdm_SM_or_LRTD_Pri, tdm_ratio_idx, tdm_ratio_idx_SM, attack_flag[0], nb_bits_metadata );
+ tdm_configure_enc( hCPE, Etot_last, tdm_SM_or_LRTD_Pri, tdm_ratio_idx, tdm_ratio_idx_SM, attack_flag[0], nb_bits_metadata
+#ifdef OMASA_TUNING_TD_STEREO
+ ,
+ st_ivas->hOMasa != NULL
+#endif
+ );
if ( hEncoderConfig->Opt_DTX_ON )
{
@@ -772,10 +800,14 @@ ivas_error ivas_cpe_enc(
/* Store previous attack detection flag */
for ( n = 0; n < CPE_CHANNELS; n++ )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( sts[n]->mct_chan_mode != MCT_CHAN_MODE_LFE )
{
+#endif
sts[n]->hTranDet->transientDetector.prev_bIsAttackPresent = sts[n]->hTranDet->transientDetector.bIsAttackPresent;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
}
#ifdef DEBUG_MODE_INFO
@@ -788,7 +820,7 @@ ivas_error ivas_cpe_enc(
dbgwrite( &n, 2, 1, input_frame, "res/TCA_idx_NCShift" );
dbgwrite( &n, 2, 1, input_frame, "res/TCA_idx_ica_gD" );
n = -1;
- dbgwrite( &n, 2, 1, input_frame, "res/tdm_ratio_idx.enc" );
+ //dbgwrite( &n, 2, 1, input_frame, "res/tdm_ratio_idx.enc" );
}
else if ( hCPE->element_mode == IVAS_CPE_TD )
{
@@ -805,7 +837,7 @@ ivas_error ivas_cpe_enc(
else if ( hCPE->element_mode == IVAS_CPE_MDCT )
{
n = -2;
- dbgwrite( &n, 2, 1, input_frame, "res/tdm_ratio_idx.enc" );
+ //dbgwrite( &n, 2, 1, input_frame, "res/tdm_ratio_idx.enc" );
}
{
@@ -947,16 +979,13 @@ ivas_error create_cpe_enc(
copy_encoder_config( st_ivas, st, 1 );
st->total_brate = hCPE->element_brate / ( st_ivas->nCPE > 1 ? 1 : CPE_CHANNELS ); /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */
st->mct_chan_mode = MCT_CHAN_MODE_REGULAR;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT && ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL )
{
st->mct_chan_mode = MCT_CHAN_MODE_LFE;
}
-
-#ifdef PARAM_ISM_DTX_CNG
- if ( ( error = init_encoder( st, n, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 0, st_ivas->ism_mode ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = init_encoder( st, n, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 0 ) ) != IVAS_ERR_OK )
#endif
+ if ( ( error = init_encoder( st, n, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 0, st_ivas->ism_mode ) ) != IVAS_ERR_OK )
{
return error;
}
diff --git a/lib_enc/ivas_decision_matrix_enc.c b/lib_enc/ivas_decision_matrix_enc.c
index fcc77edd524cae622ee6ccb278a5819ddc20021e..e26d1e7a7231aa4fb732f81a708d710af5871f7e 100644
--- a/lib_enc/ivas_decision_matrix_enc.c
+++ b/lib_enc/ivas_decision_matrix_enc.c
@@ -114,7 +114,7 @@ void ivas_decision_matrix_enc(
if ( st->element_mode == IVAS_SCE && st->low_rate_mode )
{
- /* ISm low-rate mode */
+ /* ISM low-rate mode */
st->core = ACELP_CORE;
st->coder_type = INACTIVE;
}
@@ -391,7 +391,7 @@ void ivas_signaling_enc(
}
else if ( st->element_mode == IVAS_SCE && st->low_rate_mode )
{
- /* ISm Low-rate mode -> do nothing -> always WB, ACELP core, IC coder_type */
+ /* ISM Low-rate mode -> do nothing -> always WB, ACELP core, IC coder_type */
}
else if ( ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) || st->core_brate <= SID_2k40 )
{
diff --git a/lib_enc/ivas_dirac_enc.c b/lib_enc/ivas_dirac_enc.c
index 92c2f80fadf734d36af84bb460cdf56d9afae991..43bc94fb04c06e30858d5419907091bac7b4872a 100644
--- a/lib_enc/ivas_dirac_enc.c
+++ b/lib_enc/ivas_dirac_enc.c
@@ -104,7 +104,7 @@ ivas_error ivas_dirac_enc_open(
return error;
}
/* Allocate and initialize FB mixer handle */
- if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -118,14 +118,17 @@ ivas_error ivas_dirac_enc_open(
}
dirac_slot_ns = DIRAC_SLOT_ENC_NS;
- /* initalize delay for SPAR/DirAC delay synchronization */
+ /* initialize delay for SPAR/DirAC delay synchronization */
if ( st_ivas->sba_mode == SBA_MODE_DIRAC )
{
hDirAC->num_samples_synchro_delay = NS2SA( input_Fs, IVAS_FB_ENC_DELAY_NS );
for ( i = 0; i < DIRAC_MAX_ANA_CHANS; i++ )
{
- hDirAC->sba_synchro_buffer[i] = (float *) malloc( hDirAC->num_samples_synchro_delay * sizeof( float ) );
+ if ( ( hDirAC->sba_synchro_buffer[i] = (float *) malloc( hDirAC->num_samples_synchro_delay * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_zero( hDirAC->sba_synchro_buffer[i], hDirAC->num_samples_synchro_delay );
}
}
@@ -142,11 +145,17 @@ ivas_error ivas_dirac_enc_open(
/* intensity 3-dim */
for ( i = 0; i < DIRAC_NUM_DIMS; i++ )
{
- hDirAC->direction_vector_m[i] = (float **) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( float * ) );
+ if ( ( hDirAC->direction_vector_m[i] = (float **) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
{
- hDirAC->direction_vector_m[i][j] = (float *) malloc( DIRAC_MAX_NBANDS * sizeof( float ) );
+ if ( ( hDirAC->direction_vector_m[i][j] = (float *) malloc( DIRAC_MAX_NBANDS * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_f( hDirAC->direction_vector_m[i][j], 0.0f, DIRAC_MAX_NBANDS );
}
}
@@ -154,14 +163,24 @@ ivas_error ivas_dirac_enc_open(
hDirAC->no_col_avg_diff = (int16_t) ( DIRAC_NO_COL_AVG_DIFF_NS / dirac_slot_ns );
for ( i = 0; i < DIRAC_NUM_DIMS; i++ )
{
- hDirAC->buffer_intensity_real[i] = (float **) malloc( hDirAC->no_col_avg_diff * sizeof( float * ) );
+ if ( ( hDirAC->buffer_intensity_real[i] = (float **) malloc( hDirAC->no_col_avg_diff * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
for ( j = 0; j < hDirAC->no_col_avg_diff; j++ )
{
- hDirAC->buffer_intensity_real[i][j] = (float *) malloc( DIRAC_MAX_NBANDS * sizeof( float ) );
+ if ( ( hDirAC->buffer_intensity_real[i][j] = (float *) malloc( DIRAC_MAX_NBANDS * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_f( hDirAC->buffer_intensity_real[i][j], 0.0f, DIRAC_MAX_NBANDS );
}
}
- hDirAC->buffer_energy = (float *) malloc( DIRAC_MAX_NBANDS * hDirAC->no_col_avg_diff * sizeof( float ) );
+
+ if ( ( hDirAC->buffer_energy = (float *) malloc( DIRAC_MAX_NBANDS * hDirAC->no_col_avg_diff * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DirAC\n" ) );
+ }
set_f( hDirAC->buffer_energy, 0.0f, DIRAC_MAX_NBANDS * hDirAC->no_col_avg_diff );
if ( st_ivas->hQMetaData->useLowerRes )
@@ -226,19 +245,27 @@ ivas_error ivas_dirac_enc_reconfigure(
/*-------------------------------------------------------------------------
* ivas_dirac_enc_close()
*
- * Close DirAC
+ * Close DirAC encoder handle
*------------------------------------------------------------------------*/
void ivas_dirac_enc_close(
- DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */
- const int32_t input_Fs /* i : input sampling rate */
+ DIRAC_ENC_HANDLE *hDirAC_out, /* i/o: encoder DirAC handle */
+ const int32_t input_Fs /* i : input sampling rate */
)
{
int16_t i, j;
+ DIRAC_ENC_HANDLE hDirAC;
+
+ if ( hDirAC_out == NULL || *hDirAC_out == NULL )
+ {
+ return;
+ }
+
+ hDirAC = *hDirAC_out;
if ( hDirAC->hFbMixer != NULL )
{
- ivas_FB_mixer_close( &hDirAC->hFbMixer, input_Fs );
+ ivas_FB_mixer_close( &hDirAC->hFbMixer, input_Fs, 0 );
}
for ( i = 0; i < DIRAC_MAX_ANA_CHANS; i++ )
@@ -284,7 +311,8 @@ void ivas_dirac_enc_close(
hDirAC->hConfig = NULL;
}
- free( hDirAC );
+ free( *hDirAC_out );
+ *hDirAC_out = NULL;
return;
}
diff --git a/lib_enc/ivas_enc.c b/lib_enc/ivas_enc.c
index e4448b0f5618e063268576fbf16ff98e50db196f..5d329701cb5e8df438fa8cf2947961340333e0b3 100644
--- a/lib_enc/ivas_enc.c
+++ b/lib_enc/ivas_enc.c
@@ -140,14 +140,11 @@ ivas_error ivas_enc(
/* bypass EVS coding in float precision, emulating EVS encoder/decoder delay */
for ( i = 0; i < n; i++ )
{
-#ifdef SBA_HPF_TUNING_ENC
if ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->sba_mode == SBA_MODE_SPAR ) )
{
hp20( data_f[HOA_keep_ind[i]], input_frame, st_ivas->mem_hp20_in[i], input_Fs );
}
- else
-#endif
- if ( !( ivas_format == MC_FORMAT && i == LFE_CHANNEL ) ) /*TODO: is the HPF needed for LFE channel? */
+ else if ( !( ivas_format == MC_FORMAT && i == LFE_CHANNEL ) ) /*TODO: is the HPF needed for LFE channel? */
{
hp20( data_f[i], input_frame, st_ivas->mem_hp20_in[i], input_Fs );
}
@@ -238,20 +235,26 @@ ivas_error ivas_enc(
}
else
{
+#ifdef FIX_382_MASA_META_FRAMING_ASYNC
+ ivas_masa_estimate_energy( st_ivas->hMasa, data_f, input_frame, st_ivas->nchan_transport ); /* energy-estimation uses TF-resolution: 4x24 */
+#endif
if ( ( error = ivas_masa_enc_config( st_ivas ) ) != IVAS_ERR_OK )
{
return error;
}
-
- ivas_masa_estimate_energy( st_ivas->hMasa, data_f, input_frame, st_ivas->nchan_transport );
-
- ivas_masa_encode( st_ivas->hMasa, st_ivas->hQMetaData, hMetaData, &nb_bits_metadata[0], st_ivas->nchan_transport, ivas_format,
- ivas_total_brate, hEncoderConfig->Opt_DTX_ON, st_ivas->nchan_transport == 2 ? st_ivas->hCPE[0]->element_mode : -1
+#ifndef FIX_382_MASA_META_FRAMING_ASYNC
+ ivas_masa_estimate_energy( st_ivas->hMasa, data_f, input_frame, st_ivas->nchan_transport ); /* energy-estimation uses TF-resolution: 4x24 */
+#endif
+ if ( ( error = ivas_masa_encode( st_ivas->hMasa, st_ivas->hQMetaData, hMetaData, &nb_bits_metadata[0], st_ivas->nchan_transport, ivas_format,
+ ivas_total_brate, hEncoderConfig->Opt_DTX_ON, st_ivas->nchan_transport == 2 ? st_ivas->hCPE[0]->element_mode : -1
#ifdef MASA_AND_OBJECTS
- ,
+ ,
ISM_MODE_NONE, -1, NULL, -1, NULL, 0
#endif
- );
+ ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
}
else if ( st_ivas->sba_mode == SBA_MODE_SPAR )
@@ -296,7 +299,14 @@ ivas_error ivas_enc(
float data_separated_object[L_FRAME48k];
int16_t idx_separated_object;
+#ifdef OMASA_BRATE_SW
+ if ( ( error = ivas_omasa_enc_config( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+#else
ivas_masa_enc_reconfigure( st_ivas );
+#endif
hMetaData = st_ivas->hCPE[st_ivas->nCPE - 1]->hMetaData;
@@ -310,6 +320,9 @@ ivas_error ivas_enc(
/* nb_bits_metadata[0] = 0; */
set_s( nb_bits_metadata, 0, MAX_SCE + 1 );
+#ifdef OMASA_BRATE_SW
+ idx_separated_object = 0;
+#else
/* Configure MASA encoder based on frame parameters */
if ( ( error = ivas_masa_enc_config( st_ivas ) ) != IVAS_ERR_OK )
{
@@ -322,6 +335,7 @@ ivas_error ivas_enc(
/* Configure oMASA analysis based on MASA config */
ivas_omasa_set_config( st_ivas->hOMasa, st_ivas->hMasa, st_ivas->hEncoderConfig->input_Fs, st_ivas->ism_mode );
}
+#endif
/* Estimate TF-tile energy for the input MASA stream */
ivas_masa_estimate_energy( st_ivas->hMasa, &( data_f[hEncoderConfig->nchan_ism] ), input_frame, st_ivas->nchan_transport );
@@ -442,12 +456,15 @@ ivas_error ivas_enc(
ivas_mcmasa_enc( st_ivas->hMcMasa, st_ivas->hQMetaData, st_ivas->hMasa, data_f, input_frame, st_ivas->nchan_transport, nchan_inp );
- ivas_masa_encode( st_ivas->hMasa, st_ivas->hQMetaData, hMetaData, &nb_bits_metadata[0], st_ivas->nchan_transport, ivas_format, ivas_total_brate, 0, -1
+ if ( ( error = ivas_masa_encode( st_ivas->hMasa, st_ivas->hQMetaData, hMetaData, &nb_bits_metadata[0], st_ivas->nchan_transport, ivas_format, ivas_total_brate, 0, -1
#ifdef MASA_AND_OBJECTS
- ,
+ ,
ISM_MODE_NONE, -1, NULL, -1, NULL, 0
#endif
- );
+ ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
if ( st_ivas->hMcMasa->separateChannelEnabled )
{
diff --git a/lib_enc/ivas_enc_cov_handler.c b/lib_enc/ivas_enc_cov_handler.c
index b70c05e96205010bdbdf0b759ee87dfaed3aadc4..e117cfc5a55ba7e737c495d437a8c1fe282c91d9 100644
--- a/lib_enc/ivas_enc_cov_handler.c
+++ b/lib_enc/ivas_enc_cov_handler.c
@@ -117,17 +117,19 @@ void ivas_spar_covar_enc_close(
{
ivas_enc_cov_handler_state_t *hCovState;
+ if ( hCovEnc == NULL || *hCovEnc == NULL )
+ {
+ return;
+ }
+
hCovState = *hCovEnc;
- if ( hCovState != NULL )
- {
- ivas_spar_covar_smooth_enc_close( &hCovState->pCov_state, nchan_inp );
+ ivas_spar_covar_smooth_enc_close( &hCovState->pCov_state, nchan_inp );
- ivas_spar_covar_smooth_enc_close( &hCovState->pCov_dtx_state, nchan_inp );
+ ivas_spar_covar_smooth_enc_close( &hCovState->pCov_dtx_state, nchan_inp );
- free( hCovState );
- hCovState = NULL;
- }
+ free( *hCovEnc );
+ *hCovEnc = NULL;
return;
}
@@ -150,12 +152,7 @@ void ivas_enc_cov_handler_process(
const int16_t end_band,
const int16_t num_ch,
const int16_t dtx_vad,
-#ifdef SMOOTH_WITH_TRANS_DET
- const int16_t transient_det[2]
-#else
- const int16_t transient_det
-#endif
-)
+ const int16_t transient_det[2] )
{
int16_t i, j;
int16_t dtx_cov_flag;
@@ -218,11 +215,7 @@ void ivas_enc_cov_handler_process(
}
else
{
-#ifdef SMOOTH_WITH_TRANS_DET
if ( ( transient_det[0] == 0 ) && ( transient_det[1] == 0 ) )
-#else
- if ( transient_det == 0 )
-#endif
{
ivas_cov_smooth_process( hCovEnc->pCov_dtx_state, cov_dtx_real, pFb, start_band, end_band, num_ch, transient_det );
hCovEnc->prior_dtx_present = 1;
diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c
index ff43a425364d97dc389389f22683730dfe6ea711..1fd102c07c2e3026f0c031c213fc57865b0d8a0d 100644
--- a/lib_enc/ivas_init_enc.c
+++ b/lib_enc/ivas_init_enc.c
@@ -212,11 +212,7 @@ int16_t getNumChanAnalysis(
n = st_ivas->nSCE + CPE_CHANNELS * st_ivas->nCPE;
if ( st_ivas->hEncoderConfig->ivas_format == SBA_FORMAT )
{
-#ifdef SBA_HPF_TUNING_ENC
n = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order );
-#else
- n = DIRAC_MAX_ANA_CHANS;
-#endif
}
else if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && ( st_ivas->mc_mode == MC_MODE_PARAMMC || st_ivas->mc_mode == MC_MODE_MCMASA ) )
{
@@ -303,16 +299,14 @@ void ivas_initialize_handles_enc(
st_ivas->mem_hp20_in = NULL;
- /* ISm metadata handles */
+ /* ISM metadata handles */
for ( i = 0; i < MAX_NUM_OBJECTS; i++ )
{
st_ivas->hIsmMetaData[i] = NULL;
}
-#ifdef PARAM_ISM_DTX_CNG
/* ISM DTX handle */
st_ivas->hISMDTX = NULL;
-#endif
/* Q Metadata handle */
st_ivas->hQMetaData = NULL;
@@ -447,7 +441,7 @@ ivas_error ivas_init_encoder(
st_ivas->ism_mode = ivas_ism_mode_select( hEncoderConfig->nchan_inp, ivas_total_brate );
- if ( ( error = create_ism_metadata_enc( st_ivas, hEncoderConfig->nchan_inp, element_brate_tmp ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_ism_metadata_enc_create( st_ivas, hEncoderConfig->nchan_inp, element_brate_tmp ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -475,15 +469,17 @@ ivas_error ivas_init_encoder(
}
}
-#ifdef PARAM_ISM_DTX_CNG
+#ifdef DISCRETE_ISM_DTX_CNG
+ if ( st_ivas->hEncoderConfig->Opt_DTX_ON )
+#else
if ( st_ivas->hEncoderConfig->Opt_DTX_ON && st_ivas->ism_mode == ISM_MODE_PARAM )
+#endif
{
if ( ( error = ivas_ism_dtx_open( st_ivas ) ) != IVAS_ERR_OK )
{
return error;
}
}
-#endif
}
else if ( ivas_format == SBA_FORMAT || ivas_format == MASA_FORMAT )
{
@@ -500,7 +496,7 @@ ivas_error ivas_init_encoder(
if ( st_ivas->sba_mode == SBA_MODE_SPAR )
{
- if ( ( error = ivas_spar_enc_open( st_ivas ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_spar_enc_open( st_ivas, 0 ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -585,7 +581,7 @@ ivas_error ivas_init_encoder(
st_ivas->ism_mode = ivas_omasa_ism_mode_select( ivas_total_brate, hEncoderConfig->nchan_ism );
st_ivas->nchan_transport = 2;
- if ( ( error = create_ism_metadata_enc( st_ivas, hEncoderConfig->nchan_ism, element_brate_tmp ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_ism_metadata_enc_create( st_ivas, hEncoderConfig->nchan_ism, element_brate_tmp ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -618,6 +614,13 @@ ivas_error ivas_init_encoder(
return error;
}
+#ifdef OMASA_BRATE_SW
+ for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
+ {
+ set_f( st_ivas->hQMetaData->masa_to_total_energy_ratio[i], 0, MASA_FREQUENCY_BANDS );
+ }
+#endif
+
if ( ( error = ivas_masa_enc_open( st_ivas ) ) != IVAS_ERR_OK )
{
return error;
@@ -630,6 +633,7 @@ ivas_error ivas_init_encoder(
return error;
}
}
+
#ifdef OMASA_UPDATES
if ( ivas_total_brate - ism_total_brate >= MIN_BRATE_MDCT_STEREO && ( st_ivas->ism_mode != ISM_MASA_MODE_PARAM ) )
#else
@@ -855,7 +859,7 @@ void destroy_core_enc(
ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */
)
{
- destroy_encoder( hCoreCoder );
+ destroy_cldfb_encoder( hCoreCoder );
if ( hCoreCoder->hSignalBuf != NULL )
{
@@ -1046,75 +1050,53 @@ void ivas_destroy_enc(
}
/* ISM metadata handles */
- for ( n = 0; n < MAX_NUM_OBJECTS; n++ )
- {
- if ( st_ivas->hIsmMetaData[n] != NULL )
- {
- free( st_ivas->hIsmMetaData[n] );
- st_ivas->hIsmMetaData[n] = NULL;
- }
- }
+#ifdef OMASA_BRATE_SW
+ ivas_ism_metadata_close( st_ivas->hIsmMetaData, 0 );
+#else
+ ivas_ism_metadata_close( st_ivas->hIsmMetaData );
+#endif
-#ifdef PARAM_ISM_DTX_CNG
/* ISM DTX Handle */
if ( st_ivas->hISMDTX != NULL )
{
free( st_ivas->hISMDTX );
st_ivas->hISMDTX = NULL;
}
-#endif
/* Q Metadata handle */
ivas_qmetadata_close( &( st_ivas->hQMetaData ) );
/* DirAC handle */
- if ( st_ivas->hDirAC != NULL )
+ if ( ivas_format == ISM_FORMAT )
{
- if ( ivas_format == ISM_FORMAT )
- {
- ivas_param_ism_enc_close( st_ivas->hDirAC, st_ivas->hEncoderConfig->input_Fs );
- }
- else
- {
- ivas_dirac_enc_close( st_ivas->hDirAC, st_ivas->hEncoderConfig->input_Fs );
- }
- st_ivas->hDirAC = NULL;
+ ivas_param_ism_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs );
}
-
- /* SPAR handle */
- if ( st_ivas->hSpar != NULL )
+ else
{
- ivas_spar_enc_close( st_ivas->hSpar, st_ivas->hEncoderConfig->input_Fs, nchan_inp );
- st_ivas->hSpar = NULL;
+ ivas_dirac_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs );
}
+ /* SPAR handle */
+ ivas_spar_enc_close( &( st_ivas->hSpar ), st_ivas->hEncoderConfig->input_Fs, nchan_inp, 0 );
+
/* MASA handle */
- if ( st_ivas->hMasa != NULL )
- {
- ivas_masa_enc_close( st_ivas->hMasa, st_ivas->nchan_transport, ivas_format );
- st_ivas->hMasa = NULL;
- }
+#ifdef FIX_350_MASA_DELAY_COMP
+ ivas_masa_enc_close( &( st_ivas->hMasa ) );
+#else
+ ivas_masa_enc_close( &( st_ivas->hMasa ), st_ivas->nchan_transport, ivas_format );
+#endif
/* MCT handle */
- if ( st_ivas->hMCT != NULL )
- {
- ivas_mct_enc_close( st_ivas->hMCT );
- st_ivas->hMCT = NULL;
- }
+ ivas_mct_enc_close( &( st_ivas->hMCT ) );
+
+ /* LFE handle */
+ ivas_lfe_enc_close( &( st_ivas->hLFE ) );
/* Parametric MC handle */
- if ( st_ivas->hParamMC != NULL )
- {
- ivas_param_mc_enc_close( st_ivas->hParamMC, st_ivas->hEncoderConfig->input_Fs );
- st_ivas->hParamMC = NULL;
- }
+ ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs );
/* Multi-channel MASA handle */
- if ( st_ivas->hMcMasa != NULL )
- {
- ivas_mcmasa_enc_close( st_ivas->hMcMasa, st_ivas->hEncoderConfig->input_Fs );
- st_ivas->hMcMasa = NULL;
- }
+ ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs );
#ifdef MASA_AND_OBJECTS
if ( st_ivas->hOMasa != NULL )
@@ -1125,18 +1107,7 @@ void ivas_destroy_enc(
#endif
/* Stereo downmix for EVS encoder handle */
- if ( st_ivas->hStereoDmxEVS != NULL )
- {
- stereo_dmx_evs_close_encoder( st_ivas->hStereoDmxEVS );
- st_ivas->hStereoDmxEVS = NULL;
- }
-
- /* LFE handle */
- if ( st_ivas->hLFE != NULL )
- {
- ivas_lfe_enc_close( st_ivas->hLFE );
- st_ivas->hLFE = NULL;
- }
+ stereo_dmx_evs_close_encoder( &( st_ivas->hStereoDmxEVS ) );
/* Encoder configuration handle */
if ( st_ivas->hEncoderConfig != NULL )
diff --git a/lib_enc/ivas_ism_dtx_enc.c b/lib_enc/ivas_ism_dtx_enc.c
index 2fea85e44a05fd0f017ea0038928218082d08099..3839a42a9df8518f01561990ac87dadefe70696f 100644
--- a/lib_enc/ivas_ism_dtx_enc.c
+++ b/lib_enc/ivas_ism_dtx_enc.c
@@ -41,7 +41,16 @@
#endif
#include "wmc_auto.h"
-#ifdef PARAM_ISM_DTX_CNG
+
+#ifdef DISCRETE_ISM_DTX_CNG
+/*-----------------------------------------------------------------------*
+ * Local constants
+ *-----------------------------------------------------------------------*/
+
+#define MD_MAX_DIFF_AZIMUTH 10
+#define MD_MAX_DIFF_ELEVATION 10
+#endif
+
/*-------------------------------------------------------------------*
* ivas_ism_dtx_open()
@@ -67,8 +76,11 @@ ivas_error ivas_ism_dtx_open(
hISMDTX->dtx_flag = 0;
hISMDTX->sce_id_dtx = 0;
-
+#ifdef DISCRETE_ISM_DTX_CNG
+ hISMDTX->cnt_SID_ISM = -1;
+#else
set_s( hISMDTX->dtx_speech_buffer_enc, 0, PARAM_ISM_HYS_BUF_SIZE );
+#endif
for ( i = 0; i < MAX_NUM_OBJECTS; i++ )
{
@@ -83,6 +95,209 @@ ivas_error ivas_ism_dtx_open(
}
+#ifdef DISCRETE_ISM_DTX_CNG
+/*-------------------------------------------------------------------*
+ * ivas_ism_get_dtx_enc()
+ *
+ * Analysis and decision about DTX in ISM format
+ *-------------------------------------------------------------------*/
+
+/*! r: indication of DTX frame */
+int16_t ivas_ism_dtx_enc(
+ ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
+ SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */
+ const int32_t ivas_total_brate, /* i : IVAS total bitrate */
+ const int16_t nchan_ism, /* i : number of objects */
+ const int16_t nchan_transport, /* i : number of transport channels */
+ int16_t vad_flag[MAX_NUM_OBJECTS], /* i : VAD flag */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ int16_t md_diff_flag[], /* o : metadata differential flag */
+ int16_t *sid_flag /* o : indication of SID frame */
+)
+{
+ int16_t ch, dtx_flag;
+ int16_t nBits, nBits_MD_max;
+ int16_t nBits_azimuth, nBits_elevation, nBits_coh, nBits_sce_id;
+ float lp_noise[MAX_NUM_OBJECTS], lp_noise_variation, lp_noise_mean;
+ float lp_noise_max;
+ float tmp1, tmp2;
+
+ /* initialization */
+ for ( ch = 0; ch < nchan_transport; ch++ )
+ {
+ hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0;
+ }
+
+ /*------------------------------------------------------------------*
+ * compute global ISM DTX flag
+ *-----------------------------------------------------------------*/
+
+ /* compute global ISM based on localVAD */
+ dtx_flag = 1;
+ for ( ch = 0; ch < nchan_transport; ch++ )
+ {
+ dtx_flag &= !vad_flag[ch];
+ }
+
+ /* compute global ISM based on long-term background noise */
+ /* one of the channels is active -> no DTX */
+ for ( ch = 0; ch < nchan_transport; ch++ )
+ {
+ lp_noise[ch] = hSCE[ch]->hCoreCoder[0]->lp_noise;
+ }
+
+ lp_noise_variation = var( lp_noise, nchan_transport );
+ lp_noise_mean = mean( lp_noise, nchan_transport );
+
+ if ( lp_noise_mean > 50 || ( lp_noise_mean > 25 && lp_noise_variation > 32 ) )
+ {
+ dtx_flag = 0;
+ }
+
+
+ /* default DTX is applied at lower bitrates; otherwise DTX is applied only in silence */
+ maximum( lp_noise, nchan_transport, &lp_noise_max );
+
+ if ( !( ( nchan_ism == 1 && ivas_total_brate <= IVAS_24k4 ) ||
+ ( nchan_ism == 2 && ivas_total_brate <= IVAS_48k ) ||
+ ( nchan_ism == 3 && ivas_total_brate <= IVAS_80k ) ||
+ ( nchan_ism == 4 && ivas_total_brate <= IVAS_96k ) ||
+ lp_noise_max < 15 ) )
+ {
+ dtx_flag = 0;
+ }
+
+ /*------------------------------------------------------------------*
+ * Reset the bitstream
+ *-----------------------------------------------------------------*/
+
+ if ( dtx_flag )
+ {
+ /* reset the bitstream (IVAS format signaling was already written) */
+ reset_indices_enc( hSCE[0]->hCoreCoder[0]->hBstr, MAX_NUM_INDICES );
+ }
+
+ /*------------------------------------------------------------------*
+ * decide about SID metadata to be sent or not (per object)
+ * estimate the MD bit-budget consumption
+ *-----------------------------------------------------------------*/
+
+ if ( dtx_flag )
+ {
+ ivas_get_ism_sid_quan_bitbudget( nchan_ism, &nBits_azimuth, &nBits_elevation, &tmp1, &tmp2, &nBits_coh, &nBits_sce_id );
+
+ nBits = 0;
+ for ( ch = 0; ch < nchan_ism; ch++ )
+ {
+ /* check difference between current and last metadata */
+ md_diff_flag[ch] = 0;
+ if ( fabsf( hIsmMeta[ch]->azimuth - hIsmMeta[ch]->last_azimuth ) > MD_MAX_DIFF_AZIMUTH )
+ {
+ md_diff_flag[ch] = 1;
+ }
+
+ if ( fabsf( hIsmMeta[ch]->elevation - hIsmMeta[ch]->last_elevation ) > MD_MAX_DIFF_ELEVATION )
+ {
+ md_diff_flag[ch] = 1;
+ }
+
+ /* estimate SID metadata bit-budget */
+ nBits++; /* number of objects */
+ nBits++; /* SID metadata flag */
+ if ( md_diff_flag[ch] == 1 )
+ {
+ nBits += nBits_azimuth;
+ nBits += nBits_elevation;
+ }
+ }
+
+ /* calculate maximum available MD bit-budget */
+ nBits_MD_max = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC;
+ nBits_MD_max -= SID_FORMAT_NBITS;
+ if ( nchan_transport > 1 )
+ {
+ nBits_MD_max -= nBits_sce_id;
+ }
+
+ for ( ch = 0; ch < nchan_transport - 1; ch++ )
+ {
+ nBits_MD_max -= nBits_coh; /* coherence */
+ }
+
+ if ( nchan_ism > 3 )
+ {
+ nBits_MD_max--; /* ism_mode flag */
+ }
+
+ /* too many metadata bits -> switch to active coding */
+ if ( nBits > nBits_MD_max )
+ {
+ dtx_flag = 0;
+ }
+ }
+
+ /*------------------------------------------------------------------*
+ * set core_brate for all channels
+ * get 'sid_flag' value
+ *-----------------------------------------------------------------*/
+
+ *sid_flag = 0;
+
+ if ( !dtx_flag )
+ {
+ /* at least one of the channels is active -> no DTX */
+ for ( ch = 0; ch < nchan_transport; ch++ )
+ {
+ hSCE[ch]->hCoreCoder[0]->core_brate = -1;
+ set_bw( IVAS_SCE, hSCE[ch]->element_brate, hSCE[ch]->hCoreCoder[0], MODE1 );
+ }
+
+ hISMDTX->cnt_SID_ISM = -1;
+
+ /* IVAS format signaling was erased in dtx() */
+ if ( hSCE[0]->hCoreCoder[0]->hBstr->nb_bits_tot == 0 )
+ {
+ /* replicate ivas_write_format() */
+ push_indice( hSCE[0]->hCoreCoder[0]->hBstr, IND_IVAS_FORMAT, 2 /* == ISM format */, IVAS_FORMAT_SIGNALING_NBITS );
+ }
+ }
+ else /* ism_dtx_flag == 1 */
+ {
+ for ( ch = 0; ch < nchan_transport; ch++ )
+ {
+ hSCE[ch]->hCoreCoder[0]->cng_type = FD_CNG;
+ }
+
+ /* * update the global SID counter */
+ hISMDTX->cnt_SID_ISM++;
+ if ( hISMDTX->cnt_SID_ISM >= hSCE[0]->hCoreCoder[0]->hDtxEnc->max_SID )
+ {
+ /* adaptive SID update interval */
+ hSCE[0]->hCoreCoder[0]->hDtxEnc->max_SID = hSCE[0]->hCoreCoder[0]->hDtxEnc->interval_SID;
+ hISMDTX->cnt_SID_ISM = 0;
+ }
+
+ /* encode SID in one channel only */
+ for ( ch = 0; ch < nchan_transport; ch++ )
+ {
+ hSCE[ch]->hCoreCoder[0]->core_brate = FRAME_NO_DATA;
+ }
+
+ if ( hISMDTX->cnt_SID_ISM == 0 )
+ {
+ hSCE[hISMDTX->sce_id_dtx]->hCoreCoder[0]->core_brate = SID_2k40;
+ *sid_flag = 1;
+ }
+ }
+
+ if ( dtx_flag == 1 && *sid_flag == 0 )
+ {
+ set_s( md_diff_flag, 0, nchan_transport );
+ }
+
+ return dtx_flag;
+}
+#else
/*-------------------------------------------------------------------*
* ivas_ism_dtx_enc()
*
@@ -217,7 +432,7 @@ int16_t ivas_ism_dtx_enc(
return dtx_flag;
}
-
+#endif
/*-------------------------------------------------------------------*
* ivas_ism_get_sce_id_dtx()
@@ -289,7 +504,11 @@ void ivas_ism_coh_estim_dtx_enc(
{
Encoder_State *st, *st_id0;
int16_t sce_id, i;
+#ifdef DISCRETE_ISM_DTX_CNG
+ float acorr_ene[MAX_NUM_OBJECTS], xcorr_ene;
+#else
float acorr_ene[PARAM_ISM_MAX_DMX], xcorr_ene;
+#endif
if ( nchan_transport == 1 )
{
@@ -333,4 +552,3 @@ void ivas_ism_coh_estim_dtx_enc(
return;
}
-#endif
diff --git a/lib_enc/ivas_ism_enc.c b/lib_enc/ivas_ism_enc.c
index 13f804aba213a3bed0ee93611fd7f02efe1cf326..60dfcf7acc3819783563cf751f4b23d5da03a8d1 100644
--- a/lib_enc/ivas_ism_enc.c
+++ b/lib_enc/ivas_ism_enc.c
@@ -85,14 +85,22 @@ ivas_error ivas_ism_enc(
float Etot_LR[1]; /* total energy; correlation shift */
float lf_E[1][2 * VOIC_BINS]; /* per bin spectrum energy in lf */
int16_t localVAD_HE_SAD[1]; /* local HE VAD */
+#ifdef DISCRETE_ISM_DTX_CNG
+ int16_t nchan_ism, dtx_flag, sid_flag, flag_noisy_speech;
+ int16_t md_diff_flag[MAX_NUM_OBJECTS];
+#else
+#ifdef NCHAN_ISM_PARAMETER
+ int16_t nchan_ism, dtx_flag, sid_flag;
+#else
+ int16_t dtx_flag, sid_flag, flag_noisy_speech;
+#endif
int16_t i, nBits;
-#ifdef PARAM_ISM_DTX_CNG
- int16_t dtx_flag, sid_flag;
#endif
ivas_error error;
#ifdef MASA_AND_OBJECTS
- int16_t n;
+ int16_t i, nchan_transport_ism;
#endif
+
push_wmops( "ivas_ism_enc" );
/*------------------------------------------------------------------*
@@ -101,19 +109,52 @@ ivas_error ivas_ism_enc(
error = IVAS_ERR_OK;
-#ifdef PARAM_ISM_DTX_CNG
dtx_flag = 0;
sid_flag = 0;
+#if ( !defined NCHAN_ISM_PARAMETER || defined DISCRETE_ISM_DTX_CNG )
+ flag_noisy_speech = 0;
+#endif
+
+#ifdef NCHAN_ISM_PARAMETER
+ nchan_ism = st_ivas->hEncoderConfig->nchan_ism;
+#else
+#ifdef DISCRETE_ISM_DTX_CNG
+ if ( st_ivas->ism_mode == ISM_MODE_PARAM )
+ {
+ nchan_ism = st_ivas->hDirAC->hParamIsm->num_obj;
+ }
+ else /* ism_mode == ISM_MODE_DISC */
+ {
+ nchan_ism = st_ivas->nchan_transport;
+ }
+#endif
+#endif
+ set_s( md_diff_flag, 1, nchan_ism );
+
+#ifdef MASA_AND_OBJECTS
+ nchan_transport_ism = st_ivas->nchan_transport;
+#ifdef OMASA_UPDATES
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
+ {
+ nchan_transport_ism = 1;
+ nchan_ism = 1;
+ }
+ else
+#endif
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
+ {
+ nchan_transport_ism = st_ivas->hEncoderConfig->nchan_ism;
+ }
#endif
/*------------------------------------------------------------------*
* Preprocesing
*-----------------------------------------------------------------*/
- /* in ISM format: st_ivas->nchan_transport = st_ivas->nSCE */
#ifdef MASA_AND_OBJECTS
- for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ )
+ for ( sce_id = 0; sce_id < nchan_transport_ism; sce_id++ )
#else
+ /* in ISM format: st_ivas->nchan_transport = st_ivas->nSCE */
for ( sce_id = 0; sce_id < st_ivas->nchan_transport; sce_id++ )
#endif
{
@@ -164,39 +205,47 @@ ivas_error ivas_ism_enc(
* Front Pre-processing
*----------------------------------------------------------------*/
-#ifdef LOW_RATE_TRANS_CORE_CODER
error = pre_proc_front_ivas( hSCE, NULL, hSCE->element_brate, nb_bits_metadata[sce_id], input_frame, 0, old_inp_12k8[sce_id][0], old_inp_16k[sce_id][0],
&ener[sce_id][0], &relE[sce_id][0], A[sce_id][0], Aw[sce_id][0], epsP[sce_id][0], lsp_new[sce_id][0], lsp_mid[sce_id][0],
&vad_hover_flag[sce_id][0], &attack_flag[sce_id][0], realBuffer[sce_id][0], imagBuffer[sce_id][0], old_wsp[sce_id][0], pitch_fr[sce_id][0], voicing_fr[sce_id][0], &loc_harm[sce_id][0], &cor_map_sum[sce_id][0], &vad_flag_dtx[sce_id][0], enerBuffer[sce_id][0],
fft_buff[sce_id][0], A[sce_id][0], lsp_new[sce_id][0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL, 0, 0, 0, 0,
st_ivas->hEncoderConfig->ivas_total_brate );
-#else
- error = pre_proc_front_ivas( hSCE, NULL, hSCE->element_brate, nb_bits_metadata[sce_id], input_frame, 0, old_inp_12k8[sce_id][0], old_inp_16k[sce_id][0],
- &ener[sce_id][0], &relE[sce_id][0], A[sce_id][0], Aw[sce_id][0], epsP[sce_id][0], lsp_new[sce_id][0], lsp_mid[sce_id][0],
- &vad_hover_flag[sce_id][0], &attack_flag[sce_id][0], realBuffer[sce_id][0], imagBuffer[sce_id][0], old_wsp[sce_id][0], pitch_fr[sce_id][0], voicing_fr[sce_id][0], &loc_harm[sce_id][0], &cor_map_sum[sce_id][0], &vad_flag_dtx[sce_id][0], enerBuffer[sce_id][0],
- fft_buff[sce_id][0], A[sce_id][0], lsp_new[sce_id][0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL, 0, 0, 0, 0,
- st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->hEncoderConfig->ivas_format );
-#endif
if ( error != IVAS_ERR_OK )
{
return error;
}
- vad_flag[sce_id] = st->vad_flag;
+#ifdef DISCRETE_ISM_DTX_CNG
+ if ( st_ivas->hEncoderConfig->Opt_DTX_ON )
+ {
+ vad_flag[sce_id] = vad_flag_dtx[sce_id][0];
+ }
+ else
+#endif
+ {
+ vad_flag[sce_id] = st->vad_flag;
+ }
}
-#ifdef PARAM_ISM_DTX_CNG
/*------------------------------------------------------------------*
* DTX analysis
*-----------------------------------------------------------------*/
+#ifdef DISCRETE_ISM_DTX_CNG
+ if ( st_ivas->hEncoderConfig->Opt_DTX_ON )
+#else
if ( st_ivas->hEncoderConfig->Opt_DTX_ON && st_ivas->ism_mode == ISM_MODE_PARAM )
+#endif
{
/* compute the dominant sce_id using long term energy */
ivas_ism_get_sce_id_dtx( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->nchan_transport, input_frame );
/* analysis and decision about DTX */
+#ifdef DISCRETE_ISM_DTX_CNG
+ dtx_flag = ivas_ism_dtx_enc( st_ivas->hISMDTX, st_ivas->hSCE, st_ivas->hEncoderConfig->ivas_total_brate, nchan_ism, st_ivas->nchan_transport, vad_flag, st_ivas->hIsmMetaData, md_diff_flag, &sid_flag );
+#else
dtx_flag = ivas_ism_dtx_enc( st_ivas, &sid_flag );
+#endif
if ( sid_flag )
{
@@ -205,81 +254,68 @@ ivas_error ivas_ism_enc(
}
#ifdef DEBUG_MODE_PARAM_ISM
- dbgwrite( &( st_ivas->hISMDTX->flag_noisy_speech ), sizeof( int16_t ), 1, 1, "./res/ParamISM_noisy_speech_flag_enc.dat" );
+ if ( st_ivas->hDirAC != NULL )
+ dbgwrite( &( st_ivas->hDirAC->hParamIsm->flag_noisy_speech ), sizeof( int16_t ), 1, 1, "./res/ParamISM_noisy_speech_flag_enc.dat" );
dbgwrite( &( st_ivas->hISMDTX->dtx_flag ), sizeof( int16_t ), 1, 1, "./res/ParamISM_DTX_CNG_flag_enc.dat" );
+ dbgwrite( &( st_ivas->hISMDTX->sce_id_dtx ), sizeof( int16_t ), 1, input_frame, "./res/sce_id_dtx" );
+ dbgwrite( &( dtx_flag ), sizeof( int16_t ), 1, input_frame, "./res/dtx_flag" );
#endif
}
-#endif
/*------------------------------------------------------------------*
* Analysis of objects, configuration and decision about bitrates per channel
* Metadata quantization and encoding
*-----------------------------------------------------------------*/
-#ifdef PARAM_ISM_DTX_CNG
if ( st_ivas->ism_mode == ISM_MODE_PARAM )
{
ivas_param_ism_compute_noisy_speech_flag( st_ivas );
+#ifdef DISCRETE_ISM_DTX_CNG
+ flag_noisy_speech = st_ivas->hDirAC->hParamIsm->flag_noisy_speech;
+#endif
}
if ( dtx_flag )
{
+#ifdef DISCRETE_ISM_DTX_CNG
+ ivas_ism_metadata_sid_enc( st_ivas->hISMDTX, flag_noisy_speech, nchan_ism, st_ivas->nchan_transport, st_ivas->ism_mode, st_ivas->hIsmMetaData, sid_flag, md_diff_flag, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata );
+#else
if ( sid_flag )
{
+#ifdef NCHAN_ISM_PARAMETER
+ ivas_param_ism_metadata_dtx_enc( st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, st_ivas->hIsmMetaData, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, nchan_ism );
+#else
ivas_param_ism_metadata_dtx_enc( st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, st_ivas->hIsmMetaData, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm );
- }
- }
- else
#endif
- if ( st_ivas->ism_mode == ISM_MODE_PARAM )
- {
-#ifndef PARAM_ISM_DTX_CNG
- /* Move the Noisy speech buffer */
- for ( i = 0; i < ( PARAM_ISM_HYS_BUF_SIZE - 1 ); i++ )
- {
- st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i + 1];
- }
-
- /* For the current frame, make a decision based on some core-coder flags */
- if ( st_ivas->hSCE[0]->hCoreCoder[0]->flag_noisy_speech_snr && st_ivas->hSCE[1]->hCoreCoder[0]->flag_noisy_speech_snr )
- {
- if ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag || st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag )
- {
- st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0;
- }
- else
- {
- st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 1;
- }
- }
- else
- {
- st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0;
- }
-
- /* Do a decision based on hysterisis */
- st_ivas->hDirAC->hParamIsm->flag_noisy_speech = 1;
- for ( i = 0; i < PARAM_ISM_HYS_BUF_SIZE; i++ )
- {
- st_ivas->hDirAC->hParamIsm->flag_noisy_speech = st_ivas->hDirAC->hParamIsm->flag_noisy_speech && st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i];
}
#endif
- ivas_ism_metadata_enc(
+ }
+ else if ( st_ivas->ism_mode == ISM_MODE_PARAM )
+ {
+ // VE: call ivas_ism_metadata_enc() with 'st_ivas' - TBD
+ if ( ( error = ivas_ism_metadata_enc(
#ifdef MASA_AND_OBJECTS
- &st_ivas->hEncoderConfig->ivas_total_brate,
+ &st_ivas->hEncoderConfig->ivas_total_brate,
#else
- st_ivas->hEncoderConfig->ivas_total_brate,
+ st_ivas->hEncoderConfig->ivas_total_brate,
+#endif
+#ifdef NCHAN_ISM_PARAMETER
+ nchan_ism,
#endif
- st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm
-#ifdef MASA_AND_OBJECTS
- ,
- st_ivas->nSCE
#ifdef MASA_AND_OBJECTS
- ,
- -1
+ nchan_transport_ism,
+#else
+ st_ivas->nchan_transport,
#endif
+ st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag
+#ifdef MASA_AND_OBJECTS
+ ,
+ -1
#endif
- );
+ ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else /* ISM_MODE_DISC */
{
@@ -306,7 +342,12 @@ ivas_error ivas_ism_enc(
ism_total_brate_ref = ism_total_brate;
// VE: change the interface of the following function and call it with 'st_ivas' only
- ivas_ism_metadata_enc( &ism_total_brate, st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL, st_ivas->nSCE, st_ivas->hMasa != NULL ? st_ivas->hMasa->data.lp_noise_CPE : 0 );
+ ivas_ism_metadata_enc( &ism_total_brate,
+#ifdef NCHAN_ISM_PARAMETER
+ nchan_ism,
+#endif
+ nchan_transport_ism, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL, st_ivas->hEncoderConfig->ism_extended_metadata_flag,
+ st_ivas->hMasa != NULL ? st_ivas->hMasa->data.lp_noise_CPE : 0 );
if ( st_ivas->hEncoderConfig->ivas_format == MASA_ISM_FORMAT )
{
@@ -314,23 +355,35 @@ ivas_error ivas_ism_enc(
}
#else
- ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL );
+ ivas_ism_metadata_enc( st_ivas->hEncoderConfig->ivas_total_brate,
+#ifdef NCHAN_ISM_PARAMETER
+ nchan_ism,
+#endif
+ st_ivas->nchan_transport, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData, nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL, st_ivas->hEncoderConfig->ism_extended_metadata_flag );
#endif
}
+
+#ifdef DISCRETE_ISM_DTX_CNG
+ update_last_metadata( nchan_ism, st_ivas->hIsmMetaData, md_diff_flag );
+#endif
+
/*----------------------------------------------------------------*
* Write IVAS format signaling in SID frames
*----------------------------------------------------------------*/
st = st_ivas->hSCE[0]->hCoreCoder[0];
+#ifdef DISCRETE_ISM_DTX_CNG
+ if ( sid_flag )
+#else
if ( st->core_brate == SID_2k40 )
+#endif
{
ivas_write_format_sid( st_ivas->hEncoderConfig->ivas_format, IVAS_SCE, st->hBstr );
-#ifdef PARAM_ISM_DTX_CNG
+#ifndef DISCRETE_ISM_DTX_CNG
if ( st_ivas->ism_mode != ISM_MODE_PARAM )
-#endif
{
/* write unused bits */
nBits = ( IVAS_SID_5k2 - SID_2k40 ) / 50 - SID_FORMAT_NBITS;
@@ -341,26 +394,15 @@ ivas_error ivas_ism_enc(
nBits -= i;
}
}
+#endif
}
/*------------------------------------------------------------------*
* CoreCoders encoding
*-----------------------------------------------------------------*/
-#ifdef MASA_AND_OBJECTS
-#ifdef OMASA_UPDATES
- if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
-#else
- if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
-#endif
- {
- n = st_ivas->nSCE;
- }
- else
- {
- n = st_ivas->nchan_transport;
- }
- for ( sce_id = 0; sce_id < n; sce_id++ )
+#ifdef MASA_AND_OBJECTS
+ for ( sce_id = 0; sce_id < nchan_transport_ism; sce_id++ )
#else
for ( sce_id = 0; sce_id < st_ivas->nchan_transport; sce_id++ )
#endif
@@ -398,9 +440,7 @@ ivas_error ivas_ism_enc(
* Encoder
*----------------------------------------------------------------*/
-#ifdef PARAM_ISM_DTX_CNG
if ( !dtx_flag || ( dtx_flag && sce_id == st_ivas->hISMDTX->sce_id_dtx ) )
-#endif
{
if ( ( error = ivas_core_enc( hSCE, NULL, NULL, 1, old_inp_12k8[sce_id], old_inp_16k[sce_id], ener[sce_id], A[sce_id], Aw[sce_id], epsP[sce_id], lsp_new[sce_id], lsp_mid[sce_id], vad_hover_flag[sce_id], attack_flag[sce_id], realBuffer[sce_id], imagBuffer[sce_id], old_wsp[sce_id], loc_harm[sce_id], cor_map_sum[sce_id], vad_flag_dtx[sce_id], enerBuffer[sce_id], fft_buff[sce_id], 0, ISM_FORMAT, 0 ) ) != IVAS_ERR_OK )
{
@@ -419,20 +459,63 @@ ivas_error ivas_ism_enc(
st->hTranDet->transientDetector.prev_bIsAttackPresent = st->hTranDet->transientDetector.bIsAttackPresent;
}
-#ifdef PARAM_ISM_DTX_CNG
if ( dtx_flag )
{
+#ifdef MASA_AND_OBJECTS
+ for ( sce_id = 0; sce_id < nchan_transport_ism; sce_id++ )
+#else
for ( sce_id = 0; sce_id < st_ivas->nchan_transport; sce_id++ )
+#endif
{
if ( sce_id != st_ivas->hISMDTX->sce_id_dtx )
{
st_ivas->hSCE[sce_id]->hCoreCoder[0]->last_core = st_ivas->hSCE[st_ivas->hISMDTX->sce_id_dtx]->hCoreCoder[0]->last_core;
st_ivas->hSCE[sce_id]->hCoreCoder[0]->last_core_brate = st_ivas->hSCE[st_ivas->hISMDTX->sce_id_dtx]->hCoreCoder[0]->core_brate;
+ st_ivas->hSCE[sce_id]->hCoreCoder[0]->last_L_frame = st_ivas->hSCE[st_ivas->hISMDTX->sce_id_dtx]->hCoreCoder[0]->last_L_frame;
}
}
}
-#endif
+#ifdef DISCRETE_ISM_DTX_CNG
+#ifdef DEBUG_MODE_INFO
+ if ( dtx_flag )
+ {
+ float tmpF;
+ int16_t id, n;
+
+ n = 0;
+#ifdef MASA_AND_OBJECTS
+ for ( sce_id = 0; sce_id < nchan_transport_ism; sce_id++ )
+#else
+ for ( sce_id = 0; sce_id < st_ivas->nchan_transport; sce_id++ )
+#endif
+ {
+ if ( sce_id != st_ivas->hISMDTX->sce_id_dtx )
+ {
+ st = st_ivas->hSCE[sce_id]->hCoreCoder[0];
+ id = st->id_element;
+
+ dbgwrite( &st->core, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "core", n, id, ENC ) );
+ dbgwrite( &st->extl, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "extl", n, id, ENC ) );
+ dbgwrite( &st->bwidth, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "bwidth", n, id, ENC ) );
+ tmpF = st->total_brate / 1000.0f;
+ dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "total_brate", n, id, ENC ) );
+ tmpF = st->core_brate / 1000.0f;
+ dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "core_brate", n, id, ENC ) );
+ tmpF = st->extl_brate / 1000.0f;
+ dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "extl_brate", n, id, ENC ) );
+
+ dbgwrite( &st->coder_type, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "coder_type", n, id, ENC ) );
+ dbgwrite( &st->coder_type_raw, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "coder_type_raw", n, id, ENC ) );
+ dbgwrite( &st->vad_flag, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "vad_flag", n, id, ENC ) );
+ dbgwrite( &st->localVAD, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "localVAD", n, id, ENC ) );
+
+ dbgwrite( &st->lp_noise, sizeof( float ), 1, input_frame, fname( debug_dir, "lp_noise", n, id, ENC ) );
+ }
+ }
+ }
+#endif
+#endif
pop_wmops();
return error;
@@ -446,7 +529,6 @@ ivas_error ivas_ism_enc(
* - reconfigure the ISM format encoder
*-------------------------------------------------------------------------*/
-/*! r : ISM format mode */
ivas_error ivas_ism_enc_config(
Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
)
@@ -472,7 +554,7 @@ ivas_error ivas_ism_enc_config(
/* Reset and Initialize */
if ( st_ivas->ism_mode == ISM_MODE_PARAM )
{
- st_ivas->nchan_transport = 2;
+ st_ivas->nchan_transport = MAX_PARAM_ISM_WAVE;
}
else
{
@@ -484,12 +566,20 @@ ivas_error ivas_ism_enc_config(
st_ivas->nSCE = st_ivas->nchan_transport;
st_ivas->nCPE = 0;
+ if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_inp, NULL, NULL, NULL, element_brate_tmp, NULL, NULL
#ifdef MASA_AND_OBJECTS
- ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_inp, NULL, NULL, NULL, element_brate_tmp, NULL, NULL, 0 );
-#else
- ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_inp, NULL, NULL, NULL, element_brate_tmp, NULL, NULL );
+ ,
+ 0
#endif
- ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, st_ivas->hEncoderConfig->ivas_total_brate / st_ivas->nchan_transport, ( st_ivas->hEncoderConfig->ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS, MC_MODE_NONE );
+ ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ if ( ( error = ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, st_ivas->hEncoderConfig->ivas_total_brate / st_ivas->nchan_transport, ( st_ivas->hEncoderConfig->ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS, MC_MODE_NONE ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
if ( st_ivas->ism_mode == ISM_MODE_PARAM && last_ism_mode == ISM_MODE_DISC )
{
@@ -503,8 +593,7 @@ ivas_error ivas_ism_enc_config(
if ( st_ivas->ism_mode == ISM_MODE_DISC && last_ism_mode == ISM_MODE_PARAM )
{
/* Deallocate the memory used by ParamISM when switch to Discrete ISM */
- ivas_param_ism_enc_close( st_ivas->hDirAC, st_ivas->hEncoderConfig->input_Fs );
- st_ivas->hDirAC = NULL;
+ ivas_param_ism_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs );
}
}
diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c
index b03b25f6c99cff42396562742f3565d1bf6d331b..9c6a32d039f423b2169a395a4ab5072decb30eb5 100644
--- a/lib_enc/ivas_ism_metadata_enc.c
+++ b/lib_enc/ivas_ism_metadata_enc.c
@@ -49,27 +49,44 @@
* Local constants
*-----------------------------------------------------------------------*/
-#define ISM_NUM_PARAM 2 /* number of coded metadata parameters */
+#define ISM_NUM_PARAM 5 /* number of coded metadata parameters */
#define ISM_MAX_AZIMUTH_DIFF_IDX ( ISM_AZIMUTH_NBITS - 1 /*zero*/ - 1 /*sign*/ )
#define ISM_MAX_ELEVATION_DIFF_IDX ( ISM_ELEVATION_NBITS - 1 /*zero*/ - 1 /*sign*/ )
+#define ISM_MAX_RADIUS_DIFF_IDX ( ISM_RADIUS_NBITS - 1 /*zero*/ - 1 /*sign*/ )
#define ISM_FEC_MAX 10
#define INTER_OBJECT_PARAM_CHECK ( ( ISM_FEC_MAX / 2 ) - 2 ) /* note: constant must be less than (ISM_FEC_MAX / number of coded parameters) */
+/*-----------------------------------------------------------------------*
+ * Local function declarations
+ *-----------------------------------------------------------------------*/
+
+#ifdef FIX_379_ANGLE
+static void encode_angle_indices( BSTR_ENC_HANDLE hBstr, ISM_METADATA_ANGLE_HANDLE angle, const int16_t last_ism_metadata_flag, const int16_t ini_frame, const int16_t idx_angle1_abs, const int16_t idx_angle2_abs, int16_t *flag_abs_angle1, int16_t *flag_abs_angle2 );
+#else
+static void encode_angle_indices( BSTR_ENC_HANDLE hBstr, ISM_METADATA_ANGLE_HANDLE angle, const int16_t last_ism_metadata_flag, const int16_t ini_frame, const int16_t idx_azimuth_abs, const int16_t idx_elevation_abs, int16_t *flag_abs_azimuth, int16_t *flag_abs_elevation );
+#endif
+
+static void encode_radius( BSTR_ENC_HANDLE hBstr, int16_t *last_radius_idx, int16_t *radius_diff_cnt, const int16_t last_ism_metadata_flag, const int16_t idx_radius_abs, int16_t *flag_abs_radius );
+
+
/*-------------------------------------------------------------------------*
- * set_ism_metadata()
+ * ivas_set_ism_metadata()
*
- * Set metadata of for one ISM
+ * Set metadata of one ISM MD handle
*-------------------------------------------------------------------------*/
-/*! r: 0 if success */
-ivas_error set_ism_metadata(
- ISM_METADATA_HANDLE hIsmMeta,
- float azimuth,
- float elevation )
+ivas_error ivas_set_ism_metadata(
+ ISM_METADATA_HANDLE hIsmMeta, /* o : ISM metadata handle */
+ const float azimuth, /* i : azimuth value */
+ const float elevation, /* i : elevation */
+ const float radius_meta, /* i : radius */
+ const float yaw, /* i : yaw */
+ const float pitch /* i : pitch */
+)
{
if ( hIsmMeta == NULL )
{
@@ -81,6 +98,9 @@ ivas_error set_ism_metadata(
/* save read metadata parameters to the internal codec structure */
hIsmMeta->azimuth = azimuth;
hIsmMeta->elevation = elevation;
+ hIsmMeta->radius = radius_meta;
+ hIsmMeta->yaw = yaw;
+ hIsmMeta->pitch = pitch;
return IVAS_ERR_OK;
}
@@ -89,7 +109,7 @@ ivas_error set_ism_metadata(
/*-------------------------------------------------------------------------*
* rate_ism_importance()
*
- * Rate importance of particular ISm streams
+ * Rate importance of particular ISM streams
*-------------------------------------------------------------------------*/
static void rate_ism_importance(
@@ -147,49 +167,66 @@ static void rate_ism_importance(
ivas_error ivas_ism_metadata_enc(
#ifdef MASA_AND_OBJECTS
- int32_t *ism_total_brate, /* i/o: ISms total bitrate */
+ int32_t *ism_total_brate, /* i/o: ISM total bitrate */
#else
- const int32_t ism_total_brate, /* i : ISms total bitrate */
-#endif
- const int16_t nchan_transport, /* i : number of transport channels */
- ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
- SCE_ENC_HANDLE hSCE[], /* i/o: SCE encoder handles */
- BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
- int16_t nb_bits_metadata[], /* o : number of metadata bits */
- const int16_t localVAD[], /* i : VAD flag */
- const int16_t ism_mode, /* i : ISM mode */
- const PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Enc Handle */
+ const int32_t ism_total_brate, /* i : ISM total bitrate */
+#endif
+#ifdef NCHAN_ISM_PARAMETER
+ const int16_t nchan_ism, /* i : number of ISM channels */
+#endif
+ const int16_t nchan_transport, /* i : number of transport channels */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ SCE_ENC_HANDLE hSCE[], /* i/o: SCE encoder handles */
+ BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
+ int16_t nb_bits_metadata[], /* o : number of metadata bits */
+ const int16_t localVAD[], /* i : VAD flag */
+ const int16_t ism_mode, /* i : ISM mode */
+ const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Enc Handle */
+ const int16_t ism_extended_metadata_flag /* i : Extended metadata flag */
#ifdef MASA_AND_OBJECTS
,
- const int16_t n_ism, /* i : number of objects */
const float lp_noise_CPE
#endif
)
{
- int16_t i, ch, nb_bits_start = 0, diff;
- int16_t idx_azimuth, idx_azimuth_abs = 0, flag_abs_azimuth[MAX_NUM_OBJECTS], nbits_diff_azimuth;
- int16_t idx_elevation, idx_elevation_abs = 0, flag_abs_elevation[MAX_NUM_OBJECTS], nbits_diff_elevation;
+ int16_t i, ch, nb_bits_start = 0;
+#ifdef FIX_379_ANGLE
+ int16_t flag_abs_azimuth[MAX_NUM_OBJECTS];
+ int16_t flag_abs_elevation[MAX_NUM_OBJECTS];
+ int16_t idx_angle1_abs = 0;
+ int16_t idx_angle2_abs = 0;
+ int16_t flag_abs_yaw[MAX_NUM_OBJECTS];
+ int16_t flag_abs_pitch[MAX_NUM_OBJECTS];
+#else
+ int16_t idx_azimuth_abs = 0, flag_abs_azimuth[MAX_NUM_OBJECTS];
+ int16_t idx_elevation_abs = 0, flag_abs_elevation[MAX_NUM_OBJECTS];
+ int16_t flag_abs_azimuth_orientation[MAX_NUM_OBJECTS];
+#endif
+ int16_t idx_radius_abs = 0, flag_abs_radius[MAX_NUM_OBJECTS];
float valQ;
ISM_METADATA_HANDLE hIsmMetaData;
int32_t element_brate[MAX_NUM_OBJECTS], total_brate[MAX_NUM_OBJECTS];
int16_t ism_metadata_flag_global;
int16_t ism_imp[MAX_NUM_OBJECTS];
- int16_t num_obj, nbands, nblocks;
- ivas_error error;
-#ifdef MASA_AND_OBJECTS
- int16_t n_ch;
+#ifdef NCHAN_ISM_PARAMETER
+ int16_t nbands, nblocks;
+#else
+ int16_t nchan_ism, nbands, nblocks;
#endif
+ ivas_error error;
+
error = IVAS_ERR_OK;
push_wmops( "ism_meta_enc" );
+#ifndef NCHAN_ISM_PARAMETER
if ( ism_mode == ISM_MODE_PARAM )
{
- num_obj = hParamIsm->num_obj;
+ nchan_ism = hParamIsm->num_obj;
}
else if ( ism_mode == ISM_MODE_DISC )
{
- num_obj = nchan_transport;
+ nchan_ism = nchan_transport;
}
#ifdef MASA_AND_OBJECTS
#ifdef OMASA_UPDATES
@@ -198,21 +235,23 @@ ivas_error ivas_ism_metadata_enc(
else if ( ism_mode == ISM_MASA_MODE_DISC )
#endif
{
- num_obj = n_ism;
+ num_obj = nchan_transport;
}
#endif
else
{
return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: incorrect ISM mode" );
}
+#endif
+#ifndef DISCRETE_ISM_DTX_CNG
#ifdef MASA_AND_OBJECTS
#ifdef OMASA_UPDATES
- if ( num_obj == 1 && ( hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) && ( ism_mode == ISM_MODE_DISC || ism_mode == ISM_MASA_MODE_DISC || ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ ) )
+ if ( nchan_ism == 1 && ( hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) && ( ism_mode == ISM_MODE_DISC || ism_mode == ISM_MASA_MODE_DISC || ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ ) )
#else
- if ( num_obj == 1 && ( hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) && ( ism_mode == ISM_MODE_DISC || ism_mode == ISM_MASA_MODE_DISC ) )
+ if ( nchan_ism == 1 && ( hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) && ( ism_mode == ISM_MODE_DISC || ism_mode == ISM_MASA_MODE_DISC ) )
#endif
#else
- if ( num_obj == 1 && ( hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) && ism_mode == ISM_MODE_DISC )
+ if ( nchan_ism == 1 && ( hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 || hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA ) && ism_mode == ISM_MODE_DISC )
#endif
{
/* no metadata encoding in CNG */
@@ -220,27 +259,22 @@ ivas_error ivas_ism_metadata_enc(
return error;
}
+#endif
/* initialization */
ism_metadata_flag_global = 0;
set_s( nb_bits_metadata, 0, nchan_transport );
- set_s( flag_abs_azimuth, 0, num_obj );
- set_s( flag_abs_elevation, 0, num_obj );
-
-#ifdef MASA_AND_OBJECTS
-#ifdef OMASA_UPDATES
- if ( ism_mode == ISM_MASA_MODE_DISC || ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
+ set_s( flag_abs_azimuth, 0, nchan_ism );
+ set_s( flag_abs_elevation, 0, nchan_ism );
+#ifdef FIX_379_ANGLE
+ set_s( flag_abs_yaw, 0, nchan_ism );
+ set_s( flag_abs_pitch, 0, nchan_ism );
#else
- if ( ism_mode == ISM_MASA_MODE_DISC )
+ set_s( flag_abs_azimuth_orientation, 0, nchan_ism );
#endif
- {
- n_ch = num_obj;
- }
- else
- {
- n_ch = nchan_transport;
- }
+ set_s( flag_abs_radius, 0, nchan_ism );
+#ifdef MASA_AND_OBJECTS
#ifdef OMASA_UPDATES
if ( ism_mode == ISM_MASA_MODE_DISC || ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
#else
@@ -248,10 +282,10 @@ ivas_error ivas_ism_metadata_enc(
#endif
{
/*----------------------------------------------------------------*
- * Rate importance of particular ISm streams in combined format coding
+ * Rate importance of particular ISM streams in combined format coding
*----------------------------------------------------------------*/
- set_ism_importance_interformat( *ism_total_brate, n_ch, hIsmMeta, hSCE, lp_noise_CPE, ism_imp );
+ set_ism_importance_interformat( *ism_total_brate, nchan_transport, hIsmMeta, hSCE, lp_noise_CPE, ism_imp );
}
else
#endif
@@ -260,7 +294,7 @@ ivas_error ivas_ism_metadata_enc(
* Set Metadata presence / importance flag
*----------------------------------------------------------------*/
- for ( ch = 0; ch < num_obj; ch++ )
+ for ( ch = 0; ch < nchan_ism; ch++ )
{
if ( ism_mode == ISM_MODE_PARAM )
{
@@ -272,59 +306,38 @@ ivas_error ivas_ism_metadata_enc(
else if ( ism_mode == ISM_MODE_DISC )
#endif
{
- hIsmMeta[ch]->ism_metadata_flag = localVAD[ch];
-
- if ( hIsmMeta[ch]->ism_metadata_flag == 0 )
- {
- /* send metadata even in inactive segments when noise is audible and metadata are changing */
- diff = (int16_t) fabsf( hIsmMeta[ch]->azimuth - ism_dequant_meta( hIsmMeta[ch]->last_azimuth_idx, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS ) );
- diff = max( diff, (int16_t) fabsf( hIsmMeta[ch]->elevation - ism_dequant_meta( hIsmMeta[ch]->last_elevation_idx, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS ) ) );
-
- if ( hSCE[ch]->hCoreCoder[0]->lp_noise > 15 && diff >= 10 )
- {
- hIsmMeta[ch]->ism_metadata_flag = 1;
- }
- }
-
- if ( hSCE[ch]->hCoreCoder[0]->tcxonly )
+#ifdef DISCRETE_ISM_DTX_CNG
+ hIsmMeta[ch]->ism_metadata_flag = localVAD[ch] || hSCE[ch]->hCoreCoder[0]->lp_noise > 10;
+#else
+ /* In case of low level noise for low bitrate inactive frames, do not sent metadata */
+ if ( localVAD[ch] == 0 && !( hSCE[ch]->hCoreCoder[0]->tcxonly ) && ( hSCE[ch]->hCoreCoder[0]->lp_noise <= 10 ) )
{
- /* at highest bitrates (with TCX core only) metadata are sent in every frame */
- hIsmMeta[ch]->ism_metadata_flag = 1;
+ hIsmMeta[ch]->ism_metadata_flag = 0;
}
+#endif
}
}
+
/*----------------------------------------------------------------*
- * Rate importance of particular ISm streams
+ * Rate importance of particular ISM streams
*----------------------------------------------------------------*/
-#ifdef MASA_AND_OBJECTS
- if ( ism_mode == ISM_MASA_MODE_DISC )
- {
- n_ch = num_obj;
- }
- else
- {
- n_ch = nchan_transport;
- }
-
- rate_ism_importance( n_ch, hIsmMeta, hSCE, ism_imp );
-#else
rate_ism_importance( nchan_transport, hIsmMeta, hSCE, ism_imp );
-#endif
+#ifndef TUNE_360_OBJECT_WITH_NOISE
/* relax the importance decision in "stereo" coding for noisy audio */
#ifdef MASA_AND_OBJECTS
- if ( ( ism_mode == ISM_MODE_DISC || ism_mode == ISM_MASA_MODE_DISC ) && num_obj == 2 )
+ if ( ( ism_mode == ISM_MODE_DISC || ism_mode == ISM_MASA_MODE_DISC ) && nchan_ism == 2 )
#else
- if ( ism_mode == ISM_MODE_DISC && num_obj == 2 )
+ if ( ism_mode == ISM_MODE_DISC && nchan_ism == 2 )
#endif
{
float diff_F;
if ( hIsmMeta[0]->ism_metadata_flag ^ hIsmMeta[1]->ism_metadata_flag )
{
- for ( ch = 0; ch < num_obj; ch++ )
+ for ( ch = 0; ch < nchan_ism; ch++ )
{
diff_F = hSCE[ch]->hCoreCoder[0]->lp_speech - hSCE[ch]->hCoreCoder[0]->lp_noise;
@@ -336,13 +349,13 @@ ivas_error ivas_ism_metadata_enc(
}
}
}
+#endif
}
/*----------------------------------------------------------------*
- * Write ISm common signaling
+ * Write ISM common signaling
*----------------------------------------------------------------*/
- /*Todo: Nokia check where we transmit the number of objects */
#ifdef MASA_AND_OBJECTS
#ifdef OMASA_UPDATES
if ( ism_mode != ISM_MASA_MODE_DISC && ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ )
@@ -352,7 +365,7 @@ ivas_error ivas_ism_metadata_enc(
{
#endif
/* write number of objects - unary coding */
- for ( ch = 1; ch < num_obj; ch++ )
+ for ( ch = 1; ch < nchan_ism; ch++ )
{
push_indice( hBstr, IND_ISM_NUM_OBJECTS, 1, 1 );
}
@@ -361,9 +374,19 @@ ivas_error ivas_ism_metadata_enc(
}
#endif
+ /* write extended metadata presence flag */
+#ifdef FIX_TD5_IN_OMASA
+ if ( ism_mode == ISM_MODE_DISC && *ism_total_brate >= ISM_EXTENDED_METADATA_BRATE )
+#else
+ if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE )
+#endif
+ {
+ push_indice( hBstr, IND_ISM_EXTENDED_FLAG, ism_extended_metadata_flag, ISM_EXTENDED_METADATA_BITS );
+ }
+
/* write ISm metadata flag (one per object) */
#ifdef MASA_AND_OBJECTS
- for ( ch = 0; ch < n_ch; ch++ )
+ for ( ch = 0; ch < nchan_transport; ch++ )
#else
for ( ch = 0; ch < nchan_transport; ch++ )
#endif
@@ -385,11 +408,11 @@ ivas_error ivas_ism_metadata_enc(
}
}
-
- for ( ch = 0; ch < num_obj; ch++ )
+ for ( ch = 0; ch < nchan_ism; ch++ )
{
ism_metadata_flag_global |= hIsmMeta[ch]->ism_metadata_flag;
}
+
#ifdef MASA_AND_OBJECTS
#ifdef OMASA_UPDATES
if ( ism_mode == ISM_MODE_DISC || ism_mode == ISM_MASA_MODE_DISC || ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
@@ -401,11 +424,7 @@ ivas_error ivas_ism_metadata_enc(
#endif
{
/* write VAD flag */
-#ifdef MASA_AND_OBJECTS
- for ( ch = 0; ch < n_ch; ch++ )
-#else
for ( ch = 0; ch < nchan_transport; ch++ )
-#endif
{
#ifdef MASA_AND_OBJECTS
#ifdef OMASA_UPDATES
@@ -455,7 +474,7 @@ ivas_error ivas_ism_metadata_enc(
nb_bits_start = hBstr->nb_bits_tot;
}
- for ( ch = 0; ch < num_obj; ch++ )
+ for ( ch = 0; ch < nchan_ism; ch++ )
{
hIsmMetaData = hIsmMeta[ch];
#ifdef MASA_AND_OBJECTS
@@ -474,10 +493,9 @@ ivas_error ivas_ism_metadata_enc(
if ( hIsmMeta[ch]->ism_metadata_flag )
{
/*----------------------------------------------------------------*
- * Azimuth quantization and encoding
+ * Quantize and encode azimuth and elevation
*----------------------------------------------------------------*/
- /* Azimuth quantization (quantize azimuth to the AZIMUTH_NBITS-bit index */
#ifdef MASA_AND_OBJECTS
#ifdef OMASA_UPDATES
if ( ism_mode == ISM_MODE_DISC || ism_mode == ISM_MASA_MODE_DISC || ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
@@ -488,246 +506,51 @@ ivas_error ivas_ism_metadata_enc(
if ( ism_mode == ISM_MODE_DISC )
#endif
{
- idx_azimuth_abs = ism_quant_meta( hIsmMetaData->azimuth, &valQ, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS );
+#ifdef FIX_379_ANGLE
+ idx_angle1_abs = ism_quant_meta( hIsmMetaData->azimuth, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS );
+ idx_angle2_abs = ism_quant_meta( hIsmMetaData->elevation, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS );
+#else
+ idx_azimuth_abs = ism_quant_meta( hIsmMetaData->azimuth, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS );
+ idx_elevation_abs = ism_quant_meta( hIsmMetaData->elevation, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS );
+#endif
}
- else if ( ism_mode == ISM_MODE_PARAM )
+ else /* ISM_MODE_PARAM */
{
+#ifdef FIX_379_ANGLE
+ idx_angle1_abs = hParamIsm->azi_index[ch];
+ idx_angle2_abs = hParamIsm->ele_index[ch];
+#else
idx_azimuth_abs = hParamIsm->azi_index[ch];
+ idx_elevation_abs = hParamIsm->ele_index[ch];
+#endif
}
- idx_azimuth = idx_azimuth_abs;
-
- nbits_diff_azimuth = 0;
-
- flag_abs_azimuth[ch] = 0; /* differential coding by default */
- if ( hIsmMetaData->azimuth_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */
- || hIsmMetaData->last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */
- )
- {
- flag_abs_azimuth[ch] = 1;
- }
-
- /* try differential coding */
- if ( flag_abs_azimuth[ch] == 0 )
- {
- diff = idx_azimuth_abs - hIsmMetaData->last_azimuth_idx;
-
- /* azimuth is on a circle - check for diff coding for -180° -> 180° and vice versa changes */
- if ( abs( diff ) > ( ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - ISM_MAX_AZIMUTH_DIFF_IDX )
- {
- if ( diff > 0 )
- {
- diff -= ( 1 << ISM_AZIMUTH_NBITS ) - 1;
- }
- else
- {
- diff += ( 1 << ISM_AZIMUTH_NBITS ) - 1;
- }
- }
-
- if ( diff == 0 )
- {
- idx_azimuth = 0;
- nbits_diff_azimuth = 1;
- }
- else if ( ABSVAL( diff ) < ISM_MAX_AZIMUTH_DIFF_IDX ) /* when diff bits >= abs bits, prefer abs */
- {
- idx_azimuth = 1 << 1;
- nbits_diff_azimuth = 1;
-
- if ( diff < 0 )
- {
- idx_azimuth += 1; /* negative sign */
- diff *= -1;
- }
- else
- {
- idx_azimuth += 0; /* positive sign */
- }
-
- idx_azimuth = idx_azimuth << diff;
- nbits_diff_azimuth++;
-
- /* unary coding of "diff */
- idx_azimuth += ( ( 1 << diff ) - 1 );
- nbits_diff_azimuth += diff;
-
- if ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 )
- {
- /* add stop bit - only for codewords shorter than ISM_AZIMUTH_NBITS */
- idx_azimuth = idx_azimuth << 1;
- nbits_diff_azimuth++;
- }
- }
- else
- {
- flag_abs_azimuth[ch] = 1;
- }
- }
-
- /* update counter */
- if ( flag_abs_azimuth[ch] == 0 )
- {
- hIsmMetaData->azimuth_diff_cnt++;
- hIsmMetaData->elevation_diff_cnt = min( hIsmMetaData->elevation_diff_cnt, ISM_FEC_MAX );
- }
- else
- {
- hIsmMetaData->azimuth_diff_cnt = 0;
- }
-
- /* Write azimuth */
- push_indice( hBstr, IND_ISM_AZIMUTH_DIFF_FLAG, flag_abs_azimuth[ch], 1 );
-
- if ( flag_abs_azimuth[ch] )
- {
- push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, ISM_AZIMUTH_NBITS );
- }
- else
- {
- push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, nbits_diff_azimuth );
- }
-
+#ifdef FIX_379_ANGLE
+ encode_angle_indices( hBstr, &( hIsmMetaData->position_angle ), hIsmMetaData->last_ism_metadata_flag, hSCE[0]->hCoreCoder[0]->ini_frame, idx_angle1_abs, idx_angle2_abs, &flag_abs_azimuth[ch], &flag_abs_elevation[ch] );
+#else
+ encode_angle_indices( hBstr, &( hIsmMetaData->angle[0] ), hIsmMetaData->last_ism_metadata_flag, hSCE[0]->hCoreCoder[0]->ini_frame, idx_azimuth_abs, idx_elevation_abs, &flag_abs_azimuth[ch], &flag_abs_elevation[ch] );
+#endif
/*----------------------------------------------------------------*
- * Elevation quantization and encoding
+ * Quantize and encode radius, yaw, and pitch
*----------------------------------------------------------------*/
- /* Elevation quantization (quantize azimuth to the ELEVATION_NBITS-bit index */
-#ifdef MASA_AND_OBJECTS
-#ifdef OMASA_UPDATES
- if ( ism_mode == ISM_MODE_DISC || ism_mode == ISM_MASA_MODE_DISC || ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
+ if ( ism_mode == ISM_MODE_DISC && ism_extended_metadata_flag )
+ {
+#ifdef FIX_379_ANGLE
+ idx_angle1_abs = ism_quant_meta( hIsmMetaData->yaw, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS );
+ idx_angle2_abs = ism_quant_meta( hIsmMetaData->pitch, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS );
#else
- if ( ism_mode == ISM_MODE_DISC || ism_mode == ISM_MASA_MODE_DISC )
+ idx_azimuth_abs = ism_quant_meta( hIsmMetaData->yaw, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS );
+ idx_elevation_abs = ism_quant_meta( hIsmMetaData->pitch, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS );
#endif
+ idx_radius_abs = usquant( hIsmMetaData->radius, &valQ, ISM_RADIUS_MIN, ISM_RADIUS_DELTA, 1 << ISM_RADIUS_NBITS );
+#ifdef FIX_379_ANGLE
+ encode_angle_indices( hBstr, &( hIsmMetaData->orientation_angle ), hIsmMetaData->last_ism_metadata_flag, hSCE[0]->hCoreCoder[0]->ini_frame, idx_angle1_abs, idx_angle2_abs, &flag_abs_yaw[ch], &flag_abs_pitch[ch] );
#else
- if ( ism_mode == ISM_MODE_DISC )
+ encode_angle_indices( hBstr, &( hIsmMetaData->angle[1] ), hIsmMetaData->last_ism_metadata_flag, hSCE[0]->hCoreCoder[0]->ini_frame, idx_azimuth_abs, idx_elevation_abs, &flag_abs_azimuth_orientation[ch], &flag_abs_elevation[ch] );
#endif
- {
- idx_elevation_abs = ism_quant_meta( hIsmMetaData->elevation, &valQ, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS );
- }
- else /* ISM_MODE_PARAM */
- {
- idx_elevation_abs = hParamIsm->ele_index[ch];
- }
- idx_elevation = idx_elevation_abs;
-
- nbits_diff_elevation = 0;
-
- flag_abs_elevation[ch] = 0; /* differential coding by default */
- if ( hIsmMetaData->elevation_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */
- || hIsmMetaData->last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */
- )
- {
- flag_abs_elevation[ch] = 1;
- }
-
- /* note: elevation is coded starting from the second frame only (it is meaningless in the init_frame) */
- if ( hSCE[0]->hCoreCoder[0]->ini_frame == 0 )
- {
- flag_abs_elevation[ch] = 1;
- hIsmMetaData->last_elevation_idx = idx_elevation_abs;
- }
-
- diff = idx_elevation_abs - hIsmMetaData->last_elevation_idx;
-
- /* avoid absolute coding of elevation if absolute coding was already used for azimuth */
- if ( flag_abs_azimuth[ch] == 1 )
- {
- int16_t diff_orig = diff;
-
- flag_abs_elevation[ch] = 0;
-
-
- if ( diff >= 0 )
- {
- diff = min( diff, ISM_MAX_ELEVATION_DIFF_IDX );
- }
- else
- {
- diff = -1 * min( -diff, ISM_MAX_ELEVATION_DIFF_IDX );
- }
-
- if ( hIsmMetaData->last_ism_metadata_flag == 0 || abs( diff_orig - diff ) > ISM_MAX_ELEVATION_DIFF_IDX )
- {
- hIsmMetaData->elevation_diff_cnt = ISM_FEC_MAX - 1;
- }
- }
-
- /* try differential coding */
- if ( flag_abs_elevation[ch] == 0 )
- {
- if ( diff == 0 )
- {
- idx_elevation = 0;
- nbits_diff_elevation = 1;
- }
- else if ( ABSVAL( diff ) <= ISM_MAX_ELEVATION_DIFF_IDX )
- {
- idx_elevation = 1 << 1;
- nbits_diff_elevation = 1;
-
- if ( diff < 0 )
- {
- idx_elevation += 1; /* negative sign */
- diff *= -1;
- }
- else
- {
- idx_elevation += 0; /* positive sign */
- }
-
- idx_elevation = idx_elevation << diff;
- nbits_diff_elevation++;
-
- /* unary coding of "diff */
- idx_elevation += ( ( 1 << diff ) - 1 );
- nbits_diff_elevation += diff;
-
- if ( nbits_diff_elevation < ISM_ELEVATION_NBITS )
- {
- /* add stop bit */
- idx_elevation = idx_elevation << 1;
- nbits_diff_elevation++;
- }
- }
- else
- {
- flag_abs_elevation[ch] = 1;
- }
- }
-
- /* update counter */
- if ( flag_abs_elevation[ch] == 0 )
- {
- hIsmMetaData->elevation_diff_cnt++;
- hIsmMetaData->elevation_diff_cnt = min( hIsmMetaData->elevation_diff_cnt, ISM_FEC_MAX );
- }
- else
- {
- hIsmMetaData->elevation_diff_cnt = 0;
- }
-
- /* Write elevation */
- if ( flag_abs_azimuth[ch] == 0 ) /* do not write "flag_abs_elevation" if "flag_abs_azimuth == 1" */
- {
- push_indice( hBstr, IND_ISM_ELEVATION_DIFF_FLAG, flag_abs_elevation[ch], 1 );
- }
-
- if ( flag_abs_elevation[ch] )
- {
- push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, ISM_ELEVATION_NBITS );
- }
- else
- {
- push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, nbits_diff_elevation );
+ encode_radius( hBstr, &hIsmMetaData->last_radius_idx, &hIsmMetaData->radius_diff_cnt, hIsmMetaData->last_ism_metadata_flag, idx_radius_abs, &flag_abs_radius[ch] );
}
- /*----------------------------------------------------------------*
- * Updates
- *----------------------------------------------------------------*/
-
- hIsmMetaData->last_azimuth_idx = idx_azimuth_abs;
- hIsmMetaData->last_elevation_idx = idx_elevation_abs;
-
/* save number of metadata bits written */
#ifdef MASA_AND_OBJECTS
#ifdef OMASA_UPDATES
@@ -750,12 +573,12 @@ ivas_error ivas_ism_metadata_enc(
*----------------------------------------------------------------*/
i = 0;
- while ( i == 0 || i < num_obj / INTER_OBJECT_PARAM_CHECK )
+ while ( i == 0 || i < nchan_ism / INTER_OBJECT_PARAM_CHECK )
{
int16_t num, abs_num, abs_first, abs_next, pos_zero;
- int16_t abs_matrice[INTER_OBJECT_PARAM_CHECK * 2];
+ int16_t abs_matrice[INTER_OBJECT_PARAM_CHECK * ISM_NUM_PARAM];
- num = min( INTER_OBJECT_PARAM_CHECK, num_obj - i * INTER_OBJECT_PARAM_CHECK );
+ num = min( INTER_OBJECT_PARAM_CHECK, nchan_ism - i * INTER_OBJECT_PARAM_CHECK );
i++;
set_s( abs_matrice, 0, INTER_OBJECT_PARAM_CHECK * ISM_NUM_PARAM );
@@ -801,12 +624,20 @@ ivas_error ivas_ism_metadata_enc(
if ( abs_next % ISM_NUM_PARAM == 0 )
{
- hIsmMeta[ch]->azimuth_diff_cnt = abs_num - 1;
+#ifdef FIX_379_ANGLE
+ hIsmMeta[ch]->position_angle.angle1_diff_cnt = abs_num - 1;
+#else
+ hIsmMeta[ch]->angle[0].azimuth_diff_cnt = abs_num - 1;
+#endif
}
if ( abs_next % ISM_NUM_PARAM == 1 )
{
- hIsmMeta[ch]->elevation_diff_cnt = abs_num - 1;
+#ifdef FIX_379_ANGLE
+ hIsmMeta[ch]->position_angle.angle2_diff_cnt = abs_num - 1;
+#else
+ hIsmMeta[ch]->angle[0].elevation_diff_cnt = abs_num - 1;
+#endif
/*hIsmMeta[ch]->elevation_diff_cnt = min( hIsmMeta[ch]->elevation_diff_cnt, ISM_FEC_MAX );*/
}
@@ -880,27 +711,22 @@ ivas_error ivas_ism_metadata_enc(
int16_t bits_ism, bits_element[MAX_NUM_OBJECTS];
#ifdef OMASA_UPDATES
int16_t brate_limit_flag;
- brate_limit_flag = calculate_brate_limit_flag( ism_imp, num_obj );
+ brate_limit_flag = calculate_brate_limit_flag( ism_imp, nchan_ism );
#endif
bits_ism = (int16_t) ( *ism_total_brate / FRAMES_PER_SECOND );
- set_s( bits_element, bits_ism / num_obj, num_obj );
- bits_element[num_obj - 1] += bits_ism % num_obj;
- bitbudget_to_brate( bits_element, element_brate, num_obj );
+ set_s( bits_element, bits_ism / nchan_ism, nchan_ism );
+ bits_element[nchan_ism - 1] += bits_ism % nchan_ism;
+ bitbudget_to_brate( bits_element, element_brate, nchan_ism );
*ism_total_brate = 0;
- for ( ch = 0; ch < num_obj; ch++ )
+ for ( ch = 0; ch < nchan_ism; ch++ )
{
#ifdef OMASA_UPDATES
- *ism_total_brate += ivas_interformat_brate( ism_mode, num_obj, hSCE[ch]->element_brate, ism_imp[ch], brate_limit_flag
+ *ism_total_brate += ivas_interformat_brate( ism_mode, nchan_ism, hSCE[ch]->element_brate, ism_imp[ch], brate_limit_flag );
#else
- *ism_total_brate += ivas_interformat_brate( ISM_MASA_MODE_DISC, num_obj, hSCE[ch]->element_brate, ism_imp[ch]
-#ifdef FIX_4OBJ_128
- ,
- brate_limit_flag
+ *ism_total_brate += ivas_interformat_brate( ISM_MASA_MODE_DISC, nchan_ism, hSCE[ch]->element_brate, ism_imp[ch] );
#endif
-#endif
- );
}
ism_metadata_flag_global = 1;
}
@@ -914,31 +740,38 @@ ivas_error ivas_ism_metadata_enc(
#ifdef OMASA_UPDATES
if ( ism_mode == ISM_MASA_MODE_DISC || ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
{
- ivas_ism_config( *ism_total_brate, nchan_transport, num_obj, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata, 1 ); // VE: this funtion should return an error
+ if ( ( error = ivas_ism_config( *ism_total_brate, nchan_transport, nchan_ism, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata, 1 ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else
{
- ivas_ism_config( *ism_total_brate, nchan_transport, num_obj, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata, 0 ); // VE: this funtion should return an error
+ if ( ( error = ivas_ism_config( *ism_total_brate, nchan_transport, nchan_ism, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata, 0 ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
#else
-#ifdef OMASA_BRATE
- ivas_ism_config( *ism_total_brate, nchan_transport, num_obj, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata, ism_mode == ISM_MASA_MODE_DISC ); // VE: this funtion should return an error
-#else
-
- ivas_ism_config( ism_total_brate, nchan_transport, num_obj, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata, ( ism_mode == ISM_MASA_MODE_DISC ) );
-#endif
+ if ( ( error = ivas_ism_config( ism_total_brate, nchan_transport, nchan_ism, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata, ism_mode == ISM_MASA_MODE_DISC ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
#endif
#else
- ivas_ism_config( ism_total_brate, nchan_transport, num_obj, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata );
+ if ( ( error = ivas_ism_config( ism_total_brate, nchan_transport, nchan_ism, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
#endif
- for ( ch = 0; ch < num_obj; ch++ )
+ for ( ch = 0; ch < nchan_ism; ch++ )
{
hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag;
}
#ifdef MASA_AND_OBJECTS
- for ( ch = 0; ch < n_ch; ch++ )
+ for ( ch = 0; ch < nchan_transport; ch++ )
{
hSCE[ch]->hCoreCoder[0]->low_rate_mode = 0;
if ( ism_mode == ISM_MODE_DISC )
@@ -998,25 +831,30 @@ ivas_error ivas_ism_metadata_enc(
return error;
}
+
/*-------------------------------------------------------------------------
- * create_ism_metadata_enc()
+ * ivas_ism_metadata_enc_create()
*
- * Create, allocate, initialize and configure IVAS encoder ISM handles
+ * Create, allocate, initialize and configure IVAS encoder ISM metadata handles
*-------------------------------------------------------------------------*/
-ivas_error create_ism_metadata_enc(
+ivas_error ivas_ism_metadata_enc_create(
Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
const int16_t n_ISms, /* i : number of objects */
int32_t element_brate_tmp[] /* o : element bitrate per object */
)
{
int16_t ch, nchan_transport;
+ ivas_error error;
- // VE: this part of the code is better to be moved to a separate function, e.g. ivas_set_omasa_TC()
#ifdef MASA_AND_OBJECTS
nchan_transport = st_ivas->nchan_transport;
if ( st_ivas->hEncoderConfig->ivas_format == MASA_ISM_FORMAT )
{
+ nchan_transport = MAX_PARAM_ISM_WAVE;
+#ifdef OMASA_BRATE_SW
+ ivas_set_omasa_TC( st_ivas->ism_mode, n_ISms, &st_ivas->nSCE, &st_ivas->nCPE );
+#else
switch ( st_ivas->ism_mode )
{
case ISM_MASA_MODE_PARAM:
@@ -1044,6 +882,7 @@ ivas_error create_ism_metadata_enc(
default:
break;
}
+#endif
}
else
{
@@ -1079,18 +918,34 @@ ivas_error create_ism_metadata_enc(
}
#endif
- /* allocate ISm metadata handles */
+ /* allocate ISM metadata handles */
for ( ch = 0; ch < n_ISms; ch++ )
{
if ( ( st_ivas->hIsmMetaData[ch] = (ISM_METADATA_HANDLE) malloc( sizeof( ISM_METADATA_FRAME ) ) ) == NULL )
{
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISm MetaData\n" ) );
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for ISM MetaData\n" ) );
}
-
- st_ivas->hIsmMetaData[ch]->last_azimuth_idx = 0;
- st_ivas->hIsmMetaData[ch]->azimuth_diff_cnt = ISM_FEC_MAX;
- st_ivas->hIsmMetaData[ch]->last_elevation_idx = 0;
- st_ivas->hIsmMetaData[ch]->elevation_diff_cnt = ISM_FEC_MAX - 1;
+#ifdef FIX_379_ANGLE
+ st_ivas->hIsmMetaData[ch]->position_angle.last_angle1_idx = 0;
+ st_ivas->hIsmMetaData[ch]->position_angle.angle1_diff_cnt = ISM_FEC_MAX;
+ st_ivas->hIsmMetaData[ch]->position_angle.last_angle2_idx = 0;
+ st_ivas->hIsmMetaData[ch]->position_angle.angle2_diff_cnt = ISM_FEC_MAX - 1;
+ st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle1_idx = 0;
+ st_ivas->hIsmMetaData[ch]->orientation_angle.angle1_diff_cnt = ISM_FEC_MAX - 2;
+ st_ivas->hIsmMetaData[ch]->orientation_angle.last_angle2_idx = 0;
+ st_ivas->hIsmMetaData[ch]->orientation_angle.angle2_diff_cnt = ISM_FEC_MAX - 2;
+#else
+ st_ivas->hIsmMetaData[ch]->angle[0].last_azimuth_idx = 0;
+ st_ivas->hIsmMetaData[ch]->angle[0].azimuth_diff_cnt = ISM_FEC_MAX;
+ st_ivas->hIsmMetaData[ch]->angle[0].last_elevation_idx = 0;
+ st_ivas->hIsmMetaData[ch]->angle[0].elevation_diff_cnt = ISM_FEC_MAX - 1;
+ st_ivas->hIsmMetaData[ch]->angle[1].last_azimuth_idx = 0;
+ st_ivas->hIsmMetaData[ch]->angle[1].azimuth_diff_cnt = ISM_FEC_MAX - 2;
+ st_ivas->hIsmMetaData[ch]->angle[1].last_elevation_idx = 0;
+ st_ivas->hIsmMetaData[ch]->angle[1].elevation_diff_cnt = ISM_FEC_MAX - 2;
+#endif
+ st_ivas->hIsmMetaData[ch]->last_radius_idx = 0;
+ st_ivas->hIsmMetaData[ch]->radius_diff_cnt = ISM_FEC_MAX - 2;
st_ivas->hIsmMetaData[ch]->last_ism_metadata_flag = 0;
#ifdef MASA_AND_OBJECTS
@@ -1103,7 +958,13 @@ ivas_error create_ism_metadata_enc(
#endif
ivas_ism_reset_metadata( st_ivas->hIsmMetaData[ch] );
+
+#ifdef DISCRETE_ISM_DTX_CNG
+ st_ivas->hIsmMetaData[ch]->last_azimuth = 0.0f;
+ st_ivas->hIsmMetaData[ch]->last_elevation = 0.0f;
+#endif
}
+
#ifdef MASA_AND_OBJECTS
if ( st_ivas->hEncoderConfig->ivas_format == MASA_ISM_FORMAT )
{
@@ -1113,24 +974,775 @@ ivas_error create_ism_metadata_enc(
if ( st_ivas->ism_mode == ISM_MASA_MODE_ONE_OBJ )
#endif
{
- ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, nchan_transport, 1, NULL, NULL, NULL, element_brate_tmp, NULL, NULL, 1 );
+ if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, nchan_transport, 1, NULL, NULL, NULL, element_brate_tmp, NULL, NULL, 1 ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
{
- ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, nchan_transport, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL, 1 );
+ if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, nchan_transport, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL, 1 ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
}
else
{
#endif
- ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, nchan_transport, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL
+ if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, nchan_transport, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL
#ifdef MASA_AND_OBJECTS
- ,
- 0
+ ,
+ 0
#endif
- );
+ ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
#ifdef MASA_AND_OBJECTS
}
#endif
+
return IVAS_ERR_OK;
}
+
+
+/*-------------------------------------------------------------------------
+ * encode_radius()
+ *
+ * Radius index encoding
+ *-------------------------------------------------------------------------*/
+
+static void encode_radius(
+ BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
+ int16_t *last_radius_idx, /* i/o: last radius index */
+ int16_t *radius_diff_cnt, /* i/o: radius diff coding counter */
+ const int16_t last_ism_metadata_flag, /* last frame ism_metadata_flag */
+ const int16_t idx_radius_abs, /* i : Azimuth index */
+ int16_t *flag_abs_radius /* o : Radius encoding mode */
+)
+{
+ int16_t idx_radius, nbits_diff_radius, diff;
+
+ idx_radius = idx_radius_abs;
+ nbits_diff_radius = 0;
+ *flag_abs_radius = 0; /* differential coding by default */
+
+ if ( *radius_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */
+ || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */
+ )
+ {
+ *flag_abs_radius = 1;
+ }
+
+ diff = idx_radius_abs - *last_radius_idx;
+
+ /* try differential coding */
+ if ( *flag_abs_radius == 0 )
+ {
+ if ( diff == 0 )
+ {
+ idx_radius = 0;
+ nbits_diff_radius = 1;
+ }
+ else if ( ABSVAL( diff ) <= ISM_MAX_RADIUS_DIFF_IDX )
+ {
+ idx_radius = 1 << 1;
+ nbits_diff_radius = 1;
+
+ if ( diff < 0 )
+ {
+ idx_radius += 1; /* negative sign */
+ diff *= -1;
+ }
+ else
+ {
+ idx_radius += 0; /* positive sign */
+ }
+
+ idx_radius = idx_radius << diff;
+ nbits_diff_radius++;
+
+ /* unary coding of "diff */
+ idx_radius += ( ( 1 << diff ) - 1 );
+ nbits_diff_radius += diff;
+
+ if ( nbits_diff_radius < ISM_RADIUS_NBITS )
+ {
+ /* add stop bit */
+ idx_radius = idx_radius << 1;
+ nbits_diff_radius++;
+ }
+ }
+ else
+ {
+ *flag_abs_radius = 1;
+ }
+ }
+
+ /* update counter */
+ if ( *flag_abs_radius == 0 )
+ {
+ ( *radius_diff_cnt )++;
+ *radius_diff_cnt = min( *radius_diff_cnt, ISM_FEC_MAX );
+ }
+ else
+ {
+ *radius_diff_cnt = 0;
+ }
+
+ /* Write radius */
+ push_indice( hBstr, IND_ISM_RADIUS_DIFF_FLAG, *flag_abs_radius, 1 );
+
+ if ( *flag_abs_radius )
+ {
+ push_indice( hBstr, IND_ISM_RADIUS, idx_radius, ISM_RADIUS_NBITS );
+ }
+ else
+ {
+ push_indice( hBstr, IND_ISM_RADIUS, idx_radius, nbits_diff_radius );
+ }
+
+ /* Updates */
+ *last_radius_idx = idx_radius_abs;
+
+ return;
+}
+
+
+/*----------------------------------------------------------------*
+ * encode_angle_indices()
+ *
+ * Encoding of an angle
+ *----------------------------------------------------------------*/
+#ifdef FIX_379_ANGLE
+static void encode_angle_indices(
+ BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
+ ISM_METADATA_ANGLE_HANDLE angle, /* i/o: angle handle */
+ const int16_t last_ism_metadata_flag, /* i : last frame ism_metadata_flag */
+ const int16_t ini_frame, /* i : initialization frames counter */
+ const int16_t idx_angle1_abs, /* i : Azimuth index */
+ const int16_t idx_angle2_abs, /* i : Elevation index */
+ int16_t *flag_abs_angle1, /* o : Azimuth/yaw encoding mode */
+ int16_t *flag_abs_angle2 /* o : Elevation/pitch encoding mode */
+)
+{
+ int16_t idx_angle1, nbits_diff_angle1, diff;
+ int16_t idx_angle2, nbits_diff_angle2;
+
+ /*----------------------------------------------------------------*
+ * Azimuth/yaw index encoding
+ *----------------------------------------------------------------*/
+
+ idx_angle1 = idx_angle1_abs;
+
+ nbits_diff_angle1 = 0;
+
+ *flag_abs_angle1 = 0; /* differential coding by default */
+ if ( angle->angle1_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */
+ || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */
+ )
+ {
+ *flag_abs_angle1 = 1;
+ }
+
+ /* try differential coding */
+ if ( *flag_abs_angle1 == 0 )
+ {
+ diff = idx_angle1_abs - angle->last_angle1_idx;
+
+ /* azimuth is on a circle - check for diff coding for -180° -> 180° and vice versa changes */
+ if ( abs( diff ) > ( ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - ISM_MAX_AZIMUTH_DIFF_IDX )
+ {
+ if ( diff > 0 )
+ {
+ diff -= ( 1 << ISM_AZIMUTH_NBITS ) - 1;
+ }
+ else
+ {
+ diff += ( 1 << ISM_AZIMUTH_NBITS ) - 1;
+ }
+ }
+
+ if ( diff == 0 )
+ {
+ idx_angle1 = 0;
+ nbits_diff_angle1 = 1;
+ }
+ else if ( ABSVAL( diff ) < ISM_MAX_AZIMUTH_DIFF_IDX ) /* when diff bits >= abs bits, prefer abs */
+ {
+ idx_angle1 = 1 << 1;
+ nbits_diff_angle1 = 1;
+
+ if ( diff < 0 )
+ {
+ idx_angle1 += 1; /* negative sign */
+ diff *= -1;
+ }
+ else
+ {
+ idx_angle1 += 0; /* positive sign */
+ }
+
+ idx_angle1 = idx_angle1 << diff;
+ nbits_diff_angle1++;
+
+ /* unary coding of "diff */
+ idx_angle1 += ( ( 1 << diff ) - 1 );
+ nbits_diff_angle1 += diff;
+
+ if ( nbits_diff_angle1 < ISM_AZIMUTH_NBITS - 1 )
+ {
+ /* add stop bit - only for codewords shorter than ISM_AZIMUTH_NBITS */
+ idx_angle1 = idx_angle1 << 1;
+ nbits_diff_angle1++;
+ }
+ }
+ else
+ {
+ *flag_abs_angle1 = 1;
+ }
+ }
+
+ /* update counter */
+ if ( *flag_abs_angle1 == 0 )
+ {
+ angle->angle1_diff_cnt++;
+ angle->angle2_diff_cnt = min( angle->angle2_diff_cnt, ISM_FEC_MAX );
+ }
+ else
+ {
+ angle->angle1_diff_cnt = 0;
+ }
+
+ /* Write azimuth/yaw */
+ push_indice( hBstr, IND_ISM_AZIMUTH_DIFF_FLAG, *flag_abs_angle1, 1 );
+
+ if ( *flag_abs_angle1 )
+ {
+ push_indice( hBstr, IND_ISM_AZIMUTH, idx_angle1, ISM_AZIMUTH_NBITS );
+ }
+ else
+ {
+ push_indice( hBstr, IND_ISM_AZIMUTH, idx_angle1, nbits_diff_angle1 );
+ }
+
+ /*----------------------------------------------------------------*
+ * Elevation/pitch index encoding
+ *----------------------------------------------------------------*/
+
+ idx_angle2 = idx_angle2_abs;
+ nbits_diff_angle2 = 0;
+ *flag_abs_angle2 = 0; /* differential coding by default */
+ if ( angle->angle2_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */
+ || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */
+ )
+ {
+ *flag_abs_angle2 = 1;
+ }
+
+ /* note: elevation/pitch is coded starting from the second frame only (it is meaningless in the init_frame) */
+ if ( ini_frame == 0 )
+ {
+ *flag_abs_angle2 = 1;
+ angle->last_angle2_idx = idx_angle2_abs;
+ }
+
+ diff = idx_angle2_abs - angle->last_angle2_idx;
+
+ /* avoid absolute coding of elevation/pitch if absolute coding was already used for azimuth/yaw */
+ if ( *flag_abs_angle1 == 1 )
+ {
+ int16_t diff_orig = diff;
+
+ *flag_abs_angle2 = 0;
+
+
+ if ( diff >= 0 )
+ {
+ diff = min( diff, ISM_MAX_ELEVATION_DIFF_IDX );
+ }
+ else
+ {
+ diff = -1 * min( -diff, ISM_MAX_ELEVATION_DIFF_IDX );
+ }
+
+ if ( last_ism_metadata_flag == 0 || abs( diff_orig - diff ) > ISM_MAX_ELEVATION_DIFF_IDX )
+ {
+ angle->angle2_diff_cnt = ISM_FEC_MAX - 1;
+ }
+ }
+
+ /* try differential coding */
+ if ( *flag_abs_angle2 == 0 )
+ {
+ if ( diff == 0 )
+ {
+ idx_angle2 = 0;
+ nbits_diff_angle2 = 1;
+ }
+ else if ( ABSVAL( diff ) <= ISM_MAX_ELEVATION_DIFF_IDX )
+ {
+ idx_angle2 = 1 << 1;
+ nbits_diff_angle2 = 1;
+
+ if ( diff < 0 )
+ {
+ idx_angle2 += 1; /* negative sign */
+ diff *= -1;
+ }
+ else
+ {
+ idx_angle2 += 0; /* positive sign */
+ }
+
+ idx_angle2 = idx_angle2 << diff;
+ nbits_diff_angle2++;
+
+ /* unary coding of "diff */
+ idx_angle2 += ( ( 1 << diff ) - 1 );
+ nbits_diff_angle2 += diff;
+
+ if ( nbits_diff_angle2 < ISM_ELEVATION_NBITS )
+ {
+ /* add stop bit */
+ idx_angle2 = idx_angle2 << 1;
+ nbits_diff_angle2++;
+ }
+ }
+ else
+ {
+ *flag_abs_angle2 = 1;
+ }
+ }
+
+ /* update counter */
+ if ( *flag_abs_angle2 == 0 )
+ {
+ angle->angle2_diff_cnt++;
+ angle->angle2_diff_cnt = min( angle->angle2_diff_cnt, ISM_FEC_MAX );
+ }
+ else
+ {
+ angle->angle2_diff_cnt = 0;
+ }
+
+ /* Write elevation */
+ if ( *flag_abs_angle1 == 0 ) /* do not write "flag_abs_elevation/pitch" if "flag_abs_azimuth/yaw == 1" */
+ {
+ push_indice( hBstr, IND_ISM_ELEVATION_DIFF_FLAG, *flag_abs_angle2, 1 );
+ }
+
+ if ( *flag_abs_angle2 )
+ {
+ push_indice( hBstr, IND_ISM_ELEVATION, idx_angle2, ISM_ELEVATION_NBITS );
+ }
+ else
+ {
+ push_indice( hBstr, IND_ISM_ELEVATION, idx_angle2, nbits_diff_angle2 );
+ }
+
+ /*----------------------------------------------------------------*
+ * Updates
+ *----------------------------------------------------------------*/
+
+ angle->last_angle1_idx = idx_angle1_abs;
+ angle->last_angle2_idx = idx_angle2_abs;
+
+ return;
+}
+
+#else
+
+static void encode_angle_indices(
+ BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
+ ISM_METADATA_ANGLE_HANDLE angle, /* i/o: angle handle */
+ const int16_t last_ism_metadata_flag, /* i : last frame ism_metadata_flag */
+ const int16_t ini_frame, /* i : initialization frames counter */
+ const int16_t idx_azimuth_abs, /* i : Azimuth index */
+ const int16_t idx_elevation_abs, /* i : Elevation index */
+ int16_t *flag_abs_azimuth, /* o : Azimuth encoding mode */
+ int16_t *flag_abs_elevation /* o : Elevation encoding mode */
+)
+{
+ int16_t idx_azimuth, nbits_diff_azimuth, diff;
+ int16_t idx_elevation, nbits_diff_elevation;
+
+ /*----------------------------------------------------------------*
+ * Azimuth index encoding
+ *----------------------------------------------------------------*/
+
+ idx_azimuth = idx_azimuth_abs;
+
+ nbits_diff_azimuth = 0;
+
+ *flag_abs_azimuth = 0; /* differential coding by default */
+ if ( angle->azimuth_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */
+ || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */
+ )
+ {
+ *flag_abs_azimuth = 1;
+ }
+
+ /* try differential coding */
+ if ( *flag_abs_azimuth == 0 )
+ {
+ diff = idx_azimuth_abs - angle->last_azimuth_idx;
+
+ /* azimuth is on a circle - check for diff coding for -180° -> 180° and vice versa changes */
+ if ( abs( diff ) > ( ( 1 << ISM_AZIMUTH_NBITS ) - 1 ) - ISM_MAX_AZIMUTH_DIFF_IDX )
+ {
+ if ( diff > 0 )
+ {
+ diff -= ( 1 << ISM_AZIMUTH_NBITS ) - 1;
+ }
+ else
+ {
+ diff += ( 1 << ISM_AZIMUTH_NBITS ) - 1;
+ }
+ }
+
+ if ( diff == 0 )
+ {
+ idx_azimuth = 0;
+ nbits_diff_azimuth = 1;
+ }
+ else if ( ABSVAL( diff ) < ISM_MAX_AZIMUTH_DIFF_IDX ) /* when diff bits >= abs bits, prefer abs */
+ {
+ idx_azimuth = 1 << 1;
+ nbits_diff_azimuth = 1;
+
+ if ( diff < 0 )
+ {
+ idx_azimuth += 1; /* negative sign */
+ diff *= -1;
+ }
+ else
+ {
+ idx_azimuth += 0; /* positive sign */
+ }
+
+ idx_azimuth = idx_azimuth << diff;
+ nbits_diff_azimuth++;
+
+ /* unary coding of "diff */
+ idx_azimuth += ( ( 1 << diff ) - 1 );
+ nbits_diff_azimuth += diff;
+
+ if ( nbits_diff_azimuth < ISM_AZIMUTH_NBITS - 1 )
+ {
+ /* add stop bit - only for codewords shorter than ISM_AZIMUTH_NBITS */
+ idx_azimuth = idx_azimuth << 1;
+ nbits_diff_azimuth++;
+ }
+ }
+ else
+ {
+ *flag_abs_azimuth = 1;
+ }
+ }
+
+ /* update counter */
+ if ( *flag_abs_azimuth == 0 )
+ {
+ angle->azimuth_diff_cnt++;
+ angle->elevation_diff_cnt = min( angle->elevation_diff_cnt, ISM_FEC_MAX );
+ }
+ else
+ {
+ angle->azimuth_diff_cnt = 0;
+ }
+
+ /* Write azimuth */
+ push_indice( hBstr, IND_ISM_AZIMUTH_DIFF_FLAG, *flag_abs_azimuth, 1 );
+
+ if ( *flag_abs_azimuth )
+ {
+ push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, ISM_AZIMUTH_NBITS );
+ }
+ else
+ {
+ push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, nbits_diff_azimuth );
+ }
+
+ /*----------------------------------------------------------------*
+ * Elevation index encoding
+ *----------------------------------------------------------------*/
+
+ idx_elevation = idx_elevation_abs;
+ nbits_diff_elevation = 0;
+ *flag_abs_elevation = 0; /* differential coding by default */
+ if ( angle->elevation_diff_cnt == ISM_FEC_MAX /* make differential encoding in ISM_FEC_MAX consecutive frames at maximum (in order to control the decoding in FEC) */
+ || last_ism_metadata_flag == 0 /* If last frame had no metadata coded, do not use differential coding */
+ )
+ {
+ *flag_abs_elevation = 1;
+ }
+
+ /* note: elevation is coded starting from the second frame only (it is meaningless in the init_frame) */
+ if ( ini_frame == 0 )
+ {
+ *flag_abs_elevation = 1;
+ angle->last_elevation_idx = idx_elevation_abs;
+ }
+
+ diff = idx_elevation_abs - angle->last_elevation_idx;
+
+ /* avoid absolute coding of elevation if absolute coding was already used for azimuth */
+ if ( *flag_abs_azimuth == 1 )
+ {
+ int16_t diff_orig = diff;
+
+ *flag_abs_elevation = 0;
+
+
+ if ( diff >= 0 )
+ {
+ diff = min( diff, ISM_MAX_ELEVATION_DIFF_IDX );
+ }
+ else
+ {
+ diff = -1 * min( -diff, ISM_MAX_ELEVATION_DIFF_IDX );
+ }
+
+ if ( last_ism_metadata_flag == 0 || abs( diff_orig - diff ) > ISM_MAX_ELEVATION_DIFF_IDX )
+ {
+ angle->elevation_diff_cnt = ISM_FEC_MAX - 1;
+ }
+ }
+
+ /* try differential coding */
+ if ( *flag_abs_elevation == 0 )
+ {
+ if ( diff == 0 )
+ {
+ idx_elevation = 0;
+ nbits_diff_elevation = 1;
+ }
+ else if ( ABSVAL( diff ) <= ISM_MAX_ELEVATION_DIFF_IDX )
+ {
+ idx_elevation = 1 << 1;
+ nbits_diff_elevation = 1;
+
+ if ( diff < 0 )
+ {
+ idx_elevation += 1; /* negative sign */
+ diff *= -1;
+ }
+ else
+ {
+ idx_elevation += 0; /* positive sign */
+ }
+
+ idx_elevation = idx_elevation << diff;
+ nbits_diff_elevation++;
+
+ /* unary coding of "diff */
+ idx_elevation += ( ( 1 << diff ) - 1 );
+ nbits_diff_elevation += diff;
+
+ if ( nbits_diff_elevation < ISM_ELEVATION_NBITS )
+ {
+ /* add stop bit */
+ idx_elevation = idx_elevation << 1;
+ nbits_diff_elevation++;
+ }
+ }
+ else
+ {
+ *flag_abs_elevation = 1;
+ }
+ }
+
+ /* update counter */
+ if ( *flag_abs_elevation == 0 )
+ {
+ angle->elevation_diff_cnt++;
+ angle->elevation_diff_cnt = min( angle->elevation_diff_cnt, ISM_FEC_MAX );
+ }
+ else
+ {
+ angle->elevation_diff_cnt = 0;
+ }
+
+ /* Write elevation */
+ if ( *flag_abs_azimuth == 0 ) /* do not write "flag_abs_elevation" if "flag_abs_azimuth == 1" */
+ {
+ push_indice( hBstr, IND_ISM_ELEVATION_DIFF_FLAG, *flag_abs_elevation, 1 );
+ }
+
+ if ( *flag_abs_elevation )
+ {
+ push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, ISM_ELEVATION_NBITS );
+ }
+ else
+ {
+ push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, nbits_diff_elevation );
+ }
+
+ /*----------------------------------------------------------------*
+ * Updates
+ *----------------------------------------------------------------*/
+
+ angle->last_azimuth_idx = idx_azimuth_abs;
+ angle->last_elevation_idx = idx_elevation_abs;
+
+ return;
+}
+#endif
+
+#ifdef DISCRETE_ISM_DTX_CNG
+/*-------------------------------------------------------------------*
+ * ivas_ism_metadata_sid_enc()
+ *
+ * Quantize and encode ISM metadata in SID frame
+ *-------------------------------------------------------------------*/
+
+void ivas_ism_metadata_sid_enc(
+ ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
+ const int16_t flag_noisy_speech, /* i : noisy speech flag */
+ const int16_t nchan_ism, /* i : number of objects */
+ const int16_t nchan_transport, /* i : number of transport channels */
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ const int16_t sid_flag, /* i : indication of SID frame */
+ const int16_t md_diff_flag[], /* i : metadata differental flag */
+ BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
+ int16_t nb_bits_metadata[] /* o : number of metadata bits */
+)
+{
+ int16_t i, ch, nBits, nBits_start, nBits_unused;
+ float q_step, q_step_border;
+ int16_t idx, idx_azimuth, idx_elevation;
+ int16_t nBits_azimuth, nBits_elevation, nBits_coh, nBits_sce_id;
+ float valQ;
+ ISM_METADATA_HANDLE hIsmMetaData;
+
+ if ( sid_flag )
+ {
+ nBits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC;
+ nBits -= SID_FORMAT_NBITS;
+ nBits_start = hBstr->nb_bits_tot;
+
+ /*----------------------------------------------------------------*
+ * Write ISm common signaling
+ *----------------------------------------------------------------*/
+
+ /* write number of objects - unary coding */
+ for ( ch = 1; ch < nchan_ism; ch++ )
+ {
+ push_indice( hBstr, IND_ISM_NUM_OBJECTS, 1, 1 );
+ }
+ push_indice( hBstr, IND_ISM_NUM_OBJECTS, 0, 1 );
+
+ /* write SID metadata flag (one per object) */
+ for ( ch = 0; ch < nchan_ism; ch++ )
+ {
+ push_indice( hBstr, IND_ISM_METADATA_FLAG, md_diff_flag[ch], 1 );
+ }
+
+ /*----------------------------------------------------------------*
+ * Set quantization bits based on the number of coded objects
+ *----------------------------------------------------------------*/
+
+ ivas_get_ism_sid_quan_bitbudget( nchan_ism, &nBits_azimuth, &nBits_elevation, &q_step, &q_step_border, &nBits_coh, &nBits_sce_id );
+
+ /*----------------------------------------------------------------*
+ * Spatial parameters, loop over TCs - 1
+ *----------------------------------------------------------------*/
+
+ /* write ISM mode flag to explicitly signal number of spatial parameters */
+ if ( nchan_ism > 2 )
+ {
+ if ( ism_mode == ISM_MODE_DISC )
+ {
+ push_indice( hBstr, IND_ISM_VAD_FLAG, 0, 1 );
+ }
+ else
+ {
+ push_indice( hBstr, IND_ISM_VAD_FLAG, 1, 1 );
+ }
+
+ if ( ism_mode == ISM_MODE_PARAM )
+ {
+ /* write noisy speech flag */
+ push_indice( hBstr, IND_ISM_NOISY_SPEECH_FLAG, flag_noisy_speech, 1 );
+ nBits_sce_id = 1;
+ }
+ }
+
+ if ( nchan_transport > 1 )
+ {
+ /* write sce id */
+ push_indice( hBstr, IND_ISM_SCE_ID_DTX, hISMDTX->sce_id_dtx, nBits_sce_id );
+
+ /* quantize and write coherence */
+ for ( ch = 0; ch < nchan_transport; ch++ )
+ {
+ if ( ch == hISMDTX->sce_id_dtx )
+ {
+ continue;
+ }
+
+ idx = (int16_t) ( hISMDTX->coh[ch] * ( ( 1 << nBits_coh ) - 1 ) + 0.5f );
+ assert( ( idx >= 0 ) && ( idx <= ( ( 1 << nBits_coh ) - 1 ) ) );
+ push_indice( hBstr, IND_ISM_DTX_COH_SCA, idx, nBits_coh );
+ }
+ }
+
+ /*----------------------------------------------------------------*
+ * Metadata quantization and coding, loop over all objects
+ *----------------------------------------------------------------*/
+
+ for ( ch = 0; ch < nchan_ism; ch++ )
+ {
+ if ( md_diff_flag[ch] == 1 )
+ {
+ hIsmMetaData = hIsmMeta[ch];
+
+ idx_azimuth = ism_quant_meta( hIsmMetaData->azimuth, &valQ, ism_azimuth_borders, q_step, q_step_border, 1 << nBits_azimuth );
+ idx_elevation = ism_quant_meta( hIsmMetaData->elevation, &valQ, ism_elevation_borders, q_step, q_step_border, 1 << nBits_elevation );
+
+ push_indice( hBstr, IND_ISM_AZIMUTH, idx_azimuth, nBits_azimuth );
+ push_indice( hBstr, IND_ISM_ELEVATION, idx_elevation, nBits_elevation );
+
+ /* update last indexes to correspond to active frames coding */
+ if ( nBits_azimuth > ISM_AZIMUTH_NBITS )
+ {
+#ifdef FIX_379_ANGLE
+ hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS );
+ hIsmMetaData->position_angle.last_angle2_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS );
+
+#else
+ hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth >> ( nBits_azimuth - ISM_AZIMUTH_NBITS );
+ hIsmMetaData->angle[0].last_elevation_idx = idx_elevation >> ( nBits_elevation - ISM_ELEVATION_NBITS );
+#endif
+ }
+ else
+ {
+#ifdef FIX_379_ANGLE
+ hIsmMetaData->position_angle.last_angle1_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth );
+ hIsmMetaData->position_angle.last_angle2_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation );
+#else
+ hIsmMetaData->angle[0].last_azimuth_idx = idx_azimuth << ( ISM_AZIMUTH_NBITS - nBits_azimuth );
+ hIsmMetaData->angle[0].last_elevation_idx = idx_elevation << ( ISM_ELEVATION_NBITS - nBits_elevation );
+#endif
+ }
+ }
+ }
+
+ /* Write unused (padding) bits */
+ nBits_unused = nBits - hBstr->nb_bits_tot;
+ while ( nBits_unused > 0 )
+ {
+ i = min( nBits_unused, 16 );
+ push_indice( hBstr, IND_UNUSED, 0, i );
+ nBits_unused -= i;
+ }
+
+ nb_bits_metadata[0] = hBstr->nb_bits_tot - nBits_start;
+ }
+
+ return;
+}
+#endif
diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc.c
index 22aa680ee28f6434d87efe60dffb5aa251de0192..873912d661a6248c5ad6fd18c0537bf05398ee0d 100644
--- a/lib_enc/ivas_ism_param_enc.c
+++ b/lib_enc/ivas_ism_param_enc.c
@@ -47,16 +47,27 @@
static void ivas_param_ism_compute_obj_parameters(
+#ifdef NCHAN_ISM_PARAMETER
+ const int16_t nchan_ism, /* i : number of ISM channels */
+#endif
float reference_power_obj[MAX_NUM_OBJECTS][PARAM_ISM_MDFT_NO_SLOTS][DIRAC_NO_FB_BANDS_MAX], /* i : Reference power */
PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: Param ISM Enc Handle */
)
{
+#ifdef NCHAN_ISM_PARAMETER
+ int16_t i, b, m, br, mr;
+#else
int16_t i, b, m, br, mr, num_obj;
+#endif
int16_t brange_start, brange_end, mrange_start, mrange_end, time_merge_fac;
float power_ratios_m[MAX_PARAM_ISM_NBANDS][MAX_PARAM_ISM_NBLOCKS];
+#ifdef NCHAN_ISM_PARAMETER
+ assert( nchan_ism == 3 || nchan_ism == 4 );
+#else
num_obj = hParamIsm->num_obj;
assert( num_obj == 3 || num_obj == 4 );
+#endif
for ( b = 0; b < hParamIsm->nbands; b++ )
{
@@ -81,7 +92,11 @@ static void ivas_param_ism_compute_obj_parameters(
/* for each object, sum up reference power within current T/F tile */
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < nchan_ism; i++ )
+#else
for ( i = 0; i < num_obj; i++ )
+#endif
{
for ( mr = mrange_start; mr < mrange_end; mr++ )
{
@@ -103,7 +118,12 @@ static void ivas_param_ism_compute_obj_parameters(
index_1 = 1;
index_2 = 0;
}
- for ( i = 2; i < num_obj; i++ )
+
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = MAX_PARAM_ISM_WAVE; i < nchan_ism; i++ )
+#else
+ for ( i = MAX_PARAM_ISM_WAVE; i < num_obj; i++ )
+#endif
{
if ( ref_power_local[i] > ref_power_local[index_1] )
{
@@ -149,23 +169,36 @@ static void ivas_param_ism_compute_obj_parameters(
static void ivas_param_ism_enc_quantize_DOA(
+#ifdef NCHAN_ISM_PARAMETER
+ const int16_t nchan_ism, /* i : number of ISM channels */
+#endif
ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS], /* i : ISM metadata */
PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: Param ISM encoder handle */
)
{
+#ifdef NCHAN_ISM_PARAMETER
+ int16_t i, azi_idx, ele_idx;
+#else
int16_t i, azi_idx, ele_idx, num_obj;
+#endif
float valQ;
+#ifndef NCHAN_ISM_PARAMETER
num_obj = hParamIsm->num_obj;
+#endif
/* Loop over objects */
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < nchan_ism; i++ )
+#else
for ( i = 0; i < num_obj; i++ )
+#endif
{
/* Quantize the elevation and obtain quantized elevation value and index */
- ele_idx = ism_quant_meta( hIsmMetaData[i]->elevation, &valQ, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS );
+ ele_idx = ism_quant_meta( hIsmMetaData[i]->elevation, &valQ, ism_elevation_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_ELEVATION_NBITS );
/* Obtain the index of quantized azimuth values */
- azi_idx = ism_quant_meta( hIsmMetaData[i]->azimuth, &valQ, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS );
+ azi_idx = ism_quant_meta( hIsmMetaData[i]->azimuth, &valQ, ism_azimuth_borders, ISM_Q_STEP, ISM_Q_STEP_BORDER, 1 << ISM_AZIMUTH_NBITS );
/*Replace azimuth with quantized values */
hIsmMetaData[i]->azimuth = valQ;
@@ -191,7 +224,11 @@ void ivas_param_ism_stereo_dmx(
const int16_t input_frame /* i : Length of input frame */
)
{
+#ifdef NCHAN_ISM_PARAMETER
+ int16_t i, j;
+#else
int16_t i, j, num_obj;
+#endif
float alpha, azi_shift, tmp, tmp_1;
float cardioid_left[MAX_NUM_OBJECTS], cardioid_right[MAX_NUM_OBJECTS];
float stereo_dmx[2][L_FRAME48k];
@@ -202,14 +239,20 @@ void ivas_param_ism_stereo_dmx(
/*Initialization*/
alpha = 0.5;
azi_shift = 0;
+#ifndef NCHAN_ISM_PARAMETER
num_obj = st_ivas->hDirAC->hParamIsm->num_obj;
+#endif
/* Set the stereo dmx to zero */
set_zero( stereo_dmx[0], L_FRAME48k );
set_zero( stereo_dmx[1], L_FRAME48k );
/* Loop over all objects */
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < st_ivas->hEncoderConfig->nchan_ism; i++ )
+#else
for ( i = 0; i < num_obj; i++ )
+#endif
{
hIsmMetaData = st_ivas->hIsmMetaData[i];
@@ -271,8 +314,10 @@ ivas_error ivas_param_ism_enc_open(
input_Fs = st_ivas->hEncoderConfig->input_Fs;
+#ifndef NCHAN_ISM_PARAMETER
/* Assign the number of objects */
hDirAC->hParamIsm->num_obj = st_ivas->hEncoderConfig->nchan_inp;
+#endif
/* set FB config. */
@@ -282,12 +327,16 @@ ivas_error ivas_param_ism_enc_open(
}
/* Allocate and initialize FB mixer handle */
- if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK )
{
return error;
}
+#ifdef NCHAN_ISM_PARAMETER
+ ivas_param_ism_config( hDirAC->hParamIsm, st_ivas->hEncoderConfig->nchan_inp );
+#else
ivas_param_ism_config( hDirAC->hParamIsm );
+#endif
/* Assign memories for Band and Block grouping */
hDirAC->hParamIsm->nbands = MAX_PARAM_ISM_NBANDS;
@@ -313,23 +362,29 @@ ivas_error ivas_param_ism_enc_open(
/*-------------------------------------------------------------------------*
* ivas_param_ism_enc_close()
*
- * Close Param ISM handle
+ * Close Param ISM encoder handle
*-------------------------------------------------------------------------*/
void ivas_param_ism_enc_close(
- DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */
- const int32_t input_Fs /* i : input sampling_rate */
+ DIRAC_ENC_HANDLE *hDirAC, /* i/o: encoder DirAC handle */
+ const int32_t input_Fs /* i : input sampling_rate */
)
{
- ivas_FB_mixer_close( &hDirAC->hFbMixer, input_Fs );
+ if ( hDirAC == NULL || *hDirAC == NULL )
+ {
+ return;
+ }
- if ( hDirAC->hParamIsm != NULL )
+ ivas_FB_mixer_close( &( *hDirAC )->hFbMixer, input_Fs, 0 );
+
+ if ( ( *hDirAC )->hParamIsm != NULL )
{
- free( hDirAC->hParamIsm );
- hDirAC->hParamIsm = NULL;
+ free( ( *hDirAC )->hParamIsm );
+ ( *hDirAC )->hParamIsm = NULL;
}
- free( hDirAC );
+ free( ( *hDirAC ) );
+ ( *hDirAC ) = NULL;
return;
}
@@ -348,6 +403,9 @@ void ivas_param_ism_enc(
)
{
int16_t i, j, ts, l_ts;
+#ifdef NCHAN_ISM_PARAMETER
+ int16_t nchan_ism;
+#endif
int16_t num_time_slots;
float *pcm_in[MAX_NUM_OBJECTS];
float fb_RealBuffer[MAX_NUM_OBJECTS][DIRAC_NO_FB_BANDS_MAX];
@@ -358,6 +416,9 @@ void ivas_param_ism_enc(
DIRAC_ENC_HANDLE hDirAC;
PARAM_ISM_CONFIG_HANDLE hParamIsm;
+#ifdef NCHAN_ISM_PARAMETER
+ nchan_ism = st_ivas->hEncoderConfig->nchan_ism;
+#endif
hDirAC = st_ivas->hDirAC;
hParamIsm = hDirAC->hParamIsm;
@@ -366,7 +427,11 @@ void ivas_param_ism_enc(
l_ts = input_frame / PARAM_ISM_MDFT_NO_SLOTS;
num_time_slots = PARAM_ISM_MDFT_NO_SLOTS;
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < nchan_ism; i++ )
+#else
for ( i = 0; i < hParamIsm->num_obj; i++ )
+#endif
{
pcm_in[i] = &data[i][0];
@@ -375,12 +440,18 @@ void ivas_param_ism_enc(
p_fb_RealBuffer[i] = &fb_RealBuffer[i][0];
p_fb_ImagBuffer[i] = &fb_ImagBuffer[i][0];
}
+
for ( ts = 0; ts < num_time_slots; ts++ )
{
ivas_fb_mixer_get_windowed_fr( hDirAC->hFbMixer, pcm_in, p_fb_RealBuffer, p_fb_ImagBuffer, l_ts, l_ts );
+
ivas_fb_mixer_update_prior_input( hDirAC->hFbMixer, pcm_in, l_ts );
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < nchan_ism; i++ )
+#else
for ( i = 0; i < hParamIsm->num_obj; i++ )
+#endif
{
pcm_in[i] += l_ts;
for ( j = 0; j < DIRAC_NO_FB_BANDS_MAX; j++ )
@@ -389,18 +460,27 @@ void ivas_param_ism_enc(
}
}
}
+
/* Quantize DOAs */
+#ifdef NCHAN_ISM_PARAMETER
+ ivas_param_ism_enc_quantize_DOA( nchan_ism, st_ivas->hIsmMetaData, hParamIsm );
+#else
ivas_param_ism_enc_quantize_DOA( st_ivas->hIsmMetaData, hParamIsm );
+#endif
/* Compute object indices and power ratios */
+#ifdef NCHAN_ISM_PARAMETER
+ ivas_param_ism_compute_obj_parameters( nchan_ism, reference_power_obj, hParamIsm );
+#else
ivas_param_ism_compute_obj_parameters( reference_power_obj, hParamIsm );
+#endif
pop_wmops();
return;
}
-#ifdef PARAM_ISM_DTX_CNG
+#ifndef DISCRETE_ISM_DTX_CNG
static void ivas_param_ism_enc_quantize_DOA_dtx(
float azimuth,
float elevation,
@@ -467,10 +547,14 @@ static void ivas_param_ism_enc_quantize_DOA_dtx(
*-------------------------------------------------------------------------*/
void ivas_param_ism_metadata_dtx_enc(
- BSTR_ENC_HANDLE hBstr, /* i/o : bitstream handle */
+ BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
ISM_METADATA_HANDLE hIsmMeta[], /* i : ISM metadata handles */
ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
PARAM_ISM_CONFIG_HANDLE hParamIsm /* i : Param ISM Enc Handle */
+#ifdef NCHAN_ISM_PARAMETER
+ ,
+ const int16_t nchan_ism /* i : number of ISM channels */
+#endif
)
{
int16_t i, nBits, nBits_unused;
@@ -482,7 +566,11 @@ void ivas_param_ism_metadata_dtx_enc(
/* Transmit the metadata */
/* write number of objects - unary coding */
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < nchan_ism; i++ )
+#else
for ( i = 1; i < hParamIsm->num_obj; i++ )
+#endif
{
push_indice( hBstr, IND_ISM_NUM_OBJECTS, 1, 1 );
}
@@ -499,7 +587,11 @@ void ivas_param_ism_metadata_dtx_enc(
assert( ( coh_idx >= 0 ) && ( coh_idx <= ( ( 1 << PARAM_ISM_DTX_COH_SCA_BITS ) - 1 ) ) );
push_indice( hBstr, IND_ISM_DTX_COH_SCA, coh_idx, PARAM_ISM_DTX_COH_SCA_BITS );
+#ifdef NCHAN_ISM_PARAMETER
+ for ( i = 0; i < nchan_ism; i++ )
+#else
for ( i = 0; i < hParamIsm->num_obj; i++ )
+#endif
{
ivas_param_ism_enc_quantize_DOA_dtx( hIsmMeta[i]->azimuth, hIsmMeta[i]->elevation, PARAM_ISM_DTX_AZI_BITS, PARAM_ISM_DTX_ELE_BITS, &azi_idx, &ele_idx );
push_indice( hBstr, IND_ISM_AZIMUTH, azi_idx, PARAM_ISM_DTX_AZI_BITS );
@@ -525,7 +617,7 @@ void ivas_param_ism_metadata_dtx_enc(
return;
}
-
+#endif
/*-------------------------------------------------------------------*
* ivas_param_ism_compute_noisy_speech_flag()
@@ -573,4 +665,3 @@ void ivas_param_ism_compute_noisy_speech_flag(
return;
}
-#endif
diff --git a/lib_enc/ivas_lfe_enc.c b/lib_enc/ivas_lfe_enc.c
index fc16c279ee62d40309caec961f91836c0ef5a5de..a14424774ffec7ed5270d26f8d46926c9568e53e 100644
--- a/lib_enc/ivas_lfe_enc.c
+++ b/lib_enc/ivas_lfe_enc.c
@@ -460,21 +460,27 @@ ivas_error ivas_create_lfe_enc(
*-------------------------------------------------------------------------*/
void ivas_lfe_enc_close(
- LFE_ENC_HANDLE hLFE /* i/o: LFE encoder handle */
+ LFE_ENC_HANDLE *hLFE /* i/o: LFE encoder handle */
)
{
- if ( hLFE->old_wtda_audio != NULL )
+ if ( hLFE == NULL || *hLFE == NULL )
{
- free( hLFE->old_wtda_audio );
- hLFE->old_wtda_audio = NULL;
+ return;
}
- if ( hLFE->pWindow_state )
+
+ if ( ( *hLFE )->old_wtda_audio != NULL )
+ {
+ free( ( *hLFE )->old_wtda_audio );
+ ( *hLFE )->old_wtda_audio = NULL;
+ }
+ if ( ( *hLFE )->pWindow_state )
{
- free( hLFE->pWindow_state );
- hLFE->pWindow_state = NULL;
+ free( ( *hLFE )->pWindow_state );
+ ( *hLFE )->pWindow_state = NULL;
}
- free( hLFE );
+ free( ( *hLFE ) );
+ ( *hLFE ) = NULL;
return;
}
diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc.c
index dec4b97b3cb24f3da9ab71af9dbfff693b4dc505..5e81132ced7dd039b946a76fdb011928bf994010 100644
--- a/lib_enc/ivas_masa_enc.c
+++ b/lib_enc/ivas_masa_enc.c
@@ -31,8 +31,8 @@
*******************************************************************************************************/
#include
-#include "options.h"
#include
+#include "options.h"
#include "ivas_cnst.h"
#include "ivas_prot.h"
#include "ivas_rom_com.h"
@@ -40,6 +40,7 @@
#include "wmc_auto.h"
#include "prot.h"
+
/*-----------------------------------------------------------------------*
* Local function prototypes
*-----------------------------------------------------------------------*/
@@ -48,9 +49,9 @@ static void combine_freqbands_and_subframes( MASA_ENCODER_HANDLE hMasa );
static void find_n_largest( const float *input, int16_t *largestIndices, const int16_t numElements, const int16_t numLargest );
-static void move_metadata_to_qmetadata( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hQMeta );
+static void move_metadata_to_qmetadata( const MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hQMeta );
-static void detect_metadata_composition( MASA_ENCODER_HANDLE hMasa, uint8_t *joinedSubframes, uint8_t *coherencePresent, uint8_t *isTwoDir );
+static void detect_metadata_composition( const MASA_ENCODER_HANDLE hMasa, uint8_t *joinedSubframes, uint8_t *coherencePresent, uint8_t *isTwoDir );
static void compensate_energy_ratios( MASA_ENCODER_HANDLE hMasa );
@@ -59,26 +60,42 @@ static int16_t encode_lfe_to_total_energy_ratio( MASA_ENCODER_HANDLE hMasa, BSTR
#ifdef MASA_AND_OBJECTS
static void ivas_encode_masaism_metadata( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hQMetaData, BSTR_ENC_HANDLE hMetaData, ISM_METADATA_HANDLE hIsmMeta[], const int16_t low_bitrate_mode, const int16_t omasa_nbands, const int16_t omasa_nblocks, const int16_t idx_separated_object, const int16_t ism_imp );
-static void reduce_metadata_further( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hqmetadata, const IVAS_FORMAT ivas_format, const ISM_MODE ism_mode );
+static void reduce_metadata_further( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hqmetadata, const IVAS_FORMAT ivas_format
+#ifndef OMASA_UPDATES
+ ,
+ const ISM_MODE ism_mode
+#endif
+);
-static void quantize_ratio_ism_vector( float *ratio_ism, int16_t *idx, const int16_t nchan_ism, const float masa_to_total_energy_ratio, const int16_t idx_sep_object );
+static void quantize_ratio_ism_vector( const float *ratio_ism, int16_t *idx, const int16_t nchan_ism, const float masa_to_total_energy_ratio, const int16_t idx_sep_object );
-static int16_t index_slice_enum( const int16_t *ratio_ism_idx, int16_t no_ism );
+static int16_t index_slice_enum( const int16_t *ratio_ism_idx, const int16_t nchan_ism );
-static int16_t encode_ratio_ism_subframe( int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], const int16_t nchan_ism, const int16_t numCodingBands, const int16_t sf, int16_t ratio_ism_idx_prev_sf[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], BSTR_ENC_HANDLE hMetaData, const float *masa_to_total_energy_ratio, const int16_t shift_one, const int16_t idx_sep_obj );
+static int16_t encode_ratio_ism_subframe( const int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], const int16_t nchan_ism, const int16_t numCodingBands, const int16_t sf, const int16_t ratio_ism_idx_prev_sf[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], BSTR_ENC_HANDLE hMetaData, const float *masa_to_total_energy_ratio, const int16_t shift_one, const int16_t idx_sep_obj );
-static void transform_index_and_GR_encode( int16_t *diff_idx, int16_t len, int16_t GR_order, BSTR_ENC_HANDLE hMetaData );
+static void transform_index_and_GR_encode( int16_t *diff_idx, const int16_t len, const int16_t GR_order, BSTR_ENC_HANDLE hMetaData );
-static void transform_difference_index( int16_t *diff_idx, int16_t *idx, int16_t len );
+static void transform_difference_index( const int16_t *diff_idx, int16_t *idx, const int16_t len );
-static void independent_coding_ratio_ism_idx( int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], const float *masa_to_total_energy_ratio, int16_t nchan_ism, int16_t numCodingBands, int16_t bits_index, BSTR_ENC_HANDLE hMetaData );
+static void independent_coding_ratio_ism_idx( const int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], const float *masa_to_total_energy_ratio, const int16_t nchan_ism, const int16_t numCodingBands, const int16_t bits_index, BSTR_ENC_HANDLE hMetaData );
-static void remove_sep_obj( int16_t *diff_idx, int16_t no_ism, int16_t idx_sep_obj );
+static void remove_sep_obj( int16_t *diff_idx, const int16_t nchan_ism, const int16_t idx_sep_obj );
#else
static void reduce_metadata_further( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hqmetadata, const IVAS_FORMAT ivas_format );
#endif
+#ifndef MASA_AND_OBJECTS
+static void combine_directions( MASA_ENCODER_HANDLE hMasa );
+#endif
+
+#ifdef FIX_382_MASA_META_FRAMING_ASYNC
+static void detect_framing_async( MASA_ENCODER_HANDLE hMasa );
+
+static void average_masa_metadata( MASA_METADATA_FRAME *hMeta, float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] );
+
+static uint8_t are_masa_subframes_similar( const MASA_METADATA_HANDLE frame1, const uint8_t sf1_idx, const MASA_METADATA_HANDLE frame2, const uint8_t sf2_idx );
+#endif
/*-----------------------------------------------------------------------*
* Local constants
@@ -164,6 +181,7 @@ ivas_error ivas_masa_enc_open(
mvs2s( DirAC_block_grouping, hMasa->config.block_grouping, MAX_PARAM_SPATIAL_SUBFRAMES + 1 );
mvs2s( MASA_band_grouping_24, hMasa->config.band_grouping, MASA_FREQUENCY_BANDS + 1 );
+#ifndef FIX_350_MASA_DELAY_COMP
#ifdef MASA_AND_OBJECTS
if ( hEncoderConfig->ivas_format == MASA_FORMAT || hEncoderConfig->ivas_format == MASA_ISM_FORMAT )
#else
@@ -176,6 +194,7 @@ ivas_error ivas_masa_enc_open(
set_f( hMasa->data.delay_buffer[i], 0.0f, MASA_ENC_DELAY_SLOTS * CLDFB_NO_CHANNELS_MAX );
}
}
+#endif
hMasa->data.onset_detector_1 = 0.0f;
hMasa->data.onset_detector_2 = 0.0f;
@@ -183,6 +202,13 @@ ivas_error ivas_masa_enc_open(
set_zero( hMasa->data.lfeToTotalEnergyRatio, MAX_PARAM_SPATIAL_SUBFRAMES );
hMasa->data.prevq_lfeToTotalEnergyRatio = 0.0f;
hMasa->data.prevq_lfeIndex = 0;
+
+#ifdef FIX_382_MASA_META_FRAMING_ASYNC
+ hMasa->data.sync_state.prev_sim_stop = 0;
+ hMasa->data.sync_state.prev_offset = 0;
+ hMasa->data.sync_state.frame_mode = MASA_FRAME_4SF;
+#endif
+
#ifdef MASA_AND_OBJECTS
hMasa->data.lp_noise_CPE = -1;
#endif
@@ -200,17 +226,27 @@ ivas_error ivas_masa_enc_open(
*-----------------------------------------------------------------------*/
void ivas_masa_enc_close(
- MASA_ENCODER_HANDLE hMasa, /* i/o: MASA metadata structure */
+ MASA_ENCODER_HANDLE *hMasa /* i/o: MASA metadata structure */
+#ifndef FIX_350_MASA_DELAY_COMP
+ ,
const int16_t nchan_transport, /* i : Number of transport channels */
const IVAS_FORMAT ivas_format /* i : IVAS format */
+#endif
)
{
int16_t i;
- for ( i = 0; i < hMasa->data.num_Cldfb_instances; i++ )
+ if ( hMasa == NULL || *hMasa == NULL )
+ {
+ return;
+ }
+
+ for ( i = 0; i < ( *hMasa )->data.num_Cldfb_instances; i++ )
{
- deleteCldfb( &( hMasa->data.cldfbAnaEnc[i] ) );
+ deleteCldfb( &( ( *hMasa )->data.cldfbAnaEnc[i] ) );
}
+
+#ifndef FIX_350_MASA_DELAY_COMP
#ifdef MASA_AND_OBJECTS
if ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT )
#else
@@ -219,12 +255,14 @@ void ivas_masa_enc_close(
{
for ( i = 0; i < nchan_transport; i++ )
{
- free( hMasa->data.delay_buffer[i] );
- hMasa->data.delay_buffer[i] = NULL;
+ free( ( *hMasa )->data.delay_buffer[i] );
+ ( *hMasa )->data.delay_buffer[i] = NULL;
}
}
+#endif
- free( hMasa );
+ free( ( *hMasa ) );
+ ( *hMasa ) = NULL;
return;
}
@@ -236,7 +274,7 @@ void ivas_masa_enc_close(
* main MASA encoder function
*-----------------------------------------------------------------------*/
-void ivas_masa_encode(
+ivas_error ivas_masa_encode(
MASA_ENCODER_HANDLE hMasa, /* i/o: MASA encoder structure */
IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */
@@ -253,7 +291,7 @@ void ivas_masa_encode(
ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS], /* i : ISM metadata handle */
const int16_t idx_separated_object, /* i : index of the separated object */
OMASA_ENC_HANDLE hOMasa, /* i : OMASA encoder handle */
- int16_t ism_imp /* i: importance of separated object */
+ const int16_t ism_imp /* i : importance of separated object */
#endif
)
{
@@ -292,7 +330,11 @@ void ivas_masa_encode(
if ( Opt_DTX_ON )
{
- h_orig_metadata = (MASA_DIRECTIONAL_SPATIAL_META *) malloc( MASA_MAXIMUM_DIRECTIONS * sizeof( MASA_DIRECTIONAL_SPATIAL_META ) );
+ if ( ( h_orig_metadata = (MASA_DIRECTIONAL_SPATIAL_META *) malloc( MASA_MAXIMUM_DIRECTIONS * sizeof( MASA_DIRECTIONAL_SPATIAL_META ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA encoder\n" ) );
+ }
+
for ( i = 0; i < MASA_MAXIMUM_DIRECTIONS; i++ )
{
for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
@@ -449,7 +491,12 @@ void ivas_masa_encode(
if ( hMasa->config.max_metadata_bits < MINIMUM_BIT_BUDGET_NORMAL_META && !hMasa->config.joinedSubframes )
{
#ifdef MASA_AND_OBJECTS
- reduce_metadata_further( hMasa, hQMetaData, ivas_format, ism_mode );
+ reduce_metadata_further( hMasa, hQMetaData, ivas_format
+#ifndef OMASA_UPDATES
+ ,
+ ism_mode
+#endif
+ );
low_bitrate_mode = ( ivas_total_brate <= 32000 );
#else
reduce_metadata_further( hMasa, hQMetaData, ivas_format );
@@ -559,7 +606,7 @@ void ivas_masa_encode(
hQMetaData->no_directions = numberOfDirectionsQMetaData;
}
- return;
+ return IVAS_ERR_OK;
}
@@ -595,6 +642,12 @@ void ivas_masa_estimate_energy(
for ( ts = mrange[0]; ts < mrange[1]; ts++ )
{
+#ifdef FIX_350_MASA_DELAY_COMP
+ for ( i = 0; i < nchan_transport; i++ )
+ {
+ cldfbAnalysis_ts( &( data_f[i][l_ts * ts] ), Input_RealBuffer[i], Input_ImagBuffer[i], l_ts, hMasa->data.cldfbAnaEnc[i] );
+ }
+#else
if ( ts < MASA_ENC_DELAY_SLOTS )
{
for ( i = 0; i < nchan_transport; i++ )
@@ -609,6 +662,7 @@ void ivas_masa_estimate_energy(
cldfbAnalysis_ts( &( data_f[i][l_ts * ( ts - MASA_ENC_DELAY_SLOTS )] ), Input_RealBuffer[i], Input_ImagBuffer[i], l_ts, hMasa->data.cldfbAnaEnc[i] );
}
}
+#endif
for ( band_m_idx = 0; band_m_idx < MASA_FREQUENCY_BANDS; band_m_idx++ )
{
@@ -636,10 +690,12 @@ void ivas_masa_estimate_energy(
}
}
+#ifndef FIX_350_MASA_DELAY_COMP
for ( i = 0; i < nchan_transport; i++ )
{
mvr2r( &data_f[i][input_frame - MASA_ENC_DELAY_SLOTS * maxBin], &( hMasa->data.delay_buffer[i][0] ), MASA_ENC_DELAY_SLOTS * maxBin );
}
+#endif
return;
}
@@ -689,6 +745,7 @@ ivas_error ivas_masa_enc_config(
}
}
#endif
+
ivas_masa_set_elements( ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport,
hQMetaData, &st_ivas->hEncoderConfig->element_mode_init, &st_ivas->nSCE, &st_ivas->nCPE
#ifdef MASA_AND_OBJECTS
@@ -696,6 +753,7 @@ ivas_error ivas_masa_enc_config(
ivas_format, st_ivas->ism_mode, ism_total_brate
#endif
);
+
hQMetaData->is_masa_ivas_format = 1;
#ifdef MASA_AND_OBJECTS
@@ -704,6 +762,15 @@ ivas_error ivas_masa_enc_config(
if ( ivas_format == MASA_FORMAT )
#endif
{
+#ifdef FIX_382_MASA_META_FRAMING_ASYNC
+ detect_framing_async( hMasa ); /* detect the offset, set 1sf/4sf mode based on this. potentially also shift the metadata using a history buffer */
+ if ( hMasa->data.sync_state.frame_mode == MASA_FRAME_1SF && hMasa->data.sync_state.prev_offset != 0 )
+ {
+ /* average over sub-frames */
+ average_masa_metadata( &( hMasa->masaMetadata ), hMasa->data.energy );
+ }
+#endif
+
/* Inspect metadata for parameter changes that affect coding. */
detect_metadata_composition( hMasa, &joinedSubframes, &coherencePresent, &isActualTwoDir );
hMasa->config.joinedSubframes = joinedSubframes;
@@ -712,7 +779,7 @@ ivas_error ivas_masa_enc_config(
}
else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA )
{
- /* For mcMASA, these are set only once as this function is called only once. */
+ /* For McMASA, these are set only once as this function is called only once. */
hMasa->config.joinedSubframes = 0;
hMasa->config.numberOfDirections = 1;
}
@@ -740,6 +807,7 @@ ivas_error ivas_masa_enc_config(
#ifdef MASA_AND_OBJECTS
}
#endif
+
/* Setup importance weights for two-direction band selection. */
if ( hMasa->config.numberOfDirections == 2 )
{
@@ -814,7 +882,11 @@ ivas_error ivas_masa_enc_config(
ivas_set_qmetadata_maxbit_req( hQMetaData, ivas_format );
+#ifdef FIX_350_MASA_DELAY_COMP
+ masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, hQMetaData, st_ivas->hEncoderConfig->input_Fs, NULL );
+#else
masa_sample_rate_band_correction( &( hMasa->config ), hMasa->data.band_mapping, hQMetaData, st_ivas->hEncoderConfig->input_Fs );
+#endif
/* Transmit stereo signals using a mono downmix at lowest bitrates */
#ifdef MASA_AND_OBJECTS
@@ -950,9 +1022,10 @@ static void combine_freqbands_and_subframes(
if ( numCodingBands < MASA_FREQUENCY_BANDS )
{
+ /* reduce metadata *frequency* resolution. time resolution is not touched */
for ( i = 0; i < numDirections; i++ )
{
- for ( j = 0; j < numSf; j++ )
+ for ( j = 0; j < numSf; j++ ) /* NB: for numSf==1, operates only on first sub-frame */
{
for ( k = 0; k < MASA_FREQUENCY_BANDS; k++ )
{
@@ -1026,7 +1099,7 @@ static void combine_freqbands_and_subframes(
}
}
}
- else if ( mergeRatiosOverSubframes )
+ else if ( mergeRatiosOverSubframes ) /* keep frequency resolution */
{
for ( j = 0; j < numSf; j++ )
{
@@ -1259,7 +1332,7 @@ static void find_n_largest(
static void move_metadata_to_qmetadata(
- MASA_ENCODER_HANDLE hMasa,
+ const MASA_ENCODER_HANDLE hMasa,
IVAS_QMETADATA_HANDLE hQMeta )
{
int16_t dir, sf, band;
@@ -1331,18 +1404,25 @@ static void move_metadata_to_qmetadata(
/* This function studies parametric MASA metadata to provide information for codec configuration */
static void detect_metadata_composition(
- MASA_ENCODER_HANDLE hMasa, /* i : MASA encoder data */
- uint8_t *joinedSubframes, /* o : Result of subframe composition */
- uint8_t *coherencePresent, /* o : Result of coherence presence */
- uint8_t *isTwoDir /* o : Result of two direction check */
+ const MASA_ENCODER_HANDLE hMasa, /* i : MASA encoder data */
+ uint8_t *joinedSubframes, /* o : Result of subframe composition */
+ uint8_t *coherencePresent, /* o : Result of coherence presence */
+ uint8_t *isTwoDir /* o : Result of two direction check */
)
{
MASA_METADATA_FRAME *hMeta;
+#ifdef FIX_382_MASA_META_FRAMING_ASYNC
+ int8_t sf, band, dir, numDir;
+#else
int16_t sf, band, dir, numDir;
+#endif
int16_t nSubFrames;
uint8_t dirValid[2] = { FALSE };
uint8_t cohPresent = FALSE;
uint8_t sfDiffer = FALSE;
+#ifdef FIX_382_MASA_META_FRAMING_ASYNC
+ uint8_t sfSimilar;
+#endif
hMeta = &( hMasa->masaMetadata );
numDir = hMeta->descriptive_meta.numberOfDirections + 1;
@@ -1407,6 +1487,16 @@ static void detect_metadata_composition(
}
/* Check if data over subframes is identical. Check is done by comparing to first subframe. */
+#ifdef FIX_382_MASA_META_FRAMING_ASYNC
+ sfSimilar = TRUE;
+ sf = 1;
+ while ( ( sfSimilar == TRUE ) && ( sf < MAX_PARAM_SPATIAL_SUBFRAMES ) )
+ {
+ sfSimilar = are_masa_subframes_similar( hMeta, 0, hMeta, sf );
+ sf++;
+ }
+ sfDiffer = sfSimilar == TRUE ? FALSE : TRUE;
+#else
dir = 0;
while ( sfDiffer == FALSE && dir < numDir )
{
@@ -1453,6 +1543,7 @@ static void detect_metadata_composition(
}
dir++;
}
+#endif
/* Further checks can be done with just one subframe if they are identical */
nSubFrames = sfDiffer == TRUE ? MAX_PARAM_SPATIAL_SUBFRAMES : 1;
@@ -1554,9 +1645,11 @@ static void reduce_metadata_further(
IVAS_QMETADATA_HANDLE hqmetadata,
const IVAS_FORMAT ivas_format
#ifdef MASA_AND_OBJECTS
+#ifndef OMASA_UPDATES
,
const ISM_MODE ism_mode
#endif
+#endif
)
{
int16_t sf;
@@ -1972,6 +2065,7 @@ void ivas_masa_enc_reconfigure(
#endif
ivas_total_brate = st_ivas->hEncoderConfig->ivas_total_brate;
+
#ifdef MASA_AND_OBJECTS
ism_total_brate = 0;
#ifdef OMASA_UPDATES
@@ -1986,6 +2080,7 @@ void ivas_masa_enc_reconfigure(
}
}
#endif
+
if ( ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate )
{
for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ )
@@ -2042,6 +2137,409 @@ void ivas_masa_enc_reconfigure(
return;
}
+
+#ifdef FIX_382_MASA_META_FRAMING_ASYNC
+/*-------------------------------------------------------------------*
+ * average_masa_metadata()
+ *
+ * Average MASA metadata frame subframe contents: applies aggregation over time
+ *-------------------------------------------------------------------*/
+
+static void average_masa_metadata(
+ MASA_METADATA_FRAME *hMeta,
+ float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS] )
+{
+ int16_t i, j, k;
+ float azi_rad, ele_rad;
+ uint8_t numDirections;
+
+ /* use the nominal values without data-adaptivity */
+ numDirections = hMeta->descriptive_meta.numberOfDirections + 1;
+
+ /* azi/ele/nrg into vectors for each sub-frame and band */
+ for ( i = 0; i < numDirections; i++ )
+ {
+ for ( k = 0; k < MASA_FREQUENCY_BANDS; k++ )
+ {
+ float x_sum, y_sum, z_sum, energy_sum, vec_len, spread_coh_sum, surr_coh_sum;
+
+ x_sum = 0.0f;
+ y_sum = 0.0f;
+ z_sum = 0.0f;
+ energy_sum = 0.0f;
+ spread_coh_sum = 0.0f;
+ surr_coh_sum = 0.0f;
+ for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
+ {
+ azi_rad = hMeta->directional_meta[i].azimuth[j][k] / 180.0f * EVS_PI;
+ ele_rad = hMeta->directional_meta[i].elevation[j][k] / 180.0f * EVS_PI;
+ vec_len = hMeta->directional_meta[i].energy_ratio[j][k] * energy[j][k];
+
+ /* energy-weighted sum over subframes */
+ x_sum += cosf( azi_rad ) * cosf( ele_rad ) * vec_len;
+ y_sum += sinf( azi_rad ) * cosf( ele_rad ) * vec_len;
+ z_sum += sinf( ele_rad ) * vec_len;
+
+ energy_sum += energy[j][k];
+
+ spread_coh_sum += hMeta->directional_meta[i].spread_coherence[j][k] * energy[j][k];
+ if ( i == 0 )
+ {
+ /* this is in common metadata and not in each direction */
+ surr_coh_sum += hMeta->common_meta.surround_coherence[j][k] * energy[j][k];
+ }
+ }
+
+ /* the data from the combined sub-frames is written into the first sub-frame band */
+ j = 0;
+ hMeta->directional_meta[i].azimuth[j][k] = atan2f( y_sum, x_sum ) / EVS_PI * 180.0f;
+ hMeta->directional_meta[i].elevation[j][k] = atan2f( z_sum, sqrtf( x_sum * x_sum + y_sum * y_sum ) ) / EVS_PI * 180.0f;
+
+ vec_len = sqrtf( x_sum * x_sum + y_sum * y_sum + z_sum * z_sum );
+ hMeta->directional_meta[i].energy_ratio[j][k] = vec_len / ( energy_sum + EPSILON );
+
+ hMeta->directional_meta[i].spread_coherence[j][k] = spread_coh_sum / ( energy_sum + EPSILON );
+ if ( i == 0 )
+ {
+ hMeta->common_meta.surround_coherence[j][k] = surr_coh_sum / ( energy_sum + EPSILON );
+ }
+
+ /* copy the same value to all subframes */
+ for ( j = 1; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
+ {
+ hMeta->directional_meta[i].azimuth[j][k] = hMeta->directional_meta[i].azimuth[0][k];
+ hMeta->directional_meta[i].elevation[j][k] = hMeta->directional_meta[i].elevation[0][k];
+ hMeta->directional_meta[i].energy_ratio[j][k] = hMeta->directional_meta[i].energy_ratio[0][k];
+ hMeta->directional_meta[i].spread_coherence[j][k] = hMeta->directional_meta[i].spread_coherence[0][k];
+ if ( i == 0 )
+ {
+ hMeta->common_meta.surround_coherence[j][k] = hMeta->common_meta.surround_coherence[0][k];
+ }
+ }
+ }
+ }
+
+ for ( k = 0; k < MASA_FREQUENCY_BANDS; k++ )
+ {
+ for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
+ {
+ if ( numDirections == 2 )
+ {
+ hMeta->common_meta.diffuse_to_total_ratio[j][k] = max( 0.0f, 1.0f - hMeta->directional_meta[1].energy_ratio[j][k] - hMeta->directional_meta[0].energy_ratio[j][k] );
+ }
+ else
+ {
+ hMeta->common_meta.diffuse_to_total_ratio[j][k] = max( 0.0f, 1.0f - hMeta->directional_meta[0].energy_ratio[j][k] );
+ }
+ hMeta->common_meta.remainder_to_total_ratio[j][k] = 0.0f;
+ }
+ }
+
+ return;
+}
+
+
+/*-------------------------------------------------------------------*
+ * copy_masa_metadata_subframe()
+ *
+ * Copy MASA metadata frame subframe contents
+ *-------------------------------------------------------------------*/
+
+static void copy_masa_metadata_subframe(
+ const MASA_METADATA_HANDLE hMetaFrom, /* i : MASA frame metdata to be copied */
+ const uint8_t sfFrom, /* i : subframe index of the copy source */
+ MASA_METADATA_HANDLE hMetaTo, /* o : MASA frame metadata copy destination */
+ const uint8_t sfTo /* i : subframe index of the copy target */
+)
+{
+ uint8_t dir;
+
+ /* directional metadata */
+ for ( dir = 0; dir < MASA_MAXIMUM_DIRECTIONS; dir++ )
+ {
+ mvr2r( hMetaFrom->directional_meta[dir].azimuth[sfFrom], hMetaTo->directional_meta[dir].azimuth[sfTo], MASA_FREQUENCY_BANDS );
+ mvr2r( hMetaFrom->directional_meta[dir].elevation[sfFrom], hMetaTo->directional_meta[dir].elevation[sfTo], MASA_FREQUENCY_BANDS );
+ mvr2r( hMetaFrom->directional_meta[dir].energy_ratio[sfFrom], hMetaTo->directional_meta[dir].energy_ratio[sfTo], MASA_FREQUENCY_BANDS );
+ mvr2r( hMetaFrom->directional_meta[dir].spread_coherence[sfFrom], hMetaTo->directional_meta[dir].spread_coherence[sfTo], MASA_FREQUENCY_BANDS );
+ }
+
+ /* common metadata */
+ mvr2r( hMetaFrom->common_meta.diffuse_to_total_ratio[sfFrom], hMetaTo->common_meta.diffuse_to_total_ratio[sfTo], MASA_FREQUENCY_BANDS );
+ mvr2r( hMetaFrom->common_meta.surround_coherence[sfFrom], hMetaTo->common_meta.surround_coherence[sfTo], MASA_FREQUENCY_BANDS );
+ mvr2r( hMetaFrom->common_meta.remainder_to_total_ratio[sfFrom], hMetaTo->common_meta.remainder_to_total_ratio[sfTo], MASA_FREQUENCY_BANDS );
+
+ return;
+}
+
+
+/*-------------------------------------------------------------------*
+ * copy_masa_metadata()
+ *
+ * Copy MASA metada frame contents
+ *-------------------------------------------------------------------*/
+
+static void copy_masa_metadata(
+ const MASA_METADATA_HANDLE hMetaFrom, /* i : MASA frame metadata to be copied */
+ MASA_METADATA_HANDLE hMetaTo /* o : MASA frame metadata copy destination */
+)
+{
+ uint8_t sf, byte_idx;
+
+ /* descriptive metadata */
+ for ( byte_idx = 0; byte_idx < 8; byte_idx++ )
+ {
+ hMetaTo->descriptive_meta.formatDescriptor[byte_idx] = hMetaFrom->descriptive_meta.formatDescriptor[byte_idx];
+ }
+
+ hMetaTo->descriptive_meta.numberOfDirections = hMetaFrom->descriptive_meta.numberOfDirections;
+ hMetaTo->descriptive_meta.numberOfChannels = hMetaFrom->descriptive_meta.numberOfChannels;
+ hMetaTo->descriptive_meta.sourceFormat = hMetaFrom->descriptive_meta.sourceFormat;
+ hMetaTo->descriptive_meta.transportDefinition = hMetaFrom->descriptive_meta.transportDefinition;
+ hMetaTo->descriptive_meta.channelAngle = hMetaFrom->descriptive_meta.channelAngle;
+ hMetaTo->descriptive_meta.channelDistance = hMetaFrom->descriptive_meta.channelDistance;
+ hMetaTo->descriptive_meta.channelLayout = hMetaFrom->descriptive_meta.channelLayout;
+
+ /* directional and common metadata */
+ for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )
+ {
+ copy_masa_metadata_subframe( hMetaFrom, sf, hMetaTo, sf );
+ }
+
+ return;
+}
+
+
+/*-------------------------------------------------------------------*
+ * are_masa_subframes_similar()
+ *
+ * Compare the similarity of MASA metadata in two sub-frames
+ *-------------------------------------------------------------------*/
+
+/* r: similarity decision */
+static uint8_t are_masa_subframes_similar(
+ const MASA_METADATA_HANDLE frame1, /* i : MASA metadata frame 1 */
+ const uint8_t sf1_idx, /* i : index of the subframe of frame1 to inspect */
+ const MASA_METADATA_HANDLE frame2, /* i : MASA metadata frame 2 */
+ const uint8_t sf2_idx /* i : index of the subframe of frame2 to inspect */
+)
+{
+ uint8_t num_dir;
+ uint8_t dir;
+ uint8_t band_idx;
+ uint8_t sf_differ;
+
+ num_dir = frame1->descriptive_meta.numberOfDirections;
+ dir = 0;
+ band_idx = 0;
+ sf_differ = FALSE;
+
+ if ( num_dir != frame2->descriptive_meta.numberOfDirections )
+ {
+ sf_differ = TRUE;
+ }
+ else
+ {
+ /* check per-direction metadata */
+ dir = 0;
+ band_idx = 0;
+
+ while ( ( sf_differ == FALSE ) && ( dir <= num_dir ) )
+ {
+ band_idx = 0;
+ while ( ( sf_differ == FALSE ) && ( band_idx < MASA_FREQUENCY_BANDS ) )
+ {
+ float azi_dif;
+ azi_dif = fabsf( frame1->directional_meta[dir].azimuth[sf1_idx][band_idx] - frame2->directional_meta[dir].azimuth[sf2_idx][band_idx] );
+ azi_dif = azi_dif > 180.0f ? 360.0f - azi_dif : azi_dif;
+
+ if ( azi_dif > MASA_ANGLE_TOLERANCE )
+ {
+ sf_differ = TRUE;
+ break;
+ }
+
+ if ( fabsf( frame1->directional_meta[dir].elevation[sf1_idx][band_idx] - frame2->directional_meta[dir].elevation[sf2_idx][band_idx] ) > MASA_ANGLE_TOLERANCE )
+ {
+ sf_differ = TRUE;
+ break;
+ }
+
+ if ( fabsf( frame1->directional_meta[dir].energy_ratio[sf1_idx][band_idx] - frame2->directional_meta[dir].energy_ratio[sf2_idx][band_idx] ) > MASA_RATIO_TOLERANCE )
+ {
+ sf_differ = TRUE;
+ break;
+ }
+
+ if ( fabsf( frame1->directional_meta[dir].spread_coherence[sf1_idx][band_idx] - frame2->directional_meta[dir].spread_coherence[sf2_idx][band_idx] ) > MASA_COHERENCE_TOLERANCE )
+ {
+ sf_differ = TRUE;
+ break;
+ }
+
+ band_idx++;
+ }
+ dir++;
+ }
+
+ /* check the common metadata */
+ while ( ( sf_differ == FALSE ) && ( band_idx < MASA_FREQUENCY_BANDS ) )
+ {
+ if ( fabsf( frame1->common_meta.surround_coherence[sf1_idx][band_idx] - frame2->common_meta.surround_coherence[sf2_idx][band_idx] ) > MASA_COHERENCE_TOLERANCE )
+ {
+ sf_differ = TRUE;
+ break;
+ }
+
+ band_idx++;
+ }
+ }
+
+ /* TODO: a nicer negation */ // VE: ??
+ if ( sf_differ )
+ {
+ return FALSE;
+ }
+ else
+ {
+ return TRUE;
+ }
+}
+
+
+/*-------------------------------------------------------------------*
+ * detect_framing_async()
+ *
+ * Compare the similarity of MASA metadata in two sub-frames
+ * Analysis result is stored in hMasa->data.sync_state, and
+ * potentially hMasa->masaMetadata is modified
+ *-------------------------------------------------------------------*/
+
+static void detect_framing_async(
+ MASA_ENCODER_HANDLE hMasa /* i/o: MASA encoder structure */
+)
+{
+ MASA_METADATA_HANDLE current_meta;
+ MASA_METADATA_HANDLE previous_meta;
+ MASA_SYNC_HANDLE sync_state;
+ MASA_FRAME_MODE frame_mode;
+ uint8_t n_sim_start, n_sim_stop, sf_idx;
+ uint8_t found_offset;
+
+ current_meta = &( hMasa->masaMetadata ); /* metadata from current frame */
+ sync_state = &( hMasa->data.sync_state ); /* synchronization structure */
+ previous_meta = &( sync_state->previous_metadata );
+
+ /* check current frame, how many are similar from the start and from the end */
+ n_sim_start = 1;
+ for ( sf_idx = n_sim_start; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
+ {
+ if ( are_masa_subframes_similar( current_meta, 0, current_meta, sf_idx ) == TRUE )
+ {
+ n_sim_start = sf_idx + 1;
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ /* number of similar sub-frames starting from the end of the frame */
+ if ( n_sim_start == MAX_PARAM_SPATIAL_SUBFRAMES ) /* shortcut */
+ {
+ n_sim_stop = n_sim_start;
+ }
+ else
+ {
+ n_sim_stop = 1;
+ for ( sf_idx = 2; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
+ {
+ /* we need to check only the two middle sub-frames, as all being the same would have taken the shortcut above */
+ if ( are_masa_subframes_similar( current_meta, MAX_PARAM_SPATIAL_SUBFRAMES - 1, current_meta, MAX_PARAM_SPATIAL_SUBFRAMES - sf_idx ) == TRUE )
+ {
+ n_sim_stop = sf_idx;
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+
+ frame_mode = MASA_FRAME_4SF; /* default mode: 4sf */
+ if ( sync_state->prev_offset > MAX_PARAM_SPATIAL_SUBFRAMES - 2 )
+ {
+ /* earlier offset was large => reset the offset */
+ found_offset = 0;
+ }
+ else
+ {
+ /* keep previous offset unless something else is found. alternatively, we could reset always */
+ found_offset = sync_state->prev_offset;
+ }
+
+ if ( ( n_sim_start == MAX_PARAM_SPATIAL_SUBFRAMES ) && ( n_sim_stop == MAX_PARAM_SPATIAL_SUBFRAMES ) )
+ {
+ /* full frame consists of similar sub-frames */
+ frame_mode = MASA_FRAME_1SF;
+ if ( ( sync_state->prev_sim_stop != 0 ) && ( are_masa_subframes_similar( current_meta, 0, previous_meta, MAX_PARAM_SPATIAL_SUBFRAMES - 1 ) == TRUE ) )
+ {
+ /* > 4 sub-frames of similar data */
+ if ( sync_state->prev_sim_stop < 3 )
+ {
+ /* can nicely align the framing with the earlier data and a small offset */
+ found_offset = sync_state->prev_sim_stop;
+ }
+ else
+ {
+ /* too many similar sub-frames to determine the offset accurately => keep earlier value */
+ found_offset = sync_state->prev_offset;
+ }
+ }
+ else
+ {
+ /* earlier window was different => reset the offset */
+ found_offset = 0;
+ }
+ }
+ else if ( n_sim_stop == 3 )
+ {
+ /* first sub-frame different that the rest 3
+ => make a risky guess that the future sf would be the same too and we're in an offset case */
+ frame_mode = MASA_FRAME_1SF;
+ found_offset = 3;
+ }
+ else if ( ( sync_state->prev_sim_stop > 0 ) && ( are_masa_subframes_similar( current_meta, 0, previous_meta, MAX_PARAM_SPATIAL_SUBFRAMES - 1 ) == TRUE ) )
+ {
+ /* seeing data similar to past */
+ if ( ( n_sim_start > 1 ) && ( n_sim_start + sync_state->prev_sim_stop >= MAX_PARAM_SPATIAL_SUBFRAMES ) )
+ {
+ /* with the past, would have at least one long frame similar subframes */
+ frame_mode = MASA_FRAME_1SF;
+
+ if ( sync_state->prev_offset == 0 )
+ {
+ found_offset = min( 2, sync_state->prev_sim_stop );
+ }
+ else
+ {
+ found_offset = sync_state->prev_offset;
+ }
+ }
+ }
+
+ /* keep the original contents of the frame, but then perform interpolation later */
+ /* just copy current frame to storage */
+ copy_masa_metadata( current_meta, previous_meta );
+
+ sync_state->prev_sim_stop = n_sim_stop;
+ sync_state->prev_offset = found_offset;
+ sync_state->frame_mode = frame_mode;
+
+ return;
+}
+#endif
+
+
#ifdef MASA_AND_OBJECTS
/*-------------------------------------------------------------------*
* ivas_merge_masa_metadata()
@@ -2062,8 +2560,6 @@ void ivas_merge_masa_metadata(
float energyTimesRatioISM;
float energyTimesRatioMASA[2];
float total_diff_nrg;
-
-
int16_t brange[2];
float eneBand;
float energyMerged[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
@@ -2178,7 +2674,7 @@ void ivas_merge_masa_metadata(
static void quantize_ratio_ism_vector(
- float *ratio_ism,
+ const float *ratio_ism,
int16_t *idx,
const int16_t nchan_ism,
const float masa_to_total_energy_ratio,
@@ -2312,21 +2808,21 @@ static void quantize_ratio_ism_vector(
static int16_t index_slice_enum(
const int16_t *ratio_ism_idx,
- int16_t no_ism )
+ const int16_t nchan_ism )
{
int16_t i;
int16_t x, index;
int16_t base;
- if ( no_ism == 2 )
+ if ( nchan_ism == 2 )
{
index = ratio_ism_idx[0];
}
else
{
- x = ratio_ism_idx[no_ism - 2];
+ x = ratio_ism_idx[nchan_ism - 2];
base = 10;
- for ( i = no_ism - 3; i >= 0; i-- )
+ for ( i = nchan_ism - 3; i >= 0; i-- )
{
x += ratio_ism_idx[i] * base;
base *= 10;
@@ -2336,7 +2832,7 @@ static int16_t index_slice_enum(
i = 0;
while ( i <= x )
{
- if ( valid_ratio_index( i, 7, no_ism - 1 ) )
+ if ( valid_ratio_index( i, 7, nchan_ism - 1 ) )
{
index++;
}
@@ -2348,10 +2844,11 @@ static int16_t index_slice_enum(
return index;
}
+
static void transform_difference_index(
- int16_t *diff_idx,
+ const int16_t *diff_idx,
int16_t *idx,
- int16_t len )
+ const int16_t len )
{
int16_t i;
for ( i = 0; i < len; i++ )
@@ -2365,36 +2862,40 @@ static void transform_difference_index(
idx[i] = 2 * diff_idx[i] - 1;
}
}
+
return;
}
static void transform_index_and_GR_encode(
- int16_t *diff_idx, /* i: differenc eindex to encode */
- int16_t len, /*i: input length */
- int16_t GR_order, /* i: GR order */
- BSTR_ENC_HANDLE hMetaData /* i/o: bitstream */
+ int16_t *diff_idx, /* i : differenc eindex to encode */
+ const int16_t len, /* i : input length */
+ const int16_t GR_order, /* i : GR order */
+ BSTR_ENC_HANDLE hMetaData /* i/o: bitstream */
)
{
int16_t i;
int16_t idx[IVAS_MAX_NUM_OBJECTS];
+
/* transform difference index into positive */
transform_difference_index( diff_idx, idx, len );
- /* GR encoding */
+ /* GR encoding */
for ( i = 0; i < len; i++ )
{
ivas_qmetadata_encode_extended_gr( hMetaData, idx[i], 100, GR_order );
}
+
return;
}
+
static int16_t try_differential(
- int16_t numCodingBands,
+ const int16_t numCodingBands,
const float *masa_to_total_energy_ratio,
- int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],
- int16_t no_ism,
- int16_t bits_index,
+ const int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],
+ const int16_t nchan_ism,
+ const int16_t bits_index,
int16_t *p_b_signif )
{
int16_t b, i;
@@ -2403,28 +2904,31 @@ static int16_t try_differential(
int16_t ratio_ism_idx_ref[MAX_NUM_OBJECTS];
int16_t diff_idx[MAX_NUM_OBJECTS];
-
b_signif = 0;
while ( ( b_signif < numCodingBands ) && ( masa_to_total_energy_ratio[b_signif] >= MASA2TOTAL_THR ) )
{
b_signif++;
}
+
nbits0 = 0;
+
if ( b_signif < numCodingBands )
{
nbits0 = bits_index;
- mvs2s( ratio_ism_idx[b_signif], ratio_ism_idx_ref, no_ism );
+ mvs2s( ratio_ism_idx[b_signif], ratio_ism_idx_ref, nchan_ism );
+
for ( b = b_signif + 1; b < numCodingBands; b++ )
{
if ( masa_to_total_energy_ratio[b] < MASA2TOTAL_THR )
{
- v_sub_s( ratio_ism_idx[b], ratio_ism_idx_ref, diff_idx, no_ism );
- mvs2s( ratio_ism_idx[b], ratio_ism_idx_ref, no_ism );
+ v_sub_s( ratio_ism_idx[b], ratio_ism_idx_ref, diff_idx, nchan_ism );
+ mvs2s( ratio_ism_idx[b], ratio_ism_idx_ref, nchan_ism );
+
/* transform difference index into positive */
- transform_difference_index( diff_idx, diff_idx, no_ism - 1 );
- /* GR encoding */
+ transform_difference_index( diff_idx, diff_idx, nchan_ism - 1 );
- for ( i = 0; i < no_ism - 1; i++ )
+ /* GR encoding */
+ for ( i = 0; i < nchan_ism - 1; i++ )
{
nbits0 += ivas_qmetadata_encode_extended_gr_length( diff_idx[i], 100, 0 );
}
@@ -2432,17 +2936,19 @@ static int16_t try_differential(
}
}
*p_b_signif = b_signif;
+
return nbits0;
}
+
static void differential_coding_first_subframe(
BSTR_ENC_HANDLE hMetaData,
const float *masa_to_total_energy_ratio,
- int16_t b_signif,
- int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],
- int16_t no_ism,
- int16_t numCodingBands,
- int16_t bits_index )
+ const int16_t b_signif,
+ const int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],
+ const int16_t nchan_ism,
+ const int16_t numCodingBands,
+ const int16_t bits_index )
{
int16_t index, b;
int16_t ratio_ism_idx_ref[MAX_NUM_OBJECTS];
@@ -2450,31 +2956,38 @@ static void differential_coding_first_subframe(
/* differential encoding*/
push_next_indice( hMetaData, 0, 1 );
+
if ( b_signif < numCodingBands )
{
- index = index_slice_enum( ratio_ism_idx[b_signif], no_ism );
+ index = index_slice_enum( ratio_ism_idx[b_signif], nchan_ism );
push_next_indice( hMetaData, index, bits_index );
- mvs2s( ratio_ism_idx[b_signif], ratio_ism_idx_ref, no_ism );
+
+ mvs2s( ratio_ism_idx[b_signif], ratio_ism_idx_ref, nchan_ism );
+
for ( b = b_signif + 1; b < numCodingBands; b++ )
{
if ( masa_to_total_energy_ratio[b] < MASA2TOTAL_THR )
{
- v_sub_s( ratio_ism_idx[b], ratio_ism_idx_ref, diff_idx, no_ism );
- mvs2s( ratio_ism_idx[b], ratio_ism_idx_ref, no_ism );
+ v_sub_s( ratio_ism_idx[b], ratio_ism_idx_ref, diff_idx, nchan_ism );
+ mvs2s( ratio_ism_idx[b], ratio_ism_idx_ref, nchan_ism );
+
/* transform difference index into positive */
- transform_index_and_GR_encode( diff_idx, no_ism - 1, 0, hMetaData );
+ transform_index_and_GR_encode( diff_idx, nchan_ism - 1, 0, hMetaData );
}
}
}
+
+ return;
}
+
static void independent_coding_ratio_ism_idx(
- int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], /* i: ISM ratios */
- const float *masa_to_total_energy_ratio, /* i: MASA to total ratios */
- int16_t no_ism, /* i: number of objects */
- int16_t numCodingBands, /* i: number of subbands */
- int16_t bits_index, /* i: number of bits per index */
- BSTR_ENC_HANDLE hMetaData /* i/o: bitstream */
+ const int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], /* i : ISM ratios */
+ const float *masa_to_total_energy_ratio, /* i : MASA to total ratios */
+ const int16_t nchan_ism, /* i : number of objects */
+ const int16_t numCodingBands, /* i : number of subbands */
+ const int16_t bits_index, /* i : number of bits per index */
+ BSTR_ENC_HANDLE hMetaData /* i/o: bitstream */
)
{
int16_t b, index;
@@ -2483,32 +2996,38 @@ static void independent_coding_ratio_ism_idx(
{
if ( masa_to_total_energy_ratio[b] < MASA2TOTAL_THR )
{
- index = index_slice_enum( ratio_ism_idx[b], no_ism );
+ index = index_slice_enum( ratio_ism_idx[b], nchan_ism );
push_next_indice( hMetaData, index, bits_index );
}
}
+
+ return;
}
+
static void remove_sep_obj(
- int16_t *diff_idx, /* i/o: array of difference of indexes */
- int16_t no_ism, /* i: number of objects */
- int16_t idx_sep_obj /* i: index of separated object, to be taken out of array */
+ int16_t *diff_idx, /* i/o: array of difference of indexes */
+ const int16_t nchan_ism, /* i : number of objects */
+ const int16_t idx_sep_obj /* i : index of separated object, to be taken out of array */
)
{
int16_t i;
- for ( i = idx_sep_obj; i < no_ism - 1; i++ )
+
+ for ( i = idx_sep_obj; i < nchan_ism - 1; i++ )
{
diff_idx[i] = diff_idx[i + 1];
}
+
return;
}
+
static void estimate_bits_subband_ism_ratio(
- int16_t *ratio_ism_idx,
- int16_t *ratio_ism_idx_ref, /* ( i/o ) */
- int16_t no_ism,
- int16_t shift_one,
- int16_t idx_sep_obj,
+ const int16_t *ratio_ism_idx,
+ const int16_t *ratio_ism_idx_ref, /* ( i/o ) */
+ const int16_t nchan_ism,
+ const int16_t shift_one,
+ const int16_t idx_sep_obj,
int16_t *p_nbits0,
int16_t *p_nbits1 )
{
@@ -2518,23 +3037,23 @@ static void estimate_bits_subband_ism_ratio(
nbits0 = 0;
nbits1 = 0;
+
/* take difference with respect to previous subframe */
- v_sub_s( ratio_ism_idx, ratio_ism_idx_ref, diff_idx, no_ism );
+ v_sub_s( ratio_ism_idx, ratio_ism_idx_ref, diff_idx, nchan_ism );
if ( shift_one )
{
- remove_sep_obj( diff_idx, no_ism, idx_sep_obj );
+ remove_sep_obj( diff_idx, nchan_ism, idx_sep_obj );
}
/* transform difference index into positive */
- transform_difference_index( diff_idx, diff_idx, no_ism - 1 - shift_one );
+ transform_difference_index( diff_idx, diff_idx, nchan_ism - 1 - shift_one );
/* GR encoding */
- for ( i = 0; i < no_ism - 1 - shift_one; i++ )
+ for ( i = 0; i < nchan_ism - 1 - shift_one; i++ )
{
nbits0 += ivas_qmetadata_encode_extended_gr_length( diff_idx[i], 100, 0 );
nbits1 += ivas_qmetadata_encode_extended_gr_length( diff_idx[i], 100, 1 );
}
-
*p_nbits0 = nbits0;
*p_nbits1 = nbits1;
@@ -2543,11 +3062,11 @@ static void estimate_bits_subband_ism_ratio(
static int16_t encode_ratio_ism_subframe(
- int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],
+ const int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],
const int16_t nchan_ism,
const int16_t numCodingBands,
const int16_t sf,
- int16_t ratio_ism_idx_prev_sf[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],
+ const int16_t ratio_ism_idx_prev_sf[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],
BSTR_ENC_HANDLE hMetaData,
const float *masa_to_total_energy_ratio,
const int16_t shift_one,
@@ -2557,7 +3076,6 @@ static int16_t encode_ratio_ism_subframe(
int16_t diff_idx[MAX_NUM_OBJECTS];
int16_t nbits, nbits0, nbits1, GR_order, GR_order_sb, bits_pos0;
int16_t differential_subframe;
-
int16_t ratio_ism_idx_ref[MAX_NUM_OBJECTS];
int16_t bits_index;
int16_t nbits00, nbits11;
@@ -3058,10 +3576,8 @@ static void ivas_encode_masaism_metadata(
}
}
-
calculate_nbits_meta( hMasa->data.nchan_ism, hMasa->data.q_energy_ratio_ism, hQMetaData->masa_to_total_energy_ratio, numSf, numCodingBands, bits_ism, idx_separated_object, ism_imp );
-
/* quantize directions */
for ( obj = 0; obj < hMasa->data.nchan_ism; obj++ )
{
diff --git a/lib_enc/ivas_mc_param_enc.c b/lib_enc/ivas_mc_param_enc.c
index 1409683ba2e41bb301005afd0fea3bf06133d581..db9945d0cec3cc358dcec3be5c7ddd917e750ad7 100644
--- a/lib_enc/ivas_mc_param_enc.c
+++ b/lib_enc/ivas_mc_param_enc.c
@@ -146,7 +146,7 @@ ivas_error ivas_param_mc_enc_open(
}
/* Allocate and initialize FB mixer handle */
- if ( ( error = ivas_FB_mixer_open( &( hParamMC->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_FB_mixer_open( &( hParamMC->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -360,14 +360,20 @@ ivas_error ivas_param_mc_enc_reconfig(
*------------------------------------------------------------------------*/
void ivas_param_mc_enc_close(
- PARAM_MC_ENC_HANDLE hParamMC, /* i/o: Parametric MC encoder handle */
+ PARAM_MC_ENC_HANDLE *hParamMC, /* i/o: Parametric MC encoder handle */
const int32_t sampling_rate )
{
- ivas_param_mc_metadata_close( &hParamMC->hMetadataPMC );
+ if ( hParamMC == NULL || *hParamMC == NULL )
+ {
+ return;
+ }
+
+ ivas_param_mc_metadata_close( &( *hParamMC )->hMetadataPMC );
- ivas_FB_mixer_close( &hParamMC->hFbMixer, sampling_rate );
+ ivas_FB_mixer_close( &( *hParamMC )->hFbMixer, sampling_rate, 0 );
- free( hParamMC );
+ free( ( *hParamMC ) );
+ ( *hParamMC ) = NULL;
return;
}
@@ -380,10 +386,10 @@ void ivas_param_mc_enc_close(
*------------------------------------------------------------------------*/
void ivas_param_mc_enc(
- Encoder_Struct *st_ivas, /* i/o: IVAS Encoder handle */
- BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */
- float data_f[][L_FRAME48k], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */
- const int16_t input_frame /* i : input frame length */
+ Encoder_Struct *st_ivas, /* i/o: IVAS Encoder handle */
+ BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */
+ float data_f[][L_FRAME48k], /* i/o: input: CICP6, CICP12, CICP14, CICP16 or CICP19 MC data */
+ const int16_t input_frame /* i : input frame length */
)
{
int16_t k;
diff --git a/lib_enc/ivas_mcmasa_enc.c b/lib_enc/ivas_mcmasa_enc.c
index 4fdf162955b2d9c148dab181d1c087794fe48b3a..866e4e176c9b0f915d58f87ff6d993486652c258 100644
--- a/lib_enc/ivas_mcmasa_enc.c
+++ b/lib_enc/ivas_mcmasa_enc.c
@@ -110,7 +110,7 @@ ivas_error ivas_mcmasa_enc_open(
assert( st_ivas->hMasa != NULL && "MASA encoder handle is not present" );
hMasa = st_ivas->hMasa;
- if ( NULL == ( hMcMasa = (MCMASA_ENC_HANDLE) malloc( sizeof( MCMASA_ENC_DATA ) ) ) )
+ if ( ( hMcMasa = (MCMASA_ENC_HANDLE) malloc( sizeof( MCMASA_ENC_DATA ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
}
@@ -194,7 +194,7 @@ ivas_error ivas_mcmasa_enc_open(
}
/* Allocate and initialize FB mixer handle */
- if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixer ), input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -203,9 +203,16 @@ ivas_error ivas_mcmasa_enc_open(
if ( hMcMasa->separateChannelEnabled )
{
/* TD Energy calculation with LP */
- hMcMasa->delay_buffer_lfe[0] = (float *) malloc( NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( float ) );
+ if ( ( hMcMasa->delay_buffer_lfe[0] = (float *) malloc( NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
+ }
set_zero( hMcMasa->delay_buffer_lfe[0], NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) );
- hMcMasa->delay_buffer_lfe[1] = (float *) malloc( NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( float ) );
+
+ if ( ( hMcMasa->delay_buffer_lfe[1] = (float *) malloc( NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
+ }
set_zero( hMcMasa->delay_buffer_lfe[1], NS2SA( input_Fs, DELAY_DIRAC_ENC_CMP_NS + DIRAC_SLOT_ENC_NS ) );
hMcMasa->hFbMixerLfe = NULL;
}
@@ -217,7 +224,7 @@ ivas_error ivas_mcmasa_enc_open(
return error;
}
- if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixerLfe ), input_Fs, fb_cfgLfe ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_FB_mixer_open( &( hMcMasa->hFbMixerLfe ), input_Fs, fb_cfgLfe, 0 ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -235,7 +242,10 @@ ivas_error ivas_mcmasa_enc_open(
bufferSize = (int16_t) ( ( input_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES );
for ( i = 0; i < 2; i++ )
{
- hMcMasa->lfeAnaRingBuffer[i] = (float *) malloc( bufferSize * sizeof( float ) );
+ if ( ( hMcMasa->lfeAnaRingBuffer[i] = (float *) malloc( bufferSize * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
+ }
set_zero( hMcMasa->lfeAnaRingBuffer[i], bufferSize );
hMcMasa->lowpassSum[i] = 0.0f;
}
@@ -249,33 +259,56 @@ ivas_error ivas_mcmasa_enc_open(
/* intensity 3-dim */
for ( i = 0; i < DIRAC_NUM_DIMS; i++ )
{
- hMcMasa->direction_vector_m[i] = (float **) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( float * ) );
+ if ( ( hMcMasa->direction_vector_m[i] = (float **) malloc( MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
+ }
for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
{
- hMcMasa->direction_vector_m[i][j] = (float *) malloc( hMcMasa->nbands * sizeof( float ) );
+ if ( ( hMcMasa->direction_vector_m[i][j] = (float *) malloc( hMcMasa->nbands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
+ }
}
}
hMcMasa->no_col_avg_diff = (int8_t) ( DIRAC_NO_COL_AVG_DIFF_NS / dirac_slot_ns );
for ( i = 0; i < DIRAC_NUM_DIMS; i++ )
{
- hMcMasa->buffer_intensity_real[i] = (float **) malloc( hMcMasa->no_col_avg_diff * sizeof( float * ) );
+ if ( ( hMcMasa->buffer_intensity_real[i] = (float **) malloc( hMcMasa->no_col_avg_diff * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
+ }
+
for ( j = 0; j < hMcMasa->no_col_avg_diff; j++ )
{
- hMcMasa->buffer_intensity_real[i][j] = (float *) malloc( hMcMasa->nbands * sizeof( float ) );
+ if ( ( hMcMasa->buffer_intensity_real[i][j] = (float *) malloc( hMcMasa->nbands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
+ }
set_zero( hMcMasa->buffer_intensity_real[i][j], hMcMasa->nbands );
}
}
- hMcMasa->buffer_intensity_real_vert = (float **) malloc( hMcMasa->no_col_avg_diff * sizeof( float * ) );
+ if ( ( hMcMasa->buffer_intensity_real_vert = (float **) malloc( hMcMasa->no_col_avg_diff * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
+ }
+
for ( j = 0; j < hMcMasa->no_col_avg_diff; j++ )
{
- hMcMasa->buffer_intensity_real_vert[j] = (float *) malloc( hMcMasa->nbands * sizeof( float ) );
+ if ( ( hMcMasa->buffer_intensity_real_vert[j] = (float *) malloc( hMcMasa->nbands * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
+ }
set_zero( hMcMasa->buffer_intensity_real_vert[j], hMcMasa->nbands );
}
- hMcMasa->buffer_energy = (float *) malloc( hMcMasa->nbands * hMcMasa->no_col_avg_diff * sizeof( float ) );
+ if ( ( hMcMasa->buffer_energy = (float *) malloc( hMcMasa->nbands * hMcMasa->no_col_avg_diff * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
+ }
set_zero( hMcMasa->buffer_energy, hMcMasa->nbands * hMcMasa->no_col_avg_diff );
if ( st_ivas->hEncoderConfig->mc_input_setup == MC_LS_SETUP_5_1 )
@@ -417,8 +450,12 @@ ivas_error ivas_mcmasa_enc_reconfig(
/* bitrate changed, may need to do something */
/* brute-force solution: close McMASA and re-instantiate with new settings */
- ivas_masa_enc_close( st_ivas->hMasa, st_ivas->nchan_transport, st_ivas->hEncoderConfig->ivas_format );
- ivas_mcmasa_enc_close( st_ivas->hMcMasa, st_ivas->hEncoderConfig->input_Fs );
+#ifdef FIX_350_MASA_DELAY_COMP
+ ivas_masa_enc_close( &( st_ivas->hMasa ) );
+#else
+ ivas_masa_enc_close( &( st_ivas->hMasa ), st_ivas->nchan_transport, st_ivas->hEncoderConfig->ivas_format );
+#endif
+ ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs );
/* Determine if to separate some channels from the analysis */
ivas_mcmasa_setNumTransportChannels( &( st_ivas->nchan_transport ), &( st_ivas->hEncoderConfig->element_mode_init ), ivas_total_brate );
@@ -446,28 +483,33 @@ ivas_error ivas_mcmasa_enc_reconfig(
*--------------------------------------------------------------------------*/
void ivas_mcmasa_enc_close(
- MCMASA_ENC_HANDLE hMcMasa, /* i/o: encoder McMASA handle */
- const int32_t input_Fs /* i : input sampling rate */
+ MCMASA_ENC_HANDLE *hMcMasa, /* i/o: encoder McMASA handle */
+ const int32_t input_Fs /* i : input sampling rate */
)
{
int16_t i, j;
- if ( hMcMasa->separateChannelEnabled )
+ if ( hMcMasa == NULL || *hMcMasa == NULL )
+ {
+ return;
+ }
+
+ if ( ( *hMcMasa )->separateChannelEnabled )
{
- free( hMcMasa->delay_buffer_lfe[0] );
- free( hMcMasa->delay_buffer_lfe[1] );
+ free( ( *hMcMasa )->delay_buffer_lfe[0] );
+ free( ( *hMcMasa )->delay_buffer_lfe[1] );
for ( i = 0; i < 2; i++ )
{
- free( hMcMasa->lfeAnaRingBuffer[i] );
+ free( ( *hMcMasa )->lfeAnaRingBuffer[i] );
}
}
- ivas_FB_mixer_close( &hMcMasa->hFbMixer, input_Fs );
+ ivas_FB_mixer_close( &( *hMcMasa )->hFbMixer, input_Fs, 0 );
- if ( !hMcMasa->separateChannelEnabled )
+ if ( !( *hMcMasa )->separateChannelEnabled )
{
- ivas_FB_mixer_close( &hMcMasa->hFbMixerLfe, input_Fs );
+ ivas_FB_mixer_close( &( *hMcMasa )->hFbMixerLfe, input_Fs, 0 );
}
/* intensity 3-dim */
@@ -475,35 +517,36 @@ void ivas_mcmasa_enc_close(
{
for ( j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
{
- free( hMcMasa->direction_vector_m[i][j] );
- hMcMasa->direction_vector_m[i][j] = NULL;
+ free( ( *hMcMasa )->direction_vector_m[i][j] );
+ ( *hMcMasa )->direction_vector_m[i][j] = NULL;
}
- for ( j = 0; j < hMcMasa->no_col_avg_diff; j++ )
+ for ( j = 0; j < ( *hMcMasa )->no_col_avg_diff; j++ )
{
- free( hMcMasa->buffer_intensity_real[i][j] );
- hMcMasa->buffer_intensity_real[i][j] = NULL;
+ free( ( *hMcMasa )->buffer_intensity_real[i][j] );
+ ( *hMcMasa )->buffer_intensity_real[i][j] = NULL;
}
- free( hMcMasa->buffer_intensity_real[i] );
- hMcMasa->buffer_intensity_real[i] = NULL;
+ free( ( *hMcMasa )->buffer_intensity_real[i] );
+ ( *hMcMasa )->buffer_intensity_real[i] = NULL;
- free( hMcMasa->direction_vector_m[i] );
- hMcMasa->direction_vector_m[i] = NULL;
+ free( ( *hMcMasa )->direction_vector_m[i] );
+ ( *hMcMasa )->direction_vector_m[i] = NULL;
}
- for ( j = 0; j < hMcMasa->no_col_avg_diff; j++ )
+ for ( j = 0; j < ( *hMcMasa )->no_col_avg_diff; j++ )
{
- free( hMcMasa->buffer_intensity_real_vert[j] );
- hMcMasa->buffer_intensity_real_vert[j] = NULL;
+ free( ( *hMcMasa )->buffer_intensity_real_vert[j] );
+ ( *hMcMasa )->buffer_intensity_real_vert[j] = NULL;
}
- free( hMcMasa->buffer_intensity_real_vert );
- hMcMasa->buffer_intensity_real_vert = NULL;
+ free( ( *hMcMasa )->buffer_intensity_real_vert );
+ ( *hMcMasa )->buffer_intensity_real_vert = NULL;
- free( hMcMasa->buffer_energy );
- hMcMasa->buffer_energy = NULL;
+ free( ( *hMcMasa )->buffer_energy );
+ ( *hMcMasa )->buffer_energy = NULL;
- free( hMcMasa );
+ free( ( *hMcMasa ) );
+ ( *hMcMasa ) = NULL;
return;
}
diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc.c
index 5cbcb57daf4e789f8f308808c5c26b9875083d34..c2c2e284c2ae200d2146122d403ad4acf6f7c1aa 100644
--- a/lib_enc/ivas_mct_core_enc.c
+++ b/lib_enc/ivas_mct_core_enc.c
@@ -51,7 +51,9 @@
*----------------------------------------------------------*/
static void FindChannelRatio(
- MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
+#endif
Encoder_State **sts, /* i/o: encoder state structure */
int16_t chBitRatios[MCT_MAX_CHANNELS], /* o : bit-disctribution channel ratios */
const int16_t nChannels /* i : number of channels to be coded */
@@ -69,7 +71,11 @@ static void FindChannelRatio(
sum_nrg = 0;
for ( i = 0; i < nChannels; i++ )
{
- if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[i]->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && sts[i]->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
sum_nrg += nrg[i];
}
@@ -78,7 +84,11 @@ static void FindChannelRatio(
for ( i = 0; i < nChannels; i++ )
{
- if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[i]->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( sts[i]->mct_chan_mode != MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && sts[i]->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
chRatio = nrg[i] * sum_nrg;
chBitRatios[i] = min( BITRATE_MCT_RATIO_RANGE - 1, max( 1, (uint16_t) ( BITRATE_MCT_RATIO_RANGE * chRatio + 0.5f ) ) );
@@ -87,15 +97,17 @@ static void FindChannelRatio(
{
chBitRatios[i] = 0;
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
else if ( hMCT->num_lfe )
{
assert( sts[i]->mct_chan_mode == MCT_CHAN_MODE_LFE );
chBitRatios[i] = !hMCT->LFE_off;
}
+#endif
}
#ifdef DEBUG_MODE_MDCT
- for ( i = 0; i < nchan; i++ )
+ for ( i = 0; i < nChannels; i++ )
{
dbgwrite( &chBitRatios[i], sizeof( int16_t ), 1, 1, "./res/chBitRatio" );
/* dbgwrite(&chRatio[i], sizeof(float),1,1,"./res/chRatio");*/
@@ -237,6 +249,8 @@ void ivas_mct_core_enc(
total_side_bits = 0;
nCPE = nChannels / CPE_CHANNELS;
+
+ /*in case of odd number of channels*/
if ( ( nCPE * CPE_CHANNELS ) != nChannels )
{
nCPE++;
@@ -255,7 +269,11 @@ void ivas_mct_core_enc(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
- if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE )
+ if ( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ )
{
i++;
continue;
@@ -304,7 +322,11 @@ void ivas_mct_core_enc(
{
st = sts[ch];
- if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && hMCT->LFE_off ) || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && hMCT->LFE_off ) ||
+#endif
+ st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
@@ -332,7 +354,11 @@ void ivas_mct_core_enc(
for ( ch = 0; ch < nChannels; ch++ )
{
- if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ||
+#endif
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
@@ -379,7 +405,11 @@ void ivas_mct_core_enc(
for ( ch = 0; ch < nChannels; ch++ )
{
st = sts[ch];
- if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ||
+#endif
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
@@ -411,7 +441,11 @@ void ivas_mct_core_enc(
for ( ch = 0; ch < nChannels; ch++ )
{
st = sts[ch];
- if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ||
+#endif
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
@@ -432,7 +466,11 @@ void ivas_mct_core_enc(
for ( ch = 0; ch < nChannels; ch++ )
{
st = sts[ch];
- if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ||
+#endif
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
@@ -445,7 +483,11 @@ void ivas_mct_core_enc(
{
st = sts[ch];
- if ( ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) ||
+#endif
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
@@ -460,7 +502,11 @@ void ivas_mct_core_enc(
write_mct_bitstream( sts, hMCT, nChannels );
- FindChannelRatio( hMCT, sts, chBitRatios, nChannels );
+ FindChannelRatio(
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ hMCT,
+#endif
+ sts, chBitRatios, nChannels );
nAvailBits = (int16_t) ( ( ivas_total_brate / FRAMES_PER_SEC ) - NBITS_BWIDTH - hMCT->nBitsMCT - lfe_bits );
@@ -488,13 +534,21 @@ void ivas_mct_core_enc(
/*substract bits needed for the bitrate ratios */
for ( ch = 0; ch < nChannels; ch++ )
{
- if ( ( ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ( ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) ||
+#endif
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
nAvailBits -= NBBITS_MCT_RATIO;
}
- nAvailBits -= total_side_bits + ( hMCT->num_lfe ? 1 : 0 ) + hMCT->nchan_out_woLFE; /* if MC 1 extra bit that was initially send to signal LFE_off */
+ nAvailBits -= total_side_bits
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + ( hMCT->num_lfe ? 1 : 0 )
+#endif
+ + hMCT->nchan_out_woLFE; /* if MC 1 extra bit that was initially send to signal LFE_off */
#ifdef DEBUG_MODE_MDCT
dbgwrite( &nAvailBits, sizeof( int16_t ), 1, 1, "./res/availBits" );
@@ -508,7 +562,11 @@ void ivas_mct_core_enc(
for ( ch = 0; ch < nChannels; ch++ )
{
- if ( ( ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ( ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) ||
+#endif
+ sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
@@ -531,15 +589,18 @@ void ivas_mct_core_enc(
{
continue;
}
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( !( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && hMCT->LFE_off ) ) /* indicates LFE with no content */
{
+#endif
st->total_brate = ( st->bits_frame_channel + st->side_bits_frame_channel ) * FRAMES_PER_SEC;
#ifdef DEBUGGING
total_brate += st->total_brate;
#endif
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
}
#ifdef DEBUGGING
if ( hCPE[cpe_id]->hMetaData != NULL )
@@ -551,7 +612,11 @@ void ivas_mct_core_enc(
#ifdef DEBUGGING
format_bits = ( ivas_format == MC_FORMAT ? IVAS_FORMAT_SIGNALING_NBITS + MC_LS_SETUP_BITS : IVAS_FORMAT_SIGNALING_NBITS_SBA + SBA_ORDER_BITS + SBA_PLANAR_BITS );
- mct_bits += hMCT->nBitsMCT + ( hMCT->num_lfe ? 1 : 0 ) + hMCT->nchan_out_woLFE;
+ mct_bits += hMCT->nBitsMCT
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + ( hMCT->num_lfe ? 1 : 0 )
+#endif
+ + hMCT->nchan_out_woLFE;
assert( ( total_brate + ( NBITS_BWIDTH + format_bits + mct_bits + sba_meta + lfe_bits ) * FRAMES_PER_SEC ) == ivas_total_brate );
#endif
diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc.c
index eb7975c1c1110daeb8d8699d8375fd135d4bb661..75191d0a412361b4b8732f3472e12cec085a3ddc 100644
--- a/lib_enc/ivas_mct_enc.c
+++ b/lib_enc/ivas_mct_enc.c
@@ -90,7 +90,61 @@ static void set_mct_enc_params(
return;
}
+/*-------------------------------------------------------------------*
+ * map_input_to_cpe_channels()
+ *
+ * for MC_MODE map input channels to cpe channels
+ * mid channel (ch==2) is mapped to last odd-channel CPE
+ * all channels after LFE are mapped to cpe_id=1 and onwards
+ * E.g. for 5_1 and for 3 CPEs:
+ * cpe_id 0: L=data[0] R=data[1]
+ * cpe_id 1: L=data[4] R=data[5]
+ * cpe_id 2: L=data[2] (mid) R=NULL
+ *-------------------------------------------------------------------*/
+#ifdef ISSUE_24_CLEANUP_MCT_LFE
+static void map_input_to_cpe_channels(
+ const Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ float *pdata[MAX_INPUT_CHANNELS], /* o: mapped input pointers */
+ float data[MCT_MAX_CHANNELS][L_FRAME48k] /* i: input channel data */
+)
+{
+ int16_t i, n;
+
+ i = 0;
+ for ( n = 0; n < LFE_CHANNEL - 1; n++ )
+ {
+ pdata[i] = data[n];
+ i++;
+ }
+
+ if ( st_ivas->hEncoderConfig->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT )
+ {
+ for ( n = LFE_CHANNEL + 1; n < st_ivas->nchan_transport; n++ )
+ {
+ pdata[i] = data[n];
+ i++;
+ }
+ pdata[i] = data[LFE_CHANNEL - 1];
+ }
+ else
+ {
+ for ( ; n < st_ivas->nchan_transport; n++ )
+ {
+ pdata[i] = data[n];
+ i++;
+ }
+ }
+
+ /* odd channel CPE*/
+ if ( ( st_ivas->nchan_transport < st_ivas->nCPE * CPE_CHANNELS ) || ( st_ivas->mc_mode == MC_MODE_MCT && st_ivas->hMCT->nchan_out_woLFE < st_ivas->nCPE * CPE_CHANNELS ) )
+ {
+ pdata[st_ivas->nCPE * CPE_CHANNELS - 1] = NULL;
+ }
+
+ return;
+}
+#endif
/*-------------------------------------------------------------------*
* ivas_mct_enc()
*
@@ -114,6 +168,9 @@ ivas_error ivas_mct_enc(
int16_t max_bwidth;
int32_t ivas_total_brate;
ivas_error error;
+#ifdef ISSUE_24_CLEANUP_MCT_LFE
+ float *pdata[MAX_INPUT_CHANNELS];
+#endif
error = IVAS_ERR_OK;
@@ -143,11 +200,22 @@ ivas_error ivas_mct_enc(
hMCT->p_orig_spectrum_long[cpe_id][n] = orig_spectrum_long[cpe_id][n];
hCPE->hCoreCoder[n]->input_bwidth = hCPE->hCoreCoder[n]->last_input_bwidth; /* updated in BWD */
hCPE->hCoreCoder[n]->bwidth = hCPE->hCoreCoder[n]->last_bwidth; /* updated in BWD */
+#ifdef ISSUE_24_CLEANUP_MCT_LFE
+ /* reset channel mode from previous state*/
+ if ( ( hCPE->cpe_id * CPE_CHANNELS + n ) >= hMCT->nchan_out_woLFE )
+ {
+ hCPE->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_IGNORE;
+ }
+ else
+ {
+ hCPE->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR;
+ }
+#endif
}
}
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
hMCT->LFE_off = 1; /* disable LFE coding by default for the moment */
-
+#endif
/* reconfiguration in case of bitrate switching */
if ( ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate )
{
@@ -163,25 +231,45 @@ ivas_error ivas_mct_enc(
/* set coded audio band-width */
switch_bw = set_bw_mct( st_ivas->hCPE, st_ivas->nCPE );
+#ifdef ISSUE_24_CLEANUP_MCT_LFE
+ /*for MC and MCT remove pointer to LFE input that has been processed seperately */
+ map_input_to_cpe_channels( st_ivas, pdata, data );
+#endif
/* pre-processing */
for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )
{
+#ifdef ISSUE_24_CLEANUP_MCT_LFE
+ if ( ( error = ivas_cpe_enc( st_ivas, cpe_id, pdata[cpe_id * CPE_CHANNELS], pdata[cpe_id * CPE_CHANNELS + 1], input_frame, nb_bits_metadata ) ) != IVAS_ERR_OK )
+#else
if ( ( error = ivas_cpe_enc( st_ivas, cpe_id, data[cpe_id * CPE_CHANNELS], data[cpe_id * CPE_CHANNELS + 1], input_frame, nb_bits_metadata ) ) != IVAS_ERR_OK )
+#endif
{
return error;
}
}
/* joint MCT encoding */
- ivas_mct_core_enc( ivas_format, hMCT, st_ivas->hCPE, hMCT->nchan_out_woLFE + hMCT->num_lfe, ivas_total_brate, switch_bw,
- ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) ? (int16_t) st_ivas->hLFE->lfe_bits : 0, st_ivas->hEncoderConfig->sba_order );
+ ivas_mct_core_enc( ivas_format, hMCT, st_ivas->hCPE,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ hMCT->nchan_out_woLFE + hMCT->num_lfe
+#else
+ hMCT->nchan_out_woLFE
+#endif
+ ,
+ ivas_total_brate, switch_bw,
+ ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT ) ? (int16_t) st_ivas->hLFE->lfe_bits : 0,
+ st_ivas->hEncoderConfig->sba_order );
/* Spectrum quantization and coding */
for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )
{
hCPE = st_ivas->hCPE[cpe_id];
- ivas_mdct_quant_coder( hCPE, hMCT->LFE_off, hMCT->tnsBits[cpe_id], hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], 1 );
+ ivas_mdct_quant_coder( hCPE,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ hMCT->LFE_off,
+#endif
+ hMCT->tnsBits[cpe_id], hMCT->tnsSize[cpe_id], hMCT->p_param[cpe_id], 1 );
/* update input samples buffer (as done in ivas_cpe_enc() for other than MCT coding) */
for ( n = 0; n < CPE_CHANNELS; n++ )
@@ -236,23 +324,30 @@ ivas_error create_mct_enc(
if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT )
{
hMCT->nchan_out_woLFE = st_ivas->hEncoderConfig->nchan_inp - 1; /* LFE channel is coded separately */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
hMCT->num_lfe = TRUE;
+#endif
}
else if ( ivas_format == SBA_FORMAT )
{
hMCT->nchan_out_woLFE = ivas_get_sba_num_TCs( ivas_total_brate, st_ivas->sba_analysis_order );
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
hMCT->num_lfe = FALSE;
+#endif
}
else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC )
{
hMCT->nchan_out_woLFE = ivas_param_mc_getNumTransportChannels( ivas_total_brate, st_ivas->hEncoderConfig->mc_input_setup );
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
hMCT->num_lfe = FALSE;
+#endif
}
else if ( ivas_format == SBA_FORMAT )
{
hMCT->nchan_out_woLFE = ivas_sba_get_nchan( st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar );
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
hMCT->num_lfe = FALSE;
+#endif
}
else
{
@@ -261,21 +356,27 @@ ivas_error create_mct_enc(
cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS;
- /* indicate LFE for appropriate core-coder channel */
for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )
{
for ( n = 0; n < CPE_CHANNELS; n++ )
{
st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) )
{
st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE;
}
+#endif
}
}
/* in case we have an uneven number of transport channels, indicate last channel ID as inactive */
- if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 )
+ if ( ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ ) %
+ 2 )
{
st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE;
}
@@ -361,17 +462,23 @@ ivas_error mct_enc_reconfigure(
if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCT )
{
hMCT->nchan_out_woLFE = st_ivas->hEncoderConfig->nchan_inp - 1; /* LFE channel is coded separately */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
hMCT->num_lfe = TRUE;
+#endif
}
else if ( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_PARAMMC )
{
hMCT->nchan_out_woLFE = ivas_param_mc_getNumTransportChannels( ivas_total_brate, st_ivas->hEncoderConfig->mc_input_setup );
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
hMCT->num_lfe = FALSE;
+#endif
}
else if ( ivas_format == SBA_FORMAT )
{
hMCT->nchan_out_woLFE = st_ivas->nchan_transport;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
hMCT->num_lfe = FALSE;
+#endif
}
else
{
@@ -381,22 +488,28 @@ ivas_error mct_enc_reconfigure(
cp_bitrate = ivas_total_brate / hMCT->nchan_out_woLFE * CPE_CHANNELS;
- /* indicate LFE for appropriate core-coder channel */
for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )
{
st_ivas->hCPE[cpe_id]->element_brate = cp_bitrate;
for ( n = 0; n < CPE_CHANNELS; n++ )
{
st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_REGULAR;
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( ( hMCT->num_lfe > 0 ) && ( ( n + cpe_id * CPE_CHANNELS ) == LFE_CHANNEL ) )
{
st_ivas->hCPE[cpe_id]->hCoreCoder[n]->mct_chan_mode = MCT_CHAN_MODE_LFE;
}
+#endif
}
}
/* in case we have an uneven number of transport channels, indicate last channel ID as inactive */
- if ( ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) % 2 )
+ if ( ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ ) %
+ 2 )
{
st_ivas->hCPE[st_ivas->nCPE - 1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_IGNORE;
}
@@ -413,10 +526,19 @@ ivas_error mct_enc_reconfigure(
st->total_brate = st_ivas->hCPE[cpe_id]->element_brate;
- if ( !( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) )
+ if ( !(
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) ||
+#endif
+ ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) ) )
{
st->bits_frame_nominal = (int16_t) ( st_ivas->hCPE[cpe_id]->element_brate / FRAMES_PER_SEC );
- st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode, st->mct_chan_mode );
+ st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
if ( st->igf )
{
IGFEncSetMode( st->hIGFEnc, st_ivas->hCPE[cpe_id]->element_brate, st->bwidth, st->element_mode, st->rf_mode );
@@ -499,29 +621,35 @@ ivas_error mct_enc_reconfigure(
*-------------------------------------------------------------------------*/
void ivas_mct_enc_close(
- MCT_ENC_HANDLE hMCT /* i/o: MCT encoder structure */
+ MCT_ENC_HANDLE *hMCT /* i/o: MCT encoder structure */
)
{
int16_t n, maxBlocks;
- maxBlocks = hMCT->nchan_out_woLFE / 2;
+ if ( hMCT == NULL || *hMCT == NULL )
+ {
+ return;
+ }
+
+ maxBlocks = ( *hMCT )->nchan_out_woLFE / 2;
for ( n = 0; n < maxBlocks; n++ )
{
- if ( hMCT->hBlockData[n] != NULL )
+ if ( ( *hMCT )->hBlockData[n] != NULL )
{
- if ( hMCT->hBlockData[n]->hStereoMdct != NULL )
+ if ( ( *hMCT )->hBlockData[n]->hStereoMdct != NULL )
{
- free( hMCT->hBlockData[n]->hStereoMdct );
- hMCT->hBlockData[n]->hStereoMdct = NULL;
+ free( ( *hMCT )->hBlockData[n]->hStereoMdct );
+ ( *hMCT )->hBlockData[n]->hStereoMdct = NULL;
}
- free( hMCT->hBlockData[n] );
- hMCT->hBlockData[n] = NULL;
+ free( ( *hMCT )->hBlockData[n] );
+ ( *hMCT )->hBlockData[n] = NULL;
}
}
- free( hMCT );
+ free( ( *hMCT ) );
+ ( *hMCT ) = NULL;
return;
}
@@ -608,30 +736,18 @@ static ivas_error ivas_mc_enc_reconfig(
}
/*De-allocate handles for other MC modes*/
- if ( st_ivas->hParamMC != NULL )
- {
- ivas_param_mc_enc_close( st_ivas->hParamMC, st_ivas->hEncoderConfig->input_Fs );
- st_ivas->hParamMC = NULL;
- }
+ ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs );
/* De-allocate McMasa-related handles */
- if ( st_ivas->hMcMasa != NULL )
- {
- ivas_mcmasa_enc_close( st_ivas->hMcMasa, st_ivas->hEncoderConfig->input_Fs );
- st_ivas->hMcMasa = NULL;
- }
+ ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs );
- if ( st_ivas->hMasa != NULL )
- {
- ivas_masa_enc_close( st_ivas->hMasa, nchan_transport_old, MC_FORMAT );
- st_ivas->hMasa = NULL;
- }
+#ifdef FIX_350_MASA_DELAY_COMP
+ ivas_masa_enc_close( &( st_ivas->hMasa ) );
+#else
+ ivas_masa_enc_close( &( st_ivas->hMasa ), nchan_transport_old, MC_FORMAT );
+#endif
- if ( st_ivas->hQMetaData != NULL )
- {
- ivas_qmetadata_close( &st_ivas->hQMetaData );
- st_ivas->hQMetaData = NULL;
- }
+ ivas_qmetadata_close( &st_ivas->hQMetaData );
}
}
else if ( st_ivas->mc_mode == MC_MODE_PARAMMC )
@@ -645,39 +761,37 @@ static ivas_error ivas_mc_enc_reconfig(
}
else
{
- ivas_param_mc_enc_reconfig( st_ivas );
+ if ( ( error = ivas_param_mc_enc_reconfig( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
/* De-allocate McMasa-related handles */
- if ( st_ivas->hMcMasa != NULL )
- {
- ivas_mcmasa_enc_close( st_ivas->hMcMasa, st_ivas->hEncoderConfig->input_Fs );
- st_ivas->hMcMasa = NULL;
- }
+ ivas_mcmasa_enc_close( &( st_ivas->hMcMasa ), st_ivas->hEncoderConfig->input_Fs );
+
if ( st_ivas->hMasa != NULL )
{
- ivas_masa_enc_close( st_ivas->hMasa, nchan_transport_old, MC_FORMAT );
+#ifdef FIX_350_MASA_DELAY_COMP
+ ivas_masa_enc_close( &( st_ivas->hMasa ) );
+#else
+ ivas_masa_enc_close( &( st_ivas->hMasa ), nchan_transport_old, MC_FORMAT );
+#endif
st_ivas->hMasa = NULL;
}
- if ( st_ivas->hQMetaData != NULL )
- {
- ivas_qmetadata_close( &st_ivas->hQMetaData );
- st_ivas->hQMetaData = NULL;
- }
+ ivas_qmetadata_close( &st_ivas->hQMetaData );
/* De-allocate MCT handle if last mode was MCT */
- if ( last_mc_mode == MC_MODE_MCT && st_ivas->hMCT != NULL && st_ivas->nchan_transport <= CPE_CHANNELS )
+ if ( last_mc_mode == MC_MODE_MCT && st_ivas->nchan_transport <= CPE_CHANNELS )
{
- ivas_mct_enc_close( st_ivas->hMCT );
- st_ivas->hMCT = NULL;
+ ivas_mct_enc_close( &( st_ivas->hMCT ) );
}
if ( last_mc_mode == MC_MODE_MCT && st_ivas->hLFE != NULL )
{
/* LFE handle */
- ivas_lfe_enc_close( st_ivas->hLFE );
- st_ivas->hLFE = NULL;
+ ivas_lfe_enc_close( &( st_ivas->hLFE ) );
}
}
else if ( st_ivas->mc_mode == MC_MODE_MCMASA )
@@ -710,26 +824,14 @@ static ivas_error ivas_mc_enc_reconfig(
}
}
- if ( st_ivas->hParamMC != NULL )
- {
- ivas_param_mc_enc_close( st_ivas->hParamMC, st_ivas->hEncoderConfig->input_Fs );
- st_ivas->hParamMC = NULL;
- }
+ ivas_param_mc_enc_close( &( st_ivas->hParamMC ), st_ivas->hEncoderConfig->input_Fs );
if ( last_mc_mode == MC_MODE_MCT )
{
/* LFE handle */
- if ( st_ivas->hLFE != NULL )
- {
- ivas_lfe_enc_close( st_ivas->hLFE );
- st_ivas->hLFE = NULL;
- }
+ ivas_lfe_enc_close( &( st_ivas->hLFE ) );
- if ( st_ivas->hMCT != NULL )
- {
- ivas_mct_enc_close( st_ivas->hMCT );
- st_ivas->hMCT = NULL;
- }
+ ivas_mct_enc_close( &( st_ivas->hMCT ) );
}
}
@@ -784,10 +886,16 @@ static ivas_error ivas_mc_enc_reconfig(
}
}
- st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode );
+ st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
/* set last core to TCX20 */
st->last_core = TCX_20_CORE;
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
else if ( last_mc_mode == MC_MODE_PARAMMC && st_ivas->mc_mode == MC_MODE_MCT && nchan_transport_old > 2 )
{
#ifdef DEBUGGING
@@ -795,7 +903,7 @@ static ivas_error ivas_mc_enc_reconfig(
#endif
st_ivas->hCPE[1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_LFE;
}
-
+#endif
if ( st_ivas->mc_mode == MC_MODE_MCMASA )
{
ivas_mcmasa_split_brate( st_ivas->hMcMasa->separateChannelEnabled, st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nSCE, st_ivas->nCPE, &new_brate_SCE, &new_brate_CPE );
diff --git a/lib_enc/ivas_mct_enc_mct.c b/lib_enc/ivas_mct_enc_mct.c
index ee0c529b8bab2758c7f97463529bc6ee1db12e90..9c0e43caa0291367f263909b8362439b0f5d4c60 100644
--- a/lib_enc/ivas_mct_enc_mct.c
+++ b/lib_enc/ivas_mct_enc_mct.c
@@ -62,7 +62,11 @@ void getChannelEnergies(
for ( ch = 0; ch < nchan; ch++ )
{
st = sts[ch];
- if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && st->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
L_subframe = st->hTcxEnc->L_frameTCX / nSubframes;
@@ -156,7 +160,11 @@ static void getCorrelationMatrix(
int16_t ch1, ch2, n, nchan;
float tmp;
- nchan = hMCT->nchan_out_woLFE + hMCT->num_lfe;
+ nchan = hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ ;
/* correlation */
for ( ch1 = 0; ch1 < nchan; ch1++ )
@@ -166,8 +174,12 @@ static void getCorrelationMatrix(
xCorrMatrix[ch1][ch2] = 0;
if ( sts[ch1]->core == sts[ch2]->core && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE &&
- sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE &&
- sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE &&
+ sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
int16_t nSubframes = ( sts[ch1]->core == TCX_20_CORE ? 1 : NB_DIV );
int16_t L_subframe = sts[ch1]->hTcxEnc->L_frameTCX / nSubframes;
@@ -225,9 +237,19 @@ static void getBestCorrelation(
*_ch2 = -1;
*max_corr = 0.f;
- for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch1++ )
+ for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ );
+ ch1++ )
{
- for ( ch2 = ch1 + 1; ch2 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch2++ )
+ for ( ch2 = ch1 + 1; ch2 < ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ );
+ ch2++ )
{
if ( fabsf( *max_corr ) < fabsf( xCorrMatrix[ch1][ch2] ) )
{
@@ -308,13 +330,27 @@ static void updateCorrelationMatrix(
int16_t ch1, ch2, n;
/* correlation: */
- for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch1++ )
+ for ( ch1 = 0; ch1 < ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ );
+ ch1++ )
{
- for ( ch2 = ch1; ch2 < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch2++ )
+ for ( ch2 = ch1; ch2 < ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ );
+ ch2++ )
{
if ( sts[ch1]->core == sts[ch2]->core && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE &&
- sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE &&
- sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE &&
+ sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
int16_t nSubframes = ( sts[ch1]->core == TCX_20_CORE ? 1 : NB_DIV );
@@ -341,8 +377,11 @@ static void updateCorrelationMatrix(
static int16_t channelPairToIndex(
const int16_t chIdx1,
const int16_t chIdx2,
- const int16_t nChannels,
+ const int16_t nChannels
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
Encoder_State **sts /* i/o: encoder state structure */
+#endif
)
{
int16_t ch1, ch2;
@@ -354,11 +393,12 @@ static int16_t channelPairToIndex(
{
for ( ch1 = 0; ch1 < ch2; ch1++ )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( sts[ch1]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch2]->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
continue;
}
-
+#endif
if ( ch1 == chIdx1 && ch2 == chIdx2 )
{
return pairIdx;
@@ -398,7 +438,11 @@ static void getGlobalILD(
/*calculate total energy without LFE*/
for ( ch = 0; ch < nchan; ch++ )
{
- if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
meanE += nrg[ch];
cnt++;
@@ -410,7 +454,11 @@ static void getGlobalILD(
meanE = max( meanE / cnt, EPSILON );
for ( ch = 0; ch < nchan; ch++ )
{
- if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
nSubframes = ( sts[ch]->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
L_subframe = sts[ch]->hTcxEnc->L_frameTCX / nSubframes;
@@ -483,11 +531,19 @@ void apply_MCT_enc(
/*Determine active channels*/
for ( ch = 0; ch < nchan; ch++ )
{
- if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
count_active_ch++;
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#else
+ else
+#endif
{
hMCT->mc_global_ild[ch] = 0;
}
@@ -508,8 +564,16 @@ void apply_MCT_enc(
{
for ( ch1 = 0; ch1 < ch2; ch1++ )
{
- if ( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE &&
- sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ &&
+ sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
sumCorrDiff += fabsf( hMCT->lastxCorrMatrix[ch1][ch2] - xCorrMatrix[ch1][ch2] );
}
@@ -600,8 +664,12 @@ void apply_MCT_enc(
}
/* calculate all related values: */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
assert( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_LFE &&
sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_LFE );
+#else
+ assert( sts[ch1]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch2]->mct_chan_mode != MCT_CHAN_MODE_IGNORE );
+#endif
getBlockValues( sts, ch1, ch2, hMCT->hBlockData[currBlockDataCnt], mdst_spectrum, inv_spectrum, inv_mdst_spectrum );
@@ -686,7 +754,11 @@ void apply_MCT_enc(
for ( ch = 0; ch < nchan; ch++ )
{
- if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE )
+ if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE
+#endif
+ )
{
if ( ( !cpEle[ch] ) || hMCT->currBlockDataCnt == 0 )
{
@@ -771,7 +843,11 @@ void write_mct_bitstream(
/* first write core info and overlap mode for all channels */
for ( ch = 0; ch < nchan; ch++ )
{
- if ( ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) && hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE ) &&
+#endif
+ hMCT->currBlockDataCnt && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE )
{
push_next_indice( hBstr, hMCT->mc_global_ild[ch], SMDCT_GLOBAL_ILD_BITS );
}
@@ -781,7 +857,11 @@ void write_mct_bitstream(
{
for ( ch = 0; ch < nchan; ch++ )
{
- if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE && sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE &&
+#endif
+ sts[ch]->mct_chan_mode != MCT_CHAN_MODE_IGNORE )
{
push_next_indice( hBstr, hMCT->lowE_ch[ch], 1 );
}
@@ -794,7 +874,12 @@ void write_mct_bitstream(
hBlock = hMCT->hBlockData[pair];
/*calculate channel pair index and write it to BS*/
- channelPairIndex = channelPairToIndex( hBlock->ch1, hBlock->ch2, nchan, sts );
+ channelPairIndex = channelPairToIndex( hBlock->ch1, hBlock->ch2, nchan
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ sts
+#endif
+ );
push_next_indice( hBstr, channelPairIndex, hMCT->bitsChannelPairIndex );
/*point to encoder states of actual channels to write block pair bits*/
@@ -838,7 +923,11 @@ void mctStereoIGF_enc(
int16_t singleChEle[MCT_MAX_CHANNELS];
L_subframeTCX = 0; /* to avoid compilation warning */
- set_s( singleChEle, 1, hMCT->nchan_out_woLFE + hMCT->num_lfe );
+ set_s( singleChEle, 1, hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ );
for ( b = 0; b < hMCT->currBlockDataCnt; b++ )
{
@@ -889,15 +978,28 @@ void mctStereoIGF_enc(
}
/* channel elements that are coded separately detected */
- if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE + hMCT->num_lfe ) ) != 0 )
+ if ( sum_s( singleChEle, ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ ) ) != 0 )
{
- for ( ch = 0; ch < ( hMCT->nchan_out_woLFE + hMCT->num_lfe ); ch++ )
+ for ( ch = 0; ch < ( hMCT->nchan_out_woLFE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ + hMCT->num_lfe
+#endif
+ );
+ ch++ )
{
if ( singleChEle[ch] )
{
st = sts[ch];
- if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ st->mct_chan_mode == MCT_CHAN_MODE_LFE ||
+#endif
+ st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
continue;
}
diff --git a/lib_enc/ivas_mdct_core_enc.c b/lib_enc/ivas_mdct_core_enc.c
old mode 100644
new mode 100755
index 626dcf2631cee1f65518558caaa04e9a58a22919..62223d9005a36bf4c4b827bd5ce1cab72dc9c556
--- a/lib_enc/ivas_mdct_core_enc.c
+++ b/lib_enc/ivas_mdct_core_enc.c
@@ -88,16 +88,19 @@ static void enc_prm_pre_mdct(
{
writeTCXWindowing( hBstr, st->hTcxCfg->tcx_last_overlap_mode );
}
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->element_mode == IVAS_CPE_MDCT && st->mct_chan_mode != MCT_CHAN_MODE_LFE )
{
+#endif
push_next_indice( hBstr, st->hTcxEnc->kernel_type[0], st->last_core != ACELP_CORE ? 2 : 1 );
if ( st->core == TCX_10_CORE )
{
assert( ( st->hTcxEnc->kernel_type[0] & 1 ) == ( st->hTcxEnc->kernel_type[1] >> 1 ) );
push_next_indice( hBstr, st->hTcxEnc->kernel_type[1] & 1, 1 );
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
st->glr_reset = 0;
#ifdef DEBUG_PLOT_BITS
@@ -288,7 +291,12 @@ static void kernel_switch_update_transforms(
int16_t i, leftOverlap = 0, rightOverlap = 0;
const float *left_win, *right_win;
- tcx_get_windows( hTcxCfg, (int16_t) windowedTimeSignal[0], (int16_t) windowedTimeSignal[1], &leftOverlap, &left_win, &rightOverlap, &right_win, 1, 0 );
+ tcx_get_windows( hTcxCfg, (int16_t) windowedTimeSignal[0], (int16_t) windowedTimeSignal[1], &leftOverlap, &left_win, &rightOverlap, &right_win, 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ 0
+#endif
+ );
if ( speech_TCX != NULL && tcxTransType != TCX_20 && (int16_t) windowedTimeSignal[0] == FULL_OVERLAP && s - leftOverlap > minWindowLen )
{
for ( i = minWindowLen; i >= 0; i-- ) /* outer left folding of shortened long ALDO slope */
@@ -311,7 +319,12 @@ static void kernel_switch_update_transforms(
s = hTcxCfg->tcx5SizeFB; /* obtain 1st TCX5 again */
nSubframes *= 2;
- WindowSignal( hTcxCfg, leftOverlap / 2, RECTANGULAR_OVERLAP, MIN_OVERLAP, &leftOverlap, &rightOverlap, windowedTimeSignal + 2, &s, tcx5Win, 0, 1, 0 );
+ WindowSignal( hTcxCfg, leftOverlap / 2, RECTANGULAR_OVERLAP, MIN_OVERLAP, &leftOverlap, &rightOverlap, windowedTimeSignal + 2, &s, tcx5Win, 0, 1
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ 0
+#endif
+ );
kernel_switch_trafo( tcx5Win, sigR, leftOverlap, s /* L_subfr. */ - ( leftOverlap + rightOverlap ) / 2, rightOverlap, kernelType );
if ( kernelType & 1 ) /* 2nd TCX5 is kernelType 3 */
@@ -576,9 +589,11 @@ void ivas_mdct_core_whitening_enc(
int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* o : number of tns parameters put into prm */
int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to the parameter table */
BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- int16_t *LFE_off, /* o : flag if LFE has zero content */
- const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */
- const int16_t nChannels /* i : total number of coded channels */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ int16_t *LFE_off, /* o : flag if LFE has zero content */
+#endif
+ const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */
+ const int16_t nChannels /* i : total number of coded channels */
)
{
int16_t n, ch, nSubframes, L_subframe, L_subframeTCX, tcx_subframe_coded_lines;
@@ -612,10 +627,14 @@ void ivas_mdct_core_whitening_enc(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( sts[ch]->mct_chan_mode != MCT_CHAN_MODE_LFE )
{
+#endif
stereo_tcx_init_enc( sts[ch] );
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
set_s( tnsSize[ch], 0, 2 );
set_s( tnsBits[ch], 0, 2 );
@@ -655,10 +674,14 @@ void ivas_mdct_core_whitening_enc(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
st = sts[ch];
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE )
{
+#endif
SetTCXModeInfo( st, st->hTranDet, &st->hTcxCfg->tcx_curr_overlap_mode );
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
}
}
@@ -672,12 +695,14 @@ void ivas_mdct_core_whitening_enc(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
st = sts[ch];
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
+#else
+ if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels )
+#endif
{
continue;
}
-
SetCurrentPsychParams( st->core, 0, st->hTcxCfg );
/* tcx ltp analysis on the 12.8kHz weighted speech, saves preproc resampling to sr_core */
@@ -686,13 +711,38 @@ void ivas_mdct_core_whitening_enc(
core_signal_analysis_high_bitrate( new_samples[ch] + L_INP_MEM, T_op[ch], NULL, NULL, st, mdst_spectrum[ch], tnsSize[ch], tnsBits[ch], param_core[ch], <pBits[ch], windowedSignal[ch], st->L_frame, st->hTcxEnc->L_frameTCX, hCPE->last_element_mode, 0 );
/* BWD in MDCT domain */
+#ifndef FIX_MDCT_BASED_BWD
if ( st->hTcxEnc->transform_type[0] == TCX_20 && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP )
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE )
+#else
+ if ( st->mct_chan_mode != MCT_CHAN_MODE_IGNORE )
+#endif
{
bw_detect( st, NULL, st->hTcxEnc->spectrum[0], NULL );
}
}
+#else
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE && st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP )
+#else
+ if ( st->hTcxCfg->tcx_last_overlap_mode != TRANSITION_OVERLAP )
+#endif
+ {
+ nSubframes = ( st->hTcxEnc->tcxMode == TCX_20 ) ? 1 : NB_DIV;
+
+ for ( n = 0; n < nSubframes; n++ )
+ {
+ bw_detect( st, NULL, st->hTcxEnc->spectrum[n], NULL, mct_on );
+
+ if ( nSubframes == NB_DIV && n == 0 )
+ {
+ st->last_input_bwidth = st->input_bwidth;
+ }
+ }
+ }
+#endif
if ( st->last_core == ACELP_CORE ) /* reset past kernel info */
{
@@ -803,7 +853,11 @@ void ivas_mdct_core_whitening_enc(
{
TCX_ENC_HANDLE hTcxEncCh = sts[ch]->hTcxEnc;
- if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE )
+ if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ )
{
hTcxEncCh->kernel_symmetry_past = hTcxEncCh->kernel_type[0] = 0;
@@ -832,7 +886,11 @@ void ivas_mdct_core_whitening_enc(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
- if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE )
+ if ( ( hCPE->cpe_id * CPE_CHANNELS + ch ) >= nChannels
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ )
{
continue;
}
@@ -877,7 +935,11 @@ void ivas_mdct_core_whitening_enc(
}
/* MCT: detect whether there are silent channels and set mct_chan_mode accordingly */
- if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE && mct_on )
+ if (
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ st->mct_chan_mode != MCT_CHAN_MODE_LFE &&
+#endif
+ mct_on )
{
chE_tot = sum_f( chE, NB_DIV );
@@ -894,7 +956,11 @@ void ivas_mdct_core_whitening_enc(
}
/* set low br mode, if possible. Can later be discarded, depending on the stereo mode used for SNS parameter decoding */
- if ( hCPE->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE ) )
+ if ( hCPE->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ ) )
{
sns_low_br_mode = !sts[0]->sp_aud_decision0;
}
@@ -921,7 +987,11 @@ void ivas_mdct_core_whitening_enc(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
param_lpc[ch][0] = ch;
- if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE )
+ if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ )
{
continue;
}
@@ -944,7 +1014,11 @@ void ivas_mdct_core_whitening_enc(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
- if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE )
+ if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ )
{
continue;
}
@@ -972,7 +1046,11 @@ void ivas_mdct_core_whitening_enc(
/* first deinterleave once more */
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
- if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE )
+ if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ )
{
continue;
}
@@ -993,7 +1071,11 @@ void ivas_mdct_core_whitening_enc(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
- if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE )
+ if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ )
{
continue;
}
@@ -1015,8 +1097,9 @@ void ivas_mdct_core_whitening_enc(
}
}
}
-
- /*check whether LFE channel is active*/
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+/*check whether LFE channel is active*/
+#endif
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
/*no need to write last channel bit in case of odd channels*/
@@ -1029,12 +1112,15 @@ void ivas_mdct_core_whitening_enc(
if ( mct_on ) /* signal bits should be written only for MCT*/
{
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
assert( *LFE_off == 1 );
push_next_indice( hBstr, *LFE_off, 1 );
}
- else if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+ else
+#endif
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
{
push_next_indice( hBstr, 1, 1 );
}
@@ -1051,7 +1137,11 @@ void ivas_mdct_core_whitening_enc(
{
st = sts[ch];
- if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( *LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
st->side_bits_frame_channel = 0;
/*dummy initialization to prevent range coder crashing in case all channels are silent and bits are distributed to channel 0 */
@@ -1096,7 +1186,11 @@ void ivas_mdct_core_whitening_enc(
{
st = sts[ch];
- if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( *LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
skipped_first_channel = 1;
continue;
@@ -1110,7 +1204,11 @@ void ivas_mdct_core_whitening_enc(
{
push_next_indice( hBstr, param_lpc[0][0] >> 1, 1 );
- if ( st->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 ) || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE ) )
+ if ( st->element_brate == IVAS_48k && !( ( sts[0]->core == TCX_20 && sts[1]->core == TCX_20 )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ || sts[1]->mct_chan_mode == MCT_CHAN_MODE_LFE
+#endif
+ ) )
{
/* write classifier decision to signal low br mode for SNS encoding, for all other configs, low_br mode is not possible */
push_next_indice( hBstr, sns_low_br_mode, 1 );
@@ -1125,7 +1223,11 @@ void ivas_mdct_core_whitening_enc(
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
st = sts[ch];
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( *LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
continue;
}
@@ -1151,8 +1253,10 @@ void ivas_mdct_core_whitening_enc(
*---------------------------------------------------------------*/
void ivas_mdct_quant_coder(
- CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */
- const int16_t LFE_off, /* i : flag if LFE is inactive */
+ CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ const int16_t LFE_off, /* i : flag if LFE is inactive */
+#endif
int16_t tnsBits[CPE_CHANNELS][NB_DIV], /* i : bits needed for TNS parameters */
int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* i : size of TNS */
int16_t p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to parameter array */
@@ -1198,7 +1302,11 @@ void ivas_mdct_quant_coder(
st = sts[ch];
- if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
ignore_chan[ch] = 1;
continue;
@@ -1258,7 +1366,11 @@ void ivas_mdct_quant_coder(
{
st = sts[ch];
- if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
/*Enable appropriate upadte of tcx_curr_overlap_mode even for uncoded channel index 1*/
L_frameTCX[ch][0] = ( st->core == TCX_10_CORE ) ? st->hTcxEnc->L_frameTCX >> 1 : st->hTcxEnc->L_frameTCX;
@@ -1285,7 +1397,11 @@ void ivas_mdct_quant_coder(
* Generate Bitstream
*---------------------------------------------------------------*/
- if ( ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE ) && LFE_off ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ if ( ( st->mct_chan_mode == MCT_CHAN_MODE_LFE && ( LFE_off ) ) || ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE ) )
+#else
+ if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
+#endif
{
continue;
}
diff --git a/lib_enc/ivas_omasa_enc.c b/lib_enc/ivas_omasa_enc.c
index ee0eadc3e628e1e04b3f3e3b25ef3578966e0450..86b5cbe90ffbb01a1003222300fc587d46f4dffe 100644
--- a/lib_enc/ivas_omasa_enc.c
+++ b/lib_enc/ivas_omasa_enc.c
@@ -215,6 +215,127 @@ void ivas_omasa_enc_close(
}
+#ifdef OMASA_BRATE_SW
+/*--------------------------------------------------------------------------*
+ * ivas_omasa_enc_config()
+ *
+ * oMASA encoder configuration
+ *--------------------------------------------------------------------------*/
+
+ivas_error ivas_omasa_enc_config(
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
+)
+{
+ int16_t k, sce_id, nSCE_old;
+ int32_t ivas_total_brate, ism_total_brate;
+ ISM_MODE ism_mode_old;
+ ENCODER_CONFIG_HANDLE hEncoderConfig;
+ ivas_error error;
+
+ hEncoderConfig = st_ivas->hEncoderConfig;
+ ivas_total_brate = hEncoderConfig->ivas_total_brate;
+ ism_mode_old = st_ivas->ism_mode;
+ nSCE_old = st_ivas->nSCE;
+
+ st_ivas->ism_mode = ivas_omasa_ism_mode_select( ivas_total_brate, hEncoderConfig->nchan_ism );
+ st_ivas->nchan_transport = 2;
+
+ /* reconfiguration in case of bitrate switching */
+ if ( hEncoderConfig->last_ivas_total_brate != ivas_total_brate )
+ {
+ ivas_set_omasa_TC( st_ivas->ism_mode, hEncoderConfig->nchan_ism, &st_ivas->nSCE, &st_ivas->nCPE );
+
+ k = 0;
+ while ( k < SIZE_IVAS_BRATE_TBL && ivas_total_brate != ivas_brate_tbl[k] )
+ {
+ k++;
+ }
+
+ ism_total_brate = 0;
+ for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ )
+ {
+ ism_total_brate += sep_object_brate[k - 2][st_ivas->nSCE - 1];
+ }
+
+ if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
+ {
+ if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, 1, NULL, NULL, NULL, NULL, NULL, NULL, 1 ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
+ {
+ if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nSCE, NULL, NULL, NULL, NULL, NULL, NULL, 1 ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+
+ /* reconfigure core-coders for ISMs */
+ if ( ( error = ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, 1, 2, sep_object_brate[k - 2][st_ivas->nSCE - 1], ivas_total_brate - ism_total_brate, MC_MODE_NONE ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ /* re-write IVAS format signalling - actual 'ism_mode' was not known before */
+ if ( st_ivas->nSCE > 0 )
+ {
+ reset_indices_enc( st_ivas->hSCE[0]->hCoreCoder[0]->hBstr, st_ivas->hSCE[0]->hCoreCoder[0]->hBstr->next_ind );
+ }
+ else
+ {
+ reset_indices_enc( st_ivas->hCPE[0]->hCoreCoder[0]->hBstr, st_ivas->hCPE[0]->hCoreCoder[0]->hBstr->next_ind );
+ }
+
+ ivas_write_format( st_ivas );
+
+ if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->hOMasa == NULL )
+ {
+ if ( ( error = ivas_omasa_enc_open( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC && st_ivas->hOMasa != NULL )
+ {
+ ivas_omasa_enc_close( st_ivas->hOMasa, st_ivas->hEncoderConfig->nchan_ism );
+ st_ivas->hOMasa = NULL;
+ }
+
+ st_ivas->hCPE[0]->element_brate = ivas_total_brate - ism_total_brate;
+
+#ifdef OMASA_UPDATES
+ if ( ivas_total_brate - ism_total_brate >= MIN_BRATE_MDCT_STEREO && ( st_ivas->ism_mode != ISM_MASA_MODE_PARAM ) )
+#else
+ if ( ivas_total_brate - ism_total_brate >= MIN_BRATE_MDCT_STEREO )
+#endif
+ {
+ hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;
+ }
+ else
+ {
+ hEncoderConfig->element_mode_init = IVAS_CPE_DFT;
+ }
+ }
+
+ /* Configure MASA encoder based on frame parameters */
+ if ( ( error = ivas_masa_enc_config( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC )
+ {
+ /* Configure oMASA analysis based on MASA config */
+ ivas_omasa_set_config( st_ivas->hOMasa, st_ivas->hMasa, st_ivas->hEncoderConfig->input_Fs, st_ivas->ism_mode );
+ }
+
+ return IVAS_ERR_OK;
+}
+#endif
+
+
/*--------------------------------------------------------------------------*
* ivas_omasa_set_config()
*
@@ -226,7 +347,7 @@ void ivas_omasa_set_config(
MASA_ENCODER_HANDLE hMasa, /* i : MASA encoder handle */
const int32_t input_Fs /* i : Input sample rate */
,
- ISM_MODE ismMode /* i : ISM mode */
+ const ISM_MODE ismMode /* i : ISM mode */
)
{
uint8_t i, maxBin;
@@ -767,7 +888,7 @@ void ivas_set_surplus_brate_enc(
if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
#else
- if ( st_ivas->ism_mode == ISM_MASA_MODE_ONE_OBJ )
+ if ( 1 ) // st_ivas->ism_mode == ISM_MASA_MODE_ONE_OBJ )
#endif
{
tmpF += st_ivas->hSCE[0]->hCoreCoder[0]->total_brate + (float) ( nb_bits_metadata[1] * 50 );
@@ -823,7 +944,6 @@ static void ivas_omasa_param_est_enc(
float intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS];
float direction_vector[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS];
float diffuseness_vector[MASA_FREQUENCY_BANDS];
-
int16_t band_m_idx, block_m_idx;
float renormalization_factor_diff[MASA_FREQUENCY_BANDS];
float norm_tmp;
@@ -833,7 +953,6 @@ static void ivas_omasa_param_est_enc(
num_freq_bands = hOMasa->nbands;
l_ts = input_frame / CLDFB_NO_COL_MAX;
-
/* Need to initialize renormalization_factors, and variables to be normalized */
set_zero( renormalization_factor_diff, hOMasa->nbands );
set_zero( diffuseness_m, hOMasa->nbands );
@@ -1157,7 +1276,6 @@ static void ivas_omasa_dmx(
}
}
-
return;
}
diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc.c
index 2af2cf76fa2ff72c36bd57eafa7f4d4d55966179..d3aab0a6e88b631f34c515061a8d9050da7d3345 100644
--- a/lib_enc/ivas_sba_enc.c
+++ b/lib_enc/ivas_sba_enc.c
@@ -106,13 +106,12 @@ ivas_error ivas_sba_enc_reconfigure(
Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
)
{
- int16_t nSCE_old, nCPE_old, nchan_transport_old;
+ int16_t n, nSCE_old, nCPE_old, nchan_transport_old;
int32_t ivas_total_brate;
ivas_error error;
ENCODER_CONFIG_HANDLE hEncoderConfig;
error = IVAS_ERR_OK;
-
hEncoderConfig = st_ivas->hEncoderConfig;
ivas_total_brate = hEncoderConfig->ivas_total_brate;
@@ -121,10 +120,10 @@ ivas_error ivas_sba_enc_reconfigure(
DIRAC_ENC_HANDLE hDirAC = st_ivas->hDirAC;
SPAR_ENC_HANDLE hSpar;
SBA_MODE sba_mode_old;
-#ifdef SBA_HPF_TUNING_ENC
int16_t analysis_order_old;
-#endif
+ int16_t spar_reconfig_flag;
+ spar_reconfig_flag = 0;
nchan_transport_old = st_ivas->nchan_transport;
nCPE_old = st_ivas->nCPE;
nSCE_old = st_ivas->nSCE;
@@ -133,11 +132,11 @@ ivas_error ivas_sba_enc_reconfigure(
st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, hEncoderConfig->sba_order );
st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate );
-#ifdef SBA_HPF_TUNING_ENC
analysis_order_old = ivas_sba_get_analysis_order( hEncoderConfig->last_ivas_total_brate, hEncoderConfig->sba_order );
+
if ( analysis_order_old != st_ivas->sba_analysis_order )
{
- int16_t n, i, n_old;
+ int16_t i, n_old;
float **old_mem_hp20_in;
n_old = ivas_sba_get_nchan_metadata( analysis_order_old );
@@ -200,27 +199,33 @@ ivas_error ivas_sba_enc_reconfigure(
old_mem_hp20_in = NULL;
}
}
-#endif
if ( st_ivas->sba_mode == SBA_MODE_SPAR )
{
if ( st_ivas->hSpar == NULL )
{
- if ( ( error = ivas_spar_enc_open( st_ivas ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_spar_enc_open( st_ivas, spar_reconfig_flag ) ) != IVAS_ERR_OK )
{
return error;
}
-
- // VE: TBV - populate 'hSpar->hFrontVad' with 'hCoreCoder[0]' instead of resetting it to init-state?
}
ivas_spar_config( ivas_total_brate, min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ),
&st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, -1 );
+
+ for ( n = 0; n < DIRAC_MAX_ANA_CHANS; n++ )
+ {
+ if ( hDirAC->sba_synchro_buffer[n] != NULL )
+ {
+ free( hDirAC->sba_synchro_buffer[n] );
+ hDirAC->sba_synchro_buffer[n] = NULL;
+ }
+ }
+ hDirAC->num_samples_synchro_delay = 0;
}
else
{
- ivas_spar_enc_close( st_ivas->hSpar, hEncoderConfig->input_Fs, hEncoderConfig->nchan_inp );
- st_ivas->hSpar = NULL;
+ ivas_spar_enc_close( &( st_ivas->hSpar ), hEncoderConfig->input_Fs, hEncoderConfig->nchan_inp, spar_reconfig_flag );
}
hSpar = st_ivas->hSpar;
@@ -234,60 +239,23 @@ ivas_error ivas_sba_enc_reconfigure(
hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;
}
- /*TODO : Verify if full SPAR close and open can be used instead of submodules close and open */
if ( ( sba_mode_old != st_ivas->sba_mode ) || ( nchan_transport_old != st_ivas->nchan_transport ) )
{
/* FB mixer handle */
if ( st_ivas->sba_mode == SBA_MODE_SPAR )
{
- // VE: TBV whether 'hFbMixer' can be reused
if ( hDirAC->hFbMixer != NULL )
{
- ivas_FB_mixer_close( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs );
+ ivas_FB_mixer_close( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs, 0 );
hDirAC->hFbMixer = NULL;
}
if ( sba_mode_old == SBA_MODE_SPAR )
{
- // VE: dirty patch -> reconfiguration of SPAR MD, TD_decorr, FbMixer modules should be used instead !!
-
- IVAS_FB_CFG *fb_cfg;
- int16_t nchan_internal, sba_order_internal;
- int16_t table_idx, active_w_mixing;
-
- sba_order_internal = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER );
- nchan_internal = ivas_sba_get_nchan_metadata( sba_order_internal );
-
- /* Covar. State handle */
- ivas_spar_covar_enc_close( &hSpar->hCovEnc, hSpar->hFbMixer->fb_cfg->num_in_chans );
-
- /* MD handle */
- ivas_spar_md_enc_close( &hSpar->hMdEnc );
-
- if ( ( error = ivas_spar_md_enc_open( &( hSpar->hMdEnc ), hEncoderConfig, sba_order_internal ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- /*Initialization*/
- hSpar->hMdEnc->table_idx = -1;
- /* FB mixer handle */
- ivas_FB_mixer_close( &hSpar->hFbMixer, hEncoderConfig->input_Fs );
-
- table_idx = ivas_get_spar_table_idx( ivas_total_brate, sba_order_internal, SPAR_CONFIG_BW, NULL, NULL );
- active_w_mixing = ivas_spar_br_table_consts[table_idx].active_w;
- if ( ( error = ivas_fb_set_cfg( &fb_cfg, SBA_FORMAT, SBA_MODE_SPAR, nchan_internal, st_ivas->nchan_transport, active_w_mixing, hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- fb_cfg->remix_order = remix_order_set[hSpar->hMdEnc->spar_md_cfg.remix_unmix_order];
-
- if ( ( error = ivas_FB_mixer_open( &( hSpar->hFbMixer ), hEncoderConfig->input_Fs, fb_cfg ) ) != IVAS_ERR_OK )
- {
- return error;
- }
+ spar_reconfig_flag = 1;
+ ivas_spar_enc_close( &( st_ivas->hSpar ), hEncoderConfig->input_Fs, hEncoderConfig->nchan_inp, spar_reconfig_flag );
- /* Covar. State handle */
- if ( ( error = ivas_spar_covar_enc_open( &( hSpar->hCovEnc ), hSpar->hFbMixer->pFb, hEncoderConfig->input_Fs, nchan_internal ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_spar_enc_open( st_ivas, spar_reconfig_flag ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -305,17 +273,11 @@ ivas_error ivas_sba_enc_reconfigure(
}
/* Allocate and initialize FB mixer handle */
- if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs, fb_cfg ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_FB_mixer_open( &( hDirAC->hFbMixer ), hEncoderConfig->input_Fs, fb_cfg, 0 ) ) != IVAS_ERR_OK )
{
return error;
}
}
- }
-
- /* initalize delay for SPAR/DirAC delay synchronization */
- if ( ( st_ivas->sba_mode == SBA_MODE_DIRAC ) && ( ( sba_mode_old != st_ivas->sba_mode ) || ( nchan_transport_old != st_ivas->nchan_transport ) ) )
- {
- int16_t n;
if ( hDirAC->num_samples_synchro_delay == 0 )
{
@@ -335,32 +297,27 @@ ivas_error ivas_sba_enc_reconfigure(
}
}
}
- else
- {
- for ( int16_t n = 0; n < DIRAC_MAX_ANA_CHANS; n++ )
- {
- if ( hDirAC->sba_synchro_buffer[n] != NULL )
- {
- free( hDirAC->sba_synchro_buffer[n] );
- hDirAC->sba_synchro_buffer[n] = NULL;
- }
- }
- hDirAC->num_samples_synchro_delay = 0;
- }
}
- ivas_dirac_enc_reconfigure( st_ivas );
+ if ( ( error = ivas_dirac_enc_reconfigure( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
if ( st_ivas->sba_mode == SBA_MODE_SPAR )
{
mvs2s( hDirAC->dirac_to_spar_md_bands, hSpar->dirac_to_spar_md_bands, DIRAC_MAX_NBANDS );
hSpar->enc_param_start_band = hDirAC->hConfig->enc_param_start_band;
}
+
/*-----------------------------------------------------------------*
- * Allocate, initalize, and configure SCE/CPE/MCT handles
+ * Allocate, initialize, and configure SCE/CPE/MCT handles
*-----------------------------------------------------------------*/
- ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, ivas_total_brate / st_ivas->nchan_transport, ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS, MC_MODE_NONE );
+ if ( ( error = ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, ivas_total_brate / st_ivas->nchan_transport, ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS, MC_MODE_NONE ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
return error;
diff --git a/lib_enc/ivas_sce_enc.c b/lib_enc/ivas_sce_enc.c
index 769e5fe970c5449b847c91b7e56f6c16b410ee19..1a42cf635f5e18e9409c43c272aff78383b69076 100644
--- a/lib_enc/ivas_sce_enc.c
+++ b/lib_enc/ivas_sce_enc.c
@@ -188,21 +188,12 @@ ivas_error ivas_sce_enc(
* Front Pre-processing
*----------------------------------------------------------------*/
-#ifdef LOW_RATE_TRANS_CORE_CODER
error = pre_proc_front_ivas( hSCE, NULL, hSCE->element_brate, nb_bits_metadata, input_frame, 0, old_inp_12k8[0], old_inp_16k[0],
&ener[0], &relE[0], A[0], Aw[0], epsP[0], lsp_new[0], lsp_mid[0],
&vad_hover_flag[0], &attack_flag[0], realBuffer[0], imagBuffer[0], old_wsp[0], pitch_fr[0], voicing_fr[0], &loc_harm[0], &cor_map_sum[0], &vad_flag_dtx[0], enerBuffer[0],
fft_buff[0], A[0], lsp_new[0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL, flag_16k_smc,
st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->force_front_vad : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_dtx_flag : 0,
st_ivas->hEncoderConfig->ivas_total_brate );
-#else
- error = pre_proc_front_ivas( hSCE, NULL, hSCE->element_brate, nb_bits_metadata, input_frame, 0, old_inp_12k8[0], old_inp_16k[0],
- &ener[0], &relE[0], A[0], Aw[0], epsP[0], lsp_new[0], lsp_mid[0],
- &vad_hover_flag[0], &attack_flag[0], realBuffer[0], imagBuffer[0], old_wsp[0], pitch_fr[0], voicing_fr[0], &loc_harm[0], &cor_map_sum[0], &vad_flag_dtx[0], enerBuffer[0],
- fft_buff[0], A[0], lsp_new[0], currFlatness[0], 0, fr_bands, Etot_LR, lf_E, localVAD_HE_SAD, NULL, flag_16k_smc,
- st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_flag : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->force_front_vad : 0, st_ivas->hSpar != NULL ? st_ivas->hSpar->front_vad_dtx_flag : 0,
- st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->hEncoderConfig->ivas_format );
-#endif
if ( error != IVAS_ERR_OK )
{
return error;
@@ -306,10 +297,8 @@ ivas_error ivas_sce_enc(
hSCE->last_element_brate = hSCE->element_brate;
-#ifdef LOW_RATE_TRANS_CORE_CODER
/* Store previous attack detection flag */
st->hTranDet->transientDetector.prev_bIsAttackPresent = st->hTranDet->transientDetector.bIsAttackPresent;
-#endif
#ifdef DEBUG_MODE_INFO
{
@@ -400,11 +389,7 @@ ivas_error create_sce_enc(
st->total_brate = hSCE->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */
st->mct_chan_mode = MCT_CHAN_MODE_REGULAR;
-#ifdef PARAM_ISM_DTX_CNG
if ( ( error = init_encoder( st, 0, st_ivas->hEncoderConfig->var_SID_rate_flag, st_ivas->hEncoderConfig->interval_SID, 0, st_ivas->ism_mode ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = init_encoder( st, 0, st_ivas->hEncoderConfig->var_SID_rate_flag, st_ivas->hEncoderConfig->interval_SID, 0 ) ) != IVAS_ERR_OK )
-#endif
{
return error;
}
diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c
index f1e87a59baacf8fae4fbec4fc0db34a6fd251a93..c659979d2b7be0b589bd697fe91870134f9bd355 100644
--- a/lib_enc/ivas_spar_encoder.c
+++ b/lib_enc/ivas_spar_encoder.c
@@ -58,7 +58,8 @@ static ivas_error ivas_spar_enc_process( Encoder_Struct *st_ivas, const ENCODER_
*------------------------------------------------------------------------*/
ivas_error ivas_spar_enc_open(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder handle */
+ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
)
{
SPAR_ENC_HANDLE hSpar;
@@ -71,11 +72,15 @@ ivas_error ivas_spar_enc_open(
hEncoderConfig = st_ivas->hEncoderConfig;
error = IVAS_ERR_OK;
+ hSpar = st_ivas->hSpar;
- /* SPAR encoder handle */
- if ( ( hSpar = (SPAR_ENC_HANDLE) malloc( sizeof( SPAR_ENC_DATA ) ) ) == NULL )
+ if ( !spar_reconfig_flag )
{
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR encoder" );
+ /* SPAR encoder handle */
+ if ( ( hSpar = (SPAR_ENC_HANDLE) malloc( sizeof( SPAR_ENC_DATA ) ) ) == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR encoder" );
+ }
}
input_Fs = hEncoderConfig->input_Fs;
@@ -102,7 +107,7 @@ ivas_error ivas_spar_enc_open(
fb_cfg->remix_order = remix_order_set[hSpar->hMdEnc->spar_md_cfg.remix_unmix_order];
/* FB mixer handle */
- if ( ( error = ivas_FB_mixer_open( &( hSpar->hFbMixer ), input_Fs, fb_cfg ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_FB_mixer_open( &( hSpar->hFbMixer ), input_Fs, fb_cfg, spar_reconfig_flag ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -113,12 +118,18 @@ ivas_error ivas_spar_enc_open(
return error;
}
- /* Transient Detector handle */
- if ( ( error = ivas_transient_det_open( &( hSpar->hTranDet ), input_Fs ) ) != IVAS_ERR_OK )
+ if ( !spar_reconfig_flag )
{
- return error;
+ /* Transient Detector handle */
+ if ( ( error = ivas_transient_det_open( &( hSpar->hTranDet ), input_Fs ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
+ /* initialization */
+ hSpar->hMdEnc->table_idx = -1;
+
/* AGC handle */
#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
hSpar->AGC_Enable = ivas_agc_enc_get_flag( hEncoderConfig->Opt_AGC_ON, nchan_transport );
@@ -168,41 +179,40 @@ ivas_error ivas_spar_enc_open(
* Allocate and initialize Front-VAD handle
*-----------------------------------------------------------------*/
- hSpar->front_vad_flag = 0;
- hSpar->front_vad_dtx_flag = 0;
- hSpar->force_front_vad = 0;
-
- if ( hEncoderConfig->Opt_DTX_ON )
+ if ( !spar_reconfig_flag )
{
- if ( ( error = front_vad_create( &( hSpar->hFrontVad ), hEncoderConfig ) ) != IVAS_ERR_OK )
- {
- return error;
- }
+ hSpar->front_vad_flag = 0;
+ hSpar->front_vad_dtx_flag = 0;
+ hSpar->force_front_vad = 0;
- if ( ( hSpar->hCoreCoderVAD = (ENC_CORE_HANDLE) malloc( sizeof( Encoder_State ) ) ) == NULL )
+ if ( hEncoderConfig->Opt_DTX_ON )
{
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CoreCoder structure\n" ) );
- }
+ if ( ( error = front_vad_create( &( hSpar->hFrontVad ), hEncoderConfig ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
- copy_encoder_config( st_ivas, hSpar->hCoreCoderVAD, 1 );
+ if ( ( hSpar->hCoreCoderVAD = (ENC_CORE_HANDLE) malloc( sizeof( Encoder_State ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CoreCoder structure\n" ) );
+ }
- hSpar->hCoreCoderVAD->total_brate = hEncoderConfig->ivas_total_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */
- hSpar->hCoreCoderVAD->mct_chan_mode = MCT_CHAN_MODE_IGNORE;
+ copy_encoder_config( st_ivas, hSpar->hCoreCoderVAD, 1 );
-#ifdef PARAM_ISM_DTX_CNG
- if ( ( error = init_encoder( hSpar->hCoreCoderVAD, 0, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 1, st_ivas->ism_mode ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = init_encoder( hSpar->hCoreCoderVAD, 0, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 1 ) ) != IVAS_ERR_OK )
-#endif
+ hSpar->hCoreCoderVAD->total_brate = hEncoderConfig->ivas_total_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */
+ hSpar->hCoreCoderVAD->mct_chan_mode = MCT_CHAN_MODE_IGNORE;
+
+ if ( ( error = init_encoder( hSpar->hCoreCoderVAD, 0, hEncoderConfig->var_SID_rate_flag, hEncoderConfig->interval_SID, 1, st_ivas->ism_mode ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ else
{
- return error;
+ hSpar->hCoreCoderVAD = NULL;
+ hSpar->hFrontVad = NULL;
}
}
- else
- {
- hSpar->hCoreCoderVAD = NULL;
- hSpar->hFrontVad = NULL;
- }
/*-----------------------------------------------------------------*
* Final assignment
@@ -221,57 +231,67 @@ ivas_error ivas_spar_enc_open(
*------------------------------------------------------------------------*/
void ivas_spar_enc_close(
- SPAR_ENC_HANDLE hSpar, /* i/o: SPAR encoder handle */
- const int32_t input_Fs, /* i : input sampling rate */
- const int16_t nchan_inp /* i : number of input channels */
+ SPAR_ENC_HANDLE *hSpar, /* i/o: SPAR encoder handle */
+ const int32_t input_Fs, /* i : input sampling rate */
+ const int16_t nchan_inp, /* i : number of input channels */
+ const int16_t spar_reconfig_flag /* i : SPAR reconfiguration flag */
)
{
int16_t num_chans;
- if ( hSpar != NULL )
+
+ if ( hSpar == NULL || *hSpar == NULL )
+ {
+ return;
+ }
+
+ if ( !spar_reconfig_flag )
{
/* core-coder-VAD handle */
- if ( hSpar->hCoreCoderVAD != NULL )
+ if ( ( *hSpar )->hCoreCoderVAD != NULL )
{
- destroy_core_enc( hSpar->hCoreCoderVAD );
- hSpar->hCoreCoderVAD = NULL;
+ destroy_core_enc( ( *hSpar )->hCoreCoderVAD );
+ ( *hSpar )->hCoreCoderVAD = NULL;
}
/* front-VAD handle */
- if ( hSpar->hFrontVad != NULL )
+ if ( ( *hSpar )->hFrontVad != NULL )
{
- front_vad_destroy( &hSpar->hFrontVad );
- hSpar->hFrontVad = NULL;
+ front_vad_destroy( &( *hSpar )->hFrontVad );
+ ( *hSpar )->hFrontVad = NULL;
}
+ }
- num_chans = hSpar->hFbMixer->fb_cfg->num_in_chans;
- assert( num_chans <= nchan_inp );
-
- /* MD handle */
- ivas_spar_md_enc_close( &hSpar->hMdEnc );
+ num_chans = ( *hSpar )->hFbMixer->fb_cfg->num_in_chans;
+ assert( num_chans <= nchan_inp );
- /* Covar. State handle */
- ivas_spar_covar_enc_close( &hSpar->hCovEnc, num_chans );
+ /* MD handle */
+ ivas_spar_md_enc_close( &( *hSpar )->hMdEnc );
- /* FB mixer handle */
- ivas_FB_mixer_close( &hSpar->hFbMixer, input_Fs );
+ /* Covar. State handle */
+ ivas_spar_covar_enc_close( &( *hSpar )->hCovEnc, num_chans );
- /* Trans Det handle */
- ivas_transient_det_close( &hSpar->hTranDet );
+ /* FB mixer handle */
+ ivas_FB_mixer_close( &( *hSpar )->hFbMixer, input_Fs, spar_reconfig_flag );
- /* AGC */
- ivas_spar_agc_enc_close( &hSpar->hAgcEnc );
+ /* AGC */
+ ivas_spar_agc_enc_close( &( *hSpar )->hAgcEnc );
- /* PCA */
- if ( hSpar->hPCA != NULL )
- {
- free( hSpar->hPCA );
- hSpar->hPCA = NULL;
- }
+ /* PCA */
+ if ( ( *hSpar )->hPCA != NULL )
+ {
+ free( ( *hSpar )->hPCA );
+ ( *hSpar )->hPCA = NULL;
+ }
- free( hSpar );
- hSpar = NULL;
+ if ( !spar_reconfig_flag )
+ {
+ /* Trans Det handle */
+ ivas_transient_det_close( &( *hSpar )->hTranDet );
+ free( ( *hSpar ) );
+ ( *hSpar ) = NULL;
}
+
return;
}
@@ -372,11 +392,7 @@ static ivas_error ivas_spar_enc_process(
float pcm_tmp[IVAS_SPAR_MAX_CH][L_FRAME48k * 2];
float *p_pcm_tmp[IVAS_SPAR_MAX_CH];
int16_t i, j, b, i_ts, input_frame, dtx_vad;
-#ifdef SMOOTH_WITH_TRANS_DET
int16_t transient_det[2];
-#else
- int16_t transient_det;
-#endif
int32_t ivas_total_brate, input_Fs;
float *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
float *cov_dtx_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];
@@ -419,15 +435,11 @@ static ivas_error ivas_spar_enc_process(
* Transient detector
*-----------------------------------------------------------------------------------------*/
-#ifdef SMOOTH_WITH_TRANS_DET
ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame, transient_det );
if ( sba_order == 1 )
{
transient_det[1] = transient_det[0];
}
-#else
- transient_det = ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame );
-#endif
/* store previous input samples for W in local buffer */
assert( num_del_samples <= IVAS_FB_1MS_48K_SAMP );
diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c
index bcc6718e9a60c513ead6780ac75f79bba2781c52..645f690ac0f8561aaccc1ea1fc050f03616d7aa7 100644
--- a/lib_enc/ivas_spar_md_enc.c
+++ b/lib_enc/ivas_spar_md_enc.c
@@ -225,6 +225,11 @@ void ivas_spar_md_enc_close(
int16_t num_channels, i, j;
ivas_spar_md_enc_state_t *hMdEnc;
+ if ( hMdEnc_in == NULL || *hMdEnc_in == NULL )
+ {
+ return;
+ }
+
hMdEnc = *hMdEnc_in;
num_channels = hMdEnc->num_umx_ch;
@@ -250,7 +255,6 @@ void ivas_spar_md_enc_close(
{
for ( i = 0; i < num_channels; i++ )
{
-
for ( j = 0; j < num_channels; j++ )
{
free( hMdEnc->cov_real[i][j] );
@@ -264,7 +268,6 @@ void ivas_spar_md_enc_close(
{
for ( i = 0; i < num_channels; i++ )
{
-
for ( j = 0; j < num_channels; j++ )
{
free( hMdEnc->cov_dtx_real[i][j] );
@@ -288,11 +291,8 @@ void ivas_spar_md_enc_close(
free( hMdEnc->mixer_mat_local );
}
- if ( hMdEnc != NULL )
- {
- free( hMdEnc );
- hMdEnc = NULL;
- }
+ free( *hMdEnc_in );
+ *hMdEnc_in = NULL;
return;
}
diff --git a/lib_enc/ivas_stat_enc.h b/lib_enc/ivas_stat_enc.h
index ad7cee3ce1dea73ea7698854b03176e0b2757148..643bd321643c270da4b34cc4975a1b3a81e0658e 100644
--- a/lib_enc/ivas_stat_enc.h
+++ b/lib_enc/ivas_stat_enc.h
@@ -550,7 +550,6 @@ typedef struct ivas_stereo_classifier_data_structure
} STEREO_CLASSIF_DATA, *STEREO_CLASSIF_HANDLE;
-#ifdef PARAM_ISM_DTX_CNG
/*----------------------------------------------------------------------------------*
* ISM DTX structure
*----------------------------------------------------------------------------------*/
@@ -560,13 +559,16 @@ typedef struct
int16_t dtx_flag;
int16_t sce_id_dtx;
+#ifdef DISCRETE_ISM_DTX_CNG
+ int16_t cnt_SID_ISM;
+#else
int16_t dtx_speech_buffer_enc[PARAM_ISM_HYS_BUF_SIZE];
+#endif
float long_term_energy_stereo_dmx_enc[MAX_NUM_OBJECTS][PARAM_ISM_HYS_BUF_SIZE];
float coh[MAX_NUM_OBJECTS];
} ISM_DTX_DATA, *ISM_DTX_HANDLE;
-#endif
/*----------------------------------------------------------------------------------*
* Front-VAD structure
@@ -738,6 +740,17 @@ typedef struct ivas_param_mc_enc_data_structure
* MASA encoder structures
*----------------------------------------------------------------------------------*/
+#ifdef FIX_382_MASA_META_FRAMING_ASYNC
+/* structure storing MASA framing sync detection and compensation data */
+typedef struct ivas_masa_sync_struct
+{
+ MASA_METADATA_FRAME previous_metadata;
+ uint8_t prev_sim_stop;
+ uint8_t prev_offset;
+ MASA_FRAME_MODE frame_mode;
+} MASA_SYNC_STATE, *MASA_SYNC_HANDLE;
+#endif
+
typedef struct ivas_masa_encoder_data_struct
{
float energy[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS];
@@ -751,7 +764,9 @@ typedef struct ivas_masa_encoder_data_struct
int16_t num_Cldfb_instances;
HANDLE_CLDFB_FILTER_BANK cldfbAnaEnc[MAX_NUM_ENC_CLDFB_INSTANCES];
+#ifndef FIX_350_MASA_DELAY_COMP
float *delay_buffer[MASA_MAX_TRANSPORT_CHANNELS];
+#endif
int16_t band_mapping[MASA_FREQUENCY_BANDS + 1];
uint8_t twoDirBands[MASA_FREQUENCY_BANDS];
float importanceWeight[MASA_FREQUENCY_BANDS];
@@ -763,6 +778,9 @@ typedef struct ivas_masa_encoder_data_struct
float onset_detector_1;
float onset_detector_2;
+#ifdef FIX_382_MASA_META_FRAMING_ASYNC
+ MASA_SYNC_STATE sync_state;
+#endif
} MASA_ENCODER_DATA;
typedef struct ivas_masa_encoder_struct
@@ -980,11 +998,14 @@ typedef struct mct_enc_data_structure
float lastxCorrMatrix[MCT_MAX_CHANNELS][MCT_MAX_CHANNELS];
int16_t lowE_ch[MCT_MAX_CHANNELS];
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
int16_t LFE_off;
+#endif
uint16_t mc_global_ild[MCT_MAX_CHANNELS];
int16_t nBitsMCT; /* number of bits spent on mct side info */
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
int16_t num_lfe;
-
+#endif
/* pointers to local buffers */
float *p_mdst_spectrum_long[MCT_MAX_BLOCKS][CPE_CHANNELS];
float *p_orig_spectrum_long[MCT_MAX_BLOCKS][CPE_CHANNELS];
@@ -1067,12 +1088,13 @@ typedef struct encoder_config_structure
int16_t element_mode_init; /* element mode used at initialization */
int16_t stereo_dmx_evs; /* flag to indicate that stereo downmix for EVS encoder */
+#ifdef NCHAN_ISM_PARAMETER
+ int16_t nchan_ism; /* number of ISM channels */
+#endif
int16_t sba_order; /* Ambisonic (SBA) order */
int16_t sba_planar; /* Ambisonic (SBA) planar flag */
MC_LS_SETUP mc_input_setup; /* multichannel input ls setup */
-#ifdef MASA_AND_OBJECTS
- int16_t nchan_ism; /* number of ISM input channels in combined format coding */
-#endif
+ int16_t ism_extended_metadata_flag; /* flag indicating extended metadata encoding, including radius and orientation (yaw, pitch) in ISM format */
int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */
@@ -1129,9 +1151,7 @@ typedef struct
/* multichannel modules */
ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS]; /* ISM metadata handles (storage for one frame of read ISM metadata) */
-#ifdef PARAM_ISM_DTX_CNG
ISM_DTX_HANDLE hISMDTX; /* ISM DTX handle */
-#endif
DIRAC_ENC_HANDLE hDirAC; /* DirAC data handle */
SPAR_ENC_HANDLE hSpar; /* SPAR encoder handle */
MASA_ENCODER_HANDLE hMasa; /* MASA encoder data and configuration */
diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier.c
index b2e33734045fba36f386a8487b97f762430e2a1d..534dc2189ca5804d9399f8ce332b07b88a9f77a1 100644
--- a/lib_enc/ivas_stereo_classifier.c
+++ b/lib_enc/ivas_stereo_classifier.c
@@ -209,8 +209,6 @@ int16_t select_stereo_mode(
set_f( hStereoClassif->xtalk_fv, -1.0f, SSC_MAX_NFEA );
}
}
-
-
#ifdef DEBUG_MODE_TD
dbgwrite( &hStereoClassif->unclr_decision, sizeof( int16_t ), 1, L_FRAME16k, "res/unclr_decision.enc" );
dbgwrite( &hStereoClassif->xtalk_decision, sizeof( int16_t ), 1, L_FRAME16k, "res/xtalk_decision.enc" );
diff --git a/lib_enc/ivas_stereo_dmx_evs.c b/lib_enc/ivas_stereo_dmx_evs.c
index 052970fa70c14831fb4768897e0e59ac17383095..a5c0fe147f0055724024771e5133507e08ccab36 100644
--- a/lib_enc/ivas_stereo_dmx_evs.c
+++ b/lib_enc/ivas_stereo_dmx_evs.c
@@ -946,16 +946,22 @@ ivas_error stereo_dmx_evs_init_encoder(
*-------------------------------------------------------------------*/
void stereo_dmx_evs_close_encoder(
- STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */
+ STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS /* i/o: Stereo downmix for EVS encoder handle */
)
{
- if ( hStereoDmxEVS->hPOC != NULL )
+ if ( hStereoDmxEVS == NULL || *hStereoDmxEVS == NULL )
{
- free( hStereoDmxEVS->hPOC );
- hStereoDmxEVS->hPOC = NULL;
+ return;
}
- free( hStereoDmxEVS );
+ if ( ( *hStereoDmxEVS )->hPOC != NULL )
+ {
+ free( ( *hStereoDmxEVS )->hPOC );
+ ( *hStereoDmxEVS )->hPOC = NULL;
+ }
+
+ free( ( *hStereoDmxEVS ) );
+ ( *hStereoDmxEVS ) = NULL;
return;
}
diff --git a/lib_enc/ivas_stereo_mdct_core_enc.c b/lib_enc/ivas_stereo_mdct_core_enc.c
index e0d5db28a63409d85f901244455549a9ec943f37..e990f52ae29a2b20f6ad634c3aa7b908ff65d3a8 100644
--- a/lib_enc/ivas_stereo_mdct_core_enc.c
+++ b/lib_enc/ivas_stereo_mdct_core_enc.c
@@ -244,7 +244,11 @@ void stereo_mdct_core_enc(
*---------------------------------------------------------------*/
ivas_mdct_core_whitening_enc( hCPE, new_samples, old_wsp, pitch_buf, p_mdst_spectrum_long,
- tnsBits, p_orig_spectrum_long, tnsSize, p_param, hBstr, NULL, 0, CPE_CHANNELS );
+ tnsBits, p_orig_spectrum_long, tnsSize, p_param, hBstr,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ NULL,
+#endif
+ 0, CPE_CHANNELS );
for ( ch = 0; ch < CPE_CHANNELS; ch++ )
{
@@ -462,7 +466,11 @@ void stereo_mdct_core_enc(
}
#endif
- ivas_mdct_quant_coder( hCPE, 0, tnsBits, tnsSize, p_param, 0 );
+ ivas_mdct_quant_coder( hCPE,
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ 0,
+#endif
+ tnsBits, tnsSize, p_param, 0 );
pop_wmops();
diff --git a/lib_enc/ivas_stereo_switching_enc.c b/lib_enc/ivas_stereo_switching_enc.c
index 1be9af224e8341d63fbfbfd1763d3d8820fd2519..0e6fe1496bd03ad3d770befe24a51544b18b4b77 100644
--- a/lib_enc/ivas_stereo_switching_enc.c
+++ b/lib_enc/ivas_stereo_switching_enc.c
@@ -526,7 +526,12 @@ ivas_error stereo_memory_enc(
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for hIGFEnc\n" ) );
}
- st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode, st->mct_chan_mode );
+ st->igf = getIgfPresent( st->element_mode, st->total_brate, st->bwidth, st->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
/* allocate and initialize MDCT stereo structure */
if ( ( hCPE->hStereoMdct = (STEREO_MDCT_ENC_DATA_HANDLE) malloc( sizeof( STEREO_MDCT_ENC_DATA ) ) ) == NULL )
diff --git a/lib_enc/ivas_stereo_td_analysis.c b/lib_enc/ivas_stereo_td_analysis.c
index d2d72c153426b47d40febe4c2079a100de5f2247..5ef8001b7a556ea2af4b99679fa8d5f99e42723f 100644
--- a/lib_enc/ivas_stereo_td_analysis.c
+++ b/lib_enc/ivas_stereo_td_analysis.c
@@ -115,6 +115,10 @@ int16_t stereo_tdm_ener_analysis(
const int16_t input_frame, /* i : Number of samples */
int16_t *tdm_SM_or_LRTD_Pri, /* o : channel combination scheme flag in TD stereo OR LRTD primary channel */
int16_t *tdm_ratio_idx_SM /* o : TDM ratio index for SM mode */
+#ifdef OMASA_TUNING_TD_STEREO
+ ,
+ const int16_t isOmasa /* i : flag that indicates OMASA format */
+#endif
)
{
float rms_R, rms_L;
@@ -195,6 +199,16 @@ int16_t stereo_tdm_ener_analysis(
* of L and R needed to create new mono/side signals
*----------------------------------------------------------------*/
+#ifdef OMASA_TUNING_TD_STEREO
+ if ( isOmasa )
+ {
+
+ if ( ( hCPE->hStereoClassif->lrtd_mode == 1 || hCPE->hStereoTD->prev_fr_LRTD_TD_dec == 1 ) && ( hCPE->element_brate - 50 * FRAMES_PER_SEC + hCPE->brate_surplus + hCPE->brate_surplus < 15000 ) )
+ {
+ hStereoTD->prev_fr_LRTD_TD_dec = 0;
+ }
+ }
+#endif
rms_thd = RMS_MIN;
if ( hCPE->hStereoClassif->lrtd_mode == 1 )
{
diff --git a/lib_enc/ivas_stereo_td_enc.c b/lib_enc/ivas_stereo_td_enc.c
index 2105b351b31bcfd496da55d44b63c08c2092066f..82e3f4bdfd7733dc5cf148e1da6814dda462a22c 100644
--- a/lib_enc/ivas_stereo_td_enc.c
+++ b/lib_enc/ivas_stereo_td_enc.c
@@ -283,8 +283,8 @@ ivas_error stereo_set_tdm(
dbgwrite( &tmp, 2, 1, 320, "res/inst_ratio_L" );
dbgwrite( &ftmp, 4, 1, 320, "res/ratio_L" );
dbgwrite( &tmp, 2, 1, 320, "res/tdm_low_rate_mode" );
- dbgwrite( &tmp, 2, 1, 320, "res/tdm_lp_reuse_flag" );
- dbgwrite( &tmp, 2, 1, 320, "res/mod_ct.enx" );
+ //dbgwrite( &tmp, 2, 1, 320, "res/tdm_lp_reuse_flag" );
+ //dbgwrite( &tmp, 2, 1, 320, "res/mod_ct.enx" );
}
#endif
hCPE->hCoreCoder[0]->tdm_LRTD_flag = 0;
@@ -309,6 +309,10 @@ void tdm_configure_enc(
const int16_t tdm_ratio_idx_SM, /* i : ratio index in SM mode */
const int16_t attack_flag, /* i : Primary channel attack flag */
const int16_t nb_bits_metadata /* i : number of metadata bits */
+#ifdef OMASA_TUNING_TD_STEREO
+ ,
+ const int16_t IsOmasa /* i : flag that indicates OMASA format */
+#endif
)
{
int16_t tdm_ratio_bit_alloc_idx, mod_ct;
@@ -420,11 +424,22 @@ void tdm_configure_enc(
}
#ifdef MASA_AND_OBJECTS
- if ( hCPE->element_brate - nb_bits_metadata * FRAMES_PER_SEC + hCPE->brate_surplus < 12600 )
+ if ( hCPE->element_brate - nb_bits_metadata * FRAMES_PER_SEC + hCPE->brate_surplus < 12000 )
{
- sts[1]->coder_type = INACTIVE;
- hStereoTD->tdm_Pitch_reuse_flag = 0;
+ if ( sts[1]->coder_type == UNVOICED )
+ {
+ sts[1]->coder_type = GENERIC;
+ }
hStereoTD->tdm_lp_reuse_flag = 1;
+
+#ifdef OMASA_TUNING_TD_STEREO
+ if ( hCPE->element_brate - nb_bits_metadata * FRAMES_PER_SEC + hCPE->brate_surplus < 11000 )
+#else
+ if ( hCPE->element_brate - nb_bits_metadata * FRAMES_PER_SEC + hCPE->brate_surplus < 12000 )
+#endif
+ {
+ sts[1]->coder_type = INACTIVE;
+ }
}
if ( hCPE->element_brate - nb_bits_metadata * FRAMES_PER_SEC + hCPE->brate_surplus < 14700 )
@@ -473,7 +488,12 @@ void tdm_configure_enc(
tdm_bit_alloc( hCPE->element_brate - nb_bits_metadata * FRAMES_PER_SEC + hCPE->brate_surplus,
hStereoTD->tdm_lp_reuse_flag, &( sts[0]->total_brate ), &( sts[1]->total_brate ),
&( hStereoTD->tdm_low_rate_mode ), sts[1]->coder_type, tdm_ratio_bit_alloc_idx, hStereoTD->tdm_Pitch_reuse_flag,
- sts[0]->bwidth, sts[1]->bwidth, sts[0]->flag_ACELP16k, hStereoTD->tdm_LRTD_flag, mod_ct, hStereoTD->tdm_inst_ratio_idx );
+ sts[0]->bwidth, sts[1]->bwidth, sts[0]->flag_ACELP16k, hStereoTD->tdm_LRTD_flag, mod_ct, hStereoTD->tdm_inst_ratio_idx
+#ifdef OMASA_TUNING_TD_STEREO
+ ,
+ IsOmasa
+#endif
+ );
#else
tdm_bit_alloc( hCPE->element_brate - nb_bits_metadata * FRAMES_PER_SEC, hStereoTD->tdm_lp_reuse_flag, &( sts[0]->total_brate ), &( sts[1]->total_brate ), &( hStereoTD->tdm_low_rate_mode ), sts[1]->coder_type, tdm_ratio_bit_alloc_idx, hStereoTD->tdm_Pitch_reuse_flag, sts[0]->bwidth, sts[1]->bwidth, sts[0]->flag_ACELP16k, hStereoTD->tdm_LRTD_flag, mod_ct, hStereoTD->tdm_inst_ratio_idx );
#endif
@@ -539,9 +559,9 @@ void tdm_configure_enc(
}
#ifdef DEBUG_MODE_TD
- dbgwrite( &hStereoTD->tdm_low_rate_mode, 2, 1, 320, "res/tdm_low_rate_mode" );
- dbgwrite( &hStereoTD->tdm_lp_reuse_flag, 2, 1, 320, "res/tdm_lp_reuse_flag" );
- dbgwrite( &mod_ct, 2, 1, 320, "res/mod_ct.enx" );
+ dbgwrite( &hStereoTD->tdm_low_rate_mode, 2, 1, 320, "res/tdm_low_rate_mode_c" );
+ dbgwrite( &hStereoTD->tdm_lp_reuse_flag, 2, 1, 320, "res/tdm_lp_reuse_flag_c" );
+ dbgwrite( &mod_ct, 2, 1, 320, "res/mod_ct.enc" );
#endif
/*----------------------------------------------------------------*
* Updates
diff --git a/lib_enc/ivas_tcx_core_enc.c b/lib_enc/ivas_tcx_core_enc.c
index 3971c6740edf18f5608ab7ec590f765dc0ed736e..3bda423fadd1f51d543cb07329a919f807e8f044 100644
--- a/lib_enc/ivas_tcx_core_enc.c
+++ b/lib_enc/ivas_tcx_core_enc.c
@@ -99,10 +99,20 @@ void stereo_tcx_init_enc(
st->hTcxCfg->ctx_hm = getCtxHm( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_mode );
st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC );
st->hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_mode, st->element_mode );
- st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode, st->mct_chan_mode );
+ st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
if ( st->element_mode != EVS_MONO )
{
- st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode );
+ st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ st->mct_chan_mode
+#endif
+ );
}
st->core_brate = st->total_brate;
@@ -457,11 +467,7 @@ void stereo_tcx_core_enc(
mvr2r( lsp_q, st->lsp_old, M );
}
-#ifdef PARAM_ISM_DTX_CNG
if ( st->Opt_DTX_ON && !st->tcxonly && st->hTdCngEnc != NULL )
-#else
- if ( st->Opt_DTX_ON && !st->tcxonly )
-#endif
{
/* update CNG parameters in active frames */
if ( st->bwidth == NB && st->enableTcxLpc && st->core != ACELP_CORE )
diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c
old mode 100755
new mode 100644
index 2857325ed60d63a95832ebdec88f20a589cbd0fa..d14d55fd93a3d3dd8e1556d701564e0df801746d
--- a/lib_enc/lib_enc.c
+++ b/lib_enc/lib_enc.c
@@ -61,6 +61,9 @@ struct IVAS_ENC
bool ismMetadataProvided[MAX_NUM_OBJECTS];
bool maxBandwidthUser; /* Was a specific max bandwith selected by the user? */
IVAS_ENC_BANDWIDTH newBandwidthApi; /* maximum encoded bandwidth, as set on API level */
+#ifdef FIX_379_EXT_METADATA
+ bool extMetadataApi; /* External metadata requested, to be checked against current bit rate */
+#endif
};
/*---------------------------------------------------------------------*
@@ -75,7 +78,11 @@ static int16_t getInputBufferSize( const Encoder_Struct *st_ivas );
static ivas_error doCommonConfigureChecks( IVAS_ENC_HANDLE hIvasEnc );
static ivas_error doCommonSetterChecks( IVAS_ENC_HANDLE hIvasEnc );
static ivas_error sanitizeBandwidth( const IVAS_ENC_HANDLE hIvasEnc );
+#ifdef FIX_379_EXT_METADATA
+static ivas_error sanitizeBitrateISM( const ENCODER_CONFIG_HANDLE hEncoderConfig, const IVAS_ENC_HANDLE hIvasEnc );
+#else
static ivas_error sanitizeBitrateISM( const ENCODER_CONFIG_HANDLE hEncoderConfig );
+#endif
static void init_encoder_config( ENCODER_CONFIG_HANDLE hEncoderConfig );
static void resetIsmMetadataProvidedFlags( IVAS_ENC_HANDLE hIvasEnc );
static ivas_error bandwidthApiToInternal( const IVAS_ENC_BANDWIDTH maxBandwidth, int16_t *internalMaxBandwidth );
@@ -417,7 +424,8 @@ ivas_error IVAS_ENC_ConfigureForObjects(
const bool max_bwidth_user, /* i : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false) */
const IVAS_ENC_BANDWIDTH maxBandwidth, /* i : bandwidth limitation */
const IVAS_ENC_DTX_CONFIG dtxConfig, /* i : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig() */
- const uint16_t numObjects /* i : number of objects to be encoded */
+ const uint16_t numObjects, /* i : number of objects to be encoded */
+ const bool ism_extended_metadata /* i : Extended metadata used (true/false), where extended metadata includes radius and orientation */
)
{
Encoder_Struct *st_ivas;
@@ -437,7 +445,13 @@ ivas_error IVAS_ENC_ConfigureForObjects(
st_ivas->hEncoderConfig->ivas_format = ISM_FORMAT;
st_ivas->hEncoderConfig->element_mode_init = IVAS_SCE;
st_ivas->hEncoderConfig->nchan_inp = numObjects;
-
+#ifdef NCHAN_ISM_PARAMETER
+ st_ivas->hEncoderConfig->nchan_ism = numObjects;
+#endif
+ st_ivas->hEncoderConfig->ism_extended_metadata_flag = ism_extended_metadata;
+#ifdef FIX_379_EXT_METADATA
+ hIvasEnc->extMetadataApi = ( ism_extended_metadata == 1 );
+#endif
hIvasEnc->maxBandwidthUser = max_bwidth_user;
error = configureEncoder( hIvasEnc, inputFs, bitrate, maxBandwidth, dtxConfig, IVAS_ENC_GetDefaultChannelAwareConfig() );
@@ -480,7 +494,8 @@ ivas_error IVAS_ENC_FeedObjectMetadata(
return IVAS_ERR_INDEX_OUT_OF_BOUNDS;
}
- error = set_ism_metadata( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth, metadata.elevation );
+ error = ivas_set_ism_metadata( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth, metadata.elevation, metadata.radius, metadata.yaw, metadata.pitch );
+
if ( error != IVAS_ERR_OK )
{
return error;
@@ -835,7 +850,11 @@ static ivas_error configureEncoder(
}
else if ( hEncoderConfig->ivas_format == ISM_FORMAT )
{
+#ifdef FIX_379_EXT_METADATA
+ if ( ( error = sanitizeBitrateISM( hEncoderConfig, hIvasEnc ) ) != IVAS_ERR_OK )
+#else
if ( ( error = sanitizeBitrateISM( hEncoderConfig ) ) != IVAS_ERR_OK )
+#endif
{
return error;
}
@@ -950,22 +969,16 @@ static ivas_error configureEncoder(
return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "8kHz input sampling rate is not supported in IVAS." );
}
-#ifdef PARAM_ISM_DTX_CNG
if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_format != MONO_FORMAT &&
- ( ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp == 2 ) || // ToDo: see Issue 113
- ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp > 2 && hEncoderConfig->ivas_total_brate != IVAS_24k4 && hEncoderConfig->ivas_total_brate != IVAS_32k ) || // ParamISM
- ( hEncoderConfig->ivas_format == MASA_FORMAT && hEncoderConfig->ivas_total_brate > IVAS_128k ) || // ToDo: remove the bitrate limitation
- ( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_get_sba_num_TCs( hEncoderConfig->ivas_total_brate, 1 ) > 2 ) || // ToDo: support for 3+ TCs to be done
- hEncoderConfig->ivas_format == MC_FORMAT // ToDo: TBD
- ) )
-#else
- if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_format != MONO_FORMAT &&
- ( ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp > 1 ) || // ToDo: see Issue 113
- ( hEncoderConfig->ivas_format == MASA_FORMAT && hEncoderConfig->ivas_total_brate > IVAS_128k ) || // ToDo: remove the bitrate limitation
- ( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_get_sba_num_TCs( hEncoderConfig->ivas_total_brate, 1 ) > 2 ) || // ToDo: support for 3+ TCs to be done
- hEncoderConfig->ivas_format == MC_FORMAT // ToDo: TBD
- ) )
+ (
+#ifndef DISCRETE_ISM_DTX_CNG
+ ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp == 2 ) || // ToDo: see Issue 113
+ ( hEncoderConfig->ivas_format == ISM_FORMAT && hEncoderConfig->nchan_inp > 2 && hEncoderConfig->ivas_total_brate != IVAS_24k4 && hEncoderConfig->ivas_total_brate != IVAS_32k ) || // ParamISM
#endif
+ ( hEncoderConfig->ivas_format == MASA_FORMAT && hEncoderConfig->ivas_total_brate > IVAS_128k ) || // ToDo: remove the bitrate limitation
+ ( hEncoderConfig->ivas_format == SBA_FORMAT && ivas_get_sba_num_TCs( hEncoderConfig->ivas_total_brate, 1 ) > 2 ) || // ToDo: support for 3+ TCs to be done
+ hEncoderConfig->ivas_format == MC_FORMAT // ToDo: TBD
+ ) )
{
return IVAS_ERROR( IVAS_ERR_DTX_NOT_SUPPORTED, "DTX is not supported in this IVAS format and element mode." );
}
@@ -996,7 +1009,7 @@ static ivas_error configureEncoder(
return error;
}
-#ifdef PARAM_ISM_DTX_CNG
+#ifndef DISCRETE_ISM_DTX_CNG
if ( hEncoderConfig->Opt_DTX_ON && ( hEncoderConfig->ivas_format == ISM_FORMAT ) && !( st_ivas->ism_mode == ISM_MODE_DISC && hEncoderConfig->nchan_inp == 1 ) && !( st_ivas->ism_mode == ISM_MODE_PARAM && ( hEncoderConfig->nchan_inp == 3 || hEncoderConfig->nchan_inp == 4 ) ) )
{
return IVAS_ERROR( IVAS_ERR_UNKNOWN, "DTX is not supported in this IVAS format and element mode." );
@@ -1046,11 +1059,7 @@ ivas_error IVAS_ENC_GetDelay(
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
}
-#ifdef BINAURALIZATION_DELAY_REPORT
*delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL ) );
-#else
- *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, 0 ) );
-#endif
*delay *= hEncoderConfig->nchan_inp;
@@ -1071,7 +1080,6 @@ static int16_t getInputBufferSize(
return (int16_t) ( st_ivas->hEncoderConfig->input_Fs * st_ivas->hEncoderConfig->nchan_inp / FRAMES_PER_SEC );
}
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
/*---------------------------------------------------------------------*
* IVAS_ENC_GetNumInChannels()
*
@@ -1096,7 +1104,6 @@ ivas_error IVAS_ENC_GetNumInChannels(
return IVAS_ERR_OK;
}
-#endif
/*---------------------------------------------------------------------*
@@ -1615,11 +1622,11 @@ static ivas_error printConfigInfo_enc(
{
if ( hEncoderConfig->ivas_total_brate <= ACELP_32k && hEncoderConfig->nchan_inp > 2 )
{
- fprintf( stdout, "IVAS format: Param-ISm (%i streams)\n", hEncoderConfig->nchan_inp );
+ fprintf( stdout, "IVAS format: Param-ISM (%i streams)\n", hEncoderConfig->nchan_inp );
}
else
{
- fprintf( stdout, "IVAS format: ISm (%i streams)\n", hEncoderConfig->nchan_inp );
+ fprintf( stdout, "IVAS format: ISM (%i streams)\n", hEncoderConfig->nchan_inp );
}
}
else if ( hEncoderConfig->ivas_format == SBA_FORMAT )
@@ -1827,7 +1834,11 @@ static ivas_error setBitrate(
if ( hEncoderConfig->ivas_format == ISM_FORMAT )
{
+#ifdef FIX_379_EXT_METADATA
+ if ( ( error = sanitizeBitrateISM( hEncoderConfig, hIvasEnc ) ) != IVAS_ERR_OK )
+#else
if ( ( error = sanitizeBitrateISM( hEncoderConfig ) ) != IVAS_ERR_OK )
+#endif
{
return error;
}
@@ -2066,9 +2077,13 @@ static ivas_error sanitizeBandwidth(
*---------------------------------------------------------------------*/
static ivas_error sanitizeBitrateISM(
+#ifdef FIX_379_EXT_METADATA
+ const ENCODER_CONFIG_HANDLE hEncoderConfig,
+ const IVAS_ENC_HANDLE hIvasEnc )
+#else
const ENCODER_CONFIG_HANDLE hEncoderConfig )
+#endif
{
-#ifdef ISM_HIGHEST_BITRATE
if ( hEncoderConfig->ivas_total_brate > IVAS_128k && hEncoderConfig->nchan_inp == 1 )
{
return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for 1 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
@@ -2083,12 +2098,6 @@ static ivas_error sanitizeBitrateISM(
{
return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for 3 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
}
-#else
- if ( hEncoderConfig->ivas_total_brate > IVAS_256k )
- {
- return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too high bitrate for ISm specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
- }
-#endif
if ( hEncoderConfig->ivas_total_brate < IVAS_16k4 && hEncoderConfig->nchan_inp == 2 )
{
@@ -2105,6 +2114,22 @@ static ivas_error sanitizeBitrateISM(
return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for 4 ISM specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
}
+#ifdef FIX_379_EXT_METADATA
+ if ( hIvasEnc->extMetadataApi )
+ {
+ hEncoderConfig->ism_extended_metadata_flag = ( hEncoderConfig->ivas_total_brate >= ISM_EXTENDED_METADATA_BRATE );
+ }
+ else
+ {
+ hEncoderConfig->ism_extended_metadata_flag = 0;
+ }
+#else
+ if ( hEncoderConfig->ivas_total_brate < ISM_EXTENDED_METADATA_BRATE && hEncoderConfig->ism_extended_metadata_flag == 1 )
+ {
+ return IVAS_ERROR( IVAS_ERR_INVALID_BITRATE, "Too low bitrate for extended metadata format specified in IVAS: %d", hEncoderConfig->ivas_total_brate );
+ }
+#endif
+
return IVAS_ERR_OK;
}
@@ -2360,8 +2385,12 @@ static void init_encoder_config(
hEncoderConfig->var_SID_rate_flag = 1;
hEncoderConfig->mc_input_setup = MC_LS_SETUP_INVALID;
hEncoderConfig->stereo_dmx_evs = 0;
+#ifdef NCHAN_ISM_PARAMETER
+ hEncoderConfig->nchan_ism = 0;
+#endif
hEncoderConfig->sba_order = 0;
hEncoderConfig->sba_planar = 0;
+ hEncoderConfig->ism_extended_metadata_flag = 0;
#ifdef DEBUGGING
hEncoderConfig->stereo_mode_cmdl = 0;
hEncoderConfig->force = -1;
diff --git a/lib_enc/lib_enc.h b/lib_enc/lib_enc.h
index 81955d74ea3e9434e09a643141d7942e4781f6ff..a60c2b0a6101268f3f46d073d42c5361104e1cb0 100644
--- a/lib_enc/lib_enc.h
+++ b/lib_enc/lib_enc.h
@@ -191,7 +191,8 @@ ivas_error IVAS_ENC_ConfigureForObjects(
const bool max_bwidth_user, /* i : shows if bandwidth limitation was set by the user (true) or if default bandwidth was used (false) */
const IVAS_ENC_BANDWIDTH maxBandwidth, /* i : bandwidth limitation */
const IVAS_ENC_DTX_CONFIG dtxConfig, /* i : configuration of DTX, can by set to default by using IVAS_ENC_GetDefaultDtxConfig() */
- const uint16_t numObjects /* i : number of objects to be encoded */
+ const uint16_t numObjects, /* i : number of objects to be encoded */
+ const bool ism_extended_metadata /* i : Extended metadata used (true/false), where extended metadata includes radius and orientation */
);
#ifdef MASA_AND_OBJECTS
@@ -322,13 +323,11 @@ ivas_error IVAS_ENC_GetDelay(
int16_t *delay /* o : encoder delay */
);
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
/*! r: encoder error code */
ivas_error IVAS_ENC_GetNumInChannels(
const IVAS_ENC_HANDLE hIvasEnc, /* i/o: IVAS encoder handle */
int16_t *numInChannels /* o : total number of samples expected in the input buffer for current encoder configuration */
);
-#endif
/*! r: encoder error code */
ivas_error IVAS_ENC_GetInputBufferSize(
diff --git a/lib_enc/pre_proc.c b/lib_enc/pre_proc.c
old mode 100644
new mode 100755
index 300cb79787d08451ccd6734198d38938badce4ed..feb0df75ca24bd5feabfe8006d6ce07b51746384
--- a/lib_enc/pre_proc.c
+++ b/lib_enc/pre_proc.c
@@ -219,7 +219,12 @@ void pre_proc(
* NB/WB/SWB/FB bandwidth detector
*----------------------------------------------------------------*/
- bw_detect( st, st->input, NULL, enerBuffer );
+ bw_detect( st, st->input, NULL, enerBuffer
+#ifdef FIX_MDCT_BASED_BWD
+ ,
+ 0
+#endif
+ );
/*----------------------------------------------------------------*
* Noise energy down-ward update and total noise energy estimation
@@ -616,7 +621,12 @@ void pre_proc(
st->gamma = GAMMA16k;
}
- st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode, MCT_CHAN_MODE_REGULAR ); /* TBV: needs checking */
+ st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ MCT_CHAN_MODE_REGULAR
+#endif
+ );
}
st->coder_type = st->coder_type_raw;
diff --git a/lib_enc/rst_enc.c b/lib_enc/rst_enc.c
index 2f19c41665aba07c87b803d0589eb8e2041e6090..3a2041875941a62f4e4b09796f49084332c77ad4 100644
--- a/lib_enc/rst_enc.c
+++ b/lib_enc/rst_enc.c
@@ -84,15 +84,11 @@ void CNG_reset_enc(
set_f( voice_factors, 1.0, NB_SUBFR16k );
-#ifdef PARAM_ISM_DTX_CNG
if ( st->hTdCngEnc != NULL )
{
-#endif
/* Reset active frame counter */
st->hTdCngEnc->act_cnt2 = 0;
-#ifdef PARAM_ISM_DTX_CNG
}
-#endif
/* deactivate bass post-filter */
st->bpf_off = 1;
diff --git a/lib_enc/transient_detection.c b/lib_enc/transient_detection.c
index 91106686c091fe908b9fd9955a479335c6a42963..83f9e2e7a09e26353b7a8ded866256d33fae89d4 100644
--- a/lib_enc/transient_detection.c
+++ b/lib_enc/transient_detection.c
@@ -324,17 +324,18 @@ void SetTCXModeInfo(
hTcxEnc->tcxMode = NO_TCX;
}
}
-
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE )
{
hTcxEnc->tcxMode = TCX_20;
*tcxModeOverlap = FULL_OVERLAP;
st->hTcxCfg->tcx_last_overlap_mode = st->hTcxCfg->tcx_curr_overlap_mode;
}
-
-
+#endif
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
if ( st->mct_chan_mode != MCT_CHAN_MODE_LFE )
{
+#endif
/* set the left window overlap */
if ( st->last_core == ACELP_CORE || st->last_core == AMR_WB_CORE )
{
@@ -403,7 +404,9 @@ void SetTCXModeInfo(
hTcxEnc->tfm_mem = 0.75f;
}
}
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
}
+#endif
/* for the ACELP -> TCX transition frames use full right window overlap */
if ( ( st->hTcxCfg->tcx_last_overlap_mode == TRANSITION_OVERLAP ) && ( *tcxModeOverlap == ALDO_WINDOW ) )
diff --git a/lib_enc/updt_enc.c b/lib_enc/updt_enc.c
index cc2d5fce36637a9b754806d76706c54bb838f73f..b194de06d5d117483e8b0b3e936a878d8866298a 100644
--- a/lib_enc/updt_enc.c
+++ b/lib_enc/updt_enc.c
@@ -408,7 +408,12 @@ void updt_enc_common(
st->gamma = GAMMA16k;
}
- st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode, MCT_CHAN_MODE_REGULAR );
+ st->igf = getIgfPresent( EVS_MONO, st->total_brate, st->bwidth, st->rf_mode
+#ifndef ISSUE_24_CLEANUP_MCT_LFE
+ ,
+ MCT_CHAN_MODE_REGULAR
+#endif
+ );
}
/* update FER clas */
diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend.c
index 00a8d4a135a9529288207b55f20c1a9d240b8d77..c05ae7c2626401afd599719743834488a63786fd 100644
--- a/lib_rend/ivas_crend.c
+++ b/lib_rend/ivas_crend.c
@@ -147,1225 +147,6 @@ static ivas_error ivas_hrtf_close(
return IVAS_ERR_OK;
}
-
-#ifndef FIX_197_CREND_INTERFACE
-/*-------------------------------------------------------------------------
- * ivas_crend_init_from_rom()
- *
- * Allocate and initialize crend renderer handle
- *------------------------------------------------------------------------*/
-
-ivas_error ivas_crend_init_from_rom(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-)
-{
- int16_t i, j, tmp;
- int32_t output_Fs;
- AUDIO_CONFIG intern_config;
- HRTFS_HANDLE hHrtf;
-
-#ifdef FIX_197_CREND_INTERFACE
- hHrtf = st_ivas->hCrendWrapper->hHrtfCrend;
-#else
- hHrtf = st_ivas->hHrtf;
-#endif
-
- output_Fs = st_ivas->hDecoderConfig->output_Fs;
-
- intern_config = st_ivas->intern_config;
-
- if ( intern_config == AUDIO_CONFIG_BINAURAL || intern_config == AUDIO_CONFIG_BINAURAL_ROOM )
- {
- return IVAS_ERR_INTERNAL_FATAL;
- }
-
- if ( hHrtf == NULL )
- {
- if ( ivas_hrtf_open( &hHrtf ) != IVAS_ERR_OK )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for HRTF handle" );
- }
- }
-
- hHrtf->max_num_ir = audioCfg2channels( intern_config );
-
- if ( hHrtf->max_num_ir <= 0 )
- {
- return IVAS_ERR_INTERNAL_FATAL;
- }
-
- /* Do all error checks up front so that the nested if later is easier */
- if ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Encountered unsupported renderer type" );
- }
-
- if ( intern_config != AUDIO_CONFIG_5_1 && intern_config != AUDIO_CONFIG_5_1_2 && intern_config != AUDIO_CONFIG_5_1_4 &&
- intern_config != AUDIO_CONFIG_7_1 && intern_config != AUDIO_CONFIG_7_1_4 &&
- intern_config != AUDIO_CONFIG_FOA && intern_config != AUDIO_CONFIG_HOA2 && intern_config != AUDIO_CONFIG_HOA3 )
- {
- return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Encountered unsupported transport config in Crend" );
- }
-
- if ( ( ( st_ivas->hRenderConfig != NULL ) && !st_ivas->hRenderConfig->roomAcoustics.use_brir ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV ) )
- {
- if ( intern_config == AUDIO_CONFIG_5_1 || intern_config == AUDIO_CONFIG_5_1_2 || intern_config == AUDIO_CONFIG_5_1_4 ||
- intern_config == AUDIO_CONFIG_7_1 || intern_config == AUDIO_CONFIG_7_1_4 )
- {
- hHrtf->max_num_ir -= 1; /* subtract LFE */
- hHrtf->gain_lfe = GAIN_LFE;
-
- if ( output_Fs == 48000 )
- {
- hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_48kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz;
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_48kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_48kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_48kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_48kHz[j];
- }
- }
- else if ( output_Fs == 32000 )
- {
- hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_32kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz;
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_32kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_32kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_32kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_32kHz[j];
- }
- }
- else if ( output_Fs == 16000 )
- {
- hHrtf->latency_s = CRendBin_Combined_HRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_16kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz;
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_HRIR_num_iterations_diffuse_16kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_HRIR_pIndex_frequency_max_diffuse_16kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_HRIR_coeff_diffuse_re_16kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_HRIR_coeff_diffuse_im_16kHz[j];
- }
- }
- else
- {
- return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" );
- }
-
- for ( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- if ( intern_config == AUDIO_CONFIG_5_1 )
- {
- tmp = channelIndex_CICP6[i];
- }
- else if ( intern_config == AUDIO_CONFIG_7_1 )
- {
- tmp = channelIndex_CICP12[i];
- }
- else if ( intern_config == AUDIO_CONFIG_5_1_2 )
- {
- tmp = channelIndex_CICP14[i];
- }
- else if ( intern_config == AUDIO_CONFIG_5_1_4 )
- {
- tmp = channelIndex_CICP16[i];
- }
- else if ( intern_config == AUDIO_CONFIG_7_1_4 )
- {
- tmp = channelIndex_CICP19[i];
- }
- else
- {
- return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Channel configuration not specified!\n\n" );
- }
-
- if ( output_Fs == 48000 )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_48kHz[tmp];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_48kHz[tmp][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_48kHz[tmp][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_48kHz[tmp][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_48kHz[tmp][j];
- }
- }
- else if ( output_Fs == 32000 )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_32kHz[tmp];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_32kHz[tmp][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_32kHz[tmp][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_32kHz[tmp][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_32kHz[tmp][j];
- }
- }
- else if ( output_Fs == 16000 )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_HRIR_inv_diffuse_weight_16kHz[tmp];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_Combined_HRIR_num_iterations_16kHz[tmp][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_HRIR_pIndex_frequency_max_16kHz[tmp][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_HRIR_coeff_re_16kHz[tmp][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_HRIR_coeff_im_16kHz[tmp][j];
- }
- }
- else
- {
- return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" );
- }
- }
- }
- else if ( intern_config == AUDIO_CONFIG_FOA || intern_config == AUDIO_CONFIG_HOA2 || intern_config == AUDIO_CONFIG_HOA3 )
- {
- if ( output_Fs == 48000 )
- {
- hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_48kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz;
-
- for ( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_48kHz[i];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_48kHz[i][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[i][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_48kHz[i][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_48kHz[i][j];
- }
- }
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_48kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_48kHz[j];
- }
- }
- else if ( output_Fs == 32000 )
- {
- hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_32kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz;
-
- for ( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_32kHz[i];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_32kHz[i][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[i][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_32kHz[i][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_32kHz[i][j];
- }
- }
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_32kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_32kHz[j];
- }
- }
- else if ( output_Fs == 16000 )
- {
- hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_16kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz;
-
- for ( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_16kHz[i];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_16kHz[i][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[i][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_16kHz[i][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_16kHz[i][j];
- }
- }
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[j];
- }
- }
- else
- {
- return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" );
- }
- }
- }
- else if ( ( ( st_ivas->hRenderConfig != NULL ) && st_ivas->hRenderConfig->roomAcoustics.use_brir ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) )
- {
- if ( intern_config == AUDIO_CONFIG_5_1 || intern_config == AUDIO_CONFIG_5_1_2 || intern_config == AUDIO_CONFIG_5_1_4 ||
- intern_config == AUDIO_CONFIG_7_1 || intern_config == AUDIO_CONFIG_7_1_4 )
- {
- hHrtf->max_num_ir -= 1; /* subtract LFE */
- hHrtf->gain_lfe = GAIN_LFE;
-
- if ( output_Fs == 48000 )
- {
- hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_48kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz;
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_48kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_48kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_48kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_48kHz[j];
- }
- }
- else if ( output_Fs == 32000 )
- {
- hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_32kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz;
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_32kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_32kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_32kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_32kHz[j];
- }
- }
- else if ( output_Fs == 16000 )
- {
- hHrtf->latency_s = CRendBin_Combined_BRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_16kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz;
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_Combined_BRIR_num_iterations_diffuse_16kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_Combined_BRIR_pIndex_frequency_max_diffuse_16kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_Combined_BRIR_coeff_diffuse_re_16kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[j];
- }
- }
- else
- {
- return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" );
- }
-
- for ( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- if ( intern_config == AUDIO_CONFIG_5_1 )
- {
- tmp = channelIndex_CICP6[i];
- }
- else if ( intern_config == AUDIO_CONFIG_7_1 )
- {
- tmp = channelIndex_CICP12[i];
- }
- else if ( intern_config == AUDIO_CONFIG_5_1_2 )
- {
- tmp = channelIndex_CICP14[i];
- }
- else if ( intern_config == AUDIO_CONFIG_5_1_4 )
- {
- tmp = channelIndex_CICP16[i];
- }
- else if ( intern_config == AUDIO_CONFIG_7_1_4 )
- {
- tmp = channelIndex_CICP19[i];
- }
- else
- {
- return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Channel configuration not specified!\n\n" );
- }
-
- if ( output_Fs == 48000 )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_48kHz[tmp];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_48kHz[tmp][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_48kHz[tmp][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_48kHz[tmp][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_48kHz[tmp][j];
- }
- }
- else if ( output_Fs == 32000 )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_32kHz[tmp];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_32kHz[tmp][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_32kHz[tmp][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_32kHz[tmp][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_32kHz[tmp][j];
- }
- }
- else if ( output_Fs == 16000 )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_Combined_BRIR_inv_diffuse_weight_16kHz[tmp];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_Combined_BRIR_num_iterations_16kHz[tmp][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_Combined_BRIR_pIndex_frequency_max_16kHz[tmp][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_Combined_BRIR_coeff_re_16kHz[tmp][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_Combined_BRIR_coeff_im_16kHz[tmp][j];
- }
- }
- else
- {
- return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" );
- }
- }
- }
- else if ( intern_config == AUDIO_CONFIG_FOA || intern_config == AUDIO_CONFIG_HOA2 || intern_config == AUDIO_CONFIG_HOA3 )
- {
- if ( output_Fs == 48000 )
- {
- hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_48kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz;
-
- for ( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_48kHz[i];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_48kHz[i][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_48kHz[i][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_48kHz[i][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_48kHz[i][j];
- }
- }
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_48kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_48kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_48kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_48kHz[j];
- }
- }
- else if ( output_Fs == 32000 )
- {
- hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_32kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz;
-
- for ( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_32kHz[i];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_32kHz[i][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_32kHz[i][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_32kHz[i][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_32kHz[i][j];
- }
- }
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_32kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_32kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_32kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_32kHz[j];
- }
- }
- else if ( output_Fs == 16000 )
- {
- hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s;
-
- hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_16kHz;
- hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz;
-
- for ( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- hHrtf->inv_diffuse_weight[i] = CRendBin_HOA3_HRIR_inv_diffuse_weight_16kHz[i];
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations[i][j] = CRendBin_HOA3_HRIR_num_iterations_16kHz[i][j];
- hHrtf->pIndex_frequency_max[i][j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_16kHz[i][j];
- hHrtf->pOut_to_bin_re[i][j] = CRendBin_HOA3_HRIR_coeff_re_16kHz[i][j];
- hHrtf->pOut_to_bin_im[i][j] = CRendBin_HOA3_HRIR_coeff_im_16kHz[i][j];
- }
- }
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = CRendBin_HOA3_HRIR_num_iterations_diffuse_16kHz[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = CRendBin_HOA3_HRIR_pIndex_frequency_max_diffuse_16kHz[j];
- hHrtf->pOut_to_bin_diffuse_re[j] = CRendBin_HOA3_HRIR_coeff_diffuse_re_16kHz[j];
- hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[j];
- }
- }
- else
- {
- return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" );
- }
- }
- else
- {
- return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported intern_config type in Crend" );
- }
- }
- else
- {
- return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported renderer type in Crend" );
- }
-
-#ifdef FIX_197_CREND_INTERFACE
- st_ivas->hCrendWrapper->hHrtfCrend = hHrtf;
-#else
- st_ivas->hHrtf = hHrtf;
-#endif
-
- return IVAS_ERR_OK;
-}
-#endif
-
-#ifndef FIX_197_CREND_INTERFACE
-/*-------------------------------------------------------------------------
- * ivas_crend_init_from_hrtf_handle()
- *
- * Allocate and initialize Crend HRTF handle from external file
- *------------------------------------------------------------------------*/
-
-ivas_error ivas_crend_init_from_hrtf_handle(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- HRTFS_HANDLE hrtf )
-{
- int16_t i, j, as_lfe_filter;
- const int16_t *hchannelIndex = NULL;
- AUDIO_CONFIG transport_config;
-
- if ( st_ivas == NULL )
- {
- return IVAS_ERR_INTERNAL;
- }
-
- if ( hrtf == NULL )
- {
- return IVAS_ERR_INVALID_HRTF;
- }
-
- if ( st_ivas->hHrtf != NULL )
- {
- ivas_hrtf_close( &st_ivas->hHrtf );
- }
-
- if ( ivas_hrtf_open( &( st_ivas->hHrtf ) ) != IVAS_ERR_OK )
- {
- return IVAS_ERR_INTERNAL;
- }
-
- if ( st_ivas->hHrtf != NULL )
- {
- st_ivas->hHrtf->latency_s = hrtf->latency_s;
- // st_ivas->hHrtf->max_num_ir->max_ir_len = hrtf->max_ir_len;
- st_ivas->hHrtf->max_num_iterations = hrtf->max_num_iterations;
- st_ivas->hHrtf->gain_lfe = hrtf->gain_lfe;
- // st_ivas->hHrtf->crend_hr_gain_foa_to_bin = hrtf->crend_hr_gain_foa_to_bin;
- st_ivas->hHrtf->max_num_ir = 0;
- st_ivas->hIntSetup.nchan_out_woLFE = 0;
- st_ivas->hIntSetup.num_lfe = 0;
- st_ivas->hIntSetup.nchan_out_woLFE = 0;
-
- transport_config = st_ivas->intern_config == AUDIO_CONFIG_INVALID ? st_ivas->transport_config : st_ivas->intern_config;
-
- switch ( transport_config )
- {
- case AUDIO_CONFIG_5_1:
- st_ivas->hHrtf->max_num_ir = 5;
- st_ivas->hHrtf->gain_lfe = GAIN_LFE;
- st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hHrtf->max_num_ir;
- st_ivas->hIntSetup.num_lfe = 1;
- hchannelIndex = (const int16_t *) &channelIndex_CICP6;
- break;
- case AUDIO_CONFIG_7_1:
- st_ivas->hHrtf->max_num_ir = 7;
- st_ivas->hHrtf->gain_lfe = GAIN_LFE;
- st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hHrtf->max_num_ir;
- st_ivas->hIntSetup.num_lfe = 1;
- hchannelIndex = (const int16_t *) &channelIndex_CICP12;
- break;
- case AUDIO_CONFIG_5_1_2:
- st_ivas->hHrtf->max_num_ir = 7;
- st_ivas->hHrtf->gain_lfe = GAIN_LFE;
- st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hHrtf->max_num_ir;
- st_ivas->hIntSetup.num_lfe = 1;
- hchannelIndex = (const int16_t *) &channelIndex_CICP14;
- break;
- case AUDIO_CONFIG_5_1_4:
- st_ivas->hHrtf->max_num_ir = 9;
- st_ivas->hHrtf->gain_lfe = GAIN_LFE;
- st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hHrtf->max_num_ir;
- st_ivas->hIntSetup.num_lfe = 1;
- hchannelIndex = (const int16_t *) &channelIndex_CICP16;
- break;
- case AUDIO_CONFIG_7_1_4:
- st_ivas->hHrtf->max_num_ir = 11;
- st_ivas->hHrtf->gain_lfe = GAIN_LFE;
- st_ivas->hIntSetup.nchan_out_woLFE = st_ivas->hHrtf->max_num_ir;
- st_ivas->hIntSetup.num_lfe = 1;
- hchannelIndex = (const int16_t *) &channelIndex_CICP19;
- break;
- case AUDIO_CONFIG_FOA:
- st_ivas->hIntSetup.ambisonics_order = 1;
- st_ivas->hHrtf->max_num_ir = 4;
- break;
- case AUDIO_CONFIG_HOA2:
- st_ivas->hIntSetup.ambisonics_order = 2;
- st_ivas->hHrtf->max_num_ir = 9;
- break;
- case AUDIO_CONFIG_HOA3:
- st_ivas->hIntSetup.ambisonics_order = 3;
- st_ivas->hHrtf->max_num_ir = 16;
- break;
- default:
- break;
- }
-
- as_lfe_filter = 0;
- if ( ( st_ivas->hHrtf->max_num_ir != hrtf->max_num_ir ) && ( st_ivas->hHrtf->max_num_ir + 1 == hrtf->max_num_ir ) )
- {
- as_lfe_filter = 1;
- hchannelIndex = NULL;
- }
-
- if ( st_ivas->hHrtf->max_num_ir == 0 )
- {
- return IVAS_ERR_INTERNAL;
- }
-
- for ( i = 0; i < st_ivas->hHrtf->max_num_ir; i++ )
- {
- int16_t tmp = i;
- if ( hchannelIndex != NULL )
- {
- tmp = hchannelIndex[i];
- }
- if ( as_lfe_filter )
- {
- if ( tmp > 2 )
- {
- tmp++;
- }
- }
-
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- st_ivas->hHrtf->pOut_to_bin_re[i][j] = hrtf->pOut_to_bin_re[tmp][j];
- st_ivas->hHrtf->pOut_to_bin_im[i][j] = hrtf->pOut_to_bin_im[tmp][j];
- st_ivas->hHrtf->num_iterations[i][j] = hrtf->num_iterations[tmp][j];
- st_ivas->hHrtf->pIndex_frequency_max[i][j] = hrtf->pIndex_frequency_max[tmp][j];
- }
- st_ivas->hHrtf->inv_diffuse_weight[i] = hrtf->inv_diffuse_weight[tmp];
- }
- for ( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- st_ivas->hHrtf->pOut_to_bin_diffuse_re[j] = hrtf->pOut_to_bin_diffuse_re[j];
- st_ivas->hHrtf->pOut_to_bin_diffuse_im[j] = hrtf->pOut_to_bin_diffuse_im[j];
- st_ivas->hHrtf->num_iterations_diffuse[j] = hrtf->num_iterations_diffuse[j];
- st_ivas->hHrtf->pIndex_frequency_max_diffuse[j] = hrtf->pIndex_frequency_max_diffuse[j];
- }
- st_ivas->hHrtf->index_frequency_max_diffuse = hrtf->index_frequency_max_diffuse;
- }
- return IVAS_ERR_OK;
-}
-
-/*-------------------------------------------------------------------------
- * ivas_crend_init_from_setofhrtf()
- *
- * Allocate and initialize crend renderer handle
- *------------------------------------------------------------------------*/
-
-ivas_error ivas_crend_init_from_setofhrtf(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-)
-{
- ivas_error error;
- AUDIO_CONFIG transport_config;
-
- transport_config = st_ivas->intern_config == AUDIO_CONFIG_INVALID ? st_ivas->transport_config : st_ivas->intern_config;
- switch ( transport_config )
- {
- case AUDIO_CONFIG_5_1:
- case AUDIO_CONFIG_5_1_2:
- case AUDIO_CONFIG_5_1_4:
- case AUDIO_CONFIG_7_1:
- case AUDIO_CONFIG_7_1_4:
- if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
- {
- if ( ( error = ivas_crend_init_from_hrtf_handle( st_ivas, st_ivas->hSetOfHRTF->hHRTF_brir_combined ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
- else
- {
- if ( ( error = ivas_crend_init_from_hrtf_handle( st_ivas, st_ivas->hSetOfHRTF->hHRTF_hrir_combined ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
- break;
- case AUDIO_CONFIG_FOA:
- case AUDIO_CONFIG_HOA2:
- case AUDIO_CONFIG_HOA3:
- if ( ( error = ivas_crend_init_from_hrtf_handle( st_ivas, st_ivas->hSetOfHRTF->hHRTF_hrir_hoa3 ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- break;
- default:
- return IVAS_ERR_INTERNAL;
- }
-
- return IVAS_ERR_OK;
-}
-
-#endif
-
-#ifndef FIX_197_CREND_INTERFACE
-/*-------------------------------------------------------------------------
- * ivas_crend_open()
- *
- * Allocate and initialize Crend renderer handle
- *------------------------------------------------------------------------*/
-
-ivas_error ivas_crend_open(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-)
-{
- int16_t i, subframe_length;
- int16_t max_total_ir_len;
- HRTFS_HANDLE hHrtf;
- CREND_HANDLE hCrend;
- ivas_error error;
-
- error = IVAS_ERR_OK;
- subframe_length = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES;
-
- if ( ( st_ivas->hHrtf == NULL ) && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) )
- {
- if ( st_ivas->hSetOfHRTF != NULL )
- {
- if ( ( error = ivas_crend_init_from_setofhrtf( st_ivas ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
- else
- {
- if ( ( error = ivas_crend_init_from_rom( st_ivas ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
- }
-
- if ( ( hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer handle" );
- }
-
- hCrend->lfe_delay_line = NULL;
-
- for ( i = 0; i < MAX_INTERN_CHANNELS; i++ )
- {
- hCrend->freq_buffer_re[i] = NULL;
- hCrend->freq_buffer_im[i] = NULL;
- }
-
- for ( i = 0; i < BINAURAL_CHANNELS; i++ )
- {
- hCrend->prev_out_buffer[i] = NULL;
- }
-
- hCrend->freq_buffer_re_diffuse = NULL;
- hCrend->freq_buffer_im_diffuse = NULL;
- hCrend->hReverb = NULL;
- hCrend->delay_line_rw_index = 0;
- hCrend->diffuse_delay_line_rw_index = 0;
- hCrend->hTrack = NULL;
- hCrend->m_fYaw = 0;
- hCrend->m_fPitch = 0;
- hCrend->m_fRoll = 0;
-
- hHrtf = st_ivas->hHrtf;
-
- if ( ( hHrtf != NULL ) && ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM ) )
- {
- max_total_ir_len = hHrtf->max_num_iterations * subframe_length;
-
- for ( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- if ( ( hCrend->freq_buffer_re[i] = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );
- }
- set_f( hCrend->freq_buffer_re[i], 0, max_total_ir_len );
-
- if ( ( hCrend->freq_buffer_im[i] = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );
- }
- set_f( hCrend->freq_buffer_im[i], 0, max_total_ir_len );
- }
-
- for ( i = 0; i < BINAURAL_CHANNELS; i++ )
- {
- if ( ( hCrend->prev_out_buffer[i] = (float *) malloc( sizeof( float ) * subframe_length ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );
- }
- set_f( hCrend->prev_out_buffer[i], 0, subframe_length );
- }
-
- max_total_ir_len = hHrtf->num_iterations_diffuse[0] * subframe_length;
-
- if ( max_total_ir_len > 0 )
- {
- if ( ( hCrend->freq_buffer_re_diffuse = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );
- }
- set_f( hCrend->freq_buffer_re_diffuse, 0, max_total_ir_len );
-
- if ( ( hCrend->freq_buffer_im_diffuse = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );
- }
- set_f( hCrend->freq_buffer_im_diffuse, 0, max_total_ir_len );
- }
- else
- {
- hCrend->freq_buffer_re_diffuse = NULL;
- hCrend->freq_buffer_im_diffuse = NULL;
- }
-
- max_total_ir_len = (int16_t) ( hHrtf->latency_s * st_ivas->hDecoderConfig->output_Fs + 0.5f ) + subframe_length;
- if ( max_total_ir_len > 0 )
- {
- if ( ( hCrend->lfe_delay_line = (float *) malloc( sizeof( float ) * max_total_ir_len ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend" );
- }
- set_f( hCrend->lfe_delay_line, 0, max_total_ir_len );
- }
- else
- {
- hCrend->lfe_delay_line = NULL;
- }
-
- if ( st_ivas->hDecoderConfig->Opt_Headrotation )
- {
- if ( ( hCrend->hTrack = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" );
- }
-
- ivas_orient_trk_Init( hCrend->hTrack );
- }
- else
- {
- hCrend->hTrack = NULL;
- }
-
- if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT && st_ivas->hDecoderConfig->Opt_Headrotation )
- {
- if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
-
- if ( ( ( st_ivas->hRenderConfig != NULL ) && st_ivas->hRenderConfig->roomAcoustics.late_reverb_on ) )
- {
- if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), st_ivas->intern_config, hHrtf, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
- else
- {
- hCrend->hReverb = NULL;
- }
-
- st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtf->latency_s * 1000000000.f );
- }
-
- st_ivas->hCrend = hCrend;
-
- return error;
-}
-#endif
-
-#ifndef FIX_197_CREND_INTERFACE
-
-/*-------------------------------------------------------------------------
- * ivas_crend_close()
- *
- * Deallocate Crend renderer handle
- *------------------------------------------------------------------------*/
-
-ivas_error ivas_crend_close(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-)
-{
- int16_t i;
-
- if ( st_ivas->hHrtf != NULL )
- {
- ivas_hrtf_close( &st_ivas->hHrtf );
- }
-
- if ( st_ivas->hCrend != NULL )
- {
- if ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD )
- {
- for ( i = 0; i < MAX_INTERN_CHANNELS; i++ )
- {
- if ( st_ivas->hCrend->freq_buffer_re[i] != NULL )
- {
- free( st_ivas->hCrend->freq_buffer_re[i] );
- st_ivas->hCrend->freq_buffer_re[i] = NULL;
- }
- if ( st_ivas->hCrend->freq_buffer_im[i] != NULL )
- {
- free( st_ivas->hCrend->freq_buffer_im[i] );
- st_ivas->hCrend->freq_buffer_im[i] = NULL;
- }
- }
-
- for ( i = 0; i < BINAURAL_CHANNELS; i++ )
- {
- if ( st_ivas->hCrend->prev_out_buffer[i] != NULL )
- {
- free( st_ivas->hCrend->prev_out_buffer[i] );
- st_ivas->hCrend->prev_out_buffer[i] = NULL;
- }
- }
-
- if ( st_ivas->hCrend->lfe_delay_line != NULL )
- {
- free( st_ivas->hCrend->lfe_delay_line );
- st_ivas->hCrend->lfe_delay_line = NULL;
- }
-
- if ( st_ivas->hCrend->freq_buffer_re_diffuse != NULL )
- {
- free( st_ivas->hCrend->freq_buffer_re_diffuse );
- st_ivas->hCrend->freq_buffer_re_diffuse = NULL;
- }
-
- if ( st_ivas->hCrend->freq_buffer_im_diffuse != NULL )
- {
- free( st_ivas->hCrend->freq_buffer_im_diffuse );
- st_ivas->hCrend->freq_buffer_im_diffuse = NULL;
- }
-
- if ( st_ivas->hCrend->hTrack != NULL )
- {
- free( st_ivas->hCrend->hTrack );
- st_ivas->hCrend->hTrack = NULL;
- }
- }
-
- ivas_reverb_close( &st_ivas->hCrend->hReverb );
-
- free( st_ivas->hCrend );
- st_ivas->hCrend = NULL;
- }
-
- return IVAS_ERR_OK;
-}
-#endif
-
-#ifndef FIX_197_CREND_INTERFACE
-
-/*-----------------------------------------------------------------------------------------*
- * Function ivas_crend_convolver()
- *
- * Convolver block
- *-----------------------------------------------------------------------------------------*/
-
-static ivas_error ivas_crend_convolver(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- float pcm_in[][L_FRAME48k],
- float pcm_out[][L_FRAME48k],
- const int16_t i_ts )
-{
- float *pIn;
- float *pFreq_buf_re;
- float *pFreq_buf_im;
- float *pFreq_filt_re;
- float *pFreq_filt_im;
- int16_t i, j, k, m, nchan_out, subframe_length, nchan_intern, idx_in;
- float pOut[L_FRAME48k * 2];
- float tmp_out_re[L_FRAME48k], tmp_out_im[L_FRAME48k];
- int16_t offset, offset_in, offset_diffuse;
- int32_t output_Fs;
-
- nchan_intern = audioCfg2channels( st_ivas->intern_config );
- nchan_out = st_ivas->hDecoderConfig->nchan_out;
- output_Fs = st_ivas->hDecoderConfig->output_Fs;
- subframe_length = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES;
-
- offset = st_ivas->hCrend->delay_line_rw_index * subframe_length; /* subframe_length * ( st_ivas->hHrtf->max_num_iterations - 1 ); */
- offset_diffuse = st_ivas->hCrend->diffuse_delay_line_rw_index * subframe_length; /* subframe_length *( st_ivas->hHrtf->num_iterations_diffuse[0] - 1 ); */
-
- if ( st_ivas->hHrtf->num_iterations_diffuse[0] > 0 )
- {
- set_zero( &st_ivas->hCrend->freq_buffer_re_diffuse[offset_diffuse], subframe_length );
- set_zero( &st_ivas->hCrend->freq_buffer_im_diffuse[offset_diffuse], subframe_length );
- }
-
- i = 0;
- for ( idx_in = 0; idx_in < nchan_intern; idx_in++ )
- {
- pIn = &pcm_in[idx_in][i_ts * subframe_length];
- if ( st_ivas->hIntSetup.index_lfe[0] != idx_in )
- {
- if ( st_ivas->hHrtf->num_iterations_diffuse[0] > 0 )
- {
- pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re_diffuse[offset_diffuse];
- pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im_diffuse[offset_diffuse];
- pFreq_filt_re = &st_ivas->hCrend->freq_buffer_re[i][offset];
- pFreq_filt_im = &st_ivas->hCrend->freq_buffer_im[i][offset];
-
- for ( k = 0; k < st_ivas->hHrtf->index_frequency_max_diffuse; k++ )
- {
- pFreq_buf_re[k] += pFreq_filt_re[k] * st_ivas->hHrtf->inv_diffuse_weight[i];
- pFreq_buf_im[k] += pFreq_filt_im[k] * st_ivas->hHrtf->inv_diffuse_weight[i];
- }
- }
-
- pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re[i][offset];
- pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im[i][offset];
-
- ivas_mdft( pIn, pFreq_buf_re, pFreq_buf_im, subframe_length, subframe_length );
- i++;
- }
- }
-
- for ( j = 0; j < nchan_out; j++ )
- {
- set_zero( tmp_out_re, subframe_length );
- set_zero( tmp_out_im, subframe_length );
-
- i = 0;
- for ( idx_in = 0; idx_in < nchan_intern; idx_in++ )
- {
- if ( idx_in != st_ivas->hIntSetup.index_lfe[0] )
- {
- offset = 0;
- for ( m = 0; m < st_ivas->hHrtf->num_iterations[i][j]; m++ )
- {
- offset_in = ( st_ivas->hCrend->delay_line_rw_index + st_ivas->hHrtf->max_num_iterations - st_ivas->hHrtf->num_iterations[i][j] + m + 1 );
- offset_in = offset_in % ( st_ivas->hHrtf->max_num_iterations );
- offset_in = offset_in * subframe_length;
- pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re[i][offset_in];
- pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im[i][offset_in];
- pFreq_filt_re = &st_ivas->hHrtf->pOut_to_bin_re[i][j][offset];
- pFreq_filt_im = &st_ivas->hHrtf->pOut_to_bin_im[i][j][offset];
-
- for ( k = 0; k < st_ivas->hHrtf->pIndex_frequency_max[i][j][m]; k++ )
- {
- tmp_out_re[k] += pFreq_buf_re[k] * pFreq_filt_re[k] - pFreq_buf_im[k] * pFreq_filt_im[k];
- tmp_out_im[k] += pFreq_buf_re[k] * pFreq_filt_im[k] + pFreq_buf_im[k] * pFreq_filt_re[k];
- }
- offset = offset + k;
- }
- i++;
- }
- }
-
- offset = 0;
- for ( m = 0; m < st_ivas->hHrtf->num_iterations_diffuse[j]; m++ )
- {
- offset_diffuse = ( st_ivas->hCrend->diffuse_delay_line_rw_index + m + 1 );
- offset_diffuse = offset_diffuse % st_ivas->hHrtf->num_iterations_diffuse[0];
- offset_diffuse = offset_diffuse * subframe_length;
- pFreq_buf_re = &st_ivas->hCrend->freq_buffer_re_diffuse[offset_diffuse];
- pFreq_buf_im = &st_ivas->hCrend->freq_buffer_im_diffuse[offset_diffuse];
- pFreq_filt_re = &st_ivas->hHrtf->pOut_to_bin_diffuse_re[j][offset];
- pFreq_filt_im = &st_ivas->hHrtf->pOut_to_bin_diffuse_im[j][offset];
-
- for ( k = 0; k < st_ivas->hHrtf->pIndex_frequency_max_diffuse[j][m]; k++ )
- {
- tmp_out_re[k] += pFreq_buf_re[k] * pFreq_filt_re[k] - pFreq_buf_im[k] * pFreq_filt_im[k];
- tmp_out_im[k] += pFreq_buf_re[k] * pFreq_filt_im[k] + pFreq_buf_im[k] * pFreq_filt_re[k];
- }
- offset = offset + k;
- }
-
- ivas_imdft( tmp_out_re, tmp_out_im, pOut, subframe_length );
-
- pFreq_buf_re = &pcm_out[j][i_ts * subframe_length];
- for ( k = 0; k < subframe_length; k++ )
- {
- pFreq_buf_re[k] = pOut[k] + st_ivas->hCrend->prev_out_buffer[j][k];
- st_ivas->hCrend->prev_out_buffer[j][k] = pOut[k + subframe_length];
- }
- }
-
- st_ivas->hCrend->delay_line_rw_index++;
- st_ivas->hCrend->delay_line_rw_index = st_ivas->hCrend->delay_line_rw_index % ( st_ivas->hHrtf->max_num_iterations );
- if ( st_ivas->hHrtf->num_iterations_diffuse[0] > 0 )
- {
- st_ivas->hCrend->diffuse_delay_line_rw_index++;
- st_ivas->hCrend->diffuse_delay_line_rw_index = st_ivas->hCrend->diffuse_delay_line_rw_index % ( st_ivas->hHrtf->num_iterations_diffuse[0] );
- }
-
- return IVAS_ERR_OK;
-}
-#endif
-
-#ifndef FIX_197_CREND_INTERFACE
-
-/*-----------------------------------------------------------------------------------------*
- * Function ivas_crend_process()
- *
- * Process call for IVAS Crend renderer
- *-----------------------------------------------------------------------------------------*/
-
-ivas_error ivas_crend_process(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- float output[][L_FRAME48k] /* i/o: input/output audio channels */
-)
-{
- int16_t i, nchan_out, output_frame;
- int16_t subframe_len, subframe_idx;
- float pcm_tmp[BINAURAL_CHANNELS][L_FRAME48k];
- AUDIO_CONFIG intern_config;
- ivas_error error;
-
- push_wmops( "ivas_crend_process" );
-
- intern_config = st_ivas->intern_config;
- nchan_out = st_ivas->hDecoderConfig->nchan_out;
- output_frame = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC );
- subframe_len = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES;
-
- for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ )
- {
- if ( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData && st_ivas->hHeadTrackData->num_quaternions >= 0 )
- {
- /* Orientation tracking */
- if ( st_ivas->hCrend->hTrack != NULL )
- {
- if ( st_ivas->hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_AVG )
- {
- ivas_orient_trk_SetTrackingType( st_ivas->hCrend->hTrack, OTR_TRACKING_AVG_ORIENT );
- }
- else
- {
- ivas_orient_trk_SetTrackingType( st_ivas->hCrend->hTrack, OTR_TRACKING_REF_ORIENT );
- }
-
- /* get current subframe quaternion and convert to euler angles */
- Quat2Euler( st_ivas->hHeadTrackData->Quaternions[subframe_idx], &( st_ivas->hCrend->m_fYaw ), &( st_ivas->hCrend->m_fPitch ), &( st_ivas->hCrend->m_fRoll ) );
- ivas_orient_trk_SetAbsoluteOrientation( st_ivas->hCrend->hTrack, st_ivas->hCrend->m_fYaw, st_ivas->hCrend->m_fPitch, st_ivas->hCrend->m_fRoll );
- ivas_orient_trk_Process( st_ivas->hCrend->hTrack );
- ivas_orient_trk_GetTrackedOrientation( st_ivas->hCrend->hTrack, &( st_ivas->hCrend->m_fYaw ), &( st_ivas->hCrend->m_fPitch ), &( st_ivas->hCrend->m_fRoll ) );
- }
-
- /* Rotation in SHD for:
- MC with elevation (5_1_2 / 5_1_4 / 7_1_4) -> BINAURAL
- SBA SPAR -> BINAURAL or BINAURAL_ROOM
- */
- if ( intern_config == AUDIO_CONFIG_FOA || intern_config == AUDIO_CONFIG_HOA2 || intern_config == AUDIO_CONFIG_HOA3 )
- {
- rotateFrame_shd( st_ivas->hHeadTrackData, output, subframe_len, st_ivas->hIntSetup, subframe_idx );
- }
- /* Rotation in SD for MC -> BINAURAL_ROOM */
- else if ( st_ivas->ivas_format != ISM_FORMAT && st_ivas->hIntSetup.is_loudspeaker_setup )
- {
- rotateFrame_sd( st_ivas->hHeadTrackData, output, subframe_len, st_ivas->hIntSetup, st_ivas->hEFAPdata, subframe_idx );
- }
- }
-
- if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
- {
- if ( ( intern_config == AUDIO_CONFIG_FOA ) || ( intern_config == AUDIO_CONFIG_HOA2 ) || ( intern_config == AUDIO_CONFIG_HOA3 ) ||
- ( intern_config == AUDIO_CONFIG_5_1 ) || ( intern_config == AUDIO_CONFIG_7_1 ) ||
- ( intern_config == AUDIO_CONFIG_5_1_2 ) || ( intern_config == AUDIO_CONFIG_5_1_4 ) || ( intern_config == AUDIO_CONFIG_7_1_4 ) )
- {
- ivas_crend_convolver( st_ivas, output, pcm_tmp, subframe_idx );
-
- if ( st_ivas->hCrend->hReverb != NULL )
- {
- if ( ( error = ivas_reverb_process( st_ivas->hCrend->hReverb, intern_config, 1, output, pcm_tmp, subframe_idx ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
- }
- else
- {
- return IVAS_ERR_INVALID_INPUT_FORMAT;
- }
- }
- else
- {
- return IVAS_ERR_INTERNAL_FATAL;
- }
- }
-
- /* move to output */
- for ( i = 0; i < nchan_out; i++ )
- {
- mvr2r( pcm_tmp[i], output[i], output_frame );
- }
-
- pop_wmops();
-
- return IVAS_ERR_OK;
-}
-#endif
-
-
/*-------------------------------------------------------------------------
* initCrend_from_rom()
*
@@ -1400,10 +181,12 @@ static ivas_error ivas_rend_initCrend(
{
return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Encountered unsupported input config in Crend" );
}
+
if ( outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL && outConfig != IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Encountered unsupported output type in Crend" );
}
+
if ( hHrtf == NULL )
{
if ( ivas_hrtf_open( &hHrtf ) != IVAS_ERR_OK )
@@ -1414,17 +197,10 @@ static ivas_error ivas_rend_initCrend(
/* set BRIR flag */
use_brir = false;
-#ifdef FIX_197_CREND_INTERFACE
if ( ( ( hRendCfg != NULL ) && hRendCfg->roomAcoustics.use_brir ) || ( ( hRendCfg == NULL ) && ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) ) )
{
use_brir = true;
}
-#else
- if ( ( hRendCfg != NULL && hRendCfg->roomAcoustics.use_brir ) || outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM )
- {
- use_brir = true;
- }
-#endif
if ( ( error = getAudioConfigNumChannels( inConfig, &nchan_in ) ) != IVAS_ERR_OK )
@@ -1891,8 +667,6 @@ static ivas_error ivas_rend_initCrend(
return IVAS_ERR_OK;
}
-#ifdef FIX_197_CREND_INTERFACE
-#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
/*-------------------------------------------------------------------------
* ivas_rend_initCrendWrapper()
*
@@ -1903,14 +677,17 @@ ivas_error ivas_rend_initCrendWrapper(
CREND_WRAPPER_HANDLE *pCrend )
{
int16_t i;
+
if ( pCrend == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer handle" );
}
+
if ( ( *pCrend = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" );
}
+
( *pCrend )->binaural_latency_ns = 0;
( *pCrend )->hCrend = NULL;
( *pCrend )->hHrtfCrend = NULL;
@@ -1945,8 +722,6 @@ ivas_error ivas_rend_initCrendWrapper(
return IVAS_ERR_OK;
}
-#endif
-#endif
/*-------------------------------------------------------------------------
* ivas_rend_openCrend()
*
@@ -1954,17 +729,10 @@ ivas_error ivas_rend_initCrendWrapper(
*------------------------------------------------------------------------*/
ivas_error ivas_rend_openCrend(
-#ifdef FIX_197_CREND_INTERFACE
CREND_WRAPPER_HANDLE *pCrend,
-#else
- CREND_WRAPPER *pCrend,
-#endif
const AUDIO_CONFIG inConfig,
const AUDIO_CONFIG outConfig,
RENDER_CONFIG_DATA *hRendCfg,
-#ifdef FIX_197_CREND_INTERFACE
- int16_t Opt_Headrotation,
-#endif
HRTFS_CREND_HANDLE hSetOfHRTF,
const int32_t output_Fs )
{
@@ -1976,35 +744,14 @@ ivas_error ivas_rend_openCrend(
ivas_error error;
error = IVAS_ERR_OK;
-#ifdef FIX_197_CREND_INTERFACE
-#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
if ( ( error = ivas_rend_initCrendWrapper( pCrend ) ) != IVAS_ERR_OK )
{
return error;
}
hCrend = ( *pCrend )->hCrend;
-#else
- if ( pCrend == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" );
- }
-
- if ( *pCrend == NULL )
- {
- if ( ( *pCrend = (CREND_WRAPPER_HANDLE) malloc( sizeof( CREND_WRAPPER ) ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Crend Wrapper\n" );
- }
- ( *pCrend )->binaural_latency_ns = 0;
- ( *pCrend )->hCrend = NULL;
- ( *pCrend )->hHrtfCrend = NULL;
- }
-#endif
-#endif
subframe_length = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES;
-#ifdef FIX_197_CREND_INTERFACE
if ( ( *pCrend )->hHrtfCrend == NULL )
{
if ( ( error = ivas_rend_initCrend( *pCrend, inConfig, outConfig, hRendCfg, hSetOfHRTF, output_Fs ) ) != IVAS_ERR_OK )
@@ -2012,53 +759,8 @@ ivas_error ivas_rend_openCrend(
return error;
}
}
-#else
- if ( pCrend->hHrtfCrend == NULL )
- {
- if ( ( error = ivas_rend_initCrend( pCrend, inConfig, outConfig, hRendCfg, hSetOfHRTF, output_Fs ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
-#endif
-
-#ifndef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
-
- if ( ( hCrend = (CREND_HANDLE) malloc( sizeof( CREND_DATA ) ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer handle" );
- }
-
- hCrend->lfe_delay_line = NULL;
-
- for ( i = 0; i < MAX_INTERN_CHANNELS; i++ )
- {
- hCrend->freq_buffer_re[i] = NULL;
- hCrend->freq_buffer_im[i] = NULL;
- }
-
- for ( i = 0; i < BINAURAL_CHANNELS; i++ )
- {
- hCrend->prev_out_buffer[i] = NULL;
- }
- hCrend->freq_buffer_re_diffuse = NULL;
- hCrend->freq_buffer_im_diffuse = NULL;
- hCrend->hReverb = NULL;
- hCrend->delay_line_rw_index = 0;
- hCrend->diffuse_delay_line_rw_index = 0;
- hCrend->hTrack = NULL;
- hCrend->m_fYaw = 0;
- hCrend->m_fPitch = 0;
- hCrend->m_fRoll = 0;
-#endif
-
-
-#ifdef FIX_197_CREND_INTERFACE
hHrtf = ( *pCrend )->hHrtfCrend;
-#else
- hHrtf = pCrend->hHrtfCrend;
-#endif
if ( hHrtf != NULL )
{
@@ -2123,35 +825,10 @@ ivas_error ivas_rend_openCrend(
{
hCrend->lfe_delay_line = NULL;
}
-#ifdef FIX_197_CREND_INTERFACE
- if ( Opt_Headrotation )
-#else
- if ( false ) /* TODO tmu : check renderer headrotation flag */
-#endif
- {
- if ( ( hCrend->hTrack = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" );
- }
-
- ivas_orient_trk_Init( hCrend->hTrack );
- }
- else
- {
- hCrend->hTrack = NULL;
- }
if ( ( hRendCfg != NULL ) && ( hRendCfg->roomAcoustics.late_reverb_on ) )
{
- if ( ( error = ivas_reverb_open( &( hCrend->hReverb ),
- inConfig,
-#ifdef FIX_197_CREND_INTERFACE
- ( *pCrend )->hHrtfCrend,
-#else
- pCrend->hHrtfCrend,
-#endif
- hRendCfg,
- output_Fs ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_reverb_open( &( hCrend->hReverb ), inConfig, ( *pCrend )->hHrtfCrend, hRendCfg, output_Fs ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -2161,44 +838,27 @@ ivas_error ivas_rend_openCrend(
hCrend->hReverb = NULL;
}
-#ifdef FIX_197_CREND_INTERFACE
( *pCrend )->binaural_latency_ns = (int32_t) ( ( *pCrend )->hHrtfCrend->latency_s * 1000000000.f );
-#else
- pCrend->binaural_latency_ns = (int32_t) ( pCrend->hHrtfCrend->latency_s * 1000000000.f );
-#endif
}
-#ifdef FIX_197_CREND_INTERFACE
( *pCrend )->hCrend = hCrend;
-#else
- pCrend->hCrend = hCrend;
-#endif
+
return IVAS_ERR_OK;
}
+
/*-------------------------------------------------------------------------
* ivas_crend_close()
*
* Deallocate Crend renderer handle
*------------------------------------------------------------------------*/
-#ifdef FIX_197_CREND_INTERFACE
void ivas_rend_closeCrend(
CREND_WRAPPER_HANDLE *pCrend )
-#else
-ivas_error ivas_rend_closeCrend(
- CREND_WRAPPER *pCrend )
-#endif
{
int16_t i;
-#ifdef FIX_197_CREND_INTERFACE
- if ( pCrend == NULL )
- {
- return;
- }
-
- if ( *pCrend == NULL )
+ if ( pCrend == NULL || *pCrend == NULL )
{
return;
}
@@ -2264,72 +924,11 @@ ivas_error ivas_rend_closeCrend(
free( *pCrend );
*pCrend = NULL;
}
- return;
-#else
- if ( pCrend->hHrtfCrend != NULL )
- {
- ivas_hrtf_close( &pCrend->hHrtfCrend );
- }
-
- if ( pCrend->hCrend != NULL )
- {
-
- for ( i = 0; i < MAX_INTERN_CHANNELS; i++ )
- {
- if ( pCrend->hCrend->freq_buffer_re[i] != NULL )
- {
- free( pCrend->hCrend->freq_buffer_re[i] );
- pCrend->hCrend->freq_buffer_re[i] = NULL;
- }
- if ( pCrend->hCrend->freq_buffer_im[i] != NULL )
- {
- free( pCrend->hCrend->freq_buffer_im[i] );
- pCrend->hCrend->freq_buffer_im[i] = NULL;
- }
- }
-
- for ( i = 0; i < BINAURAL_CHANNELS; i++ )
- {
- if ( pCrend->hCrend->prev_out_buffer[i] != NULL )
- {
- free( pCrend->hCrend->prev_out_buffer[i] );
- pCrend->hCrend->prev_out_buffer[i] = NULL;
- }
- }
-
- if ( pCrend->hCrend->lfe_delay_line != NULL )
- {
- free( pCrend->hCrend->lfe_delay_line );
- pCrend->hCrend->lfe_delay_line = NULL;
- }
-
- if ( pCrend->hCrend->freq_buffer_re_diffuse != NULL )
- {
- free( pCrend->hCrend->freq_buffer_re_diffuse );
- pCrend->hCrend->freq_buffer_re_diffuse = NULL;
- }
-
- if ( pCrend->hCrend->freq_buffer_im_diffuse != NULL )
- {
- free( pCrend->hCrend->freq_buffer_im_diffuse );
- pCrend->hCrend->freq_buffer_im_diffuse = NULL;
- }
-
- if ( pCrend->hCrend->hTrack != NULL )
- {
- free( pCrend->hCrend->hTrack );
- pCrend->hCrend->hTrack = NULL;
- }
- ivas_reverb_close( &pCrend->hCrend->hReverb );
-
- free( pCrend->hCrend );
- pCrend->hCrend = NULL;
- }
- return IVAS_ERR_OK;
-#endif
+ return;
}
+
/*-----------------------------------------------------------------------------------------*
* Function ivas_crend_convolver()
*
@@ -2355,9 +954,17 @@ static ivas_error ivas_rend_crendConvolver(
float *pFreq_filt_re, *pFreq_filt_im;
float pOut[L_FRAME48k * 2];
float tmp_out_re[L_FRAME48k], tmp_out_im[L_FRAME48k];
+ ivas_error error;
+
+ if ( ( error = getAudioConfigNumChannels( inConfig, &nchan_in ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
- getAudioConfigNumChannels( inConfig, &nchan_in );
- getAudioConfigNumChannels( outConfig, &nchan_out );
+ if ( ( error = getAudioConfigNumChannels( outConfig, &nchan_out ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
subframe_length = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES;
@@ -2494,20 +1101,14 @@ ivas_error ivas_rend_crendProcess(
const CREND_WRAPPER *pCrend,
const AUDIO_CONFIG inConfig,
const AUDIO_CONFIG outConfig,
-#ifdef FIX_197_CREND_INTERFACE
DECODER_CONFIG_HANDLE hDecoderConfig,
HEAD_TRACK_DATA_HANDLE hHeadTrackData,
IVAS_OUTPUT_SETUP_HANDLE hIntSetup,
EFAP_HANDLE hEFAPdata,
-#endif
float output[][L_FRAME48k], /* i/o: input/output audio channels */
const int32_t output_Fs )
{
-#ifdef FIX_197_CREND_INTERFACE
int16_t i, subframe_idx, output_frame, subframe_len;
-#else
- int16_t i, subframe_idx, output_frame;
-#endif
int16_t nchan_out;
float pcm_tmp[BINAURAL_CHANNELS][L_FRAME48k];
AUDIO_CONFIG in_config;
@@ -2521,42 +1122,22 @@ ivas_error ivas_rend_crendProcess(
inRendConfig = getRendAudioConfigFromIvasAudioConfig( inConfig );
outRendConfig = getRendAudioConfigFromIvasAudioConfig( outConfig );
-#ifdef FIX_197_CREND_INTERFACE
in_config = getIvasAudioConfigFromRendAudioConfig( inRendConfig );
-#else
- in_config = rendAudioConfigToIvasAudioConfig( inRendConfig );
-#endif
inConfigType = getAudioConfigType( inRendConfig );
- getAudioConfigNumChannels( outRendConfig, &nchan_out );
+
+ if ( ( error = getAudioConfigNumChannels( outRendConfig, &nchan_out ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
output_frame = (int16_t) ( output_Fs / FRAMES_PER_SEC );
-#ifdef FIX_197_CREND_INTERFACE
subframe_len = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES;
-#endif
for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ )
{
-#ifdef FIX_197_CREND_INTERFACE
if ( hDecoderConfig && hDecoderConfig->Opt_Headrotation && hHeadTrackData && hHeadTrackData->num_quaternions >= 0 )
{
/* Orientation tracking */
- if ( pCrend->hCrend->hTrack != NULL )
- {
- if ( hDecoderConfig->orientation_tracking == IVAS_ORIENT_TRK_AVG )
- {
- ivas_orient_trk_SetTrackingType( pCrend->hCrend->hTrack, OTR_TRACKING_AVG_ORIENT );
- }
- else
- {
- ivas_orient_trk_SetTrackingType( pCrend->hCrend->hTrack, OTR_TRACKING_REF_ORIENT );
- }
-
- /* get current subframe quaternion and convert to euler angles */
- Quat2Euler( hHeadTrackData->Quaternions[subframe_idx], &( pCrend->hCrend->m_fYaw ), &( pCrend->hCrend->m_fPitch ), &( pCrend->hCrend->m_fRoll ) );
- ivas_orient_trk_SetAbsoluteOrientation( pCrend->hCrend->hTrack, pCrend->hCrend->m_fYaw, pCrend->hCrend->m_fPitch, pCrend->hCrend->m_fRoll );
- ivas_orient_trk_Process( pCrend->hCrend->hTrack );
- ivas_orient_trk_GetTrackedOrientation( pCrend->hCrend->hTrack, &( pCrend->hCrend->m_fYaw ), &( pCrend->hCrend->m_fPitch ), &( pCrend->hCrend->m_fRoll ) );
- }
/* Rotation in SHD for:
MC with elevation (5_1_2 / 5_1_4 / 7_1_4) -> BINAURAL
@@ -2572,7 +1153,6 @@ ivas_error ivas_rend_crendProcess(
rotateFrame_sd( hHeadTrackData, output, subframe_len, *hIntSetup, hEFAPdata, subframe_idx );
}
}
-#endif
if ( ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) || ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) )
{
diff --git a/lib_rend/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions.c
index 6de5688492f0b75640fde2a2deb1b7b6c739ef36..e219e5bd543aa9513798a87b54809ba1a20eb3d6 100644
--- a/lib_rend/ivas_dirac_dec_binaural_functions.c
+++ b/lib_rend/ivas_dirac_dec_binaural_functions.c
@@ -40,6 +40,10 @@
#include "ivas_cnst.h"
#include "ivas_rom_binauralRenderer.h"
#include "ivas_rom_rend.h"
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
+#include "ivas_rom_com.h"
+#endif
+
#ifdef DEBUGGING
#include "debug.h"
#endif
@@ -57,6 +61,20 @@
#define STEREO_PREPROCESS_IIR_FACTOR ( 0.9f )
#endif
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT
+/* powf(0.95f, 4.0f) for sub-frame smoothing instead of CLDFB slot */
+#define ADAPT_HTPROTO_IIR_FAC 0.81450625f
+#else
+#define ADAPT_HTPROTO_IIR_FAC 0.95f
+#endif
+
+#define ADAPT_HTPROTO_ILD_LIM_DB0 1.0f
+#define ADAPT_HTPROTO_ILD_LIM_DB1 4.0f
+#define ADAPT_HTPROTO_ROT_LIM_0 0.4f
+#define ADAPT_HTPROTO_ROT_LIM_1 0.8f
+#endif
+
/*-------------------------------------------------------------------------
* Local function prototypes
*------------------------------------------------------------------------*/
@@ -71,6 +89,10 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices( Decoder_Struc
static void ivas_dirac_dec_binaural_process_output( Decoder_Struct *st_ivas, float output_f[][L_FRAME48k], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const int16_t max_band_decorr, const uint8_t numInputChannels, const uint8_t firstSlot, const uint8_t slotEnd );
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
+static void adaptTransportSignalsHeadtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const uint8_t firstSlot, const uint8_t slotEnd, const uint8_t nBins, float Rmat[3][3] );
+#endif
+
static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const uint8_t firstSlot, const uint8_t slotEnd, const uint8_t nBins, float Rmat[3][3] );
static void formulate2x2MixingMatrix( float Ein1, float Ein2, float CinRe, float CinIm, float Eout1, float Eout2, float CoutRe, float CoutIm, float Q[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Mre[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Mim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], const float regularizationFactor );
@@ -83,6 +105,9 @@ static void matrixMul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Ai
static void matrixTransp2Mul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] );
+#ifdef NOKIA_PARAMBIN_REQULARIZATION
+static float configure_reqularization_factor( const IVAS_FORMAT ivas_format, const int32_t ivas_brate );
+#endif
/*-------------------------------------------------------------------------
* ivas_dirac_dec_init_binaural_data()
@@ -146,22 +171,7 @@ ivas_error ivas_dirac_dec_init_binaural_data(
set_zero( hBinaural->ChCrossImOutPrev, nBins );
hBinaural->renderStereoOutputInsteadOfBinaural = 0;
-#ifdef FIX_107_5MS_SUBFRAME_RENDERING
hBinaural->useSubframeMode = 1;
-#else
- if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR ) /* Use subframe-mode with SPAR, since the metadata is not in sync on a frame level */
- {
- hBinaural->useSubframeMode = 1;
- }
- else
- {
-#ifdef DEBUGGING
- hBinaural->useSubframeMode = st_ivas->hDecoderConfig->forceSubframeBinauralization;
-#else
- hBinaural->useSubframeMode = 0; /* Default to 20 ms mode. */
-#endif
- }
-#endif
hBinaural->useTdDecorr = 0;
if ( st_ivas->ivas_format == SBA_FORMAT )
@@ -290,6 +300,10 @@ ivas_error ivas_dirac_dec_init_binaural_data(
ivas_td_decorr_dec_close( &( hBinaural->hTdDecorr ) );
}
+#ifdef NOKIA_PARAMBIN_REQULARIZATION
+ hBinaural->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate );
+#endif
+
st_ivas->hDiracDecBin = hBinaural;
return IVAS_ERR_OK;
@@ -306,7 +320,7 @@ void ivas_dirac_dec_close_binaural_data(
DIRAC_DEC_BIN_HANDLE *hBinaural /* i/o: decoder DirAC binaural data handle */
)
{
- if ( *hBinaural == NULL )
+ if ( hBinaural == NULL || *hBinaural == NULL )
{
return;
}
@@ -611,6 +625,10 @@ static void ivas_dirac_dec_binaural_internal(
if ( nchan_transport == 2 )
{
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
+ adaptTransportSignalsHeadtracked( st_ivas->hHeadTrackData, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, firstSlot, slotEnd, nBins, Rmat );
+#endif
+
ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( st_ivas->hHeadTrackData, Cldfb_ImagBuffer_in, Cldfb_RealBuffer_in, firstSlot, slotEnd, nBins, Rmat );
}
}
@@ -1049,8 +1067,10 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric
{
#ifdef MASA_AND_OBJECTS
float spectrumModVal;
+
+ idx = min( bin, MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS - 1 );
/* Apply target spectrum that emphasizes low frequencies when the sound is surround coherent */
- spectrumModVal = ( 1.0f - surCoh ) + surCoh * surCohEne[min( bin, MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS - 1 )];
+ spectrumModVal = ( 1.0f - surCoh ) + surCoh * surCohEne[idx];
diffEne *= spectrumModVal;
#else
idx = min( bin, MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS - 1 );
@@ -1219,11 +1239,19 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices(
CrEneR = 0.0f;
/* Formulate main processing matrix M */
+#ifdef NOKIA_PARAMBIN_REQULARIZATION
+ formulate2x2MixingMatrix( h->ChEne[0][bin], h->ChEne[1][bin],
+ h->ChCrossRe[bin], h->ChCrossIm[bin],
+ h->ChEneOut[0][bin], h->ChEneOut[1][bin],
+ h->ChCrossReOut[bin], h->ChCrossImOut[bin],
+ prototypeMtx, Mre, Mim, h->reqularizationFactor );
+#else
formulate2x2MixingMatrix( h->ChEne[0][bin], h->ChEne[1][bin],
h->ChCrossRe[bin], h->ChCrossIm[bin],
h->ChEneOut[0][bin], h->ChEneOut[1][bin],
h->ChCrossReOut[bin], h->ChCrossImOut[bin],
prototypeMtx, Mre, Mim, 1.0f );
+#endif
/* Load estimated covariance matrix to the [2][2] matrix form */
CxRe[0][0] = h->ChEne[0][bin];
@@ -1534,6 +1562,198 @@ static void ivas_dirac_dec_binaural_process_output(
}
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
+static void adaptTransportSignalsHeadtracked(
+ HEAD_TRACK_DATA_HANDLE hHeadTrackData,
+ float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
+ float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
+ const uint8_t firstSlot,
+ const uint8_t slotEnd,
+ const uint8_t nBins,
+ float Rmat[3][3] )
+{
+ int16_t slot, ch, bin, louderCh;
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT
+ float ILD, mono_factor_ILD, mono_factor_rotation, mono_factor, y_val, ene_proc, ene_target;
+ uint8_t n_slots_per_sf, sf_idx, n_sf;
+ int16_t max_band;
+#else
+ float re[2], im[2], ILD, mono_factor_ILD, mono_factor_rotation, mono_factor, y_val;
+ float proc_re[2], proc_im[2], sum_re, sum_im, ene_proc, ene_target, mf;
+#endif
+
+ /* Determine head-orientation-based mono factor.
+ Rmat[1][1] entry informs how close the ears are aligned according to transport signals. */
+ y_val = 1.0f - fabsf( Rmat[1][1] );
+ mono_factor_rotation = ( y_val - ADAPT_HTPROTO_ROT_LIM_0 ) / ( ADAPT_HTPROTO_ROT_LIM_1 - ADAPT_HTPROTO_ROT_LIM_0 );
+ mono_factor_rotation = fmaxf( 0.0f, fminf( 1.0f, mono_factor_rotation ) );
+
+ /* Adapt transport signals in frequency bands */
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT
+ /* optimization grouping CLDFB bins into MASA bands (they are readily available in ROM and suitable for the task) AND group CLDFB slots into sub-frames */
+ n_slots_per_sf = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES;
+ n_sf = ( slotEnd - firstSlot ) / n_slots_per_sf;
+
+ max_band = 0;
+ while ( max_band < MASA_FREQUENCY_BANDS && MASA_band_grouping_24[max_band] < nBins )
+ {
+ max_band++;
+ }
+
+ for ( sf_idx = 0; sf_idx < n_sf; sf_idx++ )
+ {
+ float eqVal;
+ uint8_t start_slot, stop_slot;
+ int16_t band_idx, bin_lo, bin_hi;
+
+ start_slot = firstSlot + sf_idx * n_slots_per_sf;
+ stop_slot = start_slot + n_slots_per_sf;
+
+ for ( band_idx = 0; band_idx < max_band; band_idx++ )
+ {
+ float ch_nrg[2]; /* storage for input signal channel energies */
+ bin_lo = MASA_band_grouping_24[band_idx];
+ bin_hi = min( MASA_band_grouping_24[band_idx + 1], (int16_t) nBins );
+ for ( ch = 0; ch < 2; ch++ )
+ {
+ ch_nrg[ch] = 0.0f;
+ for ( slot = start_slot; slot < stop_slot; slot++ )
+ {
+ for ( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ ch_nrg[ch] += ( inRe[ch][slot][bin] * inRe[ch][slot][bin] ) + ( inIm[ch][slot][bin] * inIm[ch][slot][bin] );
+ }
+ }
+ hHeadTrackData->chEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC;
+ hHeadTrackData->chEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ch_nrg[ch];
+ }
+
+ /* Determine ILD */
+ ILD = fabsf( 10.0f * log10f( fmaxf( 1e-12f, hHeadTrackData->chEneIIR[0][band_idx] ) / fmaxf( 1e-12f, hHeadTrackData->chEneIIR[1][band_idx] ) ) );
+ if ( hHeadTrackData->chEneIIR[1][band_idx] > hHeadTrackData->chEneIIR[0][band_idx] )
+ {
+ louderCh = 1;
+ }
+ else
+ {
+ louderCh = 0;
+ }
+
+ /* Determine ILD-based mono factor */
+ mono_factor_ILD = ( ILD - ADAPT_HTPROTO_ILD_LIM_DB0 ) / ( ADAPT_HTPROTO_ILD_LIM_DB1 - ADAPT_HTPROTO_ILD_LIM_DB0 );
+ mono_factor_ILD = fmaxf( 0.0f, fminf( 1.0f, mono_factor_ILD ) );
+
+ /* Combine mono factors */
+ mono_factor = mono_factor_ILD * mono_factor_rotation;
+
+ /* Mix original audio and sum signal according to determined mono factor */
+ for ( ch = 0; ch < 2; ch++ )
+ {
+ if ( ch != louderCh )
+ {
+ float band_nrg = 0.0f;
+
+ for ( slot = start_slot; slot < stop_slot; slot++ )
+ {
+ for ( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ /* mono sum signal with the computed weight + rest from the original channel */
+ inRe[ch][slot][bin] = mono_factor * ( inRe[0][slot][bin] + inRe[1][slot][bin] ) + ( 1.0f - mono_factor ) * inRe[ch][slot][bin];
+ inIm[ch][slot][bin] = mono_factor * ( inIm[0][slot][bin] + inIm[1][slot][bin] ) + ( 1.0f - mono_factor ) * inIm[ch][slot][bin];
+ band_nrg += ( inRe[ch][slot][bin] * inRe[ch][slot][bin] ) + ( inIm[ch][slot][bin] * inIm[ch][slot][bin] );
+ }
+ }
+ hHeadTrackData->procChEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC;
+ hHeadTrackData->procChEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * band_nrg;
+ }
+ else
+ {
+ /* processed signal is input. use the original channel, so no need to compute new signals or signal energy */
+ hHeadTrackData->procChEneIIR[ch][band_idx] *= ADAPT_HTPROTO_IIR_FAC;
+ hHeadTrackData->procChEneIIR[ch][band_idx] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ch_nrg[ch];
+ }
+ }
+
+ /* Equalize */
+ ene_target = hHeadTrackData->chEneIIR[0][band_idx] + hHeadTrackData->chEneIIR[1][band_idx];
+ ene_proc = hHeadTrackData->procChEneIIR[0][band_idx] + hHeadTrackData->procChEneIIR[1][band_idx];
+ eqVal = fminf( 4.0f, sqrtf( ene_target / fmaxf( 1e-12f, ene_proc ) ) );
+
+ for ( slot = start_slot; slot < stop_slot; slot++ )
+ {
+ for ( ch = 0; ch < 2; ch++ )
+ {
+ for ( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ inRe[ch][slot][bin] *= eqVal;
+ inIm[ch][slot][bin] *= eqVal;
+ }
+ }
+ }
+ }
+ }
+#else
+ /* original contribution */
+ for ( slot = firstSlot; slot < slotEnd; slot++ )
+ {
+ float eqVal[60];
+
+ for ( bin = 0; bin < nBins; bin++ )
+ {
+ /* Determine channel energies */
+ for ( ch = 0; ch < 2; ch++ )
+ {
+ re[ch] = inRe[ch][slot][bin];
+ im[ch] = inIm[ch][slot][bin];
+
+ hHeadTrackData->chEneIIR[ch][bin] *= ADAPT_HTPROTO_IIR_FAC;
+ hHeadTrackData->chEneIIR[ch][bin] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ( ( re[ch] * re[ch] ) + ( im[ch] * im[ch] ) );
+ }
+
+ /* Determine ILD */
+ ILD = fabsf( 10.0f * log10f( fmaxf( 1e-12f, hHeadTrackData->chEneIIR[0][bin] ) / fmaxf( 1e-12f, hHeadTrackData->chEneIIR[1][bin] ) ) );
+ louderCh = ( hHeadTrackData->chEneIIR[1][bin] > hHeadTrackData->chEneIIR[0][bin] );
+
+ /* Determine ILD-based mono factor */
+ mono_factor_ILD = ( ILD - ADAPT_HTPROTO_ILD_LIM_DB0 ) / ( ADAPT_HTPROTO_ILD_LIM_DB1 - ADAPT_HTPROTO_ILD_LIM_DB0 );
+ mono_factor_ILD = fmaxf( 0.0f, fminf( 1.0f, mono_factor_ILD ) );
+
+ /* Combine mono factors */
+ mono_factor = mono_factor_ILD * mono_factor_rotation;
+
+ /* Mix original audio and sum signal according to determined mono factor */
+ sum_re = re[0] + re[1];
+ sum_im = im[0] + im[1];
+ for ( ch = 0; ch < 2; ch++ )
+ {
+ mf = ( ch == louderCh ) ? 0.0f : mono_factor;
+
+ proc_re[ch] = mf * sum_re + ( 1.0f - mf ) * re[ch];
+ proc_im[ch] = mf * sum_im + ( 1.0f - mf ) * im[ch];
+
+ hHeadTrackData->procChEneIIR[ch][bin] *= ADAPT_HTPROTO_IIR_FAC;
+ hHeadTrackData->procChEneIIR[ch][bin] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ( ( proc_re[ch] * proc_re[ch] ) + ( proc_im[ch] * proc_im[ch] ) );
+ }
+
+ /* Equalize */
+ ene_target = hHeadTrackData->chEneIIR[0][bin] + hHeadTrackData->chEneIIR[1][bin];
+ ene_proc = hHeadTrackData->procChEneIIR[0][bin] + hHeadTrackData->procChEneIIR[1][bin];
+ eqVal[bin] = fminf( 4.0f, sqrtf( ene_target / fmaxf( 1e-12f, ene_proc ) ) );
+
+ for ( ch = 0; ch < 2; ch++ )
+ {
+ inRe[ch][slot][bin] = proc_re[ch] * eqVal[bin];
+ inIm[ch][slot][bin] = proc_im[ch] * eqVal[bin];
+ }
+ }
+ }
+#endif
+
+ return;
+}
+#endif
+
+
static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked(
HEAD_TRACK_DATA_HANDLE hHeadTrackData,
float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
@@ -2070,6 +2290,85 @@ static void hrtfShGetHrtf(
}
+#ifdef NOKIA_PARAMBIN_REQULARIZATION
+/*-------------------------------------------------------------------------
+ * configure_reqularization_factor()
+ *
+ * Configure regularization factor for the mixing matrix generation of the
+ * parametric binauralizer using IVAS codec format and current bitrate.
+ *------------------------------------------------------------------------*/
+
+/*! r: Configured reqularization factor value to be set. */
+static float configure_reqularization_factor(
+ const IVAS_FORMAT ivas_format, /* i: IVAS codec format in use */
+ const int32_t ivas_brate ) /* i: Current IVAS bitrate */
+{
+ float reqularizationFactor;
+ reqularizationFactor = 1.0f; /* Default value */
+
+ if ( ivas_format == MASA_FORMAT )
+ {
+ if ( ivas_brate >= IVAS_256k )
+ {
+ reqularizationFactor = 0.2f;
+ }
+ else if ( ivas_brate == IVAS_192k )
+ {
+ reqularizationFactor = 0.3f;
+ }
+ else if ( ivas_brate == IVAS_160k )
+ {
+ reqularizationFactor = 0.4f;
+ }
+ else if ( ivas_brate == IVAS_128k )
+ {
+ reqularizationFactor = 0.5f;
+ }
+ else if ( ivas_brate == IVAS_96k )
+ {
+ reqularizationFactor = 0.6f;
+ }
+ else if ( ivas_brate >= IVAS_64k )
+ {
+ reqularizationFactor = 0.8f;
+ }
+ else
+ {
+ reqularizationFactor = 1.0f;
+ }
+ }
+
+ if ( ivas_format == MC_FORMAT ) /* This is always McMASA for parametric binauralizer. */
+ {
+ if ( ivas_brate >= IVAS_96k )
+ {
+ reqularizationFactor = 0.3f;
+ }
+ else if ( ivas_brate >= IVAS_80k )
+ {
+ reqularizationFactor = 0.5f;
+ }
+ else if ( ivas_brate >= IVAS_64k )
+ {
+ reqularizationFactor = 0.7f;
+ }
+ else if ( ivas_brate >= IVAS_48k )
+ {
+ reqularizationFactor = 0.8f;
+ }
+ else
+ {
+ reqularizationFactor = 1.0f;
+ }
+ }
+
+ /* For SBA and parametric ISM, currently in default value of 1.0f. */
+
+ return reqularizationFactor;
+}
+#endif
+
+
#ifdef MASA_AND_OBJECTS
/*-------------------------------------------------------------------*
* preProcessStereoTransportsForMovedObjects()
diff --git a/lib_rend/ivas_hrtf.c b/lib_rend/ivas_hrtf.c
index b53c636932f3dd77bb56142ba4387adce85caba2..2b1f16d025cfb0c9166a5c5c80c6c5489e0ca305 100644
--- a/lib_rend/ivas_hrtf.c
+++ b/lib_rend/ivas_hrtf.c
@@ -116,7 +116,6 @@ void ivas_HRTF_CRend_binary_close(
return;
}
-
free( *hSetOfHRTF );
*hSetOfHRTF = NULL;
@@ -202,38 +201,3 @@ void ivas_HRTF_parambin_binary_close(
return;
}
-
-
-/*-----------------------------------------------------------------------*
- * ivas_headTrack_open()
- *
- * Allocate and initialize Head-Tracking handle
- *-----------------------------------------------------------------------*/
-
-ivas_error ivas_headTrack_open(
- HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* o : head track handle */
-)
-{
- int16_t i;
-
- /* Allocate Head-Tracking handle */
- if ( ( *hHeadTrackData = (HEAD_TRACK_DATA_HANDLE) malloc( sizeof( HEAD_TRACK_DATA ) ) ) == NULL )
- {
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for head-tracking memory\n" ) );
- }
-
- /* Initialization */
- ( *hHeadTrackData )->num_quaternions = 0;
- ( *hHeadTrackData )->lrSwitchInterpVal = 0.0f;
- ( *hHeadTrackData )->lrSwitchedCurrent = 0;
- ( *hHeadTrackData )->lrSwitchedNext = 0;
-
- /* Initialise Rmat_prev to I, Rmat will be computed later */
- for ( i = 0; i < 3; i++ )
- {
- set_zero( ( *hHeadTrackData )->Rmat_prev[i], 3 );
- ( *hHeadTrackData )->Rmat_prev[i][i] = 1.0f;
- }
-
- return IVAS_ERR_OK;
-}
diff --git a/lib_rend/ivas_limiter.c b/lib_rend/ivas_limiter.c
index 9ea9192e2ec20a1fdf708c40ef0a10eb2dbe9d9f..28c272bc0c820c180908817035d9446a12d6b819 100644
--- a/lib_rend/ivas_limiter.c
+++ b/lib_rend/ivas_limiter.c
@@ -114,7 +114,10 @@ IVAS_LIMITER_HANDLE ivas_limiter_open(
return NULL;
}
- hLimiter = malloc( sizeof( IVAS_LIMITER ) );
+ if ( ( hLimiter = malloc( sizeof( IVAS_LIMITER ) ) ) == NULL )
+ {
+ return NULL;
+ }
hLimiter->max_num_channels = max_num_channels;
hLimiter->num_channels = max_num_channels;
diff --git a/lib_rend/ivas_objectRenderer.c b/lib_rend/ivas_objectRenderer.c
index 5a2b0e3454a7bf54e4f700649633e0051bfacda3..e782dbbc5d84061ef6633992ef65ecbb3f7b65b3 100644
--- a/lib_rend/ivas_objectRenderer.c
+++ b/lib_rend/ivas_objectRenderer.c
@@ -30,6 +30,7 @@
*******************************************************************************************************/
+#include "ivas_stat_rend.h"
#include
#include "options.h"
#include "prot.h"
@@ -47,6 +48,7 @@
*---------------------------------------------------------------------*/
static void TDREND_Clear_Update_flags( BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd );
+static void angles_to_vec( const float radius, const float azimuth, const float elevation, float *vec );
/*---------------------------------------------------------------------*
* ivas_td_binaural_open_unwrap()
@@ -60,6 +62,7 @@ ivas_error ivas_td_binaural_open_unwrap(
const int16_t nchan_transport, /* i : Number of channels */
const IVAS_FORMAT ivas_format, /* i : IVAS format (ISM/MC) */
const AUDIO_CONFIG transport_config, /* i : Transport configuration */
+ const float *directivity, /* i : Directivity pattern (used for ISM) */
const IVAS_OUTPUT_SETUP hTransSetup, /* i : Loudspeaker layout */
BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd, /* o : TD renderer handle */
int32_t *binaural_latency_ns /* i : Binauralization delay */
@@ -102,10 +105,16 @@ ivas_error ivas_td_binaural_open_unwrap(
pBinRendTd->TdRend_MixSpatSpec_p->UseCommonDistAttenModel = TRUE;
pBinRendTd->TdRend_MixSpatSpec_p->DistAttenModel = 0; /* 0=Turned off, else use TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED */
- TDREND_MIX_Init( pBinRendTd, hHrtfTD, pBinRendTd->TdRend_MixSpatSpec_p, output_Fs );
+ if ( ( error = TDREND_MIX_Init( pBinRendTd, hHrtfTD, pBinRendTd->TdRend_MixSpatSpec_p, output_Fs ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* Set the attenuation (or can set MixSpatSpec.DistAttenModel above) */
- TDREND_MIX_SetDistAttenModel( pBinRendTd, TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED );
+ if ( ( error = TDREND_MIX_SetDistAttenModel( pBinRendTd, TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* Add sources to module and mixer, headphones */
PosType = TDREND_POSTYPE_ABSOLUTE; /* or TDREND_POSTYPE_RELATIVE_TO_LISTENER */
@@ -162,9 +171,7 @@ ivas_error ivas_td_binaural_open_unwrap(
for ( nS = 0; nS < nchan_rend; nS++ )
{
/* Set source positions according to loudspeaker layout */
- Pos[0] = cosf( ls_elevation[nS] * PI_OVER_180 ) * cosf( ls_azimuth[nS] * PI_OVER_180 );
- Pos[1] = cosf( ls_elevation[nS] * PI_OVER_180 ) * sinf( ls_azimuth[nS] * PI_OVER_180 );
- Pos[2] = sinf( ls_elevation[nS] * PI_OVER_180 );
+ angles_to_vec( 1.0f, ls_azimuth[nS], ls_elevation[nS], Pos );
Dir[0] = 1.0f;
Dir[1] = 0.0f;
Dir[2] = 0.0f;
@@ -180,6 +187,27 @@ ivas_error ivas_td_binaural_open_unwrap(
TDREND_MIX_SRC_SetDirAtten( pBinRendTd, nS, DirAtten_p );
}
}
+ if ( ivas_format == ISM_FORMAT )
+ {
+ DirAtten_p = pBinRendTd->DirAtten_p;
+ if ( NULL == directivity )
+ {
+ DirAtten_p->ConeInnerAngle = 360.0f; /* Front cone */
+ DirAtten_p->ConeOuterAngle = 360.0f; /* Back cone */
+ DirAtten_p->ConeOuterGain = 1.0f; /* Back attenuation */
+ }
+ else
+ {
+ DirAtten_p->ConeInnerAngle = directivity[0];
+ DirAtten_p->ConeOuterAngle = directivity[1];
+ DirAtten_p->ConeOuterGain = directivity[2];
+ }
+
+ for ( nS = 0; nS < nchan_rend; nS++ )
+ {
+ TDREND_MIX_SRC_SetDirAtten( pBinRendTd, nS, DirAtten_p );
+ }
+ }
*hBinRendererTd = pBinRendTd;
@@ -228,23 +256,17 @@ void ivas_td_binaural_close(
* Call ivas_td_binaural_renderer() without st_ivas.
*---------------------------------------------------------------------*/
-void ivas_td_binaural_renderer_unwrap(
- RENDER_CONFIG_DATA *hRenderConfig, /* i : Renderer configuration */
- const int16_t ini_frame, /* i : Initialization frame counter */
-#ifdef FIX_197_CREND_INTERFACE
- CREND_WRAPPER_HANDLE hCrendWrapper, /* i : Crend wrapper handle */
-#else
- CREND_HANDLE hCrend, /* i : Crend handle */
-#endif
- AUDIO_CONFIG transport_config, /* i : Transport configuration */
- const int32_t output_Fs, /* i : Output sampling rate */
+ivas_error ivas_td_binaural_renderer_unwrap(
+ const REVERB_HANDLE hReverb, /* i : Reverberator handle */
+ const AUDIO_CONFIG transport_config, /* i : Transport configuration */
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD binaural object renderer handle */
- const int16_t nchan_transport, /* i : Transport channels (ISms) */
+ const int16_t num_src, /* i : number of sources to render */
const int16_t lfe_idx, /* i : LFE channel index */
- IVAS_FORMAT ivas_format, /* i : IVAS format */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
ISM_METADATA_HANDLE *hIsmMetaData, /* i : ISM metadata handle */
const int16_t Opt_Headrotation, /* i : Head rotation flag */
const IVAS_QUATERNION *Quaternions, /* i : Head tracking data per subframe */
+ const IVAS_POSITION *Pos, /* i : Listener position data per subframe */
float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */
const int16_t output_frame /* i : output frame length */
)
@@ -252,76 +274,42 @@ void ivas_td_binaural_renderer_unwrap(
int16_t subframe_length;
int16_t subframe_idx;
float reverb_signal[BINAURAL_CHANNELS][L_FRAME48k];
+ ivas_error error;
subframe_length = output_frame / MAX_PARAM_SPATIAL_SUBFRAMES;
- if ( hRenderConfig != NULL )
- {
-
- if ( hRenderConfig->roomAcoustics.late_reverb_on && ( ini_frame == 0 ) )
- {
- ivas_reverb_open(
-#ifdef FIX_197_CREND_INTERFACE
- &hCrendWrapper->hCrend->hReverb,
-#else
- &hCrend->hReverb,
-#endif
- transport_config,
- NULL,
- hRenderConfig,
- output_Fs );
- }
- }
/* Update object position(s) */
- TDREND_Update_object_positions( hBinRendererTd, nchan_transport, lfe_idx, ivas_format, hIsmMetaData, output );
+ TDREND_Update_object_positions( hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, output );
for ( subframe_idx = 0; subframe_idx < MAX_PARAM_SPATIAL_SUBFRAMES; subframe_idx++ )
{
/* Update the listener's location/orientation */
- TDREND_Update_listener_orientation( hBinRendererTd, Opt_Headrotation, ( Quaternions != NULL ) ? &Quaternions[subframe_idx] : NULL );
+ TDREND_Update_listener_orientation( hBinRendererTd, Opt_Headrotation, ( Quaternions != NULL ) ? &Quaternions[subframe_idx] : NULL, ( Pos != NULL ) ? &Pos[subframe_idx] : NULL );
- if ( ( hRenderConfig != NULL ) && ( hRenderConfig->roomAcoustics.late_reverb_on ) )
+ if ( hReverb != NULL && hReverb->pConfig.roomAcoustics.late_reverb_on )
{
- ivas_reverb_process(
-#ifdef FIX_197_CREND_INTERFACE
- hCrendWrapper->hCrend->hReverb,
-#else
- hCrend->hReverb,
-#endif
- transport_config,
- 0,
- output,
- reverb_signal,
- subframe_idx );
-
- ivas_reverb_process(
-#ifdef FIX_197_CREND_INTERFACE
- hCrendWrapper->hCrend->hReverb,
-#else
- hCrend->hReverb,
-#endif
- transport_config,
- 0,
- output,
- reverb_signal,
- subframe_idx );
+ if ( ( error = ivas_reverb_process( hReverb, transport_config, 0, output, reverb_signal, subframe_idx ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
/* Render subframe */
- TDREND_GetMix( hBinRendererTd, output, subframe_length, subframe_idx );
+ if ( ( error = TDREND_GetMix( hBinRendererTd, output, subframe_length, subframe_idx ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
- if ( hRenderConfig != NULL ) /* Renderer Configuration not enabled in TD standalone renderer */
+
+ if ( hReverb != NULL && hReverb->pConfig.roomAcoustics.late_reverb_on )
{
- if ( hRenderConfig->roomAcoustics.late_reverb_on )
- {
- /* add reverb to rendered signals */
- v_add( reverb_signal[0], output[0], output[0], output_frame );
- v_add( reverb_signal[1], output[1], output[1], output_frame );
- }
+ /* add reverb to rendered signals */
+ v_add( reverb_signal[0], output[0], output[0], output_frame );
+ v_add( reverb_signal[1], output[1], output[1], output_frame );
}
- return;
+ return IVAS_ERR_OK;
}
@@ -333,7 +321,7 @@ void ivas_td_binaural_renderer_unwrap(
ivas_error TDREND_GetMix(
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
- float output[][L_FRAME48k], /* i/o: ISm object synth / rendered output in 0,1 */
+ float output[][L_FRAME48k], /* i/o: ISM object synth / rendered output in 0,1 */
const int16_t subframe_length, /* i/o: subframe length */
const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */
)
@@ -422,7 +410,7 @@ static void TDREND_Clear_Update_flags(
void TDREND_Update_object_positions(
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o : TD Renderer handle */
- const int16_t numSources, /* i : Number of sources to render */
+ const int16_t num_src, /* i : number of sources to render */
const int16_t lfe_idx, /* i : Input LFE index */
const IVAS_FORMAT in_format, /* i : Format of input sources */
const ISM_METADATA_HANDLE *hIsmMetaData, /* i : Input metadata for ISM objects */
@@ -439,7 +427,7 @@ void TDREND_Update_object_positions(
/* For each source, write the frame data to the source object*/
c_indx = 0;
- for ( nS = 0; nS < numSources; nS++ )
+ for ( nS = 0; nS < num_src; nS++ )
{
if ( !( in_format == MC_FORMAT && nS == lfe_idx ) ) /* Skip LFE for MC */
{
@@ -457,13 +445,8 @@ void TDREND_Update_object_positions(
/* Update the source positions */
/* Source position and direction */
- Pos[0] = cosf( hIsmMetaData[nS]->elevation * PI_OVER_180 ) * cosf( hIsmMetaData[nS]->azimuth * PI_OVER_180 );
- Pos[1] = cosf( hIsmMetaData[nS]->elevation * PI_OVER_180 ) * sinf( hIsmMetaData[nS]->azimuth * PI_OVER_180 );
- Pos[2] = sinf( hIsmMetaData[nS]->elevation * PI_OVER_180 );
- Dir[0] = 1.0f;
- Dir[1] = 0.0f;
- Dir[2] = 0.0f;
-
+ angles_to_vec( hIsmMetaData[nS]->radius, hIsmMetaData[nS]->azimuth, hIsmMetaData[nS]->elevation, Pos );
+ angles_to_vec( 1.0f, hIsmMetaData[nS]->yaw, hIsmMetaData[nS]->pitch, Dir );
/* Source directivity info */
DirAtten_p->ConeInnerAngle = 360.0f;
DirAtten_p->ConeOuterAngle = 360.0f;
@@ -490,19 +473,14 @@ void TDREND_Update_object_positions(
void TDREND_Update_listener_orientation(
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD Renderer handle */
const int16_t headRotEnabled, /* i : Headrotation flag */
- const IVAS_QUATERNION *headPosition /* i : Head Position */
+ const IVAS_QUATERNION *headPosition, /* i : Listener orientation */
+ const IVAS_POSITION *Pos /* i : Listener Position */
)
{
- float Pos[3];
float FrontVec[3];
float UpVec[3];
float Rmat[3][3];
-
- /* Update the listener's location/orientation */
- /* Listener at the origin */
- Pos[0] = 0.0f;
- Pos[1] = 0.0f;
- Pos[2] = 0.0f;
+ float Pos_p[3];
if ( headRotEnabled )
{
@@ -516,6 +494,10 @@ void TDREND_Update_listener_orientation(
UpVec[0] = Rmat[2][0];
UpVec[1] = Rmat[2][1];
UpVec[2] = Rmat[2][2];
+ /* Input position */
+ Pos_p[0] = ( *Pos ).x;
+ Pos_p[1] = ( *Pos ).y;
+ Pos_p[2] = ( *Pos ).z;
}
else
{
@@ -527,10 +509,14 @@ void TDREND_Update_listener_orientation(
UpVec[0] = 0.0f;
UpVec[1] = 0.0f;
UpVec[2] = 1.0f;
+ /* Listener at the origin */
+ Pos_p[0] = 0.0f;
+ Pos_p[1] = 0.0f;
+ Pos_p[2] = 0.0f;
}
/* Set the listener position and orientation:*/
- TDREND_MIX_LIST_SetPos( hBinRendererTd, Pos );
+ TDREND_MIX_LIST_SetPos( hBinRendererTd, Pos_p );
TDREND_MIX_LIST_SetOrient( hBinRendererTd, FrontVec, UpVec );
return;
@@ -546,6 +532,7 @@ void TDREND_Update_listener_orientation(
ivas_error ivas_td_binaural_open_ext(
TDREND_WRAPPER *pTDRend,
IVAS_REND_AudioConfig inConfig,
+ RENDER_CONFIG_DATA *hRendCfg, /* i : Renderer configuration */
LSSETUP_CUSTOM_STRUCT *customLsInput,
const int32_t outFs )
{
@@ -553,25 +540,32 @@ ivas_error ivas_td_binaural_open_ext(
AUDIO_CONFIG transport_config;
IVAS_FORMAT ivas_format;
IVAS_OUTPUT_SETUP hTransSetup;
+ ivas_error error;
+ float *directivity = NULL;
if ( inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM )
{
- getAudioConfigNumChannels( inConfig, &nchan_transport );
+ if ( ( error = getAudioConfigNumChannels( inConfig, &nchan_transport ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else
{
nchan_transport = customLsInput->num_spk;
}
-#ifdef FIX_197_CREND_INTERFACE
+
transport_config = getIvasAudioConfigFromRendAudioConfig( inConfig );
-#else
- transport_config = rendAudioConfigToIvasAudioConfig( inConfig );
-#endif
ivas_format = ( getAudioConfigType( inConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) ? MC_FORMAT : ISM_FORMAT;
hTransSetup.ls_azimuth = customLsInput->ls_azimuth;
hTransSetup.ls_elevation = customLsInput->ls_elevation;
- return ivas_td_binaural_open_unwrap( &pTDRend->hHrtfTD, outFs, nchan_transport, ivas_format, transport_config, hTransSetup, &pTDRend->hBinRendererTd, &pTDRend->binaural_latency_ns );
+ if ( NULL != hRendCfg )
+ {
+ directivity = hRendCfg->directivity;
+ }
+
+ return ivas_td_binaural_open_unwrap( &pTDRend->hHrtfTD, outFs, nchan_transport, ivas_format, transport_config, directivity, hTransSetup, &pTDRend->hBinRendererTd, &pTDRend->binaural_latency_ns );
}
@@ -582,13 +576,13 @@ ivas_error ivas_td_binaural_open_ext(
* and renders the current frame.
*---------------------------------------------------------------------*/
-/*! r: TD Renderer result code. */
ivas_error ivas_td_binaural_renderer_ext(
const TDREND_WRAPPER *pTDRend, /* i : TD Renderer wrapper structure */
const IVAS_REND_AudioConfig inConfig, /* i : Input audio configuration */
const LSSETUP_CUSTOM_STRUCT *customLsInput, /* i : Input custom loudspeaker layout */
const IVAS_REND_HeadRotData *headRotData, /* i : Input head positions */
const IVAS_REND_AudioObjectPosition *currentPos, /* i : Object position */
+ const REVERB_HANDLE hReverb, /* i : Reverberator handle */
const int16_t output_frame, /* i : output frame length */
float output[][L_FRAME48k] /* i/o: SCE channels / Binaural synthesis */
)
@@ -597,12 +591,10 @@ ivas_error ivas_td_binaural_renderer_ext(
ISM_METADATA_HANDLE hIsmMetaData[1];
int16_t lfe_idx;
int16_t num_src;
- /* TODO tmu : pass down renderer config struct */
- // float reverb_signal[BINAURAL_CHANNELS][L_FRAME48k];
IVAS_FORMAT ivas_format;
IVAS_REND_AudioConfigType inConfigType;
AUDIO_CONFIG transport_config;
- int32_t output_Fs;
+ ivas_error error;
push_wmops( "ivas_td_binaural_renderer_ext" );
@@ -613,9 +605,13 @@ ivas_error ivas_td_binaural_renderer_ext(
if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED )
{
ivas_format = MC_FORMAT;
+ transport_config = getIvasAudioConfigFromRendAudioConfig( inConfig );
if ( inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM )
{
- getAudioConfigNumChannels( inConfig, &num_src );
+ if ( ( error = getAudioConfigNumChannels( inConfig, &num_src ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else
{
@@ -627,24 +623,43 @@ ivas_error ivas_td_binaural_renderer_ext(
{
ivas_format = ISM_FORMAT;
num_src = 1;
+ transport_config = AUDIO_CONFIG_ISM1;
hIsmMetaData[0] = &hIsmMetaDataFrame;
hIsmMetaData[0]->azimuth = currentPos->azimuth;
hIsmMetaData[0]->elevation = currentPos->elevation;
+ hIsmMetaData[0]->yaw = currentPos->yaw;
+ hIsmMetaData[0]->pitch = currentPos->pitch;
+ hIsmMetaData[0]->radius = currentPos->radius;
}
-
-#ifdef FIX_197_CREND_INTERFACE
- transport_config = getIvasAudioConfigFromRendAudioConfig( inConfig );
-#else
- transport_config = rendAudioConfigToIvasAudioConfig( inConfig );
-#endif
- output_Fs = output_frame * 50;
-
- ivas_td_binaural_renderer_unwrap( NULL, 1, NULL, transport_config, output_Fs, pTDRend->hBinRendererTd, num_src, lfe_idx,
- ivas_format, hIsmMetaData, headRotData->headRotEnabled, ( headRotData != NULL ) ? headRotData->headPositions : NULL,
- output, output_frame );
+ if ( ( error = ivas_td_binaural_renderer_unwrap( hReverb, transport_config, pTDRend->hBinRendererTd, num_src, lfe_idx, ivas_format, hIsmMetaData, headRotData->headRotEnabled,
+ ( headRotData != NULL ) ? headRotData->headPositions : NULL,
+ ( headRotData != NULL ) ? headRotData->Pos : NULL, output, output_frame ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
pop_wmops();
return IVAS_ERR_OK;
}
+
+/*---------------------------------------------------------------------*
+ * angles_to_vec()
+ *
+ * Convert azimuth and elevation angles to position/orientation vector
+ *---------------------------------------------------------------------*/
+
+static void angles_to_vec(
+ const float radius, /* i : radius */
+ const float azimuth, /* i : Azimuth angle */
+ const float elevation, /* i : Elevation angle */
+ float *vec /* o : Pos/Dir vector */
+)
+{
+ vec[0] = radius * cosf( elevation * PI_OVER_180 ) * cosf( azimuth * PI_OVER_180 );
+ vec[1] = radius * cosf( elevation * PI_OVER_180 ) * sinf( azimuth * PI_OVER_180 );
+ vec[2] = radius * sinf( elevation * PI_OVER_180 );
+
+ return;
+}
diff --git a/lib_rend/ivas_objectRenderer_hrFilt.c b/lib_rend/ivas_objectRenderer_hrFilt.c
index 0220b481450f403294a5cc453e8931780e7f5f8e..91b018b1486f9f3538c9d30d6f890fef0a06c732 100644
--- a/lib_rend/ivas_objectRenderer_hrFilt.c
+++ b/lib_rend/ivas_objectRenderer_hrFilt.c
@@ -69,10 +69,14 @@ ivas_error TDREND_REND_RenderSourceHRFilt(
{
float LeftOutputFrame[L_SPATIAL_SUBFR_48k];
float RightOutputFrame[L_SPATIAL_SUBFR_48k];
+ float Gain;
+
+ Gain = ( *Src_p->SrcRend_p->DirGain_p ) * ( *Src_p->SrcRend_p->DistGain_p );
TDREND_Apply_ITD( Src_p->InputFrame_p, LeftOutputFrame, RightOutputFrame, &Src_p->previtd, Src_p->itd, Src_p->mem_itd, subframe_length );
- TDREND_firfilt( LeftOutputFrame, Src_p->hrf_left_prev, hrf_left_delta, intp_count, Src_p->mem_hrf_left, subframe_length, Src_p->filterlength );
- TDREND_firfilt( RightOutputFrame, Src_p->hrf_right_prev, hrf_right_delta, intp_count, Src_p->mem_hrf_right, subframe_length, Src_p->filterlength );
+ TDREND_firfilt( LeftOutputFrame, Src_p->hrf_left_prev, hrf_left_delta, intp_count, Src_p->mem_hrf_left, subframe_length, Src_p->filterlength, Gain );
+ TDREND_firfilt( RightOutputFrame, Src_p->hrf_right_prev, hrf_right_delta, intp_count, Src_p->mem_hrf_right, subframe_length, Src_p->filterlength, Gain );
+
/* Copy to accumulative output frame */
v_add( LeftOutputFrame, output_buf[0], output_buf[0], subframe_length );
v_add( RightOutputFrame, output_buf[1], output_buf[1], subframe_length );
diff --git a/lib_rend/ivas_objectRenderer_mix.c b/lib_rend/ivas_objectRenderer_mix.c
index 9da9c2750c32b9d2227d402ee6b147cf3024ee83..509d22d320f98ef6d1fcc17dc55b3ec8cc5ae14b 100644
--- a/lib_rend/ivas_objectRenderer_mix.c
+++ b/lib_rend/ivas_objectRenderer_mix.c
@@ -35,6 +35,7 @@
#include "prot.h"
#include "ivas_prot_rend.h"
#include "ivas_rom_TdBinauralRenderer.h"
+#include "ivas_error.h"
#include "wmc_auto.h"
#ifdef DEBUGGING
#include "debug.h"
@@ -53,7 +54,7 @@
* Local functions
*-------------------------------------------------------------------------*/
-static void DefaultBSplineModel( TDREND_HRFILT_FiltSet_t *HrFiltSet_p, const int32_t output_Fs );
+static ivas_error DefaultBSplineModel( TDREND_HRFILT_FiltSet_t *HrFiltSet_p, const int32_t output_Fs );
/*-------------------------------------------------------------------*
@@ -193,6 +194,7 @@ ivas_error TDREND_MIX_Init(
const int32_t output_Fs /* i : Output sampling rate */
)
{
+ ivas_error error;
hBinRendererTd->Gain = 1.0f;
@@ -225,7 +227,10 @@ ivas_error TDREND_MIX_Init(
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
}
- DefaultBSplineModel( hBinRendererTd->HrFiltSet_p, output_Fs );
+ if ( ( error = DefaultBSplineModel( hBinRendererTd->HrFiltSet_p, output_Fs ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
*hHrtfTD = hBinRendererTd->HrFiltSet_p;
}
else
@@ -340,15 +345,22 @@ ivas_error TDREND_MIX_AddSrc(
* Allocate the B Spline HR Filter model.
--------------------------------------------------------------------*/
-void BSplineModelEvalAlloc(
+static ivas_error BSplineModelEvalAlloc(
ModelParams_t *model, /* i : Model parameters */
ModelEval_t *modelEval /* i/o: Model evaluation structure */
)
{
- modelEval->hrfModL = (float *) malloc( model->K * sizeof( float ) );
- modelEval->hrfModR = (float *) malloc( model->K * sizeof( float ) );
+ if ( ( modelEval->hrfModL = (float *) malloc( model->K * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
+ }
- return;
+ if ( ( modelEval->hrfModR = (float *) malloc( model->K * sizeof( float ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
+ }
+
+ return IVAS_ERR_OK;
}
@@ -358,7 +370,7 @@ void BSplineModelEvalAlloc(
* Init default HRTF model
--------------------------------------------------------------------*/
-static void DefaultBSplineModel(
+static ivas_error DefaultBSplineModel(
TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* o : Loaded HR filter set */
const int32_t output_Fs /* i : Output sampling rate */
)
@@ -366,6 +378,7 @@ static void DefaultBSplineModel(
ModelParams_t *model;
ModelParamsITD_t *modelITD;
int16_t i, j;
+ ivas_error error;
HrFiltSet_p->FilterMethod = TDREND_HRFILT_Method_BSplineModel;
model = &( HrFiltSet_p->ModelParams );
@@ -402,11 +415,24 @@ static void DefaultBSplineModel(
model->elevKSeq = (const float *) orange53_rom_elevKSeq;
model->elevBsShape = (const float *) orange53_rom_elevBsShape;
- model->azimBsShape = (const float **) malloc( model->num_unique_azim_splines * sizeof( float * ) );
+ if ( ( model->azimBsShape = (const float **) malloc( model->num_unique_azim_splines * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
+ }
+
model->azimBsShape[0] = (const float *) orange53_rom_azimBsShape;
- model->azimKSeq = (float **) malloc( 18 * sizeof( float * ) );
- model->azimKSeq[0] = (float *) malloc( 2 * sizeof( float * ) );
- model->azimKSeq[17] = (float *) malloc( 2 * sizeof( float * ) );
+ if ( ( model->azimKSeq = (float **) malloc( 18 * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
+ }
+ if ( ( model->azimKSeq[0] = (float *) malloc( 2 * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
+ }
+ if ( ( model->azimKSeq[17] = (float *) malloc( 2 * sizeof( float * ) ) ) == NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
+ }
model->azimKSeq[0][0] = 0.0f;
model->azimKSeq[17][0] = 0.0f;
model->azimKSeq[0][1] = 360.0f;
@@ -414,7 +440,10 @@ static void DefaultBSplineModel(
for ( i = 1; i < 17; i++ )
{
- model->azimKSeq[i] = (float *) malloc( model->azimDim2[i] * sizeof( float * ) ); /* azimDim2[i] = 91, i=2..15 */
+ if ( ( model->azimKSeq[i] = (float *) malloc( model->azimDim2[i] * sizeof( float * ) ) ) == NULL ) /* azimDim2[i] = 91, i=2..15 */
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
+ }
for ( j = 0; j < model->azimDim2[i]; j++ )
{
model->azimKSeq[i][j] = (float) orange53_rom_azimSegSamples[0] * j;
@@ -499,7 +528,10 @@ static void DefaultBSplineModel(
HrFiltSet_p->SampleRate = output_Fs;
HrFiltSet_p->FiltLength = HrFiltSet_p->ModelParams.K;
- BSplineModelEvalAlloc( &HrFiltSet_p->ModelParams, &HrFiltSet_p->ModelEval );
+ if ( ( error = BSplineModelEvalAlloc( &HrFiltSet_p->ModelParams, &HrFiltSet_p->ModelEval ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
- return;
+ return IVAS_ERR_OK;
}
diff --git a/lib_rend/ivas_objectRenderer_sfx.c b/lib_rend/ivas_objectRenderer_sfx.c
index 005025827b8cc0c49158fb6fd7a83b11c86facf8..98f45a5dd94b7d6542e679fda3d122d3a13faaa1 100644
--- a/lib_rend/ivas_objectRenderer_sfx.c
+++ b/lib_rend/ivas_objectRenderer_sfx.c
@@ -182,6 +182,7 @@ static void sincResample(
const float *p_sinc_forward;
const float *p_sinc_backward;
+
/* Compute fractional time step */
t_step = (float) ( length_in ) / (float) ( length_out );
t_frac = 0;
@@ -234,7 +235,8 @@ void TDREND_firfilt(
const int16_t intp_count, /* i : interpolation count */
float *mem, /* i/o: filter memory */
const int16_t subframe_length, /* i : Length of signal */
- const int16_t filterlength /* i : Filter length */
+ const int16_t filterlength, /* i : Filter length */
+ const float Gain /* i : Gain */
)
{
float buffer[SFX_SPAT_BIN_MAX_FILTER_LENGTH - 1 + L_SUBFRAME5MS_48k];
@@ -260,7 +262,7 @@ void TDREND_firfilt(
{
tmp += ( *p_filter++ ) * ( *p_tmp-- );
}
- signal[i] = tmp;
+ signal[i] = tmp * Gain;
if ( i < intp_count )
{
diff --git a/lib_rend/ivas_objectRenderer_sources.c b/lib_rend/ivas_objectRenderer_sources.c
index 694764979db139169078ac2e8b41278c43681ab6..b14db0b7c2f69c0d784f3f528c4dfa4bc7e8cabe 100644
--- a/lib_rend/ivas_objectRenderer_sources.c
+++ b/lib_rend/ivas_objectRenderer_sources.c
@@ -96,7 +96,7 @@ ivas_error TDREND_MIX_SRC_SetPos(
/*-------------------------------------------------------------------*
* TDREND_MIX_SRC_SetDir()
*
- * Set source direciton
+ * Set source direction
--------------------------------------------------------------------*/
ivas_error TDREND_MIX_SRC_SetDir(
@@ -193,11 +193,11 @@ static ivas_error TDREND_SRC_REND_Alloc(
*SrcRend_pp = NULL;
/* Allocate the TDREND_SRC_REND_t variable */
- SrcRend_p = (TDREND_SRC_REND_t *) malloc( sizeof( TDREND_SRC_REND_t ) );
- if ( SrcRend_p == NULL )
+ if ( ( SrcRend_p = (TDREND_SRC_REND_t *) malloc( sizeof( TDREND_SRC_REND_t ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "SrcRend_p allocation error\n" ) );
}
+
*SrcRend_pp = SrcRend_p;
return IVAS_ERR_OK;
@@ -266,6 +266,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams(
TDREND_MIX_Listener_t *Listener_p;
TDREND_HRFILT_FiltSet_t *HrFiltSet_p;
float ListRelPos[3], ListRelDist;
+ float ListRelPosAbs[3]; /* Relative position, ignoring orientation of listener */
float Azim, Elev;
float hrf_left[SFX_SPAT_BIN_MAX_FILTER_LENGTH];
float hrf_right[SFX_SPAT_BIN_MAX_FILTER_LENGTH];
@@ -287,14 +288,14 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams(
break;
case TDREND_POSTYPE_ABSOLUTE:
/* Absolute position */
- TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos );
+ TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos, ListRelPosAbs );
break;
default: /* Illegal position type */
#ifdef DEBUGGING
printf( "Warning! TDREND_SRC_REND_UpdateFiltersFromSpatialParams: Invalid position type. Assuming absolute position!\n" );
#endif
/* Assume absolute position */
- TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos );
+ TDREND_SPATIAL_VecMapToNewCoordSystem( SrcSpatial_p->Pos_p, Listener_p->Pos, Listener_p->Front, Listener_p->Up, Listener_p->Right, ListRelPos, ListRelPosAbs );
break;
}
@@ -320,7 +321,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams(
*SrcRend_p->DirGain_p = 1.0f;
if ( SrcSpatial_p->DirAttenEnabled )
{
- *SrcRend_p->DirGain_p = TDREND_SRC_SPATIAL_GetDirGain( &SrcSpatial_p->DirAtten, SrcSpatial_p->Front_p, ListRelPos );
+ *SrcRend_p->DirGain_p = TDREND_SRC_SPATIAL_GetDirGain( &SrcSpatial_p->DirAtten, SrcSpatial_p->Front_p, ListRelPosAbs );
}
/* Distance gain */
@@ -389,8 +390,7 @@ static ivas_error TDREND_SRC_SPATIAL_Alloc(
*SrcSpatial_pp = NULL;
/* Allocate the TDREND_SRC_t variable */
- SrcSpatial_p = (TDREND_SRC_SPATIAL_t *) malloc( sizeof( TDREND_SRC_SPATIAL_t ) );
- if ( SrcSpatial_p == NULL )
+ if ( ( SrcSpatial_p = (TDREND_SRC_SPATIAL_t *) malloc( sizeof( TDREND_SRC_SPATIAL_t ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "TDREND_SRC_SPATIAL_t allocation error\n" ) );
}
@@ -460,7 +460,11 @@ static void TDREND_SRC_SPATIAL_Init(
SrcSpatial_p->DistAttenEnabled = FALSE;
SrcSpatial_p->DistAtten.DistAttenModel = TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED;
SrcSpatial_p->DistAtten.RefDist = 1.0f;
+#ifdef FIX_379_EXT_METADATA
+ SrcSpatial_p->DistAtten.MaxDist = 15.75f; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */
+#else
SrcSpatial_p->DistAtten.MaxDist = 10.0f;
+#endif
SrcSpatial_p->DistAtten.RollOffFactor = 1.0f;
return;
@@ -601,8 +605,7 @@ ivas_error TDREND_SRC_Alloc(
*Src_pp = NULL;
/* Allocate the TDREND_SRC_t variable */
- Src_p = (TDREND_SRC_t *) malloc( sizeof( TDREND_SRC_t ) );
- if ( Src_p == NULL )
+ if ( ( Src_p = (TDREND_SRC_t *) malloc( sizeof( TDREND_SRC_t ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, " TDREND_SRC_Alloc: Allocation error\n" ) );
}
diff --git a/lib_rend/ivas_objectRenderer_vec.c b/lib_rend/ivas_objectRenderer_vec.c
index c3a780c725fa66aa07fe592adfb06dba643098b8..061b790e1b46e9010d14a0b0162b528bbd3768fb 100644
--- a/lib_rend/ivas_objectRenderer_vec.c
+++ b/lib_rend/ivas_objectRenderer_vec.c
@@ -111,20 +111,16 @@ void TDREND_SPATIAL_VecMapToNewCoordSystem(
const float *DirVec_p, /* i : Direction vector */
const float *UpVec_p, /* i : Up vector */
const float *RightVec_p, /* i : Right vector */
- float *MappedVec_p /* o : Transformed vector */
+ float *MappedVec_p, /* o : Transformed vector */
+ float *LisRelPosAbs /* o : Transformed vector ignoring orientation */
)
{
- float RelVec[3];
-
- /* Evaluate Vec relative to the new origin given by TranslVec */
- v_sub( Vec_p, TranslVec_p, RelVec, 3 );
-
+ v_sub( Vec_p, TranslVec_p, LisRelPosAbs, 3 );
/* Evalute the relative Vec in the coordinates of the Orientation vectors, */
/* which form an orthonormal basis */
- MappedVec_p[0] = dotp( RelVec, DirVec_p, 3 );
- MappedVec_p[1] = dotp( RelVec, RightVec_p, 3 );
- MappedVec_p[2] = dotp( RelVec, UpVec_p, 3 );
-
+ MappedVec_p[0] = dotp( LisRelPosAbs, DirVec_p, 3 );
+ MappedVec_p[1] = dotp( LisRelPosAbs, RightVec_p, 3 );
+ MappedVec_p[2] = dotp( LisRelPosAbs, UpVec_p, 3 );
return;
}
diff --git a/lib_rend/ivas_orient_trk.c b/lib_rend/ivas_orient_trk.c
index 4b72c16ce66f694a63e702e485f0c9f5f907caae..63d863c4b635dcdfc832f9c0027d165a7c902238 100644
--- a/lib_rend/ivas_orient_trk.c
+++ b/lib_rend/ivas_orient_trk.c
@@ -30,6 +30,7 @@
*******************************************************************************************************/
+#include "common_api_types.h"
#include
#include "options.h"
#include "ivas_prot.h"
@@ -49,52 +50,328 @@
#define MAX_TRACKED_ANGLE_AVG_ORIENT PI_OVER_2
#define MAX_TRACKED_ANGLE_REF_ORIENT EVS_PI
-
-/* TODO relate to frame rate - assumed here 50Hz, i.e. 20ms frame length */
-#define OTR_UPDATE_RATE ( 50.0f ) /* rate of the Process() calls [Hz]; 1x per IVAS frame */
+#define OTR_UPDATE_RATE (float) FRAMES_PER_SEC /* rate of the Process() calls [Hz]; 1x per IVAS frame */
/*------------------------------------------------------------------------------------------*
* Local functions
*------------------------------------------------------------------------------------------*/
-static float ClipAngle(
- const float angle,
- const float min_angle,
- const float max_angle )
+/*------------------------------------------------------------------------------------------*
+ * IdentityQuaternion()
+ *
+ *
+ *------------------------------------------------------------------------------------------*/
+
+static IVAS_QUATERNION IdentityQuaternion(
+ void )
{
- float result = angle;
+ IVAS_QUATERNION q;
- /* wrap angle modulo 2*pi into range of [-pi, pi> radians */
- /* 'while' assumed to use comparison to 0 */
- while ( result > EVS_PI )
- {
- result -= PI2;
- }
- /* 'while' assumed to use comparison to 0 */
- while ( result <= -EVS_PI )
+ q.w = 1.0f;
+ q.x = q.y = q.z = 0.0f;
+
+ return q;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * QuaternionProduct()
+ *
+ * Quaternion product
+ *------------------------------------------------------------------------------------------*/
+
+static void QuaternionProduct(
+ const IVAS_QUATERNION q1,
+ const IVAS_QUATERNION q2,
+ IVAS_QUATERNION *const r )
+{
+ IVAS_QUATERNION tmp;
+ tmp.w = q1.w * q2.w - q1.x * q2.x - q1.y * q2.y - q1.z * q2.z;
+ tmp.x = q1.w * q2.x + q1.x * q2.w + q1.y * q2.z - q1.z * q2.y;
+ tmp.y = q1.w * q2.y - q1.x * q2.z + q1.y * q2.w + q1.z * q2.x;
+ tmp.z = q1.w * q2.z + q1.x * q2.y - q1.y * q2.x + q1.z * q2.w;
+
+ *r = tmp;
+
+ return;
+}
+
+/*------------------------------------------------------------------------------------------*
+ * QuaternionDotProduct()
+ *
+ * Quaternion dot product
+ *------------------------------------------------------------------------------------------*/
+
+static float QuaternionDotProduct(
+ const IVAS_QUATERNION q1,
+ const IVAS_QUATERNION q2 )
+{
+ return q1.x * q2.x + q1.y * q2.y + q1.z * q2.z + q1.w * q2.w;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * QuaternionDivision()
+ *
+ * Divides a quaternion by a scalar
+ *------------------------------------------------------------------------------------------*/
+
+static void QuaternionDivision(
+ const IVAS_QUATERNION q,
+ const float d,
+ IVAS_QUATERNION *const r )
+{
+ r->w = q.w / d;
+ r->x = q.x / d;
+ r->y = q.y / d;
+ r->z = q.z / d;
+
+ return;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * QuaternionNormalize()
+ *
+ * Normalizes a quaternion
+ *------------------------------------------------------------------------------------------*/
+
+static void QuaternionNormalize(
+ const IVAS_QUATERNION q,
+ IVAS_QUATERNION *const r )
+{
+ QuaternionDivision( q, sqrtf( QuaternionDotProduct( q, q ) ), r );
+
+ return;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * QuaternionSlerp()
+ *
+ * Computes a spherical linear interpolation between two quaternions
+ *------------------------------------------------------------------------------------------*/
+
+static void QuaternionSlerp(
+ const IVAS_QUATERNION q1,
+ const IVAS_QUATERNION q2,
+ const float t,
+ IVAS_QUATERNION *const r )
+{
+ float angle, denom, s, s2;
+
+ s = QuaternionDotProduct( q1, q2 );
+
+ if ( fabsf( s ) >= 1.0f )
{
- result += PI2;
+ *r = q2;
+ return;
}
- /* Next, clip angle into range */
- /* 'if' assumed to use comparison to 0 */
- if ( result < min_angle )
+ angle = acosf( s );
+ denom = sinf( angle );
+
+ s = sinf( ( 1 - t ) * angle );
+ s2 = sinf( t * angle );
+ r->x = ( q1.x * s + q2.x * s2 ) / denom;
+ r->y = ( q1.y * s + q2.y * s2 ) / denom;
+ r->z = ( q1.z * s + q2.z * s2 ) / denom;
+ r->w = ( q1.w * s + q2.w * s2 ) / denom;
+
+ QuaternionNormalize( *r, r );
+
+ return;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * QuaternionConjugate()
+ *
+ * Computes a quaternion conjugate
+ *------------------------------------------------------------------------------------------*/
+
+static void QuaternionConjugate(
+ const IVAS_QUATERNION q,
+ IVAS_QUATERNION *const r )
+{
+ r->w = q.w;
+ r->x = -q.x;
+ r->y = -q.y;
+ r->z = -q.z;
+
+ return;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * QuaternionAngle()
+ *
+ * Computes an angle between two quaternions
+ *------------------------------------------------------------------------------------------*/
+
+static float QuaternionAngle(
+ const IVAS_QUATERNION q1,
+ const IVAS_QUATERNION q2 )
+{
+ IVAS_QUATERNION q12;
+ float angle;
+
+ QuaternionConjugate( q1, &q12 );
+ QuaternionProduct( q12, q2, &q12 );
+ angle = 2.0f * atan2f( sqrtf( q12.x * q12.x + q12.y * q12.y + q12.z * q12.z ), q12.w );
+
+ return angle;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * QuaternionInverse()
+ *
+ * Computes an inverse quaternion
+ *------------------------------------------------------------------------------------------*/
+
+static void QuaternionInverse(
+ const IVAS_QUATERNION q,
+ IVAS_QUATERNION *const r )
+{
+ float dot_product;
+
+ dot_product = QuaternionDotProduct( q, q );
+ QuaternionConjugate( q, r );
+ QuaternionDivision( *r, dot_product, r );
+
+ return;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * VectorSubtract()
+ *
+ * Computes the difference of two vectors
+ *------------------------------------------------------------------------------------------*/
+
+static IVAS_VECTOR3 VectorSubtract(
+ const IVAS_VECTOR3 p1,
+ const IVAS_VECTOR3 p2 )
+{
+ IVAS_VECTOR3 result;
+
+ result.x = p1.x - p2.x;
+ result.y = p1.y - p2.y;
+ result.z = p1.z - p2.z;
+
+ return result;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * VectorCrossProduct()
+ *
+ * Computes the cross product of two vectors
+ *------------------------------------------------------------------------------------------*/
+
+static IVAS_VECTOR3 VectorCrossProduct(
+ const IVAS_VECTOR3 p1,
+ const IVAS_VECTOR3 p2 )
+{
+ IVAS_VECTOR3 result;
+ result.x = p1.y * p2.z - p1.z * p2.y;
+ result.y = p1.z * p2.x - p1.x * p2.z;
+ result.z = p1.x * p2.y - p1.y * p2.x;
+
+ return result;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * VectorDotProduct(
+ *
+ * Computes the dot product of two vectors
+ *------------------------------------------------------------------------------------------*/
+
+static float VectorDotProduct(
+ const IVAS_VECTOR3 p1,
+ const IVAS_VECTOR3 p2 )
+{
+ return p1.x * p2.x + p1.y * p2.y + p1.z * p2.z;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * VectorLength()
+ *
+ * Computes the length of a vector
+ *------------------------------------------------------------------------------------------*/
+
+static float VectorLength(
+ const IVAS_VECTOR3 p )
+{
+ return sqrtf( p.x * p.x + p.y * p.y + p.z * p.z );
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * VectorNormalize()
+ *
+ * Normalizes a vector
+ *------------------------------------------------------------------------------------------*/
+
+static IVAS_VECTOR3 VectorNormalize(
+ const IVAS_VECTOR3 p )
+{
+ IVAS_VECTOR3 result;
+
+ const float length = VectorLength( p );
+
+ result.x = p.x / length;
+ result.y = p.y / length;
+ result.z = p.z / length;
+
+ return result;
+}
+
+
+/*------------------------------------------------------------------------------------------*
+ * VectorRotationToQuaternion()
+ *
+ * Computes a quaternion representing the rotation from vector p1 to vector p2
+ *------------------------------------------------------------------------------------------*/
+
+static void VectorRotationToQuaternion(
+ const IVAS_VECTOR3 p1,
+ const IVAS_VECTOR3 p2,
+ IVAS_QUATERNION *const r )
+{
+ float dot_product;
+ IVAS_VECTOR3 cross_product, p1_normalized, p2_normalized;
+
+ p1_normalized = VectorNormalize( p1 );
+ p2_normalized = VectorNormalize( p2 );
+ cross_product = VectorCrossProduct( p1_normalized, p2_normalized );
+ dot_product = VectorDotProduct( p1_normalized, p2_normalized );
+
+ if ( dot_product < -0.999999 )
{
- result = min_angle;
+ /* happens when the p1 vector is parallel to p2, but direction is flipped */
+ r->w = 0.0f;
+ r->x = 0.0f;
+ r->y = 0.0f;
+ r->z = 1.0f;
}
else
{
- /* 'if' assumed to use comparison to 0 */
- if ( result > max_angle )
- {
- result = max_angle;
- }
+ /* all regular cases */
+ r->x = cross_product.x;
+ r->y = cross_product.y;
+ r->z = cross_product.z;
+ r->w = 1.0f + dot_product;
}
- return result;
-}
+ QuaternionNormalize( *r, r );
+ return;
+}
/*-------------------------------------------------------------------*
* ivas_orient_trk_Init()
@@ -102,11 +379,18 @@ static float ClipAngle(
*
*-------------------------------------------------------------------*/
-void ivas_orient_trk_Init(
- ivas_orient_trk_state_t *pOTR )
+ivas_error ivas_orient_trk_Init(
+ ivas_orient_trk_state_t *pOTR ) /* i/o : orientation tracker handle */
{
- /* Track relative to a reference orientation */
- pOTR->trackingType = OTR_TRACKING_REF_ORIENT;
+ IVAS_QUATERNION identity;
+
+ if ( pOTR == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ identity.w = 1.0f;
+ identity.x = identity.y = identity.z = 0.0f;
/* configuration parameters */
pOTR->centerAdaptationRate = 1.0f / 30.0f;
@@ -116,23 +400,15 @@ void ivas_orient_trk_Init(
/* initial adaptivity filter coefficient, will be auto-adapted */
pOTR->alpha = sinf( PI2 * pOTR->offCenterAdaptationRate / OTR_UPDATE_RATE ); /* start adaptation at off-center rate = fastest rate */
- pOTR->absYaw = 0.0f;
- pOTR->absPitch = 0.0f;
- pOTR->absRoll = 0.0f;
-
- pOTR->absAvgYaw = 0.0f;
- pOTR->absAvgPitch = 0.0f;
- pOTR->absAvgRoll = 0.0f;
+ pOTR->trkRot = identity;
+ pOTR->absAvgRot = identity;
+ /* Use frontal and horiontal orientation as reference orientation, unless/until overridden */
+ pOTR->refRot = identity;
- /* Use frontal and horiontal orientation as reference orientation,
- unless/until overridden by ivas_orient_trk_SetAbsoluteOrientation() */
- pOTR->refYaw = 0.0f;
- pOTR->refPitch = 0.0f;
- pOTR->refRoll = 0.0f;
+ /* set safe default tracking mode */
+ pOTR->trackingType = OTR_TRACKING_NONE;
- pOTR->trkYaw = 0.0f;
- pOTR->trkPitch = 0.0f;
- pOTR->trkRoll = 0.0f;
+ return IVAS_ERR_OK;
}
@@ -143,171 +419,256 @@ void ivas_orient_trk_Init(
*-------------------------------------------------------------------*/
ivas_error ivas_orient_trk_SetTrackingType(
- ivas_orient_trk_state_t *pOTR,
- OTR_TRACKING_T trackingType )
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ const OTR_TRACKING_T trackingType /* i/o: orientation tracking type */
+)
{
+ if ( pOTR == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
pOTR->trackingType = trackingType;
+
return IVAS_ERR_OK;
}
-
/*-------------------------------------------------------------------*
- * ivas_orient_trk_SetAbsoluteOrientation()
+ * ivas_orient_trk_SetReferenceRotation()
*
*
*-------------------------------------------------------------------*/
-ivas_error ivas_orient_trk_SetAbsoluteOrientation(
- ivas_orient_trk_state_t *pOTR,
- float yaw,
- float pitch,
- float roll )
+ivas_error ivas_orient_trk_SetReferenceRotation(
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ const IVAS_QUATERNION refRot /* i : reference rotation */
+)
{
- /* TODO implement condition checks */
- pOTR->absYaw = yaw;
- pOTR->absPitch = pitch;
- pOTR->absRoll = roll;
+ if ( pOTR == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ /* check for Euler angle signaling */
+ if ( refRot.w == -3.0f )
+ {
+ Euler2Quat( deg2rad( refRot.x ), deg2rad( refRot.y ), deg2rad( refRot.z ), &pOTR->refRot );
+ }
+ else
+ {
+ pOTR->refRot = refRot;
+ }
return IVAS_ERR_OK;
}
/*-------------------------------------------------------------------*
- * ivas_orient_trk_Process()
+ * ivas_orient_trk_GetMainOrientation()
*
*
*-------------------------------------------------------------------*/
-ivas_error ivas_orient_trk_Process(
- ivas_orient_trk_state_t *pOTR )
+ivas_error ivas_orient_trk_GetMainOrientation(
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ IVAS_QUATERNION *pOrientation /* i/o: average/reference orientation */
+)
{
- float yaw;
- float pitch;
- float roll;
-
- if ( pOTR->trackingType == OTR_TRACKING_AVG_ORIENT )
+ if ( pOTR == NULL || pOrientation == NULL )
{
- float normalizedOrientation;
- float relativeOrientationRate;
- float rateRange;
- float cutoffFrequency;
- float alpha = pOTR->alpha;
-
- /* Copy absolute orientation as input to compute further on */
- yaw = pOTR->absYaw;
- pitch = pOTR->absPitch;
- roll = pOTR->absRoll;
-
- /* Compute average (low-pass filtered) absolute orientation */
- pOTR->absAvgYaw = ( 1.0f - alpha ) * pOTR->absAvgYaw + alpha * yaw;
- pOTR->absAvgPitch = ( 1.0f - alpha ) * pOTR->absAvgPitch + alpha * pitch;
- pOTR->absAvgRoll = ( 1.0f - alpha ) * pOTR->absAvgRoll + alpha * roll;
-
- /* Compute relative orientation = (absolute orientation) - (average absolute orientation) */
- yaw -= pOTR->absAvgYaw;
- pitch -= pOTR->absAvgPitch;
- roll -= pOTR->absAvgRoll;
-
- /* Clip tracked relative orientation to avoid wrap around */
- yaw = ClipAngle( yaw, -MAX_TRACKED_ANGLE_AVG_ORIENT, MAX_TRACKED_ANGLE_AVG_ORIENT );
- pitch = ClipAngle( pitch, -MAX_TRACKED_ANGLE_AVG_ORIENT, MAX_TRACKED_ANGLE_AVG_ORIENT );
- roll = ClipAngle( roll, -MAX_TRACKED_ANGLE_AVG_ORIENT, MAX_TRACKED_ANGLE_AVG_ORIENT );
-
- /* Store relative orientation result as output */
- pOTR->trkYaw = yaw;
- pOTR->trkPitch = pitch;
- pOTR->trkRoll = roll;
-
- /* Reconstruct the mean absolute orientation, compensating for non-linear computation of relative orientation:
- take absolute orientation and subtract the *clipped* mean relative orientation */
- pOTR->absAvgYaw = pOTR->absYaw - yaw;
- pOTR->absAvgPitch = pOTR->absPitch - pitch;
- pOTR->absAvgRoll = pOTR->absRoll - roll;
-
- /* Adapt LPF constant based on orientation excursion relative to current mean:
- - low cutoff (slow adaptation) for small excursions (around center)
- - high cutoff (fast adaptation) for large excursions (off-center)
- */
-
- normalizedOrientation = yaw * yaw;
- normalizedOrientation += pitch * pitch;
- normalizedOrientation += roll * roll;
-
- relativeOrientationRate = sqrtf( normalizedOrientation ) / pOTR->adaptationAngle;
- /* 'if' assumed to perform comparison to 0 */
- if ( relativeOrientationRate > 1.0f )
- {
- relativeOrientationRate = 1.0f;
- }
-
- /* Compute range of the adaptation rate between center = lower rate and off-center = higher rate */
- rateRange = pOTR->offCenterAdaptationRate - pOTR->centerAdaptationRate;
- /* 'if' assumed to perform comparison to 0 */
- if ( rateRange < 0.0f )
- {
- rateRange = 0.0f;
- }
-
- /* Compute adaptivity cutoff frequency: interpolate between minimum (center) and maximum (off-center) values */
- cutoffFrequency = pOTR->centerAdaptationRate + ( relativeOrientationRate * rateRange );
-
- /* Compute filter coefficient corresponding to desired cutoff frequency */
- pOTR->alpha = sinf( 2.0f * EVS_PI * cutoffFrequency / OTR_UPDATE_RATE );
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
}
- else
+ switch ( pOTR->trackingType )
{
- /* 'if' assumed to perform comparison to 0 */
- if ( pOTR->trackingType == OTR_TRACKING_REF_ORIENT )
- {
- /* Reset average orientation */
- pOTR->absAvgYaw = pOTR->absYaw;
- pOTR->absAvgPitch = pOTR->absPitch;
- pOTR->absAvgRoll = pOTR->absRoll;
+ case OTR_TRACKING_NONE:
+ *pOrientation = IdentityQuaternion();
+ break;
+ case OTR_TRACKING_REF_VEC:
+ case OTR_TRACKING_REF_VEC_LEV:
+ case OTR_TRACKING_REF_ORIENT:
+ *pOrientation = pOTR->refRot;
+ break;
+ case OTR_TRACKING_AVG_ORIENT:
+ *pOrientation = pOTR->absAvgRot;
+ break;
+ }
- /* Reset adaptation filter - start adaptation at center rate */
- pOTR->alpha = sinf( 2.0f * EVS_PI * pOTR->centerAdaptationRate / OTR_UPDATE_RATE );
+ return IVAS_ERR_OK;
+}
- /* Copy absolute orientation as input to compute further on */
- yaw = pOTR->absYaw;
- pitch = pOTR->absPitch;
- roll = pOTR->absRoll;
- /* Compute relative orientation = (absolute orientation) - (reference orientation) */
- yaw -= pOTR->refYaw;
- pitch -= pOTR->refPitch;
- roll -= pOTR->refRoll;
-
- /* Clip computed relative orientation to avoid wrap around and store as output */
- pOTR->trkYaw = ClipAngle( yaw, -MAX_TRACKED_ANGLE_REF_ORIENT, MAX_TRACKED_ANGLE_REF_ORIENT );
- pOTR->trkPitch = ClipAngle( pitch, -MAX_TRACKED_ANGLE_REF_ORIENT, MAX_TRACKED_ANGLE_REF_ORIENT );
- pOTR->trkRoll = ClipAngle( roll, -MAX_TRACKED_ANGLE_REF_ORIENT, MAX_TRACKED_ANGLE_REF_ORIENT );
- }
-
- else
- {
- return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Non-supported orientation tracking adaptation type" );
- }
+/*-------------------------------------------------------------------*
+ * ivas_orient_trk_GetTrackedRotation()
+ *
+ *
+ *-------------------------------------------------------------------*/
+
+ivas_error ivas_orient_trk_GetTrackedRotation(
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ IVAS_QUATERNION *pRotation /* i/o: processed rotation */
+)
+{
+ if ( pOTR == NULL || pRotation == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
}
+ *pRotation = pOTR->trkRot;
+
return IVAS_ERR_OK;
}
/*-------------------------------------------------------------------*
- * ivas_orient_trk_GetTrackedOrientation()
+ * ivas_orient_trk_SetReferenceVector()
*
*
*-------------------------------------------------------------------*/
-ivas_error ivas_orient_trk_GetTrackedOrientation(
- ivas_orient_trk_state_t *pOTR,
- float *yaw,
- float *pitch,
- float *roll )
+ivas_error ivas_orient_trk_SetReferenceVector(
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ const IVAS_VECTOR3 listenerPos, /* i : Listener position */
+ const IVAS_VECTOR3 refPos /* i : Reference position */
+)
{
- *yaw = pOTR->trkYaw;
- *pitch = pOTR->trkPitch;
- *roll = pOTR->trkRoll;
+ IVAS_VECTOR3 acousticFrontVector, ivasForwardVector;
+ IVAS_VECTOR3 listenerPosLevel, refPosLevel;
+ float acousticFrontVectorLength;
+
+ if ( pOTR == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ switch ( pOTR->trackingType )
+ {
+ case OTR_TRACKING_NONE:
+ case OTR_TRACKING_REF_ORIENT:
+ case OTR_TRACKING_AVG_ORIENT:
+ case OTR_TRACKING_REF_VEC:
+ acousticFrontVector = VectorSubtract( listenerPos, refPos );
+ break;
+ case OTR_TRACKING_REF_VEC_LEV:
+ /* ignore the height difference between listener position and reference position */
+ listenerPosLevel.z = refPosLevel.z = listenerPos.z;
+ listenerPosLevel.x = listenerPos.x;
+ listenerPosLevel.y = listenerPos.y;
+ refPosLevel.x = refPos.x;
+ refPosLevel.y = refPos.y;
+ acousticFrontVector = VectorSubtract( listenerPosLevel, refPosLevel );
+ break;
+ default:
+ return IVAS_ERR_WRONG_PARAMS;
+ }
+
+ acousticFrontVectorLength = VectorLength( acousticFrontVector );
+
+ /* if the length is zero, the user has entered insensible listener and reference positions */
+ if ( acousticFrontVectorLength < 0.0001f )
+ {
+ return IVAS_ERR_WRONG_PARAMS;
+ }
+
+ ivasForwardVector.x = -1.0f;
+ ivasForwardVector.y = 0.0f;
+ ivasForwardVector.z = 0.0f;
+ VectorRotationToQuaternion( ivasForwardVector, acousticFrontVector, &pOTR->refRot );
return IVAS_ERR_OK;
}
+
+
+/*-------------------------------------------------------------------*
+ * ivas_orient_trk_Process()
+ *
+ *
+ *-------------------------------------------------------------------*/
+
+ivas_error ivas_orient_trk_Process(
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ IVAS_QUATERNION absRot, /* i : absolute head rotation */
+ float updateRate, /* i : rotation update rate [Hz] */
+ IVAS_QUATERNION *pTrkRot /* o : tracked rotation */
+)
+{
+ float normalizedOrientation;
+ float relativeOrientationRate;
+ float rateRange;
+ float cutoffFrequency;
+ float alpha = pOTR->alpha;
+ float ang;
+ ivas_error result;
+
+ if ( pOTR == NULL || pTrkRot == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ result = IVAS_ERR_OK;
+
+ switch ( pOTR->trackingType )
+ {
+ case OTR_TRACKING_NONE:
+ pOTR->trkRot = absRot;
+ break;
+ case OTR_TRACKING_REF_VEC:
+ case OTR_TRACKING_REF_VEC_LEV:
+ case OTR_TRACKING_REF_ORIENT:
+ /* Reset average orientation */
+ pOTR->absAvgRot = absRot;
+
+ /* Reset adaptation filter - start adaptation at center rate */
+ pOTR->alpha = sinf( 2.0f * EVS_PI * pOTR->centerAdaptationRate / updateRate );
+
+ /* Compute relative orientation = (absolute orientation) - (reference orientation) */
+ QuaternionInverse( pOTR->refRot, &pOTR->trkRot );
+ QuaternionProduct( pOTR->trkRot, absRot, &pOTR->trkRot );
+ break;
+
+ case OTR_TRACKING_AVG_ORIENT:
+ /* Compute average (low-pass filtered) absolute orientation */
+ QuaternionSlerp( pOTR->absAvgRot, absRot, alpha, &pOTR->absAvgRot );
+
+ /* Compute relative orientation = (absolute orientation) - (average absolute orientation) */
+ QuaternionInverse( pOTR->absAvgRot, &pOTR->trkRot );
+ QuaternionProduct( pOTR->trkRot, absRot, &pOTR->trkRot );
+
+ /* Adapt LPF constant based on orientation excursion relative to current mean:
+ - low cutoff (slow adaptation) for small excursions (around center)
+ - high cutoff (fast adaptation) for large excursions (off-center)
+ */
+ ang = QuaternionAngle( absRot, pOTR->trkRot );
+ normalizedOrientation = ang * ang;
+
+ relativeOrientationRate = sqrtf( normalizedOrientation ) / pOTR->adaptationAngle;
+ /* 'if' assumed to perform comparison to 0 */
+ if ( relativeOrientationRate > 1.0f )
+ {
+ relativeOrientationRate = 1.0f;
+ }
+
+ /* Compute range of the adaptation rate between center = lower rate and off-center = higher rate */
+ rateRange = pOTR->offCenterAdaptationRate - pOTR->centerAdaptationRate;
+ /* 'if' assumed to perform comparison to 0 */
+ if ( rateRange < 0.0f )
+ {
+ rateRange = 0.0f;
+ }
+
+ /* Compute adaptivity cutoff frequency: interpolate between minimum (center) and maximum (off-center) values */
+ cutoffFrequency = pOTR->centerAdaptationRate + ( relativeOrientationRate * rateRange );
+
+ /* Compute filter coefficient corresponding to desired cutoff frequency */
+ pOTR->alpha = sinf( 2.0f * EVS_PI * cutoffFrequency / updateRate );
+ break;
+ default:
+ result = IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Non-supported orientation tracking adaptation type" );
+ break;
+ }
+
+ if ( result == IVAS_ERR_OK )
+ {
+ *pTrkRot = pOTR->trkRot;
+ }
+
+ return result;
+}
diff --git a/lib_rend/ivas_prot_rend.h b/lib_rend/ivas_prot_rend.h
index 8a6cb1a2f90fab3f671d337ce973c60ed745e916..938e8de02c909c85236052bb6055cbd1f97b8143 100644
--- a/lib_rend/ivas_prot_rend.h
+++ b/lib_rend/ivas_prot_rend.h
@@ -54,11 +54,7 @@ ivas_error getAudioConfigNumChannels(
int16_t *numChannels
);
-#ifdef FIX_197_CREND_INTERFACE
AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig(
-#else
-AUDIO_CONFIG rendAudioConfigToIvasAudioConfig(
-#endif
IVAS_REND_AudioConfig rendConfig );
IVAS_REND_AudioConfig getRendAudioConfigFromIvasAudioConfig(
@@ -215,23 +211,17 @@ void ivas_HRTF_CRend_binary_close(
* TD object renderer
*----------------------------------------------------------------------------------*/
-void ivas_td_binaural_renderer_unwrap(
- RENDER_CONFIG_DATA *hRenderConfig, /* i : Renderer configuration */
- const int16_t ini_frame, /* i : Initialization frame counter */
-#ifdef FIX_197_CREND_INTERFACE
- CREND_WRAPPER_HANDLE hCrendWrapper, /* i : Crend wrapper handle */
-#else
- CREND_HANDLE hCrend, /* i : Crend handle */
-#endif
- AUDIO_CONFIG transport_config, /* i : Transport configuration */
- const int32_t output_Fs, /* i : Output sampling rate */
+ivas_error ivas_td_binaural_renderer_unwrap(
+ const REVERB_HANDLE hReverb, /* i : Reverberator handle */
+ const AUDIO_CONFIG transport_config, /* i : Transport configuration */
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD binaural object renderer handle */
- const int16_t nchan_transport, /* i : Transport channels (ISms) */
+ const int16_t num_src, /* i : number of sources to render */
const int16_t lfe_idx, /* i : LFE channel index */
- IVAS_FORMAT ivas_format, /* i : IVAS format */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
ISM_METADATA_HANDLE *hIsmMetaData, /* i : ISM metadata handle */
const int16_t Opt_Headrotation, /* i : Head rotation flag */
const IVAS_QUATERNION *Quaternions, /* i : Head tracking data per subframe */
+ const IVAS_POSITION *Pos, /* i : Listener position data per subframe */
float output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis */
const int16_t output_frame /* i : output frame length */
);
@@ -242,6 +232,7 @@ ivas_error ivas_td_binaural_renderer_ext(
const LSSETUP_CUSTOM_STRUCT *customLsInput, /* i : Input custom loudspeaker layout */
const IVAS_REND_HeadRotData *headRotData, /* i : Input head positions */
const IVAS_REND_AudioObjectPosition *currentPos, /* i : Object position */
+ const REVERB_HANDLE hReverb, /* i : Reverberator handle */
const int16_t output_frame, /* i : output frame length */
float output[][L_FRAME48k] /* i/o: SCE channels / Binaural synthesis */
);
@@ -252,6 +243,7 @@ ivas_error ivas_td_binaural_open_unwrap(
const int16_t nchan_transport, /* i : Number of channels */
const IVAS_FORMAT ivas_format, /* i : IVAS format (ISM/MC) */
const AUDIO_CONFIG transport_config, /* i : Transport configuration */
+ const float *directivity, /* i : Directivity pattern (used for ISM) */
const IVAS_OUTPUT_SETUP hTransSetup, /* i : Loudspeaker layout */
BINAURAL_TD_OBJECT_RENDERER_HANDLE *hBinRendererTd, /* o : TD renderer handle */
int32_t *binaural_latency_ns /* i : Binauralization delay */
@@ -260,6 +252,7 @@ ivas_error ivas_td_binaural_open_unwrap(
ivas_error ivas_td_binaural_open_ext(
TDREND_WRAPPER *pTDRend,
const IVAS_REND_AudioConfig inConfig,
+ RENDER_CONFIG_DATA *hRendCfg, /* i : Renderer configuration */
LSSETUP_CUSTOM_STRUCT *customLsInput,
const int32_t output_Fs
);
@@ -271,7 +264,7 @@ void ivas_td_binaural_close(
ivas_error TDREND_GetMix(
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
- float output[][L_FRAME48k], /* i/o: ISm object synth / rendered output in 0,1 */
+ float output[][L_FRAME48k], /* i/o: ISM object synth / rendered output in 0,1 */
const int16_t subframe_length, /* i/o: subframe length */
const int16_t subframe_idx /* i : Subframe index to 5 ms subframe */
);
@@ -279,23 +272,19 @@ ivas_error TDREND_GetMix(
void TDREND_Update_listener_orientation(
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD Renderer handle */
const int16_t headRotEnabled, /* i : Headrotation flag */
- const IVAS_QUATERNION *headPosition /* i : Head Position */
+ const IVAS_QUATERNION *headPosition, /* i : Listener orientation */
+ const IVAS_POSITION *Pos /* i : Listener Position */
);
void TDREND_Update_object_positions(
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o : TD Renderer handle */
- const int16_t numSources, /* i : Number of sources to render */
+ const int16_t num_src, /* i : number of sources to render */
const int16_t lfe_idx, /* i : Input LFE index */
const IVAS_FORMAT in_format, /* i : Format of input sources */
const ISM_METADATA_HANDLE *hIsmMetaData, /* i : Input metadata for ISM objects */
float output[][L_FRAME48k] /* i/o: SCE/MC channels */
);
-void BSplineModelEvalAlloc(
- ModelParams_t *model, /* i : Model parameters */
- ModelEval_t *modelEval /* i/o: Model evaluation structure */
-);
-
void BSplineModelEvalDealloc(
ModelParams_t *model, /* i : Model parameters */
ModelEval_t *modelEval /* i : Model evaluation structure */
@@ -405,7 +394,8 @@ void TDREND_SPATIAL_VecMapToNewCoordSystem(
const float *DirVec_p, /* i : Direction vector */
const float *UpVec_p, /* i : Up vector */
const float *RightVec_p, /* i : Right vector */
- float *MappedVec_p /* o : Transformed vector */
+ float *MappedVec_p, /* o : Transformed vector */
+ float *LisRelPosAbs /* o : Transformed vector ignoring orientation */
);
/*! r: Flag if the orientation has been updated */
@@ -471,7 +461,8 @@ void TDREND_firfilt(
const int16_t intp_count, /* i : interpolation count */
float *mem, /* i/o: filter memory */
const int16_t subframe_length, /* i : Length of signal */
- const int16_t filterlength /* i : Filter length */
+ const int16_t filterlength, /* i : Filter length */
+ const float Gain /* i : Gain */
);
@@ -480,59 +471,32 @@ void TDREND_firfilt(
*----------------------------------------------------------------------------------*/
ivas_error ivas_rend_openCrend(
-#ifdef FIX_197_CREND_INTERFACE
CREND_WRAPPER_HANDLE *pCrend,
-#else
- CREND_WRAPPER *pCrend,
-#endif
const AUDIO_CONFIG inConfig,
const AUDIO_CONFIG outConfig,
RENDER_CONFIG_DATA *hRendCfg,
-#ifdef FIX_197_CREND_INTERFACE
- int16_t Opt_Headrotation,
-#endif
HRTFS_CREND_HANDLE hSetOfHRTF,
const int32_t output_Fs
);
-#ifdef FIX_197_CREND_INTERFACE
void ivas_rend_closeCrend(
CREND_WRAPPER_HANDLE *pCrend );
-#else
-ivas_error ivas_rend_closeCrend(
- CREND_WRAPPER *pCrend );
-#endif
-#ifdef FIX_329_ENABLE_TD_RENDERER_REVERB_MC
ivas_error ivas_rend_initCrendWrapper(
CREND_WRAPPER_HANDLE *pCrend );
-#endif
ivas_error ivas_rend_crendProcess(
const CREND_WRAPPER *pCrend,
const AUDIO_CONFIG inConfig,
const AUDIO_CONFIG outConfig,
-#ifdef FIX_197_CREND_INTERFACE
DECODER_CONFIG_HANDLE hDecoderConfig,
HEAD_TRACK_DATA_HANDLE hHeadTrackData,
IVAS_OUTPUT_SETUP_HANDLE hIntSetup,
EFAP_HANDLE hEFAPdata,
-#endif
float output[][L_FRAME48k], /* i/o: input/output audio channels */
const int32_t output_Fs
);
-#ifndef FIX_197_CREND_INTERFACE
-
-ivas_error ivas_crend_init_from_setofhrtf(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-);
-
-ivas_error ivas_crend_init_from_hrtf_handle(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- HRTFS_HANDLE hrtf);
-
-#endif
@@ -596,12 +560,12 @@ void ivas_reverb_close(
);
ivas_error ivas_reverb_process(
- REVERB_HANDLE hReverb, /* i/o: reverb state */
+ const REVERB_HANDLE hReverb, /* i : Reverberator handle */
const AUDIO_CONFIG input_audio_config, /* i : reverb. input audio configuration */
const int16_t mix_signals, /* i : add reverb to output signal */
float pcm_in[][L_FRAME48k], /* i : the PCM audio to apply reverb on */
float pcm_out[][L_FRAME48k], /* o : the PCM audio with reverb applied */
- const int16_t i_ts
+ const int16_t i_ts /* i : subframe index */
);
void ivas_rev_delay_line_init(
@@ -786,13 +750,21 @@ ivas_error ivas_headTrack_open(
HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* o : head track handle */
);
-void Quat2Euler(
- const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */
- float *yaw, /* o : yaw */
- float *pitch, /* o : pitch */
- float *roll /* o : roll */
+void ivas_headTrack_close(
+ HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* i/o: head track handle */
);
+void Euler2Quat(
+ const float yaw, /* i : yaw (x) */
+ const float pitch, /* i : pitch (y) */
+ const float roll, /* i : roll (z) */
+ IVAS_QUATERNION *quat /* o : quaternion describing the rotation */
+);
+
+float deg2rad( float degrees );
+
+
+
void QuatToRotMat(
const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */
float Rmat[3][3] /* o : real-space rotation matrix for this rotation */
@@ -870,32 +842,43 @@ ivas_error ivas_render_config_init_from_rom(
* Orientation tracking
*----------------------------------------------------------------------------------*/
-void ivas_orient_trk_Init(
- ivas_orient_trk_state_t *pOTR
+ivas_error ivas_orient_trk_Init(
+ ivas_orient_trk_state_t *pOTR /* i/o: orientation tracker handle */
);
-ivas_error ivas_orient_trk_SetTrackingType(
- ivas_orient_trk_state_t *pOTR,
- OTR_TRACKING_T trackingType
+ivas_error ivas_orient_trk_SetTrackingType(
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ const OTR_TRACKING_T trackingType /* i : orientation tracking type */
);
-ivas_error ivas_orient_trk_SetAbsoluteOrientation(
- ivas_orient_trk_state_t *pOTR,
- float yaw,
- float pitch,
- float roll
+ivas_error ivas_orient_trk_SetReferenceRotation(
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientatoin trakcer handle */
+ const IVAS_QUATERNION refRot /* i : reference rotation */
);
-ivas_error ivas_orient_trk_Process(
- ivas_orient_trk_state_t *pOTR
+ivas_error ivas_orient_trk_SetReferenceVector(
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ const IVAS_VECTOR3 listenerPos, /* i : Listener position */
+ const IVAS_VECTOR3 refPos /* i : Reference position */
);
-ivas_error ivas_orient_trk_GetTrackedOrientation(
- ivas_orient_trk_state_t *pOTR,
- float *yaw,
- float *pitch,
- float *roll
+ivas_error ivas_orient_trk_GetMainOrientation(
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ IVAS_QUATERNION *pOrientation /* i/o: average/reference orientation */
);
+
+ivas_error ivas_orient_trk_GetTrackedRotation(
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ IVAS_QUATERNION *pRotation /* i/o: processed rotation */
+);
+
+ivas_error ivas_orient_trk_Process(
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ IVAS_QUATERNION absRot, /* i : absolute head rotation */
+ float updateRate, /* i : rotation update rate [Hz] */
+ IVAS_QUATERNION *pTrkRot /* o : tracked rotation */
+);
+
/* clang-format on */
#endif /* IVAS_PROT_REND_H */
diff --git a/lib_rend/ivas_render_config.c b/lib_rend/ivas_render_config.c
index 405ae8d72f343e7c614461aae8c83a36febe76ea..efd866ccec4139bb01801f6141e6b4451776bc51 100644
--- a/lib_rend/ivas_render_config.c
+++ b/lib_rend/ivas_render_config.c
@@ -61,8 +61,7 @@ ivas_error ivas_render_config_open(
)
{
/* Allocate HR filter set for headphones configuration */
- *hRenderConfig = (RENDER_CONFIG_HANDLE) malloc( sizeof( RENDER_CONFIG_DATA ) );
- if ( *hRenderConfig == NULL )
+ if ( ( *hRenderConfig = (RENDER_CONFIG_HANDLE) malloc( sizeof( RENDER_CONFIG_DATA ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for renderer configuration!" );
}
@@ -104,6 +103,7 @@ ivas_error ivas_render_config_init_from_rom(
const int16_t room_flag_on /* i : room effect on/off flag */
)
{
+
if ( hRenderConfig == NULL || *hRenderConfig == NULL )
{
return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Unexpected null pointer while attempting to fill renderer configuration from ROM" );
@@ -126,5 +126,9 @@ ivas_error ivas_render_config_init_from_rom(
mvr2r( ivas_reverb_default_RT60, ( *hRenderConfig )->roomAcoustics.pAcoustic_rt60, IVAS_REVERB_DEFAULT_N_BANDS );
mvr2r( ivas_reverb_default_DSR, ( *hRenderConfig )->roomAcoustics.pAcoustic_dsr, IVAS_REVERB_DEFAULT_N_BANDS );
+ ( *hRenderConfig )->directivity[0] = 360.0f; /* Front cone */
+ ( *hRenderConfig )->directivity[1] = 360.0f; /* Back cone */
+ ( *hRenderConfig )->directivity[2] = 1.0f; /* Back attenuation */
+
return IVAS_ERR_OK;
}
diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb.c
index a3d55584b406f5f1e41d578e7038bb47bb06ee3f..d31d1bd1a6b6359158ea54483cd388d4222aa5c5 100644
--- a/lib_rend/ivas_reverb.c
+++ b/lib_rend/ivas_reverb.c
@@ -675,34 +675,34 @@ static ivas_error calc_jot_t60_coeffs(
*-----------------------------------------------------------------------------------------*/
static ivas_error initialize_reverb_filters(
- REVERB_HANDLE pState )
+ REVERB_HANDLE hReverb )
{
ivas_error error;
error = IVAS_ERR_OK;
/* init correlation and coloration filters */
- if ( ( error = ivas_reverb_t2f_f2t_init( &pState->fft_filter_ols, pState->fft_size, pState->fft_subblock_size ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_reverb_t2f_f2t_init( &hReverb->fft_filter_ols, hReverb->fft_size, hReverb->fft_subblock_size ) ) != IVAS_ERR_OK )
{
return error;
}
- if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_correl_0, pState->fft_size ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_correl_0, hReverb->fft_size ) ) != IVAS_ERR_OK )
{
return error;
}
- if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_correl_1, pState->fft_size ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_correl_1, hReverb->fft_size ) ) != IVAS_ERR_OK )
{
return error;
}
- if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_color_0, pState->fft_size ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_color_0, hReverb->fft_size ) ) != IVAS_ERR_OK )
{
return error;
}
- if ( ( error = ivas_reverb_fft_filter_init( &pState->fft_filter_color_1, pState->fft_size ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_reverb_fft_filter_init( &hReverb->fft_filter_color_1, hReverb->fft_size ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -718,13 +718,13 @@ static ivas_error initialize_reverb_filters(
*-----------------------------------------------------------------------------------------*/
static ivas_error set_t60_filter(
- REVERB_HANDLE pState,
+ REVERB_HANDLE hReverb,
const uint16_t branch,
const uint16_t nr_taps,
const float coefA[],
const float coefB[] )
{
- if ( branch >= pState->nr_of_branches )
+ if ( branch >= hReverb->nr_of_branches )
{
return IVAS_ERR_INTERNAL;
}
@@ -734,7 +734,7 @@ static ivas_error set_t60_filter(
return IVAS_ERR_INTERNAL;
}
- ivas_reverb_iir_filt_set( &( pState->t60[branch] ), nr_taps, coefA, coefB );
+ ivas_reverb_iir_filt_set( &( hReverb->t60[branch] ), nr_taps, coefA, coefB );
return IVAS_ERR_OK;
}
@@ -747,16 +747,16 @@ static ivas_error set_t60_filter(
*-----------------------------------------------------------------------------------------*/
static ivas_error set_feedback_delay(
- REVERB_HANDLE pState,
+ REVERB_HANDLE hReverb,
const uint16_t branch,
const int16_t fb_delay )
{
- if ( branch >= pState->nr_of_branches )
+ if ( branch >= hReverb->nr_of_branches )
{
return IVAS_ERR_INTERNAL;
}
- pState->delay_line[branch].Delay = fb_delay;
+ hReverb->delay_line[branch].Delay = fb_delay;
return IVAS_ERR_OK;
}
@@ -769,19 +769,19 @@ static ivas_error set_feedback_delay(
*-----------------------------------------------------------------------------------------*/
static ivas_error set_feedback_gain(
- REVERB_HANDLE pState,
+ REVERB_HANDLE hReverb,
const uint16_t branch,
const float *pGain )
{
uint16_t gain_idx;
- if ( branch >= pState->nr_of_branches )
+ if ( branch >= hReverb->nr_of_branches )
{
return IVAS_ERR_INTERNAL;
}
- for ( gain_idx = 0; gain_idx < pState->nr_of_branches; gain_idx++ )
+ for ( gain_idx = 0; gain_idx < hReverb->nr_of_branches; gain_idx++ )
{
- pState->gain_matrix[branch][gain_idx] = pGain[gain_idx];
+ hReverb->gain_matrix[branch][gain_idx] = pGain[gain_idx];
}
return IVAS_ERR_OK;
@@ -795,7 +795,7 @@ static ivas_error set_feedback_gain(
*-----------------------------------------------------------------------------------------*/
static ivas_error set_correl_fft_filter(
- REVERB_HANDLE pState,
+ REVERB_HANDLE hReverb,
const uint16_t channel,
rv_fftwf_type_complex *pSpectrum )
{
@@ -806,11 +806,11 @@ static ivas_error set_correl_fft_filter(
if ( channel == 0 )
{
- ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_correl_0.fft_spectrum, pState->fft_filter_correl_0.fft_size );
+ ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_correl_0.fft_spectrum, hReverb->fft_filter_correl_0.fft_size );
}
else
{
- ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_correl_1.fft_spectrum, pState->fft_filter_correl_1.fft_size );
+ ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_correl_1.fft_spectrum, hReverb->fft_filter_correl_1.fft_size );
}
return IVAS_ERR_OK;
@@ -824,7 +824,7 @@ static ivas_error set_correl_fft_filter(
*-----------------------------------------------------------------------------------------*/
static ivas_error set_color_fft_filter(
- REVERB_HANDLE pState,
+ REVERB_HANDLE hReverb,
const uint16_t channel,
rv_fftwf_type_complex *pSpectrum )
{
@@ -835,11 +835,11 @@ static ivas_error set_color_fft_filter(
if ( channel == 0 )
{
- ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_color_0.fft_spectrum, pState->fft_filter_color_0.fft_size );
+ ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_color_0.fft_spectrum, hReverb->fft_filter_color_0.fft_size );
}
else
{
- ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, pState->fft_filter_color_1.fft_spectrum, pState->fft_filter_color_1.fft_size );
+ ivas_reverb_fft_filter_ConvertFFTWF_2_FFTR( pSpectrum, hReverb->fft_filter_color_1.fft_spectrum, hReverb->fft_filter_color_1.fft_size );
}
return IVAS_ERR_OK;
@@ -853,7 +853,7 @@ static ivas_error set_color_fft_filter(
*-----------------------------------------------------------------------------------------*/
static ivas_error set_mixer_level(
- REVERB_HANDLE pState,
+ REVERB_HANDLE hReverb,
const uint16_t channel,
const float level[] )
{
@@ -863,9 +863,9 @@ static ivas_error set_mixer_level(
return IVAS_ERR_INTERNAL;
}
- for ( branch_idx = 0; branch_idx < pState->nr_of_branches; branch_idx++ )
+ for ( branch_idx = 0; branch_idx < hReverb->nr_of_branches; branch_idx++ )
{
- pState->mixer[channel][branch_idx] = level[branch_idx];
+ hReverb->mixer[channel][branch_idx] = level[branch_idx];
}
return IVAS_ERR_OK;
@@ -879,7 +879,7 @@ static ivas_error set_mixer_level(
*-----------------------------------------------------------------------------------------*/
static void clear_buffers(
- REVERB_HANDLE pState )
+ REVERB_HANDLE hReverb )
{
int16_t branch_idx;
ivas_rev_iir_filter_t *iirFilter;
@@ -887,15 +887,15 @@ static void clear_buffers(
for ( branch_idx = 0; branch_idx < IVAS_REV_MAX_NR_BRANCHES; branch_idx++ )
{
- delay_line = &( pState->delay_line[branch_idx] );
+ delay_line = &( hReverb->delay_line[branch_idx] );
set_f( delay_line->pBuffer, 0, delay_line->MaxDelay );
delay_line->BufferPos = 0;
- iirFilter = &( pState->t60[branch_idx] );
+ iirFilter = &( hReverb->t60[branch_idx] );
set_f( iirFilter->pBuffer, 0, iirFilter->MaxTaps );
}
- ivas_reverb_t2f_f2t_ClearHistory( &pState->fft_filter_ols );
+ ivas_reverb_t2f_f2t_ClearHistory( &hReverb->fft_filter_ols );
return;
}
@@ -908,31 +908,31 @@ static void clear_buffers(
*-----------------------------------------------------------------------------------------*/
static void set_fft_and_datablock_sizes(
- REVERB_HANDLE pState,
+ REVERB_HANDLE hReverb,
const int16_t subframe_len )
{
- pState->full_block_size = subframe_len;
+ hReverb->full_block_size = subframe_len;
if ( subframe_len == L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES )
{
- pState->fft_size = IVAS_REVERB_FFT_SIZE_48K;
- pState->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_48K;
+ hReverb->fft_size = IVAS_REVERB_FFT_SIZE_48K;
+ hReverb->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_48K;
}
else if ( subframe_len == L_FRAME32k / MAX_PARAM_SPATIAL_SUBFRAMES )
{
- pState->fft_size = IVAS_REVERB_FFT_SIZE_32K;
- pState->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_32K;
+ hReverb->fft_size = IVAS_REVERB_FFT_SIZE_32K;
+ hReverb->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_32K;
}
else if ( subframe_len == L_FRAME16k / MAX_PARAM_SPATIAL_SUBFRAMES )
{
- pState->fft_size = IVAS_REVERB_FFT_SIZE_16K;
- pState->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_16K;
+ hReverb->fft_size = IVAS_REVERB_FFT_SIZE_16K;
+ hReverb->num_fft_subblocks = IVAS_REVERB_FFT_N_SUBBLOCKS_16K;
}
else
{
assert( 0 ); /* unsupported block size */
}
- pState->fft_subblock_size = subframe_len / pState->num_fft_subblocks;
+ hReverb->fft_subblock_size = subframe_len / hReverb->num_fft_subblocks;
return;
}
@@ -1030,7 +1030,7 @@ static void set_reverb_acoustic_data(
*-----------------------------------------------------------------------------------------*/
static ivas_error setup_FDN_branches(
- REVERB_HANDLE pState,
+ REVERB_HANDLE hReverb,
ivas_reverb_params_t *pParams )
{
int16_t nr_coefs, branch_idx, channel_idx;
@@ -1041,12 +1041,12 @@ static ivas_error setup_FDN_branches(
/* initialize feedback branches */
for ( branch_idx = 0; branch_idx < IVAS_REV_MAX_NR_BRANCHES; branch_idx++ )
{
- ivas_rev_delay_line_init( &( pState->delay_line[branch_idx] ), pState->loop_delay_buffer[branch_idx], init_loop_delay[branch_idx], pParams->pLoop_delays[branch_idx] );
- ivas_reverb_iir_filt_init( &( pState->t60[branch_idx] ), IVAS_REV_MAX_IIR_FILTER_LENGTH );
- pState->mixer[0][branch_idx] = 0.0f;
- pState->mixer[1][branch_idx] = 0.0f;
+ ivas_rev_delay_line_init( &( hReverb->delay_line[branch_idx] ), hReverb->loop_delay_buffer[branch_idx], init_loop_delay[branch_idx], pParams->pLoop_delays[branch_idx] );
+ ivas_reverb_iir_filt_init( &( hReverb->t60[branch_idx] ), IVAS_REV_MAX_IIR_FILTER_LENGTH );
+ hReverb->mixer[0][branch_idx] = 0.0f;
+ hReverb->mixer[1][branch_idx] = 0.0f;
}
- clear_buffers( pState );
+ clear_buffers( hReverb );
nr_coefs = pParams->t60_filter_order + 1;
if ( IVAS_REV_MAX_IIR_FILTER_LENGTH < nr_coefs )
@@ -1060,17 +1060,17 @@ static ivas_error setup_FDN_branches(
pCoef_a = &pParams->pT60_filter_coeff[2 * nr_coefs * branch_idx + nr_coefs];
pCoef_b = &pParams->pT60_filter_coeff[2 * nr_coefs * branch_idx];
- if ( ( error = set_t60_filter( pState, branch_idx, nr_coefs, pCoef_a, pCoef_b ) ) != IVAS_ERR_OK )
+ if ( ( error = set_t60_filter( hReverb, branch_idx, nr_coefs, pCoef_a, pCoef_b ) ) != IVAS_ERR_OK )
{
return error;
}
- if ( ( error = set_feedback_delay( pState, branch_idx, pParams->pLoop_delays[branch_idx] ) ) != IVAS_ERR_OK )
+ if ( ( error = set_feedback_delay( hReverb, branch_idx, pParams->pLoop_delays[branch_idx] ) ) != IVAS_ERR_OK )
{
return error;
}
- if ( ( error = set_feedback_gain( pState, branch_idx, &( pParams->pLoop_feedback_matrix[branch_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK )
+ if ( ( error = set_feedback_gain( hReverb, branch_idx, &( pParams->pLoop_feedback_matrix[branch_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -1079,7 +1079,7 @@ static ivas_error setup_FDN_branches(
for ( channel_idx = 0; channel_idx < pParams->nr_outputs; channel_idx++ )
{
- if ( ( error = set_mixer_level( pState, channel_idx, &( pParams->pLoop_extract_matrix[channel_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK )
+ if ( ( error = set_mixer_level( hReverb, channel_idx, &( pParams->pLoop_extract_matrix[channel_idx * pParams->nr_loops] ) ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -1175,6 +1175,15 @@ ivas_error ivas_reverb_open(
/* set up reverb acoustic data on the basis of HRTF data and renderer config */
set_reverb_acoustic_data( ¶ms, input_audio_config, hHrtf, &hRenderConfig->roomAcoustics, subframe_len, nr_fc_input, nr_fc_fft_filter );
+ /* set reverb acoustic configuration based on renderer config */
+#ifdef DEBUGGING
+ pState->pConfig.renderer_type_override = hRenderConfig->renderer_type_override;
+#endif
+ pState->pConfig.roomAcoustics.override = hRenderConfig->roomAcoustics.override;
+ pState->pConfig.roomAcoustics.use_brir = hRenderConfig->roomAcoustics.use_brir;
+ pState->pConfig.roomAcoustics.late_reverb_on = hRenderConfig->roomAcoustics.late_reverb_on;
+ pState->pConfig.roomAcoustics.nBands = hRenderConfig->roomAcoustics.nBands;
+
/* set up input downmix */
pState->dmx_gain = calc_dmx_gain();
@@ -1301,27 +1310,27 @@ void ivas_reverb_close(
*-----------------------------------------------------------------------------------------*/
static void post_fft_filter(
- REVERB_HANDLE pState,
+ REVERB_HANDLE hReverb,
float *p0,
float *p1,
float *pBuffer_0,
float *pBuffer_1 )
{
- if ( pState->do_corr_filter )
+ if ( hReverb->do_corr_filter )
{
- ivas_reverb_t2f_f2t_in( &pState->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 );
- ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_correl_0, pBuffer_0 );
- ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_correl_1, pBuffer_1 );
- ivas_reverb_fft_filter_CrossMix( pBuffer_0, pBuffer_1, pState->fft_filter_correl_0.fft_size );
+ ivas_reverb_t2f_f2t_in( &hReverb->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 );
+ ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_correl_0, pBuffer_0 );
+ ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_correl_1, pBuffer_1 );
+ ivas_reverb_fft_filter_CrossMix( pBuffer_0, pBuffer_1, hReverb->fft_filter_correl_0.fft_size );
}
else
{
- ivas_reverb_t2f_f2t_in( &pState->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 );
+ ivas_reverb_t2f_f2t_in( &hReverb->fft_filter_ols, p0, p1, pBuffer_0, pBuffer_1 );
}
- ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_color_0, pBuffer_0 );
- ivas_reverb_fft_filter_ComplexMul( &pState->fft_filter_color_1, pBuffer_1 );
- ivas_reverb_t2f_f2t_out( &pState->fft_filter_ols, pBuffer_0, pBuffer_1, p0, p1 );
+ ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_color_0, pBuffer_0 );
+ ivas_reverb_fft_filter_ComplexMul( &hReverb->fft_filter_color_1, pBuffer_1 );
+ ivas_reverb_t2f_f2t_out( &hReverb->fft_filter_ols, pBuffer_0, pBuffer_1, p0, p1 );
return;
}
@@ -1334,14 +1343,14 @@ static void post_fft_filter(
*-----------------------------------------------------------------------------------------*/
static void reverb_block(
- REVERB_HANDLE pState,
+ REVERB_HANDLE hReverb,
float *pInput,
float *pOut0,
float *pOut1 )
{
- uint16_t nr_branches = pState->nr_of_branches;
- uint16_t bsize = pState->full_block_size;
+ uint16_t nr_branches = hReverb->nr_of_branches;
+ uint16_t bsize = hReverb->full_block_size;
uint16_t inner_bsize = INNER_BLK_SIZE;
uint16_t i, j, k, ns, branch_idx, blk_idx, start_sample_idx;
@@ -1373,12 +1382,12 @@ static void reverb_block(
for ( i = 0; i < nr_branches; i++ )
{
float *pOutput_i = &ppOutput[i][0];
- float mixer_0_i = pState->mixer[0][i];
- float mixer_1_i = pState->mixer[1][i];
+ float mixer_0_i = hReverb->mixer[0][i];
+ float mixer_1_i = hReverb->mixer[1][i];
/* output and feedback are same, get sample from delay line ... */
- ivas_rev_delay_line_get_sample_blk( &( pState->delay_line[i] ), inner_bsize, pTemp );
- ivas_reverb_iir_filt_2taps_feed_blk( &( pState->t60[i] ), inner_bsize, pTemp, ppOutput[i] );
+ ivas_rev_delay_line_get_sample_blk( &( hReverb->delay_line[i] ), inner_bsize, pTemp );
+ ivas_reverb_iir_filt_2taps_feed_blk( &( hReverb->t60[i] ), inner_bsize, pTemp, ppOutput[i] );
for ( ns = 0; ns < inner_bsize; ns++ )
{
pO0[ns] += pOutput_i[ns] * mixer_0_i; /* mixer ch 0 */
@@ -1397,7 +1406,7 @@ static void reverb_block(
for ( j = 0; j < nr_branches; j++ )
{
- float gain_matrix_j_i = pState->gain_matrix[j][i];
+ float gain_matrix_j_i = hReverb->gain_matrix[j][i];
float *pOutput = &ppOutput[j][0];
for ( ns = 0; ns < inner_bsize; ns++ )
{
@@ -1405,15 +1414,15 @@ static void reverb_block(
}
}
- ivas_rev_delay_line_feed_sample_blk( &( pState->delay_line[i] ), inner_bsize, pFeedback_input );
+ ivas_rev_delay_line_feed_sample_blk( &( hReverb->delay_line[i] ), inner_bsize, pFeedback_input );
}
}
/* Applying FFT filter to each sub-frame */
- for ( blk_idx = 0; blk_idx < pState->num_fft_subblocks; blk_idx++ )
+ for ( blk_idx = 0; blk_idx < hReverb->num_fft_subblocks; blk_idx++ )
{
- start_sample_idx = blk_idx * pState->fft_subblock_size;
- post_fft_filter( pState, pOut0 + start_sample_idx, pOut1 + start_sample_idx, pFFT_buf[0], pFFT_buf[1] );
+ start_sample_idx = blk_idx * hReverb->fft_subblock_size;
+ post_fft_filter( hReverb, pOut0 + start_sample_idx, pOut1 + start_sample_idx, pFFT_buf[0], pFFT_buf[1] );
}
return;
@@ -1427,14 +1436,14 @@ static void reverb_block(
*-----------------------------------------------------------------------------------------*/
static ivas_error downmix_input_block(
- REVERB_HANDLE pState,
+ const REVERB_HANDLE hReverb,
float pcm_in[][L_FRAME48k],
const AUDIO_CONFIG input_audio_config,
float *pPcm_out,
const int16_t input_offset )
{
int16_t i, s, nchan_transport;
- float dmx_gain = pState->dmx_gain;
+ float dmx_gain = hReverb->dmx_gain;
switch ( input_audio_config )
{
@@ -1450,7 +1459,7 @@ static ivas_error downmix_input_block(
case AUDIO_CONFIG_ISM4:
{
nchan_transport = audioCfg2channels( input_audio_config );
- for ( s = 0; s < pState->full_block_size; s++ )
+ for ( s = 0; s < hReverb->full_block_size; s++ )
{
float temp = pcm_in[0][input_offset + s];
for ( i = 1; i < nchan_transport; i++ )
@@ -1466,7 +1475,7 @@ static ivas_error downmix_input_block(
case AUDIO_CONFIG_HOA2:
case AUDIO_CONFIG_HOA3:
{
- for ( s = 0; s < pState->full_block_size; s++ )
+ for ( s = 0; s < hReverb->full_block_size; s++ )
{
pPcm_out[s] = dmx_gain * pcm_in[0][input_offset + s];
}
@@ -1488,35 +1497,35 @@ static ivas_error downmix_input_block(
*-----------------------------------------------------------------------------------------*/
static void predelay_block(
- REVERB_HANDLE pState,
+ const REVERB_HANDLE hReverb,
float *pInput,
float *pOutput )
{
uint16_t i, idx, n_samples, blk_size;
- uint16_t max_blk_size = (uint16_t) pState->predelay_line.Delay;
+ uint16_t max_blk_size = (uint16_t) hReverb->predelay_line.Delay;
if ( max_blk_size < 2 )
{
if ( max_blk_size == 0 ) /* zero-length delay line: just copy the data from input to output */
{
- for ( i = 0; i < pState->full_block_size; i++ )
+ for ( i = 0; i < hReverb->full_block_size; i++ )
{
pOutput[i] = pInput[i];
}
}
else /* 1-sample length delay line: feed the data sample-by-sample */
{
- for ( i = 0; i < pState->full_block_size; i++ )
+ for ( i = 0; i < hReverb->full_block_size; i++ )
{
- pOutput[i] = ivas_rev_delay_line_get_sample( &( pState->predelay_line ) );
- ivas_rev_delay_line_feed_sample( &( pState->predelay_line ), pInput[i] );
+ pOutput[i] = ivas_rev_delay_line_get_sample( &( hReverb->predelay_line ) );
+ ivas_rev_delay_line_feed_sample( &( hReverb->predelay_line ), pInput[i] );
}
}
}
else /* multiple-sample length delay line: use block processing */
{
idx = 0;
- n_samples = pState->full_block_size;
+ n_samples = hReverb->full_block_size;
while ( n_samples > 0 )
{
blk_size = n_samples;
@@ -1524,8 +1533,8 @@ static void predelay_block(
{
blk_size = max_blk_size;
}
- ivas_rev_delay_line_get_sample_blk( &( pState->predelay_line ), blk_size, &pOutput[idx] );
- ivas_rev_delay_line_feed_sample_blk( &( pState->predelay_line ), blk_size, &pInput[idx] );
+ ivas_rev_delay_line_get_sample_blk( &( hReverb->predelay_line ), blk_size, &pOutput[idx] );
+ ivas_rev_delay_line_feed_sample_blk( &( hReverb->predelay_line ), blk_size, &pInput[idx] );
idx += blk_size;
n_samples -= blk_size;
}
@@ -1542,7 +1551,7 @@ static void predelay_block(
*-----------------------------------------------------------------------------------------*/
static void mix_output_block(
- REVERB_HANDLE pState,
+ const REVERB_HANDLE hReverb,
const float *pInL,
const float *pInR,
float *pOutL,
@@ -1550,7 +1559,7 @@ static void mix_output_block(
{
uint16_t i;
- for ( i = 0; i < pState->full_block_size; i++ )
+ for ( i = 0; i < hReverb->full_block_size; i++ )
{
pOutL[i] += pInL[i];
pOutR[i] += pInR[i];
@@ -1567,12 +1576,13 @@ static void mix_output_block(
*-----------------------------------------------------------------------------------------*/
ivas_error ivas_reverb_process(
- REVERB_HANDLE hReverb, /* i/o: reverb state */
+ const REVERB_HANDLE hReverb, /* i : Reverberator handle */
const AUDIO_CONFIG input_audio_config, /* i : reverb. input audio configuration */
const int16_t mix_signals, /* i : add reverb to output signal */
float pcm_in[][L_FRAME48k], /* i : the PCM audio to apply reverb on */
float pcm_out[][L_FRAME48k], /* o : the PCM audio with reverb applied */
- const int16_t i_ts )
+ const int16_t i_ts /* i : subframe index */
+)
{
float tmp0[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES], tmp1[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES], tmp2[L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];
ivas_error error;
@@ -1884,6 +1894,28 @@ ivas_error ivas_binaural_reverb_open(
}
}
+
+#ifdef FIX_103_RA_PARAMS_PARAM_BIN_REND
+ if ( ( roomAcoustics ) && ( roomAcoustics->override ) )
+ {
+ ivas_reverb_prepare_cldfb_params( roomAcoustics, hHrtfFastConv, output_config, roomAcoustics->use_brir, sampling_rate, t60, ene );
+ ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, t60, ene );
+ ivas_binaural_reverb_setPreDelay( hReverb, (int16_t) roundf( 48000.0f * roomAcoustics->acousticPreDelay / CLDFB_NO_CHANNELS_MAX ) );
+ }
+ else
+ {
+ if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
+ {
+ ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfFastConv->fastconvReverberationTimes, hHrtfFastConv->fastconvReverberationEneCorrections );
+ ivas_binaural_reverb_setPreDelay( hReverb, 10 );
+ }
+ else
+ {
+ ivas_binaural_reverb_setReverbTimes( hReverb, sampling_rate, hHrtfParambin->parametricReverberationTimes, hHrtfParambin->parametricReverberationEneCorrections );
+ ivas_binaural_reverb_setPreDelay( hReverb, 10 );
+ }
+ }
+#else
if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
{
if ( !roomAcoustics->override )
@@ -1904,6 +1936,7 @@ ivas_error ivas_binaural_reverb_open(
ivas_binaural_reverb_setPreDelay( hReverb, 10 );
}
+#endif
return IVAS_ERR_OK;
}
diff --git a/lib_rend/ivas_rom_TdBinauralRenderer.c b/lib_rend/ivas_rom_TdBinauralRenderer.c
index 70daa6dff9ab5eafe41320317533c40ec1ed1ae2..4b56fb4883d7fb0b26d230409dd250cb75406f85 100644
--- a/lib_rend/ivas_rom_TdBinauralRenderer.c
+++ b/lib_rend/ivas_rom_TdBinauralRenderer.c
@@ -41,6 +41,7 @@
#include "ivas_cnst.h"
#include "wmc_auto.h"
+#define WMC_TOOL_SKIP
/*-------------------------------------------------------------------------
* TD Binaural rendering related ROM tables
@@ -12456,4 +12457,6 @@ const uint32_t orange53_rom_ITD_elevBsShape[28] = {
0x3ebda12f,0x3f12f685,0x3f2aaaab,
};
+#undef WMC_TOOL_SKIP
+
/* clang-format on */
diff --git a/lib_rend/ivas_rom_binauralRenderer.c b/lib_rend/ivas_rom_binauralRenderer.c
index 763777ad288c2be764a3863d8439000c7d55b439..9708bac83aec16af96f97ae080fba9933f23d4bb 100644
--- a/lib_rend/ivas_rom_binauralRenderer.c
+++ b/lib_rend/ivas_rom_binauralRenderer.c
@@ -41,6 +41,8 @@
/* clang-format off */
+#define WMC_TOOL_SKIP
+
/*-------------------------------------------------------------------------
* Binaural rendering related ROM tables
*------------------------------------------------------------------------*/
@@ -44077,4 +44079,6 @@ const float parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX] =
0.016350f, 0.042709f, 0.077337f, 0.066238f, 0.042046f, 0.020017f, 0.007896f, 0.002947f, 0.000932f, 0.000152f
};
+#undef WMC_TOOL_SKIP
+
/* clang-format on */
diff --git a/lib_rend/ivas_rom_binaural_crend_head.c b/lib_rend/ivas_rom_binaural_crend_head.c
index a57d7803783d776b3e8d3541622d72ec654092d5..56a9a9ef5352414618cbc049009c64d61d3d1af9 100644
--- a/lib_rend/ivas_rom_binaural_crend_head.c
+++ b/lib_rend/ivas_rom_binaural_crend_head.c
@@ -47,6 +47,7 @@
#include "cnst.h"
#include "ivas_cnst.h"
+#define WMC_TOOL_SKIP
/********************** CRendBin_Combined_HRIR **********************/
#ifdef FIX_BINAURAL_DELAY_PRECISION
@@ -6923,3 +6924,4 @@ const float CRendBin_Combined_BRIR_coeff_diffuse_im_16kHz[BINAURAL_CHANNELS][252
0.050578f, 0.012222f, 0.020049f, -0.020057f, -0.032135f, -0.002553f, -0.037541f, -0.023567f, -0.008392f, -0.012215f, 0.001644f, -0.001142f, 0.000540f, 0.001404f, -0.027979f, -0.022362f, -0.012091f, -0.022963f, 0.009075f, 0.010977f, -0.007069f, -0.000183f, -0.022228f, -0.001348f, 0.006548f, -0.003034f}
};
+#undef WMC_TOOL_SKIP
diff --git a/lib_rend/ivas_rom_rend.c b/lib_rend/ivas_rom_rend.c
index 0dfdaf0d28083baaaa060515c382631ff7eb49b9..dd8ca99d80ee6cb990fa7f65db3db9539cd837f5 100644
--- a/lib_rend/ivas_rom_rend.c
+++ b/lib_rend/ivas_rom_rend.c
@@ -104,7 +104,7 @@ const float diffuseFieldCoherenceDifferenceZ[BINAURAL_COHERENCE_DIFFERENCE_BINS]
/*----------------------------------------------------------------------------------*
- * TD ISm binaural renderer ROM tables
+ * TD ISM binaural renderer ROM tables
*----------------------------------------------------------------------------------*/
const int16_t HRTF_MODEL_N_CPTS_VAR[HRTF_MODEL_N_SECTIONS] =
diff --git a/lib_rend/ivas_rotation.c b/lib_rend/ivas_rotation.c
index 2622d02308b0c9dd25bd7cd67b301f2b2b214626..58536df19f343eff092a44f56a2f31d3b15c6739 100644
--- a/lib_rend/ivas_rotation.c
+++ b/lib_rend/ivas_rotation.c
@@ -30,6 +30,7 @@
*******************************************************************************************************/
+#include "ivas_cnst.h"
#include
#include
#include "options.h"
@@ -43,111 +44,168 @@
#include "wmc_auto.h"
-/*----------------------------------------------------------------------------------
- * QuatToRotMat()
+/*-----------------------------------------------------------------------*
+ * ivas_headTrack_open()
*
- * Quaternion handling: calculate rotation matrices in real-space and SHD
- *---------------------------------------------------------------------------------*/
+ * Allocate and initialize Head-Tracking handle
+ *-----------------------------------------------------------------------*/
-void QuatToRotMat(
- const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */
- float Rmat[3][3] /* o : real-space rotation matrix for this rotation */
+ivas_error ivas_headTrack_open(
+ HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* o : head track handle */
)
{
- float s1, s2, s3, c1, c2, c3;
-#ifdef DEBUGGING
- /* PrintQuat( quat ); */
-#endif
+ int16_t i;
+ ivas_error error;
- /* For debugging purposes we can also calculate the rotation matrix from
- * Euler angles instead of quaternions. In this case, all the w values must
- * be set to -3.0 in the trajectory file to signal switching to Euler angles.
- * The x,y, and z components of the quaternion are then interpreted as
- * yaw-pitch-roll.
- */
- if ( quat.w != -3.0 )
+ /* Allocate Head-Tracking handle */
+ if ( ( *hHeadTrackData = (HEAD_TRACK_DATA_HANDLE) malloc( sizeof( HEAD_TRACK_DATA ) ) ) == NULL )
{
- Rmat[0][0] = quat.w * quat.w + quat.x * quat.x - quat.y * quat.y - quat.z * quat.z;
- Rmat[0][1] = 2.0f * ( quat.x * quat.y - quat.w * quat.z );
- Rmat[0][2] = 2.0f * ( quat.x * quat.z + quat.w * quat.y );
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for head-tracking memory\n" ) );
+ }
- Rmat[1][0] = 2.0f * ( quat.x * quat.y + quat.w * quat.z );
- Rmat[1][1] = quat.w * quat.w - quat.x * quat.x + quat.y * quat.y - quat.z * quat.z;
- Rmat[1][2] = 2.0f * ( quat.y * quat.z - quat.w * quat.x );
+ /* Initialization */
+ ( *hHeadTrackData )->num_quaternions = 0;
+ ( *hHeadTrackData )->lrSwitchInterpVal = 0.0f;
+ ( *hHeadTrackData )->lrSwitchedCurrent = 0;
+ ( *hHeadTrackData )->lrSwitchedNext = 0;
+ if ( ( ( *hHeadTrackData )->OrientationTracker = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" );
+ }
- Rmat[2][0] = 2.0f * ( quat.x * quat.z - quat.w * quat.y );
- Rmat[2][1] = 2.0f * ( quat.y * quat.z + quat.w * quat.x );
- Rmat[2][2] = quat.w * quat.w - quat.x * quat.x - quat.y * quat.y + quat.z * quat.z;
+ if ( ( error = ivas_orient_trk_Init( ( *hHeadTrackData )->OrientationTracker ) ) != IVAS_ERR_OK )
+ {
+ return error;
}
- else
+
+ /* Initialise Rmat_prev to I, Rmat will be computed later */
+ for ( i = 0; i < 3; i++ )
{
- /* Euler angles in R_X(roll)*R_Y(pitch)*R_Z(yaw) convention
- *
- * yaw: rotate scene counter-clockwise in the horizontal plane
- * pitch: rotate scene in the median plane, increase elevation with positive values
- * roll: rotate scene from the right ear to the top
- */
+ set_zero( ( *hHeadTrackData )->Rmat_prev[i], 3 );
+ ( *hHeadTrackData )->Rmat_prev[i][i] = 1.0f;
+ }
- c1 = cosf( quat.z / _180_OVER_PI );
- c2 = cosf( quat.y / _180_OVER_PI );
- c3 = cosf( quat.x / _180_OVER_PI );
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT
+ set_zero( ( *hHeadTrackData )->chEneIIR[0], MASA_FREQUENCY_BANDS );
+ set_zero( ( *hHeadTrackData )->chEneIIR[1], MASA_FREQUENCY_BANDS );
+ set_zero( ( *hHeadTrackData )->procChEneIIR[0], MASA_FREQUENCY_BANDS );
+ set_zero( ( *hHeadTrackData )->procChEneIIR[1], MASA_FREQUENCY_BANDS );
+#else
+ set_zero( ( *hHeadTrackData )->chEneIIR[0], CLDFB_NO_CHANNELS_MAX );
+ set_zero( ( *hHeadTrackData )->chEneIIR[1], CLDFB_NO_CHANNELS_MAX );
+ set_zero( ( *hHeadTrackData )->procChEneIIR[0], CLDFB_NO_CHANNELS_MAX );
+ set_zero( ( *hHeadTrackData )->procChEneIIR[1], CLDFB_NO_CHANNELS_MAX );
+#endif
+#endif
- s1 = sinf( quat.z / _180_OVER_PI );
- s2 = sinf( -quat.y / _180_OVER_PI );
- s3 = sinf( quat.x / _180_OVER_PI );
+ return IVAS_ERR_OK;
+}
- Rmat[0][0] = c2 * c3;
- Rmat[0][1] = -c2 * s3;
- Rmat[0][2] = s2;
- Rmat[1][0] = c1 * s3 + c3 * s1 * s2;
- Rmat[1][1] = c1 * c3 - s1 * s2 * s3;
- Rmat[1][2] = -c2 * s1;
+/*-----------------------------------------------------------------------*
+ * ivas_headTrack_close()
+ *
+ * Deallocate Head-Tracking handle
+ *-----------------------------------------------------------------------*/
- Rmat[2][0] = s1 * s3 - c1 * c3 * s2;
- Rmat[2][1] = c3 * s1 + c1 * s2 * s3;
- Rmat[2][2] = c1 * c2;
+void ivas_headTrack_close(
+ HEAD_TRACK_DATA_HANDLE *hHeadTrackData /* i/o: head track handle */
+)
+{
+ if ( hHeadTrackData == NULL || *hHeadTrackData == NULL )
+ {
+ return;
+ }
+
+ if ( ( *hHeadTrackData )->OrientationTracker != NULL )
+ {
+ free( ( *hHeadTrackData )->OrientationTracker );
+ ( *hHeadTrackData )->OrientationTracker = NULL;
}
+ free( ( *hHeadTrackData ) );
+ *hHeadTrackData = NULL;
+
return;
}
+
+/*----------------------------------------------------------------------------------
+ * QuatToRotMat()
+ *
+ * Quaternion handling: calculate rotation matrices in real-space and SHD
+ *---------------------------------------------------------------------------------*/
+
+void QuatToRotMat(
+ const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */
+ float Rmat[3][3] /* o : real-space rotation matrix for this rotation */
+)
+{
+ Rmat[0][0] = quat.w * quat.w + quat.x * quat.x - quat.y * quat.y - quat.z * quat.z;
+ Rmat[0][1] = 2.0f * ( quat.x * quat.y - quat.w * quat.z );
+ Rmat[0][2] = 2.0f * ( quat.x * quat.z + quat.w * quat.y );
+
+ Rmat[1][0] = 2.0f * ( quat.x * quat.y + quat.w * quat.z );
+ Rmat[1][1] = quat.w * quat.w - quat.x * quat.x + quat.y * quat.y - quat.z * quat.z;
+ Rmat[1][2] = 2.0f * ( quat.y * quat.z - quat.w * quat.x );
+
+ Rmat[2][0] = 2.0f * ( quat.x * quat.z - quat.w * quat.y );
+ Rmat[2][1] = 2.0f * ( quat.y * quat.z + quat.w * quat.x );
+ Rmat[2][2] = quat.w * quat.w - quat.x * quat.x - quat.y * quat.y + quat.z * quat.z;
+
+ return;
+}
+
+
/*-------------------------------------------------------------------------
- * Quat2Euler()
+ * Euler2Quat()
*
- * Quaternion handling: calculate corresponding Euler angles
+ * Calculate corresponding Quaternion from Euler angles in radians
*------------------------------------------------------------------------*/
-void Quat2Euler(
- const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */
- float *yaw, /* o : yaw */
- float *pitch, /* o : pitch */
- float *roll /* o : roll */
+void Euler2Quat(
+ const float yaw, /* i : yaw (x) */
+ const float pitch, /* i : pitch (y) */
+ const float roll, /* i : roll (z) */
+ IVAS_QUATERNION *quat /* o : quaternion describing the rotation */
)
{
- if ( quat.w != -3.0 )
+ float cr = cosf( roll * 0.5f );
+ float sr = sinf( roll * 0.5f );
+ float cp = cosf( pitch * 0.5f );
+ float sp = sinf( -pitch * 0.5f );
+ float cy = cosf( yaw * 0.5f );
+ float sy = sinf( yaw * 0.5f );
+
+ quat->w = cr * cp * cy - sr * sp * sy;
+ quat->x = sr * cp * cy + cr * sp * sy;
+ quat->y = cr * sp * cy - sr * cp * sy;
+ quat->z = cr * cp * sy + sr * sp * cy;
+
+ return;
+}
+
+/*-------------------------------------------------------------------------
+ * deg2rad()
+ *
+ * Converts degrees to normalized radians
+ *------------------------------------------------------------------------*/
+float deg2rad(
+ float degrees )
+{
+ while ( degrees >= 180.0f )
{
- *yaw = atan2f( 2 * ( quat.w * quat.x + quat.y * quat.z ), 1 - 2 * ( quat.x * quat.x + quat.y * quat.y ) );
- *pitch = asinf( 2 * ( quat.w * quat.y - quat.z * quat.x ) );
- *roll = atan2f( 2 * ( quat.w * quat.z + quat.x * quat.y ), 1 - 2 * ( quat.y * quat.y + quat.z * quat.z ) );
+ degrees = degrees - 360.0f;
}
- else
+ while ( degrees <= -180.0f )
{
- /* Euler angles in R_X(roll)*R_Y(pitch)*R_Z(yaw) convention
- *
- * yaw: rotate scene counter-clockwise in the horizontal plane
- * pitch: rotate scene in the median plane, increase elevation with positive values
- * roll: rotate scene from the right ear to the top
- */
- *yaw = quat.z;
- *pitch = quat.y;
- *roll = quat.x;
+ degrees = degrees + 360.0f;
}
- return;
+ return PI_OVER_180 * degrees;
}
-
/*-------------------------------------------------------------------------
* rotateAziEle()
*
diff --git a/lib_rend/ivas_stat_rend.h b/lib_rend/ivas_stat_rend.h
index 023c41ead7106c78d69fb98dd4d34d1e113162ef..4e19435b07facf951f055c981977b9ed63feca0a 100644
--- a/lib_rend/ivas_stat_rend.h
+++ b/lib_rend/ivas_stat_rend.h
@@ -150,6 +150,9 @@ typedef struct ivas_dirac_dec_binaural_data_structure
uint16_t useSubframeMode; /* 0 = process in 20 ms frames, 1 = process in 5 ms subframes */
uint16_t useTdDecorr;
ivas_td_decorr_state_t *hTdDecorr;
+#ifdef NOKIA_PARAMBIN_REQULARIZATION
+ float reqularizationFactor;
+#endif
} DIRAC_DEC_BIN_DATA, *DIRAC_DEC_BIN_HANDLE;
@@ -231,6 +234,23 @@ typedef struct EFAP
} EFAP, *EFAP_HANDLE;
+/*----------------------------------------------------------------------------------*
+ * Orientation tracking structure
+ *----------------------------------------------------------------------------------*/
+
+typedef struct ivas_orient_trk_state_t
+{
+ OTR_TRACKING_T trackingType;
+ float centerAdaptationRate;
+ float offCenterAdaptationRate;
+ float adaptationAngle;
+
+ float alpha;
+ IVAS_QUATERNION absAvgRot; /* average absolute orientation */
+ IVAS_QUATERNION refRot; /* reference orientation */
+ IVAS_QUATERNION trkRot; /* tracked rotation */
+
+} ivas_orient_trk_state_t;
/*----------------------------------------------------------------------------------*
* Head rotation data structure
@@ -240,7 +260,9 @@ typedef struct
{
int8_t headRotEnabled;
IVAS_QUATERNION headPositions[RENDERER_HEAD_POSITIONS_PER_FRAME];
+ IVAS_POSITION Pos[RENDERER_HEAD_POSITIONS_PER_FRAME];
float crossfade[L_FRAME48k / RENDERER_HEAD_POSITIONS_PER_FRAME];
+ ivas_orient_trk_state_t *hOrientationTracker;
} IVAS_REND_HeadRotData;
@@ -248,6 +270,7 @@ typedef struct ivas_binaural_head_track_struct
{
int16_t num_quaternions;
IVAS_QUATERNION Quaternions[MAX_PARAM_SPATIAL_SUBFRAMES];
+ IVAS_POSITION Pos[MAX_PARAM_SPATIAL_SUBFRAMES];
float Rmat[3][3];
float Rmat_prev[3][3];
@@ -255,46 +278,26 @@ typedef struct ivas_binaural_head_track_struct
uint8_t lrSwitchedCurrent;
float lrSwitchInterpVal;
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
+#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT
+ float chEneIIR[2][MASA_FREQUENCY_BANDS]; /* independent of the format. MASA bands are suitable for the task and readily available in ROM. */
+ float procChEneIIR[2][MASA_FREQUENCY_BANDS];
+#else
+ float chEneIIR[2][CLDFB_NO_CHANNELS_MAX];
+ float procChEneIIR[2][CLDFB_NO_CHANNELS_MAX];
+#endif
+#endif
+
int16_t shd_rot_max_order;
+ ivas_orient_trk_state_t *OrientationTracker;
} HEAD_TRACK_DATA, *HEAD_TRACK_DATA_HANDLE;
-
-/*----------------------------------------------------------------------------------*
- * Orientation tracking structure
- *----------------------------------------------------------------------------------*/
-
-typedef struct ivas_orient_trk_state_t
-{
- OTR_TRACKING_T trackingType;
- float centerAdaptationRate;
- float offCenterAdaptationRate;
- float adaptationAngle;
-
- float alpha;
-
- float absYaw; /* absolute orientation */
- float absPitch;
- float absRoll;
-
- float absAvgYaw; /* average absolute orientation */
- float absAvgPitch;
- float absAvgRoll;
-
- float refYaw; /* reference orientation */
- float refPitch;
- float refRoll;
-
- float trkYaw; /* tracked orientation */
- float trkPitch;
- float trkRoll;
-
-} ivas_orient_trk_state_t;
-
-
/*----------------------------------------------------------------------------------*
* Reverberator structure
*----------------------------------------------------------------------------------*/
+/* Reverberator structures */
+
typedef struct ivas_roomAcoustics_t
{
@@ -316,6 +319,7 @@ typedef struct ivas_render_config_t
ivas_renderTypeOverride renderer_type_override;
#endif
ivas_roomAcoustics_t roomAcoustics;
+ float directivity[3];
} RENDER_CONFIG_DATA, *RENDER_CONFIG_HANDLE;
@@ -399,7 +403,7 @@ typedef struct ivas_reverb_state_t
/*----------------------------------------------------------------------------------*
- * TD ISm Object Renderer structure
+ * TD ISM Object Renderer structure
*----------------------------------------------------------------------------------*/
typedef struct
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index 1ea76d4fb2ca9f392ce6531c06bbaa0baf56842c..3d2420632d86ccac487ab5aeb6737bb9afb2631d 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -115,11 +115,8 @@ typedef struct
IVAS_REND_AudioObjectPosition currentPos;
IVAS_REND_AudioObjectPosition previousPos;
TDREND_WRAPPER tdRendWrapper;
-#ifdef FIX_197_CREND_INTERFACE
CREND_WRAPPER_HANDLE crendWrapper;
-#else
- CREND_WRAPPER crendWrapper;
-#endif
+ REVERB_HANDLE hReverb;
rotation_matrix rot_mat_prev;
} input_ism;
@@ -144,11 +141,8 @@ typedef struct
LSSETUP_CUSTOM_STRUCT customLsInput;
EFAP_WRAPPER efapInWrapper;
TDREND_WRAPPER tdRendWrapper;
-#ifdef FIX_197_CREND_INTERFACE
CREND_WRAPPER_HANDLE crendWrapper;
-#else
- CREND_WRAPPER crendWrapper;
-#endif
+ REVERB_HANDLE hReverb;
rotation_gains rot_gains_prev;
lfe_routing lfeRouting;
} input_mc;
@@ -157,11 +151,7 @@ typedef struct
{
input_base base;
pan_matrix hoaDecMtx;
-#ifdef FIX_197_CREND_INTERFACE
CREND_WRAPPER_HANDLE crendWrapper;
-#else
- CREND_WRAPPER crendWrapper;
-#endif
rotation_gains rot_gains_prev;
} input_sba;
@@ -323,11 +313,7 @@ static int32_t limitRendererOutput(
*
*-------------------------------------------------------------------*/
-#ifdef FIX_197_CREND_INTERFACE
AUDIO_CONFIG getIvasAudioConfigFromRendAudioConfig(
-#else
-AUDIO_CONFIG rendAudioConfigToIvasAudioConfig(
-#endif
IVAS_REND_AudioConfig rendConfig )
{
switch ( rendConfig )
@@ -565,10 +551,9 @@ static ivas_error initLimiter(
ivas_limiter_close( phLimiter );
}
- *phLimiter = ivas_limiter_open( (int16_t) numChannels, sampleRate );
- if ( *phLimiter == NULL )
+ if ( ( *phLimiter = ivas_limiter_open( numChannels, sampleRate ) ) == NULL )
{
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Failed to open limiter" );
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Failed to open limiter handle" );
}
return IVAS_ERR_OK;
@@ -834,14 +819,17 @@ static ivas_error initEfap(
{
return error;
}
+
if ( ( error = getSpeakerElevations( pEfapWrapper->speakerConfig, &elevations ) ) != IVAS_ERR_OK )
{
return error;
}
+
if ( ( error = getNumNonLfeChannelsInSpeakerLayout( pEfapWrapper->speakerConfig, &numNonLfeChannels ) ) != IVAS_ERR_OK )
{
return error;
}
+
if ( ( error = efap_init_data( &pEfapWrapper->hEfap, azimuths, elevations, numNonLfeChannels, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK )
{
return error;
@@ -913,11 +901,12 @@ static ivas_error getEfapGains(
return IVAS_ERR_OK;
}
-static void initHeadRotation(
+static ivas_error initHeadRotation(
IVAS_REND_HANDLE hIvasRend )
{
int16_t i, crossfade_len;
float tmp;
+ ivas_error error;
/* Head rotation is enabled by default */
hIvasRend->headRotData.headRotEnabled = 1;
@@ -936,6 +925,27 @@ static void initHeadRotation(
hIvasRend->headRotData.headPositions[i] = quaternionInit();
}
+ if ( ( hIvasRend->headRotData.hOrientationTracker = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) ) ) == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Orientation tracking" );
+ }
+
+ if ( ( error = ivas_orient_trk_Init( hIvasRend->headRotData.hOrientationTracker ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ return IVAS_ERR_OK;
+}
+
+static void closeHeadRotation(
+ IVAS_REND_HANDLE hIvasRend )
+{
+ if ( ( hIvasRend != NULL ) && ( hIvasRend->headRotData.hOrientationTracker != NULL ) )
+ {
+ free( hIvasRend->headRotData.hOrientationTracker );
+ }
+
return;
}
@@ -997,6 +1007,9 @@ static IVAS_REND_AudioObjectPosition defaultObjectPosition(
pos.azimuth = 0.0f;
pos.elevation = 0.0f;
+ pos.radius = 1.0f;
+ pos.yaw = 0.0f;
+ pos.pitch = 0.0f;
return pos;
}
@@ -1042,6 +1055,21 @@ static CREND_WRAPPER defaultCrendWrapper(
return w;
}
+static bool isIoConfigPairSupported(
+ IVAS_REND_AudioConfig inConfig,
+ IVAS_REND_AudioConfig outConfig )
+{
+ /* Rendering mono or stereo to binaural is not supported */
+ if ( ( inConfig == IVAS_REND_AUDIO_CONFIG_MONO || inConfig == IVAS_REND_AUDIO_CONFIG_STEREO ) &&
+ getAudioConfigType( outConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL )
+ {
+ return false;
+ }
+
+ /* If not returned so far, config pair is supported */
+ return true;
+}
+
static ivas_error setRendInputActiveIsm(
void *input,
const IVAS_REND_AudioConfig inConfig,
@@ -1057,42 +1085,50 @@ static ivas_error setRendInputActiveIsm(
rendCtx = inputIsm->base.ctx;
outConfig = *rendCtx.pOutConfig;
+ if ( !isIoConfigPairSupported( inConfig, outConfig ) )
+ {
+ return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED;
+ }
+
initRendInputBase( &inputIsm->base, inConfig, id, rendCtx );
inputIsm->currentPos = defaultObjectPosition();
inputIsm->previousPos = defaultObjectPosition();
-#ifdef FIX_197_CREND_INTERFACE
inputIsm->crendWrapper = NULL;
-#else
- inputIsm->crendWrapper = defaultCrendWrapper();
-#endif
+ inputIsm->hReverb = NULL;
inputIsm->tdRendWrapper = defaultTdRendWrapper();
initRotMatrix( inputIsm->rot_mat_prev );
error = IVAS_ERR_OK;
if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL )
{
- error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, NULL, *rendCtx.pOutSampleRate );
+ if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM )
{
- error = ivas_rend_openCrend( &inputIsm->crendWrapper,
- AUDIO_CONFIG_7_1_4,
-#ifdef FIX_197_CREND_INTERFACE
- getIvasAudioConfigFromRendAudioConfig( outConfig ),
-#else
- rendAudioConfigToIvasAudioConfig( outConfig ),
-#endif
- hRendCfg,
-#ifdef FIX_197_CREND_INTERFACE
- 0,
-#endif
- NULL,
- *rendCtx.pOutSampleRate );
- }
- if ( error != IVAS_ERR_OK )
- {
- return error;
+ if ( hRendCfg != NULL && hRendCfg->roomAcoustics.use_brir == 0 && hRendCfg->roomAcoustics.late_reverb_on )
+ {
+ if ( ( error = ivas_td_binaural_open_ext( &inputIsm->tdRendWrapper, inConfig, hRendCfg, NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ if ( ( error = ivas_reverb_open( &( inputIsm->hReverb ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, hRendCfg, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+ else
+ {
+ if ( ( error = ivas_rend_openCrend( &inputIsm->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), hRendCfg,
+ NULL, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
}
return IVAS_ERR_OK;
@@ -1108,19 +1144,18 @@ static void clearInputIsm(
initRendInputBase( &inputIsm->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx );
/* Free input's internal handles */
-#ifdef FIX_197_CREND_INTERFACE
- if ( inputIsm->crendWrapper != NULL )
-#else
- if ( inputIsm->crendWrapper.hCrend != NULL )
-#endif
- {
- ivas_rend_closeCrend( &inputIsm->crendWrapper );
- }
+
+ ivas_rend_closeCrend( &inputIsm->crendWrapper );
+
+ ivas_reverb_close( &inputIsm->hReverb );
+
if ( inputIsm->tdRendWrapper.hBinRendererTd != NULL )
{
ivas_td_binaural_close( &inputIsm->tdRendWrapper.hBinRendererTd );
inputIsm->tdRendWrapper.hHrtfTD = NULL;
}
+
+ return;
}
static void copyLsConversionMatrixToPanMatrix(
@@ -1170,6 +1205,8 @@ static void fillIdentityPanMatrix(
{
panMatrix[i][i] = 1.0f;
}
+
+ return;
}
static ivas_error initMcPanGainsWithIdentMatrix(
@@ -1187,20 +1224,14 @@ static ivas_error initMcPanGainsWithConversionMapping(
AUDIO_CONFIG ivasConfigIn, ivasConfigOut;
int16_t i;
-#ifdef FIX_197_CREND_INTERFACE
ivasConfigIn = getIvasAudioConfigFromRendAudioConfig( inputMc->base.inConfig );
ivasConfigOut = getIvasAudioConfigFromRendAudioConfig( outConfig );
-#else
- ivasConfigIn = rendAudioConfigToIvasAudioConfig( inputMc->base.inConfig );
- ivasConfigOut = rendAudioConfigToIvasAudioConfig( outConfig );
-#endif
/* Find conversion mapping for current I/O config pair.
* Stay with default panning matrix if conversion_matrix is NULL */
for ( i = 0; i < LS_SETUP_CONVERSION_NUM_MAPPINGS; ++i )
{
- if ( ls_conversion_mapping[i].input_config == ivasConfigIn &&
- ls_conversion_mapping[i].output_config == ivasConfigOut )
+ if ( ls_conversion_mapping[i].input_config == ivasConfigIn && ls_conversion_mapping[i].output_config == ivasConfigOut )
{
/* Mapping found with valid matrix - copy */
if ( ls_conversion_mapping[i].conversion_matrix != NULL )
@@ -1236,10 +1267,12 @@ static ivas_error initMcPanGainsWithEfap(
{
return error;
}
+
if ( ( error = getSpeakerAzimuths( inputMc->base.inConfig, &spkAzi ) ) != IVAS_ERR_OK )
{
return error;
}
+
if ( ( error = getSpeakerElevations( inputMc->base.inConfig, &spkEle ) ) != IVAS_ERR_OK )
{
return error;
@@ -1399,6 +1432,7 @@ static ivas_error initMcPanGainsWithStereoLookup(
{
return error;
}
+
for ( readIdx = 0, writeIdx = 0; writeIdx < numInChannels; ++readIdx, ++writeIdx )
{
if ( skipSideSpeakers && readIdx == 4 )
@@ -1431,14 +1465,17 @@ static bool configsAreEqual(
{
return false;
}
+
if ( customLsA.num_lfe != customLsB.num_lfe )
{
return false;
}
+
if ( customLsA.is_planar_setup != customLsB.is_planar_setup )
{
return false;
}
+
for ( i = 0; i < customLsA.num_spk; ++i )
{
/* Compare to nearest degree (hence the int cast) */
@@ -1625,10 +1662,12 @@ static ivas_error updateMcPanGainsForAmbiOut(
{
return error;
}
+
if ( ( error = getSpeakerAzimuths( inputMc->base.inConfig, &spkAzi ) ) != IVAS_ERR_OK )
{
return error;
}
+
if ( ( error = getSpeakerElevations( inputMc->base.inConfig, &spkEle ) ) != IVAS_ERR_OK )
{
return error;
@@ -1747,14 +1786,11 @@ static ivas_error initMcBinauralRendering(
ivas_td_binaural_close( &inputMc->tdRendWrapper.hBinRendererTd );
inputMc->tdRendWrapper.hHrtfTD = NULL;
}
-#ifdef FIX_197_CREND_INTERFACE
- if ( inputMc->crendWrapper != NULL )
-#else
- if ( inputMc->crendWrapper.hCrend != NULL )
-#endif
- {
- ivas_rend_closeCrend( &inputMc->crendWrapper );
- }
+
+ ivas_rend_closeCrend( &inputMc->crendWrapper );
+
+ ivas_reverb_close( &inputMc->hReverb );
+
if ( inputMc->efapInWrapper.hEfap != NULL )
{
efap_free_data( &inputMc->efapInWrapper.hEfap );
@@ -1780,27 +1816,23 @@ static ivas_error initMcBinauralRendering(
// if ( initTDRend )
{
- if ( ( error = ivas_td_binaural_open_ext( &inputMc->tdRendWrapper, inConfig, &inputMc->customLsInput, outSampleRate ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_td_binaural_open_ext( &inputMc->tdRendWrapper, inConfig, hRendCfg, &inputMc->customLsInput, outSampleRate ) ) != IVAS_ERR_OK )
{
return error;
}
+
+ if ( hRendCfg != NULL && hRendCfg->roomAcoustics.use_brir == 0 && hRendCfg->roomAcoustics.late_reverb_on )
+ {
+ if ( ( error = ivas_reverb_open( &( inputMc->hReverb ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, hRendCfg, outSampleRate ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
}
{
- if ( ( error = ivas_rend_openCrend( &inputMc->crendWrapper,
-#ifdef FIX_197_CREND_INTERFACE
- ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) ? AUDIO_CONFIG_7_1_4 : getIvasAudioConfigFromRendAudioConfig( inConfig ),
- getIvasAudioConfigFromRendAudioConfig( outConfig ),
-#else
- ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) ? AUDIO_CONFIG_7_1_4 : rendAudioConfigToIvasAudioConfig( inConfig ),
- rendAudioConfigToIvasAudioConfig( outConfig ),
-#endif
- hRendCfg,
-#ifdef FIX_197_CREND_INTERFACE
- 0,
-#endif
- NULL,
- outSampleRate ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_rend_openCrend( &inputMc->crendWrapper, ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) ? AUDIO_CONFIG_7_1_4 : getIvasAudioConfigFromRendAudioConfig( inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ), hRendCfg,
+ NULL, outSampleRate ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -1809,10 +1841,13 @@ static ivas_error initMcBinauralRendering(
/* Initialise the EFAP handle for rotation on input layout */
if ( inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM && inputMc->base.ctx.pHeadRotData->headRotEnabled )
{
- initEfap( &inputMc->efapInWrapper, inConfig, NULL );
+ if ( ( error = initEfap( &inputMc->efapInWrapper, inConfig, NULL ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
- return error;
+ return IVAS_ERR_OK;
}
static lfe_routing defaultLfeRouting(
@@ -1821,7 +1856,7 @@ static lfe_routing defaultLfeRouting(
const IVAS_REND_AudioConfig outConfig,
const LSSETUP_CUSTOM_STRUCT customLsOut )
{
- int32_t i;
+ int16_t i;
lfe_routing routing;
/* Set all output gains to zero, then route each input LFE consecutively to the next available output LFE. */
@@ -1888,15 +1923,17 @@ static ivas_error setRendInputActiveMc(
rendCtx = inputMc->base.ctx;
outConfig = *rendCtx.pOutConfig;
+ if ( !isIoConfigPairSupported( inConfig, outConfig ) )
+ {
+ return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED;
+ }
+
initRendInputBase( &inputMc->base, inConfig, id, rendCtx );
setZeroPanMatrix( inputMc->panGains );
inputMc->customLsInput = defaultCustomLs();
inputMc->tdRendWrapper = defaultTdRendWrapper();
-#ifdef FIX_197_CREND_INTERFACE
inputMc->crendWrapper = NULL;
-#else
- inputMc->crendWrapper = defaultCrendWrapper();
-#endif
+ inputMc->hReverb = NULL;
initRotGains( inputMc->rot_gains_prev );
inputMc->lfeRouting = defaultLfeRouting( inConfig, inputMc->customLsInput, outConfig, *inputMc->base.ctx.pCustomLsOut );
@@ -1930,14 +1967,11 @@ static void clearInputMc(
{
efap_free_data( &inputMc->efapInWrapper.hEfap );
}
-#ifdef FIX_197_CREND_INTERFACE
- if ( inputMc->crendWrapper != NULL )
-#else
- if ( inputMc->crendWrapper.hCrend != NULL )
-#endif
- {
- ivas_rend_closeCrend( &inputMc->crendWrapper );
- }
+
+ ivas_rend_closeCrend( &inputMc->crendWrapper );
+
+ ivas_reverb_close( &inputMc->hReverb );
+
if ( inputMc->tdRendWrapper.hBinRendererTd != NULL )
{
ivas_td_binaural_close( &inputMc->tdRendWrapper.hBinRendererTd );
@@ -1974,11 +2008,7 @@ static ivas_error initSbaPanGainsForMcOut(
case IVAS_REND_AUDIO_CONFIG_MONO:
hOutSetup.ls_azimuth = ls_azimuth_CICP1;
hOutSetup.ls_elevation = ls_elevation_CICP1;
-#ifdef FIX_197_CREND_INTERFACE
ivas_output_init( &hOutSetup, getIvasAudioConfigFromRendAudioConfig( outConfig ) );
-#else
- ivas_output_init( &hOutSetup, rendAudioConfigToIvasAudioConfig( outConfig ) );
-#endif
break;
case IVAS_REND_AUDIO_CONFIG_STEREO:
case IVAS_REND_AUDIO_CONFIG_5_1:
@@ -1986,11 +2016,7 @@ static ivas_error initSbaPanGainsForMcOut(
case IVAS_REND_AUDIO_CONFIG_5_1_2:
case IVAS_REND_AUDIO_CONFIG_5_1_4:
case IVAS_REND_AUDIO_CONFIG_7_1_4:
-#ifdef FIX_197_CREND_INTERFACE
ivas_output_init( &hOutSetup, getIvasAudioConfigFromRendAudioConfig( outConfig ) );
-#else
- ivas_output_init( &hOutSetup, rendAudioConfigToIvasAudioConfig( outConfig ) );
-#endif
break;
case IVAS_REND_AUDIO_CONFIG_LS_CUSTOM:
ivas_ls_custom_setup( &hOutSetup, outSetupCustom );
@@ -2071,17 +2097,9 @@ static ivas_error updateSbaPanGains(
{
case IVAS_REND_AUDIO_CONFIG_BINAURAL:
error = ivas_rend_openCrend( &inputSba->crendWrapper,
-#ifdef FIX_197_CREND_INTERFACE
getIvasAudioConfigFromRendAudioConfig( inConfig ),
getIvasAudioConfigFromRendAudioConfig( outConfig ),
-#else
- rendAudioConfigToIvasAudioConfig( inConfig ),
- rendAudioConfigToIvasAudioConfig( outConfig ),
-#endif
hRendCfg,
-#ifdef FIX_197_CREND_INTERFACE
- 0,
-#endif
NULL,
*rendCtx.pOutSampleRate );
break;
@@ -2090,17 +2108,11 @@ static ivas_error updateSbaPanGains(
{
return error;
}
+
error = ivas_rend_openCrend( &inputSba->crendWrapper,
AUDIO_CONFIG_7_1_4,
-#ifdef FIX_197_CREND_INTERFACE
getIvasAudioConfigFromRendAudioConfig( outConfig ),
-#else
- rendAudioConfigToIvasAudioConfig( outConfig ),
-#endif
hRendCfg,
-#ifdef FIX_197_CREND_INTERFACE
- 0,
-#endif
NULL,
*rendCtx.pOutSampleRate );
break;
@@ -2135,13 +2147,14 @@ static ivas_error setRendInputActiveSba(
rendCtx = inputSba->base.ctx;
outConfig = *rendCtx.pOutConfig;
+ if ( !isIoConfigPairSupported( inConfig, outConfig ) )
+ {
+ return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED;
+ }
+
initRendInputBase( &inputSba->base, inConfig, id, rendCtx );
setZeroPanMatrix( inputSba->hoaDecMtx );
-#ifdef FIX_197_CREND_INTERFACE
inputSba->crendWrapper = NULL;
-#else
- inputSba->crendWrapper = defaultCrendWrapper();
-#endif
initRotGains( inputSba->rot_gains_prev );
if ( ( error = updateSbaPanGains( inputSba, outConfig, hRendCfg ) ) != IVAS_ERR_OK )
@@ -2162,14 +2175,7 @@ static void clearInputSba(
initRendInputBase( &inputSba->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx );
/* Free input's internal handles */
-#ifdef FIX_197_CREND_INTERFACE
- if ( inputSba->crendWrapper != NULL )
-#else
- if ( inputSba->crendWrapper.hCrend != NULL )
-#endif
- {
- ivas_rend_closeCrend( &inputSba->crendWrapper );
- }
+ ivas_rend_closeCrend( &inputSba->crendWrapper );
return;
}
@@ -2186,11 +2192,7 @@ static ivas_error initMasaDummyDecForMcOut(
DecoderDummy *decDummy;
decDummy = inputMasa->decDummy;
-#ifdef FIX_197_CREND_INTERFACE
output_config = getIvasAudioConfigFromRendAudioConfig( outConfig );
-#else
- output_config = rendAudioConfigToIvasAudioConfig( outConfig );
-#endif
decDummy->hDecoderConfig->output_config = output_config;
decDummy->hDecoderConfig->ivas_total_brate = IVAS_512k; /* Todo Nokia: This is preventing initialization of 2TC as 1TC, should be fixed properly in ivas_dirac_dec_config() */
@@ -2220,6 +2222,9 @@ static ivas_error initMasaDummyDecForMcOut(
{
return error;
}
+#ifdef FIX_390_EXT_REND_MASA_META_COPY
+ decDummy->hDirAC->dirac_bs_md_write_idx = 0;
+#endif
if ( decDummy->renderer_type == RENDERER_STEREO_PARAMETRIC )
{
@@ -2227,9 +2232,6 @@ static ivas_error initMasaDummyDecForMcOut(
{
return error;
}
-#ifndef FIX_107_5MS_SUBFRAME_RENDERING
- decDummy->hDiracDecBin->useSubframeMode = 0; /* Todo Nokia: This will disappear in later work but needs to be this now. */
-#endif
}
numCldfbAnalyses = decDummy->nchan_transport;
@@ -2275,11 +2277,7 @@ static ivas_error initMasaDummyDecForSbaOut(
decDummy = inputMasa->decDummy;
-#ifdef FIX_197_CREND_INTERFACE
output_config = getIvasAudioConfigFromRendAudioConfig( outConfig );
-#else
- output_config = rendAudioConfigToIvasAudioConfig( outConfig );
-#endif
decDummy->hDecoderConfig->output_config = output_config;
decDummy->hDecoderConfig->ivas_total_brate = IVAS_512k; /* Todo Nokia: This is preventing initialization of 2TC as 1TC, should be fixed properly in ivas_dirac_dec_config() */
@@ -2303,6 +2301,9 @@ static ivas_error initMasaDummyDecForSbaOut(
{
return error;
}
+#ifdef FIX_390_EXT_REND_MASA_META_COPY
+ decDummy->hDirAC->dirac_bs_md_write_idx = 0;
+#endif
numCldfbAnalyses = decDummy->nchan_transport;
numCldfbSyntheses = decDummy->hDecoderConfig->nchan_out;
@@ -2346,11 +2347,7 @@ static ivas_error initMasaDummyDecForBinauralOut(
decDummy = inputMasa->decDummy;
-#ifdef FIX_197_CREND_INTERFACE
output_config = getIvasAudioConfigFromRendAudioConfig( outConfig );
-#else
- output_config = rendAudioConfigToIvasAudioConfig( outConfig );
-#endif
decDummy->hDecoderConfig->output_config = output_config;
output_config = decDummy->hDecoderConfig->output_config;
@@ -2370,16 +2367,15 @@ static ivas_error initMasaDummyDecForBinauralOut(
}
decDummy->ivas_format = MASA_FORMAT;
decDummy->transport_config = AUDIO_CONFIG_INVALID;
-#ifndef REMOVE_FORCE_SUBFRAME_BIN
-#ifdef DEBUGGING
- decDummy->hDecoderConfig->forceSubframeBinauralization = 0;
-#endif
-#endif
if ( ( error = ivas_dirac_dec_open( decDummy ) ) != IVAS_ERR_OK )
{
return error;
}
+#ifdef FIX_390_EXT_REND_MASA_META_COPY
+ decDummy->hDirAC->dirac_bs_md_write_idx = 0;
+#endif
+
if ( ( error = ivas_dirac_dec_binaural_copy_hrtfs( &decDummy->hHrtfParambin ) ) != IVAS_ERR_OK )
{
return error;
@@ -2390,9 +2386,6 @@ static ivas_error initMasaDummyDecForBinauralOut(
return error;
}
-#ifndef FIX_107_5MS_SUBFRAME_RENDERING
- decDummy->hDiracDecBin->useSubframeMode = 0; /* Todo Nokia: This will disappear in later work but needs to be this now. */
-#endif
for ( i = 0; i < BINAURAL_CHANNELS; i++ )
{
@@ -2434,13 +2427,8 @@ static ivas_error updateMasaDummyDec(
default:
return IVAS_ERR_INVALID_OUTPUT_FORMAT;
}
- /* Check error here to keep switch statement more compact */
- if ( error != IVAS_ERR_OK )
- {
- return error;
- }
- return IVAS_ERR_OK;
+ return error;
}
static DecoderDummy *initDecoderDummy(
@@ -2463,17 +2451,12 @@ static DecoderDummy *initDecoderDummy(
decDummy = malloc( sizeof( DecoderDummy ) );
decDummy->hDecoderConfig = malloc( sizeof( DECODER_CONFIG ) );
decDummy->hDecoderConfig->output_Fs = sampleRate;
- decDummy->hDecoderConfig->nchan_out = (int16_t) numOutChannels;
+ decDummy->hDecoderConfig->nchan_out = numOutChannels;
decDummy->hDecoderConfig->Opt_Headrotation = 0;
decDummy->hBinRenderer = NULL;
decDummy->hEFAPdata = NULL;
-#ifdef FIX_197_CREND_INTERFACE
decDummy->hCrendWrapper = NULL;
-#else
- decDummy->hHrtf = NULL;
- decDummy->hCrend = NULL;
-#endif
decDummy->hHrtfTD = NULL;
decDummy->hSpar = NULL;
decDummy->hoa_dec_mtx = NULL;
@@ -2481,11 +2464,7 @@ static DecoderDummy *initDecoderDummy(
decDummy->hMasa = NULL;
decDummy->hDiracDecBin = NULL;
decDummy->hQMetaData = NULL;
-#ifdef FIX_197_CREND_INTERFACE
decDummy->hDecoderConfig->output_config = getIvasAudioConfigFromRendAudioConfig( outConfig );
-#else
- decDummy->hDecoderConfig->output_config = rendAudioConfigToIvasAudioConfig( outConfig );
-#endif
decDummy->nchan_transport = numTransChannels;
if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM || outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM )
@@ -2502,6 +2481,8 @@ static DecoderDummy *initDecoderDummy(
decDummy->hHeadTrackData->lrSwitchInterpVal = 0.0f;
decDummy->hHeadTrackData->lrSwitchedCurrent = 0;
decDummy->hHeadTrackData->lrSwitchedNext = 0;
+ decDummy->hHeadTrackData->OrientationTracker = (ivas_orient_trk_state_t *) malloc( sizeof( ivas_orient_trk_state_t ) );
+ ivas_orient_trk_Init( decDummy->hHeadTrackData->OrientationTracker );
}
else
{
@@ -2541,13 +2522,18 @@ static ivas_error setRendInputActiveMasa(
outConfig = *rendCtx.pOutConfig;
(void) hRendCfg; /* Suppress warning */
+ if ( !isIoConfigPairSupported( inConfig, outConfig ) )
+ {
+ return IVAS_ERR_IO_CONFIG_PAIR_NOT_SUPPORTED;
+ }
+
initRendInputBase( &inputMasa->base, inConfig, id, rendCtx );
if ( ( error = getAudioConfigNumChannels( inConfig, &numInChannels ) ) != IVAS_ERR_OK )
{
return error;
}
- inputMasa->decDummy = initDecoderDummy( *rendCtx.pOutSampleRate, (int16_t) numInChannels, outConfig, 0 );
+ inputMasa->decDummy = initDecoderDummy( *rendCtx.pOutSampleRate, numInChannels, outConfig, 0 );
inputMasa->metadataHasBeenFed = false;
if ( ( error = updateMasaDummyDec( inputMasa, outConfig ) ) != IVAS_ERR_OK )
@@ -2574,8 +2560,13 @@ static void freeDecoderDummy(
{
free( pDecDummy->hDecoderConfig );
}
+
if ( pDecDummy->hHeadTrackData != NULL )
{
+ if ( pDecDummy->hHeadTrackData->OrientationTracker != NULL )
+ {
+ free( pDecDummy->hHeadTrackData->OrientationTracker );
+ }
free( pDecDummy->hHeadTrackData );
}
ivas_render_config_close( &pDecDummy->hRenderConfig );
@@ -2586,7 +2577,6 @@ static void freeDecoderDummy(
if ( pDecDummy->cldfbAnaDec[i] != NULL )
{
deleteCldfb( &( pDecDummy->cldfbAnaDec[i] ) );
- pDecDummy->cldfbAnaDec[i] = NULL;
}
}
@@ -2595,16 +2585,11 @@ static void freeDecoderDummy(
if ( pDecDummy->cldfbSynDec[i] != NULL )
{
deleteCldfb( &( pDecDummy->cldfbSynDec[i] ) );
- pDecDummy->cldfbSynDec[i] = NULL;
}
}
/* DirAC handle */
- if ( pDecDummy->hDirAC != NULL )
- {
- ivas_dirac_dec_close( pDecDummy->hDirAC );
- pDecDummy->hDirAC = NULL;
- }
+ ivas_dirac_dec_close( &( pDecDummy->hDirAC ) );
/* Qmetadata handle */
ivas_qmetadata_close( &pDecDummy->hQMetaData );
@@ -2624,6 +2609,8 @@ static void freeDecoderDummy(
free( pDecDummy );
pDecDummy = NULL;
+
+ return;
}
static void clearInputMasa(
@@ -2635,6 +2622,8 @@ static void clearInputMasa(
initRendInputBase( &inputMasa->base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, rendCtx );
freeDecoderDummy( &inputMasa->decDummy );
+
+ return;
}
ivas_error IVAS_REND_Open(
@@ -2647,18 +2636,17 @@ ivas_error IVAS_REND_Open(
ivas_error error;
int16_t numOutChannels;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( phIvasRend == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
}
+
if ( ( error = validateOutputAudioConfig( outConfig ) ) != IVAS_ERR_OK )
{
return error;
}
+
if ( ( error = validateOutputSampleRate( outputSampleRate, outConfig ) ) != IVAS_ERR_OK )
{
return error;
@@ -2686,45 +2674,48 @@ ivas_error IVAS_REND_Open(
{
return error;
}
- initLimiter( &hIvasRend->hLimiter, numOutChannels, outputSampleRate );
+
+ if ( ( error = initLimiter( &hIvasRend->hLimiter, numOutChannels, outputSampleRate ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* Initialize headrotation data */
- initHeadRotation( hIvasRend );
+ if ( ( error = initHeadRotation( hIvasRend ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* Initialize EFAP */
- initEfap( &hIvasRend->efapOutWrapper, outConfig, &hIvasRend->customLsOut );
+ if ( ( error = initEfap( &hIvasRend->efapOutWrapper, outConfig, &hIvasRend->customLsOut ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* Initialize inputs */
for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
{
initRendInputBase( &hIvasRend->inputsIsm[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) );
-#ifdef FIX_197_CREND_INTERFACE
hIvasRend->inputsIsm[i].crendWrapper = NULL;
-#else
- hIvasRend->inputsIsm[i].crendWrapper.hCrend = NULL;
-#endif
+ hIvasRend->inputsIsm[i].hReverb = NULL;
hIvasRend->inputsIsm[i].tdRendWrapper.hBinRendererTd = NULL;
}
+
for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )
{
initRendInputBase( &hIvasRend->inputsMc[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) );
hIvasRend->inputsMc[i].efapInWrapper.hEfap = NULL;
-#ifdef FIX_197_CREND_INTERFACE
hIvasRend->inputsMc[i].crendWrapper = NULL;
-#else
- hIvasRend->inputsMc[i].crendWrapper.hCrend = NULL;
-#endif
+ hIvasRend->inputsMc[i].hReverb = NULL;
hIvasRend->inputsMc[i].tdRendWrapper.hBinRendererTd = NULL;
}
+
for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i )
{
initRendInputBase( &hIvasRend->inputsSba[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) );
-#ifdef FIX_197_CREND_INTERFACE
hIvasRend->inputsSba[i].crendWrapper = NULL;
-#else
- hIvasRend->inputsSba[i].crendWrapper.hCrend = NULL;
-#endif
}
+
for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )
{
initRendInputBase( &hIvasRend->inputsMasa[i].base, IVAS_REND_AUDIO_CONFIG_UNKNOWN, 0, getRendCtx( hIvasRend ) );
@@ -2772,11 +2763,13 @@ static ivas_error validateCustomLsLayout(
{
return IVAS_ERR_INVALID_CUSTOM_LS_LAYOUT;
}
+
/* There must be at least one speaker or LFE in the layout */
if ( layout.num_spk + layout.num_lfe <= 0 )
{
return IVAS_ERR_INVALID_CUSTOM_LS_LAYOUT;
}
+
/* LFE indices must be positive */
for ( i = 0; i < layout.num_lfe; ++i )
{
@@ -2798,19 +2791,18 @@ ivas_error IVAS_REND_ConfigureCustomOutputLoudspeakerLayout(
input_mc *inputMc;
input_sba *inputSba;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
}
+
if ( hIvasRend->outputConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM )
{
/* Specifying details of custom speaker layout only makes sense if output config is set to custom speaker layout */
return IVAS_ERR_INVALID_OUTPUT_FORMAT;
}
+
if ( ( error = validateCustomLsLayout( layout ) ) != IVAS_ERR_OK )
{
return error;
@@ -2823,10 +2815,17 @@ ivas_error IVAS_REND_ConfigureCustomOutputLoudspeakerLayout(
{
return error;
}
- initLimiter( &hIvasRend->hLimiter, numOutChannels, hIvasRend->sampleRateOut );
+
+ if ( ( error = initLimiter( &hIvasRend->hLimiter, numOutChannels, hIvasRend->sampleRateOut ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* Re-initialize EFAP - output layout has changed or has been fully defined for the first time */
- initEfap( &hIvasRend->efapOutWrapper, hIvasRend->outputConfig, &hIvasRend->customLsOut );
+ if ( ( error = initEfap( &hIvasRend->efapOutWrapper, hIvasRend->outputConfig, &hIvasRend->customLsOut ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* Re-initialize panning gains for each active MC input, This includes re-initializing
* LFE handling for the new output layout, which means custom LFE handling is overwritten,
@@ -2852,11 +2851,13 @@ ivas_error IVAS_REND_ConfigureCustomOutputLoudspeakerLayout(
for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i )
{
inputSba = &hIvasRend->inputsSba[i];
+
if ( inputSba->base.inConfig == IVAS_REND_AUDIO_CONFIG_UNKNOWN )
{
/* Input inactive, skip. */
continue;
}
+
if ( ( error = updateSbaPanGains( inputSba, hIvasRend->outputConfig, hIvasRend->hRendererConfig ) ) != IVAS_ERR_OK )
{
return error;
@@ -2872,10 +2873,7 @@ ivas_error IVAS_REND_NumOutChannels(
{
ivas_error error;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL || numOutChannels == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -2886,16 +2884,14 @@ ivas_error IVAS_REND_NumOutChannels(
{
case IVAS_REND_AUDIO_CONFIG_LS_CUSTOM:
*numOutChannels = hIvasRend->customLsOut.num_spk + hIvasRend->customLsOut.num_lfe;
- error = IVAS_ERR_OK;
break;
default:
- error = getAudioConfigNumChannels( hIvasRend->outputConfig, numOutChannels );
+ if ( ( error = getAudioConfigNumChannels( hIvasRend->outputConfig, numOutChannels ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
break;
}
- if ( error != IVAS_ERR_OK )
- {
- return error;
- }
return IVAS_ERR_OK;
}
@@ -3100,10 +3096,7 @@ ivas_error IVAS_REND_AddInput(
ivas_error ( *activateInput )( void *, IVAS_REND_AudioConfig, IVAS_REND_InputId, RENDER_CONFIG_DATA * );
int32_t inputIndex;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL || inputId == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3172,10 +3165,7 @@ ivas_error IVAS_REND_ConfigureCustomInputLoudspeakerLayout(
input_mc *inputMc;
ivas_error error;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3204,7 +3194,10 @@ ivas_error IVAS_REND_ConfigureCustomInputLoudspeakerLayout(
inputMc->lfeRouting = defaultLfeRouting( inputMc->base.inConfig, inputMc->customLsInput, hIvasRend->outputConfig, *inputMc->base.ctx.pCustomLsOut );
- initEfap( &inputMc->efapInWrapper, inputMc->base.inConfig, &inputMc->customLsInput );
+ if ( ( error = initEfap( &inputMc->efapInWrapper, inputMc->base.inConfig, &inputMc->customLsInput ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
if ( hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL || hIvasRend->outputConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM )
{
@@ -3238,10 +3231,7 @@ ivas_error IVAS_REND_SetInputGain(
input_base *inputBase;
ivas_error error;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3275,10 +3265,7 @@ ivas_error IVAS_REND_SetInputLfeMtx(
input_mc *pInputMc;
ivas_error error;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3329,10 +3316,7 @@ ivas_error IVAS_REND_SetInputLfePos(
input_mc *pInputMc;
ivas_error error;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3378,10 +3362,7 @@ ivas_error IVAS_REND_RemoveInput(
ivas_error error;
input_base *inputBase;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3429,10 +3410,7 @@ ivas_error IVAS_REND_GetInputNumChannels(
ivas_error error;
const input_base *pInput;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL || numChannels == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3471,10 +3449,7 @@ ivas_error IVAS_REND_GetDelay(
int32_t latency_ns;
int32_t max_latency_ns;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL || nSamples == NULL || timeScale == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3489,13 +3464,8 @@ ivas_error IVAS_REND_GetDelay(
{
if ( hIvasRend->inputsIsm[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN )
{
-#ifdef FIX_197_CREND_INTERFACE
latency_ns = max( ( hIvasRend->inputsIsm[i].crendWrapper != NULL ) ? hIvasRend->inputsIsm[i].crendWrapper->binaural_latency_ns : 0,
hIvasRend->inputsIsm[i].tdRendWrapper.binaural_latency_ns );
-#else
- latency_ns = max( hIvasRend->inputsIsm[i].crendWrapper.binaural_latency_ns,
- hIvasRend->inputsIsm[i].tdRendWrapper.binaural_latency_ns );
-#endif
max_latency_ns = max( max_latency_ns, latency_ns );
}
}
@@ -3504,13 +3474,8 @@ ivas_error IVAS_REND_GetDelay(
{
if ( hIvasRend->inputsMc[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN )
{
-#ifdef FIX_197_CREND_INTERFACE
latency_ns = max( ( hIvasRend->inputsMc[i].crendWrapper != NULL ) ? hIvasRend->inputsMc[i].crendWrapper->binaural_latency_ns : 0,
hIvasRend->inputsMc[i].tdRendWrapper.binaural_latency_ns );
-#else
- latency_ns = max( hIvasRend->inputsMc[i].crendWrapper.binaural_latency_ns,
- hIvasRend->inputsMc[i].tdRendWrapper.binaural_latency_ns );
-#endif
max_latency_ns = max( max_latency_ns, latency_ns );
}
}
@@ -3519,11 +3484,7 @@ ivas_error IVAS_REND_GetDelay(
{
if ( hIvasRend->inputsSba[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN )
{
-#ifdef FIX_197_CREND_INTERFACE
latency_ns = ( hIvasRend->inputsSba[i].crendWrapper != NULL ) ? hIvasRend->inputsSba[i].crendWrapper->binaural_latency_ns : 0;
-#else
- latency_ns = hIvasRend->inputsSba[i].crendWrapper.binaural_latency_ns;
-#endif
max_latency_ns = max( max_latency_ns, latency_ns );
}
}
@@ -3532,7 +3493,7 @@ ivas_error IVAS_REND_GetDelay(
{
if ( hIvasRend->inputsMasa[i].base.inConfig != IVAS_REND_AUDIO_CONFIG_UNKNOWN )
{
- latency_ns = NS2SA( hIvasRend->sampleRateOut, (int32_t) ( (float) IVAS_FB_DEC_DELAY_NS + 0.5f ) );
+ latency_ns = (int32_t) ( (float) IVAS_FB_DEC_DELAY_NS + 0.5f );
max_latency_ns = max( max_latency_ns, latency_ns );
}
}
@@ -3559,10 +3520,7 @@ ivas_error IVAS_REND_FeedInputAudio(
input_base *inputBase;
int16_t numInputChannels;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL || inputAudio.data == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3626,10 +3584,7 @@ ivas_error IVAS_REND_FeedInputObjectMetadata(
input_ism *inputIsm;
ivas_error error;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3670,10 +3625,7 @@ ivas_error IVAS_REND_FeedInputMasaMetadata(
input_base *inputBase;
input_masa *inputMasa;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3705,11 +3657,20 @@ ivas_error IVAS_REND_FeedInputMasaMetadata(
*-------------------------------------------------------------------*/
ivas_error IVAS_REND_InitConfig(
- IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+#ifdef FIX_392_LATE_REVERB
+ const IVAS_REND_AudioConfig outAudioConfig /* i : output audioConfig */
+#else
const bool rendererConfigEnabled /* i : flag indicating if a renderer configuration file was supplied */
+#endif
)
{
ivas_error error;
+#ifdef FIX_392_LATE_REVERB
+ bool rendererConfigEnabled;
+
+ rendererConfigEnabled = ( getAudioConfigType( outAudioConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL );
+#endif
if ( rendererConfigEnabled )
{
@@ -3720,34 +3681,25 @@ ivas_error IVAS_REND_InitConfig(
hIvasRend->rendererConfigEnabled = 0;
}
-#ifdef FIX_197_CREND_INTERFACE
if ( rendererConfigEnabled )
{
if ( ( error = ivas_render_config_open( &( hIvasRend->hRendererConfig ) ) ) != IVAS_ERR_OK )
{
return error;
}
-
- if ( ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, hIvasRend->rendererConfigEnabled ) != IVAS_ERR_OK )
+#ifdef FIX_392_LATE_REVERB
+ if ( ( error = ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, outAudioConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM ) ) != IVAS_ERR_OK )
+#else
+ if ( ( error = ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, hIvasRend->rendererConfigEnabled ) ) != IVAS_ERR_OK )
+#endif
{
- return IVAS_ERR_INTERNAL_FATAL;
+ return error;
}
}
else
{
hIvasRend->hRendererConfig = NULL;
}
-#else
- if ( ( error = ivas_render_config_open( &( hIvasRend->hRendererConfig ) ) ) != IVAS_ERR_OK )
- {
- return error;
- }
-
- if ( ivas_render_config_init_from_rom( &hIvasRend->hRendererConfig, hIvasRend->rendererConfigEnabled ) != IVAS_ERR_OK )
- {
- return IVAS_ERR_INTERNAL_FATAL;
- }
-#endif
return IVAS_ERR_OK;
}
@@ -3820,6 +3772,7 @@ int16_t IVAS_REND_FeedRenderConfig(
}
hRenderConfig = hIvasRend->hRendererConfig;
+ mvr2r( renderConfig.directivity, hRenderConfig->directivity, 3 );
#ifdef DEBUGGING
hRenderConfig->renderer_type_override = RENDER_TYPE_OVERRIDE_NONE;
if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV )
@@ -3852,16 +3805,15 @@ int16_t IVAS_REND_FeedRenderConfig(
*-------------------------------------------------------------------*/
ivas_error IVAS_REND_SetHeadRotation(
- IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
- const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : head positions for next rendering call */
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME], /* i : head orientations for next rendering call */
+ const IVAS_POSITION Pos[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : listener positions for next rendering call */
)
{
int16_t i;
+ IVAS_QUATERNION rotQuat;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -3870,7 +3822,7 @@ ivas_error IVAS_REND_SetHeadRotation(
if ( getAudioConfigType( hIvasRend->outputConfig ) != IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL )
{
/* Head rotation can be set only with binaural output */
- return IVAS_ERR_METADATA_NOT_EXPECTED;
+ return IVAS_ERR_INVALID_OUTPUT_FORMAT;
}
if ( headRot == NULL )
@@ -3882,7 +3834,18 @@ ivas_error IVAS_REND_SetHeadRotation(
hIvasRend->headRotData.headRotEnabled = 1;
for ( i = 0; i < RENDERER_HEAD_POSITIONS_PER_FRAME; ++i )
{
- hIvasRend->headRotData.headPositions[i] = headRot[i];
+ /* check for Euler angle signaling */
+ if ( headRot[i].w == -3.0f )
+ {
+ Euler2Quat( deg2rad( headRot[i].x ), deg2rad( headRot[i].y ), deg2rad( headRot[i].z ), &rotQuat );
+ }
+ else
+ {
+ rotQuat = headRot[i];
+ }
+
+ ivas_orient_trk_Process( hIvasRend->headRotData.hOrientationTracker, rotQuat, FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES, &hIvasRend->headRotData.headPositions[i] );
+ hIvasRend->headRotData.Pos[i] = Pos[i];
}
}
@@ -3890,6 +3853,158 @@ ivas_error IVAS_REND_SetHeadRotation(
}
+/*-------------------------------------------------------------------*
+ * IVAS_REND_SetOrientationTrackingMode()
+ *
+ *
+ *-------------------------------------------------------------------*/
+
+ivas_error IVAS_REND_SetOrientationTrackingMode(
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ const uint8_t otrMode /* i : Orientation tracking mode */
+)
+{
+ OTR_TRACKING_T mode;
+ ivas_error error;
+
+ if ( hIvasRend == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ switch ( otrMode )
+ {
+ case IVAS_ORIENT_TRK_AVG:
+ mode = OTR_TRACKING_AVG_ORIENT;
+ break;
+ case IVAS_ORIENT_TRK_REF:
+ mode = OTR_TRACKING_REF_ORIENT;
+ break;
+ case IVAS_ORIENT_TRK_REF_VEC:
+ mode = OTR_TRACKING_REF_VEC;
+ break;
+ case IVAS_ORIENT_TRK_REF_VEC_LEV:
+ mode = OTR_TRACKING_REF_VEC_LEV;
+ break;
+ case IVAS_ORIENT_TRK_NONE:
+ default:
+ mode = OTR_TRACKING_NONE;
+ break;
+ }
+
+ if ( ( error = ivas_orient_trk_SetTrackingType( hIvasRend->headRotData.hOrientationTracker, mode ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ return IVAS_ERR_OK;
+}
+
+
+/*-------------------------------------------------------------------*
+ * IVAS_REND_SetReferenceRotation()
+ *
+ *
+ *-------------------------------------------------------------------*/
+
+ivas_error IVAS_REND_SetReferenceRotation(
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ const IVAS_QUATERNION refRot /* i : Reference rotation */
+)
+{
+ ivas_error error;
+
+ /* Validate function arguments */
+ if ( hIvasRend == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ if ( ( error = ivas_orient_trk_SetReferenceRotation( hIvasRend->headRotData.hOrientationTracker, refRot ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ return IVAS_ERR_OK;
+}
+
+
+/*-------------------------------------------------------------------*
+ * IVAS_REND_GetMainOrientation()
+ *
+ *
+ *-------------------------------------------------------------------*/
+
+ivas_error IVAS_REND_GetMainOrientation(
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ IVAS_QUATERNION *pOrientation /* i/o: Quaternion pointer for main orientation */
+)
+{
+ ivas_error error;
+
+ if ( hIvasRend == NULL || pOrientation == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ if ( ( error = ivas_orient_trk_GetMainOrientation( hIvasRend->headRotData.hOrientationTracker, pOrientation ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ return IVAS_ERR_OK;
+}
+
+
+/*-------------------------------------------------------------------*
+ * IVAS_REND_GetTrackedRotation()
+ *
+ *
+ *-------------------------------------------------------------------*/
+
+ivas_error IVAS_REND_GetTrackedRotation(
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ IVAS_QUATERNION *pRotation /* i/o: Quaternion pointer processed rotation */
+)
+{
+ ivas_error error;
+
+ if ( hIvasRend == NULL || pRotation == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ if ( ( error = ivas_orient_trk_GetTrackedRotation( hIvasRend->headRotData.hOrientationTracker, pRotation ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ return IVAS_ERR_OK;
+}
+
+
+/*---------------------------------------------------------------------*
+ * IVAS_REND_SetReferenceVector( )
+ *
+ * Sets a reference vector spanning from listenerPos to refPos. Only
+ * available in OTR_TRACKING_REF_VEC and OTR_TRACKING_REF_VEC_LEV modes.
+ *---------------------------------------------------------------------*/
+
+ivas_error IVAS_REND_SetReferenceVector(
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ const IVAS_VECTOR3 listenerPos, /* i : Listener position */
+ const IVAS_VECTOR3 refPos /* i : Reference position */
+)
+{
+ if ( hIvasRend == NULL || hIvasRend->headRotData.hOrientationTracker == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ return ivas_orient_trk_SetReferenceVector( hIvasRend->headRotData.hOrientationTracker, listenerPos, refPos );
+}
+
+
/*-------------------------------------------------------------------*
* Local functions
*-------------------------------------------------------------------*/
@@ -3963,6 +4078,8 @@ static void renderBufferChannelLerp(
}
}
}
+
+ return;
}
/* Take one channel from input buffer and copy it to each channel
@@ -4000,24 +4117,31 @@ static ivas_error rotateFrameMc(
rotation_matrix Rmat;
rotation_gains gains;
float tmp_gains[MAX_INPUT_CHANNELS];
+ ivas_error error;
push_wmops( "rotateFrameMc" );
if ( inConfig != IVAS_REND_AUDIO_CONFIG_LS_CUSTOM )
{
- getAudioConfigNumChannels( inConfig, &nchan );
+ if ( ( error = getAudioConfigNumChannels( inConfig, &nchan ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else
{
nchan = inCustomLs.num_spk + inCustomLs.num_lfe;
}
- getMcConfigValues( inConfig, inCustomLs, &ls_azimuth, &ls_elevation, &lfe_idx, &is_planar_setup );
+ if ( ( error = getMcConfigValues( inConfig, inCustomLs, &ls_azimuth, &ls_elevation, &lfe_idx, &is_planar_setup ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* initialize gains to passthrough */
for ( ch_in = 0; ch_in < nchan; ch_in++ )
{
- set_zero( gains[ch_in], (int16_t) nchan );
+ set_zero( gains[ch_in], nchan );
gains[ch_in][ch_in] = 1.f;
}
@@ -4108,10 +4232,14 @@ static ivas_error rotateFrameSba(
rotation_matrix Rmat;
float tmpRot[2 * HEADROT_ORDER + 1];
rotation_gains gains;
+ ivas_error error;
push_wmops( "rotateFrameSba" );
- getAmbisonicsOrder( inConfig, &shd_rot_max_order );
+ if ( ( error = getAmbisonicsOrder( inConfig, &shd_rot_max_order ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* subframe loop */
subframe_len = inAudio.config.numSamplesPerChannel / RENDERER_HEAD_POSITIONS_PER_FRAME;
@@ -4152,15 +4280,15 @@ static ivas_error rotateFrameSba(
( 1 - headRotData->crossfade[i] ) * gains_prev[n][m] * ( *readPtr );
}
}
+ /* write back the result */
+ for ( n = m1; n < m2; n++ )
+ {
+ writePtr = getSmplPtr( outAudio, n, subframe_idx * subframe_len + i );
+ ( *writePtr ) = tmpRot[n - m1];
+ }
+ m1 = m2;
+ m2 += 2 * ( l + 1 ) + 1;
}
- /* write back the result */
- for ( n = m1; n < m2; n++ )
- {
- writePtr = getSmplPtr( outAudio, n, subframe_idx * subframe_len + i );
- ( *writePtr ) = tmpRot[n - m1];
- }
- m1 = m2;
- m2 += 2 * ( l + 1 ) + 1;
}
/*unoptimized code for reference (full matrix multiplication)*/
@@ -4207,6 +4335,7 @@ static ivas_error renderIsmToBinaural(
NULL,
ismInput->base.ctx.pHeadRotData,
&ismInput->currentPos,
+ ismInput->hReverb,
outAudio.config.numSamplesPerChannel,
tmpTDRendBuffer ) ) != IVAS_ERR_OK )
{
@@ -4229,7 +4358,7 @@ static ivas_error renderIsmToBinauralRoom(
int16_t subframe_idx, subframe_len;
int16_t tmp;
rotation_matrix Rmat;
- float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];
+ float tmpRendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];
IVAS_QUATERNION quat;
ivas_error error;
pan_vector currentPanGains;
@@ -4243,92 +4372,109 @@ static ivas_error renderIsmToBinauralRoom(
headRotData = ismInput->base.ctx.pHeadRotData;
rotatedPos = defaultObjectPosition();
- if ( headRotData->headRotEnabled )
+ if ( ismInput->hReverb != NULL && ismInput->hReverb->pConfig.roomAcoustics.use_brir == 0 && ismInput->hReverb->pConfig.roomAcoustics.late_reverb_on == 1 && headRotData->headRotEnabled )
{
- subframe_len = ismInput->base.inputBuffer.config.numSamplesPerChannel / RENDERER_HEAD_POSITIONS_PER_FRAME;
- // for ( subframe_idx = 0; subframe_idx < RENDERER_HEAD_POSITIONS_PER_FRAME; subframe_idx++ )
- for ( subframe_idx = 0; subframe_idx < 1; subframe_idx++ )
- {
- quat.w = headRotData->headPositions[subframe_idx].w;
- quat.x = headRotData->headPositions[subframe_idx].x;
- quat.y = headRotData->headPositions[subframe_idx].y;
- quat.z = headRotData->headPositions[subframe_idx].z;
+ copyBufferTo2dArray( ismInput->base.inputBuffer, tmpRendBuffer );
- QuatToRotMat( quat, Rmat );
+ /* TODO tmu : missing: interpolation between positions, 5ms rendering */
+ if ( ( error = ivas_td_binaural_renderer_ext( &ismInput->tdRendWrapper,
+ ismInput->base.inConfig,
+ NULL,
+ ismInput->base.ctx.pHeadRotData,
+ &ismInput->currentPos,
+ ismInput->hReverb,
+ outAudio.config.numSamplesPerChannel,
+ tmpRendBuffer ) ) != IVAS_ERR_OK )
+ {
+ return error;
}
- (void) subframe_len; // avoid warning
- }
-
- /* TODO tmu : missing: interpolation between positions, 5ms rendering */
- /* TODO(sgi): Possible optimization: less processing needed if position didn't change */
- /* TODO tmu2sgi: needs a lot of cleanup, we could also add rot_gains_prev to ismInput and use that */
- /* previous position gains */
- if ( headRotData->headRotEnabled )
- {
- rotateAziEle( ismInput->previousPos.azimuth, ismInput->previousPos.elevation, &azi_rot, &ele_rot, ismInput->rot_mat_prev, 0 );
- rotatedPos.azimuth = (float) azi_rot;
- rotatedPos.elevation = (float) ele_rot;
+ accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio );
}
- if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper,
- ( headRotData->headRotEnabled ) ? rotatedPos.azimuth : ismInput->previousPos.azimuth,
- ( headRotData->headRotEnabled ) ? rotatedPos.elevation : ismInput->previousPos.elevation,
- previousPanGains ) ) != IVAS_ERR_OK )
+ else
{
- return error;
- }
- /* current position gains */
- if ( headRotData->headRotEnabled )
- {
- rotateAziEle( ismInput->currentPos.azimuth, ismInput->currentPos.elevation, &azi_rot, &ele_rot, Rmat, 0 );
- rotatedPos.azimuth = (float) azi_rot;
- rotatedPos.elevation = (float) ele_rot;
- }
- if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper,
- ( headRotData->headRotEnabled ) ? rotatedPos.azimuth : ismInput->currentPos.azimuth,
- ( headRotData->headRotEnabled ) ? rotatedPos.elevation : ismInput->currentPos.elevation,
- currentPanGains ) ) != IVAS_ERR_OK )
- {
- return error;
- }
+ if ( headRotData->headRotEnabled )
+ {
+ subframe_len = ismInput->base.inputBuffer.config.numSamplesPerChannel / RENDERER_HEAD_POSITIONS_PER_FRAME;
+ // for ( subframe_idx = 0; subframe_idx < RENDERER_HEAD_POSITIONS_PER_FRAME; subframe_idx++ )
+ for ( subframe_idx = 0; subframe_idx < 1; subframe_idx++ )
+ {
+ quat.w = headRotData->headPositions[subframe_idx].w;
+ quat.x = headRotData->headPositions[subframe_idx].x;
+ quat.y = headRotData->headPositions[subframe_idx].y;
+ quat.z = headRotData->headPositions[subframe_idx].z;
- for ( i = 0; i < 3; i++ )
- {
- mvr2r( Rmat[i], ismInput->rot_mat_prev[i], 3 );
- }
+ QuatToRotMat( quat, Rmat );
+ }
+ (void) subframe_len; // avoid warning
+ }
- /* intermediate rendering to 7_1_4 */
- tmpMcBuffer = ismInput->base.inputBuffer;
- getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp );
- tmpMcBuffer.config.numChannels = tmp;
- tmpMcBuffer.data = malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) );
- set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels );
+ /* TODO tmu : missing: interpolation between positions, 5ms rendering */
+ /* TODO(sgi): Possible optimization: less processing needed if position didn't change */
+ /* TODO tmu2sgi: needs a lot of cleanup, we could also add rot_gains_prev to ismInput and use that */
+ /* previous position gains */
+ if ( headRotData->headRotEnabled )
+ {
+ rotateAziEle( ismInput->previousPos.azimuth, ismInput->previousPos.elevation, &azi_rot, &ele_rot, ismInput->rot_mat_prev, 0 );
+ rotatedPos.azimuth = (float) azi_rot;
+ rotatedPos.elevation = (float) ele_rot;
+ }
- renderBufferChannelLerp( ismInput->base.inputBuffer, 0, currentPanGains, previousPanGains, tmpMcBuffer );
+ if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper,
+ ( headRotData->headRotEnabled ) ? rotatedPos.azimuth : ismInput->previousPos.azimuth,
+ ( headRotData->headRotEnabled ) ? rotatedPos.elevation : ismInput->previousPos.elevation,
+ previousPanGains ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
- copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer );
+ /* current position gains */
+ if ( headRotData->headRotEnabled )
+ {
+ rotateAziEle( ismInput->currentPos.azimuth, ismInput->currentPos.elevation, &azi_rot, &ele_rot, Rmat, 0 );
+ rotatedPos.azimuth = (float) azi_rot;
+ rotatedPos.elevation = (float) ele_rot;
+ }
- ivas_rend_crendProcess(
-#ifdef FIX_197_CREND_INTERFACE
- ismInput->crendWrapper,
-#else
- &ismInput->crendWrapper,
-#endif
- AUDIO_CONFIG_7_1_4,
- AUDIO_CONFIG_BINAURAL_ROOM,
-#ifdef FIX_197_CREND_INTERFACE
- NULL,
- NULL,
- NULL,
- NULL,
-#endif
- tmpCrendBuffer,
- *ismInput->base.ctx.pOutSampleRate );
+ if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper,
+ ( headRotData->headRotEnabled ) ? rotatedPos.azimuth : ismInput->currentPos.azimuth,
+ ( headRotData->headRotEnabled ) ? rotatedPos.elevation : ismInput->currentPos.elevation,
+ currentPanGains ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
- accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio );
+ for ( i = 0; i < 3; i++ )
+ {
+ mvr2r( Rmat[i], ismInput->rot_mat_prev[i], 3 );
+ }
- free( tmpMcBuffer.data );
+ /* intermediate rendering to 7_1_4 */
+ tmpMcBuffer = ismInput->base.inputBuffer;
+ if ( ( error = getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ tmpMcBuffer.config.numChannels = tmp;
+ tmpMcBuffer.data = malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) );
+ set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels );
+
+ renderBufferChannelLerp( ismInput->base.inputBuffer, 0, currentPanGains, previousPanGains, tmpMcBuffer );
+
+ copyBufferTo2dArray( tmpMcBuffer, tmpRendBuffer );
+
+ if ( ( error = ivas_rend_crendProcess( ismInput->crendWrapper, AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM,
+ NULL, NULL, NULL, NULL, tmpRendBuffer, *ismInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio );
+
+ free( tmpMcBuffer.data );
+ }
pop_wmops();
return IVAS_ERR_OK;
@@ -4369,6 +4515,7 @@ static ivas_error renderIsmToMc(
{
return error;
}
+
// TODO tmu review when #215 is resolved
if ( ( error = getEfapGains( *ismInput->base.ctx.pEfapOutWrapper,
(int16_t) floorf( ismInput->previousPos.azimuth + 0.5f ),
@@ -4378,6 +4525,7 @@ static ivas_error renderIsmToMc(
return error;
}
}
+
/* Assume num channels in audio buffer to be 1.
* This should have been validated in IVAS_REND_FeedInputAudio() */
renderBufferChannelLerp( ismInput->base.inputBuffer, 0, currentPanGains, previousPanGains, outAudio );
@@ -4405,6 +4553,7 @@ static ivas_error renderIsmToSba(
{
return error;
}
+
if ( ( error = getAmbisonicsOrder( outConfig, &ambiOrderOut ) ) != IVAS_ERR_OK )
{
return error;
@@ -4459,7 +4608,6 @@ static ivas_error renderInputIsm(
/* Apply input gain to new audio */
v_multc( inAudio.data, ismInput->base.gain, inAudio.data, inAudio.config.numSamplesPerChannel * inAudio.config.numChannels );
-
switch ( getAudioConfigType( outConfig ) )
{
case IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED:
@@ -4508,6 +4656,7 @@ static ivas_error renderActiveInputsIsm(
/* Skip inactive inputs */
continue;
}
+
if ( ( error = renderInputIsm( pCurrentInput, hIvasRend->outputConfig, outAudio ) ) != IVAS_ERR_OK )
{
return error;
@@ -4574,7 +4723,6 @@ static ivas_error renderMcToBinaural(
int8_t headRotEnabled;
float tmpRendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];
IVAS_REND_AudioConfig inConfig;
-
ivas_error error;
IVAS_REND_AudioBuffer tmpRotBuffer;
@@ -4583,18 +4731,12 @@ static ivas_error renderMcToBinaural(
headRotEnabled = mcInput->base.ctx.pHeadRotData->headRotEnabled;
inConfig = mcInput->base.inConfig;
- if ( ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) ||
- ( headRotEnabled && ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 || inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) ) )
+ if ( ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) || ( headRotEnabled && ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 || inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) ) )
{
copyBufferTo2dArray( mcInput->base.inputBuffer, tmpRendBuffer );
- if ( ( error = ivas_td_binaural_renderer_ext( &mcInput->tdRendWrapper,
- mcInput->base.inConfig,
- &mcInput->customLsInput,
- mcInput->base.ctx.pHeadRotData,
- NULL,
- mcInput->base.inputBuffer.config.numSamplesPerChannel,
- tmpRendBuffer ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_td_binaural_renderer_ext( &mcInput->tdRendWrapper, mcInput->base.inConfig, &mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, NULL,
+ mcInput->hReverb, mcInput->base.inputBuffer.config.numSamplesPerChannel, tmpRendBuffer ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -4608,13 +4750,11 @@ static ivas_error renderMcToBinaural(
tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) );
set_zero( tmpRotBuffer.data, tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels );
- rotateFrameMc( mcInput->base.inputBuffer,
- mcInput->base.inConfig,
- mcInput->customLsInput,
- mcInput->base.ctx.pHeadRotData,
- mcInput->rot_gains_prev,
- mcInput->efapInWrapper.hEfap,
- tmpRotBuffer );
+ if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, mcInput->base.inConfig, mcInput->customLsInput, mcInput->base.ctx.pHeadRotData,
+ mcInput->rot_gains_prev, mcInput->efapInWrapper.hEfap, tmpRotBuffer ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
copyBufferTo2dArray( tmpRotBuffer, tmpRendBuffer );
free( tmpRotBuffer.data );
@@ -4625,23 +4765,8 @@ static ivas_error renderMcToBinaural(
}
/* call CREND */
-
- if ( ( error = ivas_rend_crendProcess(
-#ifdef FIX_197_CREND_INTERFACE
- mcInput->crendWrapper,
- getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ),
- getIvasAudioConfigFromRendAudioConfig( outConfig ),
- NULL,
- NULL,
- NULL,
- NULL,
-#else
- &mcInput->crendWrapper,
- rendAudioConfigToIvasAudioConfig( mcInput->base.inConfig ),
- rendAudioConfigToIvasAudioConfig( outConfig ),
-#endif
- tmpRendBuffer,
- *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ),
+ NULL, NULL, NULL, NULL, tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -4650,7 +4775,10 @@ static ivas_error renderMcToBinaural(
accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio );
/* TODO tmu : needs delay compensation */
- renderLfeToBinaural( mcInput, outAudio );
+ if ( ( error = renderLfeToBinaural( mcInput, outAudio ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
pop_wmops();
@@ -4662,61 +4790,65 @@ static ivas_error renderMcToBinauralRoom(
const IVAS_REND_AudioConfig outConfig,
IVAS_REND_AudioBuffer outAudio )
{
- float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];
-
+ int8_t headRotEnabled;
+ float tmpRendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];
+ IVAS_REND_AudioConfig inConfig;
ivas_error error;
IVAS_REND_AudioBuffer tmpRotBuffer;
push_wmops( "renderMcToBinauralRoom" );
- /* apply rotation */
- if ( mcInput->base.ctx.pHeadRotData->headRotEnabled )
- {
- tmpRotBuffer = mcInput->base.inputBuffer;
- tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) );
- set_zero( tmpRotBuffer.data, tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels );
+ headRotEnabled = mcInput->base.ctx.pHeadRotData->headRotEnabled;
+ inConfig = mcInput->base.inConfig;
- rotateFrameMc( mcInput->base.inputBuffer,
- mcInput->base.inConfig,
- mcInput->customLsInput,
- mcInput->base.ctx.pHeadRotData,
- mcInput->rot_gains_prev,
- mcInput->efapInWrapper.hEfap,
- tmpRotBuffer );
+ if ( ( mcInput->hReverb != NULL && mcInput->hReverb->pConfig.roomAcoustics.use_brir == 0 && mcInput->hReverb->pConfig.roomAcoustics.late_reverb_on == 1 ) && ( ( inConfig == IVAS_REND_AUDIO_CONFIG_LS_CUSTOM ) || ( headRotEnabled && ( inConfig == IVAS_REND_AUDIO_CONFIG_5_1 || inConfig == IVAS_REND_AUDIO_CONFIG_7_1 ) ) ) )
+ {
+ copyBufferTo2dArray( mcInput->base.inputBuffer, tmpRendBuffer );
- copyBufferTo2dArray( tmpRotBuffer, tmpCrendBuffer );
- free( tmpRotBuffer.data );
+ if ( ( error = ivas_td_binaural_renderer_ext( &mcInput->tdRendWrapper, mcInput->base.inConfig, &mcInput->customLsInput, mcInput->base.ctx.pHeadRotData,
+ NULL, mcInput->hReverb, mcInput->base.inputBuffer.config.numSamplesPerChannel, tmpRendBuffer ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
else
{
- copyBufferTo2dArray( mcInput->base.inputBuffer, tmpCrendBuffer );
- }
+ /* apply rotation */
+ if ( headRotEnabled )
+ {
+ tmpRotBuffer = mcInput->base.inputBuffer;
+ tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) );
+ set_zero( tmpRotBuffer.data, tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels );
- /* call CREND */
- if ( ( error = ivas_rend_crendProcess(
-#ifdef FIX_197_CREND_INTERFACE
- mcInput->crendWrapper,
- getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ),
- getIvasAudioConfigFromRendAudioConfig( outConfig ),
- NULL,
- NULL,
- NULL,
- NULL,
-#else
- &mcInput->crendWrapper,
- rendAudioConfigToIvasAudioConfig( mcInput->base.inConfig ),
- rendAudioConfigToIvasAudioConfig( outConfig ),
-#endif
- tmpCrendBuffer,
- *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
- {
- return error;
+ if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, mcInput->base.inConfig, mcInput->customLsInput, mcInput->base.ctx.pHeadRotData,
+ mcInput->rot_gains_prev, mcInput->efapInWrapper.hEfap, tmpRotBuffer ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ copyBufferTo2dArray( tmpRotBuffer, tmpRendBuffer );
+ free( tmpRotBuffer.data );
+ }
+ else
+ {
+ copyBufferTo2dArray( mcInput->base.inputBuffer, tmpRendBuffer );
+ }
+
+ /* call CREND */
+ if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( mcInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ),
+ NULL, NULL, NULL, NULL, tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
- accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio );
+ accumulate2dArrayToBuffer( tmpRendBuffer, &outAudio );
/* TODO tmu : needs delay compensation */
- renderLfeToBinaural( mcInput, outAudio );
+ if ( ( error = renderLfeToBinaural( mcInput, outAudio ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
pop_wmops();
@@ -4750,19 +4882,21 @@ static ivas_error renderMcCustomLsToBinauralRoom(
tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) );
set_zero( tmpRotBuffer.data, tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels );
- rotateFrameMc( mcInput->base.inputBuffer,
- mcInput->base.inConfig,
- mcInput->customLsInput,
- mcInput->base.ctx.pHeadRotData,
- mcInput->rot_gains_prev,
- mcInput->efapInWrapper.hEfap,
- tmpRotBuffer );
+ if ( ( error = rotateFrameMc( mcInput->base.inputBuffer, mcInput->base.inConfig, mcInput->customLsInput, mcInput->base.ctx.pHeadRotData, mcInput->rot_gains_prev, mcInput->efapInWrapper.hEfap, tmpRotBuffer ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
/* intermediate conversion to 7_1_4 */
tmpMcBuffer = mcInput->base.inputBuffer;
- getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp );
- tmpMcBuffer.config.numChannels = (int16_t) tmp;
+
+ if ( ( error = getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ tmpMcBuffer.config.numChannels = tmp;
tmpMcBuffer.data = malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) );
set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels );
@@ -4774,22 +4908,8 @@ static ivas_error renderMcCustomLsToBinauralRoom(
copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer );
/* call CREND */
- if ( ( error = ivas_rend_crendProcess(
-#ifdef FIX_197_CREND_INTERFACE
- mcInput->crendWrapper,
- AUDIO_CONFIG_7_1_4,
- getIvasAudioConfigFromRendAudioConfig( outConfig ),
- NULL,
- NULL,
- NULL,
- NULL,
-#else
- &mcInput->crendWrapper,
- AUDIO_CONFIG_7_1_4,
- rendAudioConfigToIvasAudioConfig( outConfig ),
-#endif
- tmpCrendBuffer,
- *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, NULL, NULL, NULL,
+ tmpCrendBuffer, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -4797,7 +4917,10 @@ static ivas_error renderMcCustomLsToBinauralRoom(
accumulate2dArrayToBuffer( tmpCrendBuffer, &outAudio );
/* TODO tmu : needs delay compensation */
- renderLfeToBinaural( mcInput, outAudio );
+ if ( ( error = renderLfeToBinaural( mcInput, outAudio ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
if ( headRotEnabled )
{
@@ -4810,7 +4933,7 @@ static ivas_error renderMcCustomLsToBinauralRoom(
return IVAS_ERR_OK;
}
-static ivas_error renderMcToMc(
+static void renderMcToMc(
const input_mc *mcInput,
IVAS_REND_AudioBuffer outAudio )
{
@@ -4828,10 +4951,10 @@ static ivas_error renderMcToMc(
pop_wmops();
- return IVAS_ERR_OK;
+ return;
}
-static ivas_error renderMcToSba(
+static void renderMcToSba(
const input_mc *mcInput,
IVAS_REND_AudioBuffer outAudio )
{
@@ -4849,7 +4972,7 @@ static ivas_error renderMcToSba(
pop_wmops();
- return IVAS_ERR_OK;
+ return;
}
static ivas_error renderInputMc(
@@ -4860,6 +4983,8 @@ static ivas_error renderInputMc(
ivas_error error;
IVAS_REND_AudioBuffer inAudio;
+ error = IVAS_ERR_OK;
+
inAudio = mcInput->base.inputBuffer;
if ( mcInput->base.numNewSamplesPerChannel != outAudio.config.numSamplesPerChannel )
@@ -4878,10 +5003,10 @@ static ivas_error renderInputMc(
switch ( getAudioConfigType( outConfig ) )
{
case IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED:
- error = renderMcToMc( mcInput, outAudio );
+ renderMcToMc( mcInput, outAudio );
break;
case IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS:
- error = renderMcToSba( mcInput, outAudio );
+ renderMcToSba( mcInput, outAudio );
break;
case IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL:
switch ( outConfig )
@@ -4907,13 +5032,7 @@ static ivas_error renderInputMc(
return IVAS_ERR_INVALID_OUTPUT_FORMAT;
}
- /* Check error here to keep switch statement more compact */
- if ( error != IVAS_ERR_OK )
- {
- return error;
- }
-
- return IVAS_ERR_OK;
+ return error;
}
static ivas_error renderActiveInputsMc(
@@ -4941,7 +5060,7 @@ static ivas_error renderActiveInputsMc(
return IVAS_ERR_OK;
}
-static ivas_error renderSbaToMc(
+static void renderSbaToMc(
const input_sba *sbaInput,
IVAS_REND_AudioBuffer outAudio )
{
@@ -4959,10 +5078,10 @@ static ivas_error renderSbaToMc(
pop_wmops();
- return IVAS_ERR_OK;
+ return;
}
-static ivas_error renderSbaToSba(
+static void renderSbaToSba(
const input_sba *sbaInput,
IVAS_REND_AudioBuffer outAudio )
{
@@ -4980,7 +5099,7 @@ static ivas_error renderSbaToSba(
pop_wmops();
- return IVAS_ERR_OK;
+ return;
}
static ivas_error renderSbaToBinaural(
@@ -5002,14 +5121,12 @@ static ivas_error renderSbaToBinaural(
tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) );
/* copy input for in-place rotation */
- mvr2r( sbaInput->base.inputBuffer.data, tmpRotBuffer.data,
- tmpRotBuffer.config.numChannels * tmpRotBuffer.config.numSamplesPerChannel );
+ mvr2r( sbaInput->base.inputBuffer.data, tmpRotBuffer.data, tmpRotBuffer.config.numChannels * tmpRotBuffer.config.numSamplesPerChannel );
- rotateFrameSba( sbaInput->base.inputBuffer,
- sbaInput->base.inConfig,
- sbaInput->base.ctx.pHeadRotData,
- sbaInput->rot_gains_prev,
- tmpRotBuffer );
+ if ( ( error = rotateFrameSba( sbaInput->base.inputBuffer, sbaInput->base.inConfig, sbaInput->base.ctx.pHeadRotData, sbaInput->rot_gains_prev, tmpRotBuffer ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
copyBufferTo2dArray( tmpRotBuffer, tmpCrendBuffer );
free( tmpRotBuffer.data );
@@ -5020,22 +5137,8 @@ static ivas_error renderSbaToBinaural(
}
/* call CREND */
- if ( ( error = ivas_rend_crendProcess(
-#ifdef FIX_197_CREND_INTERFACE
- sbaInput->crendWrapper,
- getIvasAudioConfigFromRendAudioConfig( sbaInput->base.inConfig ),
- getIvasAudioConfigFromRendAudioConfig( outConfig ),
- NULL,
- NULL,
- NULL,
- NULL,
-#else
- &sbaInput->crendWrapper,
- rendAudioConfigToIvasAudioConfig( sbaInput->base.inConfig ),
- rendAudioConfigToIvasAudioConfig( outConfig ),
-#endif
- tmpCrendBuffer,
- *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, getIvasAudioConfigFromRendAudioConfig( sbaInput->base.inConfig ), getIvasAudioConfigFromRendAudioConfig( outConfig ),
+ NULL, NULL, NULL, NULL, tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -5056,7 +5159,6 @@ static ivas_error renderSbaToBinauralRoom(
int16_t i;
int16_t tmp;
float tmpCrendBuffer[MAX_OUTPUT_CHANNELS][L_FRAME48k];
-
ivas_error error;
IVAS_REND_AudioBuffer tmpRotBuffer;
IVAS_REND_AudioBuffer tmpMcBuffer;
@@ -5073,16 +5175,25 @@ static ivas_error renderSbaToBinauralRoom(
{
tmpRotBuffer = sbaInput->base.inputBuffer;
tmpRotBuffer.data = malloc( tmpRotBuffer.config.numSamplesPerChannel * tmpRotBuffer.config.numChannels * sizeof( float ) );
+
/* copy input for in-place rotation */
mvr2r( sbaInput->base.inputBuffer.data, tmpRotBuffer.data, tmpRotBuffer.config.numChannels * tmpRotBuffer.config.numSamplesPerChannel );
- rotateFrameSba( sbaInput->base.inputBuffer, sbaInput->base.inConfig, sbaInput->base.ctx.pHeadRotData, sbaInput->rot_gains_prev, tmpRotBuffer );
+ if ( ( error = rotateFrameSba( sbaInput->base.inputBuffer, sbaInput->base.inConfig, sbaInput->base.ctx.pHeadRotData, sbaInput->rot_gains_prev, tmpRotBuffer ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
}
/* intermediate rendering to 7_1_4 */
tmpMcBuffer = sbaInput->base.inputBuffer;
- getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp );
- tmpMcBuffer.config.numChannels = (int16_t) tmp;
+
+ if ( ( error = getAudioConfigNumChannels( IVAS_REND_AUDIO_CONFIG_7_1_4, &tmp ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+
+ tmpMcBuffer.config.numChannels = tmp;
tmpMcBuffer.data = malloc( tmpMcBuffer.config.numSamplesPerChannel * tmpMcBuffer.config.numChannels * sizeof( float ) );
set_zero( tmpMcBuffer.data, tmpMcBuffer.config.numChannels * tmpMcBuffer.config.numSamplesPerChannel );
@@ -5095,22 +5206,8 @@ static ivas_error renderSbaToBinauralRoom(
copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer );
/* call CREND */
- if ( ( error = ivas_rend_crendProcess(
-#ifdef FIX_197_CREND_INTERFACE
- sbaInput->crendWrapper,
- AUDIO_CONFIG_7_1_4,
- getIvasAudioConfigFromRendAudioConfig( outConfig ),
- NULL,
- NULL,
- NULL,
- NULL,
-#else
- &sbaInput->crendWrapper,
- AUDIO_CONFIG_7_1_4,
- rendAudioConfigToIvasAudioConfig( outConfig ),
-#endif
- tmpCrendBuffer,
- *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
+ if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, AUDIO_CONFIG_7_1_4, getIvasAudioConfigFromRendAudioConfig( outConfig ),
+ NULL, NULL, NULL, NULL, tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -5136,6 +5233,8 @@ static ivas_error renderInputSba(
ivas_error error;
IVAS_REND_AudioBuffer inAudio;
+ error = IVAS_ERR_OK;
+
inAudio = sbaInput->base.inputBuffer;
if ( sbaInput->base.numNewSamplesPerChannel != outAudio.config.numSamplesPerChannel )
@@ -5154,10 +5253,10 @@ static ivas_error renderInputSba(
switch ( getAudioConfigType( outConfig ) )
{
case IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED:
- error = renderSbaToMc( sbaInput, outAudio );
+ renderSbaToMc( sbaInput, outAudio );
break;
case IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS:
- error = renderSbaToSba( sbaInput, outAudio );
+ renderSbaToSba( sbaInput, outAudio );
break;
case IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL:
switch ( outConfig )
@@ -5176,13 +5275,7 @@ static ivas_error renderInputSba(
return IVAS_ERR_INVALID_OUTPUT_FORMAT;
}
- /* Check error here to keep switch statement more compact */
- if ( error != IVAS_ERR_OK )
- {
- return error;
- }
-
- return IVAS_ERR_OK;
+ return error;
}
static ivas_error renderActiveInputsSba(
@@ -5215,38 +5308,66 @@ static void copyMasaMetadataToDiracRenderer(
DIRAC_DEC_HANDLE hDirAC )
{
int16_t band, sf, bin;
+#ifdef FIX_390_EXT_REND_MASA_META_COPY
+ int16_t meta_write_index;
+#endif
hDirAC->numSimultaneousDirections = meta->descriptive_meta.numberOfDirections + 1;
for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )
{
+#ifdef FIX_390_EXT_REND_MASA_META_COPY
+ meta_write_index = ( hDirAC->dirac_bs_md_write_idx + sf ) % hDirAC->dirac_md_buffer_length;
+#endif
+
for ( band = 0; band < MASA_MAXIMUM_CODING_SUBBANDS; band++ )
{
for ( bin = MASA_band_grouping_24[band]; bin < MASA_band_grouping_24[band + 1]; bin++ )
{
+#ifdef FIX_390_EXT_REND_MASA_META_COPY
+ hDirAC->azimuth[meta_write_index][bin] = (int16_t) meta->directional_meta[0].azimuth[sf][band];
+ hDirAC->elevation[meta_write_index][bin] = (int16_t) meta->directional_meta[0].elevation[sf][band];
+ hDirAC->energy_ratio1[meta_write_index][bin] = meta->directional_meta[0].energy_ratio[sf][band];
+ hDirAC->diffuseness_vector[meta_write_index][bin] = 1.0f - meta->directional_meta[0].energy_ratio[sf][band];
+ hDirAC->spreadCoherence[meta_write_index][bin] = meta->directional_meta[0].spread_coherence[sf][band];
+ hDirAC->surroundingCoherence[meta_write_index][bin] = meta->common_meta.surround_coherence[sf][band];
+#else
hDirAC->azimuth[sf][bin] = (int16_t) meta->directional_meta[0].azimuth[sf][band];
hDirAC->elevation[sf][bin] = (int16_t) meta->directional_meta[0].elevation[sf][band];
hDirAC->energy_ratio1[sf][bin] = meta->directional_meta[0].energy_ratio[sf][band];
hDirAC->diffuseness_vector[sf][bin] = 1.0f - meta->directional_meta[0].energy_ratio[sf][band];
hDirAC->spreadCoherence[sf][bin] = meta->directional_meta[0].spread_coherence[sf][band];
hDirAC->surroundingCoherence[sf][bin] = meta->common_meta.surround_coherence[sf][band];
+#endif
if ( hDirAC->numSimultaneousDirections == 2 )
{
+#ifdef FIX_390_EXT_REND_MASA_META_COPY
+ hDirAC->azimuth2[meta_write_index][bin] = (int16_t) meta->directional_meta[1].azimuth[sf][band];
+ hDirAC->elevation2[meta_write_index][bin] = (int16_t) meta->directional_meta[1].elevation[sf][band];
+ hDirAC->energy_ratio2[meta_write_index][bin] = meta->directional_meta[1].energy_ratio[sf][band];
+ hDirAC->diffuseness_vector[meta_write_index][bin] -= meta->directional_meta[1].energy_ratio[sf][band];
+ hDirAC->spreadCoherence2[meta_write_index][bin] = meta->directional_meta[1].spread_coherence[sf][band];
+#else
hDirAC->azimuth2[sf][bin] = (int16_t) meta->directional_meta[1].azimuth[sf][band];
hDirAC->elevation2[sf][bin] = (int16_t) meta->directional_meta[1].elevation[sf][band];
hDirAC->energy_ratio2[sf][bin] = meta->directional_meta[1].energy_ratio[sf][band];
hDirAC->diffuseness_vector[sf][bin] -= meta->directional_meta[1].energy_ratio[sf][band];
hDirAC->spreadCoherence2[sf][bin] = meta->directional_meta[1].spread_coherence[sf][band];
+#endif
}
}
}
}
+#ifdef FIX_390_EXT_REND_MASA_META_COPY
+
+ hDirAC->dirac_bs_md_write_idx = ( hDirAC->dirac_bs_md_write_idx + MAX_PARAM_SPATIAL_SUBFRAMES ) % hDirAC->dirac_md_buffer_length;
+#endif
return;
}
-static ivas_error renderMasaToMc(
+static void renderMasaToMc(
input_masa *masaInput,
IVAS_REND_AudioBuffer outAudio )
{
@@ -5267,10 +5388,10 @@ static ivas_error renderMasaToMc(
accumulate2dArrayToBuffer( tmpBuffer, &outAudio );
- return IVAS_ERR_OK;
+ return;
}
-static ivas_error renderMasaToSba(
+static void renderMasaToSba(
input_masa *masaInput,
IVAS_REND_AudioBuffer outAudio )
{
@@ -5283,10 +5404,10 @@ static ivas_error renderMasaToSba(
accumulate2dArrayToBuffer( tmpBuffer, &outAudio );
- return IVAS_ERR_OK;
+ return;
}
-static ivas_error renderMasaToBinaural(
+static void renderMasaToBinaural(
input_masa *masaInput,
IVAS_REND_AudioBuffer outAudio )
{
@@ -5299,7 +5420,7 @@ static ivas_error renderMasaToBinaural(
accumulate2dArrayToBuffer( tmpBuffer, &outAudio );
- return IVAS_ERR_OK;
+ return;
}
static ivas_error renderInputMasa(
@@ -5307,7 +5428,6 @@ static ivas_error renderInputMasa(
const IVAS_REND_AudioConfig outConfig,
IVAS_REND_AudioBuffer outAudio )
{
- ivas_error error;
IVAS_REND_AudioBuffer inAudio;
if ( !masaInput->metadataHasBeenFed )
@@ -5333,20 +5453,20 @@ static ivas_error renderInputMasa(
switch ( getAudioConfigType( outConfig ) )
{
case IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED:
- error = renderMasaToMc( masaInput, outAudio );
+ renderMasaToMc( masaInput, outAudio );
break;
case IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS:
- error = renderMasaToSba( masaInput, outAudio );
+ renderMasaToSba( masaInput, outAudio );
break;
case IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL:
switch ( outConfig )
{
case IVAS_REND_AUDIO_CONFIG_BINAURAL:
- error = renderMasaToBinaural( masaInput, outAudio );
+ renderMasaToBinaural( masaInput, outAudio );
break;
/* ToDo */
// case IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM:
- // error = renderMasaToBinauralRoom( masaInput, outConfig, outAudio );
+ // renderMasaToBinauralRoom( masaInput, outConfig, outAudio );
// break;
default:
return IVAS_ERR_INVALID_OUTPUT_FORMAT;
@@ -5356,12 +5476,6 @@ static ivas_error renderInputMasa(
return IVAS_ERR_INVALID_OUTPUT_FORMAT;
}
- /* Check error here to keep switch statement more compact */
- if ( error != IVAS_ERR_OK )
- {
- return error;
- }
-
return IVAS_ERR_OK;
}
@@ -5369,7 +5483,7 @@ static ivas_error renderActiveInputsMasa(
IVAS_REND_HANDLE hIvasRend,
IVAS_REND_AudioBuffer outAudio )
{
- int32_t i;
+ int16_t i;
input_masa *pCurrentInput;
ivas_error error;
@@ -5405,10 +5519,7 @@ ivas_error IVAS_REND_GetSamples(
ivas_error error;
int16_t numOutChannels;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( hIvasRend == NULL || outAudio.data == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -5486,10 +5597,7 @@ void IVAS_REND_Close(
uint16_t i;
IVAS_REND_HANDLE hIvasRend;
- /*-----------------------------------------------------------------*
- * Validate function arguments
- *-----------------------------------------------------------------*/
-
+ /* Validate function arguments */
if ( phIvasRend == NULL || *phIvasRend == NULL )
{
return;
@@ -5524,6 +5632,8 @@ void IVAS_REND_Close(
ivas_limiter_close( &hIvasRend->hLimiter );
+ closeHeadRotation( hIvasRend );
+
free( hIvasRend );
*phIvasRend = NULL;
diff --git a/lib_rend/lib_rend.h b/lib_rend/lib_rend.h
index 6db5fd91dc12c7a4cecb82d801a1f5c50ba6adb1..ec4c05a6d676aac8b1a0fb98d156ee8ef110de82 100644
--- a/lib_rend/lib_rend.h
+++ b/lib_rend/lib_rend.h
@@ -228,8 +228,12 @@ ivas_error IVAS_REND_FeedInputMasaMetadata(
);
ivas_error IVAS_REND_InitConfig(
- IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
- const bool rendererConfigEnabled /* i : flag indicating if a renderer configuration file was supplied */
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+#ifdef FIX_392_LATE_REVERB
+ const IVAS_REND_AudioConfig outAudioConfig /* i : output audioConfig */
+#else
+ const bool rendererConfigEnabled /* i : flag indicating if a renderer configuration file was supplied */
+#endif
);
int16_t IVAS_REND_GetRenderConfig(
@@ -244,7 +248,34 @@ int16_t IVAS_REND_FeedRenderConfig(
ivas_error IVAS_REND_SetHeadRotation(
IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
- const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : head positions for next rendering call */
+ const IVAS_QUATERNION headRot[RENDERER_HEAD_POSITIONS_PER_FRAME], /* i : head orientations for next rendering call */
+ const IVAS_POSITION Pos[RENDERER_HEAD_POSITIONS_PER_FRAME] /* i : listener positions for next rendering call */
+);
+
+ivas_error IVAS_REND_SetOrientationTrackingMode(
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ const uint8_t otrMode /* i : Orientation tracking mode */
+);
+
+ivas_error IVAS_REND_SetReferenceRotation(
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ const IVAS_QUATERNION refRot /* i : Reference rotation */
+);
+
+ivas_error IVAS_REND_GetMainOrientation(
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ IVAS_QUATERNION *pOrientation /* i/o: Quaternion pointer for main orientation */
+);
+
+ivas_error IVAS_REND_GetTrackedRotation(
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ IVAS_QUATERNION *pRotation /* i/o: Quaternion pointer for processed rotation */
+);
+
+ivas_error IVAS_REND_SetReferenceVector(
+ IVAS_REND_HANDLE hIvasRend, /* i/o: Renderer handle */
+ const IVAS_VECTOR3 listenerPos, /* i : Listener position */
+ const IVAS_VECTOR3 refPos /* i : Reference position */
);
ivas_error IVAS_REND_GetSamples(
diff --git a/lib_util/audio_file_reader.c b/lib_util/audio_file_reader.c
index c7feefd7b7d58ae04de932265d9d1e6c18104094..4f6bd0c34d13fd62439775d31933f9d67a4197f4 100644
--- a/lib_util/audio_file_reader.c
+++ b/lib_util/audio_file_reader.c
@@ -40,9 +40,7 @@ struct AudioFileReader
{
FILE *rawFile;
WAVEFILEIN *wavFile;
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
uint32_t samplingRate;
-#endif
int16_t numChannels;
};
@@ -57,26 +55,12 @@ static int8_t AudioFileReader_open_raw(
static int8_t AudioFileReader_open_wav(
AudioFileReader *self,
- const char *fileName
-#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS
- ,
- int32_t *sampleRate
-#endif
-)
+ const char *fileName )
{
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
uint32_t samplesInFile;
-#else
- uint32_t sampleRate_, samplesInFile;
-#endif
int16_t bps;
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
self->wavFile = OpenWav( fileName, &self->samplingRate, &self->numChannels, &samplesInFile, &bps );
-#else
- self->wavFile = OpenWav( fileName, &sampleRate_, &self->numChannels, &samplesInFile, &bps );
- *sampleRate = sampleRate_;
-#endif
if ( !self->wavFile )
{
@@ -92,10 +76,6 @@ static int8_t AudioFileReader_open_wav(
ivas_error AudioFileReader_open(
AudioFileReader **audioReader, /* o : AudioFileReader handle */
const char *fileName /* i : path to wav/raw pcm file */
-#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS
- ,
- int32_t *sampleRate /* o : sample rate of wav file, unused with pcm */
-#endif
)
{
AudioFileReader *self;
@@ -118,19 +98,12 @@ ivas_error AudioFileReader_open(
return IVAS_ERR_FAILED_FILE_OPEN;
}
self = calloc( sizeof( AudioFileReader ), 1 );
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
self->samplingRate = 0;
-#endif
self->numChannels = 0;
if ( fileNameLen > wavSuffixLen && strncmp( fileName + fileNameLen - wavSuffixLen, wavSuffix, wavSuffixLen ) == 0 )
{
- retCode = AudioFileReader_open_wav( self, fileName
-#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS
- ,
- sampleRate
-#endif
- );
+ retCode = AudioFileReader_open_wav( self, fileName );
}
else
{
@@ -206,7 +179,6 @@ ivas_error AudioFileReader_read(
return error;
}
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
ivas_error AudioFileReader_getSamplingRate(
AudioFileReader *self,
int32_t *samplingRate )
@@ -257,17 +229,3 @@ ivas_error AudioFileReader_getNumChannels(
return IVAS_ERR_OK;
}
-#else
-/*! r: number of channels of the opened file */
-int16_t AudioFileReader_getNumChannels(
- AudioFileReader *self /* i/o: AudioFileReader handle */
-)
-{
- if ( self != NULL )
- {
- return self->numChannels;
- }
-
- return 0;
-}
-#endif
diff --git a/lib_util/audio_file_reader.h b/lib_util/audio_file_reader.h
index a944c85dc1a44279efa3596c3219943c70ae78a6..0fd4da5ac76c25285d3b49d67166ce651a96eeb8 100644
--- a/lib_util/audio_file_reader.h
+++ b/lib_util/audio_file_reader.h
@@ -43,9 +43,6 @@ typedef struct AudioFileReader AudioFileReader;
ivas_error AudioFileReader_open(
AudioFileReader **audioReader, /* o : AudioFileReader handle */
const char *fileName /* i : path to wav/raw pcm file */
-#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS
- ,int32_t *sampleRate /* o : sample rate of wav file, unused with pcm */
-#endif
);
ivas_error AudioFileReader_read(
@@ -55,7 +52,6 @@ ivas_error AudioFileReader_read(
int16_t *numSamplesRead /* i : number of samples actualy read */
);
-#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS
/*! r: ivas error - in particular, IVAS_ERR_SAMPLING_RATE_UNKNOWN if the opened file has no sampling rate metadata */
ivas_error AudioFileReader_getSamplingRate(
AudioFileReader *self, /* i/o: AudioFileReader handle */
@@ -67,12 +63,6 @@ ivas_error AudioFileReader_getNumChannels(
AudioFileReader *self, /* i/o: AudioFileReader handle */
int16_t * numChannels /* o : number fo channels in opened audio file */
);
-#else
-/*! r: number of channels of the opened file */
-int16_t AudioFileReader_getNumChannels(
- AudioFileReader *self /* i/o: AudioFileReader handle */
-);
-#endif
void AudioFileReader_close(
AudioFileReader **selfPtr /* i/o: pointer to AudioFileReader handle */
diff --git a/lib_util/audio_file_writer.c b/lib_util/audio_file_writer.c
index d6cbb1810ed4729e1f749e4ec505435f50cc0e3c..81084dbd95b686d52477327b948ada136225f42f 100644
--- a/lib_util/audio_file_writer.c
+++ b/lib_util/audio_file_writer.c
@@ -98,7 +98,7 @@ ivas_error AudioFileWriter_open(
int8_t retCode;
- if ( fileNameLen > wavSuffixLen && strncmp( fileName + fileNameLen - wavSuffixLen, wavSuffix, wavSuffixLen ) == 0 )
+ if ( ( fileNameLen > wavSuffixLen ) && ( strncmp( fileName + fileNameLen - wavSuffixLen, wavSuffix, wavSuffixLen ) == 0 ) )
{
retCode = AudioFileWriter_open_wav( self, fileName, sampleRate, numChannels );
}
diff --git a/lib_util/head_rotation_file_reader.c b/lib_util/head_rotation_file_reader.c
index 533c14a6515edce05db918749c2d79749812920b..02f14be9247c62fb5ba80701fab7de6d96a49c84 100644
--- a/lib_util/head_rotation_file_reader.c
+++ b/lib_util/head_rotation_file_reader.c
@@ -93,33 +93,41 @@ ivas_error HeadRotationFileReader_open(
ivas_error HeadRotationFileReading(
HeadRotFileReader *headRotReader, /* i/o: HeadRotFileReader handle */
- IVAS_QUATERNION *Quaternions, /* o : head-tracking data */
- const int32_t frame_dec /* i : decoded frame number */
+ IVAS_QUATERNION *pQuaternion, /* o : head-tracking data */
+ IVAS_POSITION *pPos /* o : listener position */
)
{
- uint16_t i;
float w, x, y, z;
+ float posx, posy, posz;
+ int32_t read_values;
- for ( i = 0; i < IVAS_MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
+ posx = 0.0f;
+ posy = 0.0f;
+ posz = 0.0f;
+
+ read_values = fscanf( headRotReader->trajFile, "%f,%f,%f,%f,%f,%f,%f", &w, &x, &y, &z, &posx, &posy, &posz );
+ if ( ( read_values != 4 ) && ( read_values != 7 ) ) /* Allow either orientation (4) or orientation+position (4+3) */
{
- if ( 4 != fscanf( headRotReader->trajFile, "%f,%f,%f,%f", &w, &x, &y, &z ) )
+ if ( feof( headRotReader->trajFile ) )
{
- if ( feof( headRotReader->trajFile ) )
- {
- rewind( headRotReader->trajFile );
- headRotReader->fileRewind = true;
- return HeadRotationFileReading( headRotReader, Quaternions, frame_dec );
- }
- return IVAS_ERR_FAILED_FILE_PARSE;
+ rewind( headRotReader->trajFile );
+ headRotReader->fileRewind = true;
+ return HeadRotationFileReading( headRotReader, pQuaternion, pPos );
}
+ return IVAS_ERR_FAILED_FILE_PARSE;
+ }
+ ( headRotReader->frameCounter )++;
- ( headRotReader->frameCounter )++;
-
- Quaternions[i].w = w;
- Quaternions[i].x = x;
- Quaternions[i].y = y;
- Quaternions[i].z = z;
+ pQuaternion->w = w;
+ pQuaternion->x = x;
+ pQuaternion->y = y;
+ pQuaternion->z = z;
+ if ( pPos != NULL )
+ {
+ pPos->x = posx;
+ pPos->y = posy;
+ pPos->z = posz;
}
return IVAS_ERR_OK;
diff --git a/lib_util/head_rotation_file_reader.h b/lib_util/head_rotation_file_reader.h
index e70281401af40b5f00e246f40989be91ecaa5d9d..4794aeba45b2d17e2c7552112ff292741ca9655d 100644
--- a/lib_util/head_rotation_file_reader.h
+++ b/lib_util/head_rotation_file_reader.h
@@ -59,8 +59,8 @@ ivas_error HeadRotationFileReader_open(
ivas_error HeadRotationFileReading(
HeadRotFileReader *headRotReader, /* i/o: HeadRotFileReader handle */
- IVAS_QUATERNION *Quaternions, /* o : head-tracking data */
- const int32_t frame_dec /* i : decoded frame number */
+ IVAS_QUATERNION *pQuaternion, /* o : head-tracking data */
+ IVAS_POSITION *pPos /* o : listener position */
);
/*-----------------------------------------------------------------------*
diff --git a/lib_util/ism_file_reader.c b/lib_util/ism_file_reader.c
index 77912f5c586251110a57d708b529499f483aecd9..0aeca6d6a06e36cdf8df76f6971670d356fb0923 100644
--- a/lib_util/ism_file_reader.c
+++ b/lib_util/ism_file_reader.c
@@ -37,7 +37,8 @@
#define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */
-#define NUM_ISM_METADATA_PER_LINE 5 /* Number of ISM metadata per line in a metadata file */
+#define NUM_ISM_METADATA_PER_LINE 7 /* Number of ISM metadata per line in a metadata file */
+#define NUM_MIN_ISM_METADATA 2 /* Minimum number of metadata parameters (azimuth and elevation) */
struct IsmFileReader
@@ -54,7 +55,7 @@ struct IsmFileReader
*---------------------------------------------------------------------*/
IsmFileReader *IsmFileReader_open(
- const char *filePath /* i : path to ism metadata file */
+ const char *filePath /* i : path to ISM metadata file */
)
{
IsmFileReader *self;
@@ -90,15 +91,22 @@ IsmFileReader *IsmFileReader_open(
/*! r: error code */
ivas_error IsmFileReader_readNextFrame(
IsmFileReader *self, /* i/o: IsmFileReader handle */
- IVAS_ISM_METADATA *ismMetadata /* o ISM : metadata read from the opened file */
+ IVAS_ISM_METADATA *ismMetadata /* o : ISM metadata read from the opened file */
)
{
char char_buff[META_LINE_LENGTH];
float meta_prm[NUM_ISM_METADATA_PER_LINE];
+ const float meta_prm_default[NUM_ISM_METADATA_PER_LINE] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f };
char *char_ptr;
int16_t i;
FILE *file;
+ /* Set default metadata parameters */
+ for ( i = 0; i < NUM_ISM_METADATA_PER_LINE; i++ )
+ {
+ meta_prm[i] = meta_prm_default[i];
+ }
+
if ( ismMetadata == NULL || self->file == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
@@ -127,24 +135,30 @@ ivas_error IsmFileReader_readNextFrame(
meta_prm[i++] = (float) atof( char_ptr );
}
-
- if ( i != NUM_ISM_METADATA_PER_LINE )
+#ifdef FIX_379_EXT_METADATA
+ /* Verify the number of metadata values. */
+ if ( i < NUM_MIN_ISM_METADATA || char_ptr != NULL )
{
- /* Not enough values provided in one line */
+ /* Invalid number of metadata parameters (2-7 supported) */
return IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT;
}
-
- if ( char_ptr != NULL )
+#else
+ /* Check if minimum number of metadata values were read. Additional values are ignored. */
+ if ( i < NUM_MIN_ISM_METADATA )
{
- /* Too many values provided in one line */
+ /* Not enough values provided in one line */
return IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT;
}
+#endif
+
ismMetadata->azimuth = meta_prm[0];
ismMetadata->elevation = meta_prm[1];
ismMetadata->radius = meta_prm[2];
ismMetadata->spread = meta_prm[3];
ismMetadata->gainFactor = meta_prm[4];
+ ismMetadata->yaw = meta_prm[5];
+ ismMetadata->pitch = meta_prm[6];
/* verify whether the read metadata values are in an expected range */
if ( ismMetadata->azimuth > 180 || ismMetadata->azimuth < -180 )
@@ -157,7 +171,11 @@ ivas_error IsmFileReader_readNextFrame(
return IVAS_ERR_ISM_INVALID_METADATA_VALUE;
}
+#ifdef FIX_379_EXT_METADATA
+ if ( ismMetadata->radius < 0 ) /* Negative radius not supported. Max quantized radius = (2^ISM_RADIUS_NBITS-1)*0.25 = 15.75 */
+#else
if ( ismMetadata->radius < 0 ) // Ivas_fmToDo: to be reviewed
+#endif
{
return IVAS_ERR_ISM_INVALID_METADATA_VALUE;
}
@@ -171,6 +189,15 @@ ivas_error IsmFileReader_readNextFrame(
{
return IVAS_ERR_ISM_INVALID_METADATA_VALUE;
}
+ if ( ismMetadata->yaw > 180 || ismMetadata->yaw < -180 )
+ {
+ return IVAS_ERR_ISM_INVALID_METADATA_VALUE;
+ }
+
+ if ( ismMetadata->pitch > 90 || ismMetadata->pitch < -90 )
+ {
+ return IVAS_ERR_ISM_INVALID_METADATA_VALUE;
+ }
return IVAS_ERR_OK;
}
diff --git a/lib_util/ism_file_writer.c b/lib_util/ism_file_writer.c
index c4dffe38b03462337e460558d84449f53977aebc..b29386282b016342c147f0c60775a8b9eb314ba4 100644
--- a/lib_util/ism_file_writer.c
+++ b/lib_util/ism_file_writer.c
@@ -35,8 +35,7 @@
#include
-#define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */
-#define NUM_ISM_METADATA_PER_LINE 5 /* Number of ISM metadata per line in a metadata file */
+#define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */
struct IsmFileWriter
@@ -54,7 +53,7 @@ struct IsmFileWriter
/*! r: error code */
ivas_error IsmFileWriter_open(
const char *filePathWav, /* i : path to output file */
- const int16_t obj_num, /* i : ISm number */
+ const int16_t obj_num, /* i : number of ISM channels */
IsmFileWriter **ismWriter /* o : IsmFileWriter handle */
)
{
@@ -115,7 +114,10 @@ ivas_error IsmFileWriter_writeFrame(
file = ismWriter->file;
/* IVAS_fmToDo: work in progress; currently position_azimuth, position_elevation, position_radius, spread, gain_factor */
- snprintf( char_buff, sizeof( char_buff ), "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor );
+#ifdef FIX_293_EXT_RENDERER_CLI
+ sprintf( char_buff, "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch );
+#endif
+ snprintf( char_buff, sizeof( char_buff ), "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch );
if ( file )
{
diff --git a/lib_util/ism_file_writer.h b/lib_util/ism_file_writer.h
index 24b4c58bd4d89d805212ece1250546ed925d8c27..d9f731e87e56b8f0b333d725d813047320d82a39 100644
--- a/lib_util/ism_file_writer.h
+++ b/lib_util/ism_file_writer.h
@@ -43,7 +43,7 @@ typedef struct IsmFileWriter IsmFileWriter;
/*! r: error code */
ivas_error IsmFileWriter_open(
const char *filePathWav, /* i : path to output file */
- const int16_t obj_num, /* i : ISm number */
+ const int16_t obj_num, /* i : number of ISM channels */
IsmFileWriter **ismWriter /* o : IsmFileReader handle */
);
diff --git a/lib_util/ls_custom_file_reader.c b/lib_util/ls_custom_file_reader.c
index f73022e8499fdbb22eb801221444a06aa8af41f6..9b39fab486bd99ab3259fc5dd6770351792e1e6e 100644
--- a/lib_util/ls_custom_file_reader.c
+++ b/lib_util/ls_custom_file_reader.c
@@ -52,7 +52,7 @@ struct LsCustomFileReader
ivas_error CustomLsReader_open(
const char *LsFilePath, /* i : LS custom layout file name */
- LsCustomFileReader **hLsCustomReader /* o : HeadRotFileReader handle */
+ LsCustomFileReader **hLsCustomReader /* o : LsCustomFileReader handle */
)
{
LsCustomFileReader *self;
@@ -89,7 +89,7 @@ ivas_error CustomLsReader_open(
*-----------------------------------------------------------------------*/
void CustomLsReader_close(
- LsCustomFileReader **hLsCustomReader /* i/o: HeadRotFileReader handle */
+ LsCustomFileReader **hLsCustomReader /* i/o: LsCustomFileReader handle */
)
{
if ( hLsCustomReader == NULL || *hLsCustomReader == NULL )
@@ -228,7 +228,7 @@ static void CustomLoudspeakerLayout_print_info(
*-------------------------------------------------------------------------*/
LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading(
- LsCustomFileReader *hLsCustomReader, /* i/o: HeadRotFileReader handle */
+ LsCustomFileReader *hLsCustomReader, /* i/o: LsCustomFileReader handle */
IVAS_CUSTOM_LS_DATA *hLsCustomData /* o : Custom loudspeaker setup data */
)
{
diff --git a/lib_util/ls_custom_file_reader.h b/lib_util/ls_custom_file_reader.h
index 70c854aa9cff8b26f5947d0b70ce6a7eabee2431..df7fe6bde7a929cb7dff5ae4a4e17d34ab0b58eb 100644
--- a/lib_util/ls_custom_file_reader.h
+++ b/lib_util/ls_custom_file_reader.h
@@ -64,7 +64,7 @@ typedef enum _LS_CUSTOM_FILEREADER_ERROR
ivas_error CustomLsReader_open(
const char *LsFilePath, /* i : LS custom layout file name */
- LsCustomFileReader **hLsCustomReader /* o : HeadRotFileReader handle */
+ LsCustomFileReader **hLsCustomReader /* o : LsCustomFileReader handle */
);
/*-----------------------------------------------------------------------*
@@ -74,7 +74,7 @@ ivas_error CustomLsReader_open(
*-----------------------------------------------------------------------*/
void CustomLsReader_close(
- LsCustomFileReader **hLsCustomReader /* i/o: HeadRotFileReader handle */
+ LsCustomFileReader **hLsCustomReader /* i/o: LsCustomFileReader handle */
);
/*-------------------------------------------------------------------------*
@@ -84,7 +84,7 @@ void CustomLsReader_close(
*-------------------------------------------------------------------------*/
LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading(
- LsCustomFileReader *hLsCustomReader, /* i/o: HeadRotFileReader handle */
+ LsCustomFileReader *hLsCustomReader, /* i/o: LsCustomFileReader handle */
IVAS_CUSTOM_LS_DATA *hLsCustomData /* o : Custom loudspeaker setup data */
);
diff --git a/lib_util/masa_file_writer.c b/lib_util/masa_file_writer.c
index 0ccd8b2ae0ae6592e2c295df84e4b79dda609b1f..5667968ece8b39c4a1a8ecc783a9efcea63b2011 100644
--- a/lib_util/masa_file_writer.c
+++ b/lib_util/masa_file_writer.c
@@ -32,24 +32,43 @@
#include "masa_file_writer.h"
#include "ivas_stat_com.h"
+#ifdef FIX_350_MASA_DELAY_COMP
+#include "ivas_stat_dec.h"
+#endif
#include "ivas_cnst.h"
#include
#include
#include
+#ifdef FIX_350_MASA_DELAY_COMP
+typedef struct masaMetaDelayStorage
+{
+ MASA_DECRIPTIVE_META descriptiveMeta;
+ uint16_t directionIndex[MASA_MAXIMUM_DIRECTIONS][DELAY_MASA_PARAM_DEC_SFR][MASA_FREQUENCY_BANDS];
+ uint8_t directToTotalRatio[MASA_MAXIMUM_DIRECTIONS][DELAY_MASA_PARAM_DEC_SFR][MASA_FREQUENCY_BANDS];
+ uint8_t spreadCoherence[MASA_MAXIMUM_DIRECTIONS][DELAY_MASA_PARAM_DEC_SFR][MASA_FREQUENCY_BANDS];
+ uint8_t surroundCoherence[DELAY_MASA_PARAM_DEC_SFR][MASA_FREQUENCY_BANDS];
+ uint8_t diffuseToTotalRatio[DELAY_MASA_PARAM_DEC_SFR][MASA_FREQUENCY_BANDS];
+
+} MASA_META_DELAY_STORAGE;
+#endif
struct MasaFileWriter
{
FILE *file;
char *file_path;
+#ifdef FIX_350_MASA_DELAY_COMP
+ MASA_META_DELAY_STORAGE *delayStorage;
+#endif
};
/*-----------------------------------------------------------------------*
* Local constants
*-----------------------------------------------------------------------*/
+#ifndef FIX_350_MASA_DELAY_COMP
#define SPH_IDX_FRONT ( MASA_NO_POINTS_EQUATOR / 2 ) /* Spherical index corresponding to front direction for setting as default value */
-
+#endif
/*-----------------------------------------------------------------------*
* Local functions
@@ -74,16 +93,77 @@ static void getExtMasaMetadataFileName(
return;
}
+#ifdef FIX_350_MASA_DELAY_COMP
+static void delayMasaMetadata(
+ MASA_DECODER_EXT_OUT_META_HANDLE extOutMeta, /* i/o : New input metadata which is inplace replaced with delayed metadata frame */
+ MASA_META_DELAY_STORAGE *delayStorage /* i/o : Storage for 10 ms of metadata and related descriptive metadata */
+)
+{
+ int16_t dir, sf, band;
+ uint8_t currentNumberOfDirections;
+
+ /* Move meta to delay and output. Always use two directions as the metadata is prepared to contain zero energy second direction
+ * if there is 1dir meta. */
+ for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES - DELAY_MASA_PARAM_DEC_SFR; sf++ )
+ {
+ for ( band = 0; band < MASA_FREQUENCY_BANDS; band++ )
+ {
+ uint16_t temp_u16;
+ uint8_t temp_u8;
+ for ( dir = 0; dir < MASA_MAXIMUM_DIRECTIONS; dir++ )
+ {
+ temp_u16 = delayStorage->directionIndex[dir][sf][band];
+ delayStorage->directionIndex[dir][sf][band] = extOutMeta->directionIndex[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band];
+ extOutMeta->directionIndex[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band] = extOutMeta->directionIndex[dir][sf][band];
+ extOutMeta->directionIndex[dir][sf][band] = temp_u16;
+
+ temp_u8 = delayStorage->directToTotalRatio[dir][sf][band];
+ delayStorage->directToTotalRatio[dir][sf][band] = extOutMeta->directToTotalRatio[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band];
+ extOutMeta->directToTotalRatio[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band] = extOutMeta->directToTotalRatio[dir][sf][band];
+ extOutMeta->directToTotalRatio[dir][sf][band] = temp_u8;
+
+ temp_u8 = delayStorage->spreadCoherence[dir][sf][band];
+ delayStorage->spreadCoherence[dir][sf][band] = extOutMeta->spreadCoherence[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band];
+ extOutMeta->spreadCoherence[dir][sf + DELAY_MASA_PARAM_DEC_SFR][band] = extOutMeta->spreadCoherence[dir][sf][band];
+ extOutMeta->spreadCoherence[dir][sf][band] = temp_u8;
+ }
+
+ temp_u8 = delayStorage->surroundCoherence[sf][band];
+ delayStorage->surroundCoherence[sf][band] = extOutMeta->surroundCoherence[sf + DELAY_MASA_PARAM_DEC_SFR][band];
+ extOutMeta->surroundCoherence[sf + DELAY_MASA_PARAM_DEC_SFR][band] = extOutMeta->surroundCoherence[sf][band];
+ extOutMeta->surroundCoherence[sf][band] = temp_u8;
+
+ temp_u8 = delayStorage->diffuseToTotalRatio[sf][band];
+ delayStorage->diffuseToTotalRatio[sf][band] = extOutMeta->diffuseToTotalRatio[sf + DELAY_MASA_PARAM_DEC_SFR][band];
+ extOutMeta->diffuseToTotalRatio[sf + DELAY_MASA_PARAM_DEC_SFR][band] = extOutMeta->diffuseToTotalRatio[sf][band];
+ extOutMeta->diffuseToTotalRatio[sf][band] = temp_u8;
+ }
+ }
+
+ /* Finalize descriptive meta by using new frame except for number of directions which is the larger of the two */
+ currentNumberOfDirections = extOutMeta->descriptiveMeta.numberOfDirections;
+ if ( delayStorage->descriptiveMeta.numberOfDirections > extOutMeta->descriptiveMeta.numberOfDirections )
+ {
+ extOutMeta->descriptiveMeta.numberOfDirections = delayStorage->descriptiveMeta.numberOfDirections;
+ }
+ delayStorage->descriptiveMeta.numberOfDirections = currentNumberOfDirections;
+
+ return;
+}
+#endif
/*---------------------------------------------------------------------*
- * MasaFileWriter_writeFrame()
+ * MasaFileWriter_open()
*
*
*---------------------------------------------------------------------*/
ivas_error MasaFileWriter_open(
const char *outputWavFilename, /* i : name of the output audio file */
- MasaFileWriter **masaWriter /* o : MasaFileWriter handle */
+#ifdef FIX_350_MASA_DELAY_COMP
+ const bool delayCompensationEnabled, /* i : is delay compensation enabled */
+#endif
+ MasaFileWriter **masaWriter /* o : MasaFileWriter handle */
)
{
MasaFileWriter *self;
@@ -109,6 +189,13 @@ ivas_error MasaFileWriter_open(
self->file_path = calloc( sizeof( char ), strlen( filePath ) + 1 );
strcpy( self->file_path, filePath );
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( !delayCompensationEnabled )
+ {
+ self->delayStorage = calloc( sizeof( MASA_META_DELAY_STORAGE ), 1 );
+ }
+#endif
+
*masaWriter = self;
return IVAS_ERR_OK;
@@ -122,8 +209,12 @@ ivas_error MasaFileWriter_open(
*---------------------------------------------------------------------*/
ivas_error MasaFileWriter_writeFrame(
- MasaFileWriter *self, /* i/o: MasaFileWriter handle */
- IVAS_MASA_QMETADATA_HANDLE hMasaQMetadata /* i/o: MASA qMetadata handle to be written */
+ MasaFileWriter *self, /* i/o: MasaFileWriter handle */
+#ifdef FIX_350_MASA_DELAY_COMP
+ MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta /* i/o: MASA ext out meta handle to be written */
+#else
+ IVAS_MASA_QMETADATA_HANDLE hMasaQMetadata /* i/o: MASA qMetadata handle to be written */
+#endif
)
{
if ( self == NULL )
@@ -131,6 +222,11 @@ ivas_error MasaFileWriter_writeFrame(
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
}
+#ifdef FIX_350_MASA_DELAY_COMP
+ uint16_t descMetaTemp = 0;
+ int16_t i, sf, dir, numDirections;
+ uint8_t writeTempOther[MASA_FREQUENCY_BANDS];
+#else
const uint8_t ivasmasaFormatDescriptor[8] = { 0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 }; /* "IVASMASA" */
uint16_t descMetaTemp = 0;
int16_t i, sf, b_old, b_new, dir;
@@ -146,7 +242,45 @@ ivas_error MasaFileWriter_writeFrame(
numCodingBands = hMasaQMetadata->numCodingBands;
bandMap = hMasaQMetadata->bandMap;
nchan_transport = hMasaQMetadata->nchan_transport;
+#endif
+
+#ifdef FIX_350_MASA_DELAY_COMP
+ /* If delay storage has been reserved, then we are in the normal mode for the decoder
+ * (i.e., no delay compensation for PCM) which means that metadata should be delayed
+ * by two subframes (10 ms). Descriptive metadata is a combined result. */
+ if ( self->delayStorage )
+ {
+ delayMasaMetadata( hMasaExtOutMeta, self->delayStorage );
+ }
+ numDirections = hMasaExtOutMeta->descriptiveMeta.numberOfDirections + 1;
+
+ if ( fwrite( &( hMasaExtOutMeta->descriptiveMeta.formatDescriptor ), sizeof( uint8_t ), 8, self->file ) != 8 )
+ {
+ return IVAS_ERR_FAILED_FILE_WRITE;
+ }
+
+ descMetaTemp += hMasaExtOutMeta->descriptiveMeta.numberOfDirections << 15u;
+ descMetaTemp += hMasaExtOutMeta->descriptiveMeta.numberOfChannels << 14u;
+ descMetaTemp += hMasaExtOutMeta->descriptiveMeta.sourceFormat << 12u;
+ if ( hMasaExtOutMeta->descriptiveMeta.sourceFormat == 0x0 || hMasaExtOutMeta->descriptiveMeta.sourceFormat == 0x1 )
+ {
+ descMetaTemp += hMasaExtOutMeta->descriptiveMeta.transportDefinition << 9u;
+ descMetaTemp += hMasaExtOutMeta->descriptiveMeta.channelAngle << 6u;
+ descMetaTemp += hMasaExtOutMeta->descriptiveMeta.channelDistance;
+ }
+ else if ( hMasaExtOutMeta->descriptiveMeta.sourceFormat == 0x2 )
+ {
+ descMetaTemp += hMasaExtOutMeta->descriptiveMeta.channelLayout << 9u;
+ /* 9 LSB remain at zero */
+ }
+ else if ( hMasaExtOutMeta->descriptiveMeta.sourceFormat == 0x3 )
+ {
+ descMetaTemp += hMasaExtOutMeta->descriptiveMeta.transportDefinition << 9u;
+ descMetaTemp += hMasaExtOutMeta->descriptiveMeta.channelAngle << 6u;
+ /* 6 LSB remain at zero */
+ }
+#else
/* Construct descriptive meta */
for ( i = 0; i < 8; i++ )
{
@@ -186,6 +320,7 @@ ivas_error MasaFileWriter_writeFrame(
descMetaTemp += descMeta.channelAngle << 6u;
/* 6 LSB remain at zero */
}
+#endif
if ( fwrite( &( descMetaTemp ), sizeof( uint16_t ), 1, self->file ) != 1 )
{
@@ -197,6 +332,9 @@ ivas_error MasaFileWriter_writeFrame(
for ( dir = 0; dir < numDirections; dir++ )
{
/* Spherical index */
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( fwrite( hMasaExtOutMeta->directionIndex[dir][sf], sizeof( uint16_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS )
+#else
for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ )
{
writeTempIndex[i] = SPH_IDX_FRONT;
@@ -211,11 +349,15 @@ ivas_error MasaFileWriter_writeFrame(
}
if ( fwrite( writeTempIndex, sizeof( uint16_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS )
+#endif
{
return IVAS_ERR_FAILED_FILE_WRITE;
}
/* Direct-to-total ratio */
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( fwrite( hMasaExtOutMeta->directToTotalRatio[dir][sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS )
+#else
for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ )
{
writeTempOther[i] = 0;
@@ -230,11 +372,15 @@ ivas_error MasaFileWriter_writeFrame(
}
if ( fwrite( writeTempOther, sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS )
+#endif
{
return IVAS_ERR_FAILED_FILE_WRITE;
}
/* Spread coherence */
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( fwrite( hMasaExtOutMeta->spreadCoherence[dir][sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS )
+#else
for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ )
{
writeTempOther[i] = 0;
@@ -252,6 +398,7 @@ ivas_error MasaFileWriter_writeFrame(
}
if ( fwrite( writeTempOther, sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS )
+#endif
{
return IVAS_ERR_FAILED_FILE_WRITE;
}
@@ -259,6 +406,9 @@ ivas_error MasaFileWriter_writeFrame(
/* Common spatial meta */
/* Diffuse-to-total ratio = 1 - sum(direct-to-total ratios) */
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( fwrite( hMasaExtOutMeta->diffuseToTotalRatio[sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS )
+#else
for ( b_new = 0; b_new < MASA_FREQUENCY_BANDS; b_new++ )
{
writeTempOther[b_new] = UINT8_MAX;
@@ -277,11 +427,16 @@ ivas_error MasaFileWriter_writeFrame(
}
if ( fwrite( writeTempOther, sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS )
+#endif
{
return IVAS_ERR_FAILED_FILE_WRITE;
}
/* Surround coherence */
+#ifdef FIX_350_MASA_DELAY_COMP
+ if ( fwrite( hMasaExtOutMeta->surroundCoherence[sf], sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS )
+#else
+ /* Surround coherence */
for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ )
{
writeTempOther[i] = 0;
@@ -299,16 +454,24 @@ ivas_error MasaFileWriter_writeFrame(
}
if ( fwrite( writeTempOther, sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS )
+#endif
{
return IVAS_ERR_FAILED_FILE_WRITE;
}
/* Remainder-to-total ratio */
/* This is zero after codec */
+#ifdef FIX_350_MASA_DELAY_COMP
+ for ( i = 0; i < MASA_FREQUENCY_BANDS; i++ )
+ {
+ writeTempOther[i] = 0u;
+ }
+#else
for ( b_new = 0; b_new < MASA_FREQUENCY_BANDS; b_new++ )
{
writeTempOther[b_new] = 0u;
}
+#endif
if ( fwrite( writeTempOther, sizeof( uint8_t ), MASA_FREQUENCY_BANDS, self->file ) != MASA_FREQUENCY_BANDS )
{
@@ -337,6 +500,9 @@ void MasaFileWriter_close(
fclose( ( *selfPtr )->file );
free( ( *selfPtr )->file_path );
+#ifdef FIX_350_MASA_DELAY_COMP
+ free( ( *selfPtr )->delayStorage );
+#endif
free( *selfPtr );
*selfPtr = NULL;
diff --git a/lib_util/masa_file_writer.h b/lib_util/masa_file_writer.h
index a01b90e7ee412a082d7034c43db9bf102b1957f8..cb7d8f3d1efdb608e5e880be8a18a49bd43bffec 100644
--- a/lib_util/masa_file_writer.h
+++ b/lib_util/masa_file_writer.h
@@ -33,6 +33,11 @@
#ifndef IVAS_MASA_FILE_WRITER_H
#define IVAS_MASA_FILE_WRITER_H
+#include
+#include "options.h"
+#ifdef FIX_350_MASA_DELAY_COMP
+#include
+#endif
#include "common_api_types.h"
@@ -41,12 +46,19 @@ typedef struct MasaFileWriter MasaFileWriter;
ivas_error MasaFileWriter_open(
const char *outputWavFilename, /* i : name of the output audio file */
- MasaFileWriter **masaWriter /* o : MasaFileWriter handle */
+#ifdef FIX_350_MASA_DELAY_COMP
+ const bool delayCompensationEnabled, /* i : is delay compensation enabled */
+#endif
+ MasaFileWriter **masaWriter /* o : MasaFileWriter handle */
);
ivas_error MasaFileWriter_writeFrame(
- MasaFileWriter *self, /* i/o: MasaFileWriter handle */
+ MasaFileWriter *self, /* i/o: MasaFileWriter handle */
+#ifdef FIX_350_MASA_DELAY_COMP
+ MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta /* i/o: MASA ext out meta handle to be written */
+#else
IVAS_MASA_QMETADATA_HANDLE hMasaQMetadata /* i/o: MASA qMetadata handle to be written */
+#endif
);
void MasaFileWriter_close(
diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c
index 9fe7f019ebb767c5dfe384ab94eaf142fb47fe4a..54f2d012ce7f06c567ba87d1e216e98680306845 100644
--- a/lib_util/render_config_reader.c
+++ b/lib_util/render_config_reader.c
@@ -522,6 +522,13 @@ ivas_error RenderConfigReader_read(
errorHandler( pValue, ERROR_VALUE_INVALID );
}
}
+ else if ( strcmp( item, "DIRECTIVITY" ) == 0 )
+ {
+ if ( read_vector( pValue, 3, hRenderConfig->directivity ) )
+ {
+ errorHandler( item, ERROR_VALUE_INVALID );
+ }
+ }
#ifdef DEBUGGING
else
{
diff --git a/lib_util/vector3_pair_file_reader.c b/lib_util/vector3_pair_file_reader.c
new file mode 100644
index 0000000000000000000000000000000000000000..9e03358b91c901e9c6f2875bb8f714cce00a86db
--- /dev/null
+++ b/lib_util/vector3_pair_file_reader.c
@@ -0,0 +1,163 @@
+/******************************************************************************************************
+
+ (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+ Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+ Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+ Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+ contributors to this repository. All Rights Reserved.
+
+ This software is protected by copyright law and by international treaties.
+ The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,
+ Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
+ Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
+ Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
+ contributors to this repository retain full ownership rights in their respective contributions in
+ the software. This notice grants no license of any kind, including but not limited to patent
+ license, nor is any license granted by implication, estoppel or otherwise.
+
+ Contributors are required to enter into the IVAS codec Public Collaboration agreement before making
+ contributions.
+
+ This software is provided "AS IS", without any express or implied warranties. The software is in the
+ development stage. It is intended exclusively for experts who have experience with such software and
+ solely for the purpose of inspection. All implied warranties of non-infringement, merchantability
+ and fitness for a particular purpose are hereby disclaimed and excluded.
+
+ Any dispute, controversy or claim arising under or in relation to providing this software shall be
+ submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in
+ accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
+ the United Nations Convention on Contracts on the International Sales of Goods.
+
+*******************************************************************************************************/
+
+#include "vector3_pair_file_reader.h"
+#include
+#include
+#include
+#include
+#include "prot.h"
+#include "options.h" /* only included to get access to the feature-defines */
+
+
+struct Vector3PairFileReader
+{
+ FILE *trajFile;
+ char *file_path;
+};
+
+/*-----------------------------------------------------------------------*
+ * Vector3PairFileReader_open()
+ *
+ * Allocate and initialize reader
+ *-----------------------------------------------------------------------*/
+
+ivas_error Vector3PairFileReader_open(
+ const char *trajFilePath, /* i : trajectory file name */
+ Vector3PairFileReader **vector3PairReader /* o : Vector3PairFileReader handle */
+)
+{
+ Vector3PairFileReader *self;
+ FILE *trajFile;
+
+ /* Open trajectory file */
+ if ( strlen( trajFilePath ) < 1 )
+ {
+ return IVAS_ERR_FAILED_FILE_OPEN;
+ }
+
+ trajFile = fopen( trajFilePath, "r" );
+
+ if ( !trajFile )
+ {
+ return IVAS_ERR_FAILED_FILE_OPEN;
+ }
+
+ self = calloc( sizeof( Vector3PairFileReader ), 1 );
+ self->trajFile = trajFile;
+ self->file_path = calloc( sizeof( char ), strlen( trajFilePath ) + 1 );
+ strcpy( self->file_path, trajFilePath );
+
+ *vector3PairReader = self;
+
+ return IVAS_ERR_OK;
+}
+
+
+/*-----------------------------------------------------------------------*
+ * Vector3PairFileReader_read()
+ *
+ * Read one line of values from the trajectory file
+ *-----------------------------------------------------------------------*/
+
+ivas_error Vector3PairFileReader_read(
+ Vector3PairFileReader *vector3PairReader, /* i/o: Vector3PairFileReader handle */
+ IVAS_VECTOR3 *pFirst, /* o : first x,y,z position in the line */
+ IVAS_VECTOR3 *pSecond /* o : second x,y,z position in the line */
+)
+{
+ float x1, y1, z1, x2, y2, z2;
+
+ if ( vector3PairReader == NULL || pFirst == NULL || pSecond == NULL )
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+
+ if ( 6 != fscanf( vector3PairReader->trajFile, "%f,%f,%f,%f,%f,%f", &x1, &y1, &z1, &x2, &y2, &z2 ) )
+ {
+ if ( feof( vector3PairReader->trajFile ) )
+ {
+ rewind( vector3PairReader->trajFile );
+ return Vector3PairFileReader_read( vector3PairReader, pFirst, pSecond );
+ }
+ return IVAS_ERR_FAILED_FILE_PARSE;
+ }
+
+ pFirst->x = x1;
+ pFirst->y = y1;
+ pFirst->z = z1;
+ pSecond->x = x2;
+ pSecond->y = y2;
+ pSecond->z = z2;
+
+ return IVAS_ERR_OK;
+}
+
+/*-----------------------------------------------------------------------*
+ * Vector3PairFileReader_close()
+ *
+ * Deallocates memory for the Head-Tracking reader
+ *-----------------------------------------------------------------------*/
+
+void Vector3PairFileReader_close(
+ Vector3PairFileReader **reader /* i/o: Vector3PairFileReader handle */
+)
+{
+ if ( reader == NULL || *reader == NULL )
+ {
+ return;
+ }
+
+ fclose( ( *reader )->trajFile );
+ free( ( *reader )->file_path );
+ free( *reader );
+ *reader = NULL;
+
+ return;
+}
+
+
+/*-----------------------------------------------------------------------*
+ * Vector3PairFileReader_getFilePath()
+ *
+ *
+ *-----------------------------------------------------------------------*/
+
+const char *Vector3PairFileReader_getFilePath(
+ Vector3PairFileReader *reader /* i/o: Vector3PairFileReader handle */
+)
+{
+ if ( reader == NULL )
+ {
+ return NULL;
+ }
+
+ return reader->file_path;
+}
diff --git a/lib_debug/segsnr.c b/lib_util/vector3_pair_file_reader.h
similarity index 53%
rename from lib_debug/segsnr.c
rename to lib_util/vector3_pair_file_reader.h
index 5e5cee48b0d6f629890140af827eea0571350c3e..4ab687848c25265bc08fc33a7f2d5e474516e25b 100644
--- a/lib_debug/segsnr.c
+++ b/lib_util/vector3_pair_file_reader.h
@@ -30,76 +30,58 @@
*******************************************************************************************************/
-#include
-#ifdef DEBUGGING
-#include "debug.h"
-#endif
-#include "wmc_auto.h"
-#include
-#include "options.h"
-#include "prot.h"
-
-#define WMC_TOOL_SKIP
-
-#ifdef OUTPUT_SNR
-/*_____________________________________________________________________
- | |
- | FUNCTION NAME segsnr |
- | Computes the segmential signal-to-noise ratio between the |
- | signal x and its estimate xe of length n samples. The segment |
- | length is nseg samples. |
- |
- | INPUT
- | x[0:n-1] Signal of n samples.
- | xe[0:n-1] Estimated signal of n samples.
- | n Signal length.
- | nseg Segment length, must be a submultiple of n.
- |
- | RETURN VALUE
- | snr Segmential signal to noise ratio in dB.
- |_____________________________________________________________________|
-*/
-
-float segsnr( float x[], float xe[], int16_t n, int16_t nseg )
-{
- float snr = 0.0f;
- float signal, noise, error, fac;
- int16_t i, j;
- LOOP( 1 );
- for ( i = 0; i < n; i += nseg )
- {
- signal = 1e-6f;
- MOVE( 2 );
- noise = 1e-6f;
- LOOP( 1 );
- for ( j = 0; j < nseg; j++ )
- {
- signal += ( *x ) * ( *x );
- MAC( 1 );
- error = *x++ - *xe++;
- ADD( 1 );
- noise += error * error;
- MAC( 1 );
- }
- snr += (float) log10( signal / noise );
- TRANS( 1 );
- DIV( 1 );
- ADD( 1 );
- }
- fac = ( (float) ( 10 * nseg ) ) / (float) n;
- DIV( 1 );
- MULT( 1 );
- snr = fac * snr;
- MULT( 1 );
- ADD( 1 );
- BRANCH( 1 );
- if ( snr < -99.0f )
- {
- snr = -99.0f;
- MOVE( 1 );
- }
- return ( snr );
-}
-#endif
-
-#undef WMC_TOOL_SKIP
+#ifndef IVAS_V3PAIR_FILE_READER_H
+#define IVAS_V3PAIR_FILE_READER_H
+
+#include "common_api_types.h"
+#include "ivas_error.h"
+#include "options.h" /* only included to get access to the feature-defines */
+
+
+typedef struct Vector3PairFileReader Vector3PairFileReader;
+
+/*-----------------------------------------------------------------------*
+ * Vector3PairFileReader_open()
+ *
+ * Allocate and initialize Head-Tracking handle
+ *-----------------------------------------------------------------------*/
+
+ivas_error Vector3PairFileReader_open(
+ const char *trajFilePath, /* i : trajectory file name */
+ Vector3PairFileReader **vector3PairReader /* o : Vector3PairFileReader handle */
+);
+
+/*-----------------------------------------------------------------------*
+ * Vector3PairFileReader_read()
+ *
+ * Read one line of values from the trajectory file
+ *-----------------------------------------------------------------------*/
+
+ivas_error Vector3PairFileReader_read(
+ Vector3PairFileReader *vector3PairReader, /* i/o: Vector3PairFileReader handle */
+ IVAS_VECTOR3 *pFirst, /* o : first x,y,z position in the line */
+ IVAS_VECTOR3 *pSecond /* o : second x,y,z position in the line */
+);
+
+/*-----------------------------------------------------------------------*
+ * Vector3PairFileReader_close()
+ *
+ * Deallocates memory for the handle
+ *-----------------------------------------------------------------------*/
+
+void Vector3PairFileReader_close(
+ Vector3PairFileReader **vector3PairReader /* i/o: Vector3PairFileReader handle */
+);
+
+/*-----------------------------------------------------------------------*
+ * Vector3PairFileReader_getFilePath()
+ *
+ *
+ *-----------------------------------------------------------------------*/
+
+const char *Vector3PairFileReader_getFilePath(
+ Vector3PairFileReader *vector3PairReader /* i/o: Vector3PairFileReader handle */
+);
+
+
+#endif /* IVAS_V3PAIR_FILE_READER_H */
diff --git a/readme.txt b/readme.txt
index 95b9a814eca1d4bb44a4623a087a33f236d9289e..8334fa5bd77667bb7970c617a6043e740a679494 100644
--- a/readme.txt
+++ b/readme.txt
@@ -251,8 +251,19 @@ Options:
Format files, the magic word in the mime file is used to determine
which of the two supported formats is in use.
default bitstream file format is G.192
--T File : Head rotation specified by external trajectory File
-hrtf File : HRTF filter File used in ISm format and BINAURAL output configuration
+-T File : Head rotation specified by external trajectory File
+-otr tracking_type : Head orientation tracking type: 'none', 'ref', 'avg', 'ref_vec'
+ or 'ref_vec_lev' (only for binaural rendering)
+-rf File : Reference rotation specified by external trajectory file
+ works only in combination with '-otr ref' mode
+-rvf File : Reference vector specified by external trajectory file
+ works only in combination with '-otr ref_vec' and 'ref_vec_lev' modes
+-render_config File : Renderer configuration option File
+-no_diegetic_pan : panning mono non-diegetic sound to stereo -1<= pan <=1,
+ left or l or 1->left, right or r or -1->right, center or c or 0->middle
+-q : Quiet mode, no frame counter
+ default is deactivated
-force_subframe_bin : Forces parametric binauralizer code to use 5 ms time resolution even when
output time resolution is larger.
-FEC X : Insert frame erasures, X = 0-10 is the percentage
@@ -261,12 +272,7 @@ Options:
containing FEC pattern (short values of 0 (good) or 1 (bad))
default is OFF, if this option is not used
-force R : Force specific binaural rendering mode, R = (TDREND, CLDFBREND),
--otr tracking_type : head orientation tracking type: 'ref' or 'avg' (only for binaural rendering)
--render_config File : Renderer configuration option File
--no_diegetic_pan : panning mono no dietic sound to stereo -1<= pan <=1,
- left or l or 1->left, right or r or -1->right, center or c or 0->middle
--q : Quiet mode, no frame counter
- default is deactivated
+
MULTICHANNEL LOUDSPEAKER INPUT / OUTPUT CONFIGURATIONS
diff --git a/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c b/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c
index a0e2ddd94ce4f4c69f1fdc3fcb758aa2dd869965..a7d4391c7520be27e06d0127aecac706bc1d8b6d 100644
--- a/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c
+++ b/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c
@@ -1,6 +1,6 @@
/******************************************************************************************************
- (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+ (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/scripts/binauralRenderer_interface/Table_Format_Converter/table_format_converter_readme.txt b/scripts/binauralRenderer_interface/Table_Format_Converter/table_format_converter_readme.txt
index 391ad644e942c007d498b7ac5fa1eb234d9c752b..dda6738a9ae8ea0be8f875ef85b36fa0489b916b 100644
--- a/scripts/binauralRenderer_interface/Table_Format_Converter/table_format_converter_readme.txt
+++ b/scripts/binauralRenderer_interface/Table_Format_Converter/table_format_converter_readme.txt
@@ -1,6 +1,6 @@
/******************************************************************************************************
- (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+ (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c b/scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c
index 0aae3c6cabb404550c52e0fd7df00bb946dfce69..3f847f83cf30ff3f786f47463d308efc833afdbe 100644
--- a/scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c
+++ b/scripts/binauralRenderer_interface/generate_crend_ivas_tables_from_sofa.c
@@ -1,6 +1,6 @@
/******************************************************************************************************
- (C) 2022 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB,
+ (C) 2022-2023 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB,
Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies OY, Orange,
Panasonic Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation. All Rights Reserved.
diff --git a/scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.c b/scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.c
index 456997b5a1202344911e0313c17343458439f17f..7e9658bd8030b2d5a93a4defb7731263423217fe 100644
--- a/scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.c
+++ b/scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.c
@@ -1,6 +1,6 @@
/******************************************************************************************************
- (C) 2022 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB,
+ (C) 2022-2023 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB,
Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies OY, Orange,
Panasonic Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation. All Rights Reserved.
diff --git a/scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.h b/scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.h
index 9b8fdbcde916440319990b039e1a141d21c79cee..28d3c1225023d0343c66d19bf5d5e7c6706619d8 100644
--- a/scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.h
+++ b/scripts/binauralRenderer_interface/ivas_crend_binaural_filter_design.h
@@ -1,6 +1,6 @@
/******************************************************************************************************
- (C) 2022 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB,
+ (C) 2022-2023 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB,
Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies OY, Orange,
Panasonic Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation. All Rights Reserved.
diff --git a/scripts/binauralRenderer_interface/mixer_conv_sofa_to_rom_table_converter_readme.txt b/scripts/binauralRenderer_interface/mixer_conv_sofa_to_rom_table_converter_readme.txt
index ead4b2d4374b4c829aa00a14c948ca19fc775aaa..73314c5cd5188ed690ecc00d4d4b5fd30737db40 100644
--- a/scripts/binauralRenderer_interface/mixer_conv_sofa_to_rom_table_converter_readme.txt
+++ b/scripts/binauralRenderer_interface/mixer_conv_sofa_to_rom_table_converter_readme.txt
@@ -1,6 +1,6 @@
/******************************************************************************************************
- (C) 2022 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
+ (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
diff --git a/scripts/binauralRenderer_interface/resolve_build_dep.py b/scripts/binauralRenderer_interface/resolve_build_dep.py
index 5a1a823033b5bbc9480bbc4d0da0c8e55b2f86a2..a251e7fe327b7b8366562ae31a627411d1b0be3c 100644
--- a/scripts/binauralRenderer_interface/resolve_build_dep.py
+++ b/scripts/binauralRenderer_interface/resolve_build_dep.py
@@ -1,5 +1,5 @@
"""
- (C) 2022 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB,
+ (C) 2022-2023 Baseline Development Group with portions copyright Dolby International AB, Ericsson AB,
Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies OY, Orange,
Panasonic Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation. All Rights Reserved.
diff --git a/scripts/config/ivas_modes.json b/scripts/config/ivas_modes.json
index a2adaa4ccf89ecb49200c245aa23c066ad78401e..0e4ef469d9ec36a97c513394609921375f57d1f9 100644
--- a/scripts/config/ivas_modes.json
+++ b/scripts/config/ivas_modes.json
@@ -1968,6 +1968,68 @@
256000
]
}
+ },
+ "ISM2_b{bitrate}_dtx_{bandwidth}_cbr": {
+ "encmodeoption": [
+ "-dtx",
+ "-ism",
+ "2"
+ ],
+ "encoptions": [
+ "-max_band",
+ "{bandwidth}"
+ ],
+ "dec": {
+ "EXT": []
+ },
+ "in_config": "ISM2",
+ "table_name": "ISM2@{table_bitrate} kbps DTX {bandwidth}",
+ "nummetadata": 2,
+ "metadatafilenames": [
+ "test_ISM_trajectory{mdi}.csv"
+ ],
+ "rs": false,
+ "amr": false,
+ "mono": false,
+ "bitrates": {
+ "wb": [
+ 16400,
+ 24400,
+ 32000,
+ 48000,
+ 64000,
+ 80000,
+ 96000,
+ 128000,
+ 160000,
+ 192000,
+ 256000
+ ],
+ "swb": [
+ 16400,
+ 24400,
+ 32000,
+ 48000,
+ 64000,
+ 80000,
+ 96000,
+ 128000,
+ 160000,
+ 192000,
+ 256000
+ ],
+ "fb": [
+ 32000,
+ 48000,
+ 64000,
+ 80000,
+ 96000,
+ 128000,
+ 160000,
+ 192000,
+ 256000
+ ]
+ }
}
},
"ISM3": {
@@ -2058,14 +2120,41 @@
"bitrates": {
"wb": [
24400,
- 32000
+ 32000,
+ 48000,
+ 64000,
+ 80000,
+ 96000,
+ 128000,
+ 160000,
+ 192000,
+ 256000,
+ 384000
],
"swb": [
24400,
- 32000
+ 32000,
+ 48000,
+ 64000,
+ 80000,
+ 96000,
+ 128000,
+ 160000,
+ 192000,
+ 256000,
+ 384000
],
"fb": [
- 32000
+ 32000,
+ 48000,
+ 64000,
+ 80000,
+ 96000,
+ 128000,
+ 160000,
+ 192000,
+ 256000,
+ 384000
]
}
}
@@ -2161,14 +2250,44 @@
"bitrates": {
"wb": [
24400,
- 32000
+ 32000,
+ 48000,
+ 64000,
+ 80000,
+ 96000,
+ 128000,
+ 160000,
+ 192000,
+ 256000,
+ 384000,
+ 512000
],
"swb": [
24400,
- 32000
+ 32000,
+ 48000,
+ 64000,
+ 80000,
+ 96000,
+ 128000,
+ 160000,
+ 192000,
+ 256000,
+ 384000,
+ 512000
],
"fb": [
- 32000
+ 32000,
+ 48000,
+ 64000,
+ 80000,
+ 96000,
+ 128000,
+ 160000,
+ 192000,
+ 256000,
+ 384000,
+ 512000
]
}
}
diff --git a/scripts/config/self_test.prm b/scripts/config/self_test.prm
index 223ac0352c236eac057b8ac0a6da86eadf3de341..70f0ef6b3661f32bfb97529d154c850ef4d6c320 100644
--- a/scripts/config/self_test.prm
+++ b/scripts/config/self_test.prm
@@ -161,19 +161,19 @@
../IVAS_dec STEREO 48 bit testv/stvST48c.wav_stereo_32000_48-48_bandwidth_sw.tst
// stereo at 32 kbps, 48kHz in, 32kHz out, random FEC at 6%
-../IVAS_cod -stereo -max_band FB 32000 48 testv/stvST48c.wav bit
+../IVAS_cod -stereo 32000 48 testv/stvST48c.wav bit
../IVAS_dec -fec testv/FEC_6pct.bin STEREO 32 bit testv/stvST48c.wav_stereo_32000_48-32_FEC5.tst
// stereo at 32 kbps, 48kHz in, 48kHz out, DTX on, random FEC at 5%
-../IVAS_cod -stereo -dtx -max_band FB 32000 48 testv/stvST48n.wav bit
+../IVAS_cod -stereo -dtx 32000 48 testv/stvST48n.wav bit
../IVAS_dec -fec 5 STEREO 48 bit testv/stvST48n.wav_stereo_32000_48-48_DTX_FEC5.tst
// stereo at 32 kbps, 48kHz in, 48kHz out, DTX on, MONO out, random FEC at 5%
-../IVAS_cod -stereo -dtx -max_band FB 32000 48 testv/stvST48n.wav bit
+../IVAS_cod -stereo -dtx 32000 48 testv/stvST48n.wav bit
../IVAS_dec -fec 5 MONO 48 bit testv/stvST48n.wav_stereo_32000_48-48_DTX_MONO_FEC5.tst
// stereo at 32 kbps, 48kHz in, 16kHz out, DTX on, MONO out, random FEC at 5%
-../IVAS_cod -stereo -dtx -max_band FB 32000 48 testv/stvST48n.wav bit
+../IVAS_cod -stereo -dtx 32000 48 testv/stvST48n.wav bit
../IVAS_dec -fec 5 MONO 16 bit testv/stvST48n.wav_stereo_32000_48-16_DTX_MONO_FEC5.tst
// stereo at 48 kbps, 16kHz in, 16kHz out
@@ -250,154 +250,173 @@
-// 1 ISm with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, MONO out
+// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, MONO out
../IVAS_cod -ism 1 testv/stvISM1.csv 13200 48 testv/stv1ISM48s.wav bit
../IVAS_dec MONO 48 bit testv/stv1ISM48s.wav_13200_48-48_MONO.tst
-// 1 ISm with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out, random FEC at 5%
+// 1 ISM with metadata at 13.2 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out, random FEC at 5%
../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 13200 48 testv/stv48n.wav bit
../IVAS_dec -fec 5 BINAURAL 48 bit testv/stv48n.wav_13200_48-48_DTX_FEC5_BINAURAL.tst
-// 2 ISm with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, STEREO out
+// 2 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, STEREO out
../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 16400 48 testv/stv2ISM48s.wav bit
../IVAS_dec STEREO 48 bit testv/stv2ISM48s.wav_16400_48-48_STEREO.tst
-// 3 ISm with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, 7_1 out
+// 2 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL out
+../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 16400 48 testv/stv2ISM48s.wav bit
+../IVAS_dec BINAURAL 48 bit testv/stv2ISM48s.wav_16400_48-48_binaural.tst
+
+// 1 ISM with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out
+../IVAS_cod -ism 1 testv/stvISM1.csv 16400 48 testv/stv1ISM48s.wav bit
+../IVAS_dec BINAURAL_ROOM 48 bit testv/stv1ISM48s.wav_16400_48-48_binaural_room.tst
+
+// 3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, 7_1 out
../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.wav bit
../IVAS_dec 7_1 48 bit testv/stv3ISM48s.wav_24400_48-48_7_1.tst
-// 3 ISm with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, MONO out, random FEC at 5%
+// 3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, MONO out, random FEC at 5%
../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.wav bit
../IVAS_dec -fec 5 MONO 48 bit testv/stv3ISM48s.wav_24400_48-48_MONO_FEC5.tst
-// 1 ISm with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, MONO out
+// 3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, BINAURAL out
+../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.wav bit
+../IVAS_dec BINAURAL 48 bit testv/stv3ISM48s.wav_24400_48-48_binaural.tst
+
+// 1 ISM with metadata at 32 kbps, 32 kHz in, 32 kHz out, DTX on, MONO out
../IVAS_cod -dtx -ism 1 testv/stvISM1.csv 32000 32 testv/stv32n.wav bit
../IVAS_dec MONO 32 bit testv/stv32n.wav_32000_32-32_DTX_MONO.tst
-// 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, FOA out
+// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, FOA out
../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit
../IVAS_dec FOA 48 bit testv/stv4ISM48s.wav_32000_48-48_FOA.tst
-// 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, STEREO out
+// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, STEREO out
../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit
../IVAS_dec STEREO 48 bit testv/stv4ISM48s.wav_32000_48-48_STEREO.tst
-// 3 ISm with metadata at 48 kbps, 48 kHz in, 48 kHz out, MONO out
-../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 48000 48 testv/stv3ISM48s.wav bit
-../IVAS_dec MONO 48 bit testv/stv43ISM48s_48000_48-48_MONO.tst
-
-// 2 ISm with metadata at 64 kbps, 48 kHz in, 32 kHz out, 5_1 out
-../IVAS_cod -max_band FB -ism 2 testv/stvISM1.csv testv/stvISM2.csv 64000 48 testv/stv2ISM48s.wav bit
-../IVAS_dec 5_1 32 bit testv/stv2ISM48s.wav_64000_48-32_5_1.tst
+// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out
+../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit
+../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_32000_48-48_binaural.tst
-// 4 ISm with metadata at 80 kbps, 48 kHz in, 48 kHz out, HOA2 out
-../IVAS_cod -max_band FB -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 80000 48 testv/stv4ISM48s.wav bit
-../IVAS_dec HOA2 48 bit testv/stv4ISM48s.wav_80000_48-48_HOA2.tst
+// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL out
+../IVAS_cod -dtx -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48n.wav bit
+../IVAS_dec BINAURAL 48 bit testv/stv4ISM48n.wav_32000_48-48_DTX_BINAURAL.tst
-// 4 ISm with metadata at 96 kbps, 48 kHz in, 48 kHz out, Custom LS setup out
-../IVAS_cod -max_band FB -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 96000 48 testv/stv4ISM48s.wav bit
-../IVAS_dec testv/ls_setup_16ch_8+4+4.txt 48 bit testv/stv4ISM48s.wav_96000_48-48_MC_custom_setup.tst
+// 2 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, DTX on, HOA2 out
+../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 32000 48 testv/stvST48c.wav bit
+../IVAS_dec HOA2 48 bit testv/stv2ST48c.wav_32000_48-48_DTX_HOA2.tst
-// 3 ISm with metadata at 128 kbps, 48 kHz in, 32 kHz out, HOA3 out, random FEC at 5%
-../IVAS_cod -max_band FB -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stv3ISM48s.wav bit
-../IVAS_dec -fec 5 HOA3 32 bit testv/stv3ISM48s.wav_128000_48-32_HOA3_FEC5.tst
+// 2 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, EXTERNAL out
+../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 32000 48 testv/stv2ISM48s.wav bit
+../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_32000_48-48_external.tst
-// 4 ISm with metadata at 160 kbps, 48 kHz in, 48 kHz out, STEREO out
-../IVAS_cod -max_band FB -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 160000 48 testv/stv4ISM48s.wav bit
-../IVAS_dec STEREO 48 bit testv/stv4ISM48s.wav_160000_48-48_STEREO.tst
+// 4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, random FEC at 5%
+../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit
+../IVAS_dec -fec 5 BINAURAL_ROOM 48 bit testv/stv4ISM48s.wav_32000_48-48_binaural_room_FEC5.tst
-// 2 ISm with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL out
-../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 16400 48 testv/stv2ISM48s.wav bit
-../IVAS_dec BINAURAL 48 bit testv/stv2ISM48s.wav_16400_48-48_binaural.tst
+// 3 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, MONO out
+../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 48000 48 testv/stv3ISM48s.wav bit
+../IVAS_dec MONO 48 bit testv/stv43ISM48s_48000_48-48_MONO.tst
-// 3 ISm with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, BINAURAL out
-../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.wav bit
-../IVAS_dec BINAURAL 48 bit testv/stv3ISM48s.wav_24400_48-48_binaural.tst
+// 4 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, DTX on, BINAURAL ROOM out, random FEC at 5%
+../IVAS_cod -dtx -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv4ISM48n.wav bit
+../IVAS_dec -fec 5 BINAURAL_ROOM 48 bit testv/stv4ISM48n.wav_48000_48-48_DTX_TD_binaural_room_FEC5.tst
-// 2 ISm with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL out, random FEC at 5%
+// 2 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL out, random FEC at 5%
../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv2ISM48s.wav bit
../IVAS_dec -fec 5 BINAURAL 48 bit testv/stv2ISM48s.wav_48000_48-48_binaural_FEC5.tst
-// 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out
-../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit
-../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_32000_48-48_binaural.tst
-
-// 1 ISm with metadata at 16.4 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out
-../IVAS_cod -ism 1 testv/stvISM1.csv 16400 48 testv/stv1ISM48s.wav bit
-../IVAS_dec BINAURAL_ROOM 48 bit testv/stv1ISM48s.wav_16400_48-48_binaural_room.tst
-
-// 2 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, EXTERNAL out
-../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 32000 48 testv/stv2ISM48s.wav bit
-../IVAS_dec EXT 48 bit testv/stv2ISM48s.wav_32000_48-48_external.tst
+// 1 ISM with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, head rotation, random FEC at 5%
+../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit
+../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM 48 bit testv/stv1ISM48s.wav_64000_48-48_binaural_room_HR.tst
-// 2 ISm with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out
+// 2 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out
../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv2ISM48s.wav bit
../IVAS_dec BINAURAL_ROOM 48 bit testv/stv2ISM48s.wav_64000_48-48_binaural_room.tst
-// 4 ISm with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, random FEC at 5%
-../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48s.wav bit
-../IVAS_dec -fec 5 BINAURAL_ROOM 48 bit testv/stv4ISM48s.wav_32000_48-48_binaural_room_FEC5.tst
+// 2 ISM with metadata at 64 kbps, 48 kHz in, 32 kHz out, 5_1 out
+../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 64000 48 testv/stv2ISM48s.wav bit
+../IVAS_dec 5_1 32 bit testv/stv2ISM48s.wav_64000_48-32_5_1.tst
-// 4 ISm with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out
+// 4 ISM with metadata at 64 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out
../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 64000 48 testv/stv4ISM48s.wav bit
../IVAS_dec BINAURAL_ROOM 48 bit testv/stv4ISM48s.wav_64000_48-48_binaural_room.tst
-// 1 ISm with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL ROOM out, head rotation, random FEC at 5%
-../IVAS_cod -ism 1 testv/stvISM1.csv 48000 48 testv/stv1ISM48s.wav bit
-../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM 48 bit testv/stv1ISM48s.wav_64000_48-48_binaural_room_HR.tst
+// 2 ISM with metadata at 80 kbps, 48 kHz in, 48 kHz out, DTX on, stereo out
+../IVAS_cod -dtx -ism 2 testv/stvISM1.csv testv/stvISM2.csv 80000 48 testv/stvST48c.wav bit
+../IVAS_dec STEREO 48 bit testv/stv2ST48c.wav_80000_48-48_DTX_STEREO.tst
-// 1 ISm with metadata at 96 kbps, 48 kHz in, 16 kHz out, TD BINAURAL out (Model from file)
-../IVAS_cod -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.wav bit
-../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.wav_96000_48-16_TD_binaural.tst
+// 4 ISM with metadata at 80 kbps, 48 kHz in, 48 kHz out, HOA2 out
+../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 80000 48 testv/stv4ISM48s.wav bit
+../IVAS_dec HOA2 48 bit testv/stv4ISM48s.wav_80000_48-48_HOA2.tst
-// 2 ISm with metadata at 160 kbps, 48 kHz in, 32 kHz out, TD BINAURAL out
-../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 160000 48 testv/stv2ISM48s.wav bit
-../IVAS_dec BINAURAL 32 bit testv/stv2ISM48s.wav_160000_48-32_TD_binaural.tst
+// 1 ISM with metadata at 80 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file), head rotation, random FEC at 5%
+../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit
+../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.wav_80000_48-16_binaural_file_TDHR_FEC5.tst
-// 3 ISm with metadata at 192 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out (Model from file)
-../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit
-../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_TD_binaural.tst
+// 4 ISM with metadata at 96 kbps, 48 kHz in, 48 kHz out, Custom LS setup out
+../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 96000 48 testv/stv4ISM48s.wav bit
+../IVAS_dec testv/ls_setup_16ch_8+4+4.txt 48 bit testv/stv4ISM48s.wav_96000_48-48_MC_custom_setup.tst
-// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out
-../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
-../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_TD_binaural.tst
+// 1 ISM with metadata at 96 kbps, 48 kHz in, 16 kHz out, BINAURAL out (Model from file)
+../IVAS_cod -ism 1 testv/stvISM1.csv 96000 48 testv/stv1ISM48s.wav bit
+../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.wav_96000_48-16_binaural.tst
-// 1 ISm with metadata at 80 kbps, 48 kHz in, 16 kHz out, TD BINAURAL out (Model from file), head rotation, random FEC at 5%
-../IVAS_cod -ism 1 testv/stvISM1.csv 80000 48 testv/stv1ISM48s.wav bit
-../IVAS_dec -fec 5 -t testv/headrot_case00_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin BINAURAL 16 bit testv/stv2ISM48s.wav_80000_48-16_TDHR_FEC5.tst
+// 3 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, HOA3 out, random FEC at 5%
+../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 128000 48 testv/stv3ISM48s.wav bit
+../IVAS_dec -fec 5 HOA3 32 bit testv/stv3ISM48s.wav_128000_48-32_HOA3_FEC5.tst
-// 2 ISm with metadata at 128 kbps, 48 kHz in, 32 kHz out, TD BINAURAL out (Model from file), head rotation
+// 2 ISM with metadata at 128 kbps, 48 kHz in, 32 kHz out, BINAURAL out (Model from file), head rotation
../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 128000 48 testv/stv2ISM48s.wav bit
-../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.wav_128000_48-32_TDHR.tst
+../IVAS_dec -t testv/headrot_case01_3000_q.csv -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin BINAURAL 32 bit testv/stv2ISM48s.wav_128000_48-32_binaural_file_TDHR.tst
+
+// 4 ISM with metadata at 160 kbps, 48 kHz in, 48 kHz out, STEREO out
+../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 160000 48 testv/stv4ISM48s.wav bit
+../IVAS_dec STEREO 48 bit testv/stv4ISM48s.wav_160000_48-48_STEREO.tst
-// 3 ISm with metadata at 192 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, random FEC at 5%
+// 2 ISM with metadata at 160 kbps, 48 kHz in, 32 kHz out, BINAURAL out
+../IVAS_cod -ism 2 testv/stvISM1.csv testv/stvISM2.csv 160000 48 testv/stv2ISM48s.wav bit
+../IVAS_dec BINAURAL 32 bit testv/stv2ISM48s.wav_160000_48-32_binaural.tst
+
+// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out (Model from file)
../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit
-../IVAS_dec -fec 5 -t testv/headrot_case02_3000_q.csv BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_TDHR_FEC5.tst
+../IVAS_dec -hrtf ../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_binaural)file.tst
-// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation
+// 3 ISM with metadata at 192 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation, random FEC at 5%
+../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 192000 48 testv/stv3ISM48s.wav bit
+../IVAS_dec -fec 5 -t testv/headrot_case02_3000_q.csv BINAURAL 48 bit testv/stv3ISM48s.wav_192000_48-48_binaural_file_TDHR_FEC5.tst
+
+// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out
../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
-../IVAS_dec -t testv/headrot_case03_3000_q.csv BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_TDHR.tst
+../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_binaural.tst
-// 3 ISm with metadata at 384 kbps, 48 kHz in, 32 kHz out, 7_1_4 out
+// 4 ISM with metadata at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out, head rotation
+../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
+../IVAS_dec -t testv/headrot_case03_3000_q.csv BINAURAL 48 bit testv/stv4ISM48s.wav_256000_48-48_binaural_file_TDHR.tst
+
+// 3 ISM with metadata at 384 kbps, 48 kHz in, 32 kHz out, 7_1_4 out
../IVAS_cod -ism 3 testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 384000 48 testv/stv3ISM48s.wav bit
../IVAS_dec 7_1_4 32 bit testv/stv3ISM48s.wav_384000_48-32_7_1_4.tst
-// 4 ISm with metadata at 512 kbps, 48 kHz in, 48 kHz out, 5_1
+// 4 ISM with metadata at 512 kbps, 48 kHz in, 48 kHz out, 5_1
../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 512000 48 testv/stv4ISM48s.wav bit
../IVAS_dec 5_1 48 bit testv/stv4ISM48s.wav_512000_48-48_5_1.tst
-// 1 ISm with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, mono out, DTX on
+// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, TD BINAURAL out, head rotation, Orientation tracking
+../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 256000 48 testv/stv4ISM48s.wav bit
+../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 48 bit testv/stv4ISM48s.pcm_256000_48-48_TDHR_OtrAvg.tst
+
+// 1 ISM with metadata bitrate switching from 13.2 kbps to 128 kbps, 32 kHz in, 32 kHz out, mono out, DTX on
../IVAS_cod -dtx -ism 1 testv/stvISM1.csv ../scripts/switchPaths/sw_13k2_to_128k_10fr.bin 32 testv/stv32c.wav bit
../IVAS_dec MONO 32 bit testv/stv32c.wav_brate_sw_32-32_mono_dtx.tst
-// 4 ISm with metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out
+// 4 ISM with metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out
../IVAS_cod -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.wav bit
-../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_brate_sw_48-48_BINAURAL.tst
-
-// 4 ISm with metadata at 256 kbps, 48 kHz in, 48 kHz out, DTX on, TD BINAURAL out
-../IVAS_cod -dtx -ism 4 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv 32000 48 testv/stv4ISM48n.wav bit
-../IVAS_dec BINAURAL 48 bit testv/stv4ISM48n.wav_256000_48-48_DTX_TD_binaural.tst
+../IVAS_dec BINAURAL 48 bit testv/stv4ISM48s.wav_brate_sw_48-48_binaural.tst
+// 4 ISm with and without metadata bitrate switching from 24.4 kbps to 256 kbps, 48 kHz in, 48 kHz out, DTX on, HOA3 out
+../IVAS_cod -dtx -ism 4 testv/stvISM1.csv NULL NULL testv/stvISM4.csv ../scripts/switchPaths/sw_24k4_256k.bin 48 testv/stv4ISM48s.wav bit
+../IVAS_dec HOA3 48 bit testv/stv4ISM48s.wav_brate_sw_48-48_DTX_hoa3.tst
// SBA at 13.2 kbps, 32kHz in, 32kHz out, HOA3 out
@@ -432,6 +451,10 @@
../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit
../IVAS_dec -t testv/headrot.csv BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_Binaural_Headrot.tst
+// SBA at 24.4 kbps, 32kHz in, 32kHz out, BINAURAL out, Headrotation, Orientation tracking
+../IVAS_cod -sba 3 24400 32 testv/stv3OA32c.wav bit
+../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL 32 bit testv/stv3OA32c.pcm_SBA_24400_32-32_Binaural_Headrot_OtrAvg.tst
+
// SBA at 24.4 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, random FEC at 5%
../IVAS_cod -sba 3 -dtx 24400 32 testv/stv3OA32c.wav bit
../IVAS_dec -fec 5 BINAURAL 32 bit testv/stv3OA32c.wav_SBA_24400_32-32_DTX_Binaural_FEC5.tst
@@ -476,6 +499,18 @@
../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_BinauralRoom_Headrot.tst
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking
+../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
+../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrAvg.tst
+
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, reference vector tracking
+../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
+../IVAS_dec -t ../scripts/trajectories/full-circle-4s.csv -rvf ../scripts/trajectories/full-circle-4s-Vector3.csv -otr ref_vec BINAURAL_ROOM 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPos.tst
+
+// SBA at 48 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, reference vector tracking in level mode
+../IVAS_cod -sba 3 48000 32 testv/stv3OA32c.wav bit
+../IVAS_dec -t ../scripts/trajectories/full-circle-with-up-and-down-4s.csv -rvf ../scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv -otr ref_vec_lev BINAURAL_ROOM 32 bit testv/stv3OA32c.pcm_SBA_48000_32-32_BinauralRoom_Headrot_OtrRefPosLev.tst
+
// SBA at 48 kbps, 32kHz in, 32kHz out, DTX on, BINAURAL out, random FEC at 5%
../IVAS_cod -sba 3 -dtx 48000 32 testv/stv3OA32c.wav bit
../IVAS_dec -fec 5 BINAURAL 32 bit testv/stv3OA32c.wav_SBA_48000_32-32_DTX_Binaural_FEC5.tst
@@ -493,7 +528,7 @@
../IVAS_dec -fec 5 FOA 32 bit testv/stvFOA32c.wav_SBA_64000_32-32_DTX_FOA.tst
// SBA at 64 kbps, 48kHz in, 48kHz out, 5_1_4 out
-../IVAS_cod -max_band FB -sba 1 64000 48 testv/stvFOA48c.wav bit
+../IVAS_cod -sba 1 64000 48 testv/stvFOA48c.wav bit
../IVAS_dec 5_1_4 48 bit testv/stvFOA48c.wav_SBA_64000_48-48_5_1_4.tst
// SBA at 64 kbps, 48kHz in, 48kHz out, 7_1_4 out
@@ -532,6 +567,10 @@
../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM 32 bit testv/stv3OA32c.wav_SBA_128000_32-32_Binaural_room_Headrot.tst
+// SBA at 128 kbps, 32kHz in, 32kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking
+../IVAS_cod -sba 3 128000 32 testv/stv3OA32c.wav bit
+../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM 32 bit testv/stv3OA32c.pcm_SBA_128000_32-32_Binaural_room_Headrot_OtrAvg.tst
+
// SBA at 192 kbps, 48kHz in, 48kHz out, HOA2 out, random FEC at 5%
../IVAS_cod -sba 3 192000 48 testv/stv3OA48c.wav bit
../IVAS_dec -fec 5 HOA2 48 bit testv/stv3OA48c.wav_SBA_192000_48-48_HOA2_FEC5.tst
@@ -666,6 +705,10 @@
../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit
../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM 48 bit testv/stv1MASA2TC48c.wav_32000_48-48_BinauralRoom_Headrot.tst
+// MASA 1dir 2TC at 32 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, Headrotation, Orientation tracking
+../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 32000 48 testv/stv1MASA2TC48c.wav bit
+../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM 48 bit testv/stv_IVASMASA_1dir2TC.pcm_32000_48-48_BinauralRoom_Headrot_OtrAvg.tst
+
// MASA 1dir 2TC at 48 kbps, 48kHz in, 48kHz out, 7_1_4 out, random FEC at 5%
../IVAS_cod -masa 2 testv/stv1MASA2TC48c.met 48000 48 testv/stv1MASA2TC48c.wav bit
../IVAS_dec -fec 5 7_1_4 48 bit testv/stv1MASA2TC48c.wav_48000_48-48_7_1_4_FEC5.tst
@@ -804,6 +847,10 @@
../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit
../IVAS_dec -t testv/headrot_case00_3000_q.csv BINAURAL_ROOM 48 bit testv/stv51MC48c.wav_MC51_256000_48-48_BinauralRoom_Headrot.tst
+// Multi-channel 5_1 at 256 kbps, 48kHz in, 48kHz out, BINAURAL ROOM out, head rotation, Orientation tracking
+../IVAS_cod -mc 5_1 256000 48 testv/stv51MC48c.wav bit
+../IVAS_dec -t testv/headrot.csv -otr avg BINAURAL_ROOM 48 bit testv/stv51MC48c.pcm_MC51_256000_48-48_BinauralRoom_Headrot_OtrAvg.tst
+
// Multi-channel 5_1 at 384 kbps, 48kHz in, 48kHz out
../IVAS_cod -mc 5_1 384000 48 testv/stv51MC48c.wav bit
../IVAS_dec 5_1 48 bit testv/stv51MC48c.wav_MC51_384000_48-48_5_1.tst
diff --git a/scripts/prepare_instrumentation.sh b/scripts/prepare_instrumentation.sh
index 17179fc57c62800b71b6624616220586be7b2cf1..c748f19aca4745df84b90a3e7132235fdfa36555 100755
--- a/scripts/prepare_instrumentation.sh
+++ b/scripts/prepare_instrumentation.sh
@@ -106,8 +106,8 @@ find $targetdir -name "*.[ch]" -exec sed -i.bak -e "s/\(0x[0-9a-fA-F]*\)UL/\(\(u
"tools/$system/wmc_tool" -m "$targetdir/apps/decoder.c" "$targetdir/lib_dec/*.c" "$targetdir/lib_rend/*.c" >> /dev/null
# automatically enable #define WMOPS in options.h
-sed -i.bak -e "s/\/\*\s*\(#define\s*WMOPS\)\s*\*\//\1/g" $targetdir/lib_com/options.h
-sed -i.bak -e "s/\/\/\s*\(#define\s*WMOPS\)/\1/g" $targetdir/lib_com/options.h
+sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*WMOPS\)[[:space:]]*\*\//\1/g" $targetdir/lib_com/options.h
+sed -i.bak -e "s/\/\/[[:space:]]*\(#define[[:space:]]*WMOPS\)/\1/g" $targetdir/lib_com/options.h
# return to start dir
cd "$currdir"
diff --git a/scripts/testv/stv16c.wav b/scripts/testv/stv16c.wav
index 6923cea4edbcfd591262d5322c6b5344929a1947..d107fe711ddec9aa01c1501903dfa969558aaffb 100644
--- a/scripts/testv/stv16c.wav
+++ b/scripts/testv/stv16c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:787f5198da219f4a449b2269d9f2a7c592abdbc9554a991b8b9656d53aac1884
-size 640108
+oid sha256:61f9eca5dafeb46a6aa29c82a8252ebb4ffd4e7a7255f5a4653d8335e685872e
+size 640046
diff --git a/scripts/testv/stv16n.wav b/scripts/testv/stv16n.wav
index dd94fc0e63a1d83ca165e65ab03dbdb7cc61ebd4..9a9c8798e5c7b9e470280f32b979f3edfe123ced 100644
--- a/scripts/testv/stv16n.wav
+++ b/scripts/testv/stv16n.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:831f2439e3d728595e3583fea053a5f7130e5f09b69832e686b76a69d93bbcee
-size 620908
+oid sha256:7d0ac0846c3046d91843b390fbef3a0180dac92b7d53e4079b3541d43b8af188
+size 620846
diff --git a/scripts/testv/stv1ISM48s.wav b/scripts/testv/stv1ISM48s.wav
index ddcd5d33249f8b72541bfa63b7e7e923cb27f31f..da050755658ef780ac8e884fcd23b58e37f671fa 100644
--- a/scripts/testv/stv1ISM48s.wav
+++ b/scripts/testv/stv1ISM48s.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c6914081054030a4a99ab3556f86ecd817b477a132df8d837a8b11568debd49e
-size 2880106
+oid sha256:dfd1f55af3964c73b423efe64c7400c02ea3c5f289bf347b019350fe3165bcf3
+size 2880044
diff --git a/scripts/testv/stv1MASA1TC48c.wav b/scripts/testv/stv1MASA1TC48c.wav
index 60c2de7967aa02771f0d8ecac019e0650e43eb1f..263f109000e4a141bdbabe41a7c5686421e05e0d 100644
--- a/scripts/testv/stv1MASA1TC48c.wav
+++ b/scripts/testv/stv1MASA1TC48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e9d4810b9aeee2f374c77ab3a0377c478e49e52d9e81b9ec2a01ddd0e8a0f8d4
-size 288106
+oid sha256:2409df48bf501463db0e468aeeee11e5aa866f0adf91ef714a7c6fc506235aa1
+size 288044
diff --git a/scripts/testv/stv1MASA1TC48n.wav b/scripts/testv/stv1MASA1TC48n.wav
index 541ded9f6d29df3f5a40c758c387086b4eef58fa..1b0012d8862fcebcaa5023702456a3320e0b6847 100644
--- a/scripts/testv/stv1MASA1TC48n.wav
+++ b/scripts/testv/stv1MASA1TC48n.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c0a85059ba982f249e77391188a0d030acf6853fe326ab5ade480239ce80f07f
-size 1927786
+oid sha256:81065ed959b13b8c2a4bb1a05ef14095f523912bc3007fdd172cce87a8398046
+size 1927724
diff --git a/scripts/testv/stv1MASA2TC48c.wav b/scripts/testv/stv1MASA2TC48c.wav
index aefec77efe5edf936ac1ce6fc86f6a7dfc11fb92..982e69fb2075ea81e9f9f9a93b1124f1d4e29598 100644
--- a/scripts/testv/stv1MASA2TC48c.wav
+++ b/scripts/testv/stv1MASA2TC48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ab7437cdf41e56338c93f5e593118a112a48bae5138be2cdd301eff5da59bb06
-size 1152106
+oid sha256:1bd8440cbf857f9376d053f780572213964c32a267f325948f3a3a02805dc998
+size 1152044
diff --git a/scripts/testv/stv1MASA2TC48n.wav b/scripts/testv/stv1MASA2TC48n.wav
index d5e9d955b287baa70c797a4a8b31bfc50b4e234c..f25eb2435385831117586582ce019fcdd9850afe 100644
--- a/scripts/testv/stv1MASA2TC48n.wav
+++ b/scripts/testv/stv1MASA2TC48n.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8f745778ed4fa70a704f530049022827696fc4e0dd3389a4076a8658ed514926
+oid sha256:97f1a7a43012ce166b929df59bd756f5d96433ea00ce0a1005380368c01619a0
size 3855404
diff --git a/scripts/testv/stv2ISM48s.wav b/scripts/testv/stv2ISM48s.wav
index a945db6b00ece7928db3590e610d499254fde1c2..02de53114d52e3856a2513423726d595b81d592b 100644
--- a/scripts/testv/stv2ISM48s.wav
+++ b/scripts/testv/stv2ISM48s.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:777052eddbd7cb2ddcf4539a064368efcb6c5155e08ce42fa7a508d98dd5f8c5
-size 5760106
+oid sha256:e042a1a219fcd4f8a82d1d200071139b76c749d97a7b627774431ba961486b2c
+size 5760044
diff --git a/scripts/testv/stv2MASA1TC48c.wav b/scripts/testv/stv2MASA1TC48c.wav
index 43096765fdcd66b3f1d122552d60d8d97eb3657d..afe705b0b1563c87e74387de1aac6e2b25f4c87f 100644
--- a/scripts/testv/stv2MASA1TC48c.wav
+++ b/scripts/testv/stv2MASA1TC48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ccf03f372e4836c9d5ef71d75cf92a00642a13f77464e7c0fcf5f46c961a7f8d
-size 576106
+oid sha256:0d500a55bcc63dda1fd93329bcef272a21eb49731ceb0a60e546ef02e07cdd9b
+size 576044
diff --git a/scripts/testv/stv2MASA2TC48c.wav b/scripts/testv/stv2MASA2TC48c.wav
index 0f72267ea03c634f752c2c755294245cce8222b2..e159c4f9ae1d39c5ad6ed62c7241ac722f4a7ecd 100644
--- a/scripts/testv/stv2MASA2TC48c.wav
+++ b/scripts/testv/stv2MASA2TC48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a5a0379965053087ef1ce4775c85384e8c06aaa8161f12888f5e5c06d8612c1f
-size 576106
+oid sha256:60a713ed1b97cf94b16849806951ef83d8f41c8ee455b267ec0a292c695cbbc1
+size 576044
diff --git a/scripts/testv/stv2OA32c.wav b/scripts/testv/stv2OA32c.wav
index 071c4866e07f15abbdcb90382954d1cc9308ece3..86d288de725bfab0444515c30be3fcc88df23481 100644
--- a/scripts/testv/stv2OA32c.wav
+++ b/scripts/testv/stv2OA32c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d608b108d8e38750d78f1691ed92cac2e92f48a86a4488a3dab9a893cfa6ecf2
-size 11520436
+oid sha256:1824c3afe43861b2ed1e4ff94591932f34bb1885d96796e282d3839906e50aed
+size 11520350
diff --git a/scripts/testv/stv2OA48c.wav b/scripts/testv/stv2OA48c.wav
index 6ba780a84aac6954f24e8315aad5f8bfb562492d..24bb1f0872f8b58fbbfdb7889f8c0bac85702c18 100644
--- a/scripts/testv/stv2OA48c.wav
+++ b/scripts/testv/stv2OA48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ef0935e08a571a9e88f2257e64c45394633252766a0fb91da582eabf5537a49e
-size 17280580
+oid sha256:f573744bd97ad3dcb8e86c39d1770725a34f3c43c37c62c26d670a7f722a880e
+size 17280494
diff --git a/scripts/testv/stv32c.wav b/scripts/testv/stv32c.wav
index 1267f189de477f527ce27efd257058a5214ee046..640532cc122da361f158e8dd49fb85d537396e16 100644
--- a/scripts/testv/stv32c.wav
+++ b/scripts/testv/stv32c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9babeb07a95e9e23068a9c15eea1996a7c366e6000cf8347ce70661631e04ec4
-size 1389700
+oid sha256:00089d67aa513a9f6b2f73526e94d5c32437c6944ec6467072dc27ccaa1f5080
+size 1389542
diff --git a/scripts/testv/stv32n.wav b/scripts/testv/stv32n.wav
index 888bbe819c689d21daf1fd144529059ab4c96ba8..6a23d99d6e6c5cefe68892fd52d9dfb4a6b95eee 100644
--- a/scripts/testv/stv32n.wav
+++ b/scripts/testv/stv32n.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:acbf022e8fbaafb811c14f75f78ec503ef8a1529ce4b04eabbb00c5066635592
-size 1241706
+oid sha256:1a92be333a359a77ec70324815d71282398dede88e59ac19a31f8d18913c0505
+size 1241644
diff --git a/scripts/testv/stv3ISM48s.wav b/scripts/testv/stv3ISM48s.wav
index 12f31ee40a201b9769e32c35686843c92710a395..c52500f6100f39ac9482a3998baad2c881edf516 100644
--- a/scripts/testv/stv3ISM48s.wav
+++ b/scripts/testv/stv3ISM48s.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ac91a0d2d1584c52799d7fb52eaa2741df9c6927f94f9d5293dd214938f18a50
-size 8640130
+oid sha256:2a29dfd720edab2367f86c394d4abc9f641596d50697539be70cdfe178d2a28d
+size 8640044
diff --git a/scripts/testv/stv3OA32c.wav b/scripts/testv/stv3OA32c.wav
index 88c473707d6d533063b6b65b3262f27b47b8b7fd..07cda526741c5c58668bba78c492459a4d6540c6 100644
--- a/scripts/testv/stv3OA32c.wav
+++ b/scripts/testv/stv3OA32c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7376200d96aafc156cd4f9907e0b727e1e04921bfcbdb580ac8ff58fea4a60d6
-size 20480674
+oid sha256:bdd1fd31b318bef4439a35baf2252c8edabb826198c75d705095b68dfa288fb0
+size 20480588
diff --git a/scripts/testv/stv3OA48c.wav b/scripts/testv/stv3OA48c.wav
index 39a208555fb300d06e12275d567bc05a183ed59c..960d9e2019514a022ef216fa2e03241afe369635 100644
--- a/scripts/testv/stv3OA48c.wav
+++ b/scripts/testv/stv3OA48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3d1bf1ccd3a2d59b8fd768df58c49f9abd2b090664745256eec7d23aa0ea8c70
-size 30720930
+oid sha256:7ce54b1708a76f34eeedc40b01e806cb92d32b0813e8ac23bfceaaa8d25262e6
+size 30720844
diff --git a/scripts/testv/stv48c.wav b/scripts/testv/stv48c.wav
index d6df0e8fe29e8edbd19f5c79907465a06a707794..1be5a1dc3ccb7c70c6ec8e0eeedda2b0c52a69e0 100644
--- a/scripts/testv/stv48c.wav
+++ b/scripts/testv/stv48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2a2553784fc796c20b2f7d12e159661e9a480438b0ca71bfaf613757c841a1bb
-size 1920106
+oid sha256:59f39e02d601b453170cde1e49d50e58b58ff5154ba54c75fc5d79f4964d1e48
+size 1920044
diff --git a/scripts/testv/stv48n.wav b/scripts/testv/stv48n.wav
index 040040fadce74aee714972cff67d7efc8640bb06..2d79cee520a69b5c897cd583f459c14d68af3639 100644
--- a/scripts/testv/stv48n.wav
+++ b/scripts/testv/stv48n.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:621ec6a05e4e5064bd2f5699129e81335ac64f257e3dee293b0245ac1adcdb6b
-size 1862506
+oid sha256:3c774e6fe4e22274ef72552901c4b4870d56d825fa67e8e3e59a30cc0a44dbfa
+size 1862444
diff --git a/scripts/testv/stv4ISM48n.wav b/scripts/testv/stv4ISM48n.wav
index 5294260a0f29ceb1a6409a2eca7e1e6d7f79a888..0ca6e5f3f5547632e70e566fe1affa1b4e0cf635 100644
--- a/scripts/testv/stv4ISM48n.wav
+++ b/scripts/testv/stv4ISM48n.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b48c4030982641afcaa0c61182f35d6648e2bea4a952d9430f710989e4e4646c
+oid sha256:74697fcb6241db1bed87121244c09a3499ea4024cdf15d279feafbedbca6123a
size 7680044
diff --git a/scripts/testv/stv4ISM48s.wav b/scripts/testv/stv4ISM48s.wav
index faffedc961b948117bc549a309207af2d4f8ec7d..de034819ea54c26ebecc607ab73eac7d96352d20 100644
--- a/scripts/testv/stv4ISM48s.wav
+++ b/scripts/testv/stv4ISM48s.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:361001b64a7ff11a22267df08ccd261728b9a455c2c4860f84f99ce2dc6dd485
-size 11520130
+oid sha256:70433aebd892f38df31f12f10e71caaa1e794c64abb7d3e75fe895676e63609e
+size 11520044
diff --git a/scripts/testv/stv512MC48c.wav b/scripts/testv/stv512MC48c.wav
index a0c66dc86cdbab889c3d94bccebf7eb65b3af549..e21644a5d9c6945438f7d53a0417f6e1317a63a5 100644
--- a/scripts/testv/stv512MC48c.wav
+++ b/scripts/testv/stv512MC48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0f2bcf911eda4dc1069e113d82f2e72b0849db5fb28ebdd619a59971f16fc909
-size 2304130
+oid sha256:3be0c6dccbf26f8755200683bba42553eb36feed297110e289afcec32e0c8459
+size 2304044
diff --git a/scripts/testv/stv514MC48c.wav b/scripts/testv/stv514MC48c.wav
index 22d0c6e0abd52b94d47ca652cdaca88e15886e27..113cd6219a67255b191e0d0bf6f363efcb062294 100644
--- a/scripts/testv/stv514MC48c.wav
+++ b/scripts/testv/stv514MC48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6ca93376cae09017177a1a49e2d7d006f5bf61c4c94b9e466dedee6e03a45efb
-size 2880130
+oid sha256:d2097dd80fa69f239689b06a62a44eb592bf2fe699e549347ae4567c1b690170
+size 2880044
diff --git a/scripts/testv/stv51MC48c.wav b/scripts/testv/stv51MC48c.wav
index 7c98cc83d33dabb8bb05ee870af3669125be3fc8..e5f4bae7d485cf224add6c166da48e0fc400ca74 100644
--- a/scripts/testv/stv51MC48c.wav
+++ b/scripts/testv/stv51MC48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:377961aefebcea8dd87e5a63af8c17f6b0db588f328cee9ae6db5be95e23cd05
-size 11520130
+oid sha256:daccececb4336a7f2492185767d108dbc5594a7d6e2841d861f43ef44437a377
+size 11520044
diff --git a/scripts/testv/stv714MC48c.wav b/scripts/testv/stv714MC48c.wav
index 53c36268d0be0fe429d552c406b361a330e44a3b..cabcb790b06b55e5fb8a98c3ab190547cec7bbd6 100644
--- a/scripts/testv/stv714MC48c.wav
+++ b/scripts/testv/stv714MC48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6fa104a2015be912ea80d015ddb0a42774edea137bc9427954767efcae5e0b1c
-size 3456130
+oid sha256:da62e19b166089efae2f22e68d76b82d3295d15785a4967465a04bc1c75b0462
+size 3456044
diff --git a/scripts/testv/stv71MC48c.wav b/scripts/testv/stv71MC48c.wav
index 2a0b012ab051c2681cbee56d3165413cd531ae1c..72b3337e598212176d0a9960660a967b881f93c5 100644
--- a/scripts/testv/stv71MC48c.wav
+++ b/scripts/testv/stv71MC48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d0ac38ddb16b2ce9cbca27965c5aedaf1af857a6fdce340bc01322794311e92d
-size 2304130
+oid sha256:3fb15d0c109c41d5e629b2e15a47be72ca8d209919ac39f79a7947e9cd2e5e02
+size 2304044
diff --git a/scripts/testv/stv8c.wav b/scripts/testv/stv8c.wav
index 0ee4ea2b7a21eca9587ac520744daefaf1cc8219..5f3b0ed4d90686d034ada4b69fc99362faa3716c 100644
--- a/scripts/testv/stv8c.wav
+++ b/scripts/testv/stv8c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8659d17c088387b59f3a02e698c5dd32746f541493d68be1883a217f4d1b08cf
-size 320108
+oid sha256:722081dcfaaee1c04254b0bde8436c73748a44f6760067907194a1ba24b199d7
+size 320046
diff --git a/scripts/testv/stv8n.wav b/scripts/testv/stv8n.wav
index 66e042366e675a6bfee4ecf8aa8c9a8dc4d5a0d3..2b35ec4dbacf84c3d7b42fa245578ce3c3ff90c5 100644
--- a/scripts/testv/stv8n.wav
+++ b/scripts/testv/stv8n.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d872103d81dcdf846105cdacdb33fc02cbae02104e2c77ff5ff6d985f409b81f
-size 310508
+oid sha256:223e9f5353c49163803abedf97d557436d025f445fe9de4508c9559ca15b330b
+size 310446
diff --git a/scripts/testv/stvFOA16c.wav b/scripts/testv/stvFOA16c.wav
index 996ada1bcde6b9a70b297f5f35e9eba5569253b5..cb67e8b371d4ba07a8cc5383de21e77720b626a8 100644
--- a/scripts/testv/stvFOA16c.wav
+++ b/scripts/testv/stvFOA16c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:30a766e574f03b20403b873443b837497a685c0c5ac28c5ac51c95ef226385fa
-size 2560202
+oid sha256:6725a5d2647516071033f83f385dc7dfe4ff6719d493b1b682ec0274c1347e93
+size 2560116
diff --git a/scripts/testv/stvFOA32c.wav b/scripts/testv/stvFOA32c.wav
index 3a681bfa80d821f81f59d940a811d4a83eaaf45a..661a97a3dc964ab6b32ee5167adee6383f6548ee 100644
--- a/scripts/testv/stvFOA32c.wav
+++ b/scripts/testv/stvFOA32c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:47176066fc373347564bc28ff56d8d9d52745ab7dd631ce4e051f81dff6908e5
-size 5120266
+oid sha256:273308e57de4c5f3ef2eeed164b0a9f34ba86ab05ca533ee5ee8a76528c01abe
+size 5120180
diff --git a/scripts/testv/stvFOA48c.wav b/scripts/testv/stvFOA48c.wav
index ade8e3343da49e62c31275810e6618310b387d8d..7ece23b0843f684a176a82aa3fa918b4a6ba0373 100644
--- a/scripts/testv/stvFOA48c.wav
+++ b/scripts/testv/stvFOA48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9c5da22f3ab1bd9681fff74a77f8ff543f1565f93a5c573125db8820c267376f
-size 7680330
+oid sha256:45a1dd6c4fe6802e98821657337b453d5dab2fe32089c675637b9d23cfe74c8d
+size 7680244
diff --git a/scripts/testv/stvST16c.wav b/scripts/testv/stvST16c.wav
index e46f2e6f5d5276e4d7e9e551f209b8d7cdf401cf..3fb9ec0b3b9f55a2fe252aa805fe91be2a6b3ae4 100644
--- a/scripts/testv/stvST16c.wav
+++ b/scripts/testv/stvST16c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:350c8b0d4c11d2e994158be287c07fda1eef6fd6f92aaf769a7f8529c88f16d0
-size 1280110
+oid sha256:11a2f5887fe2407df03128634188d8aef6d3f76b52db14a1f834dbb98b7dd52e
+size 1280048
diff --git a/scripts/testv/stvST16n.wav b/scripts/testv/stvST16n.wav
index 63afe4f14b0f2add3a579d355820678332c3f548..74c80dca9338eef9496975640b25d820ef5331cc 100644
--- a/scripts/testv/stvST16n.wav
+++ b/scripts/testv/stvST16n.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:40d28848ee6fc8442738662e5cda78473fb099314aab49440afcfd68286d280d
-size 1241710
+oid sha256:60a8cfa5abf4e052840fea0054fec5331465149747fd7bc7eadab18b62d864f1
+size 1241648
diff --git a/scripts/testv/stvST32c.wav b/scripts/testv/stvST32c.wav
index 876c0e558bcbc2306b0a857dadd41e1b791ab071..68a4a1fa334a85b2a3b6a2802b7fcc5f5b8b39e1 100644
--- a/scripts/testv/stvST32c.wav
+++ b/scripts/testv/stvST32c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:12737393e0bbcdb7b6d9d6dbef79984feac3ff5313daa97a6a8793d3e26099ba
-size 2560106
+oid sha256:1182294e7c3ba44e854219698e6a3c209e24345ab2e5e4296fce38029324f374
+size 2560044
diff --git a/scripts/testv/stvST32n.wav b/scripts/testv/stvST32n.wav
index 6d77c6892d2a23550e5cf611005a8238da921d0c..7da590907d62a9df209f90d5b4b18692f1342f83 100644
--- a/scripts/testv/stvST32n.wav
+++ b/scripts/testv/stvST32n.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3642b2bce81ea794457655886f56bca58fb0b1431ed7ac52f1a27f8388c75eb4
-size 2483306
+oid sha256:a6edbfd26681fa42f377891761ad79f97029a3380bc644e47bff1803c7904ff9
+size 2483244
diff --git a/scripts/testv/stvST48c.wav b/scripts/testv/stvST48c.wav
index 250770d61f51646088de82c9a83b9df8adecedd7..df554e65210845892f2c72bc2da025f5e5cbfb39 100644
--- a/scripts/testv/stvST48c.wav
+++ b/scripts/testv/stvST48c.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:cc028e71c94b43068dcc2c7557277ad1989ee20e7a6d8dd6fd30d70d384d56b3
-size 3840106
+oid sha256:40929eb3eb266ed78c16daa2a9c987745fe8e005a577f2dd81264ffda845c118
+size 3840044
diff --git a/scripts/testv/stvST48n.wav b/scripts/testv/stvST48n.wav
index 8dd24e4ca03022fbb17ff964001c85c7ef547f58..cb2d8c4fc30272c6b440ce906a11693d0f339453 100644
--- a/scripts/testv/stvST48n.wav
+++ b/scripts/testv/stvST48n.wav
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ac4262d08b5e45e8ce8da4456740d1e7224aa25b0e3e3088381cb91436cec31f
-size 3724906
+oid sha256:6074a3a3b88c7868f62c9bcf7df56e4a8fd25ffed059886846220efc4fbc0992
+size 3724844
diff --git a/scripts/trajectories/azi+2-ele+2-every-100-frames-Euler.csv b/scripts/trajectories/azi_plus_2-ele_plus_2-every-100-frames-Euler.csv
similarity index 100%
rename from scripts/trajectories/azi+2-ele+2-every-100-frames-Euler.csv
rename to scripts/trajectories/azi_plus_2-ele_plus_2-every-100-frames-Euler.csv
diff --git a/scripts/trajectories/azi+2-ele+2-every-100-frames.csv b/scripts/trajectories/azi_plus_2-ele_plus_2-every-100-frames.csv
similarity index 100%
rename from scripts/trajectories/azi+2-ele+2-every-100-frames.csv
rename to scripts/trajectories/azi_plus_2-ele_plus_2-every-100-frames.csv
diff --git a/scripts/trajectories/azi_plus_2-ele_plus_2-every-25-rows.csv b/scripts/trajectories/azi_plus_2-ele_plus_2-every-25-rows.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4d8eb8d47b98963cf759f1a0a3f52b592f82ce86
--- /dev/null
+++ b/scripts/trajectories/azi_plus_2-ele_plus_2-every-25-rows.csv
@@ -0,0 +1,3000 @@
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.653281, -0.270598, 0.270598, 0.653281
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.634602, -0.292582, 0.282543, 0.657150
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.615562, -0.314856, 0.293608, 0.660109
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.596200, -0.337381, 0.303779, 0.662147
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.576556, -0.360116, 0.313044, 0.663252
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.556670, -0.383022, 0.321394, 0.663414
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.536584, -0.406058, 0.328819, 0.662626
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.516337, -0.429181, 0.335313, 0.660881
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.495972, -0.452352, 0.340872, 0.658176
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.475528, -0.475528, 0.345492, 0.654508
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.455049, -0.498668, 0.349171, 0.649877
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.434575, -0.521730, 0.351911, 0.644283
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.414147, -0.544673, 0.353715, 0.637730
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.393807, -0.567455, 0.354585, 0.630223
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.373595, -0.590035, 0.354529, 0.621767
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.353553, -0.612372, 0.353553, 0.612372
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.333721, -0.634427, 0.351668, 0.602048
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.314138, -0.656158, 0.348885, 0.590807
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.294843, -0.677527, 0.345217, 0.578662
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.275876, -0.698494, 0.340678, 0.565629
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.257274, -0.719022, 0.335286, 0.551725
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.239074, -0.739074, 0.329057, 0.536969
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.221313, -0.758612, 0.322012, 0.521380
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.204025, -0.777602, 0.314172, 0.504981
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.187247, -0.796008, 0.305559, 0.487794
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.171010, -0.813798, 0.296198, 0.469846
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.155348, -0.830938, 0.286115, 0.451162
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.140291, -0.847398, 0.275336, 0.431771
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.125869, -0.863147, 0.263890, 0.411700
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.112112, -0.878156, 0.251807, 0.390980
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.099046, -0.892399, 0.239118, 0.369644
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.086697, -0.905849, 0.225854, 0.347723
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.075090, -0.918482, 0.212048, 0.325251
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.064248, -0.930274, 0.197736, 0.302264
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.054193, -0.941204, 0.182951, 0.278797
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.044943, -0.951251, 0.167731, 0.254887
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.036519, -0.960398, 0.152112, 0.230571
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.028936, -0.968628, 0.136132, 0.205888
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.022209, -0.975926, 0.119829, 0.180877
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.016352, -0.982278, 0.103242, 0.155578
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.011376, -0.987672, 0.086410, 0.130030
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.007292, -0.992099, 0.069374, 0.104274
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.004106, -0.995551, 0.052175, 0.078352
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.001826, -0.998021, 0.034852, 0.052304
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000457, -0.999505, 0.017446, 0.026173
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000000, -1.000000, 0.000000, 0.000000
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.000457, -0.999505, -0.017446, -0.026173
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.001826, -0.998021, -0.034852, -0.052304
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.004106, -0.995551, -0.052175, -0.078352
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.007292, -0.992099, -0.069374, -0.104274
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.011376, -0.987672, -0.086410, -0.130030
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.016352, -0.982278, -0.103242, -0.155578
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.022209, -0.975926, -0.119829, -0.180877
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.028936, -0.968628, -0.136132, -0.205888
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.036519, -0.960398, -0.152112, -0.230571
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.044943, -0.951251, -0.167731, -0.254887
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.054193, -0.941204, -0.182951, -0.278797
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.064248, -0.930274, -0.197736, -0.302264
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.075090, -0.918482, -0.212048, -0.325251
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.086697, -0.905849, -0.225854, -0.347723
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.099046, -0.892399, -0.239118, -0.369644
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.112112, -0.878156, -0.251807, -0.390980
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.125869, -0.863147, -0.263890, -0.411700
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.140291, -0.847398, -0.275336, -0.431771
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.155348, -0.830938, -0.286115, -0.451162
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.171010, -0.813798, -0.296198, -0.469846
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.187247, -0.796008, -0.305559, -0.487794
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.204025, -0.777602, -0.314172, -0.504981
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.221313, -0.758612, -0.322012, -0.521380
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.239074, -0.739074, -0.329057, -0.536969
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.257274, -0.719022, -0.335286, -0.551725
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.275876, -0.698494, -0.340678, -0.565629
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.294843, -0.677527, -0.345217, -0.578662
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.314138, -0.656158, -0.348885, -0.590807
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.333721, -0.634427, -0.351668, -0.602048
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.353553, -0.612372, -0.353553, -0.612372
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.373595, -0.590035, -0.354529, -0.621767
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.393807, -0.567455, -0.354585, -0.630223
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.414147, -0.544673, -0.353715, -0.637730
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.434575, -0.521730, -0.351911, -0.644283
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.455049, -0.498668, -0.349171, -0.649877
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.475528, -0.475528, -0.345492, -0.654508
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.495972, -0.452352, -0.340872, -0.658176
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.516337, -0.429181, -0.335313, -0.660881
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.536584, -0.406058, -0.328819, -0.662626
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.556670, -0.383022, -0.321394, -0.663414
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.576556, -0.360116, -0.313044, -0.663252
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.596200, -0.337381, -0.303779, -0.662147
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.615562, -0.314856, -0.293608, -0.660109
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.634602, -0.292582, -0.282543, -0.657150
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.653281, -0.270598, -0.270598, -0.653281
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.671562, -0.248943, -0.257788, -0.648519
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.689404, -0.227656, -0.244131, -0.642880
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.706773, -0.206773, -0.229644, -0.636381
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.723630, -0.186331, -0.214349, -0.629042
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.739942, -0.166366, -0.198267, -0.620885
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.755673, -0.146912, -0.181421, -0.611932
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.770791, -0.128003, -0.163837, -0.602208
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.785262, -0.109672, -0.145540, -0.591738
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.799057, -0.091950, -0.126558, -0.580549
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.812144, -0.074867, -0.106921, -0.568669
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.824496, -0.058452, -0.086658, -0.556130
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.836085, -0.042732, -0.065801, -0.542960
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.846886, -0.027734, -0.044383, -0.529193
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.856874, -0.013482, -0.022438, -0.514862
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.866025, -0.000000, -0.000000, -0.500000
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.874320, 0.012691, 0.022895, -0.484643
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.881738, 0.024570, 0.046210, -0.468828
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.888260, 0.035620, 0.069908, -0.452591
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.893870, 0.045822, 0.093950, -0.435970
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.898554, 0.055163, 0.118297, -0.419003
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.902298, 0.063628, 0.142910, -0.401729
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.905091, 0.071205, 0.167749, -0.384188
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.906923, 0.077885, 0.192772, -0.366421
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907786, 0.083659, 0.217940, -0.348466
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.907673, 0.088521, 0.243210, -0.330366
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.906582, 0.092466, 0.268542, -0.312161
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.904508, 0.095492, 0.293893, -0.293893
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.901453, 0.097596, 0.319221, -0.275602
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
+ 0.897415, 0.098780, 0.344485, -0.257330
diff --git a/scripts/trajectories/const000-Vector3.csv b/scripts/trajectories/const000-Vector3.csv
new file mode 100644
index 0000000000000000000000000000000000000000..f47ae12e5defebf51cff611c9887c231cfdb2327
--- /dev/null
+++ b/scripts/trajectories/const000-Vector3.csv
@@ -0,0 +1,4 @@
+0.0, 0.0, 0.0, 1.0, 0.0, 0.0
+0.0, 0.0, 0.0, 1.0, 0.0, 0.0
+0.0, 0.0, 0.0, 1.0, 0.0, 0.0
+0.0, 0.0, 0.0, 1.0, 0.0, 0.0
diff --git a/scripts/trajectories/full-circle-4s-Vector3.csv b/scripts/trajectories/full-circle-4s-Vector3.csv
new file mode 100644
index 0000000000000000000000000000000000000000..38a350523957054744f92fb08c628981a12e0f9a
--- /dev/null
+++ b/scripts/trajectories/full-circle-4s-Vector3.csv
@@ -0,0 +1,200 @@
+0.0000,0.0000,0.0000,0.9995,-0.0314,0.0000
+0.0000,0.0000,0.0000,0.9980,-0.0628,0.0000
+0.0000,0.0000,0.0000,0.9956,-0.0941,0.0000
+0.0000,0.0000,0.0000,0.9921,-0.1253,0.0000
+0.0000,0.0000,0.0000,0.9877,-0.1564,0.0000
+0.0000,0.0000,0.0000,0.9823,-0.1874,0.0000
+0.0000,0.0000,0.0000,0.9759,-0.2181,0.0000
+0.0000,0.0000,0.0000,0.9686,-0.2487,0.0000
+0.0000,0.0000,0.0000,0.9603,-0.2790,0.0000
+0.0000,0.0000,0.0000,0.9511,-0.3090,0.0000
+0.0000,0.0000,0.0000,0.9409,-0.3387,0.0000
+0.0000,0.0000,0.0000,0.9298,-0.3681,0.0000
+0.0000,0.0000,0.0000,0.9178,-0.3971,0.0000
+0.0000,0.0000,0.0000,0.9048,-0.4258,0.0000
+0.0000,0.0000,0.0000,0.8910,-0.4540,0.0000
+0.0000,0.0000,0.0000,0.8763,-0.4818,0.0000
+0.0000,0.0000,0.0000,0.8607,-0.5090,0.0000
+0.0000,0.0000,0.0000,0.8443,-0.5358,0.0000
+0.0000,0.0000,0.0000,0.8271,-0.5621,0.0000
+0.0000,0.0000,0.0000,0.8090,-0.5878,0.0000
+0.0000,0.0000,0.0000,0.7902,-0.6129,0.0000
+0.0000,0.0000,0.0000,0.7705,-0.6374,0.0000
+0.0000,0.0000,0.0000,0.7501,-0.6613,0.0000
+0.0000,0.0000,0.0000,0.7290,-0.6845,0.0000
+0.0000,0.0000,0.0000,0.7071,-0.7071,0.0000
+0.0000,0.0000,0.0000,0.6845,-0.7290,0.0000
+0.0000,0.0000,0.0000,0.6613,-0.7501,0.0000
+0.0000,0.0000,0.0000,0.6374,-0.7705,0.0000
+0.0000,0.0000,0.0000,0.6129,-0.7902,0.0000
+0.0000,0.0000,0.0000,0.5878,-0.8090,0.0000
+0.0000,0.0000,0.0000,0.5621,-0.8271,0.0000
+0.0000,0.0000,0.0000,0.5358,-0.8443,0.0000
+0.0000,0.0000,0.0000,0.5090,-0.8607,0.0000
+0.0000,0.0000,0.0000,0.4818,-0.8763,0.0000
+0.0000,0.0000,0.0000,0.4540,-0.8910,0.0000
+0.0000,0.0000,0.0000,0.4258,-0.9048,0.0000
+0.0000,0.0000,0.0000,0.3971,-0.9178,0.0000
+0.0000,0.0000,0.0000,0.3681,-0.9298,0.0000
+0.0000,0.0000,0.0000,0.3387,-0.9409,0.0000
+0.0000,0.0000,0.0000,0.3090,-0.9511,0.0000
+0.0000,0.0000,0.0000,0.2790,-0.9603,0.0000
+0.0000,0.0000,0.0000,0.2487,-0.9686,0.0000
+0.0000,0.0000,0.0000,0.2181,-0.9759,0.0000
+0.0000,0.0000,0.0000,0.1874,-0.9823,0.0000
+0.0000,0.0000,0.0000,0.1564,-0.9877,0.0000
+0.0000,0.0000,0.0000,0.1253,-0.9921,0.0000
+0.0000,0.0000,0.0000,0.0941,-0.9956,0.0000
+0.0000,0.0000,0.0000,0.0628,-0.9980,0.0000
+0.0000,0.0000,0.0000,0.0314,-0.9995,0.0000
+0.0000,0.0000,0.0000,-0.0000,-1.0000,0.0000
+0.0000,0.0000,0.0000,-0.0314,-0.9995,0.0000
+0.0000,0.0000,0.0000,-0.0628,-0.9980,0.0000
+0.0000,0.0000,0.0000,-0.0941,-0.9956,0.0000
+0.0000,0.0000,0.0000,-0.1253,-0.9921,0.0000
+0.0000,0.0000,0.0000,-0.1564,-0.9877,0.0000
+0.0000,0.0000,0.0000,-0.1874,-0.9823,0.0000
+0.0000,0.0000,0.0000,-0.2181,-0.9759,0.0000
+0.0000,0.0000,0.0000,-0.2487,-0.9686,0.0000
+0.0000,0.0000,0.0000,-0.2790,-0.9603,0.0000
+0.0000,0.0000,0.0000,-0.3090,-0.9511,0.0000
+0.0000,0.0000,0.0000,-0.3387,-0.9409,0.0000
+0.0000,0.0000,0.0000,-0.3681,-0.9298,0.0000
+0.0000,0.0000,0.0000,-0.3971,-0.9178,0.0000
+0.0000,0.0000,0.0000,-0.4258,-0.9048,0.0000
+0.0000,0.0000,0.0000,-0.4540,-0.8910,0.0000
+0.0000,0.0000,0.0000,-0.4818,-0.8763,0.0000
+0.0000,0.0000,0.0000,-0.5090,-0.8607,0.0000
+0.0000,0.0000,0.0000,-0.5358,-0.8443,0.0000
+0.0000,0.0000,0.0000,-0.5621,-0.8271,0.0000
+0.0000,0.0000,0.0000,-0.5878,-0.8090,0.0000
+0.0000,0.0000,0.0000,-0.6129,-0.7902,0.0000
+0.0000,0.0000,0.0000,-0.6374,-0.7705,0.0000
+0.0000,0.0000,0.0000,-0.6613,-0.7501,0.0000
+0.0000,0.0000,0.0000,-0.6845,-0.7290,0.0000
+0.0000,0.0000,0.0000,-0.7071,-0.7071,0.0000
+0.0000,0.0000,0.0000,-0.7290,-0.6845,0.0000
+0.0000,0.0000,0.0000,-0.7501,-0.6613,0.0000
+0.0000,0.0000,0.0000,-0.7705,-0.6374,0.0000
+0.0000,0.0000,0.0000,-0.7902,-0.6129,0.0000
+0.0000,0.0000,0.0000,-0.8090,-0.5878,0.0000
+0.0000,0.0000,0.0000,-0.8271,-0.5621,0.0000
+0.0000,0.0000,0.0000,-0.8443,-0.5358,0.0000
+0.0000,0.0000,0.0000,-0.8607,-0.5090,0.0000
+0.0000,0.0000,0.0000,-0.8763,-0.4818,0.0000
+0.0000,0.0000,0.0000,-0.8910,-0.4540,0.0000
+0.0000,0.0000,0.0000,-0.9048,-0.4258,0.0000
+0.0000,0.0000,0.0000,-0.9178,-0.3971,0.0000
+0.0000,0.0000,0.0000,-0.9298,-0.3681,0.0000
+0.0000,0.0000,0.0000,-0.9409,-0.3387,0.0000
+0.0000,0.0000,0.0000,-0.9511,-0.3090,0.0000
+0.0000,0.0000,0.0000,-0.9603,-0.2790,0.0000
+0.0000,0.0000,0.0000,-0.9686,-0.2487,0.0000
+0.0000,0.0000,0.0000,-0.9759,-0.2181,0.0000
+0.0000,0.0000,0.0000,-0.9823,-0.1874,0.0000
+0.0000,0.0000,0.0000,-0.9877,-0.1564,0.0000
+0.0000,0.0000,0.0000,-0.9921,-0.1253,0.0000
+0.0000,0.0000,0.0000,-0.9956,-0.0941,0.0000
+0.0000,0.0000,0.0000,-0.9980,-0.0628,0.0000
+0.0000,0.0000,0.0000,-0.9995,-0.0314,0.0000
+0.0000,0.0000,0.0000,-1.0000,0.0000,0.0000
+0.0000,0.0000,0.0000,-0.9995,0.0314,0.0000
+0.0000,0.0000,0.0000,-0.9980,0.0628,0.0000
+0.0000,0.0000,0.0000,-0.9956,0.0941,0.0000
+0.0000,0.0000,0.0000,-0.9921,0.1253,0.0000
+0.0000,0.0000,0.0000,-0.9877,0.1564,0.0000
+0.0000,0.0000,0.0000,-0.9823,0.1874,0.0000
+0.0000,0.0000,0.0000,-0.9759,0.2181,0.0000
+0.0000,0.0000,0.0000,-0.9686,0.2487,0.0000
+0.0000,0.0000,0.0000,-0.9603,0.2790,0.0000
+0.0000,0.0000,0.0000,-0.9511,0.3090,0.0000
+0.0000,0.0000,0.0000,-0.9409,0.3387,0.0000
+0.0000,0.0000,0.0000,-0.9298,0.3681,0.0000
+0.0000,0.0000,0.0000,-0.9178,0.3971,0.0000
+0.0000,0.0000,0.0000,-0.9048,0.4258,0.0000
+0.0000,0.0000,0.0000,-0.8910,0.4540,0.0000
+0.0000,0.0000,0.0000,-0.8763,0.4818,0.0000
+0.0000,0.0000,0.0000,-0.8607,0.5090,0.0000
+0.0000,0.0000,0.0000,-0.8443,0.5358,0.0000
+0.0000,0.0000,0.0000,-0.8271,0.5621,0.0000
+0.0000,0.0000,0.0000,-0.8090,0.5878,0.0000
+0.0000,0.0000,0.0000,-0.7902,0.6129,0.0000
+0.0000,0.0000,0.0000,-0.7705,0.6374,0.0000
+0.0000,0.0000,0.0000,-0.7501,0.6613,0.0000
+0.0000,0.0000,0.0000,-0.7290,0.6845,0.0000
+0.0000,0.0000,0.0000,-0.7071,0.7071,0.0000
+0.0000,0.0000,0.0000,-0.6845,0.7290,0.0000
+0.0000,0.0000,0.0000,-0.6613,0.7501,0.0000
+0.0000,0.0000,0.0000,-0.6374,0.7705,0.0000
+0.0000,0.0000,0.0000,-0.6129,0.7902,0.0000
+0.0000,0.0000,0.0000,-0.5878,0.8090,0.0000
+0.0000,0.0000,0.0000,-0.5621,0.8271,0.0000
+0.0000,0.0000,0.0000,-0.5358,0.8443,0.0000
+0.0000,0.0000,0.0000,-0.5090,0.8607,0.0000
+0.0000,0.0000,0.0000,-0.4818,0.8763,0.0000
+0.0000,0.0000,0.0000,-0.4540,0.8910,0.0000
+0.0000,0.0000,0.0000,-0.4258,0.9048,0.0000
+0.0000,0.0000,0.0000,-0.3971,0.9178,0.0000
+0.0000,0.0000,0.0000,-0.3681,0.9298,0.0000
+0.0000,0.0000,0.0000,-0.3387,0.9409,0.0000
+0.0000,0.0000,0.0000,-0.3090,0.9511,0.0000
+0.0000,0.0000,0.0000,-0.2790,0.9603,0.0000
+0.0000,0.0000,0.0000,-0.2487,0.9686,0.0000
+0.0000,0.0000,0.0000,-0.2181,0.9759,0.0000
+0.0000,0.0000,0.0000,-0.1874,0.9823,0.0000
+0.0000,0.0000,0.0000,-0.1564,0.9877,0.0000
+0.0000,0.0000,0.0000,-0.1253,0.9921,0.0000
+0.0000,0.0000,0.0000,-0.0941,0.9956,0.0000
+0.0000,0.0000,0.0000,-0.0628,0.9980,0.0000
+0.0000,0.0000,0.0000,-0.0314,0.9995,0.0000
+0.0000,0.0000,0.0000,0.0000,1.0000,0.0000
+0.0000,0.0000,0.0000,0.0314,0.9995,0.0000
+0.0000,0.0000,0.0000,0.0628,0.9980,0.0000
+0.0000,0.0000,0.0000,0.0941,0.9956,0.0000
+0.0000,0.0000,0.0000,0.1253,0.9921,0.0000
+0.0000,0.0000,0.0000,0.1564,0.9877,0.0000
+0.0000,0.0000,0.0000,0.1874,0.9823,0.0000
+0.0000,0.0000,0.0000,0.2181,0.9759,0.0000
+0.0000,0.0000,0.0000,0.2487,0.9686,0.0000
+0.0000,0.0000,0.0000,0.2790,0.9603,0.0000
+0.0000,0.0000,0.0000,0.3090,0.9511,0.0000
+0.0000,0.0000,0.0000,0.3387,0.9409,0.0000
+0.0000,0.0000,0.0000,0.3681,0.9298,0.0000
+0.0000,0.0000,0.0000,0.3971,0.9178,0.0000
+0.0000,0.0000,0.0000,0.4258,0.9048,0.0000
+0.0000,0.0000,0.0000,0.4540,0.8910,0.0000
+0.0000,0.0000,0.0000,0.4818,0.8763,0.0000
+0.0000,0.0000,0.0000,0.5090,0.8607,0.0000
+0.0000,0.0000,0.0000,0.5358,0.8443,0.0000
+0.0000,0.0000,0.0000,0.5621,0.8271,0.0000
+0.0000,0.0000,0.0000,0.5878,0.8090,0.0000
+0.0000,0.0000,0.0000,0.6129,0.7902,0.0000
+0.0000,0.0000,0.0000,0.6374,0.7705,0.0000
+0.0000,0.0000,0.0000,0.6613,0.7501,0.0000
+0.0000,0.0000,0.0000,0.6845,0.7290,0.0000
+0.0000,0.0000,0.0000,0.7071,0.7071,0.0000
+0.0000,0.0000,0.0000,0.7290,0.6845,0.0000
+0.0000,0.0000,0.0000,0.7501,0.6613,0.0000
+0.0000,0.0000,0.0000,0.7705,0.6374,0.0000
+0.0000,0.0000,0.0000,0.7902,0.6129,0.0000
+0.0000,0.0000,0.0000,0.8090,0.5878,0.0000
+0.0000,0.0000,0.0000,0.8271,0.5621,0.0000
+0.0000,0.0000,0.0000,0.8443,0.5358,0.0000
+0.0000,0.0000,0.0000,0.8607,0.5090,0.0000
+0.0000,0.0000,0.0000,0.8763,0.4818,0.0000
+0.0000,0.0000,0.0000,0.8910,0.4540,0.0000
+0.0000,0.0000,0.0000,0.9048,0.4258,0.0000
+0.0000,0.0000,0.0000,0.9178,0.3971,0.0000
+0.0000,0.0000,0.0000,0.9298,0.3681,0.0000
+0.0000,0.0000,0.0000,0.9409,0.3387,0.0000
+0.0000,0.0000,0.0000,0.9511,0.3090,0.0000
+0.0000,0.0000,0.0000,0.9603,0.2790,0.0000
+0.0000,0.0000,0.0000,0.9686,0.2487,0.0000
+0.0000,0.0000,0.0000,0.9759,0.2181,0.0000
+0.0000,0.0000,0.0000,0.9823,0.1874,0.0000
+0.0000,0.0000,0.0000,0.9877,0.1564,0.0000
+0.0000,0.0000,0.0000,0.9921,0.1253,0.0000
+0.0000,0.0000,0.0000,0.9956,0.0941,0.0000
+0.0000,0.0000,0.0000,0.9980,0.0628,0.0000
+0.0000,0.0000,0.0000,0.9995,0.0314,0.0000
+0.0000,0.0000,0.0000,1.0000,-0.0000,0.0000
diff --git a/scripts/trajectories/full-circle-4s-ccw-Vector3.csv b/scripts/trajectories/full-circle-4s-ccw-Vector3.csv
new file mode 100644
index 0000000000000000000000000000000000000000..37b2904ea4199014bf5647fa0196bf3975b13d55
--- /dev/null
+++ b/scripts/trajectories/full-circle-4s-ccw-Vector3.csv
@@ -0,0 +1,200 @@
+0.0000,0.0000,0.0000,0.9995,0.0314,0.0000
+0.0000,0.0000,0.0000,0.9980,0.0628,0.0000
+0.0000,0.0000,0.0000,0.9956,0.0941,0.0000
+0.0000,0.0000,0.0000,0.9921,0.1253,0.0000
+0.0000,0.0000,0.0000,0.9877,0.1564,0.0000
+0.0000,0.0000,0.0000,0.9823,0.1874,0.0000
+0.0000,0.0000,0.0000,0.9759,0.2181,0.0000
+0.0000,0.0000,0.0000,0.9686,0.2487,0.0000
+0.0000,0.0000,0.0000,0.9603,0.2790,0.0000
+0.0000,0.0000,0.0000,0.9511,0.3090,0.0000
+0.0000,0.0000,0.0000,0.9409,0.3387,0.0000
+0.0000,0.0000,0.0000,0.9298,0.3681,0.0000
+0.0000,0.0000,0.0000,0.9178,0.3971,0.0000
+0.0000,0.0000,0.0000,0.9048,0.4258,0.0000
+0.0000,0.0000,0.0000,0.8910,0.4540,0.0000
+0.0000,0.0000,0.0000,0.8763,0.4818,0.0000
+0.0000,0.0000,0.0000,0.8607,0.5090,0.0000
+0.0000,0.0000,0.0000,0.8443,0.5358,0.0000
+0.0000,0.0000,0.0000,0.8271,0.5621,0.0000
+0.0000,0.0000,0.0000,0.8090,0.5878,0.0000
+0.0000,0.0000,0.0000,0.7902,0.6129,0.0000
+0.0000,0.0000,0.0000,0.7705,0.6374,0.0000
+0.0000,0.0000,0.0000,0.7501,0.6613,0.0000
+0.0000,0.0000,0.0000,0.7290,0.6845,0.0000
+0.0000,0.0000,0.0000,0.7071,0.7071,0.0000
+0.0000,0.0000,0.0000,0.6845,0.7290,0.0000
+0.0000,0.0000,0.0000,0.6613,0.7501,0.0000
+0.0000,0.0000,0.0000,0.6374,0.7705,0.0000
+0.0000,0.0000,0.0000,0.6129,0.7902,0.0000
+0.0000,0.0000,0.0000,0.5878,0.8090,0.0000
+0.0000,0.0000,0.0000,0.5621,0.8271,0.0000
+0.0000,0.0000,0.0000,0.5358,0.8443,0.0000
+0.0000,0.0000,0.0000,0.5090,0.8607,0.0000
+0.0000,0.0000,0.0000,0.4818,0.8763,0.0000
+0.0000,0.0000,0.0000,0.4540,0.8910,0.0000
+0.0000,0.0000,0.0000,0.4258,0.9048,0.0000
+0.0000,0.0000,0.0000,0.3971,0.9178,0.0000
+0.0000,0.0000,0.0000,0.3681,0.9298,0.0000
+0.0000,0.0000,0.0000,0.3387,0.9409,0.0000
+0.0000,0.0000,0.0000,0.3090,0.9511,0.0000
+0.0000,0.0000,0.0000,0.2790,0.9603,0.0000
+0.0000,0.0000,0.0000,0.2487,0.9686,0.0000
+0.0000,0.0000,0.0000,0.2181,0.9759,0.0000
+0.0000,0.0000,0.0000,0.1874,0.9823,0.0000
+0.0000,0.0000,0.0000,0.1564,0.9877,0.0000
+0.0000,0.0000,0.0000,0.1253,0.9921,0.0000
+0.0000,0.0000,0.0000,0.0941,0.9956,0.0000
+0.0000,0.0000,0.0000,0.0628,0.9980,0.0000
+0.0000,0.0000,0.0000,0.0314,0.9995,0.0000
+0.0000,0.0000,0.0000,-0.0000,1.0000,0.0000
+0.0000,0.0000,0.0000,-0.0314,0.9995,0.0000
+0.0000,0.0000,0.0000,-0.0628,0.9980,0.0000
+0.0000,0.0000,0.0000,-0.0941,0.9956,0.0000
+0.0000,0.0000,0.0000,-0.1253,0.9921,0.0000
+0.0000,0.0000,0.0000,-0.1564,0.9877,0.0000
+0.0000,0.0000,0.0000,-0.1874,0.9823,0.0000
+0.0000,0.0000,0.0000,-0.2181,0.9759,0.0000
+0.0000,0.0000,0.0000,-0.2487,0.9686,0.0000
+0.0000,0.0000,0.0000,-0.2790,0.9603,0.0000
+0.0000,0.0000,0.0000,-0.3090,0.9511,0.0000
+0.0000,0.0000,0.0000,-0.3387,0.9409,0.0000
+0.0000,0.0000,0.0000,-0.3681,0.9298,0.0000
+0.0000,0.0000,0.0000,-0.3971,0.9178,0.0000
+0.0000,0.0000,0.0000,-0.4258,0.9048,0.0000
+0.0000,0.0000,0.0000,-0.4540,0.8910,0.0000
+0.0000,0.0000,0.0000,-0.4818,0.8763,0.0000
+0.0000,0.0000,0.0000,-0.5090,0.8607,0.0000
+0.0000,0.0000,0.0000,-0.5358,0.8443,0.0000
+0.0000,0.0000,0.0000,-0.5621,0.8271,0.0000
+0.0000,0.0000,0.0000,-0.5878,0.8090,0.0000
+0.0000,0.0000,0.0000,-0.6129,0.7902,0.0000
+0.0000,0.0000,0.0000,-0.6374,0.7705,0.0000
+0.0000,0.0000,0.0000,-0.6613,0.7501,0.0000
+0.0000,0.0000,0.0000,-0.6845,0.7290,0.0000
+0.0000,0.0000,0.0000,-0.7071,0.7071,0.0000
+0.0000,0.0000,0.0000,-0.7290,0.6845,0.0000
+0.0000,0.0000,0.0000,-0.7501,0.6613,0.0000
+0.0000,0.0000,0.0000,-0.7705,0.6374,0.0000
+0.0000,0.0000,0.0000,-0.7902,0.6129,0.0000
+0.0000,0.0000,0.0000,-0.8090,0.5878,0.0000
+0.0000,0.0000,0.0000,-0.8271,0.5621,0.0000
+0.0000,0.0000,0.0000,-0.8443,0.5358,0.0000
+0.0000,0.0000,0.0000,-0.8607,0.5090,0.0000
+0.0000,0.0000,0.0000,-0.8763,0.4818,0.0000
+0.0000,0.0000,0.0000,-0.8910,0.4540,0.0000
+0.0000,0.0000,0.0000,-0.9048,0.4258,0.0000
+0.0000,0.0000,0.0000,-0.9178,0.3971,0.0000
+0.0000,0.0000,0.0000,-0.9298,0.3681,0.0000
+0.0000,0.0000,0.0000,-0.9409,0.3387,0.0000
+0.0000,0.0000,0.0000,-0.9511,0.3090,0.0000
+0.0000,0.0000,0.0000,-0.9603,0.2790,0.0000
+0.0000,0.0000,0.0000,-0.9686,0.2487,0.0000
+0.0000,0.0000,0.0000,-0.9759,0.2181,0.0000
+0.0000,0.0000,0.0000,-0.9823,0.1874,0.0000
+0.0000,0.0000,0.0000,-0.9877,0.1564,0.0000
+0.0000,0.0000,0.0000,-0.9921,0.1253,0.0000
+0.0000,0.0000,0.0000,-0.9956,0.0941,0.0000
+0.0000,0.0000,0.0000,-0.9980,0.0628,0.0000
+0.0000,0.0000,0.0000,-0.9995,0.0314,0.0000
+0.0000,0.0000,0.0000,-1.0000,-0.0000,0.0000
+0.0000,0.0000,0.0000,-0.9995,-0.0314,0.0000
+0.0000,0.0000,0.0000,-0.9980,-0.0628,0.0000
+0.0000,0.0000,0.0000,-0.9956,-0.0941,0.0000
+0.0000,0.0000,0.0000,-0.9921,-0.1253,0.0000
+0.0000,0.0000,0.0000,-0.9877,-0.1564,0.0000
+0.0000,0.0000,0.0000,-0.9823,-0.1874,0.0000
+0.0000,0.0000,0.0000,-0.9759,-0.2181,0.0000
+0.0000,0.0000,0.0000,-0.9686,-0.2487,0.0000
+0.0000,0.0000,0.0000,-0.9603,-0.2790,0.0000
+0.0000,0.0000,0.0000,-0.9511,-0.3090,0.0000
+0.0000,0.0000,0.0000,-0.9409,-0.3387,0.0000
+0.0000,0.0000,0.0000,-0.9298,-0.3681,0.0000
+0.0000,0.0000,0.0000,-0.9178,-0.3971,0.0000
+0.0000,0.0000,0.0000,-0.9048,-0.4258,0.0000
+0.0000,0.0000,0.0000,-0.8910,-0.4540,0.0000
+0.0000,0.0000,0.0000,-0.8763,-0.4818,0.0000
+0.0000,0.0000,0.0000,-0.8607,-0.5090,0.0000
+0.0000,0.0000,0.0000,-0.8443,-0.5358,0.0000
+0.0000,0.0000,0.0000,-0.8271,-0.5621,0.0000
+0.0000,0.0000,0.0000,-0.8090,-0.5878,0.0000
+0.0000,0.0000,0.0000,-0.7902,-0.6129,0.0000
+0.0000,0.0000,0.0000,-0.7705,-0.6374,0.0000
+0.0000,0.0000,0.0000,-0.7501,-0.6613,0.0000
+0.0000,0.0000,0.0000,-0.7290,-0.6845,0.0000
+0.0000,0.0000,0.0000,-0.7071,-0.7071,0.0000
+0.0000,0.0000,0.0000,-0.6845,-0.7290,0.0000
+0.0000,0.0000,0.0000,-0.6613,-0.7501,0.0000
+0.0000,0.0000,0.0000,-0.6374,-0.7705,0.0000
+0.0000,0.0000,0.0000,-0.6129,-0.7902,0.0000
+0.0000,0.0000,0.0000,-0.5878,-0.8090,0.0000
+0.0000,0.0000,0.0000,-0.5621,-0.8271,0.0000
+0.0000,0.0000,0.0000,-0.5358,-0.8443,0.0000
+0.0000,0.0000,0.0000,-0.5090,-0.8607,0.0000
+0.0000,0.0000,0.0000,-0.4818,-0.8763,0.0000
+0.0000,0.0000,0.0000,-0.4540,-0.8910,0.0000
+0.0000,0.0000,0.0000,-0.4258,-0.9048,0.0000
+0.0000,0.0000,0.0000,-0.3971,-0.9178,0.0000
+0.0000,0.0000,0.0000,-0.3681,-0.9298,0.0000
+0.0000,0.0000,0.0000,-0.3387,-0.9409,0.0000
+0.0000,0.0000,0.0000,-0.3090,-0.9511,0.0000
+0.0000,0.0000,0.0000,-0.2790,-0.9603,0.0000
+0.0000,0.0000,0.0000,-0.2487,-0.9686,0.0000
+0.0000,0.0000,0.0000,-0.2181,-0.9759,0.0000
+0.0000,0.0000,0.0000,-0.1874,-0.9823,0.0000
+0.0000,0.0000,0.0000,-0.1564,-0.9877,0.0000
+0.0000,0.0000,0.0000,-0.1253,-0.9921,0.0000
+0.0000,0.0000,0.0000,-0.0941,-0.9956,0.0000
+0.0000,0.0000,0.0000,-0.0628,-0.9980,0.0000
+0.0000,0.0000,0.0000,-0.0314,-0.9995,0.0000
+0.0000,0.0000,0.0000,0.0000,-1.0000,0.0000
+0.0000,0.0000,0.0000,0.0314,-0.9995,0.0000
+0.0000,0.0000,0.0000,0.0628,-0.9980,0.0000
+0.0000,0.0000,0.0000,0.0941,-0.9956,0.0000
+0.0000,0.0000,0.0000,0.1253,-0.9921,0.0000
+0.0000,0.0000,0.0000,0.1564,-0.9877,0.0000
+0.0000,0.0000,0.0000,0.1874,-0.9823,0.0000
+0.0000,0.0000,0.0000,0.2181,-0.9759,0.0000
+0.0000,0.0000,0.0000,0.2487,-0.9686,0.0000
+0.0000,0.0000,0.0000,0.2790,-0.9603,0.0000
+0.0000,0.0000,0.0000,0.3090,-0.9511,0.0000
+0.0000,0.0000,0.0000,0.3387,-0.9409,0.0000
+0.0000,0.0000,0.0000,0.3681,-0.9298,0.0000
+0.0000,0.0000,0.0000,0.3971,-0.9178,0.0000
+0.0000,0.0000,0.0000,0.4258,-0.9048,0.0000
+0.0000,0.0000,0.0000,0.4540,-0.8910,0.0000
+0.0000,0.0000,0.0000,0.4818,-0.8763,0.0000
+0.0000,0.0000,0.0000,0.5090,-0.8607,0.0000
+0.0000,0.0000,0.0000,0.5358,-0.8443,0.0000
+0.0000,0.0000,0.0000,0.5621,-0.8271,0.0000
+0.0000,0.0000,0.0000,0.5878,-0.8090,0.0000
+0.0000,0.0000,0.0000,0.6129,-0.7902,0.0000
+0.0000,0.0000,0.0000,0.6374,-0.7705,0.0000
+0.0000,0.0000,0.0000,0.6613,-0.7501,0.0000
+0.0000,0.0000,0.0000,0.6845,-0.7290,0.0000
+0.0000,0.0000,0.0000,0.7071,-0.7071,0.0000
+0.0000,0.0000,0.0000,0.7290,-0.6845,0.0000
+0.0000,0.0000,0.0000,0.7501,-0.6613,0.0000
+0.0000,0.0000,0.0000,0.7705,-0.6374,0.0000
+0.0000,0.0000,0.0000,0.7902,-0.6129,0.0000
+0.0000,0.0000,0.0000,0.8090,-0.5878,0.0000
+0.0000,0.0000,0.0000,0.8271,-0.5621,0.0000
+0.0000,0.0000,0.0000,0.8443,-0.5358,0.0000
+0.0000,0.0000,0.0000,0.8607,-0.5090,0.0000
+0.0000,0.0000,0.0000,0.8763,-0.4818,0.0000
+0.0000,0.0000,0.0000,0.8910,-0.4540,0.0000
+0.0000,0.0000,0.0000,0.9048,-0.4258,0.0000
+0.0000,0.0000,0.0000,0.9178,-0.3971,0.0000
+0.0000,0.0000,0.0000,0.9298,-0.3681,0.0000
+0.0000,0.0000,0.0000,0.9409,-0.3387,0.0000
+0.0000,0.0000,0.0000,0.9511,-0.3090,0.0000
+0.0000,0.0000,0.0000,0.9603,-0.2790,0.0000
+0.0000,0.0000,0.0000,0.9686,-0.2487,0.0000
+0.0000,0.0000,0.0000,0.9759,-0.2181,0.0000
+0.0000,0.0000,0.0000,0.9823,-0.1874,0.0000
+0.0000,0.0000,0.0000,0.9877,-0.1564,0.0000
+0.0000,0.0000,0.0000,0.9921,-0.1253,0.0000
+0.0000,0.0000,0.0000,0.9956,-0.0941,0.0000
+0.0000,0.0000,0.0000,0.9980,-0.0628,0.0000
+0.0000,0.0000,0.0000,0.9995,-0.0314,0.0000
+0.0000,0.0000,0.0000,1.0000,0.0000,0.0000
diff --git a/scripts/trajectories/full-circle-4s-ccw.csv b/scripts/trajectories/full-circle-4s-ccw.csv
new file mode 100644
index 0000000000000000000000000000000000000000..13eeae28e126750542c3fc6583d05e4a30575f42
--- /dev/null
+++ b/scripts/trajectories/full-circle-4s-ccw.csv
@@ -0,0 +1,800 @@
+0.9999,0.0000,0.0000,0.0157
+0.9999,0.0000,0.0000,0.0157
+0.9999,0.0000,0.0000,0.0157
+0.9999,0.0000,0.0000,0.0157
+0.9995,0.0000,0.0000,0.0314
+0.9995,0.0000,0.0000,0.0314
+0.9995,0.0000,0.0000,0.0314
+0.9995,0.0000,0.0000,0.0314
+0.9989,0.0000,0.0000,0.0471
+0.9989,0.0000,0.0000,0.0471
+0.9989,0.0000,0.0000,0.0471
+0.9989,0.0000,0.0000,0.0471
+0.9980,0.0000,0.0000,0.0628
+0.9980,0.0000,0.0000,0.0628
+0.9980,0.0000,0.0000,0.0628
+0.9980,0.0000,0.0000,0.0628
+0.9969,0.0000,0.0000,0.0785
+0.9969,0.0000,0.0000,0.0785
+0.9969,0.0000,0.0000,0.0785
+0.9969,0.0000,0.0000,0.0785
+0.9956,0.0000,0.0000,0.0941
+0.9956,0.0000,0.0000,0.0941
+0.9956,0.0000,0.0000,0.0941
+0.9956,0.0000,0.0000,0.0941
+0.9940,0.0000,0.0000,0.1097
+0.9940,0.0000,0.0000,0.1097
+0.9940,0.0000,0.0000,0.1097
+0.9940,0.0000,0.0000,0.1097
+0.9921,0.0000,0.0000,0.1253
+0.9921,0.0000,0.0000,0.1253
+0.9921,0.0000,0.0000,0.1253
+0.9921,0.0000,0.0000,0.1253
+0.9900,0.0000,0.0000,0.1409
+0.9900,0.0000,0.0000,0.1409
+0.9900,0.0000,0.0000,0.1409
+0.9900,0.0000,0.0000,0.1409
+0.9877,0.0000,0.0000,0.1564
+0.9877,0.0000,0.0000,0.1564
+0.9877,0.0000,0.0000,0.1564
+0.9877,0.0000,0.0000,0.1564
+0.9851,0.0000,0.0000,0.1719
+0.9851,0.0000,0.0000,0.1719
+0.9851,0.0000,0.0000,0.1719
+0.9851,0.0000,0.0000,0.1719
+0.9823,0.0000,0.0000,0.1874
+0.9823,0.0000,0.0000,0.1874
+0.9823,0.0000,0.0000,0.1874
+0.9823,0.0000,0.0000,0.1874
+0.9792,0.0000,0.0000,0.2028
+0.9792,0.0000,0.0000,0.2028
+0.9792,0.0000,0.0000,0.2028
+0.9792,0.0000,0.0000,0.2028
+0.9759,0.0000,0.0000,0.2181
+0.9759,0.0000,0.0000,0.2181
+0.9759,0.0000,0.0000,0.2181
+0.9759,0.0000,0.0000,0.2181
+0.9724,0.0000,0.0000,0.2334
+0.9724,0.0000,0.0000,0.2334
+0.9724,0.0000,0.0000,0.2334
+0.9724,0.0000,0.0000,0.2334
+0.9686,0.0000,0.0000,0.2487
+0.9686,0.0000,0.0000,0.2487
+0.9686,0.0000,0.0000,0.2487
+0.9686,0.0000,0.0000,0.2487
+0.9646,0.0000,0.0000,0.2639
+0.9646,0.0000,0.0000,0.2639
+0.9646,0.0000,0.0000,0.2639
+0.9646,0.0000,0.0000,0.2639
+0.9603,0.0000,0.0000,0.2790
+0.9603,0.0000,0.0000,0.2790
+0.9603,0.0000,0.0000,0.2790
+0.9603,0.0000,0.0000,0.2790
+0.9558,0.0000,0.0000,0.2940
+0.9558,0.0000,0.0000,0.2940
+0.9558,0.0000,0.0000,0.2940
+0.9558,0.0000,0.0000,0.2940
+0.9511,0.0000,0.0000,0.3090
+0.9511,0.0000,0.0000,0.3090
+0.9511,0.0000,0.0000,0.3090
+0.9511,0.0000,0.0000,0.3090
+0.9461,0.0000,0.0000,0.3239
+0.9461,0.0000,0.0000,0.3239
+0.9461,0.0000,0.0000,0.3239
+0.9461,0.0000,0.0000,0.3239
+0.9409,0.0000,0.0000,0.3387
+0.9409,0.0000,0.0000,0.3387
+0.9409,0.0000,0.0000,0.3387
+0.9409,0.0000,0.0000,0.3387
+0.9354,0.0000,0.0000,0.3535
+0.9354,0.0000,0.0000,0.3535
+0.9354,0.0000,0.0000,0.3535
+0.9354,0.0000,0.0000,0.3535
+0.9298,0.0000,0.0000,0.3681
+0.9298,0.0000,0.0000,0.3681
+0.9298,0.0000,0.0000,0.3681
+0.9298,0.0000,0.0000,0.3681
+0.9239,0.0000,0.0000,0.3827
+0.9239,0.0000,0.0000,0.3827
+0.9239,0.0000,0.0000,0.3827
+0.9239,0.0000,0.0000,0.3827
+0.9178,0.0000,0.0000,0.3971
+0.9178,0.0000,0.0000,0.3971
+0.9178,0.0000,0.0000,0.3971
+0.9178,0.0000,0.0000,0.3971
+0.9114,0.0000,0.0000,0.4115
+0.9114,0.0000,0.0000,0.4115
+0.9114,0.0000,0.0000,0.4115
+0.9114,0.0000,0.0000,0.4115
+0.9048,0.0000,0.0000,0.4258
+0.9048,0.0000,0.0000,0.4258
+0.9048,0.0000,0.0000,0.4258
+0.9048,0.0000,0.0000,0.4258
+0.8980,0.0000,0.0000,0.4399
+0.8980,0.0000,0.0000,0.4399
+0.8980,0.0000,0.0000,0.4399
+0.8980,0.0000,0.0000,0.4399
+0.8910,0.0000,0.0000,0.4540
+0.8910,0.0000,0.0000,0.4540
+0.8910,0.0000,0.0000,0.4540
+0.8910,0.0000,0.0000,0.4540
+0.8838,0.0000,0.0000,0.4679
+0.8838,0.0000,0.0000,0.4679
+0.8838,0.0000,0.0000,0.4679
+0.8838,0.0000,0.0000,0.4679
+0.8763,0.0000,0.0000,0.4818
+0.8763,0.0000,0.0000,0.4818
+0.8763,0.0000,0.0000,0.4818
+0.8763,0.0000,0.0000,0.4818
+0.8686,0.0000,0.0000,0.4955
+0.8686,0.0000,0.0000,0.4955
+0.8686,0.0000,0.0000,0.4955
+0.8686,0.0000,0.0000,0.4955
+0.8607,0.0000,0.0000,0.5090
+0.8607,0.0000,0.0000,0.5090
+0.8607,0.0000,0.0000,0.5090
+0.8607,0.0000,0.0000,0.5090
+0.8526,0.0000,0.0000,0.5225
+0.8526,0.0000,0.0000,0.5225
+0.8526,0.0000,0.0000,0.5225
+0.8526,0.0000,0.0000,0.5225
+0.8443,0.0000,0.0000,0.5358
+0.8443,0.0000,0.0000,0.5358
+0.8443,0.0000,0.0000,0.5358
+0.8443,0.0000,0.0000,0.5358
+0.8358,0.0000,0.0000,0.5490
+0.8358,0.0000,0.0000,0.5490
+0.8358,0.0000,0.0000,0.5490
+0.8358,0.0000,0.0000,0.5490
+0.8271,0.0000,0.0000,0.5621
+0.8271,0.0000,0.0000,0.5621
+0.8271,0.0000,0.0000,0.5621
+0.8271,0.0000,0.0000,0.5621
+0.8181,0.0000,0.0000,0.5750
+0.8181,0.0000,0.0000,0.5750
+0.8181,0.0000,0.0000,0.5750
+0.8181,0.0000,0.0000,0.5750
+0.8090,0.0000,0.0000,0.5878
+0.8090,0.0000,0.0000,0.5878
+0.8090,0.0000,0.0000,0.5878
+0.8090,0.0000,0.0000,0.5878
+0.7997,0.0000,0.0000,0.6004
+0.7997,0.0000,0.0000,0.6004
+0.7997,0.0000,0.0000,0.6004
+0.7997,0.0000,0.0000,0.6004
+0.7902,0.0000,0.0000,0.6129
+0.7902,0.0000,0.0000,0.6129
+0.7902,0.0000,0.0000,0.6129
+0.7902,0.0000,0.0000,0.6129
+0.7804,0.0000,0.0000,0.6252
+0.7804,0.0000,0.0000,0.6252
+0.7804,0.0000,0.0000,0.6252
+0.7804,0.0000,0.0000,0.6252
+0.7705,0.0000,0.0000,0.6374
+0.7705,0.0000,0.0000,0.6374
+0.7705,0.0000,0.0000,0.6374
+0.7705,0.0000,0.0000,0.6374
+0.7604,0.0000,0.0000,0.6494
+0.7604,0.0000,0.0000,0.6494
+0.7604,0.0000,0.0000,0.6494
+0.7604,0.0000,0.0000,0.6494
+0.7501,0.0000,0.0000,0.6613
+0.7501,0.0000,0.0000,0.6613
+0.7501,0.0000,0.0000,0.6613
+0.7501,0.0000,0.0000,0.6613
+0.7396,0.0000,0.0000,0.6730
+0.7396,0.0000,0.0000,0.6730
+0.7396,0.0000,0.0000,0.6730
+0.7396,0.0000,0.0000,0.6730
+0.7290,0.0000,0.0000,0.6845
+0.7290,0.0000,0.0000,0.6845
+0.7290,0.0000,0.0000,0.6845
+0.7290,0.0000,0.0000,0.6845
+0.7181,0.0000,0.0000,0.6959
+0.7181,0.0000,0.0000,0.6959
+0.7181,0.0000,0.0000,0.6959
+0.7181,0.0000,0.0000,0.6959
+0.7071,0.0000,0.0000,0.7071
+0.7071,0.0000,0.0000,0.7071
+0.7071,0.0000,0.0000,0.7071
+0.7071,0.0000,0.0000,0.7071
+0.6959,0.0000,0.0000,0.7181
+0.6959,0.0000,0.0000,0.7181
+0.6959,0.0000,0.0000,0.7181
+0.6959,0.0000,0.0000,0.7181
+0.6845,0.0000,0.0000,0.7290
+0.6845,0.0000,0.0000,0.7290
+0.6845,0.0000,0.0000,0.7290
+0.6845,0.0000,0.0000,0.7290
+0.6730,0.0000,0.0000,0.7396
+0.6730,0.0000,0.0000,0.7396
+0.6730,0.0000,0.0000,0.7396
+0.6730,0.0000,0.0000,0.7396
+0.6613,0.0000,0.0000,0.7501
+0.6613,0.0000,0.0000,0.7501
+0.6613,0.0000,0.0000,0.7501
+0.6613,0.0000,0.0000,0.7501
+0.6494,0.0000,0.0000,0.7604
+0.6494,0.0000,0.0000,0.7604
+0.6494,0.0000,0.0000,0.7604
+0.6494,0.0000,0.0000,0.7604
+0.6374,0.0000,0.0000,0.7705
+0.6374,0.0000,0.0000,0.7705
+0.6374,0.0000,0.0000,0.7705
+0.6374,0.0000,0.0000,0.7705
+0.6252,0.0000,0.0000,0.7804
+0.6252,0.0000,0.0000,0.7804
+0.6252,0.0000,0.0000,0.7804
+0.6252,0.0000,0.0000,0.7804
+0.6129,0.0000,0.0000,0.7902
+0.6129,0.0000,0.0000,0.7902
+0.6129,0.0000,0.0000,0.7902
+0.6129,0.0000,0.0000,0.7902
+0.6004,0.0000,0.0000,0.7997
+0.6004,0.0000,0.0000,0.7997
+0.6004,0.0000,0.0000,0.7997
+0.6004,0.0000,0.0000,0.7997
+0.5878,0.0000,0.0000,0.8090
+0.5878,0.0000,0.0000,0.8090
+0.5878,0.0000,0.0000,0.8090
+0.5878,0.0000,0.0000,0.8090
+0.5750,0.0000,0.0000,0.8181
+0.5750,0.0000,0.0000,0.8181
+0.5750,0.0000,0.0000,0.8181
+0.5750,0.0000,0.0000,0.8181
+0.5621,0.0000,0.0000,0.8271
+0.5621,0.0000,0.0000,0.8271
+0.5621,0.0000,0.0000,0.8271
+0.5621,0.0000,0.0000,0.8271
+0.5490,0.0000,0.0000,0.8358
+0.5490,0.0000,0.0000,0.8358
+0.5490,0.0000,0.0000,0.8358
+0.5490,0.0000,0.0000,0.8358
+0.5358,0.0000,0.0000,0.8443
+0.5358,0.0000,0.0000,0.8443
+0.5358,0.0000,0.0000,0.8443
+0.5358,0.0000,0.0000,0.8443
+0.5225,0.0000,0.0000,0.8526
+0.5225,0.0000,0.0000,0.8526
+0.5225,0.0000,0.0000,0.8526
+0.5225,0.0000,0.0000,0.8526
+0.5090,0.0000,0.0000,0.8607
+0.5090,0.0000,0.0000,0.8607
+0.5090,0.0000,0.0000,0.8607
+0.5090,0.0000,0.0000,0.8607
+0.4955,0.0000,0.0000,0.8686
+0.4955,0.0000,0.0000,0.8686
+0.4955,0.0000,0.0000,0.8686
+0.4955,0.0000,0.0000,0.8686
+0.4818,0.0000,0.0000,0.8763
+0.4818,0.0000,0.0000,0.8763
+0.4818,0.0000,0.0000,0.8763
+0.4818,0.0000,0.0000,0.8763
+0.4679,0.0000,0.0000,0.8838
+0.4679,0.0000,0.0000,0.8838
+0.4679,0.0000,0.0000,0.8838
+0.4679,0.0000,0.0000,0.8838
+0.4540,0.0000,0.0000,0.8910
+0.4540,0.0000,0.0000,0.8910
+0.4540,0.0000,0.0000,0.8910
+0.4540,0.0000,0.0000,0.8910
+0.4399,0.0000,0.0000,0.8980
+0.4399,0.0000,0.0000,0.8980
+0.4399,0.0000,0.0000,0.8980
+0.4399,0.0000,0.0000,0.8980
+0.4258,0.0000,0.0000,0.9048
+0.4258,0.0000,0.0000,0.9048
+0.4258,0.0000,0.0000,0.9048
+0.4258,0.0000,0.0000,0.9048
+0.4115,0.0000,0.0000,0.9114
+0.4115,0.0000,0.0000,0.9114
+0.4115,0.0000,0.0000,0.9114
+0.4115,0.0000,0.0000,0.9114
+0.3971,0.0000,0.0000,0.9178
+0.3971,0.0000,0.0000,0.9178
+0.3971,0.0000,0.0000,0.9178
+0.3971,0.0000,0.0000,0.9178
+0.3827,0.0000,0.0000,0.9239
+0.3827,0.0000,0.0000,0.9239
+0.3827,0.0000,0.0000,0.9239
+0.3827,0.0000,0.0000,0.9239
+0.3681,0.0000,0.0000,0.9298
+0.3681,0.0000,0.0000,0.9298
+0.3681,0.0000,0.0000,0.9298
+0.3681,0.0000,0.0000,0.9298
+0.3535,0.0000,0.0000,0.9354
+0.3535,0.0000,0.0000,0.9354
+0.3535,0.0000,0.0000,0.9354
+0.3535,0.0000,0.0000,0.9354
+0.3387,0.0000,0.0000,0.9409
+0.3387,0.0000,0.0000,0.9409
+0.3387,0.0000,0.0000,0.9409
+0.3387,0.0000,0.0000,0.9409
+0.3239,0.0000,0.0000,0.9461
+0.3239,0.0000,0.0000,0.9461
+0.3239,0.0000,0.0000,0.9461
+0.3239,0.0000,0.0000,0.9461
+0.3090,0.0000,0.0000,0.9511
+0.3090,0.0000,0.0000,0.9511
+0.3090,0.0000,0.0000,0.9511
+0.3090,0.0000,0.0000,0.9511
+0.2940,0.0000,0.0000,0.9558
+0.2940,0.0000,0.0000,0.9558
+0.2940,0.0000,0.0000,0.9558
+0.2940,0.0000,0.0000,0.9558
+0.2790,0.0000,0.0000,0.9603
+0.2790,0.0000,0.0000,0.9603
+0.2790,0.0000,0.0000,0.9603
+0.2790,0.0000,0.0000,0.9603
+0.2639,0.0000,0.0000,0.9646
+0.2639,0.0000,0.0000,0.9646
+0.2639,0.0000,0.0000,0.9646
+0.2639,0.0000,0.0000,0.9646
+0.2487,0.0000,0.0000,0.9686
+0.2487,0.0000,0.0000,0.9686
+0.2487,0.0000,0.0000,0.9686
+0.2487,0.0000,0.0000,0.9686
+0.2334,0.0000,0.0000,0.9724
+0.2334,0.0000,0.0000,0.9724
+0.2334,0.0000,0.0000,0.9724
+0.2334,0.0000,0.0000,0.9724
+0.2181,0.0000,0.0000,0.9759
+0.2181,0.0000,0.0000,0.9759
+0.2181,0.0000,0.0000,0.9759
+0.2181,0.0000,0.0000,0.9759
+0.2028,0.0000,0.0000,0.9792
+0.2028,0.0000,0.0000,0.9792
+0.2028,0.0000,0.0000,0.9792
+0.2028,0.0000,0.0000,0.9792
+0.1874,0.0000,0.0000,0.9823
+0.1874,0.0000,0.0000,0.9823
+0.1874,0.0000,0.0000,0.9823
+0.1874,0.0000,0.0000,0.9823
+0.1719,0.0000,0.0000,0.9851
+0.1719,0.0000,0.0000,0.9851
+0.1719,0.0000,0.0000,0.9851
+0.1719,0.0000,0.0000,0.9851
+0.1564,0.0000,0.0000,0.9877
+0.1564,0.0000,0.0000,0.9877
+0.1564,0.0000,0.0000,0.9877
+0.1564,0.0000,0.0000,0.9877
+0.1409,0.0000,0.0000,0.9900
+0.1409,0.0000,0.0000,0.9900
+0.1409,0.0000,0.0000,0.9900
+0.1409,0.0000,0.0000,0.9900
+0.1253,0.0000,0.0000,0.9921
+0.1253,0.0000,0.0000,0.9921
+0.1253,0.0000,0.0000,0.9921
+0.1253,0.0000,0.0000,0.9921
+0.1097,0.0000,0.0000,0.9940
+0.1097,0.0000,0.0000,0.9940
+0.1097,0.0000,0.0000,0.9940
+0.1097,0.0000,0.0000,0.9940
+0.0941,0.0000,0.0000,0.9956
+0.0941,0.0000,0.0000,0.9956
+0.0941,0.0000,0.0000,0.9956
+0.0941,0.0000,0.0000,0.9956
+0.0785,0.0000,0.0000,0.9969
+0.0785,0.0000,0.0000,0.9969
+0.0785,0.0000,0.0000,0.9969
+0.0785,0.0000,0.0000,0.9969
+0.0628,0.0000,0.0000,0.9980
+0.0628,0.0000,0.0000,0.9980
+0.0628,0.0000,0.0000,0.9980
+0.0628,0.0000,0.0000,0.9980
+0.0471,0.0000,0.0000,0.9989
+0.0471,0.0000,0.0000,0.9989
+0.0471,0.0000,0.0000,0.9989
+0.0471,0.0000,0.0000,0.9989
+0.0314,0.0000,0.0000,0.9995
+0.0314,0.0000,0.0000,0.9995
+0.0314,0.0000,0.0000,0.9995
+0.0314,0.0000,0.0000,0.9995
+0.0157,0.0000,0.0000,0.9999
+0.0157,0.0000,0.0000,0.9999
+0.0157,0.0000,0.0000,0.9999
+0.0157,0.0000,0.0000,0.9999
+-0.0000,0.0000,0.0000,1.0000
+-0.0000,0.0000,0.0000,1.0000
+-0.0000,0.0000,0.0000,1.0000
+-0.0000,0.0000,0.0000,1.0000
+-0.0157,0.0000,0.0000,0.9999
+-0.0157,0.0000,0.0000,0.9999
+-0.0157,0.0000,0.0000,0.9999
+-0.0157,0.0000,0.0000,0.9999
+-0.0314,0.0000,0.0000,0.9995
+-0.0314,0.0000,0.0000,0.9995
+-0.0314,0.0000,0.0000,0.9995
+-0.0314,0.0000,0.0000,0.9995
+-0.0471,0.0000,0.0000,0.9989
+-0.0471,0.0000,0.0000,0.9989
+-0.0471,0.0000,0.0000,0.9989
+-0.0471,0.0000,0.0000,0.9989
+-0.0628,0.0000,0.0000,0.9980
+-0.0628,0.0000,0.0000,0.9980
+-0.0628,0.0000,0.0000,0.9980
+-0.0628,0.0000,0.0000,0.9980
+-0.0785,0.0000,0.0000,0.9969
+-0.0785,0.0000,0.0000,0.9969
+-0.0785,0.0000,0.0000,0.9969
+-0.0785,0.0000,0.0000,0.9969
+-0.0941,0.0000,0.0000,0.9956
+-0.0941,0.0000,0.0000,0.9956
+-0.0941,0.0000,0.0000,0.9956
+-0.0941,0.0000,0.0000,0.9956
+-0.1097,0.0000,0.0000,0.9940
+-0.1097,0.0000,0.0000,0.9940
+-0.1097,0.0000,0.0000,0.9940
+-0.1097,0.0000,0.0000,0.9940
+-0.1253,0.0000,0.0000,0.9921
+-0.1253,0.0000,0.0000,0.9921
+-0.1253,0.0000,0.0000,0.9921
+-0.1253,0.0000,0.0000,0.9921
+-0.1409,0.0000,0.0000,0.9900
+-0.1409,0.0000,0.0000,0.9900
+-0.1409,0.0000,0.0000,0.9900
+-0.1409,0.0000,0.0000,0.9900
+-0.1564,0.0000,0.0000,0.9877
+-0.1564,0.0000,0.0000,0.9877
+-0.1564,0.0000,0.0000,0.9877
+-0.1564,0.0000,0.0000,0.9877
+-0.1719,0.0000,0.0000,0.9851
+-0.1719,0.0000,0.0000,0.9851
+-0.1719,0.0000,0.0000,0.9851
+-0.1719,0.0000,0.0000,0.9851
+-0.1874,0.0000,0.0000,0.9823
+-0.1874,0.0000,0.0000,0.9823
+-0.1874,0.0000,0.0000,0.9823
+-0.1874,0.0000,0.0000,0.9823
+-0.2028,0.0000,0.0000,0.9792
+-0.2028,0.0000,0.0000,0.9792
+-0.2028,0.0000,0.0000,0.9792
+-0.2028,0.0000,0.0000,0.9792
+-0.2181,0.0000,0.0000,0.9759
+-0.2181,0.0000,0.0000,0.9759
+-0.2181,0.0000,0.0000,0.9759
+-0.2181,0.0000,0.0000,0.9759
+-0.2334,0.0000,0.0000,0.9724
+-0.2334,0.0000,0.0000,0.9724
+-0.2334,0.0000,0.0000,0.9724
+-0.2334,0.0000,0.0000,0.9724
+-0.2487,0.0000,0.0000,0.9686
+-0.2487,0.0000,0.0000,0.9686
+-0.2487,0.0000,0.0000,0.9686
+-0.2487,0.0000,0.0000,0.9686
+-0.2639,0.0000,0.0000,0.9646
+-0.2639,0.0000,0.0000,0.9646
+-0.2639,0.0000,0.0000,0.9646
+-0.2639,0.0000,0.0000,0.9646
+-0.2790,0.0000,0.0000,0.9603
+-0.2790,0.0000,0.0000,0.9603
+-0.2790,0.0000,0.0000,0.9603
+-0.2790,0.0000,0.0000,0.9603
+-0.2940,0.0000,0.0000,0.9558
+-0.2940,0.0000,0.0000,0.9558
+-0.2940,0.0000,0.0000,0.9558
+-0.2940,0.0000,0.0000,0.9558
+-0.3090,0.0000,0.0000,0.9511
+-0.3090,0.0000,0.0000,0.9511
+-0.3090,0.0000,0.0000,0.9511
+-0.3090,0.0000,0.0000,0.9511
+-0.3239,0.0000,0.0000,0.9461
+-0.3239,0.0000,0.0000,0.9461
+-0.3239,0.0000,0.0000,0.9461
+-0.3239,0.0000,0.0000,0.9461
+-0.3387,0.0000,0.0000,0.9409
+-0.3387,0.0000,0.0000,0.9409
+-0.3387,0.0000,0.0000,0.9409
+-0.3387,0.0000,0.0000,0.9409
+-0.3535,0.0000,0.0000,0.9354
+-0.3535,0.0000,0.0000,0.9354
+-0.3535,0.0000,0.0000,0.9354
+-0.3535,0.0000,0.0000,0.9354
+-0.3681,0.0000,0.0000,0.9298
+-0.3681,0.0000,0.0000,0.9298
+-0.3681,0.0000,0.0000,0.9298
+-0.3681,0.0000,0.0000,0.9298
+-0.3827,0.0000,0.0000,0.9239
+-0.3827,0.0000,0.0000,0.9239
+-0.3827,0.0000,0.0000,0.9239
+-0.3827,0.0000,0.0000,0.9239
+-0.3971,0.0000,0.0000,0.9178
+-0.3971,0.0000,0.0000,0.9178
+-0.3971,0.0000,0.0000,0.9178
+-0.3971,0.0000,0.0000,0.9178
+-0.4115,0.0000,0.0000,0.9114
+-0.4115,0.0000,0.0000,0.9114
+-0.4115,0.0000,0.0000,0.9114
+-0.4115,0.0000,0.0000,0.9114
+-0.4258,0.0000,0.0000,0.9048
+-0.4258,0.0000,0.0000,0.9048
+-0.4258,0.0000,0.0000,0.9048
+-0.4258,0.0000,0.0000,0.9048
+-0.4399,0.0000,0.0000,0.8980
+-0.4399,0.0000,0.0000,0.8980
+-0.4399,0.0000,0.0000,0.8980
+-0.4399,0.0000,0.0000,0.8980
+-0.4540,0.0000,0.0000,0.8910
+-0.4540,0.0000,0.0000,0.8910
+-0.4540,0.0000,0.0000,0.8910
+-0.4540,0.0000,0.0000,0.8910
+-0.4679,0.0000,0.0000,0.8838
+-0.4679,0.0000,0.0000,0.8838
+-0.4679,0.0000,0.0000,0.8838
+-0.4679,0.0000,0.0000,0.8838
+-0.4818,0.0000,0.0000,0.8763
+-0.4818,0.0000,0.0000,0.8763
+-0.4818,0.0000,0.0000,0.8763
+-0.4818,0.0000,0.0000,0.8763
+-0.4955,0.0000,0.0000,0.8686
+-0.4955,0.0000,0.0000,0.8686
+-0.4955,0.0000,0.0000,0.8686
+-0.4955,0.0000,0.0000,0.8686
+-0.5090,0.0000,0.0000,0.8607
+-0.5090,0.0000,0.0000,0.8607
+-0.5090,0.0000,0.0000,0.8607
+-0.5090,0.0000,0.0000,0.8607
+-0.5225,0.0000,0.0000,0.8526
+-0.5225,0.0000,0.0000,0.8526
+-0.5225,0.0000,0.0000,0.8526
+-0.5225,0.0000,0.0000,0.8526
+-0.5358,0.0000,0.0000,0.8443
+-0.5358,0.0000,0.0000,0.8443
+-0.5358,0.0000,0.0000,0.8443
+-0.5358,0.0000,0.0000,0.8443
+-0.5490,0.0000,0.0000,0.8358
+-0.5490,0.0000,0.0000,0.8358
+-0.5490,0.0000,0.0000,0.8358
+-0.5490,0.0000,0.0000,0.8358
+-0.5621,0.0000,0.0000,0.8271
+-0.5621,0.0000,0.0000,0.8271
+-0.5621,0.0000,0.0000,0.8271
+-0.5621,0.0000,0.0000,0.8271
+-0.5750,0.0000,0.0000,0.8181
+-0.5750,0.0000,0.0000,0.8181
+-0.5750,0.0000,0.0000,0.8181
+-0.5750,0.0000,0.0000,0.8181
+-0.5878,0.0000,0.0000,0.8090
+-0.5878,0.0000,0.0000,0.8090
+-0.5878,0.0000,0.0000,0.8090
+-0.5878,0.0000,0.0000,0.8090
+-0.6004,0.0000,0.0000,0.7997
+-0.6004,0.0000,0.0000,0.7997
+-0.6004,0.0000,0.0000,0.7997
+-0.6004,0.0000,0.0000,0.7997
+-0.6129,0.0000,0.0000,0.7902
+-0.6129,0.0000,0.0000,0.7902
+-0.6129,0.0000,0.0000,0.7902
+-0.6129,0.0000,0.0000,0.7902
+-0.6252,0.0000,0.0000,0.7804
+-0.6252,0.0000,0.0000,0.7804
+-0.6252,0.0000,0.0000,0.7804
+-0.6252,0.0000,0.0000,0.7804
+-0.6374,0.0000,0.0000,0.7705
+-0.6374,0.0000,0.0000,0.7705
+-0.6374,0.0000,0.0000,0.7705
+-0.6374,0.0000,0.0000,0.7705
+-0.6494,0.0000,0.0000,0.7604
+-0.6494,0.0000,0.0000,0.7604
+-0.6494,0.0000,0.0000,0.7604
+-0.6494,0.0000,0.0000,0.7604
+-0.6613,0.0000,0.0000,0.7501
+-0.6613,0.0000,0.0000,0.7501
+-0.6613,0.0000,0.0000,0.7501
+-0.6613,0.0000,0.0000,0.7501
+-0.6730,0.0000,0.0000,0.7396
+-0.6730,0.0000,0.0000,0.7396
+-0.6730,0.0000,0.0000,0.7396
+-0.6730,0.0000,0.0000,0.7396
+-0.6845,0.0000,0.0000,0.7290
+-0.6845,0.0000,0.0000,0.7290
+-0.6845,0.0000,0.0000,0.7290
+-0.6845,0.0000,0.0000,0.7290
+-0.6959,0.0000,0.0000,0.7181
+-0.6959,0.0000,0.0000,0.7181
+-0.6959,0.0000,0.0000,0.7181
+-0.6959,0.0000,0.0000,0.7181
+-0.7071,0.0000,0.0000,0.7071
+-0.7071,0.0000,0.0000,0.7071
+-0.7071,0.0000,0.0000,0.7071
+-0.7071,0.0000,0.0000,0.7071
+-0.7181,0.0000,0.0000,0.6959
+-0.7181,0.0000,0.0000,0.6959
+-0.7181,0.0000,0.0000,0.6959
+-0.7181,0.0000,0.0000,0.6959
+-0.7290,0.0000,0.0000,0.6845
+-0.7290,0.0000,0.0000,0.6845
+-0.7290,0.0000,0.0000,0.6845
+-0.7290,0.0000,0.0000,0.6845
+-0.7396,0.0000,0.0000,0.6730
+-0.7396,0.0000,0.0000,0.6730
+-0.7396,0.0000,0.0000,0.6730
+-0.7396,0.0000,0.0000,0.6730
+-0.7501,0.0000,0.0000,0.6613
+-0.7501,0.0000,0.0000,0.6613
+-0.7501,0.0000,0.0000,0.6613
+-0.7501,0.0000,0.0000,0.6613
+-0.7604,0.0000,0.0000,0.6494
+-0.7604,0.0000,0.0000,0.6494
+-0.7604,0.0000,0.0000,0.6494
+-0.7604,0.0000,0.0000,0.6494
+-0.7705,0.0000,0.0000,0.6374
+-0.7705,0.0000,0.0000,0.6374
+-0.7705,0.0000,0.0000,0.6374
+-0.7705,0.0000,0.0000,0.6374
+-0.7804,0.0000,0.0000,0.6252
+-0.7804,0.0000,0.0000,0.6252
+-0.7804,0.0000,0.0000,0.6252
+-0.7804,0.0000,0.0000,0.6252
+-0.7902,0.0000,0.0000,0.6129
+-0.7902,0.0000,0.0000,0.6129
+-0.7902,0.0000,0.0000,0.6129
+-0.7902,0.0000,0.0000,0.6129
+-0.7997,0.0000,0.0000,0.6004
+-0.7997,0.0000,0.0000,0.6004
+-0.7997,0.0000,0.0000,0.6004
+-0.7997,0.0000,0.0000,0.6004
+-0.8090,0.0000,0.0000,0.5878
+-0.8090,0.0000,0.0000,0.5878
+-0.8090,0.0000,0.0000,0.5878
+-0.8090,0.0000,0.0000,0.5878
+-0.8182,0.0000,0.0000,0.5750
+-0.8182,0.0000,0.0000,0.5750
+-0.8182,0.0000,0.0000,0.5750
+-0.8182,0.0000,0.0000,0.5750
+-0.8271,0.0000,0.0000,0.5621
+-0.8271,0.0000,0.0000,0.5621
+-0.8271,0.0000,0.0000,0.5621
+-0.8271,0.0000,0.0000,0.5621
+-0.8358,0.0000,0.0000,0.5490
+-0.8358,0.0000,0.0000,0.5490
+-0.8358,0.0000,0.0000,0.5490
+-0.8358,0.0000,0.0000,0.5490
+-0.8443,0.0000,0.0000,0.5358
+-0.8443,0.0000,0.0000,0.5358
+-0.8443,0.0000,0.0000,0.5358
+-0.8443,0.0000,0.0000,0.5358
+-0.8526,0.0000,0.0000,0.5225
+-0.8526,0.0000,0.0000,0.5225
+-0.8526,0.0000,0.0000,0.5225
+-0.8526,0.0000,0.0000,0.5225
+-0.8607,0.0000,0.0000,0.5090
+-0.8607,0.0000,0.0000,0.5090
+-0.8607,0.0000,0.0000,0.5090
+-0.8607,0.0000,0.0000,0.5090
+-0.8686,0.0000,0.0000,0.4955
+-0.8686,0.0000,0.0000,0.4955
+-0.8686,0.0000,0.0000,0.4955
+-0.8686,0.0000,0.0000,0.4955
+-0.8763,0.0000,0.0000,0.4818
+-0.8763,0.0000,0.0000,0.4818
+-0.8763,0.0000,0.0000,0.4818
+-0.8763,0.0000,0.0000,0.4818
+-0.8838,0.0000,0.0000,0.4679
+-0.8838,0.0000,0.0000,0.4679
+-0.8838,0.0000,0.0000,0.4679
+-0.8838,0.0000,0.0000,0.4679
+-0.8910,0.0000,0.0000,0.4540
+-0.8910,0.0000,0.0000,0.4540
+-0.8910,0.0000,0.0000,0.4540
+-0.8910,0.0000,0.0000,0.4540
+-0.8980,0.0000,0.0000,0.4399
+-0.8980,0.0000,0.0000,0.4399
+-0.8980,0.0000,0.0000,0.4399
+-0.8980,0.0000,0.0000,0.4399
+-0.9048,0.0000,0.0000,0.4258
+-0.9048,0.0000,0.0000,0.4258
+-0.9048,0.0000,0.0000,0.4258
+-0.9048,0.0000,0.0000,0.4258
+-0.9114,0.0000,0.0000,0.4115
+-0.9114,0.0000,0.0000,0.4115
+-0.9114,0.0000,0.0000,0.4115
+-0.9114,0.0000,0.0000,0.4115
+-0.9178,0.0000,0.0000,0.3971
+-0.9178,0.0000,0.0000,0.3971
+-0.9178,0.0000,0.0000,0.3971
+-0.9178,0.0000,0.0000,0.3971
+-0.9239,0.0000,0.0000,0.3827
+-0.9239,0.0000,0.0000,0.3827
+-0.9239,0.0000,0.0000,0.3827
+-0.9239,0.0000,0.0000,0.3827
+-0.9298,0.0000,0.0000,0.3681
+-0.9298,0.0000,0.0000,0.3681
+-0.9298,0.0000,0.0000,0.3681
+-0.9298,0.0000,0.0000,0.3681
+-0.9354,0.0000,0.0000,0.3535
+-0.9354,0.0000,0.0000,0.3535
+-0.9354,0.0000,0.0000,0.3535
+-0.9354,0.0000,0.0000,0.3535
+-0.9409,0.0000,0.0000,0.3387
+-0.9409,0.0000,0.0000,0.3387
+-0.9409,0.0000,0.0000,0.3387
+-0.9409,0.0000,0.0000,0.3387
+-0.9461,0.0000,0.0000,0.3239
+-0.9461,0.0000,0.0000,0.3239
+-0.9461,0.0000,0.0000,0.3239
+-0.9461,0.0000,0.0000,0.3239
+-0.9511,0.0000,0.0000,0.3090
+-0.9511,0.0000,0.0000,0.3090
+-0.9511,0.0000,0.0000,0.3090
+-0.9511,0.0000,0.0000,0.3090
+-0.9558,0.0000,0.0000,0.2940
+-0.9558,0.0000,0.0000,0.2940
+-0.9558,0.0000,0.0000,0.2940
+-0.9558,0.0000,0.0000,0.2940
+-0.9603,0.0000,0.0000,0.2790
+-0.9603,0.0000,0.0000,0.2790
+-0.9603,0.0000,0.0000,0.2790
+-0.9603,0.0000,0.0000,0.2790
+-0.9646,0.0000,0.0000,0.2639
+-0.9646,0.0000,0.0000,0.2639
+-0.9646,0.0000,0.0000,0.2639
+-0.9646,0.0000,0.0000,0.2639
+-0.9686,0.0000,0.0000,0.2487
+-0.9686,0.0000,0.0000,0.2487
+-0.9686,0.0000,0.0000,0.2487
+-0.9686,0.0000,0.0000,0.2487
+-0.9724,0.0000,0.0000,0.2334
+-0.9724,0.0000,0.0000,0.2334
+-0.9724,0.0000,0.0000,0.2334
+-0.9724,0.0000,0.0000,0.2334
+-0.9759,0.0000,0.0000,0.2181
+-0.9759,0.0000,0.0000,0.2181
+-0.9759,0.0000,0.0000,0.2181
+-0.9759,0.0000,0.0000,0.2181
+-0.9792,0.0000,0.0000,0.2028
+-0.9792,0.0000,0.0000,0.2028
+-0.9792,0.0000,0.0000,0.2028
+-0.9792,0.0000,0.0000,0.2028
+-0.9823,0.0000,0.0000,0.1874
+-0.9823,0.0000,0.0000,0.1874
+-0.9823,0.0000,0.0000,0.1874
+-0.9823,0.0000,0.0000,0.1874
+-0.9851,0.0000,0.0000,0.1719
+-0.9851,0.0000,0.0000,0.1719
+-0.9851,0.0000,0.0000,0.1719
+-0.9851,0.0000,0.0000,0.1719
+-0.9877,0.0000,0.0000,0.1564
+-0.9877,0.0000,0.0000,0.1564
+-0.9877,0.0000,0.0000,0.1564
+-0.9877,0.0000,0.0000,0.1564
+-0.9900,0.0000,0.0000,0.1409
+-0.9900,0.0000,0.0000,0.1409
+-0.9900,0.0000,0.0000,0.1409
+-0.9900,0.0000,0.0000,0.1409
+-0.9921,0.0000,0.0000,0.1253
+-0.9921,0.0000,0.0000,0.1253
+-0.9921,0.0000,0.0000,0.1253
+-0.9921,0.0000,0.0000,0.1253
+-0.9940,0.0000,0.0000,0.1097
+-0.9940,0.0000,0.0000,0.1097
+-0.9940,0.0000,0.0000,0.1097
+-0.9940,0.0000,0.0000,0.1097
+-0.9956,0.0000,0.0000,0.0941
+-0.9956,0.0000,0.0000,0.0941
+-0.9956,0.0000,0.0000,0.0941
+-0.9956,0.0000,0.0000,0.0941
+-0.9969,0.0000,0.0000,0.0785
+-0.9969,0.0000,0.0000,0.0785
+-0.9969,0.0000,0.0000,0.0785
+-0.9969,0.0000,0.0000,0.0785
+-0.9980,0.0000,0.0000,0.0628
+-0.9980,0.0000,0.0000,0.0628
+-0.9980,0.0000,0.0000,0.0628
+-0.9980,0.0000,0.0000,0.0628
+-0.9989,0.0000,0.0000,0.0471
+-0.9989,0.0000,0.0000,0.0471
+-0.9989,0.0000,0.0000,0.0471
+-0.9989,0.0000,0.0000,0.0471
+-0.9995,0.0000,0.0000,0.0314
+-0.9995,0.0000,0.0000,0.0314
+-0.9995,0.0000,0.0000,0.0314
+-0.9995,0.0000,0.0000,0.0314
+-0.9999,0.0000,0.0000,0.0157
+-0.9999,0.0000,0.0000,0.0157
+-0.9999,0.0000,0.0000,0.0157
+-0.9999,0.0000,0.0000,0.0157
+1.0000,0.0000,0.0000,0.0000
+1.0000,0.0000,0.0000,0.0000
+1.0000,0.0000,0.0000,0.0000
+1.0000,0.0000,0.0000,0.0000
diff --git a/scripts/trajectories/full-circle-4s.csv b/scripts/trajectories/full-circle-4s.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4174a531b7e4b7ed785105d18fcfe2d5d195c035
--- /dev/null
+++ b/scripts/trajectories/full-circle-4s.csv
@@ -0,0 +1,800 @@
+0.9999,0.0000,0.0000,-0.0157
+0.9999,0.0000,0.0000,-0.0157
+0.9999,0.0000,0.0000,-0.0157
+0.9999,0.0000,0.0000,-0.0157
+0.9995,0.0000,0.0000,-0.0314
+0.9995,0.0000,0.0000,-0.0314
+0.9995,0.0000,0.0000,-0.0314
+0.9995,0.0000,0.0000,-0.0314
+0.9989,0.0000,0.0000,-0.0471
+0.9989,0.0000,0.0000,-0.0471
+0.9989,0.0000,0.0000,-0.0471
+0.9989,0.0000,0.0000,-0.0471
+0.9980,0.0000,0.0000,-0.0628
+0.9980,0.0000,0.0000,-0.0628
+0.9980,0.0000,0.0000,-0.0628
+0.9980,0.0000,0.0000,-0.0628
+0.9969,0.0000,0.0000,-0.0785
+0.9969,0.0000,0.0000,-0.0785
+0.9969,0.0000,0.0000,-0.0785
+0.9969,0.0000,0.0000,-0.0785
+0.9956,0.0000,0.0000,-0.0941
+0.9956,0.0000,0.0000,-0.0941
+0.9956,0.0000,0.0000,-0.0941
+0.9956,0.0000,0.0000,-0.0941
+0.9940,0.0000,0.0000,-0.1097
+0.9940,0.0000,0.0000,-0.1097
+0.9940,0.0000,0.0000,-0.1097
+0.9940,0.0000,0.0000,-0.1097
+0.9921,0.0000,0.0000,-0.1253
+0.9921,0.0000,0.0000,-0.1253
+0.9921,0.0000,0.0000,-0.1253
+0.9921,0.0000,0.0000,-0.1253
+0.9900,0.0000,0.0000,-0.1409
+0.9900,0.0000,0.0000,-0.1409
+0.9900,0.0000,0.0000,-0.1409
+0.9900,0.0000,0.0000,-0.1409
+0.9877,0.0000,0.0000,-0.1564
+0.9877,0.0000,0.0000,-0.1564
+0.9877,0.0000,0.0000,-0.1564
+0.9877,0.0000,0.0000,-0.1564
+0.9851,0.0000,0.0000,-0.1719
+0.9851,0.0000,0.0000,-0.1719
+0.9851,0.0000,0.0000,-0.1719
+0.9851,0.0000,0.0000,-0.1719
+0.9823,0.0000,0.0000,-0.1874
+0.9823,0.0000,0.0000,-0.1874
+0.9823,0.0000,0.0000,-0.1874
+0.9823,0.0000,0.0000,-0.1874
+0.9792,0.0000,0.0000,-0.2028
+0.9792,0.0000,0.0000,-0.2028
+0.9792,0.0000,0.0000,-0.2028
+0.9792,0.0000,0.0000,-0.2028
+0.9759,0.0000,0.0000,-0.2181
+0.9759,0.0000,0.0000,-0.2181
+0.9759,0.0000,0.0000,-0.2181
+0.9759,0.0000,0.0000,-0.2181
+0.9724,0.0000,0.0000,-0.2334
+0.9724,0.0000,0.0000,-0.2334
+0.9724,0.0000,0.0000,-0.2334
+0.9724,0.0000,0.0000,-0.2334
+0.9686,0.0000,0.0000,-0.2487
+0.9686,0.0000,0.0000,-0.2487
+0.9686,0.0000,0.0000,-0.2487
+0.9686,0.0000,0.0000,-0.2487
+0.9646,0.0000,0.0000,-0.2639
+0.9646,0.0000,0.0000,-0.2639
+0.9646,0.0000,0.0000,-0.2639
+0.9646,0.0000,0.0000,-0.2639
+0.9603,0.0000,0.0000,-0.2790
+0.9603,0.0000,0.0000,-0.2790
+0.9603,0.0000,0.0000,-0.2790
+0.9603,0.0000,0.0000,-0.2790
+0.9558,0.0000,0.0000,-0.2940
+0.9558,0.0000,0.0000,-0.2940
+0.9558,0.0000,0.0000,-0.2940
+0.9558,0.0000,0.0000,-0.2940
+0.9511,0.0000,0.0000,-0.3090
+0.9511,0.0000,0.0000,-0.3090
+0.9511,0.0000,0.0000,-0.3090
+0.9511,0.0000,0.0000,-0.3090
+0.9461,0.0000,0.0000,-0.3239
+0.9461,0.0000,0.0000,-0.3239
+0.9461,0.0000,0.0000,-0.3239
+0.9461,0.0000,0.0000,-0.3239
+0.9409,0.0000,0.0000,-0.3387
+0.9409,0.0000,0.0000,-0.3387
+0.9409,0.0000,0.0000,-0.3387
+0.9409,0.0000,0.0000,-0.3387
+0.9354,0.0000,0.0000,-0.3535
+0.9354,0.0000,0.0000,-0.3535
+0.9354,0.0000,0.0000,-0.3535
+0.9354,0.0000,0.0000,-0.3535
+0.9298,0.0000,0.0000,-0.3681
+0.9298,0.0000,0.0000,-0.3681
+0.9298,0.0000,0.0000,-0.3681
+0.9298,0.0000,0.0000,-0.3681
+0.9239,0.0000,0.0000,-0.3827
+0.9239,0.0000,0.0000,-0.3827
+0.9239,0.0000,0.0000,-0.3827
+0.9239,0.0000,0.0000,-0.3827
+0.9178,0.0000,0.0000,-0.3971
+0.9178,0.0000,0.0000,-0.3971
+0.9178,0.0000,0.0000,-0.3971
+0.9178,0.0000,0.0000,-0.3971
+0.9114,0.0000,0.0000,-0.4115
+0.9114,0.0000,0.0000,-0.4115
+0.9114,0.0000,0.0000,-0.4115
+0.9114,0.0000,0.0000,-0.4115
+0.9048,0.0000,0.0000,-0.4258
+0.9048,0.0000,0.0000,-0.4258
+0.9048,0.0000,0.0000,-0.4258
+0.9048,0.0000,0.0000,-0.4258
+0.8980,0.0000,0.0000,-0.4399
+0.8980,0.0000,0.0000,-0.4399
+0.8980,0.0000,0.0000,-0.4399
+0.8980,0.0000,0.0000,-0.4399
+0.8910,0.0000,0.0000,-0.4540
+0.8910,0.0000,0.0000,-0.4540
+0.8910,0.0000,0.0000,-0.4540
+0.8910,0.0000,0.0000,-0.4540
+0.8838,0.0000,0.0000,-0.4679
+0.8838,0.0000,0.0000,-0.4679
+0.8838,0.0000,0.0000,-0.4679
+0.8838,0.0000,0.0000,-0.4679
+0.8763,0.0000,0.0000,-0.4818
+0.8763,0.0000,0.0000,-0.4818
+0.8763,0.0000,0.0000,-0.4818
+0.8763,0.0000,0.0000,-0.4818
+0.8686,0.0000,0.0000,-0.4955
+0.8686,0.0000,0.0000,-0.4955
+0.8686,0.0000,0.0000,-0.4955
+0.8686,0.0000,0.0000,-0.4955
+0.8607,0.0000,0.0000,-0.5090
+0.8607,0.0000,0.0000,-0.5090
+0.8607,0.0000,0.0000,-0.5090
+0.8607,0.0000,0.0000,-0.5090
+0.8526,0.0000,0.0000,-0.5225
+0.8526,0.0000,0.0000,-0.5225
+0.8526,0.0000,0.0000,-0.5225
+0.8526,0.0000,0.0000,-0.5225
+0.8443,0.0000,0.0000,-0.5358
+0.8443,0.0000,0.0000,-0.5358
+0.8443,0.0000,0.0000,-0.5358
+0.8443,0.0000,0.0000,-0.5358
+0.8358,0.0000,0.0000,-0.5490
+0.8358,0.0000,0.0000,-0.5490
+0.8358,0.0000,0.0000,-0.5490
+0.8358,0.0000,0.0000,-0.5490
+0.8271,0.0000,0.0000,-0.5621
+0.8271,0.0000,0.0000,-0.5621
+0.8271,0.0000,0.0000,-0.5621
+0.8271,0.0000,0.0000,-0.5621
+0.8181,0.0000,0.0000,-0.5750
+0.8181,0.0000,0.0000,-0.5750
+0.8181,0.0000,0.0000,-0.5750
+0.8181,0.0000,0.0000,-0.5750
+0.8090,0.0000,0.0000,-0.5878
+0.8090,0.0000,0.0000,-0.5878
+0.8090,0.0000,0.0000,-0.5878
+0.8090,0.0000,0.0000,-0.5878
+0.7997,0.0000,0.0000,-0.6004
+0.7997,0.0000,0.0000,-0.6004
+0.7997,0.0000,0.0000,-0.6004
+0.7997,0.0000,0.0000,-0.6004
+0.7902,0.0000,0.0000,-0.6129
+0.7902,0.0000,0.0000,-0.6129
+0.7902,0.0000,0.0000,-0.6129
+0.7902,0.0000,0.0000,-0.6129
+0.7804,0.0000,0.0000,-0.6252
+0.7804,0.0000,0.0000,-0.6252
+0.7804,0.0000,0.0000,-0.6252
+0.7804,0.0000,0.0000,-0.6252
+0.7705,0.0000,0.0000,-0.6374
+0.7705,0.0000,0.0000,-0.6374
+0.7705,0.0000,0.0000,-0.6374
+0.7705,0.0000,0.0000,-0.6374
+0.7604,0.0000,0.0000,-0.6494
+0.7604,0.0000,0.0000,-0.6494
+0.7604,0.0000,0.0000,-0.6494
+0.7604,0.0000,0.0000,-0.6494
+0.7501,0.0000,0.0000,-0.6613
+0.7501,0.0000,0.0000,-0.6613
+0.7501,0.0000,0.0000,-0.6613
+0.7501,0.0000,0.0000,-0.6613
+0.7396,0.0000,0.0000,-0.6730
+0.7396,0.0000,0.0000,-0.6730
+0.7396,0.0000,0.0000,-0.6730
+0.7396,0.0000,0.0000,-0.6730
+0.7290,0.0000,0.0000,-0.6845
+0.7290,0.0000,0.0000,-0.6845
+0.7290,0.0000,0.0000,-0.6845
+0.7290,0.0000,0.0000,-0.6845
+0.7181,0.0000,0.0000,-0.6959
+0.7181,0.0000,0.0000,-0.6959
+0.7181,0.0000,0.0000,-0.6959
+0.7181,0.0000,0.0000,-0.6959
+0.7071,0.0000,0.0000,-0.7071
+0.7071,0.0000,0.0000,-0.7071
+0.7071,0.0000,0.0000,-0.7071
+0.7071,0.0000,0.0000,-0.7071
+0.6959,0.0000,0.0000,-0.7181
+0.6959,0.0000,0.0000,-0.7181
+0.6959,0.0000,0.0000,-0.7181
+0.6959,0.0000,0.0000,-0.7181
+0.6845,0.0000,0.0000,-0.7290
+0.6845,0.0000,0.0000,-0.7290
+0.6845,0.0000,0.0000,-0.7290
+0.6845,0.0000,0.0000,-0.7290
+0.6730,0.0000,0.0000,-0.7396
+0.6730,0.0000,0.0000,-0.7396
+0.6730,0.0000,0.0000,-0.7396
+0.6730,0.0000,0.0000,-0.7396
+0.6613,0.0000,0.0000,-0.7501
+0.6613,0.0000,0.0000,-0.7501
+0.6613,0.0000,0.0000,-0.7501
+0.6613,0.0000,0.0000,-0.7501
+0.6494,0.0000,0.0000,-0.7604
+0.6494,0.0000,0.0000,-0.7604
+0.6494,0.0000,0.0000,-0.7604
+0.6494,0.0000,0.0000,-0.7604
+0.6374,0.0000,0.0000,-0.7705
+0.6374,0.0000,0.0000,-0.7705
+0.6374,0.0000,0.0000,-0.7705
+0.6374,0.0000,0.0000,-0.7705
+0.6252,0.0000,0.0000,-0.7804
+0.6252,0.0000,0.0000,-0.7804
+0.6252,0.0000,0.0000,-0.7804
+0.6252,0.0000,0.0000,-0.7804
+0.6129,0.0000,0.0000,-0.7902
+0.6129,0.0000,0.0000,-0.7902
+0.6129,0.0000,0.0000,-0.7902
+0.6129,0.0000,0.0000,-0.7902
+0.6004,0.0000,0.0000,-0.7997
+0.6004,0.0000,0.0000,-0.7997
+0.6004,0.0000,0.0000,-0.7997
+0.6004,0.0000,0.0000,-0.7997
+0.5878,0.0000,0.0000,-0.8090
+0.5878,0.0000,0.0000,-0.8090
+0.5878,0.0000,0.0000,-0.8090
+0.5878,0.0000,0.0000,-0.8090
+0.5750,0.0000,0.0000,-0.8181
+0.5750,0.0000,0.0000,-0.8181
+0.5750,0.0000,0.0000,-0.8181
+0.5750,0.0000,0.0000,-0.8181
+0.5621,0.0000,0.0000,-0.8271
+0.5621,0.0000,0.0000,-0.8271
+0.5621,0.0000,0.0000,-0.8271
+0.5621,0.0000,0.0000,-0.8271
+0.5490,0.0000,0.0000,-0.8358
+0.5490,0.0000,0.0000,-0.8358
+0.5490,0.0000,0.0000,-0.8358
+0.5490,0.0000,0.0000,-0.8358
+0.5358,0.0000,0.0000,-0.8443
+0.5358,0.0000,0.0000,-0.8443
+0.5358,0.0000,0.0000,-0.8443
+0.5358,0.0000,0.0000,-0.8443
+0.5225,0.0000,0.0000,-0.8526
+0.5225,0.0000,0.0000,-0.8526
+0.5225,0.0000,0.0000,-0.8526
+0.5225,0.0000,0.0000,-0.8526
+0.5090,0.0000,0.0000,-0.8607
+0.5090,0.0000,0.0000,-0.8607
+0.5090,0.0000,0.0000,-0.8607
+0.5090,0.0000,0.0000,-0.8607
+0.4955,0.0000,0.0000,-0.8686
+0.4955,0.0000,0.0000,-0.8686
+0.4955,0.0000,0.0000,-0.8686
+0.4955,0.0000,0.0000,-0.8686
+0.4818,0.0000,0.0000,-0.8763
+0.4818,0.0000,0.0000,-0.8763
+0.4818,0.0000,0.0000,-0.8763
+0.4818,0.0000,0.0000,-0.8763
+0.4679,0.0000,0.0000,-0.8838
+0.4679,0.0000,0.0000,-0.8838
+0.4679,0.0000,0.0000,-0.8838
+0.4679,0.0000,0.0000,-0.8838
+0.4540,0.0000,0.0000,-0.8910
+0.4540,0.0000,0.0000,-0.8910
+0.4540,0.0000,0.0000,-0.8910
+0.4540,0.0000,0.0000,-0.8910
+0.4399,0.0000,0.0000,-0.8980
+0.4399,0.0000,0.0000,-0.8980
+0.4399,0.0000,0.0000,-0.8980
+0.4399,0.0000,0.0000,-0.8980
+0.4258,0.0000,0.0000,-0.9048
+0.4258,0.0000,0.0000,-0.9048
+0.4258,0.0000,0.0000,-0.9048
+0.4258,0.0000,0.0000,-0.9048
+0.4115,0.0000,0.0000,-0.9114
+0.4115,0.0000,0.0000,-0.9114
+0.4115,0.0000,0.0000,-0.9114
+0.4115,0.0000,0.0000,-0.9114
+0.3971,0.0000,0.0000,-0.9178
+0.3971,0.0000,0.0000,-0.9178
+0.3971,0.0000,0.0000,-0.9178
+0.3971,0.0000,0.0000,-0.9178
+0.3827,0.0000,0.0000,-0.9239
+0.3827,0.0000,0.0000,-0.9239
+0.3827,0.0000,0.0000,-0.9239
+0.3827,0.0000,0.0000,-0.9239
+0.3681,0.0000,0.0000,-0.9298
+0.3681,0.0000,0.0000,-0.9298
+0.3681,0.0000,0.0000,-0.9298
+0.3681,0.0000,0.0000,-0.9298
+0.3535,0.0000,0.0000,-0.9354
+0.3535,0.0000,0.0000,-0.9354
+0.3535,0.0000,0.0000,-0.9354
+0.3535,0.0000,0.0000,-0.9354
+0.3387,0.0000,0.0000,-0.9409
+0.3387,0.0000,0.0000,-0.9409
+0.3387,0.0000,0.0000,-0.9409
+0.3387,0.0000,0.0000,-0.9409
+0.3239,0.0000,0.0000,-0.9461
+0.3239,0.0000,0.0000,-0.9461
+0.3239,0.0000,0.0000,-0.9461
+0.3239,0.0000,0.0000,-0.9461
+0.3090,0.0000,0.0000,-0.9511
+0.3090,0.0000,0.0000,-0.9511
+0.3090,0.0000,0.0000,-0.9511
+0.3090,0.0000,0.0000,-0.9511
+0.2940,0.0000,0.0000,-0.9558
+0.2940,0.0000,0.0000,-0.9558
+0.2940,0.0000,0.0000,-0.9558
+0.2940,0.0000,0.0000,-0.9558
+0.2790,0.0000,0.0000,-0.9603
+0.2790,0.0000,0.0000,-0.9603
+0.2790,0.0000,0.0000,-0.9603
+0.2790,0.0000,0.0000,-0.9603
+0.2639,0.0000,0.0000,-0.9646
+0.2639,0.0000,0.0000,-0.9646
+0.2639,0.0000,0.0000,-0.9646
+0.2639,0.0000,0.0000,-0.9646
+0.2487,0.0000,0.0000,-0.9686
+0.2487,0.0000,0.0000,-0.9686
+0.2487,0.0000,0.0000,-0.9686
+0.2487,0.0000,0.0000,-0.9686
+0.2334,0.0000,0.0000,-0.9724
+0.2334,0.0000,0.0000,-0.9724
+0.2334,0.0000,0.0000,-0.9724
+0.2334,0.0000,0.0000,-0.9724
+0.2181,0.0000,0.0000,-0.9759
+0.2181,0.0000,0.0000,-0.9759
+0.2181,0.0000,0.0000,-0.9759
+0.2181,0.0000,0.0000,-0.9759
+0.2028,0.0000,0.0000,-0.9792
+0.2028,0.0000,0.0000,-0.9792
+0.2028,0.0000,0.0000,-0.9792
+0.2028,0.0000,0.0000,-0.9792
+0.1874,0.0000,0.0000,-0.9823
+0.1874,0.0000,0.0000,-0.9823
+0.1874,0.0000,0.0000,-0.9823
+0.1874,0.0000,0.0000,-0.9823
+0.1719,0.0000,0.0000,-0.9851
+0.1719,0.0000,0.0000,-0.9851
+0.1719,0.0000,0.0000,-0.9851
+0.1719,0.0000,0.0000,-0.9851
+0.1564,0.0000,0.0000,-0.9877
+0.1564,0.0000,0.0000,-0.9877
+0.1564,0.0000,0.0000,-0.9877
+0.1564,0.0000,0.0000,-0.9877
+0.1409,0.0000,0.0000,-0.9900
+0.1409,0.0000,0.0000,-0.9900
+0.1409,0.0000,0.0000,-0.9900
+0.1409,0.0000,0.0000,-0.9900
+0.1253,0.0000,0.0000,-0.9921
+0.1253,0.0000,0.0000,-0.9921
+0.1253,0.0000,0.0000,-0.9921
+0.1253,0.0000,0.0000,-0.9921
+0.1097,0.0000,0.0000,-0.9940
+0.1097,0.0000,0.0000,-0.9940
+0.1097,0.0000,0.0000,-0.9940
+0.1097,0.0000,0.0000,-0.9940
+0.0941,0.0000,0.0000,-0.9956
+0.0941,0.0000,0.0000,-0.9956
+0.0941,0.0000,0.0000,-0.9956
+0.0941,0.0000,0.0000,-0.9956
+0.0785,0.0000,0.0000,-0.9969
+0.0785,0.0000,0.0000,-0.9969
+0.0785,0.0000,0.0000,-0.9969
+0.0785,0.0000,0.0000,-0.9969
+0.0628,0.0000,0.0000,-0.9980
+0.0628,0.0000,0.0000,-0.9980
+0.0628,0.0000,0.0000,-0.9980
+0.0628,0.0000,0.0000,-0.9980
+0.0471,0.0000,0.0000,-0.9989
+0.0471,0.0000,0.0000,-0.9989
+0.0471,0.0000,0.0000,-0.9989
+0.0471,0.0000,0.0000,-0.9989
+0.0314,0.0000,0.0000,-0.9995
+0.0314,0.0000,0.0000,-0.9995
+0.0314,0.0000,0.0000,-0.9995
+0.0314,0.0000,0.0000,-0.9995
+0.0157,0.0000,0.0000,-0.9999
+0.0157,0.0000,0.0000,-0.9999
+0.0157,0.0000,0.0000,-0.9999
+0.0157,0.0000,0.0000,-0.9999
+-0.0000,0.0000,0.0000,-1.0000
+-0.0000,0.0000,0.0000,-1.0000
+-0.0000,0.0000,0.0000,-1.0000
+-0.0000,0.0000,0.0000,-1.0000
+-0.0157,0.0000,0.0000,-0.9999
+-0.0157,0.0000,0.0000,-0.9999
+-0.0157,0.0000,0.0000,-0.9999
+-0.0157,0.0000,0.0000,-0.9999
+-0.0314,0.0000,0.0000,-0.9995
+-0.0314,0.0000,0.0000,-0.9995
+-0.0314,0.0000,0.0000,-0.9995
+-0.0314,0.0000,0.0000,-0.9995
+-0.0471,0.0000,0.0000,-0.9989
+-0.0471,0.0000,0.0000,-0.9989
+-0.0471,0.0000,0.0000,-0.9989
+-0.0471,0.0000,0.0000,-0.9989
+-0.0628,0.0000,0.0000,-0.9980
+-0.0628,0.0000,0.0000,-0.9980
+-0.0628,0.0000,0.0000,-0.9980
+-0.0628,0.0000,0.0000,-0.9980
+-0.0785,0.0000,0.0000,-0.9969
+-0.0785,0.0000,0.0000,-0.9969
+-0.0785,0.0000,0.0000,-0.9969
+-0.0785,0.0000,0.0000,-0.9969
+-0.0941,0.0000,0.0000,-0.9956
+-0.0941,0.0000,0.0000,-0.9956
+-0.0941,0.0000,0.0000,-0.9956
+-0.0941,0.0000,0.0000,-0.9956
+-0.1097,0.0000,0.0000,-0.9940
+-0.1097,0.0000,0.0000,-0.9940
+-0.1097,0.0000,0.0000,-0.9940
+-0.1097,0.0000,0.0000,-0.9940
+-0.1253,0.0000,0.0000,-0.9921
+-0.1253,0.0000,0.0000,-0.9921
+-0.1253,0.0000,0.0000,-0.9921
+-0.1253,0.0000,0.0000,-0.9921
+-0.1409,0.0000,0.0000,-0.9900
+-0.1409,0.0000,0.0000,-0.9900
+-0.1409,0.0000,0.0000,-0.9900
+-0.1409,0.0000,0.0000,-0.9900
+-0.1564,0.0000,0.0000,-0.9877
+-0.1564,0.0000,0.0000,-0.9877
+-0.1564,0.0000,0.0000,-0.9877
+-0.1564,0.0000,0.0000,-0.9877
+-0.1719,0.0000,0.0000,-0.9851
+-0.1719,0.0000,0.0000,-0.9851
+-0.1719,0.0000,0.0000,-0.9851
+-0.1719,0.0000,0.0000,-0.9851
+-0.1874,0.0000,0.0000,-0.9823
+-0.1874,0.0000,0.0000,-0.9823
+-0.1874,0.0000,0.0000,-0.9823
+-0.1874,0.0000,0.0000,-0.9823
+-0.2028,0.0000,0.0000,-0.9792
+-0.2028,0.0000,0.0000,-0.9792
+-0.2028,0.0000,0.0000,-0.9792
+-0.2028,0.0000,0.0000,-0.9792
+-0.2181,0.0000,0.0000,-0.9759
+-0.2181,0.0000,0.0000,-0.9759
+-0.2181,0.0000,0.0000,-0.9759
+-0.2181,0.0000,0.0000,-0.9759
+-0.2334,0.0000,0.0000,-0.9724
+-0.2334,0.0000,0.0000,-0.9724
+-0.2334,0.0000,0.0000,-0.9724
+-0.2334,0.0000,0.0000,-0.9724
+-0.2487,0.0000,0.0000,-0.9686
+-0.2487,0.0000,0.0000,-0.9686
+-0.2487,0.0000,0.0000,-0.9686
+-0.2487,0.0000,0.0000,-0.9686
+-0.2639,0.0000,0.0000,-0.9646
+-0.2639,0.0000,0.0000,-0.9646
+-0.2639,0.0000,0.0000,-0.9646
+-0.2639,0.0000,0.0000,-0.9646
+-0.2790,0.0000,0.0000,-0.9603
+-0.2790,0.0000,0.0000,-0.9603
+-0.2790,0.0000,0.0000,-0.9603
+-0.2790,0.0000,0.0000,-0.9603
+-0.2940,0.0000,0.0000,-0.9558
+-0.2940,0.0000,0.0000,-0.9558
+-0.2940,0.0000,0.0000,-0.9558
+-0.2940,0.0000,0.0000,-0.9558
+-0.3090,0.0000,0.0000,-0.9511
+-0.3090,0.0000,0.0000,-0.9511
+-0.3090,0.0000,0.0000,-0.9511
+-0.3090,0.0000,0.0000,-0.9511
+-0.3239,0.0000,0.0000,-0.9461
+-0.3239,0.0000,0.0000,-0.9461
+-0.3239,0.0000,0.0000,-0.9461
+-0.3239,0.0000,0.0000,-0.9461
+-0.3387,0.0000,0.0000,-0.9409
+-0.3387,0.0000,0.0000,-0.9409
+-0.3387,0.0000,0.0000,-0.9409
+-0.3387,0.0000,0.0000,-0.9409
+-0.3535,0.0000,0.0000,-0.9354
+-0.3535,0.0000,0.0000,-0.9354
+-0.3535,0.0000,0.0000,-0.9354
+-0.3535,0.0000,0.0000,-0.9354
+-0.3681,0.0000,0.0000,-0.9298
+-0.3681,0.0000,0.0000,-0.9298
+-0.3681,0.0000,0.0000,-0.9298
+-0.3681,0.0000,0.0000,-0.9298
+-0.3827,0.0000,0.0000,-0.9239
+-0.3827,0.0000,0.0000,-0.9239
+-0.3827,0.0000,0.0000,-0.9239
+-0.3827,0.0000,0.0000,-0.9239
+-0.3971,0.0000,0.0000,-0.9178
+-0.3971,0.0000,0.0000,-0.9178
+-0.3971,0.0000,0.0000,-0.9178
+-0.3971,0.0000,0.0000,-0.9178
+-0.4115,0.0000,0.0000,-0.9114
+-0.4115,0.0000,0.0000,-0.9114
+-0.4115,0.0000,0.0000,-0.9114
+-0.4115,0.0000,0.0000,-0.9114
+-0.4258,0.0000,0.0000,-0.9048
+-0.4258,0.0000,0.0000,-0.9048
+-0.4258,0.0000,0.0000,-0.9048
+-0.4258,0.0000,0.0000,-0.9048
+-0.4399,0.0000,0.0000,-0.8980
+-0.4399,0.0000,0.0000,-0.8980
+-0.4399,0.0000,0.0000,-0.8980
+-0.4399,0.0000,0.0000,-0.8980
+-0.4540,0.0000,0.0000,-0.8910
+-0.4540,0.0000,0.0000,-0.8910
+-0.4540,0.0000,0.0000,-0.8910
+-0.4540,0.0000,0.0000,-0.8910
+-0.4679,0.0000,0.0000,-0.8838
+-0.4679,0.0000,0.0000,-0.8838
+-0.4679,0.0000,0.0000,-0.8838
+-0.4679,0.0000,0.0000,-0.8838
+-0.4818,0.0000,0.0000,-0.8763
+-0.4818,0.0000,0.0000,-0.8763
+-0.4818,0.0000,0.0000,-0.8763
+-0.4818,0.0000,0.0000,-0.8763
+-0.4955,0.0000,0.0000,-0.8686
+-0.4955,0.0000,0.0000,-0.8686
+-0.4955,0.0000,0.0000,-0.8686
+-0.4955,0.0000,0.0000,-0.8686
+-0.5090,0.0000,0.0000,-0.8607
+-0.5090,0.0000,0.0000,-0.8607
+-0.5090,0.0000,0.0000,-0.8607
+-0.5090,0.0000,0.0000,-0.8607
+-0.5225,0.0000,0.0000,-0.8526
+-0.5225,0.0000,0.0000,-0.8526
+-0.5225,0.0000,0.0000,-0.8526
+-0.5225,0.0000,0.0000,-0.8526
+-0.5358,0.0000,0.0000,-0.8443
+-0.5358,0.0000,0.0000,-0.8443
+-0.5358,0.0000,0.0000,-0.8443
+-0.5358,0.0000,0.0000,-0.8443
+-0.5490,0.0000,0.0000,-0.8358
+-0.5490,0.0000,0.0000,-0.8358
+-0.5490,0.0000,0.0000,-0.8358
+-0.5490,0.0000,0.0000,-0.8358
+-0.5621,0.0000,0.0000,-0.8271
+-0.5621,0.0000,0.0000,-0.8271
+-0.5621,0.0000,0.0000,-0.8271
+-0.5621,0.0000,0.0000,-0.8271
+-0.5750,0.0000,0.0000,-0.8181
+-0.5750,0.0000,0.0000,-0.8181
+-0.5750,0.0000,0.0000,-0.8181
+-0.5750,0.0000,0.0000,-0.8181
+-0.5878,0.0000,0.0000,-0.8090
+-0.5878,0.0000,0.0000,-0.8090
+-0.5878,0.0000,0.0000,-0.8090
+-0.5878,0.0000,0.0000,-0.8090
+-0.6004,0.0000,0.0000,-0.7997
+-0.6004,0.0000,0.0000,-0.7997
+-0.6004,0.0000,0.0000,-0.7997
+-0.6004,0.0000,0.0000,-0.7997
+-0.6129,0.0000,0.0000,-0.7902
+-0.6129,0.0000,0.0000,-0.7902
+-0.6129,0.0000,0.0000,-0.7902
+-0.6129,0.0000,0.0000,-0.7902
+-0.6252,0.0000,0.0000,-0.7804
+-0.6252,0.0000,0.0000,-0.7804
+-0.6252,0.0000,0.0000,-0.7804
+-0.6252,0.0000,0.0000,-0.7804
+-0.6374,0.0000,0.0000,-0.7705
+-0.6374,0.0000,0.0000,-0.7705
+-0.6374,0.0000,0.0000,-0.7705
+-0.6374,0.0000,0.0000,-0.7705
+-0.6494,0.0000,0.0000,-0.7604
+-0.6494,0.0000,0.0000,-0.7604
+-0.6494,0.0000,0.0000,-0.7604
+-0.6494,0.0000,0.0000,-0.7604
+-0.6613,0.0000,0.0000,-0.7501
+-0.6613,0.0000,0.0000,-0.7501
+-0.6613,0.0000,0.0000,-0.7501
+-0.6613,0.0000,0.0000,-0.7501
+-0.6730,0.0000,0.0000,-0.7396
+-0.6730,0.0000,0.0000,-0.7396
+-0.6730,0.0000,0.0000,-0.7396
+-0.6730,0.0000,0.0000,-0.7396
+-0.6845,0.0000,0.0000,-0.7290
+-0.6845,0.0000,0.0000,-0.7290
+-0.6845,0.0000,0.0000,-0.7290
+-0.6845,0.0000,0.0000,-0.7290
+-0.6959,0.0000,0.0000,-0.7181
+-0.6959,0.0000,0.0000,-0.7181
+-0.6959,0.0000,0.0000,-0.7181
+-0.6959,0.0000,0.0000,-0.7181
+-0.7071,0.0000,0.0000,-0.7071
+-0.7071,0.0000,0.0000,-0.7071
+-0.7071,0.0000,0.0000,-0.7071
+-0.7071,0.0000,0.0000,-0.7071
+-0.7181,0.0000,0.0000,-0.6959
+-0.7181,0.0000,0.0000,-0.6959
+-0.7181,0.0000,0.0000,-0.6959
+-0.7181,0.0000,0.0000,-0.6959
+-0.7290,0.0000,0.0000,-0.6845
+-0.7290,0.0000,0.0000,-0.6845
+-0.7290,0.0000,0.0000,-0.6845
+-0.7290,0.0000,0.0000,-0.6845
+-0.7396,0.0000,0.0000,-0.6730
+-0.7396,0.0000,0.0000,-0.6730
+-0.7396,0.0000,0.0000,-0.6730
+-0.7396,0.0000,0.0000,-0.6730
+-0.7501,0.0000,0.0000,-0.6613
+-0.7501,0.0000,0.0000,-0.6613
+-0.7501,0.0000,0.0000,-0.6613
+-0.7501,0.0000,0.0000,-0.6613
+-0.7604,0.0000,0.0000,-0.6494
+-0.7604,0.0000,0.0000,-0.6494
+-0.7604,0.0000,0.0000,-0.6494
+-0.7604,0.0000,0.0000,-0.6494
+-0.7705,0.0000,0.0000,-0.6374
+-0.7705,0.0000,0.0000,-0.6374
+-0.7705,0.0000,0.0000,-0.6374
+-0.7705,0.0000,0.0000,-0.6374
+-0.7804,0.0000,0.0000,-0.6252
+-0.7804,0.0000,0.0000,-0.6252
+-0.7804,0.0000,0.0000,-0.6252
+-0.7804,0.0000,0.0000,-0.6252
+-0.7902,0.0000,0.0000,-0.6129
+-0.7902,0.0000,0.0000,-0.6129
+-0.7902,0.0000,0.0000,-0.6129
+-0.7902,0.0000,0.0000,-0.6129
+-0.7997,0.0000,0.0000,-0.6004
+-0.7997,0.0000,0.0000,-0.6004
+-0.7997,0.0000,0.0000,-0.6004
+-0.7997,0.0000,0.0000,-0.6004
+-0.8090,0.0000,0.0000,-0.5878
+-0.8090,0.0000,0.0000,-0.5878
+-0.8090,0.0000,0.0000,-0.5878
+-0.8090,0.0000,0.0000,-0.5878
+-0.8182,0.0000,0.0000,-0.5750
+-0.8182,0.0000,0.0000,-0.5750
+-0.8182,0.0000,0.0000,-0.5750
+-0.8182,0.0000,0.0000,-0.5750
+-0.8271,0.0000,0.0000,-0.5621
+-0.8271,0.0000,0.0000,-0.5621
+-0.8271,0.0000,0.0000,-0.5621
+-0.8271,0.0000,0.0000,-0.5621
+-0.8358,0.0000,0.0000,-0.5490
+-0.8358,0.0000,0.0000,-0.5490
+-0.8358,0.0000,0.0000,-0.5490
+-0.8358,0.0000,0.0000,-0.5490
+-0.8443,0.0000,0.0000,-0.5358
+-0.8443,0.0000,0.0000,-0.5358
+-0.8443,0.0000,0.0000,-0.5358
+-0.8443,0.0000,0.0000,-0.5358
+-0.8526,0.0000,0.0000,-0.5225
+-0.8526,0.0000,0.0000,-0.5225
+-0.8526,0.0000,0.0000,-0.5225
+-0.8526,0.0000,0.0000,-0.5225
+-0.8607,0.0000,0.0000,-0.5090
+-0.8607,0.0000,0.0000,-0.5090
+-0.8607,0.0000,0.0000,-0.5090
+-0.8607,0.0000,0.0000,-0.5090
+-0.8686,0.0000,0.0000,-0.4955
+-0.8686,0.0000,0.0000,-0.4955
+-0.8686,0.0000,0.0000,-0.4955
+-0.8686,0.0000,0.0000,-0.4955
+-0.8763,0.0000,0.0000,-0.4818
+-0.8763,0.0000,0.0000,-0.4818
+-0.8763,0.0000,0.0000,-0.4818
+-0.8763,0.0000,0.0000,-0.4818
+-0.8838,0.0000,0.0000,-0.4679
+-0.8838,0.0000,0.0000,-0.4679
+-0.8838,0.0000,0.0000,-0.4679
+-0.8838,0.0000,0.0000,-0.4679
+-0.8910,0.0000,0.0000,-0.4540
+-0.8910,0.0000,0.0000,-0.4540
+-0.8910,0.0000,0.0000,-0.4540
+-0.8910,0.0000,0.0000,-0.4540
+-0.8980,0.0000,0.0000,-0.4399
+-0.8980,0.0000,0.0000,-0.4399
+-0.8980,0.0000,0.0000,-0.4399
+-0.8980,0.0000,0.0000,-0.4399
+-0.9048,0.0000,0.0000,-0.4258
+-0.9048,0.0000,0.0000,-0.4258
+-0.9048,0.0000,0.0000,-0.4258
+-0.9048,0.0000,0.0000,-0.4258
+-0.9114,0.0000,0.0000,-0.4115
+-0.9114,0.0000,0.0000,-0.4115
+-0.9114,0.0000,0.0000,-0.4115
+-0.9114,0.0000,0.0000,-0.4115
+-0.9178,0.0000,0.0000,-0.3971
+-0.9178,0.0000,0.0000,-0.3971
+-0.9178,0.0000,0.0000,-0.3971
+-0.9178,0.0000,0.0000,-0.3971
+-0.9239,0.0000,0.0000,-0.3827
+-0.9239,0.0000,0.0000,-0.3827
+-0.9239,0.0000,0.0000,-0.3827
+-0.9239,0.0000,0.0000,-0.3827
+-0.9298,0.0000,0.0000,-0.3681
+-0.9298,0.0000,0.0000,-0.3681
+-0.9298,0.0000,0.0000,-0.3681
+-0.9298,0.0000,0.0000,-0.3681
+-0.9354,0.0000,0.0000,-0.3535
+-0.9354,0.0000,0.0000,-0.3535
+-0.9354,0.0000,0.0000,-0.3535
+-0.9354,0.0000,0.0000,-0.3535
+-0.9409,0.0000,0.0000,-0.3387
+-0.9409,0.0000,0.0000,-0.3387
+-0.9409,0.0000,0.0000,-0.3387
+-0.9409,0.0000,0.0000,-0.3387
+-0.9461,0.0000,0.0000,-0.3239
+-0.9461,0.0000,0.0000,-0.3239
+-0.9461,0.0000,0.0000,-0.3239
+-0.9461,0.0000,0.0000,-0.3239
+-0.9511,0.0000,0.0000,-0.3090
+-0.9511,0.0000,0.0000,-0.3090
+-0.9511,0.0000,0.0000,-0.3090
+-0.9511,0.0000,0.0000,-0.3090
+-0.9558,0.0000,0.0000,-0.2940
+-0.9558,0.0000,0.0000,-0.2940
+-0.9558,0.0000,0.0000,-0.2940
+-0.9558,0.0000,0.0000,-0.2940
+-0.9603,0.0000,0.0000,-0.2790
+-0.9603,0.0000,0.0000,-0.2790
+-0.9603,0.0000,0.0000,-0.2790
+-0.9603,0.0000,0.0000,-0.2790
+-0.9646,0.0000,0.0000,-0.2639
+-0.9646,0.0000,0.0000,-0.2639
+-0.9646,0.0000,0.0000,-0.2639
+-0.9646,0.0000,0.0000,-0.2639
+-0.9686,0.0000,0.0000,-0.2487
+-0.9686,0.0000,0.0000,-0.2487
+-0.9686,0.0000,0.0000,-0.2487
+-0.9686,0.0000,0.0000,-0.2487
+-0.9724,0.0000,0.0000,-0.2334
+-0.9724,0.0000,0.0000,-0.2334
+-0.9724,0.0000,0.0000,-0.2334
+-0.9724,0.0000,0.0000,-0.2334
+-0.9759,0.0000,0.0000,-0.2181
+-0.9759,0.0000,0.0000,-0.2181
+-0.9759,0.0000,0.0000,-0.2181
+-0.9759,0.0000,0.0000,-0.2181
+-0.9792,0.0000,0.0000,-0.2028
+-0.9792,0.0000,0.0000,-0.2028
+-0.9792,0.0000,0.0000,-0.2028
+-0.9792,0.0000,0.0000,-0.2028
+-0.9823,0.0000,0.0000,-0.1874
+-0.9823,0.0000,0.0000,-0.1874
+-0.9823,0.0000,0.0000,-0.1874
+-0.9823,0.0000,0.0000,-0.1874
+-0.9851,0.0000,0.0000,-0.1719
+-0.9851,0.0000,0.0000,-0.1719
+-0.9851,0.0000,0.0000,-0.1719
+-0.9851,0.0000,0.0000,-0.1719
+-0.9877,0.0000,0.0000,-0.1564
+-0.9877,0.0000,0.0000,-0.1564
+-0.9877,0.0000,0.0000,-0.1564
+-0.9877,0.0000,0.0000,-0.1564
+-0.9900,0.0000,0.0000,-0.1409
+-0.9900,0.0000,0.0000,-0.1409
+-0.9900,0.0000,0.0000,-0.1409
+-0.9900,0.0000,0.0000,-0.1409
+-0.9921,0.0000,0.0000,-0.1253
+-0.9921,0.0000,0.0000,-0.1253
+-0.9921,0.0000,0.0000,-0.1253
+-0.9921,0.0000,0.0000,-0.1253
+-0.9940,0.0000,0.0000,-0.1097
+-0.9940,0.0000,0.0000,-0.1097
+-0.9940,0.0000,0.0000,-0.1097
+-0.9940,0.0000,0.0000,-0.1097
+-0.9956,0.0000,0.0000,-0.0941
+-0.9956,0.0000,0.0000,-0.0941
+-0.9956,0.0000,0.0000,-0.0941
+-0.9956,0.0000,0.0000,-0.0941
+-0.9969,0.0000,0.0000,-0.0785
+-0.9969,0.0000,0.0000,-0.0785
+-0.9969,0.0000,0.0000,-0.0785
+-0.9969,0.0000,0.0000,-0.0785
+-0.9980,0.0000,0.0000,-0.0628
+-0.9980,0.0000,0.0000,-0.0628
+-0.9980,0.0000,0.0000,-0.0628
+-0.9980,0.0000,0.0000,-0.0628
+-0.9989,0.0000,0.0000,-0.0471
+-0.9989,0.0000,0.0000,-0.0471
+-0.9989,0.0000,0.0000,-0.0471
+-0.9989,0.0000,0.0000,-0.0471
+-0.9995,0.0000,0.0000,-0.0314
+-0.9995,0.0000,0.0000,-0.0314
+-0.9995,0.0000,0.0000,-0.0314
+-0.9995,0.0000,0.0000,-0.0314
+-0.9999,0.0000,0.0000,-0.0157
+-0.9999,0.0000,0.0000,-0.0157
+-0.9999,0.0000,0.0000,-0.0157
+-0.9999,0.0000,0.0000,-0.0157
+1.0000,0.0000,0.0000,-0.0000
+1.0000,0.0000,0.0000,-0.0000
+1.0000,0.0000,0.0000,-0.0000
+1.0000,0.0000,0.0000,-0.0000
diff --git a/scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv b/scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv
new file mode 100644
index 0000000000000000000000000000000000000000..8fe2d2fe05d8e71170104a79cf3d50315ea722c8
--- /dev/null
+++ b/scripts/trajectories/full-circle-with-up-and-down-4s-Vector3.csv
@@ -0,0 +1,200 @@
+0.0000,0.0000,0.0000,0.7012,-0.0220,-0.7126
+0.0000,0.0000,0.0000,0.7057,-0.0444,-0.7071
+0.0000,0.0000,0.0000,0.7095,-0.0671,-0.7015
+0.0000,0.0000,0.0000,0.7125,-0.0900,-0.6959
+0.0000,0.0000,0.0000,0.7147,-0.1132,-0.6903
+0.0000,0.0000,0.0000,0.7161,-0.1366,-0.6845
+0.0000,0.0000,0.0000,0.7166,-0.1602,-0.6788
+0.0000,0.0000,0.0000,0.7164,-0.1839,-0.6730
+0.0000,0.0000,0.0000,0.7153,-0.2078,-0.6672
+0.0000,0.0000,0.0000,0.7134,-0.2318,-0.6613
+0.0000,0.0000,0.0000,0.7106,-0.2558,-0.6554
+0.0000,0.0000,0.0000,0.7070,-0.2799,-0.6494
+0.0000,0.0000,0.0000,0.7025,-0.3040,-0.6435
+0.0000,0.0000,0.0000,0.6972,-0.3281,-0.6374
+0.0000,0.0000,0.0000,0.6910,-0.3521,-0.6314
+0.0000,0.0000,0.0000,0.6839,-0.3760,-0.6252
+0.0000,0.0000,0.0000,0.6760,-0.3998,-0.6191
+0.0000,0.0000,0.0000,0.6671,-0.4234,-0.6129
+0.0000,0.0000,0.0000,0.6575,-0.4468,-0.6067
+0.0000,0.0000,0.0000,0.6470,-0.4700,-0.6004
+0.0000,0.0000,0.0000,0.6356,-0.4930,-0.5941
+0.0000,0.0000,0.0000,0.6234,-0.5157,-0.5878
+0.0000,0.0000,0.0000,0.6103,-0.5380,-0.5814
+0.0000,0.0000,0.0000,0.5964,-0.5601,-0.5750
+0.0000,0.0000,0.0000,0.5817,-0.5817,-0.5686
+0.0000,0.0000,0.0000,0.5662,-0.6029,-0.5621
+0.0000,0.0000,0.0000,0.5499,-0.6237,-0.5556
+0.0000,0.0000,0.0000,0.5328,-0.6440,-0.5490
+0.0000,0.0000,0.0000,0.5149,-0.6638,-0.5424
+0.0000,0.0000,0.0000,0.4963,-0.6831,-0.5358
+0.0000,0.0000,0.0000,0.4769,-0.7018,-0.5292
+0.0000,0.0000,0.0000,0.4569,-0.7199,-0.5225
+0.0000,0.0000,0.0000,0.4361,-0.7374,-0.5158
+0.0000,0.0000,0.0000,0.4147,-0.7543,-0.5090
+0.0000,0.0000,0.0000,0.3926,-0.7705,-0.5023
+0.0000,0.0000,0.0000,0.3698,-0.7860,-0.4955
+0.0000,0.0000,0.0000,0.3465,-0.8007,-0.4886
+0.0000,0.0000,0.0000,0.3226,-0.8148,-0.4818
+0.0000,0.0000,0.0000,0.2981,-0.8280,-0.4749
+0.0000,0.0000,0.0000,0.2731,-0.8405,-0.4679
+0.0000,0.0000,0.0000,0.2476,-0.8522,-0.4610
+0.0000,0.0000,0.0000,0.2216,-0.8630,-0.4540
+0.0000,0.0000,0.0000,0.1951,-0.8730,-0.4470
+0.0000,0.0000,0.0000,0.1683,-0.8821,-0.4399
+0.0000,0.0000,0.0000,0.1410,-0.8904,-0.4329
+0.0000,0.0000,0.0000,0.1134,-0.8977,-0.4258
+0.0000,0.0000,0.0000,0.0855,-0.9041,-0.4187
+0.0000,0.0000,0.0000,0.0572,-0.9096,-0.4115
+0.0000,0.0000,0.0000,0.0287,-0.9142,-0.4043
+0.0000,0.0000,0.0000,-0.0000,-0.9178,-0.3971
+0.0000,0.0000,0.0000,-0.0289,-0.9204,-0.3899
+0.0000,0.0000,0.0000,-0.0580,-0.9221,-0.3827
+0.0000,0.0000,0.0000,-0.0872,-0.9227,-0.3754
+0.0000,0.0000,0.0000,-0.1165,-0.9224,-0.3681
+0.0000,0.0000,0.0000,-0.1459,-0.9212,-0.3608
+0.0000,0.0000,0.0000,-0.1753,-0.9189,-0.3535
+0.0000,0.0000,0.0000,-0.2047,-0.9156,-0.3461
+0.0000,0.0000,0.0000,-0.2340,-0.9113,-0.3387
+0.0000,0.0000,0.0000,-0.2632,-0.9060,-0.3313
+0.0000,0.0000,0.0000,-0.2924,-0.8998,-0.3239
+0.0000,0.0000,0.0000,-0.3213,-0.8925,-0.3165
+0.0000,0.0000,0.0000,-0.3501,-0.8843,-0.3090
+0.0000,0.0000,0.0000,-0.3787,-0.8750,-0.3015
+0.0000,0.0000,0.0000,-0.4070,-0.8648,-0.2940
+0.0000,0.0000,0.0000,-0.4350,-0.8536,-0.2865
+0.0000,0.0000,0.0000,-0.4626,-0.8415,-0.2790
+0.0000,0.0000,0.0000,-0.4899,-0.8284,-0.2714
+0.0000,0.0000,0.0000,-0.5168,-0.8144,-0.2639
+0.0000,0.0000,0.0000,-0.5433,-0.7995,-0.2563
+0.0000,0.0000,0.0000,-0.5693,-0.7836,-0.2487
+0.0000,0.0000,0.0000,-0.5948,-0.7669,-0.2411
+0.0000,0.0000,0.0000,-0.6198,-0.7492,-0.2334
+0.0000,0.0000,0.0000,-0.6442,-0.7307,-0.2258
+0.0000,0.0000,0.0000,-0.6681,-0.7114,-0.2181
+0.0000,0.0000,0.0000,-0.6913,-0.6913,-0.2105
+0.0000,0.0000,0.0000,-0.7138,-0.6703,-0.2028
+0.0000,0.0000,0.0000,-0.7357,-0.6486,-0.1951
+0.0000,0.0000,0.0000,-0.7569,-0.6261,-0.1874
+0.0000,0.0000,0.0000,-0.7773,-0.6029,-0.1797
+0.0000,0.0000,0.0000,-0.7970,-0.5790,-0.1719
+0.0000,0.0000,0.0000,-0.8159,-0.5545,-0.1642
+0.0000,0.0000,0.0000,-0.8339,-0.5292,-0.1564
+0.0000,0.0000,0.0000,-0.8512,-0.5034,-0.1487
+0.0000,0.0000,0.0000,-0.8676,-0.4769,-0.1409
+0.0000,0.0000,0.0000,-0.8831,-0.4499,-0.1331
+0.0000,0.0000,0.0000,-0.8977,-0.4224,-0.1253
+0.0000,0.0000,0.0000,-0.9114,-0.3944,-0.1175
+0.0000,0.0000,0.0000,-0.9242,-0.3659,-0.1097
+0.0000,0.0000,0.0000,-0.9360,-0.3370,-0.1019
+0.0000,0.0000,0.0000,-0.9468,-0.3076,-0.0941
+0.0000,0.0000,0.0000,-0.9567,-0.2779,-0.0863
+0.0000,0.0000,0.0000,-0.9656,-0.2479,-0.0785
+0.0000,0.0000,0.0000,-0.9735,-0.2176,-0.0706
+0.0000,0.0000,0.0000,-0.9803,-0.1870,-0.0628
+0.0000,0.0000,0.0000,-0.9862,-0.1562,-0.0549
+0.0000,0.0000,0.0000,-0.9910,-0.1252,-0.0471
+0.0000,0.0000,0.0000,-0.9948,-0.0940,-0.0393
+0.0000,0.0000,0.0000,-0.9975,-0.0628,-0.0314
+0.0000,0.0000,0.0000,-0.9992,-0.0314,-0.0236
+0.0000,0.0000,0.0000,-0.9999,0.0000,-0.0157
+0.0000,0.0000,0.0000,-0.9995,0.0314,-0.0079
+0.0000,0.0000,0.0000,-0.9980,0.0628,0.0000
+0.0000,0.0000,0.0000,-0.9955,0.0941,0.0079
+0.0000,0.0000,0.0000,-0.9920,0.1253,0.0157
+0.0000,0.0000,0.0000,-0.9874,0.1564,0.0236
+0.0000,0.0000,0.0000,-0.9818,0.1873,0.0314
+0.0000,0.0000,0.0000,-0.9752,0.2180,0.0393
+0.0000,0.0000,0.0000,-0.9675,0.2484,0.0471
+0.0000,0.0000,0.0000,-0.9588,0.2786,0.0550
+0.0000,0.0000,0.0000,-0.9492,0.3084,0.0628
+0.0000,0.0000,0.0000,-0.9385,0.3379,0.0706
+0.0000,0.0000,0.0000,-0.9269,0.3670,0.0785
+0.0000,0.0000,0.0000,-0.9143,0.3957,0.0863
+0.0000,0.0000,0.0000,-0.9008,0.4239,0.0941
+0.0000,0.0000,0.0000,-0.8864,0.4516,0.1019
+0.0000,0.0000,0.0000,-0.8710,0.4788,0.1097
+0.0000,0.0000,0.0000,-0.8548,0.5055,0.1175
+0.0000,0.0000,0.0000,-0.8377,0.5316,0.1253
+0.0000,0.0000,0.0000,-0.8197,0.5571,0.1331
+0.0000,0.0000,0.0000,-0.8009,0.5819,0.1409
+0.0000,0.0000,0.0000,-0.7814,0.6061,0.1487
+0.0000,0.0000,0.0000,-0.7610,0.6296,0.1564
+0.0000,0.0000,0.0000,-0.7399,0.6523,0.1642
+0.0000,0.0000,0.0000,-0.7181,0.6744,0.1719
+0.0000,0.0000,0.0000,-0.6956,0.6956,0.1797
+0.0000,0.0000,0.0000,-0.6724,0.7161,0.1874
+0.0000,0.0000,0.0000,-0.6486,0.7357,0.1951
+0.0000,0.0000,0.0000,-0.6242,0.7545,0.2028
+0.0000,0.0000,0.0000,-0.5992,0.7725,0.2105
+0.0000,0.0000,0.0000,-0.5736,0.7895,0.2181
+0.0000,0.0000,0.0000,-0.5476,0.8057,0.2258
+0.0000,0.0000,0.0000,-0.5210,0.8210,0.2334
+0.0000,0.0000,0.0000,-0.4940,0.8354,0.2411
+0.0000,0.0000,0.0000,-0.4666,0.8488,0.2487
+0.0000,0.0000,0.0000,-0.4388,0.8612,0.2563
+0.0000,0.0000,0.0000,-0.4107,0.8728,0.2639
+0.0000,0.0000,0.0000,-0.3822,0.8833,0.2714
+0.0000,0.0000,0.0000,-0.3535,0.8929,0.2790
+0.0000,0.0000,0.0000,-0.3245,0.9014,0.2865
+0.0000,0.0000,0.0000,-0.2954,0.9090,0.2940
+0.0000,0.0000,0.0000,-0.2660,0.9156,0.3015
+0.0000,0.0000,0.0000,-0.2365,0.9212,0.3090
+0.0000,0.0000,0.0000,-0.2069,0.9258,0.3165
+0.0000,0.0000,0.0000,-0.1773,0.9293,0.3239
+0.0000,0.0000,0.0000,-0.1476,0.9319,0.3313
+0.0000,0.0000,0.0000,-0.1179,0.9335,0.3387
+0.0000,0.0000,0.0000,-0.0883,0.9340,0.3461
+0.0000,0.0000,0.0000,-0.0587,0.9336,0.3535
+0.0000,0.0000,0.0000,-0.0293,0.9322,0.3608
+0.0000,0.0000,0.0000,0.0000,0.9298,0.3681
+0.0000,0.0000,0.0000,0.0291,0.9264,0.3754
+0.0000,0.0000,0.0000,0.0580,0.9221,0.3827
+0.0000,0.0000,0.0000,0.0867,0.9168,0.3899
+0.0000,0.0000,0.0000,0.1150,0.9105,0.3971
+0.0000,0.0000,0.0000,0.1431,0.9033,0.4043
+0.0000,0.0000,0.0000,0.1708,0.8953,0.4115
+0.0000,0.0000,0.0000,0.1981,0.8863,0.4187
+0.0000,0.0000,0.0000,0.2250,0.8764,0.4258
+0.0000,0.0000,0.0000,0.2515,0.8657,0.4329
+0.0000,0.0000,0.0000,0.2775,0.8541,0.4399
+0.0000,0.0000,0.0000,0.3030,0.8417,0.4470
+0.0000,0.0000,0.0000,0.3280,0.8284,0.4540
+0.0000,0.0000,0.0000,0.3524,0.8144,0.4610
+0.0000,0.0000,0.0000,0.3763,0.7997,0.4679
+0.0000,0.0000,0.0000,0.3995,0.7841,0.4749
+0.0000,0.0000,0.0000,0.4222,0.7679,0.4818
+0.0000,0.0000,0.0000,0.4441,0.7510,0.4886
+0.0000,0.0000,0.0000,0.4654,0.7334,0.4955
+0.0000,0.0000,0.0000,0.4860,0.7152,0.5023
+0.0000,0.0000,0.0000,0.5059,0.6964,0.5090
+0.0000,0.0000,0.0000,0.5251,0.6769,0.5158
+0.0000,0.0000,0.0000,0.5435,0.6570,0.5225
+0.0000,0.0000,0.0000,0.5611,0.6365,0.5292
+0.0000,0.0000,0.0000,0.5780,0.6155,0.5358
+0.0000,0.0000,0.0000,0.5940,0.5940,0.5424
+0.0000,0.0000,0.0000,0.6093,0.5721,0.5490
+0.0000,0.0000,0.0000,0.6237,0.5499,0.5556
+0.0000,0.0000,0.0000,0.6373,0.5272,0.5621
+0.0000,0.0000,0.0000,0.6500,0.5042,0.5686
+0.0000,0.0000,0.0000,0.6619,0.4809,0.5750
+0.0000,0.0000,0.0000,0.6729,0.4573,0.5814
+0.0000,0.0000,0.0000,0.6831,0.4335,0.5878
+0.0000,0.0000,0.0000,0.6924,0.4095,0.5941
+0.0000,0.0000,0.0000,0.7008,0.3852,0.6004
+0.0000,0.0000,0.0000,0.7083,0.3609,0.6067
+0.0000,0.0000,0.0000,0.7150,0.3364,0.6129
+0.0000,0.0000,0.0000,0.7207,0.3119,0.6191
+0.0000,0.0000,0.0000,0.7256,0.2873,0.6252
+0.0000,0.0000,0.0000,0.7296,0.2627,0.6314
+0.0000,0.0000,0.0000,0.7328,0.2381,0.6374
+0.0000,0.0000,0.0000,0.7351,0.2136,0.6435
+0.0000,0.0000,0.0000,0.7365,0.1891,0.6494
+0.0000,0.0000,0.0000,0.7371,0.1648,0.6554
+0.0000,0.0000,0.0000,0.7368,0.1406,0.6613
+0.0000,0.0000,0.0000,0.7357,0.1165,0.6672
+0.0000,0.0000,0.0000,0.7338,0.0927,0.6730
+0.0000,0.0000,0.0000,0.7311,0.0691,0.6788
+0.0000,0.0000,0.0000,0.7275,0.0458,0.6845
+0.0000,0.0000,0.0000,0.7232,0.0227,0.6903
+0.0000,0.0000,0.0000,0.7181,-0.0000,0.6959
diff --git a/scripts/trajectories/full-circle-with-up-and-down-4s-ccw-Vector3.csv b/scripts/trajectories/full-circle-with-up-and-down-4s-ccw-Vector3.csv
new file mode 100644
index 0000000000000000000000000000000000000000..63108890206963dbde169465283d8eb28796fc68
--- /dev/null
+++ b/scripts/trajectories/full-circle-with-up-and-down-4s-ccw-Vector3.csv
@@ -0,0 +1,200 @@
+0.0000,0.0000,0.0000,0.7012,0.0220,0.7126
+0.0000,0.0000,0.0000,0.7057,0.0444,0.7071
+0.0000,0.0000,0.0000,0.7095,0.0671,0.7015
+0.0000,0.0000,0.0000,0.7125,0.0900,0.6959
+0.0000,0.0000,0.0000,0.7147,0.1132,0.6903
+0.0000,0.0000,0.0000,0.7161,0.1366,0.6845
+0.0000,0.0000,0.0000,0.7166,0.1602,0.6788
+0.0000,0.0000,0.0000,0.7164,0.1839,0.6730
+0.0000,0.0000,0.0000,0.7153,0.2078,0.6672
+0.0000,0.0000,0.0000,0.7134,0.2318,0.6613
+0.0000,0.0000,0.0000,0.7106,0.2558,0.6554
+0.0000,0.0000,0.0000,0.7070,0.2799,0.6494
+0.0000,0.0000,0.0000,0.7025,0.3040,0.6435
+0.0000,0.0000,0.0000,0.6972,0.3281,0.6374
+0.0000,0.0000,0.0000,0.6910,0.3521,0.6314
+0.0000,0.0000,0.0000,0.6839,0.3760,0.6252
+0.0000,0.0000,0.0000,0.6760,0.3998,0.6191
+0.0000,0.0000,0.0000,0.6671,0.4234,0.6129
+0.0000,0.0000,0.0000,0.6575,0.4468,0.6067
+0.0000,0.0000,0.0000,0.6470,0.4700,0.6004
+0.0000,0.0000,0.0000,0.6356,0.4930,0.5941
+0.0000,0.0000,0.0000,0.6234,0.5157,0.5878
+0.0000,0.0000,0.0000,0.6103,0.5380,0.5814
+0.0000,0.0000,0.0000,0.5964,0.5601,0.5750
+0.0000,0.0000,0.0000,0.5817,0.5817,0.5686
+0.0000,0.0000,0.0000,0.5662,0.6029,0.5621
+0.0000,0.0000,0.0000,0.5499,0.6237,0.5556
+0.0000,0.0000,0.0000,0.5328,0.6440,0.5490
+0.0000,0.0000,0.0000,0.5149,0.6638,0.5424
+0.0000,0.0000,0.0000,0.4963,0.6831,0.5358
+0.0000,0.0000,0.0000,0.4769,0.7018,0.5292
+0.0000,0.0000,0.0000,0.4569,0.7199,0.5225
+0.0000,0.0000,0.0000,0.4361,0.7374,0.5158
+0.0000,0.0000,0.0000,0.4147,0.7543,0.5090
+0.0000,0.0000,0.0000,0.3926,0.7705,0.5023
+0.0000,0.0000,0.0000,0.3698,0.7860,0.4955
+0.0000,0.0000,0.0000,0.3465,0.8007,0.4886
+0.0000,0.0000,0.0000,0.3226,0.8148,0.4818
+0.0000,0.0000,0.0000,0.2981,0.8280,0.4749
+0.0000,0.0000,0.0000,0.2731,0.8405,0.4679
+0.0000,0.0000,0.0000,0.2476,0.8522,0.4610
+0.0000,0.0000,0.0000,0.2216,0.8630,0.4540
+0.0000,0.0000,0.0000,0.1951,0.8730,0.4470
+0.0000,0.0000,0.0000,0.1683,0.8821,0.4399
+0.0000,0.0000,0.0000,0.1410,0.8904,0.4329
+0.0000,0.0000,0.0000,0.1134,0.8977,0.4258
+0.0000,0.0000,0.0000,0.0855,0.9041,0.4187
+0.0000,0.0000,0.0000,0.0572,0.9096,0.4115
+0.0000,0.0000,0.0000,0.0287,0.9142,0.4043
+0.0000,0.0000,0.0000,-0.0000,0.9178,0.3971
+0.0000,0.0000,0.0000,-0.0289,0.9204,0.3899
+0.0000,0.0000,0.0000,-0.0580,0.9221,0.3827
+0.0000,0.0000,0.0000,-0.0872,0.9227,0.3754
+0.0000,0.0000,0.0000,-0.1165,0.9224,0.3681
+0.0000,0.0000,0.0000,-0.1459,0.9212,0.3608
+0.0000,0.0000,0.0000,-0.1753,0.9189,0.3535
+0.0000,0.0000,0.0000,-0.2047,0.9156,0.3461
+0.0000,0.0000,0.0000,-0.2340,0.9113,0.3387
+0.0000,0.0000,0.0000,-0.2632,0.9060,0.3313
+0.0000,0.0000,0.0000,-0.2924,0.8998,0.3239
+0.0000,0.0000,0.0000,-0.3213,0.8925,0.3165
+0.0000,0.0000,0.0000,-0.3501,0.8843,0.3090
+0.0000,0.0000,0.0000,-0.3787,0.8750,0.3015
+0.0000,0.0000,0.0000,-0.4070,0.8648,0.2940
+0.0000,0.0000,0.0000,-0.4350,0.8536,0.2865
+0.0000,0.0000,0.0000,-0.4626,0.8415,0.2790
+0.0000,0.0000,0.0000,-0.4899,0.8284,0.2714
+0.0000,0.0000,0.0000,-0.5168,0.8144,0.2639
+0.0000,0.0000,0.0000,-0.5433,0.7995,0.2563
+0.0000,0.0000,0.0000,-0.5693,0.7836,0.2487
+0.0000,0.0000,0.0000,-0.5948,0.7669,0.2411
+0.0000,0.0000,0.0000,-0.6198,0.7492,0.2334
+0.0000,0.0000,0.0000,-0.6442,0.7307,0.2258
+0.0000,0.0000,0.0000,-0.6681,0.7114,0.2181
+0.0000,0.0000,0.0000,-0.6913,0.6913,0.2105
+0.0000,0.0000,0.0000,-0.7138,0.6703,0.2028
+0.0000,0.0000,0.0000,-0.7357,0.6486,0.1951
+0.0000,0.0000,0.0000,-0.7569,0.6261,0.1874
+0.0000,0.0000,0.0000,-0.7773,0.6029,0.1797
+0.0000,0.0000,0.0000,-0.7970,0.5790,0.1719
+0.0000,0.0000,0.0000,-0.8159,0.5545,0.1642
+0.0000,0.0000,0.0000,-0.8339,0.5292,0.1564
+0.0000,0.0000,0.0000,-0.8512,0.5034,0.1487
+0.0000,0.0000,0.0000,-0.8676,0.4769,0.1409
+0.0000,0.0000,0.0000,-0.8831,0.4499,0.1331
+0.0000,0.0000,0.0000,-0.8977,0.4224,0.1253
+0.0000,0.0000,0.0000,-0.9114,0.3944,0.1175
+0.0000,0.0000,0.0000,-0.9242,0.3659,0.1097
+0.0000,0.0000,0.0000,-0.9360,0.3370,0.1019
+0.0000,0.0000,0.0000,-0.9468,0.3076,0.0941
+0.0000,0.0000,0.0000,-0.9567,0.2779,0.0863
+0.0000,0.0000,0.0000,-0.9656,0.2479,0.0785
+0.0000,0.0000,0.0000,-0.9735,0.2176,0.0706
+0.0000,0.0000,0.0000,-0.9803,0.1870,0.0628
+0.0000,0.0000,0.0000,-0.9862,0.1562,0.0549
+0.0000,0.0000,0.0000,-0.9910,0.1252,0.0471
+0.0000,0.0000,0.0000,-0.9948,0.0940,0.0393
+0.0000,0.0000,0.0000,-0.9975,0.0628,0.0314
+0.0000,0.0000,0.0000,-0.9992,0.0314,0.0236
+0.0000,0.0000,0.0000,-0.9999,-0.0000,0.0157
+0.0000,0.0000,0.0000,-0.9995,-0.0314,0.0079
+0.0000,0.0000,0.0000,-0.9980,-0.0628,-0.0000
+0.0000,0.0000,0.0000,-0.9955,-0.0941,-0.0079
+0.0000,0.0000,0.0000,-0.9920,-0.1253,-0.0157
+0.0000,0.0000,0.0000,-0.9874,-0.1564,-0.0236
+0.0000,0.0000,0.0000,-0.9818,-0.1873,-0.0314
+0.0000,0.0000,0.0000,-0.9752,-0.2180,-0.0393
+0.0000,0.0000,0.0000,-0.9675,-0.2484,-0.0471
+0.0000,0.0000,0.0000,-0.9588,-0.2786,-0.0550
+0.0000,0.0000,0.0000,-0.9492,-0.3084,-0.0628
+0.0000,0.0000,0.0000,-0.9385,-0.3379,-0.0706
+0.0000,0.0000,0.0000,-0.9269,-0.3670,-0.0785
+0.0000,0.0000,0.0000,-0.9143,-0.3957,-0.0863
+0.0000,0.0000,0.0000,-0.9008,-0.4239,-0.0941
+0.0000,0.0000,0.0000,-0.8864,-0.4516,-0.1019
+0.0000,0.0000,0.0000,-0.8710,-0.4788,-0.1097
+0.0000,0.0000,0.0000,-0.8548,-0.5055,-0.1175
+0.0000,0.0000,0.0000,-0.8377,-0.5316,-0.1253
+0.0000,0.0000,0.0000,-0.8197,-0.5571,-0.1331
+0.0000,0.0000,0.0000,-0.8009,-0.5819,-0.1409
+0.0000,0.0000,0.0000,-0.7814,-0.6061,-0.1487
+0.0000,0.0000,0.0000,-0.7610,-0.6296,-0.1564
+0.0000,0.0000,0.0000,-0.7399,-0.6523,-0.1642
+0.0000,0.0000,0.0000,-0.7181,-0.6744,-0.1719
+0.0000,0.0000,0.0000,-0.6956,-0.6956,-0.1797
+0.0000,0.0000,0.0000,-0.6724,-0.7161,-0.1874
+0.0000,0.0000,0.0000,-0.6486,-0.7357,-0.1951
+0.0000,0.0000,0.0000,-0.6242,-0.7545,-0.2028
+0.0000,0.0000,0.0000,-0.5992,-0.7725,-0.2105
+0.0000,0.0000,0.0000,-0.5736,-0.7895,-0.2181
+0.0000,0.0000,0.0000,-0.5476,-0.8057,-0.2258
+0.0000,0.0000,0.0000,-0.5210,-0.8210,-0.2334
+0.0000,0.0000,0.0000,-0.4940,-0.8354,-0.2411
+0.0000,0.0000,0.0000,-0.4666,-0.8488,-0.2487
+0.0000,0.0000,0.0000,-0.4388,-0.8612,-0.2563
+0.0000,0.0000,0.0000,-0.4107,-0.8728,-0.2639
+0.0000,0.0000,0.0000,-0.3822,-0.8833,-0.2714
+0.0000,0.0000,0.0000,-0.3535,-0.8929,-0.2790
+0.0000,0.0000,0.0000,-0.3245,-0.9014,-0.2865
+0.0000,0.0000,0.0000,-0.2954,-0.9090,-0.2940
+0.0000,0.0000,0.0000,-0.2660,-0.9156,-0.3015
+0.0000,0.0000,0.0000,-0.2365,-0.9212,-0.3090
+0.0000,0.0000,0.0000,-0.2069,-0.9258,-0.3165
+0.0000,0.0000,0.0000,-0.1773,-0.9293,-0.3239
+0.0000,0.0000,0.0000,-0.1476,-0.9319,-0.3313
+0.0000,0.0000,0.0000,-0.1179,-0.9335,-0.3387
+0.0000,0.0000,0.0000,-0.0883,-0.9340,-0.3461
+0.0000,0.0000,0.0000,-0.0587,-0.9336,-0.3535
+0.0000,0.0000,0.0000,-0.0293,-0.9322,-0.3608
+0.0000,0.0000,0.0000,0.0000,-0.9298,-0.3681
+0.0000,0.0000,0.0000,0.0291,-0.9264,-0.3754
+0.0000,0.0000,0.0000,0.0580,-0.9221,-0.3827
+0.0000,0.0000,0.0000,0.0867,-0.9168,-0.3899
+0.0000,0.0000,0.0000,0.1150,-0.9105,-0.3971
+0.0000,0.0000,0.0000,0.1431,-0.9033,-0.4043
+0.0000,0.0000,0.0000,0.1708,-0.8953,-0.4115
+0.0000,0.0000,0.0000,0.1981,-0.8863,-0.4187
+0.0000,0.0000,0.0000,0.2250,-0.8764,-0.4258
+0.0000,0.0000,0.0000,0.2515,-0.8657,-0.4329
+0.0000,0.0000,0.0000,0.2775,-0.8541,-0.4399
+0.0000,0.0000,0.0000,0.3030,-0.8417,-0.4470
+0.0000,0.0000,0.0000,0.3280,-0.8284,-0.4540
+0.0000,0.0000,0.0000,0.3524,-0.8144,-0.4610
+0.0000,0.0000,0.0000,0.3763,-0.7997,-0.4679
+0.0000,0.0000,0.0000,0.3995,-0.7841,-0.4749
+0.0000,0.0000,0.0000,0.4222,-0.7679,-0.4818
+0.0000,0.0000,0.0000,0.4441,-0.7510,-0.4886
+0.0000,0.0000,0.0000,0.4654,-0.7334,-0.4955
+0.0000,0.0000,0.0000,0.4860,-0.7152,-0.5023
+0.0000,0.0000,0.0000,0.5059,-0.6964,-0.5090
+0.0000,0.0000,0.0000,0.5251,-0.6769,-0.5158
+0.0000,0.0000,0.0000,0.5435,-0.6570,-0.5225
+0.0000,0.0000,0.0000,0.5611,-0.6365,-0.5292
+0.0000,0.0000,0.0000,0.5780,-0.6155,-0.5358
+0.0000,0.0000,0.0000,0.5940,-0.5940,-0.5424
+0.0000,0.0000,0.0000,0.6093,-0.5721,-0.5490
+0.0000,0.0000,0.0000,0.6237,-0.5499,-0.5556
+0.0000,0.0000,0.0000,0.6373,-0.5272,-0.5621
+0.0000,0.0000,0.0000,0.6500,-0.5042,-0.5686
+0.0000,0.0000,0.0000,0.6619,-0.4809,-0.5750
+0.0000,0.0000,0.0000,0.6729,-0.4573,-0.5814
+0.0000,0.0000,0.0000,0.6831,-0.4335,-0.5878
+0.0000,0.0000,0.0000,0.6924,-0.4095,-0.5941
+0.0000,0.0000,0.0000,0.7008,-0.3852,-0.6004
+0.0000,0.0000,0.0000,0.7083,-0.3609,-0.6067
+0.0000,0.0000,0.0000,0.7150,-0.3364,-0.6129
+0.0000,0.0000,0.0000,0.7207,-0.3119,-0.6191
+0.0000,0.0000,0.0000,0.7256,-0.2873,-0.6252
+0.0000,0.0000,0.0000,0.7296,-0.2627,-0.6314
+0.0000,0.0000,0.0000,0.7328,-0.2381,-0.6374
+0.0000,0.0000,0.0000,0.7351,-0.2136,-0.6435
+0.0000,0.0000,0.0000,0.7365,-0.1891,-0.6494
+0.0000,0.0000,0.0000,0.7371,-0.1648,-0.6554
+0.0000,0.0000,0.0000,0.7368,-0.1406,-0.6613
+0.0000,0.0000,0.0000,0.7357,-0.1165,-0.6672
+0.0000,0.0000,0.0000,0.7338,-0.0927,-0.6730
+0.0000,0.0000,0.0000,0.7311,-0.0691,-0.6788
+0.0000,0.0000,0.0000,0.7275,-0.0458,-0.6845
+0.0000,0.0000,0.0000,0.7232,-0.0227,-0.6903
+0.0000,0.0000,0.0000,0.7181,0.0000,-0.6959
diff --git a/scripts/trajectories/full-circle-with-up-and-down-4s-ccw.csv b/scripts/trajectories/full-circle-with-up-and-down-4s-ccw.csv
new file mode 100644
index 0000000000000000000000000000000000000000..1e4a316720c584ee96394a65340d0e6726332552
--- /dev/null
+++ b/scripts/trajectories/full-circle-with-up-and-down-4s-ccw.csv
@@ -0,0 +1,800 @@
+0.9223,-0.0000,-0.3863,0.0119
+0.9223,-0.0000,-0.3863,0.0119
+0.9223,-0.0000,-0.3863,0.0119
+0.9223,-0.0000,-0.3863,0.0119
+0.9235,-0.0000,-0.3828,0.0240
+0.9235,-0.0000,-0.3828,0.0240
+0.9235,-0.0000,-0.3828,0.0240
+0.9235,-0.0000,-0.3828,0.0240
+0.9245,-0.0000,-0.3794,0.0363
+0.9245,-0.0000,-0.3794,0.0363
+0.9245,-0.0000,-0.3794,0.0363
+0.9245,-0.0000,-0.3794,0.0363
+0.9253,-0.0000,-0.3760,0.0486
+0.9253,-0.0000,-0.3760,0.0486
+0.9253,-0.0000,-0.3760,0.0486
+0.9253,-0.0000,-0.3760,0.0486
+0.9259,-0.0000,-0.3727,0.0611
+0.9259,-0.0000,-0.3727,0.0611
+0.9259,-0.0000,-0.3727,0.0611
+0.9259,-0.0000,-0.3727,0.0611
+0.9263,-0.0000,-0.3695,0.0737
+0.9263,-0.0000,-0.3695,0.0737
+0.9263,-0.0000,-0.3695,0.0737
+0.9263,-0.0000,-0.3695,0.0737
+0.9265,-0.0000,-0.3663,0.0865
+0.9265,-0.0000,-0.3663,0.0865
+0.9265,-0.0000,-0.3663,0.0865
+0.9265,-0.0000,-0.3663,0.0865
+0.9264,-0.0000,-0.3632,0.0993
+0.9264,-0.0000,-0.3632,0.0993
+0.9264,-0.0000,-0.3632,0.0993
+0.9264,-0.0000,-0.3632,0.0993
+0.9261,-0.0000,-0.3602,0.1122
+0.9261,-0.0000,-0.3602,0.1122
+0.9261,-0.0000,-0.3602,0.1122
+0.9261,-0.0000,-0.3602,0.1122
+0.9256,-0.0000,-0.3572,0.1252
+0.9256,-0.0000,-0.3572,0.1252
+0.9256,-0.0000,-0.3572,0.1252
+0.9256,-0.0000,-0.3572,0.1252
+0.9248,-0.0000,-0.3543,0.1383
+0.9248,-0.0000,-0.3543,0.1383
+0.9248,-0.0000,-0.3543,0.1383
+0.9248,-0.0000,-0.3543,0.1383
+0.9239,-0.0000,-0.3515,0.1515
+0.9239,-0.0000,-0.3515,0.1515
+0.9239,-0.0000,-0.3515,0.1515
+0.9239,-0.0000,-0.3515,0.1515
+0.9226,-0.0000,-0.3487,0.1648
+0.9226,-0.0000,-0.3487,0.1648
+0.9226,-0.0000,-0.3487,0.1648
+0.9226,-0.0000,-0.3487,0.1648
+0.9212,-0.0000,-0.3460,0.1781
+0.9212,-0.0000,-0.3460,0.1781
+0.9212,-0.0000,-0.3460,0.1781
+0.9212,-0.0000,-0.3460,0.1781
+0.9195,-0.0000,-0.3433,0.1914
+0.9195,-0.0000,-0.3433,0.1914
+0.9195,-0.0000,-0.3433,0.1914
+0.9195,-0.0000,-0.3433,0.1914
+0.9176,-0.0000,-0.3407,0.2049
+0.9176,-0.0000,-0.3407,0.2049
+0.9176,-0.0000,-0.3407,0.2049
+0.9176,-0.0000,-0.3407,0.2049
+0.9154,-0.0000,-0.3382,0.2183
+0.9154,-0.0000,-0.3382,0.2183
+0.9154,-0.0000,-0.3382,0.2183
+0.9154,-0.0000,-0.3382,0.2183
+0.9130,-0.0000,-0.3357,0.2319
+0.9130,-0.0000,-0.3357,0.2319
+0.9130,-0.0000,-0.3357,0.2319
+0.9130,-0.0000,-0.3357,0.2319
+0.9104,-0.0000,-0.3332,0.2454
+0.9104,-0.0000,-0.3332,0.2454
+0.9104,-0.0000,-0.3332,0.2454
+0.9104,-0.0000,-0.3332,0.2454
+0.9075,-0.0000,-0.3308,0.2590
+0.9075,-0.0000,-0.3308,0.2590
+0.9075,-0.0000,-0.3308,0.2590
+0.9075,-0.0000,-0.3308,0.2590
+0.9043,-0.0000,-0.3285,0.2726
+0.9043,-0.0000,-0.3285,0.2726
+0.9043,-0.0000,-0.3285,0.2726
+0.9043,-0.0000,-0.3285,0.2726
+0.9009,-0.0000,-0.3262,0.2862
+0.9009,-0.0000,-0.3262,0.2862
+0.9009,-0.0000,-0.3262,0.2862
+0.9009,-0.0000,-0.3262,0.2862
+0.8973,-0.0000,-0.3240,0.2998
+0.8973,-0.0000,-0.3240,0.2998
+0.8973,-0.0000,-0.3240,0.2998
+0.8973,-0.0000,-0.3240,0.2998
+0.8934,-0.0000,-0.3218,0.3134
+0.8934,-0.0000,-0.3218,0.3134
+0.8934,-0.0000,-0.3218,0.3134
+0.8934,-0.0000,-0.3218,0.3134
+0.8893,-0.0000,-0.3197,0.3271
+0.8893,-0.0000,-0.3197,0.3271
+0.8893,-0.0000,-0.3197,0.3271
+0.8893,-0.0000,-0.3197,0.3271
+0.8849,-0.0000,-0.3176,0.3407
+0.8849,-0.0000,-0.3176,0.3407
+0.8849,-0.0000,-0.3176,0.3407
+0.8849,-0.0000,-0.3176,0.3407
+0.8803,-0.0000,-0.3156,0.3543
+0.8803,-0.0000,-0.3156,0.3543
+0.8803,-0.0000,-0.3156,0.3543
+0.8803,-0.0000,-0.3156,0.3543
+0.8754,-0.0000,-0.3136,0.3678
+0.8754,-0.0000,-0.3136,0.3678
+0.8754,-0.0000,-0.3136,0.3678
+0.8754,-0.0000,-0.3136,0.3678
+0.8703,-0.0000,-0.3116,0.3814
+0.8703,-0.0000,-0.3116,0.3814
+0.8703,-0.0000,-0.3116,0.3814
+0.8703,-0.0000,-0.3116,0.3814
+0.8650,-0.0000,-0.3097,0.3949
+0.8650,-0.0000,-0.3097,0.3949
+0.8650,-0.0000,-0.3097,0.3949
+0.8650,-0.0000,-0.3097,0.3949
+0.8593,-0.0000,-0.3079,0.4083
+0.8593,-0.0000,-0.3079,0.4083
+0.8593,-0.0000,-0.3079,0.4083
+0.8593,-0.0000,-0.3079,0.4083
+0.8535,-0.0000,-0.3061,0.4217
+0.8535,-0.0000,-0.3061,0.4217
+0.8535,-0.0000,-0.3061,0.4217
+0.8535,-0.0000,-0.3061,0.4217
+0.8474,-0.0000,-0.3043,0.4351
+0.8474,-0.0000,-0.3043,0.4351
+0.8474,-0.0000,-0.3043,0.4351
+0.8474,-0.0000,-0.3043,0.4351
+0.8410,-0.0000,-0.3026,0.4484
+0.8410,-0.0000,-0.3026,0.4484
+0.8410,-0.0000,-0.3026,0.4484
+0.8410,-0.0000,-0.3026,0.4484
+0.8344,-0.0000,-0.3010,0.4617
+0.8344,-0.0000,-0.3010,0.4617
+0.8344,-0.0000,-0.3010,0.4617
+0.8344,-0.0000,-0.3010,0.4617
+0.8276,-0.0000,-0.2993,0.4748
+0.8276,-0.0000,-0.2993,0.4748
+0.8276,-0.0000,-0.2993,0.4748
+0.8276,-0.0000,-0.2993,0.4748
+0.8205,-0.0000,-0.2978,0.4879
+0.8205,-0.0000,-0.2978,0.4879
+0.8205,-0.0000,-0.2978,0.4879
+0.8205,-0.0000,-0.2978,0.4879
+0.8132,-0.0000,-0.2962,0.5010
+0.8132,-0.0000,-0.2962,0.5010
+0.8132,-0.0000,-0.2962,0.5010
+0.8132,-0.0000,-0.2962,0.5010
+0.8056,-0.0000,-0.2947,0.5139
+0.8056,-0.0000,-0.2947,0.5139
+0.8056,-0.0000,-0.2947,0.5139
+0.8056,-0.0000,-0.2947,0.5139
+0.7978,-0.0000,-0.2932,0.5267
+0.7978,-0.0000,-0.2932,0.5267
+0.7978,-0.0000,-0.2932,0.5267
+0.7978,-0.0000,-0.2932,0.5267
+0.7898,-0.0000,-0.2918,0.5395
+0.7898,-0.0000,-0.2918,0.5395
+0.7898,-0.0000,-0.2918,0.5395
+0.7898,-0.0000,-0.2918,0.5395
+0.7815,-0.0000,-0.2904,0.5521
+0.7815,-0.0000,-0.2904,0.5521
+0.7815,-0.0000,-0.2904,0.5521
+0.7815,-0.0000,-0.2904,0.5521
+0.7730,-0.0000,-0.2891,0.5647
+0.7730,-0.0000,-0.2891,0.5647
+0.7730,-0.0000,-0.2891,0.5647
+0.7730,-0.0000,-0.2891,0.5647
+0.7643,-0.0000,-0.2878,0.5771
+0.7643,-0.0000,-0.2878,0.5771
+0.7643,-0.0000,-0.2878,0.5771
+0.7643,-0.0000,-0.2878,0.5771
+0.7553,-0.0000,-0.2865,0.5894
+0.7553,-0.0000,-0.2865,0.5894
+0.7553,-0.0000,-0.2865,0.5894
+0.7553,-0.0000,-0.2865,0.5894
+0.7461,-0.0000,-0.2853,0.6016
+0.7461,-0.0000,-0.2853,0.6016
+0.7461,-0.0000,-0.2853,0.6016
+0.7461,-0.0000,-0.2853,0.6016
+0.7367,-0.0000,-0.2841,0.6136
+0.7367,-0.0000,-0.2841,0.6136
+0.7367,-0.0000,-0.2841,0.6136
+0.7367,-0.0000,-0.2841,0.6136
+0.7271,-0.0000,-0.2830,0.6255
+0.7271,-0.0000,-0.2830,0.6255
+0.7271,-0.0000,-0.2830,0.6255
+0.7271,-0.0000,-0.2830,0.6255
+0.7172,-0.0000,-0.2819,0.6373
+0.7172,-0.0000,-0.2819,0.6373
+0.7172,-0.0000,-0.2819,0.6373
+0.7172,-0.0000,-0.2819,0.6373
+0.7071,-0.0000,-0.2808,0.6490
+0.7071,-0.0000,-0.2808,0.6490
+0.7071,-0.0000,-0.2808,0.6490
+0.7071,-0.0000,-0.2808,0.6490
+0.6968,-0.0000,-0.2798,0.6604
+0.6968,-0.0000,-0.2798,0.6604
+0.6968,-0.0000,-0.2798,0.6604
+0.6968,-0.0000,-0.2798,0.6604
+0.6863,-0.0000,-0.2788,0.6718
+0.6863,-0.0000,-0.2788,0.6718
+0.6863,-0.0000,-0.2788,0.6718
+0.6863,-0.0000,-0.2788,0.6718
+0.6756,-0.0000,-0.2779,0.6829
+0.6756,-0.0000,-0.2779,0.6829
+0.6756,-0.0000,-0.2779,0.6829
+0.6756,-0.0000,-0.2779,0.6829
+0.6646,-0.0000,-0.2769,0.6940
+0.6646,-0.0000,-0.2769,0.6940
+0.6646,-0.0000,-0.2769,0.6940
+0.6646,-0.0000,-0.2769,0.6940
+0.6535,-0.0000,-0.2761,0.7048
+0.6535,-0.0000,-0.2761,0.7048
+0.6535,-0.0000,-0.2761,0.7048
+0.6535,-0.0000,-0.2761,0.7048
+0.6422,-0.0000,-0.2752,0.7155
+0.6422,-0.0000,-0.2752,0.7155
+0.6422,-0.0000,-0.2752,0.7155
+0.6422,-0.0000,-0.2752,0.7155
+0.6306,-0.0000,-0.2744,0.7260
+0.6306,-0.0000,-0.2744,0.7260
+0.6306,-0.0000,-0.2744,0.7260
+0.6306,-0.0000,-0.2744,0.7260
+0.6189,-0.0000,-0.2737,0.7363
+0.6189,-0.0000,-0.2737,0.7363
+0.6189,-0.0000,-0.2737,0.7363
+0.6189,-0.0000,-0.2737,0.7363
+0.6069,-0.0000,-0.2730,0.7464
+0.6069,-0.0000,-0.2730,0.7464
+0.6069,-0.0000,-0.2730,0.7464
+0.6069,-0.0000,-0.2730,0.7464
+0.5948,-0.0000,-0.2723,0.7563
+0.5948,-0.0000,-0.2723,0.7563
+0.5948,-0.0000,-0.2723,0.7563
+0.5948,-0.0000,-0.2723,0.7563
+0.5825,-0.0000,-0.2716,0.7661
+0.5825,-0.0000,-0.2716,0.7661
+0.5825,-0.0000,-0.2716,0.7661
+0.5825,-0.0000,-0.2716,0.7661
+0.5700,-0.0000,-0.2710,0.7756
+0.5700,-0.0000,-0.2710,0.7756
+0.5700,-0.0000,-0.2710,0.7756
+0.5700,-0.0000,-0.2710,0.7756
+0.5574,-0.0000,-0.2705,0.7850
+0.5574,-0.0000,-0.2705,0.7850
+0.5574,-0.0000,-0.2705,0.7850
+0.5574,-0.0000,-0.2705,0.7850
+0.5445,-0.0000,-0.2700,0.7941
+0.5445,-0.0000,-0.2700,0.7941
+0.5445,-0.0000,-0.2700,0.7941
+0.5445,-0.0000,-0.2700,0.7941
+0.5315,-0.0000,-0.2695,0.8030
+0.5315,-0.0000,-0.2695,0.8030
+0.5315,-0.0000,-0.2695,0.8030
+0.5315,-0.0000,-0.2695,0.8030
+0.5184,-0.0000,-0.2691,0.8117
+0.5184,-0.0000,-0.2691,0.8117
+0.5184,-0.0000,-0.2691,0.8117
+0.5184,-0.0000,-0.2691,0.8117
+0.5050,-0.0000,-0.2687,0.8202
+0.5050,-0.0000,-0.2687,0.8202
+0.5050,-0.0000,-0.2687,0.8202
+0.5050,-0.0000,-0.2687,0.8202
+0.4915,-0.0000,-0.2684,0.8285
+0.4915,-0.0000,-0.2684,0.8285
+0.4915,-0.0000,-0.2684,0.8285
+0.4915,-0.0000,-0.2684,0.8285
+0.4779,-0.0000,-0.2682,0.8365
+0.4779,-0.0000,-0.2682,0.8365
+0.4779,-0.0000,-0.2682,0.8365
+0.4779,-0.0000,-0.2682,0.8365
+0.4640,-0.0000,-0.2680,0.8443
+0.4640,-0.0000,-0.2680,0.8443
+0.4640,-0.0000,-0.2680,0.8443
+0.4640,-0.0000,-0.2680,0.8443
+0.4501,-0.0000,-0.2678,0.8519
+0.4501,-0.0000,-0.2678,0.8519
+0.4501,-0.0000,-0.2678,0.8519
+0.4501,-0.0000,-0.2678,0.8519
+0.4360,-0.0000,-0.2677,0.8592
+0.4360,-0.0000,-0.2677,0.8592
+0.4360,-0.0000,-0.2677,0.8592
+0.4360,-0.0000,-0.2677,0.8592
+0.4218,-0.0000,-0.2677,0.8663
+0.4218,-0.0000,-0.2677,0.8663
+0.4218,-0.0000,-0.2677,0.8663
+0.4218,-0.0000,-0.2677,0.8663
+0.4074,-0.0000,-0.2677,0.8731
+0.4074,-0.0000,-0.2677,0.8731
+0.4074,-0.0000,-0.2677,0.8731
+0.4074,-0.0000,-0.2677,0.8731
+0.3929,-0.0000,-0.2678,0.8797
+0.3929,-0.0000,-0.2678,0.8797
+0.3929,-0.0000,-0.2678,0.8797
+0.3929,-0.0000,-0.2678,0.8797
+0.3783,-0.0000,-0.2680,0.8860
+0.3783,-0.0000,-0.2680,0.8860
+0.3783,-0.0000,-0.2680,0.8860
+0.3783,-0.0000,-0.2680,0.8860
+0.3635,-0.0000,-0.2683,0.8921
+0.3635,-0.0000,-0.2683,0.8921
+0.3635,-0.0000,-0.2683,0.8921
+0.3635,-0.0000,-0.2683,0.8921
+0.3487,-0.0000,-0.2687,0.8979
+0.3487,-0.0000,-0.2687,0.8979
+0.3487,-0.0000,-0.2687,0.8979
+0.3487,-0.0000,-0.2687,0.8979
+0.3337,-0.0000,-0.2692,0.9034
+0.3337,-0.0000,-0.2692,0.9034
+0.3337,-0.0000,-0.2692,0.9034
+0.3337,-0.0000,-0.2692,0.9034
+0.3186,-0.0000,-0.2698,0.9087
+0.3186,-0.0000,-0.2698,0.9087
+0.3186,-0.0000,-0.2698,0.9087
+0.3186,-0.0000,-0.2698,0.9087
+0.3034,-0.0000,-0.2705,0.9136
+0.3034,-0.0000,-0.2705,0.9136
+0.3034,-0.0000,-0.2705,0.9136
+0.3034,-0.0000,-0.2705,0.9136
+0.2882,-0.0000,-0.2714,0.9183
+0.2882,-0.0000,-0.2714,0.9183
+0.2882,-0.0000,-0.2714,0.9183
+0.2882,-0.0000,-0.2714,0.9183
+0.2728,-0.0000,-0.2725,0.9227
+0.2728,-0.0000,-0.2725,0.9227
+0.2728,-0.0000,-0.2725,0.9227
+0.2728,-0.0000,-0.2725,0.9227
+0.2573,-0.0000,-0.2738,0.9267
+0.2573,-0.0000,-0.2738,0.9267
+0.2573,-0.0000,-0.2738,0.9267
+0.2573,-0.0000,-0.2738,0.9267
+0.2418,-0.0000,-0.2753,0.9305
+0.2418,-0.0000,-0.2753,0.9305
+0.2418,-0.0000,-0.2753,0.9305
+0.2418,-0.0000,-0.2753,0.9305
+0.2262,-0.0000,-0.2771,0.9339
+0.2262,-0.0000,-0.2771,0.9339
+0.2262,-0.0000,-0.2771,0.9339
+0.2262,-0.0000,-0.2771,0.9339
+0.2105,-0.0000,-0.2792,0.9369
+0.2105,-0.0000,-0.2792,0.9369
+0.2105,-0.0000,-0.2792,0.9369
+0.2105,-0.0000,-0.2792,0.9369
+0.1947,-0.0000,-0.2818,0.9395
+0.1947,-0.0000,-0.2818,0.9395
+0.1947,-0.0000,-0.2818,0.9395
+0.1947,-0.0000,-0.2818,0.9395
+0.1789,-0.0000,-0.2848,0.9417
+0.1789,-0.0000,-0.2848,0.9417
+0.1789,-0.0000,-0.2848,0.9417
+0.1789,-0.0000,-0.2848,0.9417
+0.1630,-0.0000,-0.2886,0.9435
+0.1630,-0.0000,-0.2886,0.9435
+0.1630,-0.0000,-0.2886,0.9435
+0.1630,-0.0000,-0.2886,0.9435
+0.1471,-0.0000,-0.2933,0.9446
+0.1471,-0.0000,-0.2933,0.9446
+0.1471,-0.0000,-0.2933,0.9446
+0.1471,-0.0000,-0.2933,0.9446
+0.1312,-0.0000,-0.2991,0.9452
+0.1312,-0.0000,-0.2991,0.9452
+0.1312,-0.0000,-0.2991,0.9452
+0.1312,-0.0000,-0.2991,0.9452
+0.1152,-0.0000,-0.3067,0.9448
+0.1152,-0.0000,-0.3067,0.9448
+0.1152,-0.0000,-0.3067,0.9448
+0.1152,-0.0000,-0.3067,0.9448
+0.0991,-0.0000,-0.3167,0.9433
+0.0991,-0.0000,-0.3167,0.9433
+0.0991,-0.0000,-0.3167,0.9433
+0.0991,-0.0000,-0.3167,0.9433
+0.0831,-0.0000,-0.3307,0.9401
+0.0831,-0.0000,-0.3307,0.9401
+0.0831,-0.0000,-0.3307,0.9401
+0.0831,-0.0000,-0.3307,0.9401
+0.0670,-0.0000,-0.3514,0.9338
+0.0670,-0.0000,-0.3514,0.9338
+0.0670,-0.0000,-0.3514,0.9338
+0.0670,-0.0000,-0.3514,0.9338
+0.0510,-0.0000,-0.3848,0.9216
+0.0510,-0.0000,-0.3848,0.9216
+0.0510,-0.0000,-0.3848,0.9216
+0.0510,-0.0000,-0.3848,0.9216
+0.0351,-0.0000,-0.4473,0.8937
+0.0351,-0.0000,-0.4473,0.8937
+0.0351,-0.0000,-0.4473,0.8937
+0.0351,-0.0000,-0.4473,0.8937
+0.0196,-0.0000,-0.6000,0.7997
+0.0196,-0.0000,-0.6000,0.7997
+0.0196,-0.0000,-0.6000,0.7997
+0.0196,-0.0000,-0.6000,0.7997
+0.0079,-0.0000,-1.0000,-0.0001
+0.0079,-0.0000,-1.0000,-0.0001
+0.0079,-0.0000,-1.0000,-0.0001
+0.0079,-0.0000,-1.0000,-0.0001
+0.0162,-0.0000,-0.2425,-0.9700
+0.0162,-0.0000,-0.2425,-0.9700
+0.0162,-0.0000,-0.2425,-0.9700
+0.0162,-0.0000,-0.2425,-0.9700
+0.0314,-0.0000,0.0000,-0.9995
+0.0314,-0.0000,0.0000,-0.9995
+0.0314,-0.0000,0.0000,-0.9995
+0.0314,-0.0000,0.0000,-0.9995
+0.0473,-0.0000,0.0831,-0.9954
+0.0473,-0.0000,0.0831,-0.9954
+0.0473,-0.0000,0.0831,-0.9954
+0.0473,-0.0000,0.0831,-0.9954
+0.0633,-0.0000,0.1241,-0.9902
+0.0633,-0.0000,0.1241,-0.9902
+0.0633,-0.0000,0.1241,-0.9902
+0.0633,-0.0000,0.1241,-0.9902
+0.0793,-0.0000,0.1485,-0.9857
+0.0793,-0.0000,0.1485,-0.9857
+0.0793,-0.0000,0.1485,-0.9857
+0.0793,-0.0000,0.1485,-0.9857
+0.0954,-0.0000,0.1646,-0.9817
+0.0954,-0.0000,0.1646,-0.9817
+0.0954,-0.0000,0.1646,-0.9817
+0.0954,-0.0000,0.1646,-0.9817
+0.1114,-0.0000,0.1762,-0.9780
+0.1114,-0.0000,0.1762,-0.9780
+0.1114,-0.0000,0.1762,-0.9780
+0.1114,-0.0000,0.1762,-0.9780
+0.1275,-0.0000,0.1848,-0.9745
+0.1275,-0.0000,0.1848,-0.9745
+0.1275,-0.0000,0.1848,-0.9745
+0.1275,-0.0000,0.1848,-0.9745
+0.1435,-0.0000,0.1915,-0.9709
+0.1435,-0.0000,0.1915,-0.9709
+0.1435,-0.0000,0.1915,-0.9709
+0.1435,-0.0000,0.1915,-0.9709
+0.1594,-0.0000,0.1970,-0.9674
+0.1594,-0.0000,0.1970,-0.9674
+0.1594,-0.0000,0.1970,-0.9674
+0.1594,-0.0000,0.1970,-0.9674
+0.1753,-0.0000,0.2014,-0.9637
+0.1753,-0.0000,0.2014,-0.9637
+0.1753,-0.0000,0.2014,-0.9637
+0.1753,-0.0000,0.2014,-0.9637
+0.1912,-0.0000,0.2052,-0.9599
+0.1912,-0.0000,0.2052,-0.9599
+0.1912,-0.0000,0.2052,-0.9599
+0.1912,-0.0000,0.2052,-0.9599
+0.2070,-0.0000,0.2085,-0.9559
+0.2070,-0.0000,0.2085,-0.9559
+0.2070,-0.0000,0.2085,-0.9559
+0.2070,-0.0000,0.2085,-0.9559
+0.2227,-0.0000,0.2113,-0.9517
+0.2227,-0.0000,0.2113,-0.9517
+0.2227,-0.0000,0.2113,-0.9517
+0.2227,-0.0000,0.2113,-0.9517
+0.2384,-0.0000,0.2138,-0.9473
+0.2384,-0.0000,0.2138,-0.9473
+0.2384,-0.0000,0.2138,-0.9473
+0.2384,-0.0000,0.2138,-0.9473
+0.2540,-0.0000,0.2161,-0.9428
+0.2540,-0.0000,0.2161,-0.9428
+0.2540,-0.0000,0.2161,-0.9428
+0.2540,-0.0000,0.2161,-0.9428
+0.2695,-0.0000,0.2181,-0.9380
+0.2695,-0.0000,0.2181,-0.9380
+0.2695,-0.0000,0.2181,-0.9380
+0.2695,-0.0000,0.2181,-0.9380
+0.2849,-0.0000,0.2200,-0.9330
+0.2849,-0.0000,0.2200,-0.9330
+0.2849,-0.0000,0.2200,-0.9330
+0.2849,-0.0000,0.2200,-0.9330
+0.3002,-0.0000,0.2217,-0.9277
+0.3002,-0.0000,0.2217,-0.9277
+0.3002,-0.0000,0.2217,-0.9277
+0.3002,-0.0000,0.2217,-0.9277
+0.3155,-0.0000,0.2233,-0.9223
+0.3155,-0.0000,0.2233,-0.9223
+0.3155,-0.0000,0.2233,-0.9223
+0.3155,-0.0000,0.2233,-0.9223
+0.3306,-0.0000,0.2248,-0.9166
+0.3306,-0.0000,0.2248,-0.9166
+0.3306,-0.0000,0.2248,-0.9166
+0.3306,-0.0000,0.2248,-0.9166
+0.3457,-0.0000,0.2263,-0.9107
+0.3457,-0.0000,0.2263,-0.9107
+0.3457,-0.0000,0.2263,-0.9107
+0.3457,-0.0000,0.2263,-0.9107
+0.3606,-0.0000,0.2277,-0.9045
+0.3606,-0.0000,0.2277,-0.9045
+0.3606,-0.0000,0.2277,-0.9045
+0.3606,-0.0000,0.2277,-0.9045
+0.3754,-0.0000,0.2290,-0.8981
+0.3754,-0.0000,0.2290,-0.8981
+0.3754,-0.0000,0.2290,-0.8981
+0.3754,-0.0000,0.2290,-0.8981
+0.3901,-0.0000,0.2303,-0.8915
+0.3901,-0.0000,0.2303,-0.8915
+0.3901,-0.0000,0.2303,-0.8915
+0.3901,-0.0000,0.2303,-0.8915
+0.4047,-0.0000,0.2315,-0.8847
+0.4047,-0.0000,0.2315,-0.8847
+0.4047,-0.0000,0.2315,-0.8847
+0.4047,-0.0000,0.2315,-0.8847
+0.4192,-0.0000,0.2327,-0.8776
+0.4192,-0.0000,0.2327,-0.8776
+0.4192,-0.0000,0.2327,-0.8776
+0.4192,-0.0000,0.2327,-0.8776
+0.4335,-0.0000,0.2339,-0.8703
+0.4335,-0.0000,0.2339,-0.8703
+0.4335,-0.0000,0.2339,-0.8703
+0.4335,-0.0000,0.2339,-0.8703
+0.4477,-0.0000,0.2351,-0.8627
+0.4477,-0.0000,0.2351,-0.8627
+0.4477,-0.0000,0.2351,-0.8627
+0.4477,-0.0000,0.2351,-0.8627
+0.4617,-0.0000,0.2362,-0.8550
+0.4617,-0.0000,0.2362,-0.8550
+0.4617,-0.0000,0.2362,-0.8550
+0.4617,-0.0000,0.2362,-0.8550
+0.4756,-0.0000,0.2374,-0.8470
+0.4756,-0.0000,0.2374,-0.8470
+0.4756,-0.0000,0.2374,-0.8470
+0.4756,-0.0000,0.2374,-0.8470
+0.4894,-0.0000,0.2385,-0.8388
+0.4894,-0.0000,0.2385,-0.8388
+0.4894,-0.0000,0.2385,-0.8388
+0.4894,-0.0000,0.2385,-0.8388
+0.5030,-0.0000,0.2396,-0.8304
+0.5030,-0.0000,0.2396,-0.8304
+0.5030,-0.0000,0.2396,-0.8304
+0.5030,-0.0000,0.2396,-0.8304
+0.5164,-0.0000,0.2408,-0.8218
+0.5164,-0.0000,0.2408,-0.8218
+0.5164,-0.0000,0.2408,-0.8218
+0.5164,-0.0000,0.2408,-0.8218
+0.5297,-0.0000,0.2419,-0.8130
+0.5297,-0.0000,0.2419,-0.8130
+0.5297,-0.0000,0.2419,-0.8130
+0.5297,-0.0000,0.2419,-0.8130
+0.5428,-0.0000,0.2431,-0.8039
+0.5428,-0.0000,0.2431,-0.8039
+0.5428,-0.0000,0.2431,-0.8039
+0.5428,-0.0000,0.2431,-0.8039
+0.5558,-0.0000,0.2442,-0.7947
+0.5558,-0.0000,0.2442,-0.7947
+0.5558,-0.0000,0.2442,-0.7947
+0.5558,-0.0000,0.2442,-0.7947
+0.5685,-0.0000,0.2454,-0.7852
+0.5685,-0.0000,0.2454,-0.7852
+0.5685,-0.0000,0.2454,-0.7852
+0.5685,-0.0000,0.2454,-0.7852
+0.5811,-0.0000,0.2465,-0.7756
+0.5811,-0.0000,0.2465,-0.7756
+0.5811,-0.0000,0.2465,-0.7756
+0.5811,-0.0000,0.2465,-0.7756
+0.5936,-0.0000,0.2477,-0.7657
+0.5936,-0.0000,0.2477,-0.7657
+0.5936,-0.0000,0.2477,-0.7657
+0.5936,-0.0000,0.2477,-0.7657
+0.6058,-0.0000,0.2489,-0.7557
+0.6058,-0.0000,0.2489,-0.7557
+0.6058,-0.0000,0.2489,-0.7557
+0.6058,-0.0000,0.2489,-0.7557
+0.6179,-0.0000,0.2501,-0.7455
+0.6179,-0.0000,0.2501,-0.7455
+0.6179,-0.0000,0.2501,-0.7455
+0.6179,-0.0000,0.2501,-0.7455
+0.6297,-0.0000,0.2513,-0.7351
+0.6297,-0.0000,0.2513,-0.7351
+0.6297,-0.0000,0.2513,-0.7351
+0.6297,-0.0000,0.2513,-0.7351
+0.6414,-0.0000,0.2525,-0.7245
+0.6414,-0.0000,0.2525,-0.7245
+0.6414,-0.0000,0.2525,-0.7245
+0.6414,-0.0000,0.2525,-0.7245
+0.6528,-0.0000,0.2538,-0.7137
+0.6528,-0.0000,0.2538,-0.7137
+0.6528,-0.0000,0.2538,-0.7137
+0.6528,-0.0000,0.2538,-0.7137
+0.6641,-0.0000,0.2550,-0.7028
+0.6641,-0.0000,0.2550,-0.7028
+0.6641,-0.0000,0.2550,-0.7028
+0.6641,-0.0000,0.2550,-0.7028
+0.6752,-0.0000,0.2563,-0.6917
+0.6752,-0.0000,0.2563,-0.6917
+0.6752,-0.0000,0.2563,-0.6917
+0.6752,-0.0000,0.2563,-0.6917
+0.6860,-0.0000,0.2576,-0.6804
+0.6860,-0.0000,0.2576,-0.6804
+0.6860,-0.0000,0.2576,-0.6804
+0.6860,-0.0000,0.2576,-0.6804
+0.6967,-0.0000,0.2590,-0.6690
+0.6967,-0.0000,0.2590,-0.6690
+0.6967,-0.0000,0.2590,-0.6690
+0.6967,-0.0000,0.2590,-0.6690
+0.7071,-0.0000,0.2603,-0.6575
+0.7071,-0.0000,0.2603,-0.6575
+0.7071,-0.0000,0.2603,-0.6575
+0.7071,-0.0000,0.2603,-0.6575
+0.7173,-0.0000,0.2617,-0.6457
+0.7173,-0.0000,0.2617,-0.6457
+0.7173,-0.0000,0.2617,-0.6457
+0.7173,-0.0000,0.2617,-0.6457
+0.7273,-0.0000,0.2631,-0.6339
+0.7273,-0.0000,0.2631,-0.6339
+0.7273,-0.0000,0.2631,-0.6339
+0.7273,-0.0000,0.2631,-0.6339
+0.7371,-0.0000,0.2645,-0.6219
+0.7371,-0.0000,0.2645,-0.6219
+0.7371,-0.0000,0.2645,-0.6219
+0.7371,-0.0000,0.2645,-0.6219
+0.7467,-0.0000,0.2659,-0.6097
+0.7467,-0.0000,0.2659,-0.6097
+0.7467,-0.0000,0.2659,-0.6097
+0.7467,-0.0000,0.2659,-0.6097
+0.7560,-0.0000,0.2674,-0.5974
+0.7560,-0.0000,0.2674,-0.5974
+0.7560,-0.0000,0.2674,-0.5974
+0.7560,-0.0000,0.2674,-0.5974
+0.7651,-0.0000,0.2689,-0.5851
+0.7651,-0.0000,0.2689,-0.5851
+0.7651,-0.0000,0.2689,-0.5851
+0.7651,-0.0000,0.2689,-0.5851
+0.7740,-0.0000,0.2705,-0.5725
+0.7740,-0.0000,0.2705,-0.5725
+0.7740,-0.0000,0.2705,-0.5725
+0.7740,-0.0000,0.2705,-0.5725
+0.7826,-0.0000,0.2720,-0.5599
+0.7826,-0.0000,0.2720,-0.5599
+0.7826,-0.0000,0.2720,-0.5599
+0.7826,-0.0000,0.2720,-0.5599
+0.7910,-0.0000,0.2736,-0.5472
+0.7910,-0.0000,0.2736,-0.5472
+0.7910,-0.0000,0.2736,-0.5472
+0.7910,-0.0000,0.2736,-0.5472
+0.7992,-0.0000,0.2752,-0.5343
+0.7992,-0.0000,0.2752,-0.5343
+0.7992,-0.0000,0.2752,-0.5343
+0.7992,-0.0000,0.2752,-0.5343
+0.8072,-0.0000,0.2769,-0.5214
+0.8072,-0.0000,0.2769,-0.5214
+0.8072,-0.0000,0.2769,-0.5214
+0.8072,-0.0000,0.2769,-0.5214
+0.8149,-0.0000,0.2786,-0.5083
+0.8149,-0.0000,0.2786,-0.5083
+0.8149,-0.0000,0.2786,-0.5083
+0.8149,-0.0000,0.2786,-0.5083
+0.8223,-0.0000,0.2803,-0.4952
+0.8223,-0.0000,0.2803,-0.4952
+0.8223,-0.0000,0.2803,-0.4952
+0.8223,-0.0000,0.2803,-0.4952
+0.8295,-0.0000,0.2820,-0.4820
+0.8295,-0.0000,0.2820,-0.4820
+0.8295,-0.0000,0.2820,-0.4820
+0.8295,-0.0000,0.2820,-0.4820
+0.8365,-0.0000,0.2838,-0.4687
+0.8365,-0.0000,0.2838,-0.4687
+0.8365,-0.0000,0.2838,-0.4687
+0.8365,-0.0000,0.2838,-0.4687
+0.8433,-0.0000,0.2857,-0.4553
+0.8433,-0.0000,0.2857,-0.4553
+0.8433,-0.0000,0.2857,-0.4553
+0.8433,-0.0000,0.2857,-0.4553
+0.8497,-0.0000,0.2875,-0.4419
+0.8497,-0.0000,0.2875,-0.4419
+0.8497,-0.0000,0.2875,-0.4419
+0.8497,-0.0000,0.2875,-0.4419
+0.8560,-0.0000,0.2894,-0.4284
+0.8560,-0.0000,0.2894,-0.4284
+0.8560,-0.0000,0.2894,-0.4284
+0.8560,-0.0000,0.2894,-0.4284
+0.8620,-0.0000,0.2913,-0.4148
+0.8620,-0.0000,0.2913,-0.4148
+0.8620,-0.0000,0.2913,-0.4148
+0.8620,-0.0000,0.2913,-0.4148
+0.8677,-0.0000,0.2933,-0.4012
+0.8677,-0.0000,0.2933,-0.4012
+0.8677,-0.0000,0.2933,-0.4012
+0.8677,-0.0000,0.2933,-0.4012
+0.8732,-0.0000,0.2953,-0.3876
+0.8732,-0.0000,0.2953,-0.3876
+0.8732,-0.0000,0.2953,-0.3876
+0.8732,-0.0000,0.2953,-0.3876
+0.8785,-0.0000,0.2974,-0.3739
+0.8785,-0.0000,0.2974,-0.3739
+0.8785,-0.0000,0.2974,-0.3739
+0.8785,-0.0000,0.2974,-0.3739
+0.8835,-0.0000,0.2995,-0.3602
+0.8835,-0.0000,0.2995,-0.3602
+0.8835,-0.0000,0.2995,-0.3602
+0.8835,-0.0000,0.2995,-0.3602
+0.8883,-0.0000,0.3016,-0.3465
+0.8883,-0.0000,0.3016,-0.3465
+0.8883,-0.0000,0.3016,-0.3465
+0.8883,-0.0000,0.3016,-0.3465
+0.8928,-0.0000,0.3038,-0.3327
+0.8928,-0.0000,0.3038,-0.3327
+0.8928,-0.0000,0.3038,-0.3327
+0.8928,-0.0000,0.3038,-0.3327
+0.8970,-0.0000,0.3060,-0.3189
+0.8970,-0.0000,0.3060,-0.3189
+0.8970,-0.0000,0.3060,-0.3189
+0.8970,-0.0000,0.3060,-0.3189
+0.9010,-0.0000,0.3083,-0.3051
+0.9010,-0.0000,0.3083,-0.3051
+0.9010,-0.0000,0.3083,-0.3051
+0.9010,-0.0000,0.3083,-0.3051
+0.9048,-0.0000,0.3106,-0.2913
+0.9048,-0.0000,0.3106,-0.2913
+0.9048,-0.0000,0.3106,-0.2913
+0.9048,-0.0000,0.3106,-0.2913
+0.9083,-0.0000,0.3130,-0.2776
+0.9083,-0.0000,0.3130,-0.2776
+0.9083,-0.0000,0.3130,-0.2776
+0.9083,-0.0000,0.3130,-0.2776
+0.9116,-0.0000,0.3154,-0.2638
+0.9116,-0.0000,0.3154,-0.2638
+0.9116,-0.0000,0.3154,-0.2638
+0.9116,-0.0000,0.3154,-0.2638
+0.9146,-0.0000,0.3179,-0.2500
+0.9146,-0.0000,0.3179,-0.2500
+0.9146,-0.0000,0.3179,-0.2500
+0.9146,-0.0000,0.3179,-0.2500
+0.9174,-0.0000,0.3204,-0.2363
+0.9174,-0.0000,0.3204,-0.2363
+0.9174,-0.0000,0.3204,-0.2363
+0.9174,-0.0000,0.3204,-0.2363
+0.9199,-0.0000,0.3229,-0.2226
+0.9199,-0.0000,0.3229,-0.2226
+0.9199,-0.0000,0.3229,-0.2226
+0.9199,-0.0000,0.3229,-0.2226
+0.9222,-0.0000,0.3256,-0.2089
+0.9222,-0.0000,0.3256,-0.2089
+0.9222,-0.0000,0.3256,-0.2089
+0.9222,-0.0000,0.3256,-0.2089
+0.9242,-0.0000,0.3282,-0.1952
+0.9242,-0.0000,0.3282,-0.1952
+0.9242,-0.0000,0.3282,-0.1952
+0.9242,-0.0000,0.3282,-0.1952
+0.9260,-0.0000,0.3309,-0.1817
+0.9260,-0.0000,0.3309,-0.1817
+0.9260,-0.0000,0.3309,-0.1817
+0.9260,-0.0000,0.3309,-0.1817
+0.9276,-0.0000,0.3337,-0.1681
+0.9276,-0.0000,0.3337,-0.1681
+0.9276,-0.0000,0.3337,-0.1681
+0.9276,-0.0000,0.3337,-0.1681
+0.9289,-0.0000,0.3366,-0.1546
+0.9289,-0.0000,0.3366,-0.1546
+0.9289,-0.0000,0.3366,-0.1546
+0.9289,-0.0000,0.3366,-0.1546
+0.9300,-0.0000,0.3395,-0.1412
+0.9300,-0.0000,0.3395,-0.1412
+0.9300,-0.0000,0.3395,-0.1412
+0.9300,-0.0000,0.3395,-0.1412
+0.9308,-0.0000,0.3424,-0.1279
+0.9308,-0.0000,0.3424,-0.1279
+0.9308,-0.0000,0.3424,-0.1279
+0.9308,-0.0000,0.3424,-0.1279
+0.9314,-0.0000,0.3454,-0.1146
+0.9314,-0.0000,0.3454,-0.1146
+0.9314,-0.0000,0.3454,-0.1146
+0.9314,-0.0000,0.3454,-0.1146
+0.9318,-0.0000,0.3485,-0.1015
+0.9318,-0.0000,0.3485,-0.1015
+0.9318,-0.0000,0.3485,-0.1015
+0.9318,-0.0000,0.3485,-0.1015
+0.9320,-0.0000,0.3516,-0.0884
+0.9320,-0.0000,0.3516,-0.0884
+0.9320,-0.0000,0.3516,-0.0884
+0.9320,-0.0000,0.3516,-0.0884
+0.9319,-0.0000,0.3548,-0.0754
+0.9319,-0.0000,0.3548,-0.0754
+0.9319,-0.0000,0.3548,-0.0754
+0.9319,-0.0000,0.3548,-0.0754
+0.9316,-0.0000,0.3581,-0.0625
+0.9316,-0.0000,0.3581,-0.0625
+0.9316,-0.0000,0.3581,-0.0625
+0.9316,-0.0000,0.3581,-0.0625
+0.9311,-0.0000,0.3614,-0.0498
+0.9311,-0.0000,0.3614,-0.0498
+0.9311,-0.0000,0.3614,-0.0498
+0.9311,-0.0000,0.3614,-0.0498
+0.9303,-0.0000,0.3648,-0.0371
+0.9303,-0.0000,0.3648,-0.0371
+0.9303,-0.0000,0.3648,-0.0371
+0.9303,-0.0000,0.3648,-0.0371
+0.9294,-0.0000,0.3683,-0.0246
+0.9294,-0.0000,0.3683,-0.0246
+0.9294,-0.0000,0.3683,-0.0246
+0.9294,-0.0000,0.3683,-0.0246
+0.9282,-0.0000,0.3718,-0.0122
+0.9282,-0.0000,0.3718,-0.0122
+0.9282,-0.0000,0.3718,-0.0122
+0.9282,-0.0000,0.3718,-0.0122
+0.9269,0.0000,0.3754,0.0000
+0.9269,0.0000,0.3754,0.0000
+0.9269,0.0000,0.3754,0.0000
+0.9269,0.0000,0.3754,0.0000
diff --git a/scripts/trajectories/full-circle-with-up-and-down-4s-fixed-pos-offset-Vector3.csv b/scripts/trajectories/full-circle-with-up-and-down-4s-fixed-pos-offset-Vector3.csv
new file mode 100644
index 0000000000000000000000000000000000000000..c858131d945425a27860315c123758a1544ad922
--- /dev/null
+++ b/scripts/trajectories/full-circle-with-up-and-down-4s-fixed-pos-offset-Vector3.csv
@@ -0,0 +1,200 @@
+10.0000,10.0000,10.0000,10.7012,9.9780,9.2874
+10.0000,10.0000,10.0000,10.7057,9.9556,9.2929
+10.0000,10.0000,10.0000,10.7095,9.9329,9.2985
+10.0000,10.0000,10.0000,10.7125,9.9100,9.3041
+10.0000,10.0000,10.0000,10.7147,9.8868,9.3097
+10.0000,10.0000,10.0000,10.7161,9.8634,9.3155
+10.0000,10.0000,10.0000,10.7166,9.8398,9.3212
+10.0000,10.0000,10.0000,10.7164,9.8161,9.3270
+10.0000,10.0000,10.0000,10.7153,9.7922,9.3328
+10.0000,10.0000,10.0000,10.7134,9.7682,9.3387
+10.0000,10.0000,10.0000,10.7106,9.7442,9.3446
+10.0000,10.0000,10.0000,10.7070,9.7201,9.3506
+10.0000,10.0000,10.0000,10.7025,9.6960,9.3565
+10.0000,10.0000,10.0000,10.6972,9.6719,9.3626
+10.0000,10.0000,10.0000,10.6910,9.6479,9.3686
+10.0000,10.0000,10.0000,10.6839,9.6240,9.3748
+10.0000,10.0000,10.0000,10.6760,9.6002,9.3809
+10.0000,10.0000,10.0000,10.6671,9.5766,9.3871
+10.0000,10.0000,10.0000,10.6575,9.5532,9.3933
+10.0000,10.0000,10.0000,10.6470,9.5300,9.3996
+10.0000,10.0000,10.0000,10.6356,9.5070,9.4059
+10.0000,10.0000,10.0000,10.6234,9.4843,9.4122
+10.0000,10.0000,10.0000,10.6103,9.4620,9.4186
+10.0000,10.0000,10.0000,10.5964,9.4399,9.4250
+10.0000,10.0000,10.0000,10.5817,9.4183,9.4314
+10.0000,10.0000,10.0000,10.5662,9.3971,9.4379
+10.0000,10.0000,10.0000,10.5499,9.3763,9.4444
+10.0000,10.0000,10.0000,10.5328,9.3560,9.4510
+10.0000,10.0000,10.0000,10.5149,9.3362,9.4576
+10.0000,10.0000,10.0000,10.4963,9.3169,9.4642
+10.0000,10.0000,10.0000,10.4769,9.2982,9.4708
+10.0000,10.0000,10.0000,10.4569,9.2801,9.4775
+10.0000,10.0000,10.0000,10.4361,9.2626,9.4842
+10.0000,10.0000,10.0000,10.4147,9.2457,9.4910
+10.0000,10.0000,10.0000,10.3926,9.2295,9.4977
+10.0000,10.0000,10.0000,10.3698,9.2140,9.5045
+10.0000,10.0000,10.0000,10.3465,9.1993,9.5114
+10.0000,10.0000,10.0000,10.3226,9.1852,9.5182
+10.0000,10.0000,10.0000,10.2981,9.1720,9.5251
+10.0000,10.0000,10.0000,10.2731,9.1595,9.5321
+10.0000,10.0000,10.0000,10.2476,9.1478,9.5390
+10.0000,10.0000,10.0000,10.2216,9.1370,9.5460
+10.0000,10.0000,10.0000,10.1951,9.1270,9.5530
+10.0000,10.0000,10.0000,10.1683,9.1179,9.5601
+10.0000,10.0000,10.0000,10.1410,9.1096,9.5671
+10.0000,10.0000,10.0000,10.1134,9.1023,9.5742
+10.0000,10.0000,10.0000,10.0855,9.0959,9.5813
+10.0000,10.0000,10.0000,10.0572,9.0904,9.5885
+10.0000,10.0000,10.0000,10.0287,9.0858,9.5957
+10.0000,10.0000,10.0000,10.0000,9.0822,9.6029
+10.0000,10.0000,10.0000,9.9711,9.0796,9.6101
+10.0000,10.0000,10.0000,9.9420,9.0779,9.6173
+10.0000,10.0000,10.0000,9.9128,9.0773,9.6246
+10.0000,10.0000,10.0000,9.8835,9.0776,9.6319
+10.0000,10.0000,10.0000,9.8541,9.0788,9.6392
+10.0000,10.0000,10.0000,9.8247,9.0811,9.6465
+10.0000,10.0000,10.0000,9.7953,9.0844,9.6539
+10.0000,10.0000,10.0000,9.7660,9.0887,9.6613
+10.0000,10.0000,10.0000,9.7368,9.0940,9.6687
+10.0000,10.0000,10.0000,9.7076,9.1002,9.6761
+10.0000,10.0000,10.0000,9.6787,9.1075,9.6835
+10.0000,10.0000,10.0000,9.6499,9.1157,9.6910
+10.0000,10.0000,10.0000,9.6213,9.1250,9.6985
+10.0000,10.0000,10.0000,9.5930,9.1352,9.7060
+10.0000,10.0000,10.0000,9.5650,9.1464,9.7135
+10.0000,10.0000,10.0000,9.5374,9.1585,9.7210
+10.0000,10.0000,10.0000,9.5101,9.1716,9.7286
+10.0000,10.0000,10.0000,9.4832,9.1856,9.7361
+10.0000,10.0000,10.0000,9.4567,9.2005,9.7437
+10.0000,10.0000,10.0000,9.4307,9.2164,9.7513
+10.0000,10.0000,10.0000,9.4052,9.2331,9.7589
+10.0000,10.0000,10.0000,9.3802,9.2508,9.7666
+10.0000,10.0000,10.0000,9.3558,9.2693,9.7742
+10.0000,10.0000,10.0000,9.3319,9.2886,9.7819
+10.0000,10.0000,10.0000,9.3087,9.3087,9.7895
+10.0000,10.0000,10.0000,9.2862,9.3297,9.7972
+10.0000,10.0000,10.0000,9.2643,9.3514,9.8049
+10.0000,10.0000,10.0000,9.2431,9.3739,9.8126
+10.0000,10.0000,10.0000,9.2227,9.3971,9.8203
+10.0000,10.0000,10.0000,9.2030,9.4210,9.8281
+10.0000,10.0000,10.0000,9.1841,9.4455,9.8358
+10.0000,10.0000,10.0000,9.1661,9.4708,9.8436
+10.0000,10.0000,10.0000,9.1488,9.4966,9.8513
+10.0000,10.0000,10.0000,9.1324,9.5231,9.8591
+10.0000,10.0000,10.0000,9.1169,9.5501,9.8669
+10.0000,10.0000,10.0000,9.1023,9.5776,9.8747
+10.0000,10.0000,10.0000,9.0886,9.6056,9.8825
+10.0000,10.0000,10.0000,9.0758,9.6341,9.8903
+10.0000,10.0000,10.0000,9.0640,9.6630,9.8981
+10.0000,10.0000,10.0000,9.0532,9.6924,9.9059
+10.0000,10.0000,10.0000,9.0433,9.7221,9.9137
+10.0000,10.0000,10.0000,9.0344,9.7521,9.9215
+10.0000,10.0000,10.0000,9.0265,9.7824,9.9294
+10.0000,10.0000,10.0000,9.0197,9.8130,9.9372
+10.0000,10.0000,10.0000,9.0138,9.8438,9.9451
+10.0000,10.0000,10.0000,9.0090,9.8748,9.9529
+10.0000,10.0000,10.0000,9.0052,9.9060,9.9607
+10.0000,10.0000,10.0000,9.0025,9.9372,9.9686
+10.0000,10.0000,10.0000,9.0008,9.9686,9.9764
+10.0000,10.0000,10.0000,9.0001,10.0000,9.9843
+10.0000,10.0000,10.0000,9.0005,10.0314,9.9921
+10.0000,10.0000,10.0000,9.0020,10.0628,10.0000
+10.0000,10.0000,10.0000,9.0045,10.0941,10.0079
+10.0000,10.0000,10.0000,9.0080,10.1253,10.0157
+10.0000,10.0000,10.0000,9.0126,10.1564,10.0236
+10.0000,10.0000,10.0000,9.0182,10.1873,10.0314
+10.0000,10.0000,10.0000,9.0248,10.2180,10.0393
+10.0000,10.0000,10.0000,9.0325,10.2484,10.0471
+10.0000,10.0000,10.0000,9.0412,10.2786,10.0550
+10.0000,10.0000,10.0000,9.0508,10.3084,10.0628
+10.0000,10.0000,10.0000,9.0615,10.3379,10.0706
+10.0000,10.0000,10.0000,9.0731,10.3670,10.0785
+10.0000,10.0000,10.0000,9.0857,10.3957,10.0863
+10.0000,10.0000,10.0000,9.0992,10.4239,10.0941
+10.0000,10.0000,10.0000,9.1136,10.4516,10.1019
+10.0000,10.0000,10.0000,9.1290,10.4788,10.1097
+10.0000,10.0000,10.0000,9.1452,10.5055,10.1175
+10.0000,10.0000,10.0000,9.1623,10.5316,10.1253
+10.0000,10.0000,10.0000,9.1803,10.5571,10.1331
+10.0000,10.0000,10.0000,9.1991,10.5819,10.1409
+10.0000,10.0000,10.0000,9.2186,10.6061,10.1487
+10.0000,10.0000,10.0000,9.2390,10.6296,10.1564
+10.0000,10.0000,10.0000,9.2601,10.6523,10.1642
+10.0000,10.0000,10.0000,9.2819,10.6744,10.1719
+10.0000,10.0000,10.0000,9.3044,10.6956,10.1797
+10.0000,10.0000,10.0000,9.3276,10.7161,10.1874
+10.0000,10.0000,10.0000,9.3514,10.7357,10.1951
+10.0000,10.0000,10.0000,9.3758,10.7545,10.2028
+10.0000,10.0000,10.0000,9.4008,10.7725,10.2105
+10.0000,10.0000,10.0000,9.4264,10.7895,10.2181
+10.0000,10.0000,10.0000,9.4524,10.8057,10.2258
+10.0000,10.0000,10.0000,9.4790,10.8210,10.2334
+10.0000,10.0000,10.0000,9.5060,10.8354,10.2411
+10.0000,10.0000,10.0000,9.5334,10.8488,10.2487
+10.0000,10.0000,10.0000,9.5612,10.8612,10.2563
+10.0000,10.0000,10.0000,9.5893,10.8728,10.2639
+10.0000,10.0000,10.0000,9.6178,10.8833,10.2714
+10.0000,10.0000,10.0000,9.6465,10.8929,10.2790
+10.0000,10.0000,10.0000,9.6755,10.9014,10.2865
+10.0000,10.0000,10.0000,9.7046,10.9090,10.2940
+10.0000,10.0000,10.0000,9.7340,10.9156,10.3015
+10.0000,10.0000,10.0000,9.7635,10.9212,10.3090
+10.0000,10.0000,10.0000,9.7931,10.9258,10.3165
+10.0000,10.0000,10.0000,9.8227,10.9293,10.3239
+10.0000,10.0000,10.0000,9.8524,10.9319,10.3313
+10.0000,10.0000,10.0000,9.8821,10.9335,10.3387
+10.0000,10.0000,10.0000,9.9117,10.9340,10.3461
+10.0000,10.0000,10.0000,9.9413,10.9336,10.3535
+10.0000,10.0000,10.0000,9.9707,10.9322,10.3608
+10.0000,10.0000,10.0000,10.0000,10.9298,10.3681
+10.0000,10.0000,10.0000,10.0291,10.9264,10.3754
+10.0000,10.0000,10.0000,10.0580,10.9221,10.3827
+10.0000,10.0000,10.0000,10.0867,10.9168,10.3899
+10.0000,10.0000,10.0000,10.1150,10.9105,10.3971
+10.0000,10.0000,10.0000,10.1431,10.9033,10.4043
+10.0000,10.0000,10.0000,10.1708,10.8953,10.4115
+10.0000,10.0000,10.0000,10.1981,10.8863,10.4187
+10.0000,10.0000,10.0000,10.2250,10.8764,10.4258
+10.0000,10.0000,10.0000,10.2515,10.8657,10.4329
+10.0000,10.0000,10.0000,10.2775,10.8541,10.4399
+10.0000,10.0000,10.0000,10.3030,10.8417,10.4470
+10.0000,10.0000,10.0000,10.3280,10.8284,10.4540
+10.0000,10.0000,10.0000,10.3524,10.8144,10.4610
+10.0000,10.0000,10.0000,10.3763,10.7997,10.4679
+10.0000,10.0000,10.0000,10.3995,10.7841,10.4749
+10.0000,10.0000,10.0000,10.4222,10.7679,10.4818
+10.0000,10.0000,10.0000,10.4441,10.7510,10.4886
+10.0000,10.0000,10.0000,10.4654,10.7334,10.4955
+10.0000,10.0000,10.0000,10.4860,10.7152,10.5023
+10.0000,10.0000,10.0000,10.5059,10.6964,10.5090
+10.0000,10.0000,10.0000,10.5251,10.6769,10.5158
+10.0000,10.0000,10.0000,10.5435,10.6570,10.5225
+10.0000,10.0000,10.0000,10.5611,10.6365,10.5292
+10.0000,10.0000,10.0000,10.5780,10.6155,10.5358
+10.0000,10.0000,10.0000,10.5940,10.5940,10.5424
+10.0000,10.0000,10.0000,10.6093,10.5721,10.5490
+10.0000,10.0000,10.0000,10.6237,10.5499,10.5556
+10.0000,10.0000,10.0000,10.6373,10.5272,10.5621
+10.0000,10.0000,10.0000,10.6500,10.5042,10.5686
+10.0000,10.0000,10.0000,10.6619,10.4809,10.5750
+10.0000,10.0000,10.0000,10.6729,10.4573,10.5814
+10.0000,10.0000,10.0000,10.6831,10.4335,10.5878
+10.0000,10.0000,10.0000,10.6924,10.4095,10.5941
+10.0000,10.0000,10.0000,10.7008,10.3852,10.6004
+10.0000,10.0000,10.0000,10.7083,10.3609,10.6067
+10.0000,10.0000,10.0000,10.7150,10.3364,10.6129
+10.0000,10.0000,10.0000,10.7207,10.3119,10.6191
+10.0000,10.0000,10.0000,10.7256,10.2873,10.6252
+10.0000,10.0000,10.0000,10.7296,10.2627,10.6314
+10.0000,10.0000,10.0000,10.7328,10.2381,10.6374
+10.0000,10.0000,10.0000,10.7351,10.2136,10.6435
+10.0000,10.0000,10.0000,10.7365,10.1891,10.6494
+10.0000,10.0000,10.0000,10.7371,10.1648,10.6554
+10.0000,10.0000,10.0000,10.7368,10.1406,10.6613
+10.0000,10.0000,10.0000,10.7357,10.1165,10.6672
+10.0000,10.0000,10.0000,10.7338,10.0927,10.6730
+10.0000,10.0000,10.0000,10.7311,10.0691,10.6788
+10.0000,10.0000,10.0000,10.7275,10.0458,10.6845
+10.0000,10.0000,10.0000,10.7232,10.0227,10.6903
+10.0000,10.0000,10.0000,10.7181,10.0000,10.6959
diff --git a/scripts/trajectories/full-circle-with-up-and-down-4s.csv b/scripts/trajectories/full-circle-with-up-and-down-4s.csv
new file mode 100644
index 0000000000000000000000000000000000000000..31692f46736eacc50237c02ec4a532cee6c67927
--- /dev/null
+++ b/scripts/trajectories/full-circle-with-up-and-down-4s.csv
@@ -0,0 +1,800 @@
+0.9223,-0.0000,0.3863,-0.0119
+0.9223,-0.0000,0.3863,-0.0119
+0.9223,-0.0000,0.3863,-0.0119
+0.9223,-0.0000,0.3863,-0.0119
+0.9235,-0.0000,0.3828,-0.0240
+0.9235,-0.0000,0.3828,-0.0240
+0.9235,-0.0000,0.3828,-0.0240
+0.9235,-0.0000,0.3828,-0.0240
+0.9245,-0.0000,0.3794,-0.0363
+0.9245,-0.0000,0.3794,-0.0363
+0.9245,-0.0000,0.3794,-0.0363
+0.9245,-0.0000,0.3794,-0.0363
+0.9253,-0.0000,0.3760,-0.0486
+0.9253,-0.0000,0.3760,-0.0486
+0.9253,-0.0000,0.3760,-0.0486
+0.9253,-0.0000,0.3760,-0.0486
+0.9259,-0.0000,0.3727,-0.0611
+0.9259,-0.0000,0.3727,-0.0611
+0.9259,-0.0000,0.3727,-0.0611
+0.9259,-0.0000,0.3727,-0.0611
+0.9263,-0.0000,0.3695,-0.0737
+0.9263,-0.0000,0.3695,-0.0737
+0.9263,-0.0000,0.3695,-0.0737
+0.9263,-0.0000,0.3695,-0.0737
+0.9265,-0.0000,0.3663,-0.0865
+0.9265,-0.0000,0.3663,-0.0865
+0.9265,-0.0000,0.3663,-0.0865
+0.9265,-0.0000,0.3663,-0.0865
+0.9264,-0.0000,0.3632,-0.0993
+0.9264,-0.0000,0.3632,-0.0993
+0.9264,-0.0000,0.3632,-0.0993
+0.9264,-0.0000,0.3632,-0.0993
+0.9261,-0.0000,0.3602,-0.1122
+0.9261,-0.0000,0.3602,-0.1122
+0.9261,-0.0000,0.3602,-0.1122
+0.9261,-0.0000,0.3602,-0.1122
+0.9256,-0.0000,0.3572,-0.1252
+0.9256,-0.0000,0.3572,-0.1252
+0.9256,-0.0000,0.3572,-0.1252
+0.9256,-0.0000,0.3572,-0.1252
+0.9248,-0.0000,0.3543,-0.1383
+0.9248,-0.0000,0.3543,-0.1383
+0.9248,-0.0000,0.3543,-0.1383
+0.9248,-0.0000,0.3543,-0.1383
+0.9239,-0.0000,0.3515,-0.1515
+0.9239,-0.0000,0.3515,-0.1515
+0.9239,-0.0000,0.3515,-0.1515
+0.9239,-0.0000,0.3515,-0.1515
+0.9226,-0.0000,0.3487,-0.1648
+0.9226,-0.0000,0.3487,-0.1648
+0.9226,-0.0000,0.3487,-0.1648
+0.9226,-0.0000,0.3487,-0.1648
+0.9212,-0.0000,0.3460,-0.1781
+0.9212,-0.0000,0.3460,-0.1781
+0.9212,-0.0000,0.3460,-0.1781
+0.9212,-0.0000,0.3460,-0.1781
+0.9195,-0.0000,0.3433,-0.1914
+0.9195,-0.0000,0.3433,-0.1914
+0.9195,-0.0000,0.3433,-0.1914
+0.9195,-0.0000,0.3433,-0.1914
+0.9176,-0.0000,0.3407,-0.2049
+0.9176,-0.0000,0.3407,-0.2049
+0.9176,-0.0000,0.3407,-0.2049
+0.9176,-0.0000,0.3407,-0.2049
+0.9154,-0.0000,0.3382,-0.2183
+0.9154,-0.0000,0.3382,-0.2183
+0.9154,-0.0000,0.3382,-0.2183
+0.9154,-0.0000,0.3382,-0.2183
+0.9130,-0.0000,0.3357,-0.2319
+0.9130,-0.0000,0.3357,-0.2319
+0.9130,-0.0000,0.3357,-0.2319
+0.9130,-0.0000,0.3357,-0.2319
+0.9104,-0.0000,0.3332,-0.2454
+0.9104,-0.0000,0.3332,-0.2454
+0.9104,-0.0000,0.3332,-0.2454
+0.9104,-0.0000,0.3332,-0.2454
+0.9075,-0.0000,0.3308,-0.2590
+0.9075,-0.0000,0.3308,-0.2590
+0.9075,-0.0000,0.3308,-0.2590
+0.9075,-0.0000,0.3308,-0.2590
+0.9043,-0.0000,0.3285,-0.2726
+0.9043,-0.0000,0.3285,-0.2726
+0.9043,-0.0000,0.3285,-0.2726
+0.9043,-0.0000,0.3285,-0.2726
+0.9009,-0.0000,0.3262,-0.2862
+0.9009,-0.0000,0.3262,-0.2862
+0.9009,-0.0000,0.3262,-0.2862
+0.9009,-0.0000,0.3262,-0.2862
+0.8973,-0.0000,0.3240,-0.2998
+0.8973,-0.0000,0.3240,-0.2998
+0.8973,-0.0000,0.3240,-0.2998
+0.8973,-0.0000,0.3240,-0.2998
+0.8934,-0.0000,0.3218,-0.3134
+0.8934,-0.0000,0.3218,-0.3134
+0.8934,-0.0000,0.3218,-0.3134
+0.8934,-0.0000,0.3218,-0.3134
+0.8893,-0.0000,0.3197,-0.3271
+0.8893,-0.0000,0.3197,-0.3271
+0.8893,-0.0000,0.3197,-0.3271
+0.8893,-0.0000,0.3197,-0.3271
+0.8849,-0.0000,0.3176,-0.3407
+0.8849,-0.0000,0.3176,-0.3407
+0.8849,-0.0000,0.3176,-0.3407
+0.8849,-0.0000,0.3176,-0.3407
+0.8803,-0.0000,0.3156,-0.3543
+0.8803,-0.0000,0.3156,-0.3543
+0.8803,-0.0000,0.3156,-0.3543
+0.8803,-0.0000,0.3156,-0.3543
+0.8754,-0.0000,0.3136,-0.3678
+0.8754,-0.0000,0.3136,-0.3678
+0.8754,-0.0000,0.3136,-0.3678
+0.8754,-0.0000,0.3136,-0.3678
+0.8703,-0.0000,0.3116,-0.3814
+0.8703,-0.0000,0.3116,-0.3814
+0.8703,-0.0000,0.3116,-0.3814
+0.8703,-0.0000,0.3116,-0.3814
+0.8650,-0.0000,0.3097,-0.3949
+0.8650,-0.0000,0.3097,-0.3949
+0.8650,-0.0000,0.3097,-0.3949
+0.8650,-0.0000,0.3097,-0.3949
+0.8593,-0.0000,0.3079,-0.4083
+0.8593,-0.0000,0.3079,-0.4083
+0.8593,-0.0000,0.3079,-0.4083
+0.8593,-0.0000,0.3079,-0.4083
+0.8535,-0.0000,0.3061,-0.4217
+0.8535,-0.0000,0.3061,-0.4217
+0.8535,-0.0000,0.3061,-0.4217
+0.8535,-0.0000,0.3061,-0.4217
+0.8474,-0.0000,0.3043,-0.4351
+0.8474,-0.0000,0.3043,-0.4351
+0.8474,-0.0000,0.3043,-0.4351
+0.8474,-0.0000,0.3043,-0.4351
+0.8410,-0.0000,0.3026,-0.4484
+0.8410,-0.0000,0.3026,-0.4484
+0.8410,-0.0000,0.3026,-0.4484
+0.8410,-0.0000,0.3026,-0.4484
+0.8344,-0.0000,0.3010,-0.4617
+0.8344,-0.0000,0.3010,-0.4617
+0.8344,-0.0000,0.3010,-0.4617
+0.8344,-0.0000,0.3010,-0.4617
+0.8276,-0.0000,0.2993,-0.4748
+0.8276,-0.0000,0.2993,-0.4748
+0.8276,-0.0000,0.2993,-0.4748
+0.8276,-0.0000,0.2993,-0.4748
+0.8205,-0.0000,0.2978,-0.4879
+0.8205,-0.0000,0.2978,-0.4879
+0.8205,-0.0000,0.2978,-0.4879
+0.8205,-0.0000,0.2978,-0.4879
+0.8132,-0.0000,0.2962,-0.5010
+0.8132,-0.0000,0.2962,-0.5010
+0.8132,-0.0000,0.2962,-0.5010
+0.8132,-0.0000,0.2962,-0.5010
+0.8056,-0.0000,0.2947,-0.5139
+0.8056,-0.0000,0.2947,-0.5139
+0.8056,-0.0000,0.2947,-0.5139
+0.8056,-0.0000,0.2947,-0.5139
+0.7978,-0.0000,0.2932,-0.5267
+0.7978,-0.0000,0.2932,-0.5267
+0.7978,-0.0000,0.2932,-0.5267
+0.7978,-0.0000,0.2932,-0.5267
+0.7898,-0.0000,0.2918,-0.5395
+0.7898,-0.0000,0.2918,-0.5395
+0.7898,-0.0000,0.2918,-0.5395
+0.7898,-0.0000,0.2918,-0.5395
+0.7815,-0.0000,0.2904,-0.5521
+0.7815,-0.0000,0.2904,-0.5521
+0.7815,-0.0000,0.2904,-0.5521
+0.7815,-0.0000,0.2904,-0.5521
+0.7730,-0.0000,0.2891,-0.5647
+0.7730,-0.0000,0.2891,-0.5647
+0.7730,-0.0000,0.2891,-0.5647
+0.7730,-0.0000,0.2891,-0.5647
+0.7643,-0.0000,0.2878,-0.5771
+0.7643,-0.0000,0.2878,-0.5771
+0.7643,-0.0000,0.2878,-0.5771
+0.7643,-0.0000,0.2878,-0.5771
+0.7553,-0.0000,0.2865,-0.5894
+0.7553,-0.0000,0.2865,-0.5894
+0.7553,-0.0000,0.2865,-0.5894
+0.7553,-0.0000,0.2865,-0.5894
+0.7461,-0.0000,0.2853,-0.6016
+0.7461,-0.0000,0.2853,-0.6016
+0.7461,-0.0000,0.2853,-0.6016
+0.7461,-0.0000,0.2853,-0.6016
+0.7367,-0.0000,0.2841,-0.6136
+0.7367,-0.0000,0.2841,-0.6136
+0.7367,-0.0000,0.2841,-0.6136
+0.7367,-0.0000,0.2841,-0.6136
+0.7271,-0.0000,0.2830,-0.6255
+0.7271,-0.0000,0.2830,-0.6255
+0.7271,-0.0000,0.2830,-0.6255
+0.7271,-0.0000,0.2830,-0.6255
+0.7172,-0.0000,0.2819,-0.6373
+0.7172,-0.0000,0.2819,-0.6373
+0.7172,-0.0000,0.2819,-0.6373
+0.7172,-0.0000,0.2819,-0.6373
+0.7071,-0.0000,0.2808,-0.6490
+0.7071,-0.0000,0.2808,-0.6490
+0.7071,-0.0000,0.2808,-0.6490
+0.7071,-0.0000,0.2808,-0.6490
+0.6968,-0.0000,0.2798,-0.6604
+0.6968,-0.0000,0.2798,-0.6604
+0.6968,-0.0000,0.2798,-0.6604
+0.6968,-0.0000,0.2798,-0.6604
+0.6863,-0.0000,0.2788,-0.6718
+0.6863,-0.0000,0.2788,-0.6718
+0.6863,-0.0000,0.2788,-0.6718
+0.6863,-0.0000,0.2788,-0.6718
+0.6756,-0.0000,0.2779,-0.6829
+0.6756,-0.0000,0.2779,-0.6829
+0.6756,-0.0000,0.2779,-0.6829
+0.6756,-0.0000,0.2779,-0.6829
+0.6646,-0.0000,0.2769,-0.6940
+0.6646,-0.0000,0.2769,-0.6940
+0.6646,-0.0000,0.2769,-0.6940
+0.6646,-0.0000,0.2769,-0.6940
+0.6535,-0.0000,0.2761,-0.7048
+0.6535,-0.0000,0.2761,-0.7048
+0.6535,-0.0000,0.2761,-0.7048
+0.6535,-0.0000,0.2761,-0.7048
+0.6422,-0.0000,0.2752,-0.7155
+0.6422,-0.0000,0.2752,-0.7155
+0.6422,-0.0000,0.2752,-0.7155
+0.6422,-0.0000,0.2752,-0.7155
+0.6306,-0.0000,0.2744,-0.7260
+0.6306,-0.0000,0.2744,-0.7260
+0.6306,-0.0000,0.2744,-0.7260
+0.6306,-0.0000,0.2744,-0.7260
+0.6189,-0.0000,0.2737,-0.7363
+0.6189,-0.0000,0.2737,-0.7363
+0.6189,-0.0000,0.2737,-0.7363
+0.6189,-0.0000,0.2737,-0.7363
+0.6069,-0.0000,0.2730,-0.7464
+0.6069,-0.0000,0.2730,-0.7464
+0.6069,-0.0000,0.2730,-0.7464
+0.6069,-0.0000,0.2730,-0.7464
+0.5948,-0.0000,0.2723,-0.7563
+0.5948,-0.0000,0.2723,-0.7563
+0.5948,-0.0000,0.2723,-0.7563
+0.5948,-0.0000,0.2723,-0.7563
+0.5825,-0.0000,0.2716,-0.7661
+0.5825,-0.0000,0.2716,-0.7661
+0.5825,-0.0000,0.2716,-0.7661
+0.5825,-0.0000,0.2716,-0.7661
+0.5700,-0.0000,0.2710,-0.7756
+0.5700,-0.0000,0.2710,-0.7756
+0.5700,-0.0000,0.2710,-0.7756
+0.5700,-0.0000,0.2710,-0.7756
+0.5574,-0.0000,0.2705,-0.7850
+0.5574,-0.0000,0.2705,-0.7850
+0.5574,-0.0000,0.2705,-0.7850
+0.5574,-0.0000,0.2705,-0.7850
+0.5445,-0.0000,0.2700,-0.7941
+0.5445,-0.0000,0.2700,-0.7941
+0.5445,-0.0000,0.2700,-0.7941
+0.5445,-0.0000,0.2700,-0.7941
+0.5315,-0.0000,0.2695,-0.8030
+0.5315,-0.0000,0.2695,-0.8030
+0.5315,-0.0000,0.2695,-0.8030
+0.5315,-0.0000,0.2695,-0.8030
+0.5184,-0.0000,0.2691,-0.8117
+0.5184,-0.0000,0.2691,-0.8117
+0.5184,-0.0000,0.2691,-0.8117
+0.5184,-0.0000,0.2691,-0.8117
+0.5050,-0.0000,0.2687,-0.8202
+0.5050,-0.0000,0.2687,-0.8202
+0.5050,-0.0000,0.2687,-0.8202
+0.5050,-0.0000,0.2687,-0.8202
+0.4915,-0.0000,0.2684,-0.8285
+0.4915,-0.0000,0.2684,-0.8285
+0.4915,-0.0000,0.2684,-0.8285
+0.4915,-0.0000,0.2684,-0.8285
+0.4779,-0.0000,0.2682,-0.8365
+0.4779,-0.0000,0.2682,-0.8365
+0.4779,-0.0000,0.2682,-0.8365
+0.4779,-0.0000,0.2682,-0.8365
+0.4640,-0.0000,0.2680,-0.8443
+0.4640,-0.0000,0.2680,-0.8443
+0.4640,-0.0000,0.2680,-0.8443
+0.4640,-0.0000,0.2680,-0.8443
+0.4501,-0.0000,0.2678,-0.8519
+0.4501,-0.0000,0.2678,-0.8519
+0.4501,-0.0000,0.2678,-0.8519
+0.4501,-0.0000,0.2678,-0.8519
+0.4360,-0.0000,0.2677,-0.8592
+0.4360,-0.0000,0.2677,-0.8592
+0.4360,-0.0000,0.2677,-0.8592
+0.4360,-0.0000,0.2677,-0.8592
+0.4218,-0.0000,0.2677,-0.8663
+0.4218,-0.0000,0.2677,-0.8663
+0.4218,-0.0000,0.2677,-0.8663
+0.4218,-0.0000,0.2677,-0.8663
+0.4074,-0.0000,0.2677,-0.8731
+0.4074,-0.0000,0.2677,-0.8731
+0.4074,-0.0000,0.2677,-0.8731
+0.4074,-0.0000,0.2677,-0.8731
+0.3929,-0.0000,0.2678,-0.8797
+0.3929,-0.0000,0.2678,-0.8797
+0.3929,-0.0000,0.2678,-0.8797
+0.3929,-0.0000,0.2678,-0.8797
+0.3783,-0.0000,0.2680,-0.8860
+0.3783,-0.0000,0.2680,-0.8860
+0.3783,-0.0000,0.2680,-0.8860
+0.3783,-0.0000,0.2680,-0.8860
+0.3635,-0.0000,0.2683,-0.8921
+0.3635,-0.0000,0.2683,-0.8921
+0.3635,-0.0000,0.2683,-0.8921
+0.3635,-0.0000,0.2683,-0.8921
+0.3487,-0.0000,0.2687,-0.8979
+0.3487,-0.0000,0.2687,-0.8979
+0.3487,-0.0000,0.2687,-0.8979
+0.3487,-0.0000,0.2687,-0.8979
+0.3337,-0.0000,0.2692,-0.9034
+0.3337,-0.0000,0.2692,-0.9034
+0.3337,-0.0000,0.2692,-0.9034
+0.3337,-0.0000,0.2692,-0.9034
+0.3186,-0.0000,0.2698,-0.9087
+0.3186,-0.0000,0.2698,-0.9087
+0.3186,-0.0000,0.2698,-0.9087
+0.3186,-0.0000,0.2698,-0.9087
+0.3034,-0.0000,0.2705,-0.9136
+0.3034,-0.0000,0.2705,-0.9136
+0.3034,-0.0000,0.2705,-0.9136
+0.3034,-0.0000,0.2705,-0.9136
+0.2882,-0.0000,0.2714,-0.9183
+0.2882,-0.0000,0.2714,-0.9183
+0.2882,-0.0000,0.2714,-0.9183
+0.2882,-0.0000,0.2714,-0.9183
+0.2728,-0.0000,0.2725,-0.9227
+0.2728,-0.0000,0.2725,-0.9227
+0.2728,-0.0000,0.2725,-0.9227
+0.2728,-0.0000,0.2725,-0.9227
+0.2573,-0.0000,0.2738,-0.9267
+0.2573,-0.0000,0.2738,-0.9267
+0.2573,-0.0000,0.2738,-0.9267
+0.2573,-0.0000,0.2738,-0.9267
+0.2418,-0.0000,0.2753,-0.9305
+0.2418,-0.0000,0.2753,-0.9305
+0.2418,-0.0000,0.2753,-0.9305
+0.2418,-0.0000,0.2753,-0.9305
+0.2262,-0.0000,0.2771,-0.9339
+0.2262,-0.0000,0.2771,-0.9339
+0.2262,-0.0000,0.2771,-0.9339
+0.2262,-0.0000,0.2771,-0.9339
+0.2105,-0.0000,0.2792,-0.9369
+0.2105,-0.0000,0.2792,-0.9369
+0.2105,-0.0000,0.2792,-0.9369
+0.2105,-0.0000,0.2792,-0.9369
+0.1947,-0.0000,0.2818,-0.9395
+0.1947,-0.0000,0.2818,-0.9395
+0.1947,-0.0000,0.2818,-0.9395
+0.1947,-0.0000,0.2818,-0.9395
+0.1789,-0.0000,0.2848,-0.9417
+0.1789,-0.0000,0.2848,-0.9417
+0.1789,-0.0000,0.2848,-0.9417
+0.1789,-0.0000,0.2848,-0.9417
+0.1630,-0.0000,0.2886,-0.9435
+0.1630,-0.0000,0.2886,-0.9435
+0.1630,-0.0000,0.2886,-0.9435
+0.1630,-0.0000,0.2886,-0.9435
+0.1471,-0.0000,0.2933,-0.9446
+0.1471,-0.0000,0.2933,-0.9446
+0.1471,-0.0000,0.2933,-0.9446
+0.1471,-0.0000,0.2933,-0.9446
+0.1312,-0.0000,0.2991,-0.9452
+0.1312,-0.0000,0.2991,-0.9452
+0.1312,-0.0000,0.2991,-0.9452
+0.1312,-0.0000,0.2991,-0.9452
+0.1152,-0.0000,0.3067,-0.9448
+0.1152,-0.0000,0.3067,-0.9448
+0.1152,-0.0000,0.3067,-0.9448
+0.1152,-0.0000,0.3067,-0.9448
+0.0991,-0.0000,0.3167,-0.9433
+0.0991,-0.0000,0.3167,-0.9433
+0.0991,-0.0000,0.3167,-0.9433
+0.0991,-0.0000,0.3167,-0.9433
+0.0831,-0.0000,0.3307,-0.9401
+0.0831,-0.0000,0.3307,-0.9401
+0.0831,-0.0000,0.3307,-0.9401
+0.0831,-0.0000,0.3307,-0.9401
+0.0670,-0.0000,0.3514,-0.9338
+0.0670,-0.0000,0.3514,-0.9338
+0.0670,-0.0000,0.3514,-0.9338
+0.0670,-0.0000,0.3514,-0.9338
+0.0510,-0.0000,0.3848,-0.9216
+0.0510,-0.0000,0.3848,-0.9216
+0.0510,-0.0000,0.3848,-0.9216
+0.0510,-0.0000,0.3848,-0.9216
+0.0351,-0.0000,0.4473,-0.8937
+0.0351,-0.0000,0.4473,-0.8937
+0.0351,-0.0000,0.4473,-0.8937
+0.0351,-0.0000,0.4473,-0.8937
+0.0196,-0.0000,0.6000,-0.7997
+0.0196,-0.0000,0.6000,-0.7997
+0.0196,-0.0000,0.6000,-0.7997
+0.0196,-0.0000,0.6000,-0.7997
+0.0079,0.0000,1.0000,0.0001
+0.0079,0.0000,1.0000,0.0001
+0.0079,0.0000,1.0000,0.0001
+0.0079,0.0000,1.0000,0.0001
+0.0162,0.0000,0.2425,0.9700
+0.0162,0.0000,0.2425,0.9700
+0.0162,0.0000,0.2425,0.9700
+0.0162,0.0000,0.2425,0.9700
+0.0314,-0.0000,-0.0000,0.9995
+0.0314,-0.0000,-0.0000,0.9995
+0.0314,-0.0000,-0.0000,0.9995
+0.0314,-0.0000,-0.0000,0.9995
+0.0473,-0.0000,-0.0831,0.9954
+0.0473,-0.0000,-0.0831,0.9954
+0.0473,-0.0000,-0.0831,0.9954
+0.0473,-0.0000,-0.0831,0.9954
+0.0633,-0.0000,-0.1241,0.9902
+0.0633,-0.0000,-0.1241,0.9902
+0.0633,-0.0000,-0.1241,0.9902
+0.0633,-0.0000,-0.1241,0.9902
+0.0793,-0.0000,-0.1485,0.9857
+0.0793,-0.0000,-0.1485,0.9857
+0.0793,-0.0000,-0.1485,0.9857
+0.0793,-0.0000,-0.1485,0.9857
+0.0954,-0.0000,-0.1646,0.9817
+0.0954,-0.0000,-0.1646,0.9817
+0.0954,-0.0000,-0.1646,0.9817
+0.0954,-0.0000,-0.1646,0.9817
+0.1114,-0.0000,-0.1762,0.9780
+0.1114,-0.0000,-0.1762,0.9780
+0.1114,-0.0000,-0.1762,0.9780
+0.1114,-0.0000,-0.1762,0.9780
+0.1275,-0.0000,-0.1848,0.9745
+0.1275,-0.0000,-0.1848,0.9745
+0.1275,-0.0000,-0.1848,0.9745
+0.1275,-0.0000,-0.1848,0.9745
+0.1435,-0.0000,-0.1915,0.9709
+0.1435,-0.0000,-0.1915,0.9709
+0.1435,-0.0000,-0.1915,0.9709
+0.1435,-0.0000,-0.1915,0.9709
+0.1594,-0.0000,-0.1970,0.9674
+0.1594,-0.0000,-0.1970,0.9674
+0.1594,-0.0000,-0.1970,0.9674
+0.1594,-0.0000,-0.1970,0.9674
+0.1753,-0.0000,-0.2014,0.9637
+0.1753,-0.0000,-0.2014,0.9637
+0.1753,-0.0000,-0.2014,0.9637
+0.1753,-0.0000,-0.2014,0.9637
+0.1912,-0.0000,-0.2052,0.9599
+0.1912,-0.0000,-0.2052,0.9599
+0.1912,-0.0000,-0.2052,0.9599
+0.1912,-0.0000,-0.2052,0.9599
+0.2070,-0.0000,-0.2085,0.9559
+0.2070,-0.0000,-0.2085,0.9559
+0.2070,-0.0000,-0.2085,0.9559
+0.2070,-0.0000,-0.2085,0.9559
+0.2227,-0.0000,-0.2113,0.9517
+0.2227,-0.0000,-0.2113,0.9517
+0.2227,-0.0000,-0.2113,0.9517
+0.2227,-0.0000,-0.2113,0.9517
+0.2384,-0.0000,-0.2138,0.9473
+0.2384,-0.0000,-0.2138,0.9473
+0.2384,-0.0000,-0.2138,0.9473
+0.2384,-0.0000,-0.2138,0.9473
+0.2540,-0.0000,-0.2161,0.9428
+0.2540,-0.0000,-0.2161,0.9428
+0.2540,-0.0000,-0.2161,0.9428
+0.2540,-0.0000,-0.2161,0.9428
+0.2695,-0.0000,-0.2181,0.9380
+0.2695,-0.0000,-0.2181,0.9380
+0.2695,-0.0000,-0.2181,0.9380
+0.2695,-0.0000,-0.2181,0.9380
+0.2849,-0.0000,-0.2200,0.9330
+0.2849,-0.0000,-0.2200,0.9330
+0.2849,-0.0000,-0.2200,0.9330
+0.2849,-0.0000,-0.2200,0.9330
+0.3002,-0.0000,-0.2217,0.9277
+0.3002,-0.0000,-0.2217,0.9277
+0.3002,-0.0000,-0.2217,0.9277
+0.3002,-0.0000,-0.2217,0.9277
+0.3155,-0.0000,-0.2233,0.9223
+0.3155,-0.0000,-0.2233,0.9223
+0.3155,-0.0000,-0.2233,0.9223
+0.3155,-0.0000,-0.2233,0.9223
+0.3306,-0.0000,-0.2248,0.9166
+0.3306,-0.0000,-0.2248,0.9166
+0.3306,-0.0000,-0.2248,0.9166
+0.3306,-0.0000,-0.2248,0.9166
+0.3457,-0.0000,-0.2263,0.9107
+0.3457,-0.0000,-0.2263,0.9107
+0.3457,-0.0000,-0.2263,0.9107
+0.3457,-0.0000,-0.2263,0.9107
+0.3606,-0.0000,-0.2277,0.9045
+0.3606,-0.0000,-0.2277,0.9045
+0.3606,-0.0000,-0.2277,0.9045
+0.3606,-0.0000,-0.2277,0.9045
+0.3754,-0.0000,-0.2290,0.8981
+0.3754,-0.0000,-0.2290,0.8981
+0.3754,-0.0000,-0.2290,0.8981
+0.3754,-0.0000,-0.2290,0.8981
+0.3901,-0.0000,-0.2303,0.8915
+0.3901,-0.0000,-0.2303,0.8915
+0.3901,-0.0000,-0.2303,0.8915
+0.3901,-0.0000,-0.2303,0.8915
+0.4047,-0.0000,-0.2315,0.8847
+0.4047,-0.0000,-0.2315,0.8847
+0.4047,-0.0000,-0.2315,0.8847
+0.4047,-0.0000,-0.2315,0.8847
+0.4192,-0.0000,-0.2327,0.8776
+0.4192,-0.0000,-0.2327,0.8776
+0.4192,-0.0000,-0.2327,0.8776
+0.4192,-0.0000,-0.2327,0.8776
+0.4335,-0.0000,-0.2339,0.8703
+0.4335,-0.0000,-0.2339,0.8703
+0.4335,-0.0000,-0.2339,0.8703
+0.4335,-0.0000,-0.2339,0.8703
+0.4477,-0.0000,-0.2351,0.8627
+0.4477,-0.0000,-0.2351,0.8627
+0.4477,-0.0000,-0.2351,0.8627
+0.4477,-0.0000,-0.2351,0.8627
+0.4617,-0.0000,-0.2362,0.8550
+0.4617,-0.0000,-0.2362,0.8550
+0.4617,-0.0000,-0.2362,0.8550
+0.4617,-0.0000,-0.2362,0.8550
+0.4756,-0.0000,-0.2374,0.8470
+0.4756,-0.0000,-0.2374,0.8470
+0.4756,-0.0000,-0.2374,0.8470
+0.4756,-0.0000,-0.2374,0.8470
+0.4894,-0.0000,-0.2385,0.8388
+0.4894,-0.0000,-0.2385,0.8388
+0.4894,-0.0000,-0.2385,0.8388
+0.4894,-0.0000,-0.2385,0.8388
+0.5030,-0.0000,-0.2396,0.8304
+0.5030,-0.0000,-0.2396,0.8304
+0.5030,-0.0000,-0.2396,0.8304
+0.5030,-0.0000,-0.2396,0.8304
+0.5164,-0.0000,-0.2408,0.8218
+0.5164,-0.0000,-0.2408,0.8218
+0.5164,-0.0000,-0.2408,0.8218
+0.5164,-0.0000,-0.2408,0.8218
+0.5297,-0.0000,-0.2419,0.8130
+0.5297,-0.0000,-0.2419,0.8130
+0.5297,-0.0000,-0.2419,0.8130
+0.5297,-0.0000,-0.2419,0.8130
+0.5428,-0.0000,-0.2431,0.8039
+0.5428,-0.0000,-0.2431,0.8039
+0.5428,-0.0000,-0.2431,0.8039
+0.5428,-0.0000,-0.2431,0.8039
+0.5558,-0.0000,-0.2442,0.7947
+0.5558,-0.0000,-0.2442,0.7947
+0.5558,-0.0000,-0.2442,0.7947
+0.5558,-0.0000,-0.2442,0.7947
+0.5685,-0.0000,-0.2454,0.7852
+0.5685,-0.0000,-0.2454,0.7852
+0.5685,-0.0000,-0.2454,0.7852
+0.5685,-0.0000,-0.2454,0.7852
+0.5811,-0.0000,-0.2465,0.7756
+0.5811,-0.0000,-0.2465,0.7756
+0.5811,-0.0000,-0.2465,0.7756
+0.5811,-0.0000,-0.2465,0.7756
+0.5936,-0.0000,-0.2477,0.7657
+0.5936,-0.0000,-0.2477,0.7657
+0.5936,-0.0000,-0.2477,0.7657
+0.5936,-0.0000,-0.2477,0.7657
+0.6058,-0.0000,-0.2489,0.7557
+0.6058,-0.0000,-0.2489,0.7557
+0.6058,-0.0000,-0.2489,0.7557
+0.6058,-0.0000,-0.2489,0.7557
+0.6179,-0.0000,-0.2501,0.7455
+0.6179,-0.0000,-0.2501,0.7455
+0.6179,-0.0000,-0.2501,0.7455
+0.6179,-0.0000,-0.2501,0.7455
+0.6297,-0.0000,-0.2513,0.7351
+0.6297,-0.0000,-0.2513,0.7351
+0.6297,-0.0000,-0.2513,0.7351
+0.6297,-0.0000,-0.2513,0.7351
+0.6414,-0.0000,-0.2525,0.7245
+0.6414,-0.0000,-0.2525,0.7245
+0.6414,-0.0000,-0.2525,0.7245
+0.6414,-0.0000,-0.2525,0.7245
+0.6528,-0.0000,-0.2538,0.7137
+0.6528,-0.0000,-0.2538,0.7137
+0.6528,-0.0000,-0.2538,0.7137
+0.6528,-0.0000,-0.2538,0.7137
+0.6641,-0.0000,-0.2550,0.7028
+0.6641,-0.0000,-0.2550,0.7028
+0.6641,-0.0000,-0.2550,0.7028
+0.6641,-0.0000,-0.2550,0.7028
+0.6752,-0.0000,-0.2563,0.6917
+0.6752,-0.0000,-0.2563,0.6917
+0.6752,-0.0000,-0.2563,0.6917
+0.6752,-0.0000,-0.2563,0.6917
+0.6860,-0.0000,-0.2576,0.6804
+0.6860,-0.0000,-0.2576,0.6804
+0.6860,-0.0000,-0.2576,0.6804
+0.6860,-0.0000,-0.2576,0.6804
+0.6967,-0.0000,-0.2590,0.6690
+0.6967,-0.0000,-0.2590,0.6690
+0.6967,-0.0000,-0.2590,0.6690
+0.6967,-0.0000,-0.2590,0.6690
+0.7071,-0.0000,-0.2603,0.6575
+0.7071,-0.0000,-0.2603,0.6575
+0.7071,-0.0000,-0.2603,0.6575
+0.7071,-0.0000,-0.2603,0.6575
+0.7173,-0.0000,-0.2617,0.6457
+0.7173,-0.0000,-0.2617,0.6457
+0.7173,-0.0000,-0.2617,0.6457
+0.7173,-0.0000,-0.2617,0.6457
+0.7273,-0.0000,-0.2631,0.6339
+0.7273,-0.0000,-0.2631,0.6339
+0.7273,-0.0000,-0.2631,0.6339
+0.7273,-0.0000,-0.2631,0.6339
+0.7371,-0.0000,-0.2645,0.6219
+0.7371,-0.0000,-0.2645,0.6219
+0.7371,-0.0000,-0.2645,0.6219
+0.7371,-0.0000,-0.2645,0.6219
+0.7467,-0.0000,-0.2659,0.6097
+0.7467,-0.0000,-0.2659,0.6097
+0.7467,-0.0000,-0.2659,0.6097
+0.7467,-0.0000,-0.2659,0.6097
+0.7560,-0.0000,-0.2674,0.5974
+0.7560,-0.0000,-0.2674,0.5974
+0.7560,-0.0000,-0.2674,0.5974
+0.7560,-0.0000,-0.2674,0.5974
+0.7651,-0.0000,-0.2689,0.5851
+0.7651,-0.0000,-0.2689,0.5851
+0.7651,-0.0000,-0.2689,0.5851
+0.7651,-0.0000,-0.2689,0.5851
+0.7740,-0.0000,-0.2705,0.5725
+0.7740,-0.0000,-0.2705,0.5725
+0.7740,-0.0000,-0.2705,0.5725
+0.7740,-0.0000,-0.2705,0.5725
+0.7826,-0.0000,-0.2720,0.5599
+0.7826,-0.0000,-0.2720,0.5599
+0.7826,-0.0000,-0.2720,0.5599
+0.7826,-0.0000,-0.2720,0.5599
+0.7910,-0.0000,-0.2736,0.5472
+0.7910,-0.0000,-0.2736,0.5472
+0.7910,-0.0000,-0.2736,0.5472
+0.7910,-0.0000,-0.2736,0.5472
+0.7992,-0.0000,-0.2752,0.5343
+0.7992,-0.0000,-0.2752,0.5343
+0.7992,-0.0000,-0.2752,0.5343
+0.7992,-0.0000,-0.2752,0.5343
+0.8072,-0.0000,-0.2769,0.5214
+0.8072,-0.0000,-0.2769,0.5214
+0.8072,-0.0000,-0.2769,0.5214
+0.8072,-0.0000,-0.2769,0.5214
+0.8149,-0.0000,-0.2786,0.5083
+0.8149,-0.0000,-0.2786,0.5083
+0.8149,-0.0000,-0.2786,0.5083
+0.8149,-0.0000,-0.2786,0.5083
+0.8223,-0.0000,-0.2803,0.4952
+0.8223,-0.0000,-0.2803,0.4952
+0.8223,-0.0000,-0.2803,0.4952
+0.8223,-0.0000,-0.2803,0.4952
+0.8295,-0.0000,-0.2820,0.4820
+0.8295,-0.0000,-0.2820,0.4820
+0.8295,-0.0000,-0.2820,0.4820
+0.8295,-0.0000,-0.2820,0.4820
+0.8365,-0.0000,-0.2838,0.4687
+0.8365,-0.0000,-0.2838,0.4687
+0.8365,-0.0000,-0.2838,0.4687
+0.8365,-0.0000,-0.2838,0.4687
+0.8433,-0.0000,-0.2857,0.4553
+0.8433,-0.0000,-0.2857,0.4553
+0.8433,-0.0000,-0.2857,0.4553
+0.8433,-0.0000,-0.2857,0.4553
+0.8497,-0.0000,-0.2875,0.4419
+0.8497,-0.0000,-0.2875,0.4419
+0.8497,-0.0000,-0.2875,0.4419
+0.8497,-0.0000,-0.2875,0.4419
+0.8560,-0.0000,-0.2894,0.4284
+0.8560,-0.0000,-0.2894,0.4284
+0.8560,-0.0000,-0.2894,0.4284
+0.8560,-0.0000,-0.2894,0.4284
+0.8620,-0.0000,-0.2913,0.4148
+0.8620,-0.0000,-0.2913,0.4148
+0.8620,-0.0000,-0.2913,0.4148
+0.8620,-0.0000,-0.2913,0.4148
+0.8677,-0.0000,-0.2933,0.4012
+0.8677,-0.0000,-0.2933,0.4012
+0.8677,-0.0000,-0.2933,0.4012
+0.8677,-0.0000,-0.2933,0.4012
+0.8732,-0.0000,-0.2953,0.3876
+0.8732,-0.0000,-0.2953,0.3876
+0.8732,-0.0000,-0.2953,0.3876
+0.8732,-0.0000,-0.2953,0.3876
+0.8785,-0.0000,-0.2974,0.3739
+0.8785,-0.0000,-0.2974,0.3739
+0.8785,-0.0000,-0.2974,0.3739
+0.8785,-0.0000,-0.2974,0.3739
+0.8835,-0.0000,-0.2995,0.3602
+0.8835,-0.0000,-0.2995,0.3602
+0.8835,-0.0000,-0.2995,0.3602
+0.8835,-0.0000,-0.2995,0.3602
+0.8883,-0.0000,-0.3016,0.3465
+0.8883,-0.0000,-0.3016,0.3465
+0.8883,-0.0000,-0.3016,0.3465
+0.8883,-0.0000,-0.3016,0.3465
+0.8928,-0.0000,-0.3038,0.3327
+0.8928,-0.0000,-0.3038,0.3327
+0.8928,-0.0000,-0.3038,0.3327
+0.8928,-0.0000,-0.3038,0.3327
+0.8970,-0.0000,-0.3060,0.3189
+0.8970,-0.0000,-0.3060,0.3189
+0.8970,-0.0000,-0.3060,0.3189
+0.8970,-0.0000,-0.3060,0.3189
+0.9010,-0.0000,-0.3083,0.3051
+0.9010,-0.0000,-0.3083,0.3051
+0.9010,-0.0000,-0.3083,0.3051
+0.9010,-0.0000,-0.3083,0.3051
+0.9048,-0.0000,-0.3106,0.2913
+0.9048,-0.0000,-0.3106,0.2913
+0.9048,-0.0000,-0.3106,0.2913
+0.9048,-0.0000,-0.3106,0.2913
+0.9083,-0.0000,-0.3130,0.2776
+0.9083,-0.0000,-0.3130,0.2776
+0.9083,-0.0000,-0.3130,0.2776
+0.9083,-0.0000,-0.3130,0.2776
+0.9116,-0.0000,-0.3154,0.2638
+0.9116,-0.0000,-0.3154,0.2638
+0.9116,-0.0000,-0.3154,0.2638
+0.9116,-0.0000,-0.3154,0.2638
+0.9146,-0.0000,-0.3179,0.2500
+0.9146,-0.0000,-0.3179,0.2500
+0.9146,-0.0000,-0.3179,0.2500
+0.9146,-0.0000,-0.3179,0.2500
+0.9174,-0.0000,-0.3204,0.2363
+0.9174,-0.0000,-0.3204,0.2363
+0.9174,-0.0000,-0.3204,0.2363
+0.9174,-0.0000,-0.3204,0.2363
+0.9199,-0.0000,-0.3229,0.2226
+0.9199,-0.0000,-0.3229,0.2226
+0.9199,-0.0000,-0.3229,0.2226
+0.9199,-0.0000,-0.3229,0.2226
+0.9222,-0.0000,-0.3256,0.2089
+0.9222,-0.0000,-0.3256,0.2089
+0.9222,-0.0000,-0.3256,0.2089
+0.9222,-0.0000,-0.3256,0.2089
+0.9242,-0.0000,-0.3282,0.1952
+0.9242,-0.0000,-0.3282,0.1952
+0.9242,-0.0000,-0.3282,0.1952
+0.9242,-0.0000,-0.3282,0.1952
+0.9260,-0.0000,-0.3309,0.1817
+0.9260,-0.0000,-0.3309,0.1817
+0.9260,-0.0000,-0.3309,0.1817
+0.9260,-0.0000,-0.3309,0.1817
+0.9276,-0.0000,-0.3337,0.1681
+0.9276,-0.0000,-0.3337,0.1681
+0.9276,-0.0000,-0.3337,0.1681
+0.9276,-0.0000,-0.3337,0.1681
+0.9289,-0.0000,-0.3366,0.1546
+0.9289,-0.0000,-0.3366,0.1546
+0.9289,-0.0000,-0.3366,0.1546
+0.9289,-0.0000,-0.3366,0.1546
+0.9300,-0.0000,-0.3395,0.1412
+0.9300,-0.0000,-0.3395,0.1412
+0.9300,-0.0000,-0.3395,0.1412
+0.9300,-0.0000,-0.3395,0.1412
+0.9308,-0.0000,-0.3424,0.1279
+0.9308,-0.0000,-0.3424,0.1279
+0.9308,-0.0000,-0.3424,0.1279
+0.9308,-0.0000,-0.3424,0.1279
+0.9314,-0.0000,-0.3454,0.1146
+0.9314,-0.0000,-0.3454,0.1146
+0.9314,-0.0000,-0.3454,0.1146
+0.9314,-0.0000,-0.3454,0.1146
+0.9318,-0.0000,-0.3485,0.1015
+0.9318,-0.0000,-0.3485,0.1015
+0.9318,-0.0000,-0.3485,0.1015
+0.9318,-0.0000,-0.3485,0.1015
+0.9320,-0.0000,-0.3516,0.0884
+0.9320,-0.0000,-0.3516,0.0884
+0.9320,-0.0000,-0.3516,0.0884
+0.9320,-0.0000,-0.3516,0.0884
+0.9319,-0.0000,-0.3548,0.0754
+0.9319,-0.0000,-0.3548,0.0754
+0.9319,-0.0000,-0.3548,0.0754
+0.9319,-0.0000,-0.3548,0.0754
+0.9316,-0.0000,-0.3581,0.0625
+0.9316,-0.0000,-0.3581,0.0625
+0.9316,-0.0000,-0.3581,0.0625
+0.9316,-0.0000,-0.3581,0.0625
+0.9311,-0.0000,-0.3614,0.0498
+0.9311,-0.0000,-0.3614,0.0498
+0.9311,-0.0000,-0.3614,0.0498
+0.9311,-0.0000,-0.3614,0.0498
+0.9303,-0.0000,-0.3648,0.0371
+0.9303,-0.0000,-0.3648,0.0371
+0.9303,-0.0000,-0.3648,0.0371
+0.9303,-0.0000,-0.3648,0.0371
+0.9294,-0.0000,-0.3683,0.0246
+0.9294,-0.0000,-0.3683,0.0246
+0.9294,-0.0000,-0.3683,0.0246
+0.9294,-0.0000,-0.3683,0.0246
+0.9282,-0.0000,-0.3718,0.0122
+0.9282,-0.0000,-0.3718,0.0122
+0.9282,-0.0000,-0.3718,0.0122
+0.9282,-0.0000,-0.3718,0.0122
+0.9269,-0.0000,-0.3754,-0.0000
+0.9269,-0.0000,-0.3754,-0.0000
+0.9269,-0.0000,-0.3754,-0.0000
+0.9269,-0.0000,-0.3754,-0.0000
diff --git a/tests/conftest.py b/tests/conftest.py
index 9896c4908fadbe48b84edaeffc87bf5fe1265c12..ef5f46ffc9c13b590fee7485a18499c6b7daec4f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -450,7 +450,22 @@ def test_vector_path(request) -> str:
path = str(path.resolve())
return path
+
+@pytest.fixture(scope="session")
+def br_switch_file_path(request) -> str:
+ """
+ Return base directory of test vector files.
+ """
+ if request.config.option.test_vector_path:
+ return request.config.option.test_vector_path
+ here = Path(__file__).parent.resolve()
+
+ path = here.joinpath("../scripts/switchPaths")
+
+ path = str(path.resolve())
+
+ return path
@pytest.fixture(scope="session")
def reference_path(request) -> str:
diff --git a/tests/renderer/constants.py b/tests/renderer/constants.py
index 3625a9307e9a947dc478b0eab8b2c661456e6973..e29696adec8b0e1b58a74c69d4939bca4c8faaea 100644
--- a/tests/renderer/constants.py
+++ b/tests/renderer/constants.py
@@ -193,6 +193,10 @@ HR_TRAJECTORIES_TO_TEST = [
"rotate_yaw_pitch_roll1",
]
+CONFIG_FILES_TO_TEST = [
+ "just_reverb"
+]
+
""" Per-testcase xfail SNR thresholds (dB) """
pass_snr = dict() # not relevant for tests anymore, should be deprecated soon
_pass_snr = {
diff --git a/tests/renderer/test_renderer.py b/tests/renderer/test_renderer.py
index 866d2eee2c91eb9f231705d4117f5fe5a532dda6..00ea239714a7239aa4331149d8a4bb9d7eecf309 100644
--- a/tests/renderer/test_renderer.py
+++ b/tests/renderer/test_renderer.py
@@ -26,12 +26,10 @@
the United Nations Convention on Contracts on the International Sales of Goods.
"""
-
import pytest
from .utils import *
-
""" Ambisonics """
@@ -58,6 +56,174 @@ def test_ambisonics_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file):
)
+# Test compares rendering with render config file containing just reverb defaults against rendering without config file.
+# These should be binary equivalent.
+@pytest.mark.parametrize("config_file", CONFIG_FILES_TO_TEST)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)
+def test_ambisonics_binaural_headrotation_defaultrenderconfig(test_info, in_fmt, out_fmt, config_file):
+ compare_renderer_args(
+ test_info,
+ in_fmt,
+ out_fmt,
+ ref_kwargs={
+ "name_extension": "defaultrenderconfig"
+ },
+ cut_kwargs={
+ "config_file": TESTV_DIR.joinpath(f"{config_file}.cfg")
+ }
+ )
+
+# Test compares rendering with just a trajectory file against rendering with a trajectory file + a zero ref rotation.
+# These should be binary equivalent.
+@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
+def test_ambisonics_binaural_headrotation_refrotzero(test_info, in_fmt, out_fmt, trj_file):
+ compare_renderer_args(
+ test_info,
+ in_fmt,
+ out_fmt,
+ ref_kwargs={
+ "name_extension": "refrotzero",
+ "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv")
+ },
+ cut_kwargs={
+ "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
+ "refrot_file": HR_TRAJECTORY_DIR.joinpath("const000.csv")
+ }
+ )
+
+
+# Second test compares rendering with no head rotation against rendering with equal ref and head rotation.
+# These should also be binary equivalent.
+# Note that reference rotation is supplied per 4 subframes; head rotation per subframe.
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
+def test_ambisonics_binaural_headrotation_refrotequal(test_info, in_fmt, out_fmt):
+ compare_renderer_args(
+ test_info,
+ in_fmt,
+ out_fmt,
+ ref_kwargs={
+ "name_extension": "refrotequal",
+ },
+ cut_kwargs={
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("azi_plus_2-ele_plus_2-every-100-frames.csv"),
+ "refrot_file": HR_TRAJECTORY_DIR.joinpath("azi_plus_2-ele_plus_2-every-25-rows.csv")
+ }
+ )
+
+# This test compares rendering with:
+# ref: head rotation trajectory file (OTR=NONE)
+# cut: identical head rotation trajectory file as ref but in addition a constant
+# reference vector in the looking direction of the coordinate system (OTR=REF_VEC)
+@pytest.mark.parametrize("trj_file", HR_TRAJECTORIES_TO_TEST)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
+def test_ambisonics_binaural_headrotation_refveczero(test_info, in_fmt, out_fmt, trj_file):
+ compare_renderer_args(
+ test_info,
+ in_fmt,
+ out_fmt,
+ ref_kwargs={
+ "name_extension": "refveczero",
+ "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv")
+ },
+ cut_kwargs={
+ "trj_file": HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
+ "refvec_file": HR_TRAJECTORY_DIR.joinpath("const000-Vector3.csv")
+ }
+ )
+
+# This test compares rendering with:
+# ref: no head rotation (OTR=NONE)
+# cut: rendering with head rotation and a ref vector which moves in the
+# looking-direction of the head rotation and therefore compensates it (OTR=REF_VEC)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
+def test_ambisonics_binaural_headrotation_refvecequal(test_info, in_fmt, out_fmt):
+ compare_renderer_args(
+ test_info,
+ in_fmt,
+ out_fmt,
+ ref_kwargs={
+ "name_extension": "refvecequal",
+ },
+ cut_kwargs={
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"),
+ "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-Vector3.csv")
+ }
+ )
+
+# This test compares rendering with:
+# ref: a head rotation trajectory with elevation (OTR=NONE)
+# cut: a static head rotation and a reference position trajectory which moves
+# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
+def test_ambisonics_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt):
+ compare_renderer_args(
+ test_info,
+ in_fmt,
+ out_fmt,
+ ref_kwargs={
+ "name_extension": "refvec_rotating",
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"),
+ },
+ cut_kwargs={
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"),
+ "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw-Vector3.csv")
+ }
+ )
+
+# This test compares rendering with:
+# ref: a head rotation trajectory with elevation (OTR=NONE)
+# cut: a static head rotation and a reference position trajectory which moves
+# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC)
+# which also contains a fixed position offset between listener and reference position (which
+# gets compensated in the REF_VEV OTR modes)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
+def test_ambisonics_binaural_headrotation_refvec_rotating_fixed_pos_offset(test_info, in_fmt, out_fmt):
+ compare_renderer_args(
+ test_info,
+ in_fmt,
+ out_fmt,
+ ref_kwargs={
+ "name_extension": "refvec_rotating",
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw.csv"),
+ },
+ cut_kwargs={
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"),
+ "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-fixed-pos-offset-Vector3.csv")
+ }
+ )
+
+# This test compares rendering with:
+# ref: a reference position trajectory with elevation and REF_VEC_LEV OTR mode (OTR=REF_VEC_LEV)
+# cut: a reference position trajectory without the elevation and REF_VEC OTR mode (OTR=REF_VEC)
+# Since the only difference between REF_VEC_LEV and REF_VEC is that *LEV ignores
+# the height difference in positions, the output must be binary equivalent.
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_AMBI)
+def test_ambisonics_binaural_headrotation_refveclev_vs_refvec(test_info, in_fmt, out_fmt):
+ compare_renderer_args(
+ test_info,
+ in_fmt,
+ out_fmt,
+ ref_kwargs={
+ "name_extension": "refveclevel",
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"),
+ "refveclev_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-Vector3.csv"),
+ },
+ cut_kwargs={
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"),
+ "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-4s-Vector3.csv")
+ }
+ )
+
+
""" Multichannel """
@@ -96,6 +262,30 @@ def test_multichannel_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file
trj_file=HR_TRAJECTORY_DIR.joinpath(f"{trj_file}.csv"),
)
+# This test compares rendering with:
+# ref: a head rotation trajectory with elevation (OTR=NONE)
+# cut: a static head rotation and a reference position trajectory which moves
+# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_MC)
+def test_multichannel_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt):
+ if in_fmt in ["MONO", "STEREO"]:
+ pytest.skip("MONO or STEREO to Binaural rendering unsupported")
+
+ compare_renderer_args(
+ test_info,
+ in_fmt,
+ out_fmt,
+ ref_kwargs={
+ "name_extension": "refvec_rotating",
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"),
+ },
+ cut_kwargs={
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"),
+ "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw-Vector3.csv")
+ }
+ )
+
""" ISM """
@@ -144,6 +334,33 @@ def test_ism_binaural_headrotation(test_info, in_fmt, out_fmt, trj_file):
in_meta_files=in_meta_files,
)
+# This test compares rendering with:
+# ref: a head rotation trajectory with elevation (OTR=NONE)
+# cut: a static head rotation and a reference position trajectory which moves
+# in a way that produces the same acoustic output as the ref head rot trajectory (OTR=REF_VEC)
+@pytest.mark.parametrize("out_fmt", OUTPUT_FORMATS_BINAURAL)
+@pytest.mark.parametrize("in_fmt", INPUT_FORMATS_ISM)
+def test_ism_binaural_headrotation_refvec_rotating(test_info, in_fmt, out_fmt):
+ try:
+ in_meta_files = FORMAT_TO_METADATA_FILES[in_fmt]
+ except:
+ in_meta_files = None
+
+ compare_renderer_args(
+ test_info,
+ in_fmt,
+ out_fmt,
+ ref_kwargs={
+ "name_extension": "refvec_rotating",
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s.csv"),
+ "in_meta_files": in_meta_files
+ },
+ cut_kwargs={
+ "trj_file": HR_TRAJECTORY_DIR.joinpath("const000.csv"),
+ "refvec_file": HR_TRAJECTORY_DIR.joinpath("full-circle-with-up-and-down-4s-ccw-Vector3.csv"),
+ "in_meta_files": in_meta_files
+ }
+ )
""" MASA """
diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py
index 143c33b066eaa5961ad3421ffe0793bea94720d6..d2af91f60cdceb41d6f236cf46abdb94e06e919f 100644
--- a/tests/renderer/utils.py
+++ b/tests/renderer/utils.py
@@ -31,12 +31,11 @@ import subprocess as sp
import sys
from pathlib import Path
from tempfile import TemporaryDirectory
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Dict
import numpy as np
import pytest
-
from .compare_audio import compare_audio_arrays
from .constants import *
@@ -106,6 +105,11 @@ def run_renderer(
metadata_input: Optional[str] = None,
in_meta_files: Optional[list] = None,
trj_file: Optional[str] = None,
+ name_extension: Optional[str] = None,
+ refrot_file: Optional[str] = None,
+ refvec_file: Optional[str] = None,
+ refveclev_file: Optional[str] = None,
+ config_file: Optional[str] = None,
output_path_base: str = OUTPUT_PATH_CUT,
binary_suffix: str = "",
is_comparetest: Optional[bool] = False,
@@ -116,6 +120,28 @@ def run_renderer(
else:
trj_name = ""
+ if refrot_file is not None:
+ refrot_name = f"_{refrot_file.stem}"
+ else:
+ refrot_name = ""
+
+ if refvec_file is not None:
+ refvec_name = f"_{refvec_file.stem}"
+ else:
+ refvec_name = ""
+
+ if refveclev_file is not None:
+ refveclev_name = f"_{refveclev_file.stem}"
+ else:
+ refveclev_name = ""
+
+ if config_file is not None:
+ config_name = f"_{config_file.stem}"
+ else:
+ config_name = ""
+
+
+
if not isinstance(out_fmt, str):
out_name = f"{out_fmt.stem}"
else:
@@ -136,7 +162,7 @@ def run_renderer(
in_file = FORMAT_TO_FILE[in_fmt]
in_name = in_fmt
- out_file = str(output_path_base.joinpath(f"{in_name}_to_{out_name}{trj_name}.wav"))
+ out_file = str(output_path_base.joinpath(f"{in_name}_to_{out_name}{trj_name}{refrot_name}{refvec_name}{refveclev_name}{config_name}{name_extension}.wav"))
cmd = RENDERER_CMD[:]
cmd[2] = str(in_file)
@@ -152,6 +178,21 @@ def run_renderer(
if trj_file is not None:
cmd.extend(["-tf", str(trj_file)])
+ if refrot_file is not None:
+ cmd.extend(["-rf", str(refrot_file)])
+ cmd.extend(["-otr", "ref"])
+
+ if refvec_file is not None:
+ cmd.extend(["-rvf", str(refvec_file)])
+ cmd.extend(["-otr", "ref_vec"])
+
+ if refveclev_file is not None:
+ cmd.extend(["-rvf", str(refveclev_file)])
+ cmd.extend(["-otr", "ref_vec_lev"])
+
+ if config_file is not None:
+ cmd.extend(["-rc", str(config_file)])
+
run_cmd(cmd)
return pyaudio3dtools.audiofile.readfile(out_file)
@@ -222,3 +263,8 @@ def compare_renderer_vs_pyscripts(test_info, in_fmt, out_fmt, **kwargs):
ref, ref_fs = run_pyscripts(in_fmt, out_fmt, **kwargs)
cut, cut_fs = run_renderer(in_fmt, out_fmt, **kwargs)
check_BE(test_info, ref, ref_fs, cut, cut_fs)
+
+def compare_renderer_args(test_info, in_fmt, out_fmt, ref_kwargs: Dict, cut_kwargs: Dict):
+ ref, ref_fs = run_renderer(in_fmt, out_fmt, **ref_kwargs)
+ cut, cut_fs = run_renderer(in_fmt, out_fmt, **cut_kwargs)
+ check_BE(test_info, ref, ref_fs, cut, cut_fs)
\ No newline at end of file
diff --git a/tests/test_sba_bs_enc.py b/tests/test_sba_bs_enc.py
index 9ea2c8fae944c9f02567668eda7158d24cd2a678..6825ee12ba3d162a21759cbab87d8a8aa8d2aaaa 100644
--- a/tests/test_sba_bs_enc.py
+++ b/tests/test_sba_bs_enc.py
@@ -53,7 +53,7 @@ dtx_set = ['0', '1']
dict_fsample_bw = {'48': '3', '32': '2', '16': '1'}
dict_bw_idx = {'FB': '3', 'SWB': '2', 'WB': '1'}
dict_bw_tag = {'SWB': '_ForceSWB', 'WB': '_ForceWB'}
-ivas_br_FOA = ['32000', '64000', '96000', '160000', '256000', '384000', '512000']
+ivas_br_FOA = ['32000','64000', '96000', '160000', '256000', '384000', '512000','sw_24k4_256k.bin']
ivas_br_HOA2 = ['256000', '384000', '512000']
ivas_br_HOA3 = ['256000', '384000', '512000']
@@ -111,6 +111,7 @@ def test_bypass_enc(
ref_encoder_path,
reference_path,
dut_base_path,
+ None,
tag,
fs,
ivas_br,
@@ -156,6 +157,7 @@ def test_sba_enc_system(
dut_base_path,
ref_encoder_path,
ref_decoder_path,
+ br_switch_file_path,
update_ref,
keep_files,
ivas_br,
@@ -167,7 +169,9 @@ def test_sba_enc_system(
if dtx == '1' and ivas_br not in ['32000', '64000']:
# skip high bitrates for DTX until DTX issue is resolved
pytest.skip()
-
+ if ivas_br == 'sw_24k4_256k.bin' and agc != 1:
+ pytest.skip()
+
tag = tag + fs + 'c'
max_bw = "FB"
bypass = -1
@@ -186,6 +190,7 @@ def test_sba_enc_system(
ref_encoder_path,
reference_path,
dut_base_path,
+ br_switch_file_path,
tag,
fs,
ivas_br,
@@ -252,6 +257,7 @@ def test_spar_hoa2_enc_system(
ref_encoder_path,
reference_path,
dut_base_path,
+ None,
tag,
fs,
ivas_br,
@@ -315,6 +321,7 @@ def test_spar_hoa3_enc_system(
ref_encoder_path,
reference_path,
dut_base_path,
+ None,
tag,
fs,
ivas_br,
@@ -368,7 +375,8 @@ def test_sba_enc_BWforce_system(
if dtx == '1' and ivas_br not in ['32000', '64000']:
# skip high bitrates for DTX until DTX issue is resolved
pytest.skip()
-
+ if ivas_br == 'sw_24k4_256k.bin':
+ pytest.skip()
fs = sample_rate_bw_idx[0]
bw = sample_rate_bw_idx[1]
tag = tag + fs + 'c'
@@ -384,6 +392,7 @@ def test_sba_enc_BWforce_system(
ref_encoder_path,
reference_path,
dut_base_path,
+ None,
tag,
fs,
ivas_br,
@@ -423,6 +432,7 @@ def sba_enc(
ref_encoder_path,
reference_path,
dut_base_path,
+ br_switch_file_path,
tag,
sampling_rate,
ivas_br,
@@ -453,6 +463,8 @@ def sba_enc(
tag = tag + dict_bw_tag[ivas_max_bw]
tag_out = f"{tag}_ivasbr{ivas_br[:-3]}k_DTX{dtx}"
+ if ivas_br == 'sw_24k4_256k.bin':
+ ivas_br = f"{br_switch_file_path}/sw_24k4_256k.bin"
short_tag_ext = ""
if agc != -1:
short_tag_ext += f'_AGC{agc}'