diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..9dcfcdcf874e3ed54257c36bb797b214413a90da
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,86 @@
+# .gitignore for IVAS public collaboration Git repository
+
+# Compiler output Unix
+IVAS_cod
+IVAS_dec
+IVAS_rend
+ISAR_post_rend
+ambi_converter
+obj/
+*.a
+*.o
+*.P
+
+# default CMake
+build*/**/*
+
+# Compiler output VS2017
+IVAS_cod.exe
+IVAS_dec.exe
+IVAS_rend.exe
+ISAR_post_rend.exe
+ambi_converter.exe
+*.user
+.vs/
+Debug_*/
+Release_*/
+*.obj
+*.pdb
+
+# Standalone TD object renderer
+scripts/td_object_renderer/object_renderer_standalone/renderer_standalone
+scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe
+
+# General/scripts
+.DS_Store
+.vscode
+.cache
+.idea
+*.log
+*.bak
+.\#*
+scripts/c-code_instrument/
+scripts/ifdef_instrument.list
+scripts/ref/
+scripts/test/
+scripts/out/
+scripts/self_test_summary.txt
+scripts/cppp/
+binary/
+tests/**/[c|d]ut
+tests/**/ref
+tests/*/testv
+tests/hrtf_binary_loading/bitstream/*
+tests/hrtf_binary_loading/dec_out_*/*
+scripts/testv/*_cut*.pcm
+scripts/testv/*_cut*.wav
+scripts/testv/stvOMASA_*.met
+scripts/testv/stvOMASA_*.csv
+scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav
+scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav
+scripts/testv/stvO*
+# default reference binary name
+IVAS_cod_ref*
+IVAS_dec_ref*
+IVAS_rend_ref*
+ISAR_post_rend_ref*
+
+# Python files that pop up when running scripts
+__pycache__/
+*.py[cod]
+*$py.class
+
+# history
+.history/
+
+#externals
+Externals/
+
+# coan output files that are created when cleaning out switches
+coan_out_*
+
+# Additional ignored locations for the BASOP repo
+/ci
+/scripts
+/tests
+/pytest.ini
diff --git a/Workspace_msvc/ambi_converter.vcxproj b/Workspace_msvc/ambi_converter.vcxproj
index caedd2c6f13a4a58e7155a70d7658086e95a7351..0e17467f00059626766158928c48c144b4f27610 100644
--- a/Workspace_msvc/ambi_converter.vcxproj
+++ b/Workspace_msvc/ambi_converter.vcxproj
@@ -160,6 +160,10 @@
{2FA8F384-0775-F3B7-F8C3-85209222FC70}
false
+
+ {54509728-928B-44D9-A118-A6F92F08B34F}
+ false
+
diff --git a/Workspace_msvc/decoder.vcxproj b/Workspace_msvc/decoder.vcxproj
index 160d4f7df7972204f12dd6a414e480e0a48b6a22..a27712c39684c30c579f3517fa57d9a7927be406 100644
--- a/Workspace_msvc/decoder.vcxproj
+++ b/Workspace_msvc/decoder.vcxproj
@@ -151,8 +151,6 @@
-
-
@@ -178,4 +176,4 @@
-
\ No newline at end of file
+
diff --git a/Workspace_msvc/lib_enc.vcxproj.filters b/Workspace_msvc/lib_enc.vcxproj.filters
index 4194dbc5a1b9602c6f126b86d3a64735badd9a31..0165869a652b48c1578988cf4406ed6a159bce20 100644
--- a/Workspace_msvc/lib_enc.vcxproj.filters
+++ b/Workspace_msvc/lib_enc.vcxproj.filters
@@ -46,9 +46,6 @@
encoder_evs_c
-
- encoder_evs_c
-
encoder_evs_c
@@ -596,6 +593,9 @@
encoder_all_c
+
+ encoder_all_c
+
diff --git a/Workspace_msvc/lib_util.vcxproj b/Workspace_msvc/lib_util.vcxproj
index 73a48f23e8967698270fd835193b8da1b580b7bb..7b793cc4c70b861dc4a0b0bfa0fa129c278f8926 100644
--- a/Workspace_msvc/lib_util.vcxproj
+++ b/Workspace_msvc/lib_util.vcxproj
@@ -110,7 +110,6 @@
-
@@ -121,6 +120,7 @@
+
@@ -145,6 +145,7 @@
+
diff --git a/apps/decoder.c b/apps/decoder.c
index b6b4feddde6624a16a67111960aef02328850122..b46f0afe7f30b19c018fa14d16fc6250a2466569 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -47,6 +47,9 @@
#include "aeid_file_reader.h"
#endif
#include "split_render_file_read_write.h"
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+#include "obj_edit_file_reader.h"
+#endif
#include "vector3_pair_file_reader.h"
#include "wmc_auto.h"
#include "options.h"
@@ -64,19 +67,10 @@ static
#endif
int32_t frame = 0; /* Counter of frames */
-#define MIN_NUM_BITS_ACTIVE_FRAME 56
-#define NUM_BITS_SID_IVAS_5K2 104
-#define MAX_OUTPUT_PCM_BUFFER_SIZE ( ( IVAS_MAX_OUTPUT_CHANNELS + IVAS_MAX_NUM_OBJECTS ) * IVAS_MAX_FRAME_SIZE )
-
-#define ORIENT_TRK_NONE ( 0 )
-#define ORIENT_TRK_REF ( 1 )
-#define ORIENT_TRK_AVG ( 2 )
-#define ORIENT_TRK_REF_VEC ( 3 )
-#define ORIENT_TRK_REF_VEC_LEV ( 4 )
-
-#define JBM_FRONTEND_FETCH_FRAMESIZE_MS 20
-#define HEADROTATION_FETCH_FRAMESIZE_MS 5
-#define DEFAULT_FETCH_FRAMESIZE_MS 20
+#ifdef DEBUGGING
+#define MIN_NUM_BITS_ACTIVE_FRAME 56
+#define NUM_BITS_SID_IVAS_5K2 104
+#endif
/*------------------------------------------------------------------------------------------*
@@ -90,8 +84,8 @@ typedef struct
uint16_t count;
uint16_t selected;
uint16_t frameCounter;
-} AcousticEnvironmentSequence;
+} AcousticEnvironmentSequence;
typedef struct
{
@@ -122,7 +116,7 @@ typedef struct
IVAS_DEC_INPUT_FORMAT inputFormat;
bool customLsOutputEnabled;
char *customLsSetupFilename;
- int16_t orientation_tracking;
+ IVAS_HEAD_ORIENT_TRK_T orientation_tracking;
bool non_diegetic_pan_enabled;
float non_diegetic_pan_gain;
Word16 non_diegetic_pan_gain_fx; /* Q15 */
@@ -135,10 +129,13 @@ typedef struct
AcousticEnvironmentSequence aeSequence;
bool dpidEnabled;
uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];
+ bool objEditEnabled;
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ char *objEditFileName;
+#endif
} DecArguments;
-#ifdef FIX_CREND_SIMPLIFY_CODE
typedef struct
{
hrtfFileReader *hrtfReader;
@@ -156,7 +153,7 @@ typedef struct
IVAS_AUDIO_CONFIG hrtf_set_audio_cfg;
} IVAS_DEC_HRTF_BINARY_WRAPPER;
-#endif
+
/*------------------------------------------------------------------------------------------*
* Local functions prototypes
@@ -164,13 +161,18 @@ typedef struct
static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );
static void usage_dec( void );
-#ifdef FIX_CREND_SIMPLIFY_CODE
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
+static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
+#else
static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
-static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );
+static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
+#endif
static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS *editableParameters, ObjectEditFileReader *objectEditFileReader );
#else
-static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
-static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );
+static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS *editableParameters );
#endif
@@ -202,12 +204,9 @@ int main(
RenderConfigReader *renderConfigReader = NULL;
int16_t *pcmBuf = NULL;
IVAS_RENDER_FRAMESIZE asked_frame_size;
-#ifdef FIX_CREND_SIMPLIFY_CODE
IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;
-#else
- IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD = NULL;
- IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
- IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ ObjectEditFileReader *objectEditFileReader = NULL;
#endif
#ifdef WMOPS
@@ -215,10 +214,8 @@ int main(
reset_mem( USE_BYTES );
#endif
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtfBinary.hHrtfTD = NULL; /* just to avoid compilation warning */
hHrtfBinary.hHrtfStatistics = NULL; /* just to avoid compilation warning */
-#endif
splitRendBits.bits_buf = splitRendBitsBuf;
@@ -338,7 +335,7 @@ int main(
}
/* sanity check */
- if ( arg.orientation_tracking != ORIENT_TRK_REF )
+ if ( arg.orientation_tracking != IVAS_HEAD_ORIENT_TRK_REF )
{
fprintf( stderr, "\nError: Reference rotation file can be used in '-otr ref' mode only.\n\n" );
goto cleanup;
@@ -365,7 +362,7 @@ int main(
}
/* sanity check */
- if ( arg.orientation_tracking != ORIENT_TRK_REF_VEC && arg.orientation_tracking != ORIENT_TRK_REF_VEC_LEV )
+ if ( arg.orientation_tracking != IVAS_HEAD_ORIENT_TRK_REF_VEC && arg.orientation_tracking != IVAS_HEAD_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;
@@ -404,6 +401,20 @@ int main(
}
}
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ /*------------------------------------------------------------------------------------------*
+ * Open object editing instruction file
+ *------------------------------------------------------------------------------------------*/
+
+ if ( arg.objEditFileName != NULL )
+ {
+ if ( ( error = ObjectEditFileReader_open( arg.objEditFileName, &objectEditFileReader ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError: Can't open Object editing instruction file %s \n\n", arg.objEditFileName );
+ goto cleanup;
+ }
+ }
+#endif
/*------------------------------------------------------------------------------------------*
* Configure the decoder
@@ -411,12 +422,20 @@ int main(
asked_frame_size = arg.renderFramesize;
uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : 65535;
+
+#ifdef LIB_DEC_REVISION
+ if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled,
+ arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled,
+ arg.non_diegetic_pan_enabled, arg.non_diegetic_pan_gain_fx, arg.dpidEnabled, aeID, arg.objEditEnabled, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
+#else
if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.non_diegetic_pan_enabled, arg.non_diegetic_pan_gain_fx,
arg.dpidEnabled, aeID, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
+#endif
{
fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
goto cleanup;
}
+
if ( ( error = IVAS_DEC_GetRenderFramesize( hIvasDec, &arg.renderFramesize ) ) != IVAS_ERR_OK )
{
fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -518,6 +537,7 @@ int main(
fprintf( stderr, "Failed to get Distance Attenuation \n\n" );
goto cleanup;
}
+
if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
{
if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS &&
@@ -603,112 +623,11 @@ int main(
if ( arg.hrtfReaderEnabled )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtfBinary.hrtfReader = hrtfReader;
hHrtfBinary.hrtfFileName = arg.hrtfFileName;
hHrtfBinary.binaural_renderer = IVAS_BIN_RENDERER_TYPE_NONE;
hHrtfBinary.binaural_renderer_sec = IVAS_BIN_RENDERER_TYPE_NONE;
hHrtfBinary.hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;
-#else
- if ( ( error = IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD ) ) != IVAS_ERR_OK )
- {
- fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
- goto cleanup;
- }
-
-#ifdef FIX_989_TD_REND_ROM
- if ( ( error = load_TDrend_HRTF_binary( *hHrtfTD, arg.output_Fs, hrtfReader ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
-#endif
- {
- if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
- {
- fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
- goto cleanup;
- }
- else
- {
- destroy_td_hrtf( hHrtfTD );
- }
- }
-
- if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )
- {
- fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
- goto cleanup;
- }
-
- if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
- {
- if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
- {
- fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
- goto cleanup;
- }
- else
- {
- destroy_SetOfHRTF( hSetOfHRTF );
- }
- }
-
- IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
- if ( ( error = IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ) ) != IVAS_ERR_OK )
- {
- fprintf( stderr, "\nIVAS_DEC_GetHrtfFastConvHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
- goto cleanup;
- }
-
- if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )
- {
- if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
- {
- fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
- goto cleanup;
- }
- else
- {
- destroy_fastconv_hrtf( hHrtfFastConv );
- }
- }
-
- IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
- if ( ( error = IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin ) ) != IVAS_ERR_OK )
- {
- fprintf( stderr, "\nIVAS_DEC_GetHrtfParamBinHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
- goto cleanup;
- }
-
- if ( ( error = load_parambin_HRTF_from_binary( *hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )
- {
- if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
- {
- fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
- goto cleanup;
- }
- else
- {
- destroy_parambin_hrtf( hHrtfParambin );
- }
- }
- if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )
- {
- fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
- goto cleanup;
- }
- if ( ( error = load_reverb_binary( *hHrtfStatistics, arg.output_Fs, hrtfReader ) ) != IVAS_ERR_OK )
- {
- if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
- {
- fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
- goto cleanup;
- }
- else
- {
- destroy_hrtf_statistics( hHrtfStatistics );
- }
- }
-#endif
}
/*------------------------------------------------------------------------------------------*
@@ -723,13 +642,11 @@ int main(
}
pcmBuf = malloc( pcmBufSize * sizeof( int16_t ) );
-#ifdef FIX_CREND_SIMPLIFY_CODE
if ( pcmBuf == NULL )
{
fprintf( stdout, "Error: Unable to allocate memory for output buffer.\n" );
goto cleanup;
}
-#endif
/*-----------------------------------------------------------------*
* Decoding
@@ -737,18 +654,18 @@ int main(
if ( arg.voipMode )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
- error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, hIvasDec );
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec, pcmBuf );
#else
- error = decodeVoIP( arg, hBsReader, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, hIvasDec );
+ error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, hIvasDec, pcmBuf );
#endif
}
else
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
- error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, &splitRendBits, hIvasDec, pcmBuf );
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, hIvasDec, pcmBuf );
#else
- error = decodeG192( arg, hBsReader, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, &splitRendBits, hIvasDec, pcmBuf );
+ error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, &splitRendBits, hIvasDec, pcmBuf );
#endif
}
@@ -765,11 +682,7 @@ int main(
}
else
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
fprintf( stderr, "\nDecoding finished prematurely: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
-#else
- fprintf( stdout, "Decoding finished prematurely\n\n" );
-#endif
goto cleanup;
}
@@ -792,38 +705,17 @@ cleanup:
if ( arg.hrtfReaderEnabled )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
destroy_td_hrtf( hHrtfBinary.hHrtfTD );
destroy_hrtf_statistics( hHrtfBinary.hHrtfStatistics );
-#else
- IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );
- if ( hHrtfTD != NULL )
- {
- destroy_td_hrtf( hHrtfTD );
- }
- IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );
- if ( hSetOfHRTF != NULL )
- {
- destroy_SetOfHRTF( hSetOfHRTF );
- }
- IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics );
- destroy_hrtf_statistics( hHrtfStatistics );
-#endif
}
#ifdef FIX_1990_SANITIZER_IN_REVERB_LOAD
// TODO:
/* This free differs from float version.
This is needed as HRTF statistics from ROM are currently converted from Word16 values to scaled Word32 values. */
-#ifdef FIX_CREND_SIMPLIFY_CODE
IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;
IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics );
destroy_hrtf_statistics( hHrtfStatistics );
-#else
- IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics );
- destroy_hrtf_statistics( hHrtfStatistics );
#endif
-#endif
-
IVAS_DEC_Close( &hIvasDec );
CustomLsReader_close( &hLsCustomReader );
hrtfFileReader_close( &hrtfReader );
@@ -832,6 +724,9 @@ cleanup:
RotationFileReader_close( &refRotReader );
Vector3PairFileReader_close( &referenceVectorReader );
RenderConfigReader_close( &renderConfigReader );
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ ObjectEditFileReader_close( &objectEditFileReader );
+#endif
if ( BS_Reader_Close( &hBsReader ) != IVAS_ERR_OK )
{
@@ -956,7 +851,11 @@ static bool parseCmdlIVAS_dec(
int16_t i;
char argv_to_upper[FILENAME_MAX];
- arg->output_Fs = 48000;
+ /*-----------------------------------------------------------------*
+ * Set default values
+ *-----------------------------------------------------------------*/
+
+ arg->output_Fs = IVAS_MAX_SAMPLING_RATE;
arg->outputConfig = IVAS_AUDIO_CONFIG_MONO;
arg->decMode = IVAS_DEC_MODE_IVAS;
arg->quietModeEnabled = false;
@@ -966,7 +865,7 @@ static bool parseCmdlIVAS_dec(
arg->enableHeadRotation = false;
arg->headrotTrajFileName = NULL;
- arg->orientation_tracking = ORIENT_TRK_NONE;
+ arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;
arg->enableReferenceRotation = false;
arg->headrotTrajFileName = NULL;
arg->enableReferenceVectorTracking = false;
@@ -1008,6 +907,10 @@ static bool parseCmdlIVAS_dec(
{
arg->directivityPatternId[i] = 65535;
}
+ arg->objEditEnabled = false;
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ arg->objEditFileName = NULL;
+#endif
/*-----------------------------------------------------------------*
* Initialization
@@ -1034,18 +937,30 @@ static bool parseCmdlIVAS_dec(
if ( strcmp( argv_to_upper, "-VOIP" ) == 0 )
{
+#ifdef LIB_DEC_REVISION
+ arg->voipMode = true;
+#else
arg->voipMode = 1;
+#endif
i++;
}
else if ( strcmp( argv_to_upper, "-VOIP_HF_ONLY=0" ) == 0 )
{
+#ifdef LIB_DEC_REVISION
+ arg->voipMode = true;
+#else
arg->voipMode = 1;
+#endif
arg->inputFormat = IVAS_DEC_INPUT_FORMAT_RTPDUMP;
i++;
}
else if ( strcmp( argv_to_upper, "-VOIP_HF_ONLY=1" ) == 0 )
{
+#ifdef LIB_DEC_REVISION
+ arg->voipMode = true;
+#else
arg->voipMode = 1;
+#endif
arg->inputFormat = IVAS_DEC_INPUT_FORMAT_RTPDUMP_HF;
i++;
}
@@ -1126,6 +1041,11 @@ static bool parseCmdlIVAS_dec(
{
if ( !is_digits_only( argv[i] ) )
{
+#ifdef LIB_DEC_REVISION
+ fprintf( stderr, "Error: Render frame size is invalid or not specified!\n\n" );
+ usage_dec();
+#endif
+
return false;
}
@@ -1160,23 +1080,23 @@ static bool parseCmdlIVAS_dec(
if ( strcmp( argv_to_upper, "NONE" ) == 0 )
{
- arg->orientation_tracking = ORIENT_TRK_NONE;
+ arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;
}
else if ( strcmp( argv_to_upper, "REF" ) == 0 )
{
- arg->orientation_tracking = ORIENT_TRK_REF;
+ arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF;
}
else if ( strcmp( argv_to_upper, "AVG" ) == 0 )
{
- arg->orientation_tracking = ORIENT_TRK_AVG;
+ arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_AVG;
}
else if ( strcmp( argv_to_upper, "REF_VEC" ) == 0 )
{
- arg->orientation_tracking = ORIENT_TRK_REF_VEC;
+ arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF_VEC;
}
else if ( strcmp( argv_to_upper, "REF_VEC_LEV" ) == 0 )
{
- arg->orientation_tracking = ORIENT_TRK_REF_VEC_LEV;
+ arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV;
}
else
{
@@ -1459,6 +1379,29 @@ static bool parseCmdlIVAS_dec(
i += tmp;
}
+ else if ( strcmp( argv_to_upper, "-OBJ_EDIT" ) == 0 )
+ {
+ arg->objEditEnabled = true;
+ i++;
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ if ( argc - i <= 3 || argv[i][0] == '-' )
+ {
+ fprintf( stderr, "Error: Object editing instruction filename not specified!\n\n" );
+ usage_dec();
+ return false;
+ }
+
+ if ( strcmp( argv[i], "NULL" ) == 0 || strcmp( argv[i], "null" ) == 0 )
+ {
+ arg->objEditFileName = NULL; /* use the built-in editing function */
+ }
+ else
+ {
+ arg->objEditFileName = argv[i]; /* read edit instructions from this file */
+ }
+ i++;
+#endif
+ }
/*-----------------------------------------------------------------*
* Option not recognized
@@ -1634,7 +1577,7 @@ static void usage_dec( void )
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, "-om File : Metadata output File for BINAURAL_SPLIT_PCM OutputConf (only for Fs = 48 kHz)\n" );
- fprintf( stdout, "-non_diegetic_pan P : panning mono non-diegetic sound to stereo with paning P, -90<= P <=90,\n" );
+ fprintf( stdout, "-non_diegetic_pan P : panning mono non-diegetic sound to stereo with panning P, -90<= P <=90,\n" );
fprintf( stdout, " left or l or 90->left, right or r or -90->right, center or c or 0->middle\n" );
fprintf( stdout, "-exof File : External orientation File for external orientation trajectory\n" );
fprintf( stdout, "-dpid ID : Directivity pattern ID(s) = [ID1, ID2, ID3, ID4]. Space-separated list of up\n" );
@@ -1647,6 +1590,12 @@ static void usage_dec( void )
fprintf( stdout, " without braces and spaces, with ':' character separating ID from duration and ',' separating\n" );
fprintf( stdout, " ID and duration pairs, where duration is specified in frames\n" );
fprintf( stdout, " for BINAURAL_ROOM_REVERB output configuration.\n" );
+#ifndef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ fprintf( stdout, "-obj_edit : Enable objects editing\n" );
+#else
+ fprintf( stdout, "-obj_edit File : Object editing instructions file or NULL for built-in example\n" );
+#endif
+
fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );
fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" );
fprintf( stdout, "-q : Quiet mode, no frame counter\n" );
@@ -1719,6 +1668,7 @@ static ivas_error initOnFirstGoodFrame(
return error;
}
+#ifndef LIB_DEC_REVISION
int32_t pcmFrameSize;
if ( ( error = IVAS_DEC_GetPcmFrameSize( hIvasDec, &pcmFrameSize ) ) != IVAS_ERR_OK )
@@ -1726,7 +1676,7 @@ static ivas_error initOnFirstGoodFrame(
fprintf( stderr, "\nError in IVAS_DEC_GetPcmFrameSize, error code: %d\n", error );
return error;
}
-
+#endif
if ( isSplitRend )
{
/* Open split rendering metadata writer */
@@ -1784,10 +1734,18 @@ static ivas_error initOnFirstGoodFrame(
}
}
+#ifdef LIB_DEC_REVISION
+ int16_t pcmFrameSize;
+ if ( ( error = IVAS_DEC_GetOutputBufferSize( hIvasDec, &pcmFrameSize ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError in IVAS_DEC_GetOutputBufferSize, error code: %d\n", error );
+ return error;
+ }
+
+#endif
#ifdef CODE_IMPROVEMENTS
int16_t *zeroBuf = calloc( pcmFrameSize, sizeof( int16_t ) );
#else
- int16_t *zeroBuf = malloc( pcmFrameSize * sizeof( int16_t ) );
memset( zeroBuf, 0, pcmFrameSize * sizeof( int16_t ) );
#endif
@@ -1963,13 +1921,14 @@ static ivas_error initOnFirstGoodFrame(
static ivas_error decodeG192(
DecArguments arg,
BS_READER_HANDLE hBsReader,
-#ifdef FIX_CREND_SIMPLIFY_CODE
IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary,
-#endif
RotFileReader *headRotReader,
RotFileReader *externalOrientationFileReader,
RotFileReader *refRotReader,
Vector3PairFileReader *referenceVectorReader,
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ ObjectEditFileReader *objectEditFileReader,
+#endif
ISAR_SPLIT_REND_BITS_DATA *splitRendBits,
IVAS_DEC_HANDLE hIvasDec,
int16_t *pcmBuf )
@@ -2002,6 +1961,19 @@ static ivas_error decodeG192(
IVAS_RENDER_CONFIG_DATA renderConfig;
RenderConfigReader *renderConfigReader = NULL;
+#ifdef VARIABLE_SPEED_DECODING
+#ifdef LIB_DEC_REVISION
+ if ( arg.tsmEnabled )
+ {
+ if ( ( error = IVAS_DEC_EnableTsm( hIvasDec ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError in IVAS_DEC_EnableTsm, code: %d\n", error );
+ return error;
+ }
+ }
+
+#endif
+#endif
if ( ( error = IVAS_DEC_is_split_rendering_enabled( hIvasDec, &isSplitRend ) ) != IVAS_ERR_OK )
{
fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_enabled, code: %d\n", error );
@@ -2247,7 +2219,6 @@ static ivas_error decodeG192(
goto cleanup;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
/* Read main parameters from the bitstream to set-up the decoder */
hHrtfBinary->binaural_renderer_old = hHrtfBinary->binaural_renderer;
hHrtfBinary->binaural_renderer_sec_old = hHrtfBinary->binaural_renderer_sec;
@@ -2268,24 +2239,56 @@ static ivas_error decodeG192(
goto cleanup;
}
}
-#endif
-#ifdef FIX_HRTF_LOAD_API
/* decode transport channels, do TSM and feed to renderer */
if ( ( error = IVAS_DEC_GetSamplesDecoder( hIvasDec, isSplitRend, splitRendBits ) ) != IVAS_ERR_OK )
{
return error;
}
+ /* Object metadata editing */
+ if ( arg.objEditEnabled )
+ {
+ IVAS_EDITABLE_PARAMETERS editableParameters;
+
+ if ( ( error = IVAS_DEC_GetEditableParameters( hIvasDec, &editableParameters ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError: could not get the editable parameters: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
+ return error;
+ }
+
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ if ( arg.objEditFileName != NULL )
+ {
+ if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError: could not read object editing instructions from file: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
+ return error;
+ }
+ }
#endif
-#ifdef OBJ_EDITING_API
+
+ /* Do object metadata editing here ... */
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ do_object_editing_fx( &editableParameters, objectEditFileReader );
+#else
+ do_object_editing_fx( &editableParameters );
+#endif
+
+ /* set new object parameters*/
+ if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError: could not set the editable parameters: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
+ goto cleanup;
+ }
+ }
+
/* Do the final preparations needed for rendering */
if ( ( error = IVAS_DEC_PrepareRenderer( hIvasDec ) ) != IVAS_ERR_OK )
{
fprintf( stderr, "\nError: could not prepare the renderer: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
goto cleanup;
}
-#endif
}
if ( isSplitRend )
@@ -2301,9 +2304,13 @@ static ivas_error decodeG192(
}
else
{
+#ifdef LIB_DEC_REVISION
+ if ( ( error = IVAS_DEC_GetSamplesRenderer( hIvasDec, nSamplesToRender, ( pcmBuf + nOutChannels * nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )
+#else
if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, ( pcmBuf + nOutChannels * nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )
+#endif
{
- fprintf( stderr, "\nError in IVAS_DEC_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );
+ fprintf( stderr, "\nError in IVAS_DEC_GetSamplesRenderer(): %s\n", IVAS_DEC_GetErrorMessage( error ) );
goto cleanup;
}
nSamplesRendered += nSamplesRendered_loop;
@@ -2318,7 +2325,6 @@ static ivas_error decodeG192(
fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
}
}
-
} while ( nSamplesRendered < nOutSamples && error == IVAS_ERR_OK );
@@ -2341,6 +2347,9 @@ static ivas_error decodeG192(
{
if ( ( error = initOnFirstGoodFrame( hIvasDec, arg, numInitialBadFrames, &nOutSamples, &vec_pos_len, delayNumSamples_orig, &delayNumSamples, &delayTimeScale, &bsFormat, &afWriter, &masaWriter, ismWriters, &nOutChannels, &numObj, &splitRendWriter ) ) != IVAS_ERR_OK )
{
+#ifdef LIB_DEC_REVISION
+ fprintf( stderr, "Error in initOnFirstGoodFrame(): %s\n", IVAS_DEC_GetErrorMessage( error ) );
+#endif
goto cleanup;
}
}
@@ -2646,7 +2655,6 @@ static ivas_error decodeG192(
cleanup:
RenderConfigReader_close( &renderConfigReader );
-
split_rend_reader_writer_close( &splitRendWriter );
AudioFileWriter_close( &afWriter );
MasaFileWriter_close( &masaWriter );
@@ -2681,21 +2689,23 @@ static ivas_error writeJbmTraceFileFrameWrapper( const void *data, void *writer
static ivas_error decodeVoIP(
DecArguments arg,
BS_READER_HANDLE hBsReader,
-#ifdef FIX_CREND_SIMPLIFY_CODE
IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf,
-#endif
RotFileReader *headRotReader,
RotFileReader *externalOrientationFileReader,
RotFileReader *refRotReader,
Vector3PairFileReader *referenceVectorReader,
- IVAS_DEC_HANDLE hIvasDec )
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ ObjectEditFileReader *objectEditFileReader,
+#endif
+ IVAS_DEC_HANDLE hIvasDec,
+ int16_t *pcmBuf )
{
bool decodingFailed = true; /* Assume failure until cleanup is reached without errors */
ivas_error error = IVAS_ERR_OK;
uint32_t nextPacketRcvTime_ms = 0;
uint32_t systemTime_ms = 0;
- uint32_t systemTimeInc_ms = (uint32_t) JBM_FRONTEND_FETCH_FRAMESIZE_MS;
+ uint32_t systemTimeInc_ms = (uint32_t) ( 1000 / IVAS_NUM_FRAMES_PER_SEC );
int32_t nFramesFed = 0;
uint8_t au[( IVAS_MAX_BITS_PER_FRAME + 7 ) >> 3];
@@ -2709,7 +2719,6 @@ static ivas_error decodeVoIP(
MasaFileWriter *masaWriter = NULL;
uint16_t numObj = 0;
- int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];
AudioFileWriter *afWriter = NULL;
#ifdef SUPPORT_JBM_TRACEFILE
JbmTraceFileWriter *jbmTraceWriter = NULL;
@@ -2733,13 +2742,9 @@ static ivas_error decodeVoIP(
IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0 } };
int16_t vec_pos_update, vec_pos_len;
int16_t nOutSamples = 0;
-#ifdef FIX_CREND_SIMPLIFY_CODE
bool bitstreamReadDone = false;
-#ifdef OBJ_EDITING_API
bool parametersAvailableForEditing = false;
-#endif
uint16_t nSamplesRendered;
-#endif
vec_pos_update = 0;
if ( ( error = IVAS_DEC_GetRenderFramesizeMs( hIvasDec, &systemTimeInc_ms ) ) != IVAS_ERR_OK )
@@ -2857,9 +2862,7 @@ static ivas_error decodeVoIP(
while ( 1 )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
nSamplesRendered = 0;
-#endif
/* reference vector */
if ( arg.enableReferenceVectorTracking && vec_pos_update == 0 )
@@ -2972,6 +2975,21 @@ static ivas_error decodeVoIP(
}
}
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
+ if ( arg.objEditEnabled && arg.objEditFileName != NULL && vec_pos_update == 0 )
+#else
+ if ( arg.objEditEnabled && ( arg.objEditFileName != NULL ) )
+#endif
+ {
+ if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError: could not read object editing instructions from file: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
+ return error;
+ }
+ }
+#endif
+
/* read all packets with a receive time smaller than the system time */
while ( nextPacketRcvTime_ms <= systemTime_ms )
{
@@ -3023,37 +3041,18 @@ static ivas_error decodeVoIP(
/* decode and get samples */
-#ifdef FIX_HRTF_LOAD
while ( nSamplesRendered < nOutSamples )
{
-#endif
#ifdef SUPPORT_JBM_TRACEFILE
-#ifdef FIX_CREND_SIMPLIFY_CODE
-#ifdef OBJ_EDITING_API
- if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, ¶metersAvailableForEditing ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered ) ) != IVAS_ERR_OK )
-#endif
-#else
- if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter ) ) != IVAS_ERR_OK )
-#endif
-#else
-#ifdef FIX_CREND_SIMPLIFY_CODE
-#ifdef OBJ_EDITING_API
- if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, &bitstreamReadDone, ¶metersAvailableForEditing ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, &bitstreamReadDone ) ) != IVAS_ERR_OK )
-#endif
+ if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, ¶metersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
#else
- if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms ) ) != IVAS_ERR_OK )
-#endif
+ if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, &bitstreamReadDone, ¶metersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
#endif
{
fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );
goto cleanup;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
if ( bitstreamReadDone == true )
{
/* Read main parameters from the bitstream to set-up the decoder */
@@ -3077,16 +3076,34 @@ static ivas_error decodeVoIP(
}
}
}
-#endif
-#ifdef OBJ_EDITING_API
- if ( parametersAvailableForEditing == true )
+
+ /* Object metadata editing */
+ if ( arg.objEditEnabled && parametersAvailableForEditing == true )
{
- /* do the object editing here */
- }
+ IVAS_EDITABLE_PARAMETERS editableParameters;
+
+ /* get object parameters */
+ if ( ( error = IVAS_DEC_GetEditableParameters( hIvasDec, &editableParameters ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError: could not get the editable parameters: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
+ return error;
+ }
+
+ /* Do object metadata editing here ... */
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ do_object_editing_fx( &editableParameters, objectEditFileReader );
+#else
+ do_object_editing_fx( &editableParameters );
#endif
-#ifdef FIX_HRTF_LOAD
+
+ /* set new object parameters */
+ if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError: could not set the editable parameters: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
+ return error;
+ }
+ }
} /* while ( nSamplesRendered < nOutSamples ) */
-#endif
/* write JBM Offset file entry */
if ( jbmOffsetWriter != NULL )
@@ -3111,7 +3128,11 @@ static ivas_error decodeVoIP(
{
if ( ( error = IVAS_DEC_HasDecodedFirstGoodFrame( hIvasDec, &decodedGoodFrame ) ) != IVAS_ERR_OK )
{
+#ifdef LIB_DEC_REVISION
+ fprintf( stderr, "Error in IVAS_DEC_HasDecodedFirstGoodFrame(): %s\n", IVAS_DEC_GetErrorMessage( error ) );
+#else
fprintf( stderr, "Error in IVAS_DEC_HasDecodedFirstGoodFrame, code: %d\n", error );
+#endif
goto cleanup;
}
@@ -3205,6 +3226,9 @@ static ivas_error decodeVoIP(
}
}
+#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
+ vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
+#else
// frame++;
if ( !arg.quietModeEnabled )
{
@@ -3212,18 +3236,29 @@ static ivas_error decodeVoIP(
}
vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
frame++;
+#endif
if ( vec_pos_update == 0 )
{
systemTime_ms += vec_pos_len * systemTimeInc_ms;
}
+#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
+ if ( vec_pos_update == 0 )
+ {
+ frame++;
+ if ( !arg.quietModeEnabled )
+ {
+ fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
+ }
+ }
+#endif
+
#ifdef WMOPS
update_mem();
update_wmops();
#endif
}
-
int16_t nSamplesFlushed = 0;
/* decode and get samples */
@@ -3372,7 +3407,129 @@ cleanup:
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
+/*---------------------------------------------------------------------*
+ * do_object_editing_fx()
+ *
+ * Example function to edit objects parameters
+ *---------------------------------------------------------------------*/
+
+static void do_object_editing_fx(
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ IVAS_EDITABLE_PARAMETERS *editableParameters,
+ ObjectEditFileReader *objectEditFileReader )
+#else
+ IVAS_EDITABLE_PARAMETERS *editableParameters )
+#endif
+{
+ /* put the objects equally spaced at the horizontal plane */
+ /* and play a little bit with the gains... */
+ Word16 obj_idx, non_diegetic_obj_idx;
+ Word16 num_nondiegetic_objects;
+
+ num_nondiegetic_objects = 0;
+ for ( obj_idx = 0; obj_idx < editableParameters->num_obj; obj_idx++ )
+ {
+ if ( !editableParameters->ism_metadata[obj_idx].non_diegetic_flag )
+ {
+ num_nondiegetic_objects++;
+ }
+ }
+
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ if ( objectEditFileReader != NULL )
+ {
+ ReadObjectEditInfo *readInfo;
+ readInfo = objectEditFileReader->readInfo;
+
+ if ( readInfo->bg_gain_edited )
+ {
+ editableParameters->gain_bed_fx = (Word32) readInfo->bg_gain * 536870912; /* Q29 */
+ }
+
+ for ( obj_idx = 0; obj_idx < editableParameters->num_obj; obj_idx++ )
+ {
+ if ( !editableParameters->ism_metadata[obj_idx].non_diegetic_flag )
+ {
+ /* object direction editing only for diegetic objects */
+ if ( readInfo->obj_azi_edited[obj_idx] )
+ {
+ if ( readInfo->obj_azi_relative[obj_idx] )
+ {
+ /* azimuth: apply relative edit + wrap */
+ editableParameters->ism_metadata[obj_idx].azimuth_fx = ( ( editableParameters->ism_metadata[obj_idx].azimuth_fx + (Word32) readInfo->obj_azi[obj_idx] * 4194304 + 2264924160 ) % 1509949440 ) - 754974720; /* Q22 */
+ }
+ else
+ {
+ editableParameters->ism_metadata[obj_idx].azimuth_fx = (Word32) readInfo->obj_azi[obj_idx] * 4194304; /* Q22 */
+ }
+ }
+ if ( readInfo->obj_ele_edited[obj_idx] )
+ {
+ if ( readInfo->obj_ele_relative[obj_idx] )
+ {
+ /* elevation: apply relative edit + saturation */
+ editableParameters->ism_metadata[obj_idx].elevation_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].elevation_fx + (Word32) readInfo->obj_ele[obj_idx] * 4194304, 377487360 ), -377487360 ); /* Q22 */
+ }
+ else
+ {
+ editableParameters->ism_metadata[obj_idx].elevation_fx = (Word32) readInfo->obj_ele[obj_idx] * 4194304; /* Q22 */
+ }
+ }
+ }
+
+ /* gain editing for all objects */
+ if ( readInfo->obj_gain_edited[obj_idx] )
+ {
+ if ( readInfo->obj_gain_relative[obj_idx] )
+ {
+ /* gain: apply relative edit + saturation */
+#ifdef FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES
+ editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( L_shl_sat( Mpy_32_32( editableParameters->ism_metadata[obj_idx].gain_fx, (Word32) readInfo->obj_gain[obj_idx] * 536870912 ), 2 ), OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29*Q29 -> Q27 shift back to Q29 */
+#else
+ editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].gain_fx * (Word32) readInfo->obj_gain[obj_idx] * 536870912, OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29 */
+#endif
+ }
+ else
+ {
+ editableParameters->ism_metadata[obj_idx].gain_fx = (Word32) readInfo->obj_gain[obj_idx] * 536870912; /* Q29 */
+ }
+ }
+ }
+ }
+ else
+ {
+#endif
+ if ( num_nondiegetic_objects )
+ {
+ float start_angle, angle_inc;
+ angle_inc = 360.0f / (float) num_nondiegetic_objects;
+ start_angle = angle_inc / 2.0f;
+ for ( obj_idx = 0, non_diegetic_obj_idx = 0; obj_idx < editableParameters->num_obj; obj_idx++ )
+ {
+ if ( !editableParameters->ism_metadata[obj_idx].non_diegetic_flag )
+ {
+ editableParameters->ism_metadata[obj_idx].elevation_fx = 0;
+ editableParameters->ism_metadata[obj_idx].azimuth_fx = (Word32) ( ( start_angle + (float) non_diegetic_obj_idx * angle_inc ) * 4194304 /* Q22 */ );
+ non_diegetic_obj_idx++;
+ }
+ }
+ }
+
+ /* breakover object gains */
+ for ( obj_idx = 0; obj_idx < editableParameters->num_obj; obj_idx++ )
+ {
+ editableParameters->ism_metadata[obj_idx].gain_fx = (Word32) ( ( 0.5f + (float) ( ( frame + obj_idx * 50 ) % 250 ) / 250.0f ) * 536870912 /*Q29*/ );
+ }
+
+ editableParameters->gain_bed_fx = ( 1 << 28 ); // 0.5 in Q29
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ }
+#endif
+
+ return;
+}
+
+
/*---------------------------------------------------------------------*
* load_hrtf_from_file()
*
@@ -3545,5 +3702,5 @@ static ivas_error load_hrtf_from_file(
return IVAS_ERR_OK;
}
-#endif
+
#undef WMC_TOOL_SKIP
diff --git a/apps/encoder.c b/apps/encoder.c
index d0ad408f2f8a77c83875e217e1f7ca71d439c9d4..2a8ef469f6161aea9111c1ff0f7d3d02eec51214 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -163,7 +163,6 @@ typedef struct
* Local functions prototypes
*------------------------------------------------------------------------------------------*/
-static void initArgStruct( EncArguments *arg );
static bool parseCmdlIVAS_enc( int16_t argc, char *argv[], EncArguments *arg );
static void usage_enc( void );
static bool readBandwidth( FILE *file, IVAS_ENC_BANDWIDTH *bandwidth, int32_t *bandwidthFrameCounter );
@@ -208,8 +207,6 @@ int main(
reset_mem( USE_BYTES );
#endif
- initArgStruct( &arg );
-
/*------------------------------------------------------------------------------------------*
* Parse command-line arguments
*------------------------------------------------------------------------------------------*/
@@ -853,11 +850,26 @@ cleanup:
* Local functions
*-------------------------------------------------------------------*/
-#define IVAS_DEFAULT_AGC ( 0 )
+/*---------------------------------------------------------------------*
+ * parseCmdlIVAS_enc()
+ *
+ * Encoder command-line parsing
+ *---------------------------------------------------------------------*/
-static void initArgStruct( EncArguments *arg )
+static bool parseCmdlIVAS_enc(
+ int16_t argc,
+ char *argv[],
+ EncArguments *arg )
{
- /* Set default values here */
+ int16_t i, j;
+ char argv_to_upper[FILENAME_MAX];
+ char stmp[FILENAME_MAX];
+ int32_t tmp;
+
+ /*-----------------------------------------------------------------*
+ * Set default values
+ *-----------------------------------------------------------------*/
+
arg->inputWavFilename = NULL;
arg->outputBitstreamFilename = NULL;
arg->inputFs = 0;
@@ -887,25 +899,9 @@ static void initArgStruct( EncArguments *arg )
#endif
arg->pca = false;
- return;
-}
-
-
-/*---------------------------------------------------------------------*
- * parseCmdlIVAS_enc()
- *
- * Encoder command-line parsing
- *---------------------------------------------------------------------*/
-
-static bool parseCmdlIVAS_enc(
- int16_t argc,
- char *argv[],
- EncArguments *arg )
-{
- int16_t i, j;
- char argv_to_upper[FILENAME_MAX];
- char stmp[FILENAME_MAX];
- int32_t tmp;
+ /*-----------------------------------------------------------------*
+ * Initialization
+ *-----------------------------------------------------------------*/
if ( argc < 5 )
{
diff --git a/apps/isar_post_rend.c b/apps/isar_post_rend.c
index 8182bfdd3d16d9baab4c8cfce8ff32fc9a71c3af..53417cf1504d72631ac8ca3ef4848084ac538411 100644
--- a/apps/isar_post_rend.c
+++ b/apps/isar_post_rend.c
@@ -952,7 +952,7 @@ int main(
memset( outBuffer.data_fx, 0, outBuffer.config.numSamplesPerChannel * outBuffer.config.numChannels * sizeof( Word32 ) );
- bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;
+ bitsBufferSize = ISAR_SPLIT_REND_BITS_BUFF_SIZE;
if ( bitsBufferSize > 0 )
{
diff --git a/apps/renderer.c b/apps/renderer.c
index c411720a536a0704ef5c2d44cfc4915c92b6efbb..3613064efc33009bf48c3f255aaa31a37053d55c 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -174,7 +174,7 @@ typedef struct
char externalOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
- int8_t orientation_tracking;
+ IVAS_HEAD_ORIENT_TRK_T orientation_tracking;
int16_t Opt_Headrotation;
int16_t Opt_ExternalOrientation;
int16_t nonDiegeticPan;
@@ -715,11 +715,7 @@ static int16_t get_cldfb_in_flag(
int16_t cldfb_in_flag;
cldfb_in_flag = 0;
-#ifdef FIX_HRTF_LOAD
if ( renderConfig->split_rend_config.rendererSelection == IVAS_BIN_RENDERER_TYPE_FASTCONV )
-#else
- if ( renderConfig->split_rend_config.rendererSelection == ISAR_SPLIT_REND_RENDERER_SELECTION_FASTCONV )
-#endif
{
#ifdef DEBUGGING
cldfb_in_flag = 1;
@@ -770,11 +766,7 @@ int main(
SplitRendBFIFileReader *splitRendBFIReader = NULL;
Vector3PairFileReader *referenceVectorReader = NULL;
hrtfFileReader *hrtfFileReader = NULL;
-#ifdef FIX_CREND_SIMPLIFY_CODE
IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;
-#else
- IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
-#endif
IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;
IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD = NULL;
@@ -1025,11 +1017,7 @@ int main(
goto cleanup;
}
-#ifdef FIX_989_TD_REND_ROM
if ( ( error = load_TDrend_HRTF_binary( *hHrtfTD, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )
-#endif
{
if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
{
@@ -1042,7 +1030,6 @@ int main(
}
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hHrtfCrend ) ) != IVAS_ERR_OK )
{
fprintf( stderr, "\nIVAS_Rend_GetHrtfCRendHandle failed: %s\n\n", ivas_error_to_string( error ) );
@@ -1056,15 +1043,6 @@ int main(
}
if ( ( error = load_Crend_HRTF_from_binary( *hHrtfCrend, hrtfFileReader, args.outConfig.audioConfig, hrtf_set_audio_cfg, args.sampleRate ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
- {
- fprintf( stderr, "\nIVAS_Rend_GetHrtfCRendHandle failed: %s\n\n", ivas_error_to_string( error ) );
- goto cleanup;
- }
-
- if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfFileReader, args.sampleRate ) ) != IVAS_ERR_OK )
-#endif
{
if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
{
@@ -1073,11 +1051,7 @@ int main(
}
else
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
destroy_crend_hrtf( hHrtfCrend );
-#else
- destroy_SetOfHRTF( hSetOfHRTF );
-#endif
}
}
@@ -1087,11 +1061,7 @@ int main(
goto cleanup;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, args.outConfig.audioConfig, args.inConfig.ambisonicsBuses->audioConfig, hrtfFileReader ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfFileReader ) ) != IVAS_ERR_OK )
-#endif
{
if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
{
@@ -1631,7 +1601,7 @@ int main(
if ( is_split_pre_rend_mode( &args ) )
{
- bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;
+ bitsBufferSize = ISAR_SPLIT_REND_BITS_BUFF_SIZE;
}
else
{
@@ -2203,18 +2173,7 @@ cleanup:
RotationFileReader_close( &externalOrientationFileReader );
RotationFileReader_close( &referenceRotReader );
Vector3PairFileReader_close( &referenceVectorReader );
-#ifdef FIX_CREND_SIMPLIFY_CODE
destroy_td_hrtf( hHrtfTD );
-#else
- if ( hSetOfHRTF != NULL && *hSetOfHRTF != NULL )
- {
- destroy_SetOfHRTF( hSetOfHRTF );
- }
- if ( hHrtfTD != NULL && *hHrtfTD != NULL )
- {
- destroy_td_hrtf( hHrtfTD );
- }
-#endif
destroy_hrtf_statistics( hHrtfStatistics );
IVAS_REND_Close( &hIvasRend );
IsmPositionProvider_close( positionProvider );
@@ -2472,7 +2431,7 @@ static bool parseRenderFramesize(
static bool parseOrientationTracking(
char *value,
- int8_t *orientation_tracking )
+ IVAS_HEAD_ORIENT_TRK_T *orientation_tracking )
{
to_upper( value );
@@ -2805,9 +2764,7 @@ static CmdlnArgs defaultArgs(
const char *executableName )
{
CmdlnArgs args;
-#ifdef FIX_CREND_SIMPLIFY_CODE
int16_t i;
-#endif
strncpy( args.executableName, executableName, RENDERER_MAX_CLI_ARG_LENGTH );
clearString( args.inputFilePath );
@@ -2824,16 +2781,12 @@ static CmdlnArgs defaultArgs(
args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_INVALID;
args.outConfig.outSetupCustom.num_spk = 0;
args.outConfig.outSetupCustom.num_lfe = 0;
-#ifdef FIX_CREND_SIMPLIFY_CODE
for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i )
{
args.inConfig.ambisonicsBuses[i].audioConfig = IVAS_AUDIO_CONFIG_INVALID;
}
for ( i = 0; i < RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS; ++i )
-#else
- for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
-#endif
{
clearString( args.inMetadataFilePaths[i] );
}
@@ -2870,11 +2823,7 @@ static CmdlnArgs defaultArgs(
clearString( args.inLfePanningMatrixFile );
args.render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
args.syncMdDelay = 0;
-#ifdef FIX_CREND_SIMPLIFY_CODE
for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
-#else
- for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
-#endif
{
args.directivityPatternId[i] = 65535;
}
@@ -3159,6 +3108,13 @@ void getMetadataFromFileReader(
fprintf( stderr, "\nError (%s) while reading ISM metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) );
exit( -1 );
}
+#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS
+ objectMetadataBuffer->positions[objIdx].azimuth_fx = ismMetadata.azimuth_fx;
+ objectMetadataBuffer->positions[objIdx].elevation_fx = ismMetadata.elevation_fx;
+ objectMetadataBuffer->positions[objIdx].radius_fx = ismMetadata.radius_fx;
+ objectMetadataBuffer->positions[objIdx].yaw_fx = ismMetadata.yaw_fx;
+ objectMetadataBuffer->positions[objIdx].pitch_fx = ismMetadata.pitch_fx;
+#else
objectMetadataBuffer->positions[objIdx].azimuth_fx = (Word32) ( ismMetadata.azimuth * ( 1 << 22 ) );
objectMetadataBuffer->positions[objIdx].elevation_fx = (Word32) ( ismMetadata.elevation * ( 1 << 22 ) );
objectMetadataBuffer->positions[objIdx].radius_fx = (Word16) ( ismMetadata.radius * ( 1 << 9 ) );
@@ -3170,6 +3126,7 @@ void getMetadataFromFileReader(
objectMetadataBuffer->positions[objIdx].radius = ismMetadata.radius;
objectMetadataBuffer->positions[objIdx].yaw = ismMetadata.yaw;
objectMetadataBuffer->positions[objIdx].pitch = ismMetadata.pitch;
+#endif
objectMetadataBuffer->positions[objIdx].non_diegetic_flag = ismMetadata.non_diegetic_flag;
return;
@@ -3223,20 +3180,50 @@ static void IsmPositionProvider_getNextFrame(
/* Otherwise fall back to default position */
else
{
+#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS
+ objectMetadataBuffer->positions[objIdx].azimuth_fx = 0;
+ objectMetadataBuffer->positions[objIdx].elevation_fx = 0;
+ objectMetadataBuffer->positions[objIdx].radius_fx = 512; // 1.f in Q9
+ objectMetadataBuffer->positions[objIdx].yaw_fx = 0;
+ objectMetadataBuffer->positions[objIdx].pitch_fx = 0;
+ objectMetadataBuffer->positions[objIdx].non_diegetic_flag = 0;
+#else
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;
- objectMetadataBuffer->positions[objIdx].azimuth_fx = 0;
- objectMetadataBuffer->positions[objIdx].elevation_fx = 0;
- objectMetadataBuffer->positions[objIdx].radius_fx = 512;
- objectMetadataBuffer->positions[objIdx].yaw_fx = 0;
- objectMetadataBuffer->positions[objIdx].pitch_fx = 0;
objectMetadataBuffer->positions[objIdx].non_diegetic_flag = 0;
+#endif
}
/* Wrap azimuth to lie within (-180, 180] range */
+#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS
+ while ( LT_32( objectMetadataBuffer->positions[objIdx].azimuth_fx, 0 ) )
+ {
+ objectMetadataBuffer->positions[objIdx].azimuth_fx = L_add( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 );
+ }
+ while ( GE_32( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 ) )
+ {
+ objectMetadataBuffer->positions[objIdx].azimuth_fx = L_sub( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 );
+ }
+
+ /* Clamp elevation to lie within [-90, 90] range (can't be wrapped easily) */
+ objectMetadataBuffer->positions[objIdx].elevation_fx = L_min( L_max( objectMetadataBuffer->positions[objIdx].elevation_fx, -DEG_90_IN_Q22 ), DEG_90_IN_Q22 );
+
+ /* Wrap yaw to lie within (-180, 180] range */
+ while ( LT_32( objectMetadataBuffer->positions[objIdx].yaw_fx, 0 ) )
+ {
+ objectMetadataBuffer->positions[objIdx].yaw_fx = L_add( objectMetadataBuffer->positions[objIdx].yaw_fx, DEG_360_IN_Q22 );
+ }
+ while ( GE_32( objectMetadataBuffer->positions[objIdx].yaw_fx, DEG_360_IN_Q22 ) )
+ {
+ objectMetadataBuffer->positions[objIdx].yaw_fx = L_sub( objectMetadataBuffer->positions[objIdx].yaw_fx, DEG_360_IN_Q22 );
+ }
+
+ /* Clamp pitch to lie within [-90, 90] range (can't be wrapped easily) */
+ objectMetadataBuffer->positions[objIdx].pitch_fx = L_min( L_max( objectMetadataBuffer->positions[objIdx].pitch_fx, -DEG_90_IN_Q22 ), DEG_90_IN_Q22 );
+#else
while ( objectMetadataBuffer->positions[objIdx].azimuth < 0.0f )
{
objectMetadataBuffer->positions[objIdx].azimuth += 360.0f;
@@ -3264,6 +3251,7 @@ static void IsmPositionProvider_getNextFrame(
objectMetadataBuffer->positions[objIdx].pitch = min( max( objectMetadataBuffer->positions[objIdx].pitch, -90 ), 90 );
objectMetadataBuffer->positions[objIdx].yaw_fx = (Word32) ( ( objectMetadataBuffer->positions[objIdx].yaw ) * ( 1 << Q22 ) );
objectMetadataBuffer->positions[objIdx].pitch_fx = (Word32) ( ( objectMetadataBuffer->positions[objIdx].pitch ) * ( 1 << Q22 ) );
+#endif
}
++positionProvider->frameCounter;
@@ -3568,6 +3556,14 @@ static void parseObjectPosition(
exit( -1 );
}
+#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS
+ position->azimuth_fx = (Word32) ( meta_prm[0] * ( 1 << Q22 ) ); /* Q22 */
+ position->elevation_fx = (Word32) ( meta_prm[1] * ( 1 << Q22 ) ); /* Q22 */
+ position->radius_fx = (Word16) ( meta_prm[2] * ( 1 << Q9 ) ); /* Q9 */
+ position->yaw_fx = (Word32) ( meta_prm[5] * ( 1 << Q22 ) ); /* Q22 */
+ position->pitch_fx = (Word32) ( meta_prm[6] * ( 1 << Q22 ) ); /* Q22 */
+ position->non_diegetic_flag = (Word16) meta_prm[7];
+#else
position->azimuth = meta_prm[0];
position->elevation = meta_prm[1];
position->azimuth_fx = (Word32) ( meta_prm[0] * ( 1 << 22 ) );
@@ -3576,6 +3572,7 @@ static void parseObjectPosition(
position->yaw = meta_prm[5];
position->pitch = meta_prm[6];
position->non_diegetic_flag = (int16_t) meta_prm[7];
+#endif
return;
}
diff --git a/lib_com/arith_coder_fx.c b/lib_com/arith_coder_fx.c
index 55d7a3ec545c9e624da69913fcdb7cb382b42e7a..09e2b7f4f8bece9a488773de92a3d1912b751a3d 100644
--- a/lib_com/arith_coder_fx.c
+++ b/lib_com/arith_coder_fx.c
@@ -194,13 +194,6 @@ void tcx_arith_scale_envelope(
Word16 statesi, bits;
Word32 mean, a, s, L_tmp;
Word16 mean_e, tmp, tmp2;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
lob_bits = 0;
move16();
@@ -225,12 +218,8 @@ void tcx_arith_scale_envelope(
tmp = norm_l( env[k] );
tmp2 = sub( 15, tmp );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = Inv16( round_fx_sat( L_shl( env[k], tmp ) ), &tmp2 ); /* exp(tmp2) */
-#else
- tmp = Inv16( round_fx_o( L_shl_o( env[k], tmp, &Overflow ), &Overflow ), &tmp2 ); /* exp(tmp2) */
-#endif
- ienv[k] = L_shl( L_deposit_h( tmp ), sub( tmp2, 15 ) ); /* Q16 */
+ ienv[k] = L_shl( L_deposit_h( tmp ), sub( tmp2, 15 ) ); /* Q16 */
move32();
mean = L_add( mean, ienv[k] ); /* Q16 */
}
@@ -262,11 +251,7 @@ void tcx_arith_scale_envelope(
b_e = add( b_e, mean_e );
/* scale = (-b + (float)sqrt(b*b - 4.0f*a*0.035f)) / (2.0f * a); */
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = round_fx_sat( BASOP_Util_Add_Mant32Exp( L_mult( b, b ), shl( b_e, 1 ), Mpy_32_16_1( a, -4588 /*-4.0f*0.035f Q15*/ ), a_e, &tmp2 ) );
-#else
- tmp = round_fx_o( BASOP_Util_Add_Mant32Exp( L_mult( b, b ), shl( b_e, 1 ), Mpy_32_16_1( a, -4588 /*-4.0f*0.035f Q15*/ ), a_e, &tmp2 ), &Overflow );
-#endif
IF( tmp <= 0 )
{
@@ -281,11 +266,7 @@ void tcx_arith_scale_envelope(
tmp2 = BASOP_Util_Add_MantExp( negate( b ), b_e, tmp, tmp2, &scale ); /* exp(scale) */
scale = BASOP_Util_Divide1616_Scale( scale, round_fx( a ), &tmp );
-#ifdef ISSUE_1836_replace_overflow_libcom
scale = shl_sat( scale, sub( sub( add( tmp, tmp2 ), a_e ), 1 ) ); /* Q15 */
-#else
- scale = shl_o( scale, sub( sub( add( tmp, tmp2 ), a_e ), 1 ), &Overflow ); /* Q15 */
-#endif
/* iscale = 1.0f / scale; */
iscale_e = 0;
@@ -334,11 +315,7 @@ void tcx_arith_scale_envelope(
L_tmp = L_add( L_tmp, L_shl( Mpy_32_16_1( env[k], mult_r( 1147 /*0.035f Q15*/, iscale ) ), iscale_e ) ); /* Q16 */
tmp = norm_l( L_tmp );
-#ifdef ISSUE_1836_replace_overflow_libcom
statesi = mult_r( statesi, round_fx_sat( L_shl( L_tmp, tmp ) ) );
-#else
- statesi = mult_r( statesi, round_fx_o( L_shl_o( L_tmp, tmp, &Overflow ), &Overflow ) );
-#endif
bits = add( bits, sub( 15, tmp ) );
tmp = norm_s( statesi );
@@ -425,11 +402,7 @@ void tcx_arith_scale_envelope(
*s_env_e = sub( add( 15, iscale_e ), tmp );
move16();
BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef ISSUE_1836_replace_overflow_libcom
a = L_shl_sat( 1265000, sub( 15, *s_env_e ) );
-#else
- a = L_shl_o( 1265000, sub( 15, *s_env_e ), &Overflow );
-#endif
BASOP_SATURATE_WARNING_ON_EVS;
FOR( k = 0; k < L_frame; k++ )
diff --git a/lib_com/basop_util.c b/lib_com/basop_util.c
index fe2b7e871a0ebe2aca06094cb879427b4593ef71..37619f4c1ff2a467c26414eea3a13394a1f4c11b 100644
--- a/lib_com/basop_util.c
+++ b/lib_com/basop_util.c
@@ -267,12 +267,6 @@ void BASOP_Util_Divide_MantExp( Word16 a_m, /*!< Mantissa of dividend a
Word16 preShift, postShift;
Word16 m;
Word32 m32;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-
assert( b_m != 0 );
@@ -305,11 +299,7 @@ void BASOP_Util_Divide_MantExp( Word16 a_m, /*!< Mantissa of dividend a
/* normalize result */
postShift = norm_l( m32 );
-#ifdef ISSUE_1836_replace_overflow_libcom
m = round_fx_sat( L_shl( m32, postShift ) );
-#else
- m = round_fx_o( L_shl( m32, postShift ), &Overflow );
-#endif
/* exponent */
*ptrResult_e = sub( add( add( a_e, sub( 1, b_e ) ), preShift ), postShift );
@@ -325,10 +315,6 @@ static Word16 Sqrt16_common( Word16 m,
Word16 e )
{
Word16 index, frac;
-#ifndef ISSUE_1836_replace_overflow_libcom
- Flag Overflow;
-#endif
-
assert( ( m >= 0x4000 ) || ( m == 0 ) );
@@ -342,13 +328,7 @@ static Word16 Sqrt16_common( Word16 m,
/* interpolate */
if ( m != 0 )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
m = mac_r_sat( SqrtTable[index], SqrtDiffTable[index], frac );
-#else
- BASOP_SATURATE_WARNING_OFF_EVS;
- m = mac_ro( SqrtTable[index], SqrtDiffTable[index], frac, &Overflow );
- BASOP_SATURATE_WARNING_ON_EVS;
-#endif
}
/* handle odd exponents */
@@ -364,19 +344,10 @@ static Word32 Sqrt32_common( Word32 m,
Word16 e )
{
Word16 m16, index, frac;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
assert( ( m >= 0x40000000 ) || ( m == 0 ) );
-#ifdef ISSUE_1836_replace_overflow_libcom
m16 = round_fx_sat( m );
-#else
- m16 = round_fx_o( m, &Overflow );
-#endif
/* get table index (upper 6 bits minus 32) */
/* index = (m16 >> 9) - 32; */
@@ -432,23 +403,9 @@ static Word32 ISqrt32_common( Word32 m,
Word16 e )
{
Word16 m16, index, frac;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
assert( m >= 0x40000000 );
-#ifdef ISSUE_1836_replace_overflow_libcom
m16 = round_fx_sat( m );
-#else
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- m16 = round_fx_o( m, &Overflow );
-#else
- m16 = round_fx( m );
-#endif
-#endif
-
/* get table index (upper 6 bits minus 32) */
/* index = (m16 >> 25) - 32; */
@@ -915,12 +872,6 @@ Word16 divide3232( Word32 L_num, Word32 L_denom )
{
Word16 z;
Word32 sign;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-
sign = L_and( L_xor( L_num, L_denom ), (Word32) 0x80000000 );
@@ -933,17 +884,12 @@ Word16 divide3232( Word32 L_num, Word32 L_denom )
L_denom = L_shl( L_denom, z );
/* round_fx instead of extract_h improves spectral distortion in E_UTIL_lev_dur (schur version). */
-#ifdef ISSUE_1836_replace_overflow_libcom
z = div_l( L_num, round_fx_sat( L_denom ) );
-#else
- z = div_l( L_num, round_fx_o( L_denom, &Overflow ) );
-#endif
if ( 0 != sign )
{
z = negate( z );
}
-
return z;
}
@@ -2072,66 +2018,6 @@ Word16 idiv1616_1( Word16 x, Word16 y )
}
}
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
-Word32 norm_llQ31( /* o : normalized result Q31 */
- Word32 L_c, /* i : upper bits of accu Q-1 */
- Word32 L_sum, /* i : lower bits of accu, unsigned Q31 */
- Word16 *exp /* o : exponent of result in [-32,31] Q0 */
-)
-{
-#ifdef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- move32(); /* compensate missing instrumentation */
- move32(); /* compensate missing instrumentation */
- return w_norm_llQ31( ( (Word64) L_c << 32 ) | (UWord32) L_sum, exp );
-#else
- Word16 i;
- Word32 L_tmp;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef ISSUE_1836_replace_overflow_libcom
- Flag Overflow = 0;
-#endif
- Flag Carry = 0;
-#endif /* BASOP_NOGLOB */
-
- /* Move MSBit of L_sum into L_c */
-#ifdef ISSUE_1836_replace_overflow_libcom
- Carry = 0;
- L_tmp = L_add_c( L_sum, L_sum, &Carry ); /* L_tmp = L_sum << 1 */
- L_c = L_add_c( L_c, L_c, &Carry );
-#else
- L_tmp = L_add_co( L_sum, L_sum, &Carry, &Overflow ); /* L_tmp = L_sum << 1 */
- L_c = L_add_co( L_c, L_c, &Carry, &Overflow );
-#endif
- L_add( 0, 0 );
- test();
- IF( ( L_c != (Word32) 0L ) && ( L_c != (Word32) 0xFFFFFFFFL ) )
- {
- i = norm_l( L_c );
- L_c = L_shl( L_c, i );
- i = sub( 31, i ); /* positive exponent */
- L_sum = L_lshr( L_tmp, 1 ); /* L_sum with MSBit=0 */
- L_sum = L_lshr( L_sum, i );
- L_sum = L_add( L_c, L_sum );
- }
- ELSE
- {
- i = -32;
- move16(); /* default exponent, if total sum=0 */
- IF( L_sum )
- {
- i = norm_l( L_sum );
- L_sum = L_shl( L_sum, i );
- i = negate( i ); /* negative or zero exponent */
- }
- }
- *exp = i;
- move16();
- return L_sum;
-#endif /* #ifdef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW */
-}
-#endif /* #ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW */
-
-
Word32 Dot_product16HQ( /* o : normalized result Q31 */
const Word32 L_off, /* i : initial sum value Qn */
const Word16 x[], /* i : x vector Qn */
diff --git a/lib_com/bitalloc_fx.c b/lib_com/bitalloc_fx.c
index 2b630cf214185b387d08ef0c830e15e5b5c643db..4d9c587994ed297a34d8b739e1658dca1805e154 100644
--- a/lib_com/bitalloc_fx.c
+++ b/lib_com/bitalloc_fx.c
@@ -23,12 +23,6 @@ void bitalloc_fx(
Word16 diff, temp;
Word16 fac;
Word16 ii;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
Word16 SFM_thr = SFM_G1G2;
move16();
@@ -56,11 +50,7 @@ void bitalloc_fx(
move16();
FOR( m = 1; m < im; m++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
v = sub_sat( temp, y[m] ); /* Q0 */
-#else
- v = sub_o( temp, y[m], &Overflow ); /* Q0 */
-#endif
temp = s_max( temp, y[m] );
if ( v < 0 )
{
@@ -230,13 +220,12 @@ void bitalloc_fx(
*-------------------------------------------------------------------*/
Word16 BitAllocF_fx(
- Word16 *y, /* i : norm of sub-vectors :Q0 */
- Word32 bit_rate, /* i : bitrate :Q0 */
- Word16 B, /* i : number of available bits :Q0 */
- Word16 N, /* i : number of sub-vectors :Q0 */
- Word16 *R, /* o : bit-allocation indicator :Q0 */
- Word16 *Rsubband_fx /* o : sub-band bit-allocation vector :Q3 */
- ,
+ Word16 *y, /* i : norm of sub-vectors :Q0 */
+ Word32 bit_rate, /* i : bitrate :Q0 */
+ Word16 B, /* i : number of available bits :Q0 */
+ Word16 N, /* i : number of sub-vectors :Q0 */
+ Word16 *R, /* o : bit-allocation indicator :Q0 */
+ Word16 *Rsubband_fx, /* o : sub-band bit-allocation vector :Q3 */
const Word16 hqswb_clas, /* i : hq swb class :Q0 */
const Word16 num_env_bands /* i : Number sub bands to be encoded for HF GNERIC :Q0 */
)
@@ -251,12 +240,6 @@ Word16 BitAllocF_fx(
Word16 tmp, exp1, exp2;
Word32 Rsubband_w32_fx[NB_SFM]; /* Q15 */
Word16 B_w16_fx;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
set32_fx( Rsubband_w32_fx, 0, NB_SFM );
@@ -450,11 +433,7 @@ Word16 BitAllocF_fx(
exp1 = sub( norm_l( L_tmp2 ), 1 );
exp2 = norm_s( n );
tmp = div_s( extract_h( L_shl( L_tmp2, exp1 ) ), shl( n, exp2 ) ); /*15 + 15 + exp1 - 16 - exp2*/
-#ifdef ISSUE_1836_replace_overflow_libcom
- m_fx = shl_sat( tmp, sub( exp2, exp1 ) ); /*Q14*/
-#else
- m_fx = shl_o( tmp, sub( exp2, exp1 ), &Overflow ); /*Q14*/
-#endif
+ m_fx = shl_sat( tmp, sub( exp2, exp1 ) ); /*Q14*/
if ( L_tmp1 < 0 )
{
m_fx = negate( m_fx );
diff --git a/lib_com/cldfb_evs_fx.c b/lib_com/cldfb_evs_fx.c
index 153f95cf99aeabd50ca6eec2eaab3d0e39e30d8b..368ce7923e560606c84f1fb665c82d573abab039 100644
--- a/lib_com/cldfb_evs_fx.c
+++ b/lib_com/cldfb_evs_fx.c
@@ -1240,12 +1240,6 @@ void GetEnergyCldfb( Word32 *energyLookahead, /*!< o: Q(*sf_energyLookahead)
Word32 energyValues[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
Word16 energyValuesSumE[CLDFB_NO_CHANNELS_MAX];
// Word16 freqTable[2] = {20, 40};
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
FOR( k = 0; k < numberCols; k++ )
{
@@ -1331,11 +1325,7 @@ void GetEnergyCldfb( Word32 *energyLookahead, /*!< o: Q(*sf_energyLookahead)
{
FOR( j = 20; j < numberBandsM; j++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
nrg = L_add_sat( nrg, L_shr_sat( energyValues[k][j], s ) );
-#else
- nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );
-#endif
}
}
@@ -1358,11 +1348,7 @@ void GetEnergyCldfb( Word32 *energyLookahead, /*!< o: Q(*sf_energyLookahead)
{
FOR( j = 20; j < numberBandsM; j++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
nrg = L_add_sat( nrg, L_shr_sat( energyValues[k][j], s ) );
-#else
- nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );
-#endif
}
}
diff --git a/lib_com/cldfb_fx.c b/lib_com/cldfb_fx.c
index 8c3331a3115886baed6f1c7dea632cac932eeb1a..2ef540fe398c4983a22694bd310117c13c5b4319 100644
--- a/lib_com/cldfb_fx.c
+++ b/lib_com/cldfb_fx.c
@@ -558,14 +558,11 @@ void cldfbAnalysis_ts_fx(
}
void cldfbAnalysis_ts_fx_var_q(
- const Word32 *timeIn_fx,
- /* i : time buffer */ // q
- Word32 realBuffer_fx[CLDFB_NO_CHANNELS_MAX],
- /* o : real value buffer */ // q_cldfb - 5
- Word32 imagBuffer_fx[CLDFB_NO_CHANNELS_MAX],
- /* o : imag value buffer */ // q_cldfb - 5
- const Word16 samplesToProcess, /* i : samples to process */
- HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i : filterbank state */
+ const Word32 *timeIn_fx, /* i : time buffer q */
+ Word32 realBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o : real value buffer q_cldfb - 5 */
+ Word32 imagBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o : imag value buffer q_cldfb - 5 */
+ const Word16 samplesToProcess, /* i : samples to process */
+ HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i : filterbank state */
Word16 *q_cldfb )
{
@@ -819,14 +816,11 @@ void cldfbAnalysis_ts_fx_var_q(
void cldfbAnalysis_ts_fx_fixed_q(
- const Word32 *timeIn_fx,
- /* i : time buffer */ // q
- Word32 realBuffer_fx[CLDFB_NO_CHANNELS_MAX],
- /* o : real value buffer */ // q - 5
- Word32 imagBuffer_fx[CLDFB_NO_CHANNELS_MAX],
- /* o : imag value buffer */ // q - 5
- const Word16 samplesToProcess, /* i : samples to process */
- HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i : filterbank state */
+ const Word32 *timeIn_fx, /* i : time buffer q */
+ Word32 realBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o : real value buffer q - 5 */
+ Word32 imagBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o : imag value buffer q - 5 */
+ const Word16 samplesToProcess, /* i : samples to process */
+ HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i : filterbank state */
Word16 *q_cldfb )
{
Word16 i, k;
@@ -1088,13 +1082,13 @@ void cldfbAnalysis_ts_fx_fixed_q(
* Conduct inverse multple overlap cmplex low delay MDCT
*--------------------------------------------------------------------*/
void cldfbSynthesis_ivas_fx(
- Word32 **realBuffer_fx, /* i : real values Qx*/
- Word32 **imagBuffer_fx, /* i : imag values Qx*/
- Word32 *timeOut_fx, /* o : output time domain samples Qx - 1*/
- const Word16 samplesToProcess, /* i : number of processed samples */
- const Word16 shift, /* i : scale for state buffer */
- const Word16 out_shift, /* i : scale for output buffer */
- HANDLE_CLDFB_FILTER_BANK h_cldfb /* i : filter bank state */
+ Word32 **realBuffer_fx, /* i : real values Qx*/
+ Word32 **imagBuffer_fx, /* i : imag values Qx*/
+ Word32 *timeOut_fx, /* o : output time domain samples Qx - 1*/
+ const Word16 samplesToProcess, /* i : number of processed samples */
+ const Word16 shift, /* i : scale for state buffer */
+ const Word16 out_shift, /* i : scale for output buffer */
+ HANDLE_CLDFB_FILTER_BANK h_cldfb /* i : filter bank state */
)
{
Word16 i;
@@ -1499,12 +1493,6 @@ static void GetEnergyCldfb_ivas_fx( Word32 *energyLookahead, /*!< o: Q(*sf_e
Word32 energyValues[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX];
Word16 energyValuesSumE[CLDFB_NO_CHANNELS_MAX];
// Word16 freqTable[2] = {20, 40};
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
FOR( k = 0; k < numberCols; k++ )
{
@@ -1590,11 +1578,7 @@ static void GetEnergyCldfb_ivas_fx( Word32 *energyLookahead, /*!< o: Q(*sf_e
{
FOR( j = 20; j < numberBandsM; j++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
nrg = L_add_sat( nrg, L_shr_sat( energyValues[k][j], s ) );
-#else
- nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );
-#endif
}
}
@@ -1617,11 +1601,7 @@ static void GetEnergyCldfb_ivas_fx( Word32 *energyLookahead, /*!< o: Q(*sf_e
{
FOR( j = 20; j < numberBandsM; j++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
nrg = L_add_sat( nrg, L_shr_sat( energyValues[k][j], s ) );
-#else
- nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );
-#endif
}
}
diff --git a/lib_com/cng_exc_fx.c b/lib_com/cng_exc_fx.c
index 56701bf6162428e0d1ca71b9c2664eebf78217c3..f23ef505c946ff2e687a3c0243b48488754f0e7e 100644
--- a/lib_com/cng_exc_fx.c
+++ b/lib_com/cng_exc_fx.c
@@ -621,12 +621,6 @@ void cng_params_postupd_fx(
Word16 CNG_mode;
Word16 ptr;
Word32 last_active_brate;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
ptr = add( sub( ho_circ_ptr, *cng_buf_cnt ), 1 );
IF( ptr < 0 )
@@ -652,16 +646,10 @@ void cng_params_postupd_fx(
FOR( i = 0; i < NUM_ENV_CNG; i++ )
{
/* sp[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mult_sat( *ptR, *ptR ); /* 2*Q_exc+1 */
L_tmp = L_add_sat( L_tmp, L_mult_sat( *ptI, *ptI ) ); /* 2*Q_exc+1 */
L_tmp = L_add_sat( L_tmp, L_tmp ); /* 2*Q_exc+1 */
-#else
- L_tmp = L_mult_o( *ptR, *ptR, &Overflow ); /* 2*Q_exc+1 */
- L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_exc+1 */
- L_tmp = L_add_o( L_tmp, L_tmp, &Overflow ); /* 2*Q_exc+1 */
-#endif
- L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_exc+1 */
+ L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_exc+1 */
tmp = add( add( Q_exc, Q_exc ), 1 );
sp[i] = L_shr( L_tmp, sub( tmp, 6 ) );
move32(); /* Q6 */
@@ -739,12 +727,6 @@ void cng_params_postupd_ivas_fx(
Word16 CNG_mode;
Word16 ptr;
Word32 last_active_brate;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
ptr = add( sub( ho_circ_ptr, *cng_buf_cnt ), 1 );
IF( ptr < 0 )
@@ -770,16 +752,10 @@ void cng_params_postupd_ivas_fx(
FOR( i = 0; i < NUM_ENV_CNG; i++ )
{
/* sp[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mult_sat( *ptR, *ptR ); /* 2*Q_exc+1 */
L_tmp = L_add_sat( L_tmp, L_mult_sat( *ptI, *ptI ) ); /* 2*Q_exc+1 */
L_tmp = L_add_sat( L_tmp, L_tmp ); /* 2*Q_exc+1 */
-#else
- L_tmp = L_mult_o( *ptR, *ptR, &Overflow ); /* 2*Q_exc+1 */
- L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_exc+1 */
- L_tmp = L_add_o( L_tmp, L_tmp, &Overflow ); /* 2*Q_exc+1 */
-#endif
- L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_exc+1 */
+ L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_exc+1 */
tmp = add( add( Q_exc, Q_exc ), 1 );
// To do : Saturation to be re-validated.
sp[i] = L_shr_sat( L_tmp, sub( tmp, 6 ) );
@@ -883,13 +859,6 @@ void cng_params_upd_fx(
Word16 tmp;
Word16 temp_lo_fx, temp_hi_fx;
Word16 exp_pow;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
/* update the pointer to circular buffer of old LSP vectors */
*ho_circ_ptr = add( *ho_circ_ptr, 1 );
@@ -926,15 +895,9 @@ void cng_params_upd_fx(
L_tmp = L_mult0( tmpv, tmpv ); /* 2*(Q_exc+scale) */
pt_exc2++;
tmpv = shl( *pt_exc2, scale );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mac0_sat( L_tmp, tmpv, tmpv );
pt_exc2++;
L_ener = L_add_sat( L_ener, L_shr_sat( L_tmp, 7 ) ); /* Q(2*(Q_exc+scale)+1) ,division by L_frame done here */
-#else
- L_tmp = L_mac0_o( L_tmp, tmpv, tmpv, &Overflow );
- pt_exc2++;
- L_ener = L_add_o( L_ener, L_shr_o( L_tmp, 7, &Overflow ), &Overflow ); /* Q(2*(Q_exc+scale)+1) ,division by L_frame done here */
-#endif
}
}
ELSE /* L_FRAME16k */
@@ -945,22 +908,12 @@ void cng_params_upd_fx(
L_tmp = L_mult0( tmpv, tmpv ); /* 2*(Q_exc+scale) */
pt_exc2++;
tmpv = shl( *pt_exc2, scale );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mac0_sat( L_tmp, tmpv, tmpv );
pt_exc2++;
L_ener = L_add_sat( L_ener, L_shr_sat( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7 ) ); /* Q(2*(Q_exc+scale)+15+1-16+1) ,division by L_frame done here */
-#else
- L_tmp = L_mac0_o( L_tmp, tmpv, tmpv, &Overflow );
- pt_exc2++;
- L_ener = L_add_o( L_ener, L_shr_o( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7, &Overflow ), &Overflow ); /* Q(2*(Q_exc+scale)+15+1-16+1) ,division by L_frame done here */
-#endif
}
}
-#ifdef ISSUE_1836_replace_overflow_libcom
L_ener = L_shr_sat( L_ener, sub( shl( add( Q_exc, scale ), 1 ), 5 ) ); /* Q6 (2*(Q_exc+scale)+1-2*(Q_exc+scale)+5) */
-#else
- L_ener = L_shr_o( L_ener, sub( shl( add( Q_exc, scale ), 1 ), 5 ), &Overflow ); /* Q6 (2*(Q_exc+scale)+1-2*(Q_exc+scale)+5) */
-#endif
/* update the circular buffer of old energies */
ho_ener_circ[*ho_circ_ptr] = L_ener;
@@ -994,16 +947,10 @@ void cng_params_upd_fx(
FOR( i = 0; i < NUM_ENV_CNG; i++ )
{
/* sp[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mult_sat( *ptR, *ptR ); /* 2*Q_exc+1 */
L_tmp = L_add_sat( L_tmp, L_mult_sat( *ptI, *ptI ) ); /* 2*Q_exc+1 */
L_tmp = L_add_sat( L_tmp, L_tmp ); /* 2*Q_exc+1 */
-#else
- L_tmp = L_mult_o( *ptR, *ptR, &Overflow ); /* 2*Q_exc+1 */
- L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_exc+1 */
- L_tmp = L_add_o( L_tmp, L_tmp, &Overflow ); /* 2*Q_exc+1 */
-#endif
- L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_exc+1 */
+ L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_exc+1 */
tmp = add( add( Q_exc, Q_exc ), 1 );
sp[i] = L_shr( L_tmp, sub( tmp, 6 ) );
move32(); /* Q6 */
@@ -1052,24 +999,23 @@ void cng_params_upd_fx(
}
void cng_params_upd_ivas_fx(
- const Word16 lsp_new[], /* i : LSP aprameters Q15 */
- const Word16 exc2[], /* i : current enhanced excitation Q_exc */
- const Word16 L_frame, /* i : frame length Q0 */
- Word16 *ho_circ_ptr, /* i/o: pointer for CNG averaging buffers Q0 */
- Word32 ho_ener_circ[], /* o : energy buffer for CNG averaging Q6 */
- Word16 *ho_circ_size, /* i/o: size of DTX hangover history buffer for averaging Q0 */
- Word16 ho_lsp_circ[], /* o : old LSP buffer for CNG averaging Q15 */
- const Word16 Q_exc, /* i : Q value of excitation */
- const Word16 enc_dec_flag, /* i : Flag indicating encoder or decoder (ENC,DEC) */
- Word32 ho_env_circ[], /* i/o: Envelope buffer Q(6+shift) */
- Word16 *cng_buf_cnt, /* i/o: Counter of postponed FFT-processing instances */
- Word16 cng_exc2_buf[], /* i/o: Excitation buffer Q_exc */
- Word16 cng_Qexc_buf[], /* i/o: Q_exc buffer Q0 */
- Word32 cng_brate_buf[], /* i/o: last_active_brate buffer Q0 */
- const Word32 last_active_brate /* i : Last active bit rate Q0 */
- ,
- const Word16 element_mode, /* i : Element mode */
- const Word16 bwidth /* i : Audio bandwidth */
+ const Word16 lsp_new[], /* i : LSP aprameters Q15 */
+ const Word16 exc2[], /* i : current enhanced excitation Q_exc */
+ const Word16 L_frame, /* i : frame length Q0 */
+ Word16 *ho_circ_ptr, /* i/o: pointer for CNG averaging buffers Q0 */
+ Word32 ho_ener_circ[], /* o : energy buffer for CNG averaging Q6 */
+ Word16 *ho_circ_size, /* i/o: size of DTX hangover history buffer for averaging Q0 */
+ Word16 ho_lsp_circ[], /* o : old LSP buffer for CNG averaging Q15 */
+ const Word16 Q_exc, /* i : Q value of excitation */
+ const Word16 enc_dec_flag, /* i : Flag indicating encoder or decoder (ENC,DEC) */
+ Word32 ho_env_circ[], /* i/o: Envelope buffer Q(6+shift) */
+ Word16 *cng_buf_cnt, /* i/o: Counter of postponed FFT-processing instances */
+ Word16 cng_exc2_buf[], /* i/o: Excitation buffer Q_exc */
+ Word16 cng_Qexc_buf[], /* i/o: Q_exc buffer Q0 */
+ Word32 cng_brate_buf[], /* i/o: last_active_brate buffer Q0 */
+ const Word32 last_active_brate, /* i : Last active bit rate Q0 */
+ const Word16 element_mode, /* i : Element mode */
+ const Word16 bwidth /* i : Audio bandwidth */
)
{
Word32 L_ener, L_tmp;
@@ -1086,12 +1032,6 @@ void cng_params_upd_ivas_fx(
move16();
Word16 temp_lo_fx, temp_hi_fx;
Word16 exp_pow;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* update the pointer to circular buffer of old LSP vectors */
*ho_circ_ptr = add( *ho_circ_ptr, 1 );
@@ -1128,15 +1068,9 @@ void cng_params_upd_ivas_fx(
L_tmp = L_mult0( tmpv, tmpv ); /* 2*(Q_exc+scale) */
pt_exc2++;
tmpv = shl( *pt_exc2, scale );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mac0_sat( L_tmp, tmpv, tmpv );
pt_exc2++;
L_ener = L_add_sat( L_ener, L_shr_sat( L_tmp, 7 ) ); /* Q(2*(Q_exc+scale)+1) ,division by L_frame done here */
-#else
- L_tmp = L_mac0_o( L_tmp, tmpv, tmpv, &Overflow );
- pt_exc2++;
- L_ener = L_add_o( L_ener, L_shr_o( L_tmp, 7, &Overflow ), &Overflow ); /* Q(2*(Q_exc+scale)+1) ,division by L_frame done here */
-#endif
}
}
ELSE /* L_FRAME16k */
@@ -1147,22 +1081,12 @@ void cng_params_upd_ivas_fx(
L_tmp = L_mult0( tmpv, tmpv ); /* 2*(Q_exc+scale) */
pt_exc2++;
tmpv = shl( *pt_exc2, scale );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mac0_sat( L_tmp, tmpv, tmpv );
pt_exc2++;
L_ener = L_add_sat( L_ener, L_shr_sat( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7 ) ); /* Q(2*(Q_exc+scale)+15+1-16+1) ,division by L_frame done here */
-#else
- L_tmp = L_mac0_o( L_tmp, tmpv, tmpv, &Overflow );
- pt_exc2++;
- L_ener = L_add_o( L_ener, L_shr_o( Mult_32_16( L_tmp, 26214 /* 256/320, Q15 */ ), 7, &Overflow ), &Overflow ); /* Q(2*(Q_exc+scale)+15+1-16+1) ,division by L_frame done here */
-#endif
}
}
-#ifdef ISSUE_1836_replace_overflow_libcom
L_ener = L_shr_sat( L_ener, sub( shl( add( Q_exc, scale ), 1 ), 5 ) ); /* Q6 (2*(Q_exc+scale)+1-2*(Q_exc+scale)+5) */
-#else
- L_ener = L_shr_o( L_ener, sub( shl( add( Q_exc, scale ), 1 ), 5 ), &Overflow ); /* Q6 (2*(Q_exc+scale)+1-2*(Q_exc+scale)+5) */
-#endif
/* update the circular buffer of old energies */
ho_ener_circ[*ho_circ_ptr] = L_ener;
@@ -1196,21 +1120,12 @@ void cng_params_upd_ivas_fx(
FOR( i = 0; i < NUM_ENV_CNG; i++ )
{
/* sp[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mult_sat( *ptR, *ptR ); /* 2*Q_exc+1 */
L_tmp = L_add_sat( L_tmp, L_mult_sat( *ptI, *ptI ) ); /* 2*Q_exc+1 */
L_tmp = L_add_sat( L_tmp, L_tmp ); /* 2*Q_exc+1 */
L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_exc+1 */
tmp = add( add( Q_exc, Q_exc ), 1 );
sp[i] = L_shr_sat( L_tmp, sub( tmp, 6 ) );
-#else
- L_tmp = L_mult_o( *ptR, *ptR, &Overflow ); /* 2*Q_exc+1 */
- L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_exc+1 */
- L_tmp = L_add_o( L_tmp, L_tmp, &Overflow ); /* 2*Q_exc+1 */
- L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_exc+1 */
- tmp = add( add( Q_exc, Q_exc ), 1 );
- sp[i] = L_shr_o( L_tmp, sub( tmp, 6 ), &Overflow );
-#endif
move32(); /* Q6 */
ptR++;
ptI--;
diff --git a/lib_com/cnst.h b/lib_com/cnst.h
index 4157d878f42522b2978d23b942c2d46a4c2420c1..cf1a7820f868b97acce348b592673e7f564030e8 100644
--- a/lib_com/cnst.h
+++ b/lib_com/cnst.h
@@ -800,10 +800,6 @@ enum
#define CLDFB_NO_COL_MAX_SWITCH_BFI 10 /* CLDFB resampling - max number of CLDFB col. for switching, BFI */
#define CLDFB_OVRLP_MIN_SLOTS 3 /* CLDFB resampling - minimize processing to minimum required for transition frame ACELP->TCX/HQ */
-#ifndef FIX_2085_FLOATING_POINT_LEFTOVERS
-#define INV_CLDFB_BANDWIDTH ( 1.f / 800.f )
-#endif
-
#define INV_CLDFB_BANDWIDTH_Q31 ( 2684355l ) /* ( 1.f / 800.f ) Q31 */
#define INV_CLDFB_BANDWIDTH_MDFT_FAC_Q31 ( 10737418 )
#define CLDFB_BANDWIDTH 800
diff --git a/lib_com/codec_tcx_common_fx.c b/lib_com/codec_tcx_common_fx.c
index 010590ad176ff7f53348a5bd3a763d4b0d9fc55b..515a1a43e75cd9389f7348cce804990c1d427fcf 100644
--- a/lib_com/codec_tcx_common_fx.c
+++ b/lib_com/codec_tcx_common_fx.c
@@ -61,12 +61,6 @@ void tcxFormantEnhancement(
Word16 i, j, k, l, n;
Word16 fac, fac0, fac1, fac_e, d, tmp;
Word16 xn_buf_e, xn_one, m, e;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
k = shr( L_frame, 6 ); /* FDNS_NPTS = 64 */
l = 0;
@@ -141,11 +135,7 @@ void tcxFormantEnhancement(
{
fac = add( fac0, mult( d, extract_l( L_mult0( j, inv_int[n] ) ) ) );
BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef ISSUE_1836_replace_overflow_libcom
xn_buf[l + j] = s_min( xn_one, shl_sat( mult( xn_buf[l + j], fac ), fac_e ) );
-#else
- xn_buf[l + j] = s_min( xn_one, shl_o( mult( xn_buf[l + j], fac ), fac_e, &Overflow ) );
-#endif
move16();
BASOP_SATURATE_WARNING_ON_EVS;
}
@@ -233,12 +223,6 @@ void tcxFormantEnhancement_with_shift(
Word16 i, j, k, l, n;
Word16 fac, fac0, fac1, fac_e, d, tmp;
Word16 xn_buf_e, xn_one, m, e;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
k = shr( L_frame, 6 ); /* FDNS_NPTS = 64 */
l = 0;
@@ -317,11 +301,7 @@ void tcxFormantEnhancement_with_shift(
{
fac = add( fac0, mult( d, extract_l( L_mult0( j, inv_int[n] ) ) ) );
BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef ISSUE_1836_replace_overflow_libcom
xn_buf[l + j] = s_min( xn_one, shl_sat( mult( xn_buf[l + j], fac ), fac_e ) );
-#else
- xn_buf[l + j] = s_min( xn_one, shl_o( mult( xn_buf[l + j], fac ), fac_e, &Overflow ) );
-#endif
move16();
BASOP_SATURATE_WARNING_ON_EVS;
}
@@ -366,11 +346,7 @@ void tcxFormantEnhancement_with_shift(
{
fac = add( fac0, mult( d, extract_l( L_mult0( j, inv_int[n] ) ) ) );
BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef ISSUE_1836_replace_overflow_libcom
xn_buf[l + j] = s_min( xn_one, shl_sat( mult( xn_buf[l + j], fac ), fac_e ) );
-#else
- xn_buf[l + j] = s_min( xn_one, shl_o( mult( xn_buf[l + j], fac ), fac_e, &Overflow ) );
-#endif
move16();
BASOP_SATURATE_WARNING_ON_EVS;
}
diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h
index d8ccd49d97dadd7c535501dd5871fafb91757f07..76b3fb6d44e7a58e6d827bcff28ce337fb0b9df6 100644
--- a/lib_com/common_api_types.h
+++ b/lib_com/common_api_types.h
@@ -46,24 +46,28 @@
* Common API constants
*----------------------------------------------------------------------------------*/
-#define IVAS_NUM_FRAMES_PER_SEC 50
-#define IVAS_MAX_FRAME_SIZE ( 48000 / IVAS_NUM_FRAMES_PER_SEC )
-#define IVAS_MAX_BITS_PER_FRAME ( 512000 / IVAS_NUM_FRAMES_PER_SEC )
+#define IVAS_NUM_FRAMES_PER_SEC 50 /* number of frames per second */
+#define IVAS_MAX_SAMPLING_RATE 48000 /* maximum supported sampling rate in Hz */
+#define IVAS_MAX_FRAME_SIZE ( IVAS_MAX_SAMPLING_RATE / IVAS_NUM_FRAMES_PER_SEC ) /* maximum frame buffer length (per channel) in samples */
+#define IVAS_MAX_BITS_PER_FRAME ( 512000 / IVAS_NUM_FRAMES_PER_SEC ) /* maximum bits per frame; corresponds to maximum bitrate of 512 kbps */
#define IVAS_MAX_NUM_OBJECTS 4
#define IVAS_MAX_INPUT_CHANNELS 16
-#define IVAS_MAX_OUTPUT_CHANNELS 16
+#define IVAS_MAX_OUTPUT_CHANNELS 16 /* Note: there is an exception for OSBA and EXT otuput where it can be 20 (HOA3 + 4 ISM channels) */
#define IVAS_CLDFB_NO_COL_MAX 16
#define IVAS_CLDFB_NO_CHANNELS_MAX 60
+/* Renderer constants */
#define IVAS_MAX_PARAM_SPATIAL_SUBFRAMES 4
#define IVAS_ROOM_ABS_COEFF 6
+#define IVAS_REVERB_PREDELAY_MAX 20 /* Max input delay for reverb module */
+#define IVAS_ER_LIST_HEIGHT 1.6f
+#define IVAS_ER_LIST_HEIGHT_FX 6710886 /* 1.6f in Q.22 */
-/* Maximum buffer length (per channel) in samples */
-#define MAX_BUFFER_LENGTH_PER_CHANNEL ( L_FRAME48k )
+/* JBM constants for adaptive-playout */
+#define IVAS_TIME_SCALE_MIN 50 /* min. time-scaling [%] */
+#define IVAS_TIME_SCALE_MAX 150 /* max. time-scaling [%] */
-/* Frame size required when rendering to binaural */
-#define BINAURAL_RENDERING_FRAME_SIZE_MS 5
/*----------------------------------------------------------------------------------*
* Common API enum for output audio configurations
@@ -126,9 +130,10 @@ typedef struct _IVAS_ISM_METADATA
Word32 elevation_fx; /* Q22 */
Word16 radius_fx; /* Q9 */
Word32 spread_fx; /* Q22 */
- Word32 gainFactor_fx; /* Q31 */
+ Word32 gainFactor_fx; /* Q29 */
Word32 yaw_fx; /* Q22 */
Word32 pitch_fx; /* Q22 */
+#ifndef FIX_2084_FLOATING_POINT_LEFTOVERS
float azimuth;
float elevation;
float radius;
@@ -136,21 +141,19 @@ typedef struct _IVAS_ISM_METADATA
float gainFactor;
float yaw;
float pitch;
- Word16 non_diegetic_flag;
-#ifdef OBJ_EDITING_API
- Word32 gain_fx;
#endif
+ Word16 non_diegetic_flag;
+ Word32 gain_fx; /* Q29 */
} IVAS_ISM_METADATA;
-#ifdef OBJ_EDITING_API
typedef struct _IVAS_EDITABLE_PARAMETERS
{
Word16 num_obj;
IVAS_ISM_METADATA ism_metadata[IVAS_MAX_NUM_OBJECTS];
- Word32 gain_bed_fx;
+ Word32 gain_bed_fx; /* Q29 */
+
} IVAS_EDITABLE_PARAMETERS;
-#endif
typedef struct
{
@@ -190,20 +193,12 @@ typedef enum
typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;
typedef struct ivas_masa_decoder_ext_out_meta_struct *IVAS_MASA_DECODER_EXT_OUT_META_HANDLE;
-#ifdef FIX_CREND_SIMPLIFY_CODE
typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_TD_HANDLE;
typedef struct ivas_hrtf_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;
typedef struct ivas_hrtf_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;
typedef struct ivas_hrtf_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;
typedef struct ivas_hrtf_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;
-#else
-typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_TD_HANDLE;
-typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;
-typedef struct ivas_hrtfs_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;
-typedef struct ivas_hrtfs_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;
-typedef struct ivas_hrtfs_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;
-#endif
-typedef struct cldfb_filter_bank_struct *IVAS_CLDFB_FILTER_BANK_HANDLE;
+typedef struct ivas_cldfb_filter_bank_struct *IVAS_CLDFB_FILTER_BANK_HANDLE;
typedef struct ivas_LS_setup_custom *IVAS_LSSETUP_CUSTOM_HANDLE;
typedef struct ivas_LS_setup_custom IVAS_LSSETUP_CUSTOM_STRUCT;
@@ -236,7 +231,6 @@ typedef struct _IVAS_JBM_TRACE_DATA
} IVAS_JBM_TRACE_DATA;
-#ifdef FIX_CREND_SIMPLIFY_CODE
typedef enum _ivas_binaural_renderer_type
{
IVAS_BIN_RENDERER_TYPE_NONE,
@@ -247,16 +241,15 @@ typedef enum _ivas_binaural_renderer_type
IVAS_BIN_RENDERER_TYPE_DEFAULT,
} IVAS_BIN_RENDERER_TYPE;
-#endif
/*----------------------------------------------------------------------------------*
* Split rendering API constants, structures, and enums
*----------------------------------------------------------------------------------*/
#define ISAR_MAX_SPLIT_REND_BITRATE 768000
-#define ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) ISAR_MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )
+#define ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (Word32) ISAR_MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )
#define ISAR_SPLIT_REND_ADDITIONAL_BYTES_TO_READ 1
-#define SPLIT_REND_BITS_BUFF_SIZE ( ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES + ISAR_SPLIT_REND_ADDITIONAL_BYTES_TO_READ )
+#define ISAR_SPLIT_REND_BITS_BUFF_SIZE ( ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES + ISAR_SPLIT_REND_ADDITIONAL_BYTES_TO_READ )
typedef enum
{
@@ -286,56 +279,42 @@ typedef enum
} ISAR_SPLIT_REND_CODEC;
-#ifndef FIX_HRTF_LOAD
-typedef enum
-{
- ISAR_SPLIT_REND_RENDERER_SELECTION_CREND,
- ISAR_SPLIT_REND_RENDERER_SELECTION_FASTCONV,
- ISAR_SPLIT_REND_RENDERER_SELECTION_PARAMBIN,
- ISAR_SPLIT_REND_RENDERER_SELECTION_TDREND,
- ISAR_SPLIT_REND_RENDERER_SELECTION_DEFAULT,
-
-} ISAR_SPLIT_REND_RENDERER_SELECTION;
-#endif
typedef struct _ISAR_SPLIT_REND_BITS_DATA
{
- uint8_t *bits_buf;
- int32_t buf_len; /*size of bits_buf in bytes. This field should be set by allocator of bits_buf*/
- int32_t bits_written;
- int32_t bits_read;
- int16_t codec_frame_size_ms;
+ UWord8 *bits_buf;
+ Word32 buf_len; /*size of bits_buf in bytes. This field should be set by allocator of bits_buf*/
+ Word32 bits_written;
+ Word32 bits_read;
+ Word16 codec_frame_size_ms;
ISAR_SPLIT_REND_CODEC codec;
ISAR_SPLIT_REND_POSE_CORRECTION_MODE pose_correction;
- int16_t isar_frame_size_ms;
- int16_t lc3plus_highres;
+ Word16 isar_frame_size_ms;
+ Word16 lc3plus_highres;
} ISAR_SPLIT_REND_BITS_DATA, *ISAR_SPLIT_REND_BITS_HANDLE;
typedef struct _ISAR_SPLIT_REND_CONFIG
{
- int32_t splitRendBitRate; /*Bit rate for split rendering mode, if "pcm_out" is set then "splitRendBitRate" is used as a limit for MD bitrate */
- int16_t hq_mode; /*High quality 3DOF mode with additional side information. Requires more pre-renditions. */
- int16_t dof; /*flag to specify if pose correction is needed for 1, 2 or 3 degree of freedoms*/
- /*The axis can be set dynamically per frame based on a file input */
- /*possible values:
+ Word32 splitRendBitRate; /*Bit rate for split rendering mode, if "pcm_out" is set then "splitRendBitRate" is used as a limit for MD bitrate */
+ Word16 hq_mode; /*High quality 3DOF mode with additional side information. Requires more pre-renditions. */
+ Word16 dof; /*flag to specify if pose correction is needed for 1, 2 or 3 degree of freedoms*/
+ /*The axis can be set dynamically per frame based on a file input */
+ /*possible values:
1 - (1dof correction. By default YAW correction)
2 - (2dof correction. By default YAW and PITCH correction)
3 - (3dof correction. By default YAW, PITCH and ROLL correction)
*/
- int16_t codec_delay_ms; /* look ahead delay of the codec that is used to code BIN signal output of pre-renderer*/
- int16_t isar_frame_size_ms; /* ISAR bit stream frame size in milliseconds */
- int16_t codec_frame_size_ms; /* Codec frame size in milliseconds, only relevant with LC3plus */
+ Word16 codec_delay_ms; /* look ahead delay of the codec that is used to code BIN signal output of pre-renderer*/
+ Word16 isar_frame_size_ms; /* ISAR bit stream frame size in milliseconds */
+ Word16 codec_frame_size_ms; /* Codec frame size in milliseconds, only relevant with LC3plus */
ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode;
ISAR_SPLIT_REND_CODEC codec;
-#ifdef FIX_HRTF_LOAD
IVAS_BIN_RENDERER_TYPE rendererSelection;
-#else
- ISAR_SPLIT_REND_RENDERER_SELECTION rendererSelection;
-#endif
- int16_t lc3plus_highres;
+ Word16 lc3plus_highres;
} ISAR_SPLIT_REND_CONFIG_DATA, *ISAR_SPLIT_REND_CONFIG_HANDLE;
+
/*----------------------------------------------------------------------------------*
* Renderer API structures and enums
*----------------------------------------------------------------------------------*/
@@ -380,13 +359,14 @@ typedef struct _IVAS_RENDER_CONFIG
Word16 directivity_fx[IVAS_MAX_NUM_OBJECTS * 3]; // has the following q-factor pattern: {6, 6, 15, 6, 6, 15, 6, 6, 15, 6, 6, 15}
float distAtt[3];
Word32 distAtt_fx[3]; /* {Q27, Q30, Q30} */
+
} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;
typedef struct
{
- int16_t numSamplesPerChannel;
- int16_t numChannels;
- int16_t is_cldfb;
+ Word16 numSamplesPerChannel;
+ Word16 numChannels;
+ Word16 is_cldfb;
} IVAS_REND_AudioBufferConfig;
@@ -396,7 +376,6 @@ typedef struct
Word16 q_factor;
Word16 *pq_fact;
Word32 *data_fx;
- // Word16 Q_data;
} IVAS_REND_AudioBuffer;
diff --git a/lib_com/deemph_fx.c b/lib_com/deemph_fx.c
index 230dcec6ac10c3f1ad33f030c3ea1e54dccef0e3..829b4045b554f374bffccffe5f611852ec9d212d 100644
--- a/lib_com/deemph_fx.c
+++ b/lib_com/deemph_fx.c
@@ -92,34 +92,16 @@ void deemph_fx(
{
Word16 i;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow;
- Overflow = 0;
- move32();
-#endif
- L_tmp = L_deposit_h( signal[0] ); /*Qx+16*/
- L_tmp = L_mac_o( L_tmp, *mem, mu, &Overflow ); /*Qx+16*/
- signal[0] = round_fx_o( L_tmp, &Overflow ); /*Qx*/
-#else
- L_tmp = L_deposit_h( signal[0] ); /*Qx+16*/
- L_tmp = L_mac_sat( L_tmp, *mem, mu ); /*Qx+16*/
- signal[0] = round_fx_sat( L_tmp ); /*Qx*/
-#endif
-
-
+ L_tmp = L_deposit_h( signal[0] ); /*Qx+16*/
+ L_tmp = L_mac_sat( L_tmp, *mem, mu ); /*Qx+16*/
+ signal[0] = round_fx_sat( L_tmp ); /*Qx*/
move16();
FOR( i = 1; i < L; i++ )
{
- L_tmp = L_deposit_h( signal[i] ); /*Qx+16*/
-#ifdef ISSUE_1836_replace_overflow_libcom
+ L_tmp = L_deposit_h( signal[i] ); /*Qx+16*/
L_tmp = L_mac_sat( L_tmp, signal[i - 1], mu ); /*Qx+16*/
signal[i] = round_fx_sat( L_tmp ); /*Qx*/
-#else
- L_tmp = L_mac_o( L_tmp, signal[i - 1], mu, &Overflow ); /*Qx+16*/
- signal[i] = round_fx_o( L_tmp, &Overflow ); /*Qx*/
-#endif
move16();
}
@@ -142,13 +124,7 @@ void Deemph2(
{
Word16 i;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow;
- Overflow = 0;
- move32();
-#endif
-#endif
+
/* saturation can occur in L_mac() */
L_tmp = L_mult( x[0], 16384 /*0.5f in Q15*/ ); /*Qx+16*/
@@ -158,16 +134,14 @@ void Deemph2(
FOR( i = 1; i < L; i++ )
{
L_tmp = L_mult( x[i], 16384 /*0.5f in Q15*/ ); /*Qx+16*/
-#ifdef ISSUE_1836_replace_overflow_libcom
- x[i] = mac_r_sat( L_tmp, x[i - 1], mu ); /*Qx-1*/
-#else
- x[i] = mac_ro( L_tmp, x[i - 1], mu, &Overflow ); /*Qx-1*/
-#endif
+ x[i] = mac_r_sat( L_tmp, x[i - 1], mu ); /*Qx-1*/
move16();
}
*mem = x[L - 1]; /*Qx-1*/
move16();
+
+ return;
}
@@ -188,17 +162,15 @@ void Deemph2(
* Returns:
* void
*/
-void E_UTIL_deemph2( Word16 shift, Word16 *x, const Word16 mu, const Word16 L, Word16 *mem )
+void E_UTIL_deemph2(
+ Word16 shift,
+ Word16 *x,
+ const Word16 mu,
+ const Word16 L,
+ Word16 *mem )
{
Word16 i;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow;
- Overflow = 0;
- move32();
-#endif
-#endif
/* signal[0] = signal[0] + mu * (*mem); */
L_tmp = L_deposit_h( *mem ); /*Qx+16*/
@@ -207,13 +179,8 @@ void E_UTIL_deemph2( Word16 shift, Word16 *x, const Word16 mu, const Word16 L, W
shift = shr( -32768, shift ); /*Q15 - shift*/
FOR( i = 0; i < L; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_msu_sat( Mpy_32_16_1( L_tmp, mu ), x[i], shift ); /*Qx-shift+16*/
x[i] = round_fx_sat( L_tmp ); /*Qx-shift*/
-#else
- L_tmp = L_msu_o( Mpy_32_16_1( L_tmp, mu ), x[i], shift, &Overflow ); /*Qx-shift+16*/
- x[i] = round_fx_o( L_tmp, &Overflow ); /*Qx-shift*/
-#endif
move16();
}
}
@@ -221,13 +188,8 @@ void E_UTIL_deemph2( Word16 shift, Word16 *x, const Word16 mu, const Word16 L, W
{
FOR( i = 0; i < L; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_msu_sat( Mpy_32_16_1( L_tmp, mu ), shr_sat( x[i], shift ), -32768 /*1.0f in Q15*/ ); /*Qx-shift+16*/
x[i] = round_fx_sat( L_tmp ); /*Qx-shift*/
-#else
- L_tmp = L_msu_o( Mpy_32_16_1( L_tmp, mu ), shr_sat( x[i], shift ), -32768 /*1.0f in Q15*/, &Overflow ); /*Qx-shift+16*/
- x[i] = round_fx_o( L_tmp, &Overflow ); /*Qx-shift*/
-#endif
move16();
}
}
diff --git a/lib_com/disclaimer.c b/lib_com/disclaimer.c
index f98245cda6a3dbada76013f29d1e72bc76db25d0..53210b9fe68764e1432438f2781ee4ccad778dbd 100644
--- a/lib_com/disclaimer.c
+++ b/lib_com/disclaimer.c
@@ -40,7 +40,7 @@
#define WMC_TOOL_SKIP
-int16_t print_disclaimer( FILE *fPtr )
+Word16 print_disclaimer( FILE *fPtr )
{
fprintf( fPtr, "\n==================================================================================================\n" );
diff --git a/lib_com/edct_fx.c b/lib_com/edct_fx.c
index 244d693819fab6a1a3d9c4e2d9087abfaa733a70..86a8ad268b57c74982476ea5ab364fa2a7df9cc5 100644
--- a/lib_com/edct_fx.c
+++ b/lib_com/edct_fx.c
@@ -9,8 +9,6 @@
#include "rom_com.h" /* Static table prototypes */
#include "prot_fx.h" /* Function prototypes */
#include "stl.h"
-
-
#include "math_32.h"
static Word16 get_edxt_factor( Word16 length ) /* Returns value of sqrtf(2.f/length) in Q15 */
@@ -395,13 +393,6 @@ void edct_16fx(
const Word16 *px, *pt;
Word16 *py;
(void) element_mode;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow;
- Overflow = 0;
- move32();
-#endif
-#endif
/*COMPLETE: some eDCT sub function are missing */
IF( EQ_16( length, L_FRAME32k ) )
@@ -456,22 +447,13 @@ void edct_16fx(
{
i2 = shl( i, 1 );
- L_tmp = L_mult( x[i2], edct_table[i] ); /*Q(Qx+16) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ L_tmp = L_mult( x[i2], edct_table[i] ); /*Q(Qx+16) */
Lacc = L_mac_sat( L_tmp, *px, *pt ); /*Q(Qx+16) */
re2[i] = round_fx_sat( L_shl_sat( Lacc, Q_edct ) ); /* Q(Qx+Q_edct) */
move16();
L_tmp = L_mult( *px, edct_table[i] ); /*Q(Qx+16) */
Lacc = L_msu_sat( L_tmp, x[i2], *pt ); /*Q(Qx+16) */
im2[i] = round_fx_sat( L_shl_sat( Lacc, Q_edct ) ); /* Q(Qx+Q_edct) */
-#else
- Lacc = L_mac_o( L_tmp, *px, *pt, &Overflow ); /*Q(Qx+16) */
- re2[i] = round_fx_o( L_shl_o( Lacc, Q_edct, &Overflow ), &Overflow ); /* Q(Qx+Q_edct) */
- move16();
- L_tmp = L_mult( *px, edct_table[i] ); /*Q(Qx+16) */
- Lacc = L_msu_o( L_tmp, x[i2], *pt, &Overflow ); /*Q(Qx+16) */
- im2[i] = round_fx_o( L_shl_o( Lacc, Q_edct, &Overflow ), &Overflow ); /* Q(Qx+Q_edct) */
-#endif
move16();
px -= 2;
pt--;
@@ -496,20 +478,12 @@ void edct_16fx(
fact = round_fx( L_shl( L_tmp, 2 ) ); /*Q15 */
FOR( i = 0; i < shr( length, 1 ); i++ )
{
- tmp = mult_r( im2[i], fact ); /*Q(Qx+Q_edct) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp = mult_r( im2[i], fact ); /*Q(Qx+Q_edct) */
re[i] = sub_sat( re2[i], tmp ); /*Q(Qx+Q_edct) */
-#else
- re[i] = sub_o( re2[i], tmp, &Overflow ); /*Q(Qx+Q_edct) */
-#endif
move16();
- tmp = mult_r( re2[i], fact ); /*Q(Qx+Q_edct) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp = mult_r( re2[i], fact ); /*Q(Qx+Q_edct) */
im[i] = add_sat( im2[i], tmp ); /*Q(Qx+Q_edct) */
-#else
- im[i] = add_o( im2[i], tmp, &Overflow ); /*Q(Qx+Q_edct) */
-#endif
move16();
}
@@ -520,8 +494,7 @@ void edct_16fx(
{
i2 = shl( i, 1 );
- L_tmp = L_mult( re[i], edct_table[i] ); /*Q(Qx+Q_edct+16) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ L_tmp = L_mult( re[i], edct_table[i] ); /*Q(Qx+Q_edct+16) */
Lacc = L_mac_sat( L_tmp, im[i], *pt ); /*Q(Qx+Q_edct+16) */
y[i2] = round_fx_sat( L_shr_sat( Lacc, Q_edct ) ); /* Q(Qx) */
move16();
@@ -529,15 +502,6 @@ void edct_16fx(
L_tmp = L_mult( re[i], edct_table[sub( shr( length, 1 ), add( 1, i ) )] ); /*Q(Qx+Q_edct+16) */
Lacc = L_msu( L_tmp, im[i], edct_table[i] ); /*Q(Qx+Q_edct+16) */
*py = round_fx_sat( L_shr_sat( Lacc, Q_edct ) ); /* Q(Qx) */
-#else
- Lacc = L_mac_o( L_tmp, im[i], *pt, &Overflow ); /*Q(Qx+Q_edct+16) */
- y[i2] = round_fx_o( L_shr_o( Lacc, Q_edct, &Overflow ), &Overflow ); /* Q(Qx) */
- move16();
-
- L_tmp = L_mult( re[i], edct_table[sub( shr( length, 1 ), add( 1, i ) )] ); /*Q(Qx+Q_edct+16) */
- Lacc = L_msu( L_tmp, im[i], edct_table[i] ); /*Q(Qx+Q_edct+16) */
- *py = round_fx_o( L_shr_o( Lacc, Q_edct, &Overflow ), &Overflow ); /* Q(Qx) */
-#endif
move16();
py -= 2;
@@ -603,7 +567,7 @@ void iedct_short_fx(
return;
}
-#define FAST_EDXT /* optimized FFT-based DCT/DST algorithm */
+
/*-------------------------------------------------------------------------*
* edxt_fx()
*
@@ -739,7 +703,6 @@ void edxt_fx(
move16();
}
-#ifdef FAST_EDXT
test();
IF( EQ_16( kernelType, MDST_II ) || EQ_16( kernelType, MDCT_II ) )
{
@@ -913,47 +876,11 @@ void edxt_fx(
}
}
}
-#endif
-#ifdef IVAS_FLOAT_FIXED_TO_BE_DONE
- ELSE
- /* TODO: below IF and ELSE blocks are unreachable, verified on code coverage report */
- IF( s_and( kernelType, 1 ) ) /* DST */
+ else
{
- const float offK = ( kernelType == MDST_II && synthesis ? 0.5f : 1.0f - 0.5f * ( kernelType >> 1 ) );
- const float offM = ( kernelType == MDST_II && synthesis ? 1.0f : 0.5f );
-
- FOR( k = 0; k < length; k++ )
- {
- y[k] = 0.f;
- FOR( m = 0; m < length; m++ )
- {
- y[k] += x[m] * sinf( pi_len * ( m + offM ) * ( k + offK ) );
- }
- }
- IF( offK == 1.f )
- {
- y[length - 1] *= 0.5f; /* scale Nyquist sample */
- }
+ assert( !"Unsupported Kernel type in edxt_fx()" );
}
- ELSE /* kernelType 0, 2: DCT */
- {
- const float offK = ( EQ_16( kernelType, MDCT_II ) && synthesis ? 0.5f : 0.5f - shr( shr( kernelType, 1 ), 1 ) );
- const float offM = ( EQ_16( kernelType, MDCT_II ) && synthesis ? 0.0f : 0.5f );
- FOR( k = 0; k < length; k++ )
- {
- y[k] = 0.f;
- FOR( m = 0; m < length; m++ )
- {
- y[k] += x[m] * cosf( pi_len * ( m + offM ) * ( k + offK ) );
- }
- }
- IF( offK == 0.f )
- {
- y[0] *= 0.5f; /* scale lowest (i.e. DC) sample */
- }
- }
-#endif // IVAS_FLOAT_FIXED_TO_BE_DONE
/*v_multc(y, (kernelType == MDCT_II ? -1.f : 1.f) * sqrtf(2.f / length), y, length);*/
fac = get_edxt_factor( length ); /* Q15 */
if ( EQ_16( kernelType, MDCT_II ) )
diff --git a/lib_com/env_stab_fx.c b/lib_com/env_stab_fx.c
index c988076951bf3ea1eb202f21f92a801d1dac72fe..728cfddb99c5f912971f07249f99dd70ae358d81 100644
--- a/lib_com/env_stab_fx.c
+++ b/lib_com/env_stab_fx.c
@@ -188,12 +188,7 @@ Word16 env_stab_smo_fx( /* Q0 */
Word16 maxval, pp[NUM_ENV_STAB_PLC_STATES], pa[NUM_ENV_STAB_PLC_STATES];
Word16 i;
Word16 tmp, sum, exp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
/* get previous state */
prev_state = maximum_fx( env_stab_state_p, NUM_ENV_STAB_PLC_STATES, &maxval );
@@ -229,11 +224,7 @@ Word16 env_stab_smo_fx( /* Q0 */
/*tmp = shl(tmp, add(exp, 1));*/ /* Q15 */
FOR( i = 0; i < NUM_ENV_STAB_PLC_STATES; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
env_stab_state_p[i] = round_fx_sat( L_shl_sat( L_mult_sat( env_stab_state_p[i], tmp ), add( exp, 1 ) ) ); /* Q15 */
-#else
- env_stab_state_p[i] = round_fx_o( L_shl_o( L_mult_o( env_stab_state_p[i], tmp, &Overflow ), add( exp, 1 ), &Overflow ), &Overflow ); /* Q15 */
-#endif
move16();
}
diff --git a/lib_com/fd_cng_com_fx.c b/lib_com/fd_cng_com_fx.c
index 6666f90914e42399d122a720c02380831add9e2c..47e3df91ea423c8419b251649ef145603c7f901a 100644
--- a/lib_com/fd_cng_com_fx.c
+++ b/lib_com/fd_cng_com_fx.c
@@ -648,12 +648,6 @@ void minimum_statistics(
Word16 msAlphaCorAlpha2;
Word16 msPeriodogSum16;
Word16 msNoiseFloor16;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
len2 = i_mult( MSNUMSUBFR, len );
@@ -752,11 +746,7 @@ void minimum_statistics(
/* use absolute value to avoid -1.0 x -1.0 multiplications */
s2 = norm_l( scalar2 );
}
-#ifdef ISSUE_1836_replace_overflow_libcom
scalar216 = round_fx_sat( L_shl( scalar2, s2 ) );
-#else
- scalar216 = round_fx_o( L_shl_o( scalar2, s2, &Overflow ), &Overflow );
-#endif
scalar2 = L_mult( scalar216, scalar216 );
/* find common exponent */
@@ -906,11 +896,7 @@ void minimum_statistics(
s2 = s_min( s2, WORD32_BITS - 1 );
/* beta: scaled by s2 */
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp16 = round_fx_sat( L_shl( tmp, s1 ) );
-#else
- tmp16 = round_fx_o( L_shl_o( tmp, s1, &Overflow ), &Overflow );
-#endif
beta = mult_r( tmp16, tmp16 );
/* scalar3: scaled by s3 */
@@ -998,13 +984,8 @@ void minimum_statistics(
move32();
/* exponent msCurrentMinSubWindow[j]: CNG_S */
BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef ISSUE_1836_replace_overflow_libcom
msCurrentMinSubWindow[j] = L_shl_sat( Mpy_32_32( scalar, msBminSubWin[j] ), 5 );
move32();
-#else
- msCurrentMinSubWindow[j] = L_shl_o( Mpy_32_32( scalar, msBminSubWin[j] ), 5, &Overflow );
- move32();
-#endif
BASOP_SATURATE_WARNING_ON_EVS;
}
}
@@ -1261,13 +1242,6 @@ void minimum_statistics_fx(
Word16 msAlphaCorAlpha2;
Word16 msPeriodogSum16;
Word16 msNoiseFloor16;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
len2 = i_mult( MSNUMSUBFR, len );
@@ -1366,11 +1340,7 @@ void minimum_statistics_fx(
/* use absolute value to avoid -1.0 x -1.0 multiplications */
s2 = norm_l( scalar2 );
}
-#ifdef ISSUE_1836_replace_overflow_libcom
scalar216 = round_fx_sat( L_shl( scalar2, s2 ) );
-#else
- scalar216 = round_fx_o( L_shl_o( scalar2, s2, &Overflow ), &Overflow );
-#endif
scalar2 = L_mult( scalar216, scalar216 );
/* find common exponent */
@@ -1527,11 +1497,7 @@ void minimum_statistics_fx(
s2 = s_min( s2, WORD32_BITS - 1 );
/* beta: scaled by s2 */
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp16 = round_fx_sat( L_shl( tmp, s1 ) );
-#else
- tmp16 = round_fx_o( L_shl_o( tmp, s1, &Overflow ), &Overflow );
-#endif
beta = mult_r( tmp16, tmp16 );
/* scalar3: scaled by s3 */
@@ -1619,11 +1585,7 @@ void minimum_statistics_fx(
move32();
/* exponent msCurrentMinSubWindow[j]: CNG_S */
BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef ISSUE_1836_replace_overflow_libcom
msCurrentMinSubWindow[j] = L_shl_sat( Mpy_32_32( scalar, msBminSubWin[j] ), 5 );
-#else
- msCurrentMinSubWindow[j] = L_shl_o( Mpy_32_32( scalar, msBminSubWin[j] ), 5, &Overflow );
-#endif
move32();
BASOP_SATURATE_WARNING_ON_EVS;
}
@@ -2308,13 +2270,6 @@ static void getmidbands(
)
{
Word16 j, max_psize, shift;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
max_psize = psize[0];
move16();
@@ -2347,11 +2302,7 @@ static void getmidbands(
move16();
FOR( j = 0; j < npart; j++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
psize_norm[j] = shl_sat( psize[j], shift ); // Q(15 - psize_norm_exp)
-#else
- psize_norm[j] = shl_o( psize[j], shift, &Overflow ); // Q(15 - psize_norm_exp)
-#endif
move16();
}
/* minimum_statistics needs fixed exponent of 6 */
@@ -3355,8 +3306,8 @@ void SynthesisSTFT_fx(
}
/* Get time-domain signal */
// v_multc(olapBuffer + hFdCngCom->frameSize / 4, (float)(hFdCngCom->fftlen / 2), timeDomainOutput, hFdCngCom->frameSize);
- v_multc_fixed( olapBuffer + hFdCngCom->frameSize / 4, fftScale, timeDomainOutput, hFdCngCom->frameSize ); // Q_in - 9
- /* Get excitation */
+ v_multc_fx( olapBuffer + hFdCngCom->frameSize / 4, fftScale, timeDomainOutput, hFdCngCom->frameSize ); // Q_in - 9
+ /* Get excitation */
test();
test();
IF( ( EQ_16( element_mode, IVAS_CPE_TD ) || EQ_16( element_mode, IVAS_CPE_DFT ) ) && EQ_16( nchan_out, 2 ) )
@@ -3367,12 +3318,12 @@ void SynthesisSTFT_fx(
move32();
}
// v_multc(buf, (float)(hFdCngCom->fftlen / 2), buf, M + 1 + hFdCngCom->frameSize);
- v_multc_fixed( buf_fx, fftScale, buf_fx, add( M + 1, hFdCngCom->frameSize ) );
+ v_multc_fx( buf_fx, fftScale, buf_fx, add( M + 1, hFdCngCom->frameSize ) );
}
ELSE
{
// v_multc(olapBuffer + hFdCngCom->frameSize / 4 - (M + 1), (float)(hFdCngCom->fftlen / 2), buf, M + 1 + hFdCngCom->frameSize);
- v_multc_fixed( olapBuffer + sub( shr( hFdCngCom->frameSize, 2 ), ( M + 1 ) ), fftScale, buf_fx, add( M + 1, hFdCngCom->frameSize ) );
+ v_multc_fx( olapBuffer + sub( shr( hFdCngCom->frameSize, 2 ), ( M + 1 ) ), fftScale, buf_fx, add( M + 1, hFdCngCom->frameSize ) );
}
tmp_fx = buf_fx[0];
@@ -3447,10 +3398,10 @@ void SynthesisSTFT_dirac_fx(
}
/* Get time-domain signal */
- v_multc_fixed( olapBuffer + shr( hFdCngCom->frameSize, 2 ), fftScale, timeDomainOutput, samples_out ); // Q_in - 9
+ v_multc_fx( olapBuffer + shr( hFdCngCom->frameSize, 2 ), fftScale, timeDomainOutput, samples_out ); // Q_in - 9
/* Get excitation */
- v_multc_fixed( olapBuffer + sub( shr( hFdCngCom->frameSize, 2 ), ( M + 1 ) ), fftScale, buf, add( M + 1, hFdCngCom->frameSize ) );
+ v_multc_fx( olapBuffer + sub( shr( hFdCngCom->frameSize, 2 ), ( M + 1 ) ), fftScale, buf, add( M + 1, hFdCngCom->frameSize ) );
tmp = buf[0];
move32();
preemph_ivas_fx( buf + 1, PREEMPH_FAC, M + hFdCngCom->frameSize, &tmp );
diff --git a/lib_com/fft_fx_evs.c b/lib_com/fft_fx_evs.c
index 221bdc533ad0a147d04d3109bbf49bf2e77debbe..cf27583ae412ffd9673dee345a76c4828cac4eae 100644
--- a/lib_com/fft_fx_evs.c
+++ b/lib_com/fft_fx_evs.c
@@ -1186,12 +1186,6 @@ static void fft5_32_16fx(
Word16 T1, To, T8, Tt, T9, Ts, Te, Tp, Th, Tn, T2, T3, T4, T5, T6, T7;
Word16 i0, i1, i2, i3, i4;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
i0 = Idx[0];
move16();
i1 = Idx[32];
@@ -1218,15 +1212,9 @@ static void fft5_32_16fx(
move16();
T6 = zRe[i3];
move16();
-#ifdef ISSUE_1836_replace_overflow_libcom
T7 = add_sat( T5, T6 );
T8 = add_sat( T4, T7 );
Tt = sub_sat( T5, T6 );
-#else
- T7 = add_o( T5, T6, &Overflow );
- T8 = add_o( T4, T7, &Overflow );
- Tt = sub_o( T5, T6, &Overflow );
-#endif
/* T9 = KP559016994 * (T4 - T7); */
L_tmp = Mult_32_16( KP559016994_16FX, sub_sat( T4, T7 ) ); // Q(16 +x)
T9 = round_fx_sat( L_tmp ); // Qx
@@ -1248,17 +1236,10 @@ static void fft5_32_16fx(
L_tmp = Mult_32_16( KP559016994_16FX, sub_sat( T4, T7 ) ); // Q(16 +x)
Tn = round_fx_sat( L_tmp ); // Qx
-#ifdef ISSUE_1836_replace_overflow_libcom
zRe[i0] = add_sat( T1, T8 );
move16();
zIm[i0] = add_sat( To, Tp );
move32();
-#else
- zRe[i0] = add_o( T1, T8, &Overflow );
- move16();
- zIm[i0] = add_o( To, Tp, &Overflow );
- move32();
-#endif
/*T2 = KP951056516*Te + KP587785252*Th; */
L_tmp = Mult_32_16( KP951056516_16FX, Te ); // Q(16 +x)
@@ -1275,7 +1256,6 @@ static void fft5_32_16fx(
T4 = add_sat( T9, T6 );
T5 = sub_sat( T6, T9 );
-#ifdef ISSUE_1836_replace_overflow_libcom
zRe[i3] = sub_sat( T4, T2 );
move32();
zRe[i1] = add_sat( T5, T3 );
@@ -1284,16 +1264,6 @@ static void fft5_32_16fx(
move32();
zRe[i4] = sub_sat( T5, T3 );
move32();
-#else
- zRe[i3] = sub_o( T4, T2, &Overflow );
- move32();
- zRe[i1] = add_o( T5, T3, &Overflow );
- move32();
- zRe[i2] = add_o( T4, T2, &Overflow );
- move32();
- zRe[i4] = sub_o( T5, T3, &Overflow );
- move32();
-#endif
/* T2 = KP951056516 * Ts + KP587785252 * Tt; */
L_tmp = Mult_32_16( KP951056516_16FX, Ts ); // Q(16 +x)
@@ -1700,12 +1670,6 @@ static void cftfsub_16fx(
{
Word16 j, j1, j2, j3, l;
Word16 x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
l = 2;
move16();
@@ -1758,7 +1722,6 @@ static void cftfsub_16fx(
{
FOR( j = 0; j < l; j += 2 )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
j1 = add_sat( j, l );
x0r = sub_sat( a[j], a[j1] );
x0i = sub_sat( a[j + 1], a[j1 + 1] );
@@ -1766,15 +1729,6 @@ static void cftfsub_16fx(
move16();
a[j + 1] = add_sat( a[j + 1], a[j1 + 1] );
move16();
-#else
- j1 = add_o( j, l, &Overflow );
- x0r = sub_o( a[j], a[j1], &Overflow );
- x0i = sub_o( a[j + 1], a[j1 + 1], &Overflow );
- a[j] = add_o( a[j], a[j1], &Overflow );
- move16();
- a[j + 1] = add_o( a[j + 1], a[j1 + 1], &Overflow );
- move16();
-#endif
a[j1] = x0r;
move16();
a[j1 + 1] = x0i;
@@ -1799,14 +1753,7 @@ static void cft1st_16fx(
Word16 x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
Word16 tmp;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-#ifdef ISSUE_1836_replace_overflow_libcom
x0r = add_sat( a[0], a[2] );
x0i = add_sat( a[1], a[3] );
x1r = sub_sat( a[0], a[2] );
@@ -1876,77 +1823,6 @@ static void cft1st_16fx(
move16();
k1 = 0;
move16();
-#else
- x0r = add_o( a[0], a[2], &Overflow );
- x0i = add_o( a[1], a[3], &Overflow );
- x1r = sub_o( a[0], a[2], &Overflow );
- x1i = sub_o( a[1], a[3], &Overflow );
- x2r = add_o( a[4], a[6], &Overflow );
- x2i = add_o( a[5], a[7], &Overflow );
- x3r = sub_o( a[4], a[6], &Overflow );
- x3i = sub_o( a[5], a[7], &Overflow );
- a[0] = add_o( x0r, x2r, &Overflow );
- move16();
- a[1] = add_o( x0i, x2i, &Overflow );
- move16();
- a[4] = sub_o( x0r, x2r, &Overflow );
- move16();
- a[5] = sub_o( x0i, x2i, &Overflow );
- move16();
- a[2] = sub_o( x1r, x3i, &Overflow );
- move16();
- a[3] = add_o( x1i, x3r, &Overflow );
- move16();
- a[6] = add_o( x1r, x3i, &Overflow );
- move16();
- a[7] = sub_o( x1i, x3r, &Overflow );
- wk1r = w[2];
- move32();
-
- x0r = add_o( a[8], a[10], &Overflow );
- x0i = add_o( a[9], a[11], &Overflow );
- x1r = sub_o( a[8], a[10], &Overflow );
- x1i = sub_o( a[9], a[11], &Overflow );
- x2r = add_o( a[12], a[14], &Overflow );
- x2i = add_o( a[13], a[15], &Overflow );
- x3r = sub_o( a[12], a[14], &Overflow );
- x3i = sub_o( a[13], a[15], &Overflow );
- a[8] = add_o( x0r, x2r, &Overflow );
- move16();
- a[9] = add_o( x0i, x2i, &Overflow );
- move16();
- a[12] = sub_o( x2i, x0i, &Overflow );
- move16();
- a[13] = sub_o( x0r, x2r, &Overflow );
- move16();
-
- x0r = sub_o( x1r, x3i, &Overflow );
- x0i = add_o( x1i, x3r, &Overflow );
- tmp = sub_o( x0r, x0i, &Overflow );
- L_tmp = Mult_32_16( wk1r, tmp ); /*Q(15+Qx+Q_edct) */
-
- a[10] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- tmp = add_o( x0r, x0i, &Overflow );
- L_tmp = Mult_32_16( wk1r, tmp ); /*Q(15+Qx+Q_edct) */
- a[11] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /* Q(Qx+Q_edct) */
- move16();
-
- x0r = add_o( x3i, x1r, &Overflow );
- x0i = sub_o( x3r, x1i, &Overflow );
- tmp = sub_o( x0i, x0r, &Overflow );
- L_tmp = Mult_32_16( wk1r, tmp ); /*Q(15+Qx+Q_edct) */
- a[14] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- tmp = add_o( x0i, x0r, &Overflow );
- L_tmp = Mult_32_16( wk1r, tmp ); /*Q(15+Qx+Q_edct) */
- a[15] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
- k1 = 0;
- move16();
-#endif
FOR( j = 16; j < n; j += 16 )
{
@@ -1967,7 +1843,7 @@ static void cft1st_16fx(
L_tmp = L_shl( Mult_32_32( wk2i, wk1r ), 1 ); /*Q29 */
wk3i = L_sub( L_shl( L_tmp, 1 ), wk1i ); /*Q30 */
-#ifdef ISSUE_1836_replace_overflow_libcom
+
x0r = add_sat( a[j], a[j + 2] );
x0i = add_sat( a[j + 1], a[j + 3] );
x1r = sub_sat( a[j], a[j + 2] );
@@ -2078,118 +1954,6 @@ static void cft1st_16fx(
L_tmp = Madd_32_16( L_tmp, wk3i, x0r ); /*Q(15+Qx+Q_edct) */
a[j + 15] = round_fx_sat( L_shl_sat( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
move16();
-#else
- x0r = add_o( a[j], a[j + 2], &Overflow );
- x0i = add_o( a[j + 1], a[j + 3], &Overflow );
- x1r = sub_o( a[j], a[j + 2], &Overflow );
- x1i = sub_o( a[j + 1], a[j + 3], &Overflow );
- x2r = add_o( a[j + 4], a[j + 6], &Overflow );
- x2i = add_o( a[j + 5], a[j + 7], &Overflow );
- x3r = sub_o( a[j + 4], a[j + 6], &Overflow );
- x3i = sub_o( a[j + 5], a[j + 7], &Overflow );
- a[j] = add_o( x0r, x2r, &Overflow );
- move16();
- a[j + 1] = add_o( x0i, x2i, &Overflow );
- move16();
-
- x0r = sub_o( x0r, x2r, &Overflow );
- x0i = sub_o( x0i, x2i, &Overflow );
- L_tmp = Mult_32_16( wk2r, x0r ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk2i, x0i ); /*Q(15+Qx+Q_edct) */
- a[j + 4] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- L_tmp = Mult_32_16( wk2r, x0i ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk2i, x0r ); /*Q(15+Qx+Q_edct) */
- a[j + 5] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- x0r = sub_o( x1r, x3i, &Overflow );
- x0i = add_o( x1i, x3r, &Overflow );
- L_tmp = Mult_32_16( wk1r, x0r ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk1i, x0i ); /*Q(15+Qx+Q_edct) */
- a[j + 2] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- L_tmp = Mult_32_16( wk1r, x0i ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk1i, x0r ); /*Q(15+Qx+Q_edct) */
- a[j + 3] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- x0r = add_o( x1r, x3i, &Overflow );
- x0i = sub_o( x1i, x3r, &Overflow );
- L_tmp = Mult_32_16( wk3r, x0r ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk3i, x0i ); /*Q(15+Qx+Q_edct) */
- a[j + 6] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- L_tmp = Mult_32_16( wk3r, x0i ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk3i, x0r ); /*Q(15+Qx+Q_edct) */
- a[j + 7] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- wk1r = w[k2 + 2];
- move32();
- wk1i = w[k2 + 3];
- move32();
- L_tmp = L_shl( Mult_32_32( wk2r, wk1i ), 1 ); /*Q29 */
- wk3r = L_sub( wk1r, L_shl( L_tmp, 1 ) ); /*Q30 */
-
- L_tmp = L_shl( Mult_32_32( wk2r, wk1r ), 1 ); /*Q29 */
- wk3i = L_sub( L_shl( L_tmp, 1 ), wk1i ); /*Q30 */
-
- x0r = add_o( a[j + 8], a[j + 10], &Overflow );
- x0i = add_o( a[j + 9], a[j + 11], &Overflow );
- x1r = sub_o( a[j + 8], a[j + 10], &Overflow );
- x1i = sub_o( a[j + 9], a[j + 11], &Overflow );
- x2r = add_o( a[j + 12], a[j + 14], &Overflow );
- x2i = add_o( a[j + 13], a[j + 15], &Overflow );
- x3r = sub_o( a[j + 12], a[j + 14], &Overflow );
- x3i = sub_o( a[j + 13], a[j + 15], &Overflow );
- a[j + 8] = add_o( x0r, x2r, &Overflow );
- move16();
- a[j + 9] = add_o( x0i, x2i, &Overflow );
- move16();
-
- x0r = sub_o( x0r, x2r, &Overflow );
- x0i = sub_o( x0i, x2i, &Overflow );
- tmp = negate( x0r );
- L_tmp = Mult_32_16( wk2i, tmp ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk2r, x0i ); /*Q(15+Qx+Q_edct) */
- a[j + 12] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- tmp = negate( x0i );
- L_tmp = Mult_32_16( wk2i, tmp ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk2r, x0r ); /*Q(15+Qx+Q_edct) */
- a[j + 13] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- x0r = sub_o( x1r, x3i, &Overflow );
- x0i = add_o( x1i, x3r, &Overflow );
- L_tmp = Mult_32_16( wk1r, x0r ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk1i, x0i ); /*Q(15+Qx+Q_edct) */
- a[j + 10] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- L_tmp = Mult_32_16( wk1r, x0i ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk1i, x0r ); /*Q(15+Qx+Q_edct) */
- a[j + 11] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- x0r = add_o( x1r, x3i, &Overflow );
- x0i = sub_o( x1i, x3r, &Overflow );
-
- L_tmp = Mult_32_16( wk3r, x0r ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk3i, x0i ); /*Q(15+Qx+Q_edct) */
- a[j + 14] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- L_tmp = Mult_32_16( wk3r, x0i ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk3i, x0r ); /*Q(15+Qx+Q_edct) */
- a[j + 15] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-#endif
}
return;
@@ -2212,16 +1976,10 @@ static void cftmdl_16fx(
Word16 tmp, tmp2;
Word32 L_tmp;
Word32 L_x0r, L_x0i;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
m = shl( l, 2 );
FOR( j = 0; j < l; j += 2 )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
j1 = add_sat( j, l );
j2 = add_sat( j1, l );
j3 = add_sat( j2, l );
@@ -2249,35 +2007,6 @@ static void cftmdl_16fx(
move16();
a[j3 + 1] = sub_sat( x1i, x3r );
move16();
-#else
- j1 = add_o( j, l, &Overflow );
- j2 = add_o( j1, l, &Overflow );
- j3 = add_o( j2, l, &Overflow );
- x0r = add_o( a[j], a[j1], &Overflow );
- x0i = add_o( a[j + 1], a[j1 + 1], &Overflow );
- x1r = sub_o( a[j], a[j1], &Overflow );
- x1i = sub_o( a[j + 1], a[j1 + 1], &Overflow );
- x2r = add_o( a[j2], a[j3], &Overflow );
- x2i = add_o( a[j2 + 1], a[j3 + 1], &Overflow );
- x3r = sub_o( a[j2], a[j3], &Overflow );
- x3i = sub_o( a[j2 + 1], a[j3 + 1], &Overflow );
- a[j] = add_o( x0r, x2r, &Overflow );
- move16();
- a[j + 1] = add_o( x0i, x2i, &Overflow );
- move16();
- a[j2] = sub_o( x0r, x2r, &Overflow );
- move16();
- a[j2 + 1] = sub_o( x0i, x2i, &Overflow );
- move16();
- a[j1] = sub_o( x1r, x3i, &Overflow );
- move16();
- a[j1 + 1] = add_o( x1i, x3r, &Overflow );
- move16();
- a[j3] = add_o( x1r, x3i, &Overflow );
- move16();
- a[j3 + 1] = sub_o( x1i, x3r, &Overflow );
- move16();
-#endif
}
wk1r = w[2];
@@ -2285,7 +2014,6 @@ static void cftmdl_16fx(
tmp2 = add( l, m );
FOR( j = m; j < tmp2; j += 2 )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
j1 = add_sat( j, l );
j2 = add_sat( j1, l );
j3 = add_sat( j2, l );
@@ -2329,51 +2057,6 @@ static void cftmdl_16fx(
L_tmp = Mult_32_16( wk1r, tmp ); /*Q(15+Qx+Q_edct) */
a[j3 + 1] = round_fx_sat( L_shl_sat( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
move16();
-#else
- j1 = add_o( j, l, &Overflow );
- j2 = add_o( j1, l, &Overflow );
- j3 = add_o( j2, l, &Overflow );
- x0r = add_o( a[j], a[j1], &Overflow );
- x0i = add_o( a[j + 1], a[j1 + 1], &Overflow );
- x1r = sub_o( a[j], a[j1], &Overflow );
- x1i = sub_o( a[j + 1], a[j1 + 1], &Overflow );
- x2r = add_o( a[j2], a[j3], &Overflow );
- x2i = add_o( a[j2 + 1], a[j3 + 1], &Overflow );
- x3r = sub_o( a[j2], a[j3], &Overflow );
- x3i = sub_o( a[j2 + 1], a[j3 + 1], &Overflow );
- a[j] = add_o( x0r, x2r, &Overflow );
- move16();
- a[j + 1] = add_o( x0i, x2i, &Overflow );
- move16();
- a[j2] = sub_o( x2i, x0i, &Overflow );
- move16();
- a[j2 + 1] = sub_o( x0r, x2r, &Overflow );
- move16();
-
- x0r = sub_o( x1r, x3i, &Overflow );
- x0i = add_o( x1i, x3r, &Overflow );
- tmp = sub_o( x0r, x0i, &Overflow );
- L_tmp = Mult_32_16( wk1r, tmp ); /*Q(15+Qx+Q_edct) */
- a[j1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- tmp = add_o( x0r, x0i, &Overflow );
- L_tmp = Mult_32_16( wk1r, tmp ); /*Q(15+Qx+Q_edct) */
- a[j1 + 1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- x0r = add_o( x3i, x1r, &Overflow );
- x0i = sub_o( x3r, x1i, &Overflow );
- tmp = sub_o( x0i, x0r, &Overflow );
- L_tmp = Mult_32_16( wk1r, tmp ); /*Q(15+Qx+Q_edct) */
- a[j3] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- tmp = add_o( x0i, x0r, &Overflow );
- L_tmp = Mult_32_16( wk1r, tmp ); /*Q(15+Qx+Q_edct) */
- a[j3 + 1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-#endif
}
k1 = 0;
@@ -2400,7 +2083,6 @@ static void cftmdl_16fx(
tmp2 = add( l, k );
FOR( j = k; j < tmp2; j += 2 )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
j1 = add_sat( j, l );
j2 = add_sat( j1, l );
j3 = add_sat( j2, l );
@@ -2456,87 +2138,21 @@ static void cftmdl_16fx(
L_tmp = Madd_32_16( L_tmp, wk3i, x0r ); /*Q(15+Qx+Q_edct) */
a[j3 + 1] = round_fx_sat( L_shl_sat( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
move16();
-#else
- j1 = add_o( j, l, &Overflow );
- j2 = add_o( j1, l, &Overflow );
- j3 = add_o( j2, l, &Overflow );
- x0r = add_o( a[j], a[j1], &Overflow );
- x0i = add_o( a[j + 1], a[j1 + 1], &Overflow );
- x1r = sub_o( a[j], a[j1], &Overflow );
- x1i = sub_o( a[j + 1], a[j1 + 1], &Overflow );
- x2r = add_o( a[j2], a[j3], &Overflow );
- x2i = add_o( a[j2 + 1], a[j3 + 1], &Overflow );
- x3r = sub_o( a[j2], a[j3], &Overflow );
- x3i = sub_o( a[j2 + 1], a[j3 + 1], &Overflow );
- a[j] = add_o( x0r, x2r, &Overflow );
- move16();
- a[j + 1] = add_o( x0i, x2i, &Overflow );
- move16();
-
- x0r = sub_o( x0r, x2r, &Overflow );
- x0i = sub_o( x0i, x2i, &Overflow );
-
- L_tmp = Mult_32_16( wk2r, x0r ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk2i, x0i ); /*Q(15+Qx+Q_edct) */
- a[j2] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- L_tmp = Mult_32_16( wk2r, x0i ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk2i, x0r ); /*Q(15+Qx+Q_edct) */
- a[j2 + 1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- x0r = sub_o( x1r, x3i, &Overflow );
- x0i = add_o( x1i, x3r, &Overflow );
-
- L_tmp = Mult_32_16( wk1r, x0r ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk1i, x0i ); /*Q(15+Qx+Q_edct) */
- a[j1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- L_tmp = Mult_32_16( wk1r, x0i ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk1i, x0r ); /*Q(15+Qx+Q_edct) */
- a[j1 + 1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- L_x0r = L_add( (Word32) x1r, (Word32) x3i );
- L_x0i = L_sub( (Word32) x1i, (Word32) x3r );
- x0r = extract_l( L_x0r );
- x0i = extract_l( L_x0i );
- L_tmp = Mult_32_16( wk3r, x0r ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk3i, x0i ); /*Q(15+Qx+Q_edct) */
- a[j3] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- L_tmp = Mult_32_16( wk3r, x0i ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk3i, x0r ); /*Q(15+Qx+Q_edct) */
- a[j3 + 1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-#endif
}
wk1r = w[k2 + 2];
move32();
wk1i = w[k2 + 3];
move32();
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shl_sat( Mult_32_32( wk2r, wk1i ), 1 ); /*Q29 */
wk3r = L_sub_sat( wk1r, L_shl_sat( L_tmp, 1 ) ); /*Q30 */
L_tmp = L_shl_sat( Mult_32_32( wk2r, wk1r ), 1 ); /*Q29 */
wk3i = L_sub_sat( L_shl_sat( L_tmp, 1 ), wk1i ); /*Q30 */
tmp2 = add( l, add( k, m ) );
-#else
- L_tmp = L_shl_o( Mult_32_32( wk2r, wk1i ), 1, &Overflow ); /*Q29 */
- wk3r = L_sub_o( wk1r, L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q30 */
- L_tmp = L_shl_o( Mult_32_32( wk2r, wk1r ), 1, &Overflow ); /*Q29 */
- wk3i = L_sub_o( L_shl_o( L_tmp, 1, &Overflow ), wk1i, &Overflow ); /*Q30 */
- tmp2 = add( l, add( k, m ) );
-#endif
FOR( j = add( k, m ); j < tmp2; j += 2 )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
j1 = add_sat( j, l );
j2 = add_sat( j1, l );
j3 = add_sat( j2, l );
@@ -2593,64 +2209,6 @@ static void cftmdl_16fx(
L_tmp = Madd_32_16( L_tmp, wk3i, x0r ); /*Q(15+Qx+Q_edct) */
a[j3 + 1] = round_fx_sat( L_shl_sat( L_tmp, 1 ) ); /*Q(Qx+Q_edct) */
move16();
-#else
- j1 = add_o( j, l, &Overflow );
- j2 = add_o( j1, l, &Overflow );
- j3 = add_o( j2, l, &Overflow );
- x0r = add_o( a[j], a[j1], &Overflow );
- x0i = add_o( a[j + 1], a[j1 + 1], &Overflow );
- x1r = sub_o( a[j], a[j1], &Overflow );
- x1i = sub_o( a[j + 1], a[j1 + 1], &Overflow );
- x2r = add_o( a[j2], a[j3], &Overflow );
- x2i = add_o( a[j2 + 1], a[j3 + 1], &Overflow );
- x3r = sub_o( a[j2], a[j3], &Overflow );
- x3i = sub_o( a[j2 + 1], a[j3 + 1], &Overflow );
- a[j] = add_o( x0r, x2r, &Overflow );
- move16();
- a[j + 1] = add_o( x0i, x2i, &Overflow );
- move16();
-
- x0r = sub_o( x0r, x2r, &Overflow );
- x0i = sub_o( x0i, x2i, &Overflow );
-
- tmp = negate( x0r );
- L_tmp = Mult_32_16( wk2i, tmp ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk2r, x0i ); /*Q(15+Qx+Q_edct) */
- a[j2] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- tmp = negate( x0i );
- L_tmp = Mult_32_16( wk2i, tmp ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk2r, x0r ); /*Q(15+Qx+Q_edct) */
- a[j2 + 1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- x0r = sub_o( x1r, x3i, &Overflow );
- x0i = add_o( x1i, x3r, &Overflow );
-
- L_tmp = Mult_32_16( wk1r, x0r ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk1i, x0i ); /*Q(15+Qx+Q_edct) */
- a[j1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- L_tmp = Mult_32_16( wk1r, x0i ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk1i, x0r ); /*Q(15+Qx+Q_edct) */
- a[j1 + 1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- x0r = add_o( x1r, x3i, &Overflow );
- x0i = sub_o( x1i, x3r, &Overflow );
-
- L_tmp = Mult_32_16( wk3r, x0r ); /*Q(15+Qx+Q_edct) */
- L_tmp = Msub_32_16( L_tmp, wk3i, x0i ); /*Q(15+Qx+Q_edct) */
- a[j3] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-
- L_tmp = Mult_32_16( wk3r, x0i ); /*Q(15+Qx+Q_edct) */
- L_tmp = Madd_32_16( L_tmp, wk3i, x0r ); /*Q(15+Qx+Q_edct) */
- a[j3 + 1] = round_fx_o( L_shl_o( L_tmp, 1, &Overflow ), &Overflow ); /*Q(Qx+Q_edct) */
- move16();
-#endif
}
}
diff --git a/lib_com/frame_ener_fx.c b/lib_com/frame_ener_fx.c
index 1e58dafac01444883e6be23556c91bed98984fe1..1ba05337caf20f13b8ad1494daf9aedb809cf03f 100644
--- a/lib_com/frame_ener_fx.c
+++ b/lib_com/frame_ener_fx.c
@@ -240,20 +240,9 @@ Word16 frame_energy_fx( /* o : Frame energy in Q8
const Word16 *pt1;
Word16 tmp16, exp1, exp2, tmp1, tmp2;
Word16 len, enern;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
/* len = (0.5f * (pitch[2]/64.0 + pitch[3]/64.0) + 0.5f) */
-#ifdef ISSUE_1836_replace_overflow_libcom
len = mult_r( add_sat( pitch[2], pitch[3] ), 256 );
-#else
- len = mult_r( add_o( pitch[2], pitch[3], &Overflow ), 256 );
-#endif
if ( LT_16( len, L_SUBFR ) )
{
@@ -283,29 +272,16 @@ Word16 frame_energy_fx( /* o : Frame energy in Q8
exp1 = sub( 15 + exp1, tmp2 );
/*add ld(2^exp1)=exp1 but check format, first*/
- tmp16 = sub( sub( 15, norm_s( exp1 ) ), 5 ); /*factor to shift Ltmp and exp1 with (shr) to avoid overflows when adding*/
-#ifdef ISSUE_1836_replace_overflow_libcom
- Ltmp = L_shr_sat( Ltmp, tmp16 ); /*Q25, tmp16*/
-#else
- Ltmp = L_shr_o( Ltmp, tmp16, &Overflow ); /*Q25, tmp16*/
-#endif
- exp2 = shr( exp1, tmp16 ); /*Q0 , tmp16*/
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp16 = sub( sub( 15, norm_s( exp1 ) ), 5 ); /*factor to shift Ltmp and exp1 with (shr) to avoid overflows when adding*/
+ Ltmp = L_shr_sat( Ltmp, tmp16 ); /*Q25, tmp16*/
+ exp2 = shr( exp1, tmp16 ); /*Q0 , tmp16*/
Ltmp = L_add_sat( Ltmp, L_shl( L_deposit_l( exp2 ), 25 ) ); /*Q25, tmp16, normalized*/
-#else
- Ltmp = L_add_o( Ltmp, L_shl( L_deposit_l( exp2 ), 25 ), &Overflow ); /*Q25, tmp16, normalized*/
-#endif
/*make 10*log10 out of log2*/
- Ltmp = Mpy_32_16_1( Ltmp, LG10 ); /*Q25,tmp16 * Q13 = Q23, tmp16*/
-#ifdef ISSUE_1836_replace_overflow_libcom
+ Ltmp = Mpy_32_16_1( Ltmp, LG10 ); /*Q25,tmp16 * Q13 = Q23, tmp16*/
*frame_ener = extract_h( L_shl_sat( Ltmp, add( tmp16, 1 ) ) ); /*Q8*/
move16();
enern = sub_sat( *frame_ener, lp_speech ); /*Q8*/
-#else
- *frame_ener = extract_h( L_shl_o( Ltmp, add( tmp16, 1 ), &Overflow ) ); /*Q8*/
- move16();
- enern = sub_o( *frame_ener, lp_speech, &Overflow ); /*Q8*/
-#endif
+
return enern;
}
diff --git a/lib_com/get_gain_fx.c b/lib_com/get_gain_fx.c
index 187339bf14b453c4115ef803c3622a271da8a4f5..69d18b600c2396544fa6e013dfc246dcbc442936 100644
--- a/lib_com/get_gain_fx.c
+++ b/lib_com/get_gain_fx.c
@@ -53,18 +53,10 @@ Word32 get_gain( /* output: codebook gain (adaptive or fixed)
{
Word32 tcorr, tener, Lgain;
Word16 exp_c, exp_e, exp, tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
tcorr = L_deposit_l( 0 );
tener = L_deposit_l( 0 );
-
/*----------------------------------------------------------------*
* Find gain based on inter-correlation product
*----------------------------------------------------------------*/
@@ -72,13 +64,8 @@ Word32 get_gain( /* output: codebook gain (adaptive or fixed)
tcorr = Dot_product16HQ( 0, x, y, n, &exp_c );
tener = Dot_productSq16HQ( 0, y, n, &exp_e );
-#ifdef ISSUE_1836_replace_overflow_libcom
BASOP_Util_Divide_MantExp( round_fx_sat( tcorr ), exp_c, s_max( round_fx_sat( tener ), 1 ), exp_e, &tmp, &exp );
Lgain = L_shl_sat( L_deposit_l( tmp ) /*Q15*/, add( 1, exp ) ) /*Q16*/; //?sat
-#else
- BASOP_Util_Divide_MantExp( round_fx_o( tcorr, &Overflow ), exp_c, s_max( round_fx_o( tener, &Overflow ), 1 ), exp_e, &tmp, &exp );
- Lgain = L_shl_o( L_deposit_l( tmp ) /*Q15*/, add( 1, exp ), &Overflow ) /*Q16*/;
-#endif
return Lgain;
}
@@ -91,12 +78,6 @@ Word32 get_gain2( /* output: codebook gain (adaptive or fixed)
{
Word32 tcorr, tener, Lgain;
Word16 m_corr, m_ener, negative, Q_corr, Q_ener;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
negative = 0;
move16();
@@ -139,17 +120,12 @@ Word32 get_gain2( /* output: codebook gain (adaptive or fixed)
Q_corr = sub( Q_corr, Q_ener );
-#ifdef ISSUE_1836_replace_overflow_libcom
Lgain = L_shl_sat( L_deposit_l( m_corr ), add( Q_corr, 1 ) ); /* Lgain in Q16 */
-#else
- Lgain = L_shl_o( L_deposit_l( m_corr ), add( Q_corr, 1 ), &Overflow ); /* Lgain in Q16 */
-#endif
if ( negative != 0 )
{
Lgain = L_negate( Lgain ); /* Lgain in Q16 */
}
-
return Lgain;
}
diff --git a/lib_com/gs_bitallocation_fx.c b/lib_com/gs_bitallocation_fx.c
index 59917f42cd3f464c94c1e40828518ba8b2b08440..a4ebbe2d576bfff7fbae1da65888ab369b3d8fb9 100644
--- a/lib_com/gs_bitallocation_fx.c
+++ b/lib_com/gs_bitallocation_fx.c
@@ -77,11 +77,7 @@ void bands_and_bit_alloc_fx(
Word16 w_sum_bit;
(void) GSC_IVAS_mode;
(void) element_mode;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
+
nb_tot_bands = MBANDS_GN;
move16();
if ( EQ_16( L_frame, L_FRAME16k ) )
@@ -95,12 +91,8 @@ void bands_and_bit_alloc_fx(
set16_fx( out_bits_per_bands, 0, MBANDS_GN_BITALLOC16k );
/* To adapt current energy band to PVQ freq band for sorting*/
-#ifdef ISSUE_1836_replace_overflow_libcom
ener_vec[0] = add_sat( Ener_per_bd_iQ[0], Ener_per_bd_iQ[1] ); /*Q12 */
-#else
- ener_vec[0] = add_o( Ener_per_bd_iQ[0], Ener_per_bd_iQ[1], &Overflow ); /*Q12 */
-#endif
- Copy( Ener_per_bd_iQ_tmp + 1, ener_vec, MBANDS_GN - 1 ); /*Q12 */
+ Copy( Ener_per_bd_iQ_tmp + 1, ener_vec, MBANDS_GN - 1 ); /*Q12 */
ener_vec[MBANDS_GN - 1] = ener_vec[MBANDS_GN - 2];
move16();
IF( EQ_16( L_frame, L_FRAME16k ) )
diff --git a/lib_com/gs_bitallocation_ivas_fx.c b/lib_com/gs_bitallocation_ivas_fx.c
index 828d7933d88c0bd83373a22b1a85f50dc954664e..2223c0f8f0a5d2fb2f8752a563100ae6f7fd94b4 100644
--- a/lib_com/gs_bitallocation_ivas_fx.c
+++ b/lib_com/gs_bitallocation_ivas_fx.c
@@ -92,7 +92,6 @@ void bands_and_bit_alloc_ivas_fx(
const Word16 GSC_IVAS_mode /* i : GSC IVAS mode */
)
{
-
Word16 bandoffset, i, j, nb_bands_max, bit_new_bands, bit_tmp, st_band, nb_bands;
Word16 ener_vec[MBANDS_GN_BITALLOC16k]; /*Q12 */
Word16 nb_tot_bands = 16;
@@ -106,11 +105,7 @@ void bands_and_bit_alloc_ivas_fx(
Word32 bits_per_bands[MBANDS_GN_BITALLOC16k]; /* Q18 */
Word16 w_sum_bit;
Word16 fzero_val;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
+
nb_tot_bands = MBANDS_GN;
move16();
if ( EQ_16( L_frame, L_FRAME16k ) )
@@ -123,11 +118,7 @@ void bands_and_bit_alloc_ivas_fx(
set16_fx( out_bits_per_bands, 0, MBANDS_GN_BITALLOC16k );
/* To adapt current energy band to PVQ freq band for sorting*/
-#ifdef ISSUE_1836_replace_overflow_libcom
ener_vec[0] = add_sat( Ener_per_bd_iQ[0], Ener_per_bd_iQ[1] ); /*Q12 */
-#else
- ener_vec[0] = add_o( Ener_per_bd_iQ[0], Ener_per_bd_iQ[1], &Overflow ); /*Q12 */
-#endif
move16();
Copy( Ener_per_bd_iQ + 1, ener_vec, MBANDS_GN - 1 ); /*Q12 */
ener_vec[MBANDS_GN - 1] = ener_vec[MBANDS_GN - 2];
diff --git a/lib_com/gs_gains_fx.c b/lib_com/gs_gains_fx.c
index 7f2cb7e63041dacfa43e2e7d95306083f7bcbbc0..860ed90b0985c9981c63008925521e3191efea1d 100644
--- a/lib_com/gs_gains_fx.c
+++ b/lib_com/gs_gains_fx.c
@@ -84,12 +84,6 @@ void Comp_and_apply_gain_fx(
Word16 y_gain;
Word16 L16, frac, exp1, tmp_exp;
Word32 L32;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* Recreate excitation for local synthesis and decoder */
StartBin = 0;
@@ -110,15 +104,9 @@ void Comp_and_apply_gain_fx(
FOR( i = StartBin; i < NB_Qbins + StartBin; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L32 = L_shl_sat( L_mult( exc_diffQ[i], y_gain ), tmp_exp ); /*Q_exc+16 */
exc_diffQ[i] = round_fx_sat( L32 ); /*Q_exc */
move16();
-#else
- L32 = L_shl_o( L_mult( exc_diffQ[i], y_gain ), tmp_exp, &Overflow ); /*Q_exc+16 */
- exc_diffQ[i] = round_fx_o( L32, &Overflow ); /*Q_exc */
- move16();
-#endif
}
}
ELSE
@@ -134,22 +122,14 @@ void Comp_and_apply_gain_fx(
y_gain = extract_l( Pow2( 14, frac ) ); /* Put 14 as exponent so that */
/* output of Pow2() will be: */
/* 16384 < Pow2() <= 32767 */
-#ifdef ISSUE_1836_replace_overflow_libcom
Ener_per_bd_yQ[i_band] = shl_sat( y_gain, sub( exp1, 13 ) );
-#else
- Ener_per_bd_yQ[i_band] = shl_o( y_gain, sub( exp1, 13 ), &Overflow );
-#endif
move16(); /*Q1 */
tmp_exp = add( add( exp1, 1 ), sub( Q_exc, Qexc_diff ) );
FOR( i = StartBin; i < NB_Qbins + StartBin; i++ )
{
- L32 = L_mult( exc_diffQ[i], y_gain ); /*Qexc_diff+15 */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ L32 = L_mult( exc_diffQ[i], y_gain ); /*Qexc_diff+15 */
exc_diffQ[i] = round_fx_sat( L_shl_sat( L32, tmp_exp ) ); /*Q_exc */
-#else
- exc_diffQ[i] = round_fx_o( L_shl_o( L32, tmp_exp, &Overflow ), &Overflow ); /*Q_exc */
-#endif
move16();
}
}
@@ -173,12 +153,6 @@ void Comp_and_apply_gain_ivas_fx(
Word16 L16, frac, exp1, tmp_exp;
Word32 L32;
Word16 Q_exc_diffQ[L_FRAME16k];
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* Recreate excitation for local synthesis and decoder */
StartBin = 0;
@@ -200,11 +174,7 @@ void Comp_and_apply_gain_ivas_fx(
FOR( i = StartBin; i < NB_Qbins + StartBin; i++ )
{
L32 = L_mult( exc_diffQ[i], y_gain ); /*Q_exc+16-tmp_exp */
-#ifdef ISSUE_1836_replace_overflow_libcom
- exc_diffQ[i] = round_fx_sat( L32 ); /*Q_exc-tmp_exp */
-#else
- exc_diffQ[i] = round_fx_o( L32, &Overflow ); /*Q_exc-tmp_exp */
-#endif
+ exc_diffQ[i] = round_fx_sat( L32 ); /*Q_exc-tmp_exp */
move16();
IF( exc_diffQ[i] )
{
@@ -230,22 +200,14 @@ void Comp_and_apply_gain_ivas_fx(
y_gain = extract_l( Pow2( 14, frac ) ); /* Put 14 as exponent so that */
/* output of Pow2() will be: */
/* 16384 < Pow2() <= 32767 */
-#ifdef ISSUE_1836_replace_overflow_libcom
- Ener_per_bd_yQ[i_band] = shl_sat( y_gain, sub( exp1, 13 ) ); /*Q13*/
-#else
- Ener_per_bd_yQ[i_band] = shl_o( y_gain, sub( exp1, 13 ), &Overflow ); /*Q13*/
-#endif
- move16(); /*Q1 */
+ Ener_per_bd_yQ[i_band] = shl_sat( y_gain, sub( exp1, 13 ) ); /*Q13*/
+ move16(); /*Q1 */
tmp_exp = add( add( exp1, 1 ), sub( *Q_exc, Qexc_diff ) );
FOR( i = StartBin; i < NB_Qbins + StartBin; i++ )
{
L32 = L_mult( exc_diffQ[i], y_gain ); /*Qexc_diff+15 */
-#ifdef ISSUE_1836_replace_overflow_libcom
- exc_diffQ[i] = round_fx_sat( L32 ); /*Q_exc-tmp_exp */
-#else
- exc_diffQ[i] = round_fx_o( L32, &Overflow ); /*Q_exc-tmp_exp */
-#endif
+ exc_diffQ[i] = round_fx_sat( L32 ); /*Q_exc-tmp_exp */
move16();
IF( exc_diffQ[i] )
{
diff --git a/lib_com/gs_noisefill_fx.c b/lib_com/gs_noisefill_fx.c
index 5b8c545410e71759371c36ee4bca56fdfdd0a689..2617bd5cec5817820e103de88e90af511f35e150 100644
--- a/lib_com/gs_noisefill_fx.c
+++ b/lib_com/gs_noisefill_fx.c
@@ -411,12 +411,6 @@ static void Decreas_freqPeak_fx(
Word16 lsf_new_diff[M];
Word16 tmp, tmp1, exp;
Word16 tmp2;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
move16(); /*ptr init*/
lsf_new_diff[0] = 0; /* prevent unitialized value */
move16();
@@ -474,13 +468,9 @@ static void Decreas_freqPeak_fx(
exp = norm_s( max_val );
tmp1 = div_s( shl( 1, sub( 14, exp ) ), max_val ); /*Q(29 - exp - Q_exc) */
L_tmp = L_mult( tmp, tmp1 ); /*Q(30 - exp) */
-#ifdef ISSUE_1836_replace_overflow_libcom
- tmp = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q14 */
-#else
- tmp = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /*Q14 */
-#endif
- tmp = sub( 32767, tmp ); /*Q14 */
- L_tmp = L_mult( avrg, tmp ); /*Q_exc +15 */
+ tmp = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q14 */
+ tmp = sub( 32767, tmp ); /*Q14 */
+ L_tmp = L_mult( avrg, tmp ); /*Q_exc +15 */
tmp = round_fx( L_shl( L_tmp, 1 ) );
tmp1 = negate( tmp );
@@ -534,12 +524,6 @@ static void envelop_modify_fx(
Word16 weight_fx;
Word32 L_exc_diffQ_fx[L_FRAME16k], exc_diffQ_max;
Word16 Q_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
start_band = i_mult( last_bin, 16 );
end_band = L_FRAME;
@@ -573,11 +557,7 @@ static void envelop_modify_fx(
/* output of Pow2() will be: */
/* 16384 < Pow2() <= 32767 */
exp = sub( exp, 14 );
-#ifdef ISSUE_1836_replace_overflow_libcom
Ener1_fx = mult_r( 13107, shl_sat( tmp, exp ) ); /*Q0 */
-#else
- Ener1_fx = mult_ro( 13107, shl_o( tmp, exp, &Overflow ), &Overflow ); /*Q0 */
-#endif
FOR( j = 0; j < 16; j++ )
{
@@ -603,11 +583,7 @@ static void envelop_modify_fx(
/* output of Pow2() will be: */
/* 16384 < Pow2() <= 32767 */
exp = sub( exp, 14 );
-#ifdef ISSUE_1836_replace_overflow_libcom
Ener1_fx = mult_r( 13107, shl_sat( tmp, exp ) ); /*Q0 */
-#else
- Ener1_fx = mult_r( 13107, shl_o( tmp, exp, &Overflow ) ); /*Q0 */
-#endif
src_fx = &exc_diffQ_fx[224];
FOR( j = 0; j < 32; j++ )
@@ -706,12 +682,6 @@ void highband_exc_dct_in_fx(
Word16 frac, exp, tmp1;
Word16 tmp2;
Word16 *end, Q_hb_exc;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
FOR( j = 10; j < MBANDS_GN; j++ )
{
@@ -726,15 +696,9 @@ void highband_exc_dct_in_fx(
/* output of Pow2() will be: */
/* 16384 < Pow2() <= 32767 */
exp = sub( exp, 14 );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp1 = shl_sat( tmp, exp );
move16();
ener = add_sat( tmp1, ener ); /*Q0 */
-#else
- tmp1 = shl_o( tmp, exp, &Overflow );
- move16();
- ener = add_o( tmp1, ener, &Overflow ); /*Q0 */
-#endif
}
test();
@@ -963,14 +927,10 @@ void highband_exc_dct_in_fx(
FOR( i = sub( L_FRAME, 16 ); i < L_FRAME; i++ )
{
/*exc_dct_in[i] *= (0.067f*i-15.f); */
- tmp = mult_r( 17564, shl( i, 6 ) ); /*0.067 in Q18 and i in Q6= Q9 */
- tmp = sub( tmp, 7680 ); /*15 in Q9 = Q9 */
- L_tmp = L_mult( exc_dct_in[i], tmp ); /*Q(Q_exc+10) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp = mult_r( 17564, shl( i, 6 ) ); /*0.067 in Q18 and i in Q6= Q9 */
+ tmp = sub( tmp, 7680 ); /*15 in Q9 = Q9 */
+ L_tmp = L_mult( exc_dct_in[i], tmp ); /*Q(Q_exc+10) */
exc_dct_in[i] = round_fx_sat( L_shl_sat( L_tmp, 6 ) ); /*Q_exc */
-#else
- exc_dct_in[i] = round_fx_o( L_shl_o( L_tmp, 6, &Overflow ), &Overflow ); /*Q_exc */
-#endif
}
}
@@ -1005,15 +965,9 @@ void highband_exc_dct_in_fx(
IF( GT_16( tmp, abs_s( *dst ) ) )
{
tmp2 = *src;
-#ifdef ISSUE_1836_replace_overflow_libcom
*src = mult_r( 16384, sub_sat( *src, abs_s( *dst ) ) ); /*Q_exc */
move16();
tmp = mult_r( 16384, add_sat( tmp2, abs_s( *dst ) ) ); /*Q_exc */
-#else
- *src = mult_r( 16384, sub_o( *src, abs_s( *dst ), &Overflow ) ); /*Q_exc */
- move16();
- tmp = mult_r( 16384, add_o( tmp2, abs_s( *dst ), &Overflow ) ); /*Q_exc */
-#endif
if ( tmp2 > 0 )
{
*src = tmp;
@@ -1102,12 +1056,6 @@ void highband_exc_dct_in_ivas_fx(
Word16 frac, exp, tmp1;
Word16 tmp2;
Word16 *end, Q_hb_exc;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
FOR( j = 10; j < MBANDS_GN; j++ )
{
@@ -1122,15 +1070,9 @@ void highband_exc_dct_in_ivas_fx(
/* output of Pow2() will be: */
/* 16384 < Pow2() <= 32767 */
exp = sub( exp, 14 );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp1 = shl_sat( tmp, exp );
move16();
ener = add_sat( tmp1, ener ); /*Q0 */
-#else
- tmp1 = shl_o( tmp, exp, &Overflow );
- move16();
- ener = add_o( tmp1, ener, &Overflow ); /*Q0 */
-#endif
}
test();
@@ -1474,14 +1416,10 @@ void highband_exc_dct_in_ivas_fx(
FOR( i = sub( L_FRAME, 16 ); i < L_FRAME; i++ )
{
/*exc_dct_in[i] *= (0.067f*i-15.f); */
- tmp = mult_r( 17564, shl( i, 6 ) ); /*0.067 in Q18 and i in Q6= Q9 */
- tmp = sub( tmp, 7680 ); /*15 in Q9 = Q9 */
- L_tmp = L_mult( exc_dct_in[i], tmp ); /*Q(Q_exc+10) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp = mult_r( 17564, shl( i, 6 ) ); /*0.067 in Q18 and i in Q6= Q9 */
+ tmp = sub( tmp, 7680 ); /*15 in Q9 = Q9 */
+ L_tmp = L_mult( exc_dct_in[i], tmp ); /*Q(Q_exc+10) */
exc_dct_in[i] = round_fx_sat( L_shl_sat( L_tmp, 6 ) ); /*Q_exc */
-#else
- exc_dct_in[i] = round_fx_o( L_shl_o( L_tmp, 6, &Overflow ), &Overflow ); /*Q_exc */
-#endif
}
}
@@ -1516,15 +1454,9 @@ void highband_exc_dct_in_ivas_fx(
IF( GT_16( tmp, abs_s( *dst ) ) )
{
tmp2 = *src;
-#ifdef ISSUE_1836_replace_overflow_libcom
*src = mult_r( 16384, sub_sat( *src, abs_s( *dst ) ) ); /*Q_exc */
move16();
tmp = mult_r( 16384, add_sat( tmp2, abs_s( *dst ) ) ); /*Q_exc */
-#else
- *src = mult_r( 16384, sub_o( *src, abs_s( *dst ), &Overflow ) ); /*Q_exc */
- move16();
- tmp = mult_r( 16384, add_o( tmp2, abs_s( *dst ), &Overflow ) ); /*Q_exc */
-#endif
IF( tmp2 > 0 )
{
*src = tmp;
diff --git a/lib_com/hp50_fx.c b/lib_com/hp50_fx.c
index 9d6f10ed2533a1b6c8028e3851235b18ae91e63f..1586bc252a2fec277b72b75bd4c19eb1257c7159 100644
--- a/lib_com/hp50_fx.c
+++ b/lib_com/hp50_fx.c
@@ -86,12 +86,6 @@ static void filter_2nd_order(
Word16 i;
Word16 x2, x1;
Word32 L_sum, L_y1, L_y2;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-
/*
* Saturation: The states of the filter, namely L_y1 and L_y2 shall
@@ -109,17 +103,10 @@ static void filter_2nd_order(
L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( mem[0], a2 ) ); /* y2*a2 */
L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( mem[1], a1 ) ); /* y1*a1 */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_y2 = L_shl_sat( L_sum, HP20_COEFF_SCALE );
BASOP_SATURATE_ERROR_OFF_EVS
BASOP_SATURATE_WARNING_OFF_EVS
signal[0] = round_fx_sat( L_shl_sat( L_y2, prescale ) );
-#else
- L_y2 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
- BASOP_SATURATE_ERROR_OFF_EVS
- BASOP_SATURATE_WARNING_OFF_EVS
- signal[0] = round_fx_o( L_shl_o( L_y2, prescale, &Overflow ), &Overflow );
-#endif
BASOP_SATURATE_WARNING_ON_EVS
@@ -131,17 +118,10 @@ static void filter_2nd_order(
L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( mem[1], a2 ) ); /* y2*a2 */
L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y2, a1 ) ); /* y1*a1 */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_y1 = L_shl_sat( L_sum, HP20_COEFF_SCALE );
BASOP_SATURATE_ERROR_OFF_EVS
BASOP_SATURATE_WARNING_OFF_EVS
signal[stride] = round_fx_sat( L_shl_sat( L_y1, prescale ) );
-#else
- L_y1 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
- BASOP_SATURATE_ERROR_OFF_EVS
- BASOP_SATURATE_WARNING_OFF_EVS
- signal[stride] = round_fx_o( L_shl_o( L_y1, prescale, &Overflow ), &Overflow );
-#endif
BASOP_SATURATE_WARNING_ON_EVS
move16();
@@ -157,17 +137,10 @@ static void filter_2nd_order(
L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y2, a2 ) );
L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y1, a1 ) );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_y2 = L_shl_sat( L_sum, HP20_COEFF_SCALE );
BASOP_SATURATE_ERROR_OFF_EVS
BASOP_SATURATE_WARNING_OFF_EVS
signal[i_mult( i, stride )] = round_fx_sat( L_shl_sat( L_y2, prescale ) );
-#else
- L_y2 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
- BASOP_SATURATE_ERROR_OFF_EVS
- BASOP_SATURATE_WARNING_OFF_EVS
- signal[i_mult( i, stride )] = round_fx_o( L_shl_o( L_y2, prescale, &Overflow ), &Overflow );
-#endif
BASOP_SATURATE_WARNING_ON_EVS
/* y[i+1] = b2*x[i-1] + b1*x[i-0] + b2*x[i+1] + a2*y[i-1] + a1*y[i+0]; */
BASOP_SATURATE_ERROR_ON_EVS
@@ -178,17 +151,10 @@ static void filter_2nd_order(
L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y1, a2 ) );
L_sum = L_add( L_sum, HP50_Mpy_32_32_fix( L_y2, a1 ) );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_y1 = L_shl_sat( L_sum, HP20_COEFF_SCALE );
BASOP_SATURATE_ERROR_OFF_EVS
BASOP_SATURATE_WARNING_OFF_EVS
signal[i_mult( add( i, 1 ), stride )] = round_fx_sat( L_shl_sat( L_y1, prescale ) );
-#else
- L_y1 = L_shl_o( L_sum, HP20_COEFF_SCALE, &Overflow );
- BASOP_SATURATE_ERROR_OFF_EVS
- BASOP_SATURATE_WARNING_OFF_EVS
- signal[i_mult( add( i, 1 ), stride )] = round_fx_o( L_shl_o( L_y1, prescale, &Overflow ), &Overflow );
-#endif
BASOP_SATURATE_WARNING_ON_EVS
move16();
}
@@ -221,12 +187,6 @@ void hp20( Word16 signal[], /* i/o: signal to filter any *
{
Word32 a1, b1, a2, b2;
Word16 prescale, prescaleOld, diff;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-
prescale = getScaleFactor16( signal, lg );
prescaleOld = extract_l( mem[4] );
@@ -235,11 +195,7 @@ void hp20( Word16 signal[], /* i/o: signal to filter any *
{
prescale = s_min( prescale, diff );
}
-#ifdef ISSUE_1836_replace_overflow_libcom
diff = norm_l( L_shl_sat( mem[3], prescaleOld ) );
-#else
- diff = norm_l( L_shl_o( mem[3], prescaleOld, &Overflow ) );
-#endif
if ( mem[3] != 0 )
{
prescale = s_min( prescale, diff );
@@ -249,7 +205,6 @@ void hp20( Word16 signal[], /* i/o: signal to filter any *
IF( prescale != prescaleOld )
{
diff = sub( prescale, prescaleOld );
-#ifdef ISSUE_1836_replace_overflow_libcom
mem[0] = L_shr_sat( mem[0], diff );
move32();
mem[1] = L_shr_sat( mem[1], diff );
@@ -257,15 +212,6 @@ void hp20( Word16 signal[], /* i/o: signal to filter any *
mem[2] = L_shr_sat( mem[2], diff );
move32();
mem[3] = L_shr_sat( mem[3], diff ); //?sat
-#else
- mem[0] = L_shr_o( mem[0], diff, &Overflow );
- move32();
- mem[1] = L_shr_o( mem[1], diff, &Overflow );
- move32();
- mem[2] = L_shr_o( mem[2], diff, &Overflow );
- move32();
- mem[3] = L_shr_o( mem[3], diff, &Overflow );
-#endif
move32();
mem[4] = L_deposit_l( prescale );
}
@@ -340,7 +286,6 @@ void hp20( Word16 signal[], /* i/o: signal to filter any *
}
-#ifdef HP20_FIX32_RECODING
void hp20_fx_32_opt(
Word32 signal_fx[],
const Word16 lg,
@@ -378,17 +323,10 @@ void hp20_fx_32_opt(
}
diff = sub( prescale, prescaleOld );
-#ifdef ISSUE_1836_replace_overflow_libcom
mem_fx[0] = L_shr_sat( mem_fx[0], diff );
mem_fx[1] = L_shr_sat( mem_fx[1], diff );
mem_fx[2] = L_shr_sat( mem_fx[2], diff );
mem_fx[3] = L_shr_sat( mem_fx[3], diff );
-#else
- mem_fx[0] = L_shr_o( mem_fx[0], diff, &Overflow );
- mem_fx[1] = L_shr_o( mem_fx[1], diff, &Overflow );
- mem_fx[2] = L_shr_o( mem_fx[2], diff, &Overflow );
- mem_fx[3] = L_shr_o( mem_fx[3], diff, &Overflow );
-#endif
move32();
move32();
move32();
@@ -509,7 +447,8 @@ void hp20_fx_32_opt(
return;
}
-#endif
+
+
void hp20_fx_32(
Word32 signal_fx[],
const Word16 lg,
diff --git a/lib_com/hq2_bit_alloc_fx.c b/lib_com/hq2_bit_alloc_fx.c
index 868617b84d4ec48060a84489d7e8083584a7d995..0f097b669510a450f8ecbd9de929eb230908036a 100644
--- a/lib_com/hq2_bit_alloc_fx.c
+++ b/lib_com/hq2_bit_alloc_fx.c
@@ -312,12 +312,6 @@ void hq2_bit_alloc_har_fx(
Word16 exp_shift;
-#ifndef ISSUE_1836_replace_overflow_libcom
- Flag Overflow;
- Overflow = 0;
- move32();
-#endif
-
L_THR1 = L_shl( L_deposit_l( THR1 ), SWB_BWE_LR_QRk );
L_THR2 = L_shl( L_deposit_l( THR2 ), SWB_BWE_LR_QRk );
L_THR3 = L_shl( L_deposit_l( THR3 ), SWB_BWE_LR_QRk );
@@ -572,13 +566,7 @@ void hq2_bit_alloc_har_fx(
L_temp = Mult_32_16( L_Ravg_sub[GRP_SB - 1], sub( GRP_SB, 1 ) ); /* Qbe+0+1 */
L_temp = Mult_32_16( L_temp, Inv_norm_sum_fx ); /* Qbe+1+QIpb+1 */
-#ifdef ISSUE_1836_replace_overflow_libcom
lf_hf_ge_r_fx = round_fx_sat( L_shl_sat( L_temp, sub( 15 + 16, sub( add( SWB_BWE_LR_Qbe, QIns ), 30 ) ) ) );
-#else
- lf_hf_ge_r_fx = round_fx_o( L_shl_o( L_temp, sub( 15 + 16, sub( add( SWB_BWE_LR_Qbe, QIns ), 30 ) ), &Overflow ), &Overflow );
- Overflow = 0; /* reset BASOP Overflow */
- move32();
-#endif
exp_normn = norm_s( norm_sum_fx );
exp_normn = sub( exp_normn, 1 );
diff --git a/lib_com/hq2_core_com_fx.c b/lib_com/hq2_core_com_fx.c
index d6606178d4ab0a6e2351f70f98e1e6f25feb6cf0..a77513009f4ab74d365878332449c45fe86072e8 100644
--- a/lib_com/hq2_core_com_fx.c
+++ b/lib_com/hq2_core_com_fx.c
@@ -88,13 +88,6 @@ void mdct_spectrum_denorm_fx(
Word16 cond_fx;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16(); /* allow overflow happen. */
-#endif
-#endif
-
exp_safe = 4; /* safe bit for overflow */
move16();
@@ -165,13 +158,8 @@ void mdct_spectrum_denorm_fx(
pd_fx = div_s( shl( npulses[k], exp_normn ), shl( band_width[k], exp_normd ) ); /* 15 + (exp_norm - exp_normd) */
Qpd = add( sub( exp_normn, exp_normd ), 15 );
-#ifdef ISSUE_1836_replace_overflow_libcom
cond_fx = sub( shl_sat( pd_fx, sub( 15, Qpd ) ), pd_thresh_fx /*Q15*/ ); /* Q15 */
-#else
- cond_fx = sub( shl_o( pd_fx, sub( 15, Qpd ), &Overflow ), pd_thresh_fx /*Q15*/ ); /* Q15 */
- Overflow = 0;
-#endif
- move16(); /* allow overflow happen. */
+ move16(); /* allow overflow happen. */
IF( cond_fx < 0 )
{
/*gain_tweak = (float) pow (2.0f, (ld_slope * log2_f (pd / pd_thresh))); */
@@ -202,11 +190,7 @@ void mdct_spectrum_denorm_fx(
/*gamma *= gain_tweak; */
L_tmp = L_mult( gamma_fx, gain_tweak_fx ); /* Qgamma+Qtweak+1 */
exp_norm = norm_l( L_tmp );
-#ifdef ISSUE_1836_replace_overflow_libcom
gamma_fx = round_fx_sat( L_shl( L_tmp, exp_norm ) );
-#else
- gamma_fx = round_fx_o( L_shl_o( L_tmp, exp_norm, &Overflow ), &Overflow );
-#endif
Qgamma = sub( add( add( Qgamma, Qtweak ), exp_norm ), 15 ); /*Qgamma+Qtweak+1+exp_norm-16; */
}
@@ -270,13 +254,6 @@ void mdct_spectrum_denorm_ivas_fx(
Word16 cond_fx;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16(); /* allow overflow happen. */
-#endif
-#endif
-
exp_safe = 4; /* safe bit for overflow */
move16();
@@ -347,13 +324,8 @@ void mdct_spectrum_denorm_ivas_fx(
pd_fx = div_s( shl( npulses[k], exp_normn ), shl( band_width[k], exp_normd ) ); /* 15 + (exp_normn + exp_normd) */
Qpd = add( sub( exp_normn, exp_normd ), 15 );
-#ifdef ISSUE_1836_replace_overflow_libcom
cond_fx = sub( shl_sat( pd_fx, sub( 15, Qpd ) ), pd_thresh_fx /*Q15*/ ); /* Q15 */
-#else
- cond_fx = sub( shl_o( pd_fx, sub( 15, Qpd ), &Overflow ), pd_thresh_fx /*Q15*/ ); /* Q15 */
- Overflow = 0;
-#endif
- move16(); /* allow overflow happen. */
+ move16(); /* allow overflow happen. */
IF( cond_fx < 0 )
{
/*gain_tweak = (float) pow (2.0f, (ld_slope * log2_f (pd / pd_thresh))); */
@@ -384,11 +356,7 @@ void mdct_spectrum_denorm_ivas_fx(
/*gamma *= gain_tweak; */
L_tmp = L_mult( gamma_fx, gain_tweak_fx ); /* Qgamma+Qtweak+1 */
exp_norm = norm_l( L_tmp );
-#ifdef ISSUE_1836_replace_overflow_libcom
gamma_fx = round_fx_sat( L_shl( L_tmp, exp_norm ) );
-#else
- gamma_fx = round_fx_o( L_shl_o( L_tmp, exp_norm, &Overflow ), &Overflow );
-#endif
Qgamma = sub( add( add( Qgamma, Qtweak ), exp_norm ), 15 ); /*Qgamma+Qtweak+1+exp_norm-16; */
}
diff --git a/lib_com/hq2_noise_inject_fx.c b/lib_com/hq2_noise_inject_fx.c
index 9f013a3b0df3c7101f8ff8db272e84ad1338dc29..76efad10e991b289bd73e343153f8440468cc7b5 100644
--- a/lib_com/hq2_noise_inject_fx.c
+++ b/lib_com/hq2_noise_inject_fx.c
@@ -80,23 +80,13 @@ void hq2_noise_inject_fx(
Word16 i, j, k, ni_end_band, satur, count[BANDS_MAX], max_pos_pulse, pos;
Word16 sb = bands;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
satur = 0;
move16();
FOR( i = 0; i < bands; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
Ep_fx[i] = L_shl_sat( Ep_fx[i], 6 ); /* Q-6 -> Q0 */
-#else
- Ep_fx[i] = L_shl_o( Ep_fx[i], 6, &Overflow ); /* Q-6 -> Q0 */
-#endif
move32();
}
@@ -161,11 +151,7 @@ void hq2_noise_inject_fx(
Q_env_fx[k] = sub( 31, exp2 );
move16();
tmp = sub( 17, Q_env_fx[k] );
-#ifdef ISSUE_1836_replace_overflow_libcom
env_fx2[k] = extract_h( L_shl_sat( env_fx[k], tmp ) ); /*Q1 */
-#else
- env_fx2[k] = extract_h( L_shl_o( env_fx[k], tmp, &Overflow ) ); /*Q1 */
-#endif
peak_fx[k] = 0;
move16();
count[k] = 0;
@@ -176,11 +162,7 @@ void hq2_noise_inject_fx(
FOR( i = band_start[k]; i <= band_end[k]; i++ )
{
L_tmp = L_mult0( y2hat_fx[i], y2hat_fx[i] ); /* Q0 */
-#ifdef ISSUE_1836_replace_overflow_libcom
Ep_fx[k] = L_sub_sat( Ep_fx[k], L_tmp );
-#else
- Ep_fx[k] = L_sub_o( Ep_fx[k], L_tmp, &Overflow );
-#endif
move32(); /* Q0 */
IF( GT_16( abs_s( y2hat_fx[i] ), peak_fx[k] ) )
{
@@ -400,12 +382,8 @@ void hq2_noise_inject_fx(
}
ELSE IF( count[k - 1] == 0 && tmp4 > 0 )
{
- L_tmp = L_mult( env_fx2[k - 1], tmp ); /* Q(1+Q_speech+1 = Q_speech+2) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ L_tmp = L_mult( env_fx2[k - 1], tmp ); /* Q(1+Q_speech+1 = Q_speech+2) */
fac_fx = extract_h( L_shl_sat( L_tmp, sub( 26, Q_speech ) ) ); /*Q12 */
-#else
- fac_fx = extract_h( L_shl_o( L_tmp, sub( 26, Q_speech ), &Overflow ) ); /*Q12 */
-#endif
}
}
@@ -485,11 +463,7 @@ void hq2_noise_inject_fx(
}
L_tmp = Mult_32_16( Ep_fx[k], fac_fx ); /*Q(Q_Ep_fx[k]+12-15 = Q_Ep_fx[k]-3) */
-#ifdef ISSUE_1836_replace_overflow_libcom
ni_gain_fx[k] = L_shr_sat( L_tmp, sub( Q_Ep_fx[k], 20 ) );
-#else
- ni_gain_fx[k] = L_shr_o( L_tmp, sub( Q_Ep_fx[k], 20 ), &Overflow );
-#endif
move32(); /*Q17 */
}
ELSE
@@ -611,22 +585,14 @@ void hq2_noise_inject_fx(
L_tmp = Mult_32_16( Ep_fx[k], tmp ); /*Q(Q_Ep_fx[k]+28-Q_speech-15 = Q_Ep_fx[k]+13-Q_speech) */
tmp = sub( Q_Ep_fx[k], Q_speech );
tmp = sub( 15, tmp );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = extract_h( L_shl_sat( L_tmp, tmp ) ); /*Q12 */
-#else
- tmp = extract_h( L_shl_o( L_tmp, tmp, &Overflow ) ); /*Q12 */
-#endif
}
ELSE
{
tmp = 0x7fff; /*Q0 */
L_tmp = Mult_32_16( Ep_fx[k], tmp ); /*Q(Q_Ep_fx[k]+0-15 = Q_Ep_fx[k]-15) */
tmp = sub( 43, Q_Ep_fx[k] );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = extract_h( L_shl_sat( L_tmp, tmp ) ); /*Q12 */
-#else
- tmp = extract_h( L_shl_o( L_tmp, tmp, &Overflow ) ); /*Q12 */
-#endif
}
fac_fx = s_max( tmp, 4096 /* 1 in Q12 */ ); /*Q12 */
@@ -638,11 +604,7 @@ void hq2_noise_inject_fx(
IF( band_width[k] != 0 )
{
Q_speech = norm_s( band_width[k] );
-#ifdef ISSUE_1836_replace_overflow_libcom
- tmp = shl_sat( band_width[k], Q_speech ); /*Q(Q_speech) */
-#else
- tmp = shl_o( band_width[k], Q_speech, &Overflow ); /*Q(Q_speech) */
-#endif
+ tmp = shl_sat( band_width[k], Q_speech ); /*Q(Q_speech) */
tmp = div_s( 16384 /* 0.5 in Q15 */, tmp ); /*Q(15+14-Q_speech) */
}
ELSE
@@ -652,16 +614,12 @@ void hq2_noise_inject_fx(
move16();
move16();
}
- tmp1 = sub( fac_fx, 4096 /* 1 in Q12 */ ); /*Q12 */
- L_tmp = L_mult( tmp1, j ); /*Q13 */
- L_tmp = Mult_32_16( L_tmp, tmp ); /*Q(13+29-Q_speech-15 = 27-Q_speech) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp1 = sub( fac_fx, 4096 /* 1 in Q12 */ ); /*Q12 */
+ L_tmp = L_mult( tmp1, j ); /*Q13 */
+ L_tmp = Mult_32_16( L_tmp, tmp ); /*Q(13+29-Q_speech-15 = 27-Q_speech) */
tmp = extract_h( L_shl_sat( L_tmp, add( 1, Q_speech ) ) ); /*Q12 */
-#else
- tmp = extract_h( L_shl_o( L_tmp, add( 1, Q_speech ), &Overflow ) ); /*Q12 */
-#endif
- tmp = sub( fac_fx, tmp ); /*Q12 */
- L_tmp = Mult_32_16( ni_gain_fx[k], tmp ); /*Q(17+12-15=14) */
+ tmp = sub( fac_fx, tmp ); /*Q12 */
+ L_tmp = Mult_32_16( ni_gain_fx[k], tmp ); /*Q(17+12-15=14) */
L_y2[i] = L_add( L_y2[i], L_shr( Mult_32_16( L_tmp, rand_fx ), 2 ) );
move32(); /*Q12 */
}
diff --git a/lib_com/ifft_rel_fx.c b/lib_com/ifft_rel_fx.c
index 2cc96b0c9eec70660930265cb76e1219b32d493b..f404a10c8f72d25c02b3d00260226591f0399cad 100644
--- a/lib_com/ifft_rel_fx.c
+++ b/lib_com/ifft_rel_fx.c
@@ -78,13 +78,6 @@ void ifft_rel_fx(
Word16 cc1, cc3, ss1, ss3;
Word16 tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
-
/*-----------------------------------------------------------------*
* ifft
@@ -111,7 +104,6 @@ void ifft_rel_fx(
FOR( i = is; i < n; i += id )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
t1 = sub_sat( *xi1, *xi3 ); /*Qx*/
*xi1 = add_sat( *xi1, *xi3 ); /*Qx*/
move16();
@@ -121,21 +113,9 @@ void ifft_rel_fx(
move16();
*xi4 = add_sat( t1, shl_sat( *xi4, 1 ) ); /*Qx*/
move16();
-#else
- t1 = sub_o( *xi1, *xi3, &Overflow ); /*Qx*/
- *xi1 = add_o( *xi1, *xi3, &Overflow ); /*Qx*/
- move16();
- *xi2 = shl_o( *xi2, 1, &Overflow ); /*Qx*/
- move16();
- *xi3 = sub_o( t1, shl_o( *xi4, 1, &Overflow ), &Overflow ); /*Qx*/
- move16();
- *xi4 = add_o( t1, shl_o( *xi4, 1, &Overflow ), &Overflow ); /*Qx*/
- move16();
-#endif
IF( NE_16( n4, 1 ) )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
t1 = mult_r( sub_sat( *( xi2 + n8 ), *( xi1 + n8 ) ), INV_SQR2_FX /*Q15*/ ); /*Qx*/
t2 = mult_r( add_sat( *( xi4 + n8 ), *( xi3 + n8 ) ), INV_SQR2_FX /*Q15*/ ); /*Qx*/
@@ -147,19 +127,6 @@ void ifft_rel_fx(
move16();
*( xi4 + n8 ) = shl_sat( sub_sat( t1, t2 ), 1 ); /*Qx*/
move16();
-#else
- t1 = mult_r( sub_o( *( xi2 + n8 ), *( xi1 + n8 ), &Overflow ), INV_SQR2_FX /*Q15*/ ); /*Qx*/
- t2 = mult_r( add_o( *( xi4 + n8 ), *( xi3 + n8 ), &Overflow ), INV_SQR2_FX /*Q15*/ ); /*Qx*/
-
- *( xi1 + n8 ) = add_o( *( xi1 + n8 ), *( xi2 + n8 ), &Overflow ); /*Qx*/
- move16();
- *( xi2 + n8 ) = sub_o( *( xi4 + n8 ), *( xi3 + n8 ), &Overflow ); /*Qx*/
- move16();
- *( xi3 + n8 ) = negate( shl_o( add_o( t2, t1, &Overflow ), 1, &Overflow ) ); /*Qx*/
- move16();
- *( xi4 + n8 ) = shl_o( sub_o( t1, t2, &Overflow ), 1, &Overflow ); /*Qx*/
- move16();
-#endif
}
xi1 += id;
xi2 += id;
@@ -207,7 +174,6 @@ void ifft_rel_fx(
FOR( i = is; i < n; i += id )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
t1 = sub_sat( *xup1, *xdn6 ); /*Qx*/
*xup1 = add_sat( *xup1, *xdn6 ); /*Qx*/
move16();
@@ -245,45 +211,6 @@ void ifft_rel_fx(
xdn8 += n4;
*xdn8 = add_sat( mult_r( t2, cc3 ), mult_r( t1, ss3 ) ); /*Qx*/
move16();
-#else
- t1 = sub_o( *xup1, *xdn6, &Overflow ); /*Qx*/
- *xup1 = add_o( *xup1, *xdn6, &Overflow ); /*Qx*/
- move16();
- xup1 += n4;
- xdn6 -= n4;
-
- t2 = sub_o( *xdn6, *xup1, &Overflow ); /*Qx*/
- *xdn6 = add_o( *xup1, *xdn6, &Overflow ); /*Qx*/
- move16();
-
- xdn6 += n4;
- t3 = add_o( *xdn8, *xup3, &Overflow ); /*Qx*/
- *xdn6 = sub_o( *xdn8, *xup3, &Overflow ); /*Qx*/
- move16();
-
- xup3 += n4;
- xdn8 -= n4;
-
- t4 = add_o( *xup3, *xdn8, &Overflow ); /*Qx*/
- *xup1 = sub_o( *xup3, *xdn8, &Overflow ); /*Qx*/
- move16();
-
- t5 = sub_o( t1, t4, &Overflow ); /*Qx*/
- t1 = add_o( t1, t4, &Overflow ); /*Qx*/
- t4 = sub_o( t2, t3, &Overflow ); /*Qx*/
- t2 = add_o( t2, t3, &Overflow ); /*Qx*/
- *xup3 = sub_o( mult_r( t1, cc3 ), mult_r( t2, ss3 ), &Overflow ); /*Qx*/
- move16();
- xup3 -= n4;
- *xup3 = add_o( mult_r( t5, cc1 ), mult_r( t4, ss1 ), &Overflow ); /*Qx*/
- move16();
- *xdn8 = sub_o( mult_r( t5, ss1 ), mult_r( t4, cc1 ), &Overflow ); /*Qx*/
- move16();
-
- xdn8 += n4;
- *xdn8 = add_o( mult_r( t2, cc3 ), mult_r( t1, ss3 ), &Overflow ); /*Qx*/
- move16();
-#endif
xup1 -= n4;
xup1 += id;
@@ -314,17 +241,10 @@ void ifft_rel_fx(
{
r1 = *xi0;
move16();
-#ifdef ISSUE_1836_replace_overflow_libcom
*xi0 = add_sat( r1, *xi1 ); /*Qx*/
move16();
*xi1 = sub_sat( r1, *xi1 ); /*Qx*/
move16();
-#else
- *xi0 = add_o( r1, *xi1, &Overflow ); /*Qx*/
- move16();
- *xi1 = sub_o( r1, *xi1, &Overflow ); /*Qx*/
- move16();
-#endif
xi0 += id;
xi1 += id;
}
diff --git a/lib_com/igf_base_fx.c b/lib_com/igf_base_fx.c
index 68853974cd23a96ce03f4d71bd977c1677deaadc..ae2e9c51bd168a96b6229eb421d5438425568a83 100644
--- a/lib_com/igf_base_fx.c
+++ b/lib_com/igf_base_fx.c
@@ -1115,61 +1115,25 @@ void IGFCommonFuncsCalcSfbEnergyPowerSpec( const Word16 startSfb, /**< in
)
{
Word16 /*Q0*/ sfb;
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Word16 /*Q0*/ line;
- Word32 L_c;
-#endif
-
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Flag Overflow = 0;
- Flag Carry = 0;
- move16();
- move16();
-#endif
-#endif
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- FOR( sfb = startSfb; sfb < stopSfb; sfb++ )
- {
- sfbEnergy[sfb] = L_deposit_l( 0 );
- move32();
- }
-#endif
IF( NULL == pPowerSpectrum )
{
-#ifdef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
FOR( sfb = startSfb; sfb < stopSfb; sfb++ )
{
sfbEnergy[sfb] = L_deposit_l( 0 );
move32();
}
-#endif
+
return;
}
FOR( sfb = startSfb; sfb < stopSfb; sfb++ )
{
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_c = L_deposit_l( 0 );
- FOR( line = swb_offset[sfb]; line < swb_offset[sfb + 1]; line++ )
- {
- Carry = 0;
- move16();
- sfbEnergy[sfb] = L_add_co( sfbEnergy[sfb], pPowerSpectrum[line], &Carry, &Overflow );
- move32();
- Overflow = 0;
- move16();
- L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );
- }
- sfbEnergy[sfb] = norm_llQ31( L_c, sfbEnergy[sfb], &( sfbEnergy_exp[sfb] ) );
- move32();
-#else
sfbEnergy[sfb] = sum_array_norm( pPowerSpectrum + swb_offset[sfb],
swb_offset[sfb + 1] - swb_offset[sfb],
&( sfbEnergy_exp[sfb] ) );
move32();
-#endif
+
sfbEnergy_exp[sfb] = add( sfbEnergy_exp[sfb], *pPowerSpectrum_exp );
move16();
}
diff --git a/lib_com/interpol_fx.c b/lib_com/interpol_fx.c
index f299c1d61b7485b4afb4e22ef8abcbe7eb57023f..7d4c2208de4c78c372e870f16da623948d69fa93 100644
--- a/lib_com/interpol_fx.c
+++ b/lib_com/interpol_fx.c
@@ -71,6 +71,7 @@ Word32 Interpol_lc_fx( /* o : interpolated value
}
L_sum = W_shl_sat_l( L_sum64, 1 ); /*Q15*/
}
+
return L_sum;
}
@@ -82,11 +83,6 @@ Word16 Interpol_4( /* Qx o : interpolated value */
{
Word16 i;
Word32 L_sum;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
x = x - L_INTERPOL1 + 1;
@@ -103,13 +99,8 @@ Word16 Interpol_4( /* Qx o : interpolated value */
}
BASOP_SATURATE_WARNING_OFF_EVS
/* Here, saturation might occur by intention */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_sum = L_shl_sat( L_sum, 1 ); /*Qx+14+2*/
BASOP_SATURATE_WARNING_ON_EVS
+
return round_fx_sat( L_sum ); /*Qx*/
-#else
- L_sum = L_shl_o( L_sum, 1, &Overflow ); /*Qx+14+2*/
- BASOP_SATURATE_WARNING_ON_EVS
- return round_fx_o( L_sum, &Overflow ); /*Qx*/
-#endif
}
diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index 69822b590c9f8492575213d00b803365948642e7..66e8f6dfa07ed4629c416bced48857875491f2f6 100644
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -44,46 +44,33 @@
* mathematical constants
*----------------------------------------------------------------------------------*/
-#define PI_OVER_2 ( EVS_PI / 2.0f )
-#define PI_OVER_180 ( EVS_PI / 180.0f )
#define ONE_BY_PI_OVER_180_Q25 ( 1922527360 ) // Q25
-#define PI_OVER_180_Q22 ( 73204 ) // Q22
-#define _180_OVER_PI ( 180.0f / EVS_PI )
-#define _180_OVER_PI_Q25 ( 1922527338 ) // Q25
-#define PI_OVER_180_Q25 ( 585635 ) // Q25
+#define PI_OVER_180_Q22 ( 73204 ) // ( EVS_PI / 180.0f ) in Q22
+#define _180_OVER_PI_Q25 ( 1922527338 ) // ( 180.0f / EVS_PI ) in Q25
+#define PI_OVER_180_Q25 ( 585635 ) // ( EVS_PI / 180.0f ) in Q25
#define _180_IN_Q22 ( 754974720 ) // Q22
#define _360_IN_Q22 ( 1509949440 ) // Q22
-#define _180_OVER_PI_FX ( 58670 ) // Q10
-#define PI_OVER_180_Q15 ( 572 ) // Q15
-#define _180_OVER_PI_Q9 ( 29335 ) // Q9
+#define _180_OVER_PI_FX ( 58670 ) // ( 180.0f / EVS_PI ) in Q10
+#define PI_OVER_180_Q15 ( 572 ) // ( EVS_PI / 180.0f ) in Q15
+#define _180_OVER_PI_Q9 ( 29335 ) // ( 180.0f / EVS_PI ) in Q9
#define PI_OVER_4_Q29 ( 421657440 ) // Q29
-#define _180_OVER_PI_Q9 ( 29335 ) // Q9
#define PI_OVER_Q29 ( 1686629760 ) // Q29
#define Q31_0_99 ( 2126008811 ) // Q31
#define Q31_0_01 ( 21474836 ) // Q31
#define PI_OVER_180_FX ( 37480660 ) // Q31
#define PI_OVER_4_Q29 ( 421657440 ) // Q29
-#define PI_OVER_Q29 ( 1686629760 ) // Q29
#define PI2_C_ADP_RATE_Q31 ( 449767936 ) // Q31 (2.0f * EVS_PI * pOTR->centerAdaptationRate)
#define PI2_C_Q28 ( 1686629760 ) // Q28
#define OFF_C_ADP_RATE_Q31 ( 268435456 ) // Q31
#define C_ADP_RATE_Q31 ( 71582792 ) // Q31
+#define SQRT2_FX 1518500250 /* 1.414213562373095f in Q30 */
+#define SQRT2_OVER_2_FX 1518500250 /* (SQRT2 / 2.0f) in Q31 */
+#define INV_SQRT2_FX 1518500224 /* 1/sqrt(2) in Q31 */
+#define INV_SQRT2_FX_Q15 23170 /* 1/sqrt(2) Q15 */
+#define INV_SQRT3_FX 18918 /* 1/sqrt(3) Q15 */
-#define SQRT2 1.414213562373095f
-#define SQRT2_FIXED 1518500250 // Q30
-#define SQRT2_OVER_2 (SQRT2 / 2.0f)
-#define SQRT2_OVER_2_FIXED 1518500250 // Q31
-
-#define INV_SQRT2 7.071067811865475e-1f /* 1/sqrt(2) */
-#define INV_SQRT3 0.577350269189626f /* 1/sqrt(3) */
-#define INV_SQRT2_FX ( 1518500224 ) /* 1/sqrt(2) in Q31 */
-
-#define INV_SQRT2_FX_Q15 ( 23170 ) /* 1/sqrt(2) Q15 */
-#define INV_SQRT3_FX ( 18918 ) /* 1/sqrt(3) Q15 */
-
-#define LOG_10 2.30258509299f
-
+#define INV_1000_Q31 2147484 /*1/1000 IN Q31*/
/*----------------------------------------------------------------------------------*
* IVAS formats
@@ -164,7 +151,7 @@ typedef enum
#define MAX_INTERN_CHANNELS 16 /* Maximum number of intern channels (HOA 3rd order) */
#define HEAD_ROTATION_HOA_ORDER 3 /* HOA 3rd order */
#define MAX_CICP_CHANNELS 16 /* max channels for loudspeaker layouts (16 for custom layouts)*/
-#define MAX_OUTPUT_CHANNELS 16 /* Maximum number of output channels (HOA 3rd order), == IVAS_MAX_OUTPUT_CHANNELS */
+#define MAX_OUTPUT_CHANNELS 16 /* Maximum number of output channels (HOA 3rd order) without separate objects in combined formats */
#define MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN 2 /* Maximum number of output channels with non diegetic panning */
#define BINAURAL_CHANNELS 2 /* number of channels for binaural output configuration */
@@ -208,7 +195,11 @@ typedef enum
#define MAX_JBM_L_FRAME48k 1920
#define MAX_JBM_L_FRAME_NS 40000000L
#define MAX_SPAR_INTERNAL_CHANNELS IVAS_SPAR_MAX_CH
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+#define MAX_CLDFB_DIGEST_CHANNELS 3 /* == maximum of ParamISM TCs and ParamMC TCs */
+#else
#define MAX_CLDFB_DIGEST_CHANNELS (FOA_CHANNELS + MAX_NUM_OBJECTS)
+#endif
typedef enum
{
@@ -262,6 +253,9 @@ typedef enum
/* format signaling in SID frames */
#define SID_FORMAT_NBITS 3 /* Bit 0 | Bit 1 | Bit 2 */
/*-------|-------|------ */
+#ifdef FIX_1384_MSAN_ivas_spar_dec_open
+#define SID_FORMAT_NONE (-0x1) /* n/a| n/a| n/a*/
+#endif
#define SID_DFT_STEREO 0x0 /* 0| 0| 0 */
#define SID_MDCT_STEREO 0x1 /* 1| 0| 0 */
#define SID_ISM 0x2 /* 0| 1| 0 */
@@ -341,36 +335,24 @@ typedef enum
#define ADJUST_ISM_BRATE_POS 8000
#define ISM_AZIMUTH_NBITS 7
-#define ISM_AZIMUTH_MIN -180.0f
-#define ISM_AZIMUTH_MAX 180.0f
-#define ISM_AZIMUTH_MIN_FX ( -754974720 ) // Q22
-#define ISM_AZIMUTH_MAX_FX ( 754974720 ) // Q22
-#define ISM_AZIMUTH_LOW_BORDER -140.0f
-#define ISM_AZIMUTH_HIGH_BORDER 135.0f
-#define ISM_AZIMUTH_LOW_BORDER_FX ( -587202560 ) // Q22
-#define ISM_AZIMUTH_HIGH_BORDER_FX ( 566231040 ) // Q22
+#define ISM_AZIMUTH_MIN_FX -754974720 /* -180.0f in Q22 */
+#define ISM_AZIMUTH_MAX_FX 754974720 /* 180.0f in Q22 */
+#define ISM_AZIMUTH_LOW_BORDER_FX -587202560 /* -140.0f in Q22 */
+#define ISM_AZIMUTH_HIGH_BORDER_FX 566231040 /* 135.0f in Q22 */
#define ISM_ELEVATION_NBITS 6
-#define ISM_ELEVATION_MIN -90.0f
-#define ISM_ELEVATION_MAX 90.0f
-#define ISM_ELEVATION_MIN_FX ( -377487360 ) // Q22
-#define ISM_ELEVATION_MAX_FX ( 377487360 ) // Q22
-#define ISM_ELEVATION_LOW_BORDER -70.0f
-#define ISM_ELEVATION_HIGH_BORDER 65.0f
-#define ISM_ELEVATION_LOW_BORDER_FX ( -293601280 ) // Q22
-#define ISM_ELEVATION_HIGH_BORDER_FX ( 272629760 ) // Q22
-#define ISM_Q_STEP 2.5f
-#define ISM_Q_STEP_FX ( 10485760 ) // Q22
-#define ISM_Q_STEP_BORDER 5.0f
-#define ISM_Q_STEP_BORDER_FX ( 20971520 ) // Q22
+#define ISM_ELEVATION_MIN_FX -377487360 /* -90.0f in Q22 */
+#define ISM_ELEVATION_MAX_FX 377487360 /* 90.0f in Q22 */
+#define ISM_ELEVATION_LOW_BORDER_FX -293601280 /* -70.0f in Q22 */
+#define ISM_ELEVATION_HIGH_BORDER_FX 272629760 /* 65.0f in Q22 */
+#define ISM_Q_STEP_FX 10485760 /* 2.5f in Q22 */
+#define ISM_Q_STEP_BORDER_FX 20971520 /* 5.0f in Q22 */
#define ISM_FEC_MAX 10
#define ISM_RADIUS_NBITS 6
-#define ISM_RADIUS_MIN 0.0f
-#define ISM_RADIUS_MIN_Q9 0
-#define ISM_RADIUS_DELTA 0.25f /* Max radius = (2^ISM_RADIUS_NBITS-1)*0.25 = 15.75 */
-#define ISM_RADIUS_DELTA_Q8 64 // Q8
+#define ISM_RADIUS_MIN_Q9 0 /* 0.0f in Q9 */
+#define ISM_RADIUS_DELTA_Q8 64 /* 0.25f in Q8 */
#define ISM_EXTENDED_METADATA_BRATE IVAS_64k
#define ISM_METADATA_IS_NDP_BITS 1
#define ISM_EXTENDED_METADATA_BITS 1
@@ -389,24 +371,24 @@ typedef enum
#define PARAM_ISM_MAX_CHAN 16
#define PARAM_ISM_HYS_BUF_SIZE 10
-#define STEP_PARAM_ISM_POW_RATIO_NBITS_Q31 (306783378) /* 1.0f / (float)((1 << PARAM_ISM_POW_RATIO_NBITS) - 1) */
+#define STEP_PARAM_ISM_POW_RATIO_NBITS_Q31 306783378 /* 1.0f / (float)((1 << PARAM_ISM_POW_RATIO_NBITS) - 1) */
/* ISM DTX */
-#define ISM_Q_STEP_FX ( 10485760 ) // Q22
-#define ISM_Q_STEP_BORDER_FX ( 20971520 ) // Q22
+#define ISM_Q_STEP_FX 10485760 /* Q22 */
+#define ISM_Q_STEP_BORDER_FX 20971520 /* Q22 */
#define ISM_DTX_COH_SCA_BITS 4
#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_Q_STEP_HIGH_FX ( 5 * ( 1 << ( 22 - 2 ) ) ) // Q22
-#define ISM_Q_STEP_BORDER_HIGH_FX ( 5 * ( 1 << ( 22 - 1 ) ) ) // Q22
+#define ISM_Q_STEP_HIGH_FX ( 5 * ( 1 << ( 22 - 2 ) ) ) /* Q22 */
+#define ISM_Q_STEP_BORDER_HIGH_FX ( 5 * ( 1 << ( 22 - 1 ) ) ) /* Q22 */
#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)
-#define ISM_Q_STEP_LOW_FX ( 5 * (1 << 22) ) // Q22
-#define ISM_Q_STEP_BORDER_LOW_FX ( 10 * (1 << 22) ) // Q22
+#define ISM_Q_STEP_LOW_FX ( 5 * (1 << 22) ) /* Q22 */
+#define ISM_Q_STEP_BORDER_LOW_FX ( 10 * (1 << 22) ) /* Q22 */
/* ISM modes */
typedef enum
@@ -555,9 +537,6 @@ enum
#define STEREO_DFT_ENC_DFT_NB ( STEREO_DFT_OFFSET + 1 ) /*frame + lookahead*/
#define STEREO_DFT_DEC_DFT_NB ( STEREO_DFT_NBDIV + STEREO_DFT_OFFSET ) /*frame + lookahead*/
-#define STEREO_CNA_LR_CORR_LT_FILT 0.95f /* long-term averaging factor for L/R correlation estimation */
-#define STEREO_CNA_ILD_LT_FILT 0.9f /* long-term averaging factor for ILD estimation */
-
typedef enum
{
DFT_STEREO_DEC_ANA_NOCORE = -1, /*-1: signal read from file (DEBUG mode)*/
@@ -570,17 +549,15 @@ typedef enum
} DFT_STEREO_DEC_ANA_TYPE;
/*Stereo parameters*/
-
#define STEREO_DFT_ERB4_BANDS 14
#define STEREO_DFT_ERB8_BANDS 8
#define STEREO_DFT_BAND_MAX ( STEREO_DFT_ERB4_BANDS - 1 ) /*Maximum number of parameter bands*/
#define STEREO_DFT_BUF_MAX STEREO_DFT32MS_N_MAX * STEREO_DFT_NBDIV
-
#define STEREO_DFT_NRG_PAST_LEN 3
/*ITD*/
#define STEREO_DFT_ITD_FS 32000
-#define STEREO_DFT_ITD_MAX 160 /*samples @ 32000*/
+#define STEREO_DFT_ITD_MAX 160 /*samples @ 32000*/
#define STEREO_DFT_ITD_MAX_ANA 200
#define STEREO_DFT_ITD_MIN max( STEREO_DFT_ITD_MAX - 256 + 1, 1 ) /*STEREO_DFT_ITD_MAX-pow(2,STEREO_DFT_ITD_NBITS-1)+1*/
#define STEREO_DFT_ITD_NBITS 9 /* 1 bit for sign, the rest for the absolute value*/
@@ -592,11 +569,10 @@ typedef enum
#define STEREO_DFT_FLAG_BITS 1
#define STEREO_DFT_SIDEGAIN_NBITS 5
#define STEREO_DFT_FEC_THRESHOLD 10
-#define STEREO_DFT_FEC_THRESHOLD_PLUS_1_INV_Q31 ( 195225786 ) // Q31
-#define STEREO_DFT_BITDIFF_LP_FAC_Q31 ( 128849019 ) // Q31 /* Low-pass filter coefficient for filtering bit difference between absolute and differential coding */
-#define STEREO_DFT_BITDIFF_ABS_SELECT_Q31 ( 1717986918 ) // Q31 /* Constant to set tendency for selecting absolute coding mode */
-#define STEREO_DFT_BITDIFF_INIT (12.0f) /* Init value for low-pass bit difference */
-#define STEREO_DFT_BITDIFF_INIT_FX (12288) // Q10 /* Init value for low-pass bit difference in Q10*/
+#define STEREO_DFT_FEC_THRESHOLD_PLUS_1_INV_Q31 ( 195225786 ) /* Q31 */
+#define STEREO_DFT_BITDIFF_LP_FAC_Q31 ( 128849019 ) /* Low-pass filter coefficient for filtering bit difference between absolute and differential coding, Q31 */
+#define STEREO_DFT_BITDIFF_ABS_SELECT_Q31 ( 1717986918 ) /* Constant to set tendency for selecting absolute coding mode, Q31 */
+#define STEREO_DFT_BITDIFF_INIT_FX ( 12288 ) /* Init value for low-pass bit difference, 12.0f in Q10*/
#define STEREO_DFT_SIDE_GAIN_NBITS 5
#define STEREO_DFT_IPD_NBITS 3
@@ -617,9 +593,8 @@ typedef enum
#define STEREO_DFT_SG_ACT_CNT_MAX 1500
#define STEREO_DFT_COH_MAXBAND 6
#define STEREO_DFT_SID_GIPD_NBITS 2
-#define STEREO_DFT_FD_FILT 0.9f
-#define STEREO_DFT_FD_FILT_Q31 1932735283 // Q31
-#define STEREO_DFT_FD_FILT_COMP_Q31 214748364 // Q31 /* 1.0 - STEREO_DFT_FD_FILT */
+#define STEREO_DFT_FD_FILT_Q31 1932735283 /* 0.9f in Q31 */
+#define STEREO_DFT_FD_FILT_COMP_Q31 214748364 /* 1.0 - STEREO_DFT_FD_FILT in Q31 */
#define STEREO_DFT_CNG_ITD_CNT 8
@@ -645,17 +620,15 @@ typedef enum
#define STEREO_DFT_RES_GAINS_BITS 3
#define STEREO_DFT_RES_COD_SNR_MIN 10
-#define STEREO_DFT_RES_COD_SNR_MIN_Q25 335544320 // Q25
+#define STEREO_DFT_RES_COD_SNR_MIN_Q25 335544320 /* Q25 */
#define STEREO_DFT_RES_COD_SNR_MAX 40
-#define STEREO_DFT_RES_COD_SNR_MAX_Q25 1342177280 // Q25
+#define STEREO_DFT_RES_COD_SNR_MAX_Q25 1342177280 /* Q25 */
#define STEREO_DFT_L_SUBFR_8k 32
#define STEREO_DFT_NBPSF_PIT_MAX_8k NBPSF_PIT_MAX / 2
/* Residual coding BPF */
-#define STEREO_DFT_BPF_ADAPT_ALPHA (0.61f)
-#define STEREO_DFT_BPF_ADAPT_BETA (0.68f)
-#define STEREO_DFT_BPF_ADAPT_ALPHA_FX (19988) /* STEREO_DFT_BPF_ADAPT_ALPHA in Q15 */
-#define STEREO_DFT_BPF_ADAPT_BETA_FX (22281) /* STEREO_DFT_BPF_ADAPT_BETA in Q15 */
+#define STEREO_DFT_BPF_ADAPT_ALPHA_FX 19988 /* 0.61f in Q15 */
+#define STEREO_DFT_BPF_ADAPT_BETA_FX 22281 /* 0.68f in Q15 */
/* Golomb-Rice encoding */
#define NO_SYMB_GR_SIDE_G 31
@@ -729,10 +702,8 @@ enum
#define ECSQ_VECTOR_SIZE_MAX 256
#define ECSQ_GLOBAL_GAIN_INDEX_ALL_ZERO 127 /* indicates that all values in the vector are zero */
-#define ECLVQ_GLOBAL_GAIN_FACTOR ( 20.0f * 127.0f / 90.0f )
-#define ECLVQ_GLOBAL_GAIN_FACTOR_Q26 1893961218 // Q26
-#define ECLVQ_INV_GLOBAL_GAIN_FACTOR ( 1.0f / ( 20.0f * 127.0f / 90.0f ) )
-#define ECLVQ_INV_GLOBAL_GAIN_FACTOR_Q24 594468 // Q24
+#define ECLVQ_GLOBAL_GAIN_FACTOR_Q26 1893961218 /* ( 20.0f * 127.0f / 90.0f ) in Q26 */
+#define ECLVQ_INV_GLOBAL_GAIN_FACTOR_Q24 594468 /* ( 1.0f / ( 20.0f * 127.0f / 90.0f ) ) in Q24 */
/* the currently defined configuration indexes are:
0: un-optimized using uniform 4 bit parameters (reserved)
@@ -825,12 +796,10 @@ enum fea_names
#define STEREO_BITS_TCA_CHAN 1 /* ref/target channel index */
#define STEREO_BITS_TCA_CORRSTATS 5 /* target corrStats */
#define STEREO_BITS_TCA_GD 5 /* target gain */
-#define STEREO_TCA_GDMIN -1.0f
-#define STEREO_TCA_GDMIN_FX -32768 // Q15
-#define STEREO_TCA_GDSTEP 0.05f
-#define STEREO_TCA_GDSTEP_FX 819 // Q14
-#define STEREO_TCA_GDMIN_FX_Q14 (-16384) // Q14
-#define STEREO_TCA_GDSTEP_FX_Q13 (410) // Q13
+#define STEREO_TCA_GDMIN_FX -32768 /* -1.0f in Q15 */
+#define STEREO_TCA_GDSTEP_FX 819 /* 0.05f in Q14 */
+#define STEREO_TCA_GDMIN_FX_Q14 -16384 /* -1.0fin Q14 */
+#define STEREO_TCA_GDSTEP_FX_Q13 410 /* 0.05f in Q13 */
#define STEREO_BITS_TCA ( STEREO_BITS_TCA_CHAN + STEREO_BITS_TCA_CORRSTATS + STEREO_BITS_TCA_GD )
#define STEREO_ICBWE_MSFLAG_BITS 1 /* BWE Multi Source flag */
@@ -846,14 +815,14 @@ enum fea_names
#define MAX_DELAYREGLEN 12 /* max regression length */
#define INV_MAX_DELAYREGLEN 0.083333333333333f /* (1/MAX_DELAYREGLEN) */
-#define INV_MAX_DELAYREGLEN_FX_Q15 2731 // Q15 /* (1/MAX_DELAYREGLEN) */
+#define INV_MAX_DELAYREGLEN_FX_Q15 2731 /* (1/MAX_DELAYREGLEN) in Q15 */
#define MAX_INTERPOLATE 11
#define ADDED_MEM_DS 40
#define STEREO_L_TCA_OVLP_NS 5000000L /* overlap length of the ICA gain scaling */
+#define STEREO_DMX_GAIN_Q13 29066 /* Q13, calculated this -->"powf( 10, ( ( 1 << STEREO_BITS_TCA_GD ) - 1 ) * STEREO_TCA_GDSTEP + STEREO_TCA_GDMIN )"*/
-#define STEREO_DMX_GAIN_Q13 29066 // Q13 /* calculated this -->"powf( 10, ( ( 1 << STEREO_BITS_TCA_GD ) - 1 ) * STEREO_TCA_GDSTEP + STEREO_TCA_GDMIN )"*/
/*----------------------------------------------------------------------------------*
* TD Stereo Constants
*----------------------------------------------------------------------------------*/
@@ -914,8 +883,7 @@ enum fea_names
#define SNS_CDBKS_BITS_4_FRAC 12
#define SNS_MEANS_BITS_4_FRAC 14
-#define MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG 0.001f
-#define MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG_Q31 2147483 // Q31
+#define MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG_Q31 2147483 /* 0.001f in Q31 */
#define MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME 2 * FRAMES_PER_SEC
#define MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN 20
#define MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE 3
@@ -1013,47 +981,36 @@ typedef enum
#define DIRAC_DIFF_NUM_AMBI_COMP 4
#define DIRAC_HOA_RENDERING_NUM_VIRT_DECORR_LS 8
-#define DIRAC_GAIN_LIMIT 31.622776601683793f /* 30db gain limitiation */
-#define DIRAC_GAIN_LIMIT_Q26 ( 2122168614 ) // Q26 /* 30db gain limitiation */
+#define DIRAC_GAIN_LIMIT_Q26 2122168614 /* 30db gain limitiation, 31.622776601683793f in Q26 */
#define DIRAC_MAX_NUM_DECORR_FILTERS 22
#define DIRAC_MAX_DECORR_FILTER_LEN 20
#define DIRAC_DECORR_NUM_SPLIT_BANDS 3
#define DIRAC_DECORR_FILTER_LEN_1 15
#define DIRAC_DECORR_FILTER_LEN_2 6
#define DIRAC_DECORR_FILTER_LEN_3 3
-#define DIRAC_ONSET_ALPHA 0.95f
-#define DIRAC_ONSET_BETA 0.995f
-#define DIRAC_ONSET_GAIN 4.0f
-#define DIRAC_ONSET_ALPHA_FX 31129 // Q15
-#define DIRAC_ONSET_BETA_FX 32604 // Q15
-#define ONE_DIRAC_ONSET_BETA_FX 163 // Q15
-#define DIRAC_ONSET_GAIN_FX 16384 // Q12
+#define DIRAC_ONSET_ALPHA_FX 31129 /* 0.95f in Q15 */
+#define DIRAC_ONSET_BETA_FX 32604 /* 0.995f in Q15 */
+#define ONE_DIRAC_ONSET_BETA_FX 163 /* Q15 */
+#define DIRAC_ONSET_GAIN_FX 16384 /* 0.995f in Q12 */
#define DELAY_DIRAC_ENC_CMP_NS 9500000L /* Delay to be compensated on DirAC encoder */
-#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_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) */
#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 */
+#define SPH_IDX_FRONT ( MASA_NO_POINTS_EQUATOR / 2 ) /* Spherical index corresponding to front direction for setting as default value */
#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
-#define DIRAC_MONO_THRESH_SILENCE 3e4f
-#define DIRAC_MONO_NORM_FACTOR 1e13f
-#define DIRAC_MONO_ONE_ON_NORM_FACTOR (1.f / 1e13f)
-#define DIRAC_MONO_MAX_THRESH 1e6f
-#define DIRAC_MONO_MIN_THRESH 1e2f
-#define DIRAC_MONO_FRAME_THRESH 15 /* 30ms */
-
-
-#define DIRAC_MONO_THRESH_SILENCE_FX (Word32)3e4
-#define DIRAC_MONO_NORM_FACTOR_FX (Word64)1e13
-#define DIRAC_MONO_ONE_ON_NORM_FACTOR_FX (Word64)1/1e13
-#define DIRAC_MONO_MAX_THRESH_FX (Word32)1e6
-#define DIRAC_MONO_MIN_THRESH_FX (Word32)1e2
-#define DIRAC_MONO_NORM_FACTOR_M 1220703104
-#define DIRAC_MONO_NORM_FACTOR_E 44
+#define DIRAC_MONO_FRAME_THRESH 15 /* 30ms */
+#define DIRAC_MONO_THRESH_SILENCE_FX (Word32)3e4
+#define DIRAC_MONO_NORM_FACTOR_FX (Word64)1e13
+#define DIRAC_MONO_ONE_ON_NORM_FACTOR_FX (Word64)1/1e13
+#define DIRAC_MONO_MAX_THRESH_FX (Word32)1e6
+#define DIRAC_MONO_MIN_THRESH_FX (Word32)1e2
+#define DIRAC_MONO_NORM_FACTOR_M 1220703104
+#define DIRAC_MONO_NORM_FACTOR_E 44
typedef enum
{
@@ -1088,18 +1045,13 @@ typedef enum
#define IVAS_SPAR_ARITH_OVERSHOOT_BITS 16
/* Common SPAR metadata constants */
-#define IVAS_ACTIVEW_DM_F_SCALE 0.5f
-#define IVAS_ACTIVEW_DM_F_SCALE_FX (1073741824) /* 0.5f in Q31 */
-#define IVAS_ACTIVEW_DM_F_SCALE_DTX 0.25f
-#define IVAS_ACTIVEW_DM_F_SCALE_DTX_FX (536870912) /* 0.25f in Q31 */
-#define IVAS_ACTIVEW_DM_F_SCALE_VLBR 0.25f
-#define IVAS_ACTIVEW_DM_F_SCALE_VLBR_FX (536870912) /* 0.25f in Q31 */
+#define IVAS_ACTIVEW_DM_F_SCALE_FX 1073741824 /* 0.5f in Q31 */
+#define IVAS_ACTIVEW_DM_F_SCALE_DTX_FX 536870912 /* 0.25f in Q31 */
+#define IVAS_ACTIVEW_DM_F_SCALE_VLBR_FX 536870912 /* 0.25f in Q31 */
#define IVAS_SPAR_FOA_DFLT_FREQ_PER_CHAN 24000
-#define IVAS_SPAR_DYN_ACTIVEW_THRESH (0.0039f)
-#define IVAS_SPAR_DYN_ACTIVEW_THRESH_FX (8375186) /* 0.0039f in Q31 */
-#define IVAS_SPAR_SIDE_CH_DYN_ACTIVEW_THRESH (32.0f)
-#define IVAS_SPAR_SIDE_CH_DYN_ACTIVEW_THRESH_Q0 (32)
+#define IVAS_SPAR_DYN_ACTIVEW_THRESH_FX 8375186 /* 0.0039f in Q31 */
+#define IVAS_SPAR_SIDE_CH_DYN_ACTIVEW_THRESH_Q0 32
#define MAX_QUANT_STRATS 3
#define MAX_CODING_STRATS 3
@@ -1154,13 +1106,10 @@ enum
#define IVAS_APD_8_SECT 8
#define IVAS_APD_16_SECT 16
-#define IVAS_DECORR_PARM_LOOKAHEAD_TAU 2e-3f
-#define IVAS_DECORR_PARM_APD_TAU 42949673 // Q31
+#define IVAS_DECORR_PARM_APD_TAU 42949673 /* Q31 */
/* IVAS SBA PCA */
-#define IVAS_PCA_NB_SUBR 20 /* 80 -> 0.25 ms, 40 -> 0.5 ms... */
-#define IVAS_PCA_COV_THRES 3e-5f
-#define IVAS_PCA_QUAT_EPS 1e-7f
+#define IVAS_PCA_NB_SUBR 20 /* 80 -> 0.25 ms, 40 -> 0.5 ms... */
#define IVAS_PCA_QBITS 19
#define IVAS_PCA_N1 91
#define IVAS_PCA_N1_EQ ( (IVAS_PCA_N1-1)/2 )
@@ -1170,15 +1119,10 @@ enum
#define IVAS_PCA_LEN_INTERP_Q ( IVAS_PCA_INTERP * IVAS_PCA_N_SLOTS )
#define IVAS_PCA_DELAY_CMP 24
#define IVAS_PCA_LEN_INTERP_EIG_DEC ( (IVAS_PCA_N_SLOTS+IVAS_PCA_DELAY_CMP)*16)
-#define IVAS_PCA_THRES_MIN_DOT 0.8f
-#define IVAS_PCA_THRES_MIN_DOT2 0.0f
-#define IVAS_PCA_THRES_DIST_ALT 6.0f
-
-#define IVAS_PCA_QUAT_EPS_FX 215 // Q31
-#define IVAS_PCA_THRES_MIN_DOT_FX 1717986918 // 0.8 in Q31
+#define IVAS_PCA_QUAT_EPS_FX 215 /* 1e-7f in Q31 */
+#define IVAS_PCA_THRES_MIN_DOT_FX 1717986918 /* 0.8 in Q31 */
#define IVAS_PCA_THRES_MIN_DOT2_FX 0
-#define IVAS_PCA_THRES_DIST_ALT_FX 1610612736 // 6 in Q28
-
+#define IVAS_PCA_THRES_DIST_ALT_FX 1610612736 /* 6 in Q28 */
typedef enum
{
@@ -1220,6 +1164,7 @@ enum
TOTAL_DECD_QUANT_STRATS
};
+
/*----------------------------------------------------------------------------------*
* MASA constants
*----------------------------------------------------------------------------------*/
@@ -1240,13 +1185,12 @@ enum
#define MASA_TRANSP_BITS 1
#define NO_BITS_MASA_ISM_NO_OBJ 2
-#define MASA2TOTAL_THR_Q30 1052266987 // 0.98f in Q30
+#define MASA2TOTAL_THR_Q30 1052266987 /* 0.98f in Q30 */
//Maximum error in float to fixed conversion : 0.005%
//Assuming the accuracy of 99.995%
//New value = 99.995 / 100 * 0.98 = 0.979951
#define BITS_MASA2TOTTAL_DCT0 6
-#define STEP_M2T 0.1f
-#define STEP_M2T_FX 214748365 // Q31
+#define STEP_M2T_FX 214748365 /* 0.1f in Q31 */
#define MASA_HEADER_BITS 2
#define MASA_SUBFRAME_BITS 1
#define MASA_LOWBITRATE_MODE_BITS 1
@@ -1286,16 +1230,11 @@ enum
#define LIMIT_ER_SIMPLE_ENC 6
#define LIMIT_USE_COMMON 3
-#define MASA_COHERENCE_TOLERANCE 0.1f
-#define MASA_COHERENCE_THRESHOLD 0.1f
-#define MASA_COHERENCE_TOLERANCE_FX 3277/*0.1 Q15*/
-#define MASA_COHERENCE_THRESHOLD_FX 214748365 // 0.1 in Q31
-#define MASA_RATIO_TOLERANCE 0.1f
-#define MASA_RATIO_THRESHOLD 0.1f
-#define MASA_ANGLE_TOLERANCE 0.5f
-#define MASA_RATIO_THRESHOLD_FX 32212255 // 0.015 in Q31
-#define MASA_RATIO_TOLERANCE_FX 107374182 // 0.1 in Q30
-#define MASA_ANGLE_TOLERANCE_FX ONE_IN_Q21 // 0.5 in Q22
+#define MASA_COHERENCE_TOLERANCE_FX 3277 /* 0.1 Q15 */
+#define MASA_COHERENCE_THRESHOLD_FX 214748365 /* 0.1 in Q31 */
+#define MASA_RATIO_THRESHOLD_FX 32212255 /* 0.015 in Q31 */
+#define MASA_RATIO_TOLERANCE_FX 107374182 /* 0.1 in Q30 */
+#define MASA_ANGLE_TOLERANCE_FX ONE_IN_Q21 /* 0.5 in Q22 */
#define MASA_LIMIT_NO_BANDS_SUR_COH 8
#define MINIMUM_BIT_BUDGET_NORMAL_META 100
#define DIFF_DFRATIO_2BIT_LIMIT_IDX_HODIRAC 4
@@ -1309,16 +1248,11 @@ enum
#define MASA_NO_POINTS_EQUATOR 430
#define MASA_NO_CIRCLES 121
-#define MASA_NO_CIRCLES_Q23 ( 1015021568 ) // Q23
-#define MASA_ASIN_OFFSET 0.0064471690266724975f
-#define MASA_ASIN_OFFSET_Q15 ( 211 ) // Q15
-#define MASA_NTOT2_FAC 32768.00566947353f
-#define MASA_NTOT2_FAC_Q15 ( 1073741952 ) // Q15
-#define MASA_ANGLE_AT_EQUATOR 0.012894427382667f
-#define MASA_ANGLE_AT_EQUATOR_Q31 ( 27690572 ) // Q31
-#define MASA_ANGLE_AT_EQUATOR_DEG 0.738796268264740f
-#define MASA_ANGLE_AT_EQUATOR_DEG_Q31 ( 1586552905l ) // Q31
-#define MASA_INV_ANGLE_AT_EQUATOR_DEG 1.353553128183453f
+#define MASA_NO_CIRCLES_Q23 1015021568 /* Q23 */
+#define MASA_ASIN_OFFSET_Q15 211 /* 0.0064471690266724975f in Q15 */
+#define MASA_NTOT2_FAC_Q15 1073741952 /* 32768.00566947353f in Q15 */
+#define MASA_ANGLE_AT_EQUATOR_Q31 27690572 /* 0.012894427382667f in Q31 */
+#define MASA_ANGLE_AT_EQUATOR_DEG_Q31 1586552905l /* 0.738796268264740f in Q31 */
#define MASA_STEREO_MIN_BITRATE IVAS_24k4
#define MAXIMUM_OMASA_FREQ_BANDS 8 /* Corresponds to maximum number of coding bands at 32 kbps */
#define OMASA_STEREO_SW_CNT_MAX 100
@@ -1326,13 +1260,16 @@ enum
#define MASA_MAXIMUM_TWO_DIR_BANDS 24
#define NBITS_HR_COH 4
#define OMASA_TDREND_MATCHING_GAIN_FX 26026
+//TODO: insert proper Q representations
+#define OMASA_GAIN_EDIT_THR_FX 246 /* OMASA gain change threshold, 0.06f in Q12 */
+#define OMASA_AZI_EDIT_THR_FX ONE_IN_Q22 /* OMASA-DISC azimuth change threshold, 1.0f in Q22 */
+#define OMASA_ELE_EDIT_THR_FX ONE_IN_Q23 /* OMASA-DISC elevation change threshold, 2.0f in Q22 */
-#define MASA_INV_ANGLE_AT_EQUATOR_DEG_Q30 (1453366656l)
-
+#define MASA_INV_ANGLE_AT_EQUATOR_DEG_Q30 1453366656l /* 1.353553128183453f in Q30 */
#define MASA_JBM_RINGBUFFER_FRAMES 3
-#define TOLERANCE_360_Q22 1510033326 /* 360 in Q22 + 0.02 in Q22*/
-#define MINUS_TOLERANCE_360_Q22 -1510033326 /* - (360 in Q22 + 0.02 in Q22) */
+#define TOLERANCE_360_Q22 1510033326 /* 360 in Q22 + 0.02 in Q22*/
+#define MINUS_TOLERANCE_360_Q22 -1510033326 /* - (360 in Q22 + 0.02 in Q22) */
typedef enum
{
MASA_STEREO_NOT_DEFINED,
@@ -1381,72 +1318,51 @@ typedef enum
#define MCMASA_SEPARATE_BRATE IVAS_64k /* minimum bitrate from which separated channel coding is supported */
#define MCMASA_MAX_ANA_CHANS 11 /* Maximum number of channels currently used in analysis of multichannel formats */
-#define MCMASA_MONOBITRATIO_64k_Q31 ( 536870912 ) // Q31
-#define MCMASA_MONOBITRATIO_Q31 ( 644245095 ) // Q31
+#define MCMASA_MONOBITRATIO_64k_Q31 536870912 /* Q31 */
+#define MCMASA_MONOBITRATIO_Q31 644245095 /* Q31 */
#define MC_MASA_THR_ELEVATION 40
-#define MCMASA_LFE_QLOW -6.5f
-#define MCMASA_LFE_DELTA 1.0f
-#define MCMASA_LFE_1BIT_THRES 0.03f
-#define MCMASA_LFE_ALPHA 0.67f
-#define MCMASA_LFE_BETA 0.09f
-#define MCMASA_LFE_1BIT_THRES_Q30 32212255 /* 0.03f in Q30 */
-#define MCMASA_LFE_ALPHA_Q30 719407022 /* 0.67f in Q30 */
-#define MCMASA_LFE_BETA_Q30 96636764 /* 0.09f in Q30 */
-#define MCMASA_LFE_THETA 1.3f
-#define MCMASA_LFE_SYNTH_ALPHA 0.95f /* Smoothing coefficient for LFE synthesis */
-#define MCMASA_LFE_SYNTH_ALPHA_Q15 (31129) // Q15
-#define MCMASA_LFE_ALPHA_Q15 (21954) // Q15
-#define MCMASA_LFE_BETA_Q15 (2949) // Q15
-#define MCMASA_LFE_BETA_Q14 (1474) // Q14
-#define MCMASA_LFE_THETA_Q14 (21299) // Q14
-#define MCMASA_LFE_QLOW_Q12 (-26624) // Q12
-#define MCMASA_LFE_DELTA_Q11 (2048) // Q11
-#define MCMASA_LFE_QLOW_Q11 (-13312) // Q11
-#define MCMASA_LFE_DELTA_Q10 (1024) // Q10
+#define MCMASA_LFE_1BIT_THRES_Q30 32212255 /* 0.03f in Q30 */
+#define MCMASA_LFE_ALPHA_Q30 719407022 /* 0.67f in Q30 */
+#define MCMASA_LFE_BETA_Q30 96636764 /* 0.09f in Q30 */
+#define MCMASA_LFE_SYNTH_ALPHA_Q15 31129 /* 0.95f in Q15 */
+#define MCMASA_LFE_ALPHA_Q15 21954 /* 0.67f in Q15 */
+#define MCMASA_LFE_BETA_Q15 2949 /* 0.09f in Q15 */
+#define MCMASA_LFE_BETA_Q14 1474 /* 0.09f in Q14 */
+#define MCMASA_LFE_THETA_Q14 21299 /* 1.3f in Q14 */
+#define MCMASA_LFE_QLOW_Q12 -26624 /* -6.5f in Q12 */
+#define MCMASA_LFE_DELTA_Q11 2048 /* 1.0f in Q11 */
+#define MCMASA_LFE_QLOW_Q11 -13312 /* -6.5f in Q11 */
+#define MCMASA_LFE_DELTA_Q10 1024 /* 1.0f in Q10 */
#define NUM_ELEVATED_SPEAKERS 4
#define MCMASA_MIN_SPEAKERS_SEPARATE_CENTER 4
+
/*----------------------------------------------------------------------------------*
* MCT constants
*----------------------------------------------------------------------------------*/
#define LFE_CHANNEL 3
-#define MIN_LFE_NRG 0.5f
-#ifdef ADJUST_MCT_CHANNELS_MAX
#define MCT_MAX_CHANNELS 11 /* == 7.1.4 LS channels without the LFE channel */
#define MCT_MAX_BLOCKS ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS ) /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/
-#else
-#define MCT_MAX_CHANNELS MAX_TRANSPORT_CHANNELS
-#define MCT_MAX_BLOCKS ( MCT_MAX_CHANNELS / CPE_CHANNELS ) /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/
-
-#define MAX_NUM_DATA max( MCT_MAX_CHANNELS, 4 )
-#endif
-
#define NBBITS_MCT_RATIO 4
#define BITRATE_MCT_RATIO_RANGE ( 1 << NBBITS_MCT_RATIO ) /* Range of the coded bitrate distribution ratio */
#define MCT_NUM_BLOCK_DATA_BITS 4
-/*typedef enum
-{
- MCT_CHAN_MODE_REGULAR,
- MCT_CHAN_MODE_IGNORE
-} MCT_CHAN_MODE;*/
-
/*----------------------------------------------------------------------------------*
* MC Param-Upmix Mode Constants
*----------------------------------------------------------------------------------*/
-#define MC_PARAMUPMIX_MAX_TRANSPORT_CHANS 8
-#define MC_PARAMUPMIX_MAX_INPUT_CHANS 12
-#define MC_PARAMUPMIX_MAX_BITS 1024 /* Maximum number of bits for the MC Param-Upmix metadata */
-#define MC_PARAMUPMIX_COMBINATIONS 4 /* number of sets of 2 channels combined */
-#define MC_PARAMUPMIX_NCH 2 /* number of channels to combine into 1 */
-#define MC_PARAMUPMIX_MIN_CLDFB 8
+#define MC_PARAMUPMIX_MAX_TRANSPORT_CHANS 8
+#define MC_PARAMUPMIX_MAX_INPUT_CHANS 12
+#define MC_PARAMUPMIX_MAX_BITS 1024 /* Maximum number of bits for the MC Param-Upmix metadata */
+#define MC_PARAMUPMIX_COMBINATIONS 4 /* number of sets of 2 channels combined */
+#define MC_PARAMUPMIX_NCH 2 /* number of channels to combine into 1 */
+#define MC_PARAMUPMIX_MIN_CLDFB 8
typedef enum _COV_SMOOTHING_TYPE
{
@@ -1498,11 +1414,8 @@ typedef enum
PARAM_MC_SYNTH_MONO_STEREO /* synthesis to mono or stereo */
} PARAM_MC_SYNTHESIS_CONF;
-#define PARAM_MC_REG_SX_FX (429496729) // Q31 /* Regularization factor for mixing matrix calculation */
-#define PARAM_MC_REG_GHAT_FX (2147483) // Q31 /* Regularization factor for mixing matrix calculation */
-
-#define PARAM_MC_REG_SX (0.2f) /* Regularization factor for mixing matrix calculation */
-#define PARAM_MC_REG_GHAT (0.001f) /* Regularization factor for mixing matrix calculation */
+#define PARAM_MC_REG_SX_FX 429496729 /* Regularization factor for mixing matrix calculation, (0.2f) in Q31 */
+#define PARAM_MC_REG_GHAT_FX 2147483 /* Regularization factor for mixing matrix calculation, (0.001f) in Q31 */
#define PARAM_MC_MAX_PARAMETER_BANDS 20 /* Maximum number of parameter bands */
#define PARAM_MC_MAX_PARAMETER_BANDS_RES 14 /* Maximum number of parameter bands with decorrelation */
#define PARAM_MC_MAX_NSLOTS MAX_JBM_CLDFB_TIMESLOTS /* Maximum number of CLDFB slots in a frame */
@@ -1510,7 +1423,6 @@ typedef enum
#define PARAM_MC_NSUBFRAMES_DEC 4 /* Number of subframes for the synthesis in the decoder */
#define PARAM_MC_MAX_BANDS_IN_PARAMETER_BAND 30 /* Maximum number of CLDFB frequency bands within a parameter band */
#define PARAM_MC_PARAMETER_FRAMES 2 /* Number of frames a parameter set for a parameter band is used*/
-#define PARAM_MC_ICC_ERROR_BIAS_FAC (1.15f) /* factor for favouring past ICC maps in the adaptive ICC map decision */
#define PARAM_MC_TRANSIENT_BAND_STEP 2 /* Number of parameter bands combined in case of a transient frame*/
#define PARAM_MC_MAX_DECORR_CLDFB_BANDS 20 /* Maximum number of CLDFB bands with decorrelation */
#define PARAM_MC_MAX_TRANSPORT_CHANS 3 /* Number of down mix channels */
@@ -1525,27 +1437,23 @@ typedef enum
#define PARAM_MC_NUM_BITS_ICC_SCALAR_QUANT 3 /* Number of bits for ICC uniform coding */
#define PARAM_MC_SZ_ILD_QUANTIZER_4BITS 16 /* Length of the ILD quantizer for Parametric MC */
#define PARAM_MC_NUM_BITS_ILD_SCALAR_QUANT 4 /* Number of bits for ILD uniform coding */
-#define PARAM_MC_DEFAULT_MIN_ILD (-92.0f) /* Default relative channel level for untransmitted channel energies */
-#define PARAM_MC_DEFAULT_MIN_ILD_FX (-23552) // Q8 /* Default relative channel level for untransmitted channel energies */
+#define PARAM_MC_DEFAULT_MIN_ILD_FX (-23552) /* Default relative channel level for untransmitted channel energies, (-92.0f) in Q8 */
#define PARAM_MC_MAX_BITS 1024 /* Maximum number of bits for the Parametric MC metadata */
#define PARAM_MC_MAX_BAND_ABS_COV_ENC 10
#define PARAM_MC_MAX_PARAM_BAND_ABS_COV_ENC 10
#define PARAM_MC_MAX_BAND_ABS_COV_DEC 10
-#define PARAM_MC_ENER_LIMIT_INTRAFRAME (1.5f)
-#define PARAM_MC_ENER_LIMIT_INTRAFRAME_FX_Q21 3145728
-#define PARAM_MC_ENER_LIMIT_INTERFRAME (2.0f)
-#define PARAM_MC_ENER_LIMIT_INTERFRAME_FX_Q21 4194304
-#define PARAM_MC_ENER_LIMIT_MAX_DELTA_FAC (15.0f)
-#define PARAM_MC_ENER_LIMIT_MAX_DELTA_FAC_FX_Q21 31457280
-#define PARAM_MC_NUM_ATTACK_ILD_THRESH (3)
-#define PARAM_MC_LFE_ON_THRESH (8000.0f)
-#define PARAM_MC_LFE_ON_THRESH_FX 8000 // Q0
+#define PARAM_MC_ENER_LIMIT_INTRAFRAME_FX_Q21 3145728 /* (1.5f) in Q21 */
+#define PARAM_MC_ENER_LIMIT_INTERFRAME_FX_Q21 4194304 /* (2.0f) in Q21 */
+#define PARAM_MC_ENER_LIMIT_MAX_DELTA_FAC_FX_Q21 31457280 /* (15.0f) in Q21 */
+#define PARAM_MC_NUM_ATTACK_ILD_THRESH 3
+#define PARAM_MC_LFE_ON_THRESH_FX 8000 /* Q0 */
#define PARAM_MC_BAND_TO_MDCT_BAND_RATIO 16 /* Ratio of resolution of CLDFB Bands to MDCT Bands */
#define PARAM_MC_SLOT_ENC_NS 2500000L
#define PARAM_MC_MDFT_NO_SLOTS 8
-#define INV_PARAM_MC_MDFT_NO_SLOTS_FX 4096 // Q15
+#define INV_PARAM_MC_MDFT_NO_SLOTS_FX 4096 /* Q15 */
#define PARAM_MC_CLDFB_TO_MDFT_FAC 2
+
/*----------------------------------------------------------------------------------*
* LFE Coding Constants
*----------------------------------------------------------------------------------*/
@@ -1575,20 +1483,14 @@ typedef enum
#define IVAS_LFE_NUM_COEFFS_IN_SUBGRP 2
#define IVAS_LFE_MAX_NUM_DCT_PASS_BINS 8
#define IVAS_LFE_MAX_NUM_DCT_COEFFS (IVAS_LFE_MAX_NUM_DCT_PASS_BINS * IVAS_LFE_NUM_COEFFS_IN_SUBGRP)
-#define IVAS_LFE_FADE_NS 8000000L /* 8.0 ms */
-#define IVAS_LFE_FADE_S_Q15 263 /* 8.0 ms in Q15 */
+#define IVAS_LFE_FADE_NS 8000000L /* 8.0 ms */
+#define IVAS_LFE_FADE_S_Q15 263 /* 8.0 ms in Q15 */
#define IVAS_MAX_NUM_QUANT_STRATS 2
#define IVAS_MAX_NUM_DCT_COEF_GROUPS 4
#define IVAS_LFE_SHIFT_BITS 5
#define IVAS_LFE_BITRATE_5000 5000
-#define IVAS_LFE_ABS_SUM_FLT_THR (0.000001f)
-
-#define IVAS_LFE_ABS_SUM_FLT_THR_Q42 4398047
-
-
-#define IVAS_ZERO_PAD_LEN_MULT_FAC (0.5f)
-
-#define IVAS_ZERO_PAD_LEN_MULT_FAC_fx 16384 // 0.5 in Q15
+#define IVAS_LFE_ABS_SUM_FLT_THR_Q42 4398047 /* 0.000001f in Q42 */
+#define IVAS_ZERO_PAD_LEN_MULT_FAC_fx 16384 /* 0.5 in Q15 */
/* LFE PLC */
#define LFE_PLC_BUFLEN 240
@@ -1597,13 +1499,16 @@ typedef enum
#define LFE_PLC_LENANA LFE_PLC_BUFLEN
#define LFE_PLC_FDEL 300
+
/*----------------------------------------------------------------------------------*
* HO Dirac Constants
*----------------------------------------------------------------------------------*/
-#define HODIRAC_BETA (214748368) /* 0.2f in Q30 */
-#define HODIRAC_FAC1 (951579008) /* 1.772454f in Q29 */
-#define HODIRAC_FAC2 (549393984) /* 1.023326f in Q29 */
-#define HODIRAC_FAC3 (317192992) /* 0.590818f in Q29 */
+
+#define HODIRAC_BETA 214748368 /* 0.2f in Q30 */
+#define HODIRAC_FAC1 951579008 /* 1.772454f in Q29 */
+#define HODIRAC_FAC2 549393984 /* 1.023326f in Q29 */
+#define HODIRAC_FAC3 317192992 /* 0.590818f in Q29 */
+
/*----------------------------------------------------------------------------------*
* Amplitude Panning (EFAP, VBAP) constants
@@ -1622,7 +1527,6 @@ typedef enum
EFAP_DMX_INTENSITY
} EFAP_VTX_DMX_TYPE;
-
#define VBAP_NUM_SEARCH_SECTORS 4
@@ -1634,8 +1538,8 @@ typedef enum
#define BINAURAL_MAXBANDS_Q25 2013265920 /* Max number of bands in Q25 */
#define ONE_BY_48000_Q31 44740
#define BINAURAL_CONVBANDS 50 /* Bands upto which convolution is performed */
-#define BINAURAL_NTAPS 3
-#define BINAURAL_NTAPS_SBA BINAURAL_NTAPS
+#define BINAURAL_NTAPS 3
+#define BINAURAL_NTAPS_SBA BINAURAL_NTAPS
#define BINAURAL_NTAPS_MAX 96
@@ -1643,27 +1547,13 @@ typedef enum
#define HRTF_SH_CHANNELS HOA3_CHANNELS
#define HRTF_LS_CHANNELS 15
#define HRTF_NUM_BINS 60
-#define REVERB_PREDELAY_MAX 20 /* Max input delay for reverb module */
-#define GAIN_LFE 1.88364911f /* Gain applied to LFE during renderering */
-#define GAIN_LFE_WORD32 2022552831 // Q30 /* Gain applied to LFE during renderering */
-#define GAIN_LFE_FX 30862 // Q14 /* Gain applied to LFE during renderering */
+#define GAIN_LFE_WORD32 2022552831 /* Gain applied to LFE during renderering, 1.88364911f in Q30 */
+#define GAIN_LFE_FX 30862 /* Gain applied to LFE during renderering, 1.88364911f in Q14 */
#define LOW_BIT_RATE_BINAURAL_EQ_BINS 17 /* Number of bins in an EQ applied at low bit rates in binauralization */
#define LOW_BIT_RATE_BINAURAL_EQ_OFFSET 14 /* Offset of bins where the low-bit-rate EQ starts*/
#define BINAURAL_COHERENCE_DIFFERENCE_BINS 9 /* Number of bins for direction-dependent diffuse-field binaural coherence */
-#ifndef FIX_CREND_SIMPLIFY_CODE
-typedef enum
-{
- BINAURAL_INPUT_AUDIO_CONFIG_INVALID,
- BINAURAL_INPUT_AUDIO_CONFIG_COMBINED, /* 5_1, 5_1_2, 5_1_4, 7_1, 7_1_4 */
- BINAURAL_INPUT_AUDIO_CONFIG_HOA3, /* HOA3 */
- BINAURAL_INPUT_AUDIO_CONFIG_HOA2, /* HOA2 */
- BINAURAL_INPUT_AUDIO_CONFIG_FOA, /* FOA */
- BINAURAL_INPUT_AUDIO_CONFIG_UNDEFINED /* Not used */
-
-} BINAURAL_INPUT_AUDIO_CONFIG;
-#endif
#define HEADROT_ORDER 3
#define HEADROT_SHMAT_DIM ( ( HEADROT_ORDER + 1 ) * ( HEADROT_ORDER + 1 ) )
#define HEADROT_SHMAT_DIM2 ( HEADROT_SHMAT_DIM * HEADROT_SHMAT_DIM )
@@ -1687,22 +1577,18 @@ typedef enum
#define SFX_SPAT_BIN_NUM_SUBSAMPLES 64
#define ITD_MEM_LEN (MAX_ITD + SFX_SPAT_BIN_SINC_M)
#define L_SUBFRAME5MS_48k (L_FRAME48k/4)
-#define MAX_ANGULAR_STEP (0.01f)
-#define MAX_ANGULAR_STEP_INV ( 1.0f / MAX_ANGULAR_STEP )
#define MAX_INTERPOLATION_STEPS 12
+#define DEG_360_IN_Q22 ( 360 << Q22 ) /* Q22 */
+#define DEG_180_IN_Q22 ( 180 << Q22 ) /* Q22 */
+#define DEG_90_IN_Q22 ( 90 << Q22 ) /* Q22 */
+#define ONE_BY_360_Q31 ( 5965232 ) /* Q31 */
+#define ONE_BY_360_Q15 ( 91 ) /* Q15 */
+#define ONE_BY_180_Q31 ( 11930465 ) /* Q31 */
-#define DEG_360_IN_Q22 ( 360 << Q22 ) // Q22
-#define DEG_180_IN_Q22 ( 180 << Q22 ) // Q22
-#define DEG_90_IN_Q22 ( 90 << Q22 ) // Q22
-#define ONE_BY_360_Q31 ( 5965232 ) // Q31
-#define ONE_BY_360_Q15 ( 91 ) // Q15
-#define ONE_BY_180_Q31 ( 11930465 ) // Q31
-
-#ifdef FIX_989_TD_REND_ROM
#define RESAMPLE_FACTOR_16_48_FX ( 5461 ) // Q14
#define RESAMPLE_FACTOR_32_48_FX ( 10922 ) // Q14
-#endif
+
/* ----- Enums - TD Renderer ----- */
@@ -1744,7 +1630,6 @@ typedef enum
} SFX_OpMode_t;
-
/*----------------------------------------------------------------------------------*
* Reverberator constants
*----------------------------------------------------------------------------------*/
@@ -1762,6 +1647,7 @@ typedef enum
#define LR_IAC_LENGTH_NR_FC ( RV_LENGTH_NR_FC )
#define LR_IAC_LENGTH_NR_FC_16KHZ ( RV_LENGTH_NR_FC_16KHZ )
+
/*----------------------------------------------------------------------------------*
* FB mixer constants
*----------------------------------------------------------------------------------*/
@@ -1876,7 +1762,7 @@ typedef enum
#define IVAS_16K_12BANDS_ACTIVE_BANDS 10
#define SPAR_DIRAC_SPLIT_START_BAND 8
-#define DIRAC_TO_SPAR_HBR_PRED_CHS (FOA_CHANNELS - 1)
+#define DIRAC_TO_SPAR_HBR_PRED_CHS (FOA_CHANNELS - 1)
#define SPAR_DTX_BANDS 2
#define SPAR_DTX_BANDS_LOG2 1 /* To be used for shift operation instead of division */
#define DIRAC_DTX_BANDS 2
@@ -1892,22 +1778,14 @@ typedef enum
*----------------------------------------------------------------------------------*/
#define IVAS_LIMITER_THRESHOLD 32729 /* -0.01 dBFS */
-#define IVAS_LIMITER_ATTACK_SECONDS 0.005f
/*----------------------------------------------------------------------------------*
* Early Reflection constants
*----------------------------------------------------------------------------------*/
-#define ER_RADIUS (1.0f)
-#define ER_LIST_ORIGIN_X (0.0f)
-#define ER_LIST_ORIGIN_Y (0.0f)
-#define ER_LIST_HEIGHT (1.6f)
-#define ER_RADIUS_FX (1* ONE_IN_Q30) //Q2.30
-#define ER_LIST_ORIGIN_X_FX (0)
-#define ER_LIST_ORIGIN_Y_FX (0)
-#define ER_LIST_HEIGHT_FX (6710886) /* 1.6 in Q.22 */
-
+#define ER_RADIUS_FX (1* ONE_IN_Q30) /*Q2.30 */
+#define ER_LIST_HEIGHT_FX IVAS_ER_LIST_HEIGHT_FX
/*----------------------------------------------------------------------------------*
@@ -1924,8 +1802,8 @@ typedef enum
#define STEREO_DMX_EVS_SUBBAND_SIZE 2
#define STEREO_DMX_EVS_NB_SUBBAND_MAX (L_FRAME48k / (2 * STEREO_DMX_EVS_SUBBAND_SIZE))
-#define STEREO_DMX_EVS_PHA_LEN_MAX 96 /* Max of PHA_LEN */
-#define STEREO_DMX_EVS_FAD_LEN_MAX 480 /* Max of FAD_LEN */
+#define STEREO_DMX_EVS_PHA_LEN_MAX 96 /* Max of PHA_LEN */
+#define STEREO_DMX_EVS_FAD_LEN_MAX 480 /* Max of FAD_LEN */
#define STEREO_DMX_EVS_DATA_LEN_MAX (STEREO_DMX_EVS_PHA_LEN_MAX + L_FRAME48k)
diff --git a/lib_com/ivas_dirac_com_fx.c b/lib_com/ivas_dirac_com_fx.c
index 7be68453542323370cee38ad5e44df2db8db3a6d..cba992070911995e986aa23a6637d2802d189c5f 100644
--- a/lib_com/ivas_dirac_com_fx.c
+++ b/lib_com/ivas_dirac_com_fx.c
@@ -218,7 +218,6 @@ ivas_error ivas_dirac_config_fx(
}
test();
-#ifdef FIX_2085_FLOATING_POINT_LEFTOVERS
IF( EQ_32( ivas_format, SBA_FORMAT ) || EQ_32( ivas_format, SBA_ISM_FORMAT ) )
{
// 100861_dirac_dec
@@ -228,17 +227,6 @@ ivas_error ivas_dirac_config_fx(
{
ivas_dirac_config_bands_fx( band_grouping, hConfig->nbands, extract_l( Mpy_32_32_r( Fs, INV_CLDFB_BANDWIDTH_Q31 ) ), NULL, 0, 0, hFbMdft, 1 );
}
-#else
- IF( EQ_32( ivas_format, SBA_FORMAT ) || EQ_32( ivas_format, SBA_ISM_FORMAT ) )
- {
- // 100861_dirac_dec
- ivas_dirac_config_bands_fx( band_grouping, IVAS_MAX_NUM_BANDS, (Word16) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), dirac_to_spar_md_bands, hQMetaData->useLowerBandRes, hConfig->enc_param_start_band, hFbMdft, 1 );
- }
- ELSE
- {
- ivas_dirac_config_bands_fx( band_grouping, hConfig->nbands, (Word16) ( Fs * INV_CLDFB_BANDWIDTH + 0.5f ), NULL, 0, 0, hFbMdft, 1 );
- }
-#endif
return error;
}
@@ -510,18 +498,19 @@ void ivas_get_dirac_sba_max_md_bits_fx(
return;
}
+
/*-------------------------------------------------------------------------
* ivas_dirac_sba_config()
*
* DirAC Configuration function for SBA
*------------------------------------------------------------------------*/
+
ivas_error ivas_dirac_sba_config_fx(
IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
Word16 *element_mode, /* i/o: element mode of the core coder */
Word32 sba_total_brate, /* i : SBA total bitrate */
const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word16 nbands /* i : number of frequency bands */
- ,
+ const Word16 nbands, /* i : number of frequency bands */
IVAS_FORMAT ivas_format )
{
Word16 nbands_coded;
@@ -606,14 +595,19 @@ ivas_error ivas_dirac_sba_config_fx(
}
}
- ivas_get_dirac_sba_max_md_bits_fx( sba_total_brate, &hQMetaData->bits_frame_nominal, &hQMetaData->metadata_max_bits, &hQMetaData->qmetadata_max_bit_req, hQMetaData->q_direction[0].cfg.nbands,
- ivas_format );
+ ivas_get_dirac_sba_max_md_bits_fx( sba_total_brate, &hQMetaData->bits_frame_nominal, &hQMetaData->metadata_max_bits, &hQMetaData->qmetadata_max_bit_req, hQMetaData->q_direction[0].cfg.nbands, ivas_format );
return error;
}
-void computeDirectionVectors_fixed(
+/*-------------------------------------------------------------------------
+ * computeDirectionVectors()
+ *
+ *
+ *------------------------------------------------------------------------*/
+
+void computeDirectionVectors_fx2(
Word32 *intensity_real_x, /* i: exp = i_e */
Word32 *intensity_real_y, /* i: exp = i_e */
Word32 *intensity_real_z, /* i: exp = i_e */
@@ -633,6 +627,7 @@ void computeDirectionVectors_fixed(
Word16 norm_x, norm_y, norm_z;
Word32 scaled_x, scaled_y, scaled_z;
Word16 e_x, e_y, e_z;
+
FOR( i = enc_param_start_band; i < enc_param_start_band + num_frequency_bands; ++i )
{
norm_x = norm_l( *intensity_real_x );
@@ -688,11 +683,7 @@ void computeDirectionVectors_fixed(
return;
}
-/*-------------------------------------------------------------------------
- * computeDirectionVectors()
- *
- *
- *------------------------------------------------------------------------*/
+
void computeDirectionVectors_fx(
Word32 *intensity_real_x, // i: Q( i_q )
@@ -722,6 +713,7 @@ void computeDirectionVectors_fx(
Word32 *init_x = intensity_real_x;
Word32 *init_y = intensity_real_y;
Word32 *init_z = intensity_real_z;
+
// First loop to determine the Q for the direction vector
FOR( i = enc_param_start_band; i < enc_param_start_band + num_frequency_bands; ++i )
{
@@ -749,6 +741,7 @@ void computeDirectionVectors_fx(
intensity_real_x = init_x;
intensity_real_y = init_y;
intensity_real_z = init_z;
+
// Actual processing loop for the direction vector
FOR( i = enc_param_start_band; i < enc_param_start_band + num_frequency_bands; ++i )
{
@@ -788,15 +781,18 @@ void computeDirectionVectors_fx(
}
*i_q = min_factor;
move16();
+
return;
}
+
/*-------------------------------------------------------------------------
* computeDiffuseness()
*
*
*------------------------------------------------------------------------*/
-void computeDiffuseness_fixed(
+
+void computeDiffuseness_fx(
Word32 *buffer_intensity[DIRAC_NUM_DIMS][DIRAC_NO_COL_AVG_DIFF], // i: Q(q_factor_intensity)
const Word32 *buffer_energy, // i: Q(q_factor_energy)
const Word16 num_freq_bands,
@@ -820,7 +816,6 @@ void computeDiffuseness_fixed(
Word16 q_ene, q_intensity;
/* Compute Intensity slow and energy slow buffer_intensity and buffer_energy */
-
set_zero_fx( intensity_slow, i_mult( DIRAC_NUM_DIMS, CLDFB_NO_CHANNELS_MAX ) );
set_zero_fx( intensity_slow_abs, CLDFB_NO_CHANNELS_MAX );
set_zero_fx( energy_slow, CLDFB_NO_CHANNELS_MAX );
@@ -979,17 +974,20 @@ void computeDiffuseness_fixed(
return;
}
-Word32 deindex_azimuth_fx( /* o : output Q22 */
- Word16 id_phi, /* i : index */
- const Word16 no_bits, /* i : number of bits for the spherical grid */
- const Word16 id_th, /* i : elevation index */
- const Word16 remap, /* i : remapping flag */
- const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
+
+/* o : output Q22 */
+Word32 deindex_azimuth_fx(
+ Word16 id_phi, /* i : index */
+ const Word16 no_bits, /* i : number of bits for the spherical grid */
+ const Word16 id_th, /* i : elevation index */
+ const Word16 remap, /* i : remapping flag */
+ const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
)
{
Word16 flag_delta;
Word32 dd_fx, delta_phi_fx;
Word32 phi_hat_fx;
+
test();
IF( NE_32( mc_format, MC_LS_SETUP_INVALID ) && EQ_16( no_bits, 2 ) )
{
@@ -1039,6 +1037,7 @@ Word32 deindex_azimuth_fx( /* o : output Q22
}
phi_hat_fx = companding_azimuth_fx( phi_hat_fx, mc_format, flag, -1 );
}
+
return phi_hat_fx;
}
@@ -1100,6 +1099,7 @@ void deindex_spherical_component_fx(
return;
}
+
/*----------------------------------------------------------------
* calculate_hodirac_sector_parameters()
*
diff --git a/lib_com/ivas_error.h b/lib_com/ivas_error.h
index 484faa90fbfc939e28e56c280aa0703a3c146ec4..035819c28339e24c171609cdf9647d5326c06495 100644
--- a/lib_com/ivas_error.h
+++ b/lib_com/ivas_error.h
@@ -77,10 +77,12 @@ typedef enum
IVAS_ERR_EXT_ORIENTATION_NOT_SUPPORTED,
IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,
IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,
+ IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED,
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED,
+#endif
IVAS_ERR_INVALID_HRTF,
-#ifdef FIX_989_TD_REND_ROM
IVAS_ERR_INVALID_HRTF_SAMPLING_RATE,
-#endif
IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,
IVAS_ERR_INVALID_INPUT_FORMAT,
IVAS_ERR_INVALID_INDEX,
@@ -251,12 +253,16 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
return "Directivity not supported";
case IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED:
return "Acoustic environment not supported";
+ case IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED:
+ return "Objects editing not supported";
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ case IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED:
+ return "Wrong use of both Object editing and Non-diegetic panning";
+#endif
case IVAS_ERR_INVALID_HRTF:
return "Unsupported HRTF filter set";
-#ifdef FIX_989_TD_REND_ROM
case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE:
return "Wrong sampling rate in HRTF binary file";
-#endif
case IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA:
return "Renderer data missing in HRTF binary file";
case IVAS_ERR_INVALID_INPUT_FORMAT:
diff --git a/lib_com/ivas_filters_fx.c b/lib_com/ivas_filters_fx.c
index eca54cc55e99e883982da5403341ac6e7f511c67..02e7b272a4beb7759335c88421067918f710763f 100644
--- a/lib_com/ivas_filters_fx.c
+++ b/lib_com/ivas_filters_fx.c
@@ -41,28 +41,27 @@
/*------------------------------------------------------------------------------------------*
* Local functions declaration
*------------------------------------------------------------------------------------------*/
-static void ivas_iir_2_filter_fx(
- ivas_filters_process_state_t *filter_state,
- Word32 *pIn_Out_fx, // Q(31-*pIn_Out_e)
- const Word16 length,
- const Word16 stage,
- Word16 *pIn_Out_e );
+
+static void ivas_iir_2_filter_fx( ivas_filters_process_state_t *filter_state, Word32 *pIn_Out_fx, const Word16 length, const Word16 stage, Word16 *pIn_Out_e );
+
+
/*-----------------------------------------------------------------------------------------*
* Function ivas_filters_init()
*
* Initialisation call for filtering a signal
*-----------------------------------------------------------------------------------------*/
+
void ivas_filters_init_fx(
- ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
- const Word32 *filt_coeff_fx, /* i : filter coefficients Q31- *filt_coeff_e */
- const Word16 *filt_coeff_e, /* i : exponents of filter coefficients */
- const Word16 order ) /* i : filter order */
+ ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
+ const Word32 *filt_coeff_fx, /* i : filter coefficients Q31- *filt_coeff_e */
+ const Word16 *filt_coeff_e, /* i : exponents of filter coefficients */
+ const Word16 order ) /* i : filter order */
{
Word16 i;
+
filter_state->order = order;
move16();
-
test();
IF( EQ_16( order, IVAS_FILTER_ORDER_1 ) )
{
@@ -155,6 +154,7 @@ void ivas_filters_init_fx(
*
* Process call for selecting the type filter
*-----------------------------------------------------------------------------------------*/
+
void ivas_filter_process_fx(
ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
Word32 *pIn_Out_fx, /* i/o: signal subject to filtering Q(q_factor) */
@@ -163,6 +163,7 @@ void ivas_filter_process_fx(
{
Word16 pIn_Out_e[L_FRAME_MAX];
Word16 i;
+
SWITCH( filter_state->order )
{
case IVAS_FILTER_ORDER_1:
@@ -195,6 +196,7 @@ void ivas_filter_process_fx(
return;
}
+
void ivas_filter_process_exp_fx(
ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
Word32 *pIn_Out_fx, /* i/o: signal subject to filtering (exp[i] : pIn_out_e[i]) */
@@ -227,6 +229,7 @@ void ivas_filter_process_exp_fx(
*
* Process call for filtering a signal
*-----------------------------------------------------------------------------------------*/
+
static void ivas_iir_2_filter_fx(
ivas_filters_process_state_t *filter_state,
Word32 *pIn_Out_fx, // Q(31-*pIn_Out_e)
@@ -279,4 +282,6 @@ static void ivas_iir_2_filter_fx(
}
}
}
+
+ return;
}
diff --git a/lib_com/ivas_ism_com_fx.c b/lib_com/ivas_ism_com_fx.c
index 30cd2f29e095ddb08699ac2b5a0e5ca2de9fccbc..ea276c944920f227648b8d0fccf79076571f0806 100644
--- a/lib_com/ivas_ism_com_fx.c
+++ b/lib_com/ivas_ism_com_fx.c
@@ -470,16 +470,22 @@ void ivas_ism_reset_metadata(
hIsmMeta->non_diegetic_flag = 0;
move16();
-#ifdef OBJ_EDITING_API
- hIsmMeta->edited_gain_fx = ONE_IN_Q31;
+ hIsmMeta->edited_gain_fx = ONE_IN_Q29;
+ move32();
hIsmMeta->edited_azimuth_fx = 0;
+ move32();
hIsmMeta->edited_elevation_fx = 0;
+ move32();
hIsmMeta->edited_pitch_fx = 0;
+ move32();
hIsmMeta->edited_yaw_fx = 0;
+ move32();
hIsmMeta->edited_radius_fx = ONE_IN_Q9;
- hIsmMeta->gain_fx = ONE_IN_Q31;
+ move32();
+ hIsmMeta->gain_fx = ONE_IN_Q29;
+ move32();
hIsmMeta->non_diegetic_flag = 0;
-#endif
+ move16();
return;
}
diff --git a/lib_com/ivas_limiter_fx.c b/lib_com/ivas_limiter_fx.c
index 4250d7a7a46db4ebc5500b6754d015d1f25a601d..a293b629c189f7cedfff46ed6caf5e6b4213873d 100644
--- a/lib_com/ivas_limiter_fx.c
+++ b/lib_com/ivas_limiter_fx.c
@@ -41,12 +41,16 @@
#include
#include "ivas_prot_fx.h"
-
-#define ATTACK_CNST_48k ( 2106670080 ) // Q31
-#define ATTACK_CNST_32k ( 2086555136 ) // Q31
-#define ATTACK_CNST_16k ( 2027355264 ) // Q31
-#define ATTACK_CNST_8k ( 1913946752 ) // Q31
-
+#define RELEASE_CNST_20MS ( 85899345 ) // Q30
+#define RELEASE_CNST_2_20MS ( 21474836 ) // Q30
+#define RELEASE_CNST_10MS ( 42949672 ) // Q30
+#define RELEASE_CNST_2_10MS ( 10737418 ) // Q30
+#define RELEASE_CNST_5MS ( 21474836 ) // Q30
+#define RELEASE_CNST_2_5MS ( 5368709 ) // Q30
+#define ATTACK_CNST_48k ( 2106670080 ) // Q31
+#define ATTACK_CNST_32k ( 2086555136 ) // Q31
+#define ATTACK_CNST_16k ( 2027355264 ) // Q31
+#define ATTACK_CNST_8k ( 1913946752 ) // Q31
/*-------------------------------------------------------------------*
* detect_strong_saturations()
@@ -349,24 +353,45 @@ void limiter_process_fx(
* keep the gain curve smoother if the threshold is exceeded in many frames
* in a short span of time.
*/
- SWITCH( output_frame )
+ IF( EQ_32( L_mult0( output_frame, 50 ), hLimiter->sampling_rate ) )
{
- case 960:
- case 640:
- case 320:
- case 160:
- releaseHeuristic_cnst = 85899345; /*Q30*/
- move32();
- releaseHeuristic_cnst_2 = 21474836; /*Q30*/
- move32();
- BREAK;
- default:
- releaseHeuristic_cnst = 21474836; /*Q30*/
- move32();
- releaseHeuristic_cnst_2 = 5368709; /*Q30*/
- move32();
- BREAK;
+ releaseHeuristic_cnst = RELEASE_CNST_20MS;
+ move32();
+ releaseHeuristic_cnst_2 = RELEASE_CNST_2_20MS;
+ move32();
}
+ ELSE IF( EQ_32( L_mult0( output_frame, 100 ), hLimiter->sampling_rate ) )
+ {
+ releaseHeuristic_cnst = RELEASE_CNST_10MS;
+ move32();
+ releaseHeuristic_cnst_2 = RELEASE_CNST_2_10MS;
+ move32();
+ }
+ ELSE IF( EQ_32( L_mult0( output_frame, 200 ), hLimiter->sampling_rate ) )
+ {
+ releaseHeuristic_cnst = RELEASE_CNST_5MS;
+ move32();
+ releaseHeuristic_cnst_2 = RELEASE_CNST_2_5MS;
+ move32();
+ }
+ ELSE
+ {
+ // computing output_frame/hLimiter->sampling_rate in Q30
+ i = norm_s( output_frame );
+ c = norm_l( hLimiter->sampling_rate );
+ scale = extract_h( L_shl( hLimiter->sampling_rate, c ) );
+ idx = shl( output_frame, i );
+ IF( GT_16( idx, scale ) )
+ {
+ idx = shr( idx, 1 );
+ i = sub( i, 1 );
+ }
+ scale = div_s( idx, scale );
+ i = sub( sub( c, i ), 1 ); // Q30
+ releaseHeuristic_cnst_2 = L_shl( scale, i );
+ releaseHeuristic_cnst = L_shl( releaseHeuristic_cnst_2, 2 );
+ }
+
releaseHeuristic = hLimiter->release_heuristic_fx; /* Q30 */
move32();
diff --git a/lib_com/ivas_pca_tools_fx.c b/lib_com/ivas_pca_tools_fx.c
index c84078a7d4291080687cfe2597eafe8af3aba784..e0d42e4040cd90a6dc4f59c0d193d7c2d6d1022a 100644
--- a/lib_com/ivas_pca_tools_fx.c
+++ b/lib_com/ivas_pca_tools_fx.c
@@ -195,7 +195,7 @@ static void house_refl_fx(
IF( ( *normu_fx ) == 0 )
{
- pu_fx[0] = SQRT2_FIXED; // same q as other elements -> Q30
+ pu_fx[0] = SQRT2_FX; // same q as other elements -> Q30
pu_e[0] = 1;
move32();
move16();
@@ -387,8 +387,7 @@ static void house_qr_fx(
move32();
}
-
- pv_fx[s - k] = dotp_fixed( &pu_fx[k], &pa_fx[k], sub( n_rows, k ) ); // exp: tmp_pu_e[k]
+ pv_fx[s - k] = dotp_fx32( &pu_fx[k], &pa_fx[k], sub( n_rows, k ) ); // exp: tmp_pu_e[k]
pv_exp[s - k] = tmp_pu_e[k];
move32();
move16();
@@ -444,7 +443,7 @@ void eig_qr_fx(
move16();
/* check zero matrix */
- d_fx = dotp_fixed( A_fx, A_fx, n * n ); // A_q + A_q - Q31 -> d_q
+ d_fx = dotp_fx32( A_fx, A_fx, n * n ); // A_q + A_q - Q31 -> d_q
d_q = sub( add( A_q, A_q ), 31 );
if ( d_fx != 0 )
@@ -480,7 +479,7 @@ void eig_qr_fx(
}
/* stop condition */
- d_fx = dotp_fixed_guarded( D_fx, D_fx, n * n ); // ( A_q + A_q - 31 ) - find_guarded_bits_fx( n * n )
+ d_fx = dotp_fx_guarded( D_fx, D_fx, n * n ); // ( A_q + A_q - 31 ) - find_guarded_bits_fx( n * n )
d_q = sub( sub( add( A_q, A_q ), 31 ), find_guarded_bits_fx( n * n ) );
exp = sub( 31, d_q );
d_fx = Sqrt32( d_fx, &exp );
diff --git a/lib_com/ivas_prot_fx.h b/lib_com/ivas_prot_fx.h
index f226e5d95f6be98e4bb9bdb429f6d3c1c1cc8200..b24d34ce8542ee11adff3a2cb86db0b0dc5b10e8 100644
--- a/lib_com/ivas_prot_fx.h
+++ b/lib_com/ivas_prot_fx.h
@@ -53,137 +53,131 @@
*----------------------------------------------------------------------------------*/
ivas_error ivas_masa_dec_open_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
);
void ivas_masa_dec_close_fx(
- MASA_DECODER_HANDLE *hMasa /* i/o: MASA metadata structure */
+ MASA_DECODER_HANDLE *hMasa /* i/o: MASA metadata structure */
);
ivas_error create_evs_sce_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- const Word16 sce_id, /* i : SCE # identifier */
- const Word32 element_brate /* i : element bitrate */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ const Word16 sce_id, /* i : SCE # identifier */
+ const Word32 element_brate /* i : element bitrate */
);
void destroy_sce_enc_fx(
- SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure */
- Flag is_evs /* i : Flag to indicate EVS encoder */
+ SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure */
+ Flag is_evs /* i : Flag to indicate EVS encoder */
);
void generate_gridEq_fx(
- SPHERICAL_GRID_DATA *data /* o : data structure for grid */
+ SPHERICAL_GRID_DATA *data /* o : data structure for grid */
);
void masa_sample_rate_band_correction_fx(
- MASA_CODEC_CONFIG *config, /* i/o: MASA codec config */
- Word16 *band_mapping, /* i/o: Band mapping used and modified */
- IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: QMetadata structure for modification */
- const UWord8 maxBand, /* i : max band */
- UWord8 is_encoder, /* i : signals if called at encoder */
- MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */
+ MASA_CODEC_CONFIG *config, /* i/o: MASA codec config */
+ Word16 *band_mapping, /* i/o: Band mapping used and modified */
+ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: QMetadata structure for modification */
+ const UWord8 maxBand, /* i : max band */
+ UWord8 is_encoder, /* i : signals if called at encoder */
+ MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */
);
void ivas_masa_set_elements_fx(
- const Word32 ivas_total_brate, /* i : codec total bitrate */
- const Word16 mc_mode, /* i : MC format mode */
- const Word16 nchan_transport, /* i : number of MASA input/transport channels */
- IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
- Word16 *element_mode, /* o : element mode */
- Word16 *nSCE, /* o : number of SCEs */
- Word16 *nCPE, /* o : number of CPEs */
- const Word16 ivas_format, /* i : IVAS format */
- const ISM_MODE ism_mode, /* i : ISM mode */
- const Word32 ism_total_brate /* i : initial ISM total bitrate */
+ const Word32 ivas_total_brate, /* i : codec total bitrate */
+ const Word16 mc_mode, /* i : MC format mode */
+ const Word16 nchan_transport, /* i : number of MASA input/transport channels */
+ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
+ Word16 *element_mode, /* o : element mode */
+ Word16 *nSCE, /* o : number of SCEs */
+ Word16 *nCPE, /* o : number of CPEs */
+ const Word16 ivas_format, /* i : IVAS format */
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ const Word32 ism_total_brate /* i : initial ISM total bitrate */
);
void ivas_masa_set_coding_config_fx(
- MASA_CODEC_CONFIG *config, /* i/o: MASA coding config structure */
- Word16 *band_mapping, /* o : Band mapping used */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 nchan_transport, /* i : number of transport channels (mono/stereo) */
- const UWord8 isMcMasa /* i : toggle for selecting mcMASA specific config */
+ MASA_CODEC_CONFIG *config, /* i/o: MASA coding config structure */
+ Word16 *band_mapping, /* o : Band mapping used */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 nchan_transport, /* i : number of transport channels (mono/stereo) */
+ const UWord8 isMcMasa /* i : toggle for selecting mcMASA specific config */
);
void ivas_masa_prerender_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- Word32 *output_fx[], /* i/o: synthesized core-coder transport channels */
- Word16 *q_shift, /* o : specifies how much the Q-factor of output has changed by. */
- const Word16 output_frame, /* i : output frame length per channel */
- const Word16 nchan_remapped /* i : number of transports used in core */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ Word32 *output_fx[], /* i/o: synthesized core-coder transport channels */
+ Word16 *q_shift, /* o : specifies how much the Q-factor of output has changed by. */
+ const Word16 output_frame, /* i : output frame length per channel */
+ const Word16 nchan_remapped /* i : number of transports used in core */
);
ivas_error ivas_masa_dec_reconfigure_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesRendered, /* o : number of samples flushed from the previous frame (JBM) */
- Word16 *data /* o : output synthesis signal */
-#endif
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void reconstruct_ism_ratios_fx(
- Word16 *ratio_ism_idx, /* i : index vector Q0 */
- const Word16 nchan_ism, /* i : number of components/objects Q0 */
- const Word32 step, /* i : quantization step Q31 */
- Word32 *q_energy_ratio_ism /* o : reconstructed ISM values Q30 */
+ Word16 *ratio_ism_idx, /* i : index vector Q0 */
+ const Word16 nchan_ism, /* i : number of components/objects Q0 */
+ const Word32 step, /* i : quantization step Q31 */
+ Word32 *q_energy_ratio_ism /* o : reconstructed ISM values Q30 */
);
void distribute_evenly_ism_fx(
- Word16 *idx, /* o : index values */
- const Word16 K, /* i : sum of indexes */
- const Word16 nchan_ism /* i : number of objects */
+ Word16 *idx, /* o : index values */
+ const Word16 K, /* i : sum of indexes */
+ const Word16 nchan_ism /* i : number of objects */
);
Word16 valid_ratio_index_fx(
- Word16 index, /* i : index to be checked */
- const Word16 K, /* i : L1 norm to check against */
- const Word16 len /* i : vector length */
+ Word16 index, /* i : index to be checked */
+ const Word16 K, /* i : L1 norm to check against */
+ const Word16 len /* i : vector length */
);
UWord16 index_theta_phi_16_fx(
- Word32 *p_theta, /* i/o: input elevation to be indexed Q22 */
- Word32 *p_phi, /* i/o: input azimuth to be indexed Q22 */
- const SPHERICAL_GRID_DATA *gridData /* i : generated grid data */
+ Word32 *p_theta, /* i/o: input elevation to be indexed Q22 */
+ Word32 *p_phi, /* i/o: input azimuth to be indexed Q22 */
+ const SPHERICAL_GRID_DATA *gridData /* i : generated grid data */
);
ivas_error ivas_masa_decode_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */
- Decoder_State *st, /* i/o: decoder state structure */
- Word16 *nb_bits_read /* o : number of bits read */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */
+ Decoder_State *st, /* i/o: decoder state structure */
+ Word16 *nb_bits_read /* o : number of bits read */
);
void ivas_omasa_rearrange_channels_fx(
- Word32 *output[], /* o : output synthesis signal */
- const Word16 nchan_transport_ism, /* o : number of ISM TCs */
- const Word16 output_frame /* i : output frame length per channel */
+ Word32 *output[], /* o : output synthesis signal */
+ const Word16 nchan_transport_ism, /* o : number of ISM TCs */
+ const Word16 output_frame /* i : output frame length per channel */
);
ivas_error ivas_omasa_combine_separate_ism_with_masa_open_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void ivas_omasa_combine_separate_ism_with_masa_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- Word32 *output[], /* o : output synthesis signal */
- Word16 *output_q, /* i/o: output Q value */
- const Word16 nchan_ism, /* i : number of ISMs */
- const Word16 output_frame /* i : output frame length per channel */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ Word32 *output[], /* o : output synthesis signal */
+ Word16 *output_q, /* i/o: output Q value */
+ const Word16 nchan_ism, /* i : number of ISMs */
+ const Word16 output_frame /* i : output frame length per channel */
);
ivas_error ivas_omasa_objects_delay_open_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void ivas_omasa_render_objects_from_mix_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- Word32 *output[], /* o : output synthesis signal */
- const Word16 nchan_ism, /* i : number of ISMs */
- const Word16 output_frame, /* i : output frame length per channel */
- Word16 *output_q /* i/o: output Q value */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ Word32 *output[], /* o : output synthesis signal */
+ const Word16 nchan_ism, /* i : number of ISMs */
+ const Word16 output_frame, /* i : output frame length per channel */
+ Word16 *output_q /* i/o: output Q value */
);
-
ivas_error ivas_omasa_ism_metadata_dec_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const Word32 ism_total_brate, /* i : ISM total bitrate */
@@ -194,20 +188,13 @@ ivas_error ivas_omasa_ism_metadata_dec_fx(
);
ivas_error ivas_omasa_dec_config_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
-#ifdef FIX_HRTF_LOAD
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
Word16 *num_src,
Word16 SrcInd[MAX_NUM_TDREND_CHANNELS]
-#else
- UWord16 *nSamplesRendered, /* o : number of samples flushed from the previous frame (JBM) */
- Word16 *num_src,
- Word16 SrcInd[MAX_NUM_TDREND_CHANNELS],
- Word16 *data /* o : output synthesis signal */
-#endif
);
void ivas_omasa_modify_masa_energy_ratios_fx(
- IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
+ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
Word32 masa_to_total_energy_ratio_fx[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_MAXIMUM_CODING_SUBBANDS] // Q30
);
@@ -218,16 +205,16 @@ Word32 calculate_cpe_brate_MASA_ISM_fx(
);
Word16 ivas_jbm_dec_get_num_tc_channels_fx(
- Decoder_Struct *st_ivas /* i : IVAS decoder handle */
+ Decoder_Struct *st_ivas /* i : IVAS decoder handle */
);
ivas_error ivas_jbm_dec_tc_buffer_open_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const TC_BUFFER_MODE tc_buffer_mode, /* i : buffer mode */
- const Word16 nchan_transport_jbm, /* i : number of real transport channels */
- const Word16 nchan_transport_internal, /* i : number of totally buffered channels */
- const Word16 nchan_full, /* i : number of channels to fully store */
- const Word16 n_samples_granularity /* i : granularity of the renderer/buffer */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const TC_BUFFER_MODE tc_buffer_mode, /* i : buffer mode */
+ const Word16 nchan_transport_jbm, /* i : number of real transport channels */
+ const Word16 nchan_transport_internal, /* i : number of totally buffered channels */
+ const Word16 nchan_full, /* i : number of channels to fully store */
+ const Word16 n_samples_granularity /* i : granularity of the renderer/buffer */
);
void ivas_dct_windowing_fx(
@@ -239,152 +226,160 @@ void ivas_dct_windowing_fx(
const Word16 frame_len, /*Q0*/
Word32 *pOut_buf, // Q10
Word32 *pBuffer_prev, // Q10
- Word32 *pTemp_lfe );
+ Word32 *pTemp_lfe
+);
void ivas_get_twid_factors_fx1(
const Word16 length, // Q0
const Word16 **pTwid_re, // Q15
- const Word16 **pTwid_im );
+ const Word16 **pTwid_im
+);
Word32 ivas_get_mdct_scaling_gain_fx(
- const Word16 dct_len_by_2 );
+ const Word16 dct_len_by_2
+);
void ivas_imdct_fx(
const Word32 *pIn, // Q24
Word32 *pOut, // q_out Q9
const Word16 length /*Q0*/,
- Word16 *q_out );
+ Word16 *q_out
+);
void ivas_mdct_fx(
const Word32 *pIn, // q_out
Word32 *pOut, // q_out
const Word16 length, // Q0
- Word16 *q_out );
+ Word16 *q_out
+);
void ivas_itda_fx(
- const Word32 *re, /* i : time alised signal after IDCT Q24 */
- Word32 *pOut, /* o : time domain buffer of size 2*length */
- const Word16 length /* i : length of time alised signal buffer Q0 */
+ const Word32 *re, /* i : time alised signal after IDCT Q24 */
+ Word32 *pOut, /* o : time domain buffer of size 2*length */
+ const Word16 length /* i : length of time alised signal buffer Q0 */
);
void ivas_tda_fx(
- const Word32 *pIn, /* i : time domain buffer of size 2*length Q10*/
- Word32 *pOut, /* o : time domain buffer of size length Q10 */
- const Word16 length /* i : length of time alised signal buffer Q0*/
+ const Word32 *pIn, /* i : time domain buffer of size 2*length Q10*/
+ Word32 *pOut, /* o : time domain buffer of size length Q10 */
+ const Word16 length /* i : length of time alised signal buffer Q0*/
);
-// ivas_agc_dec_fx.c
ivas_error ivas_spar_agc_dec_open_fx(
- ivas_agc_dec_state_t **hAgcDec, /* i/o: SPAR AGC decoder handle */
- const Word32 output_Fs /* i : output sampling rate */
+ ivas_agc_dec_state_t **hAgcDec, /* i/o: SPAR AGC decoder handle */
+ const Word32 output_Fs /* i : output sampling rate */
);
void ivas_spar_agc_dec_close_fx(
- ivas_agc_dec_state_t **hAgcDec /* i/o: SPAR AGC decoder handle */
+ ivas_agc_dec_state_t **hAgcDec /* i/o: SPAR AGC decoder handle */
);
void ivas_agc_dec_process_fx(
- ivas_agc_dec_state_t *hAgcDec, /* i/o: AGC decoder handle */
- Word32 *pcm_in[], /* i : input audio channels */
- Word32 *pcm_out[], /* o : output audio channels */
- const Word16 n_channels, /* i : number of channels */
- const Word16 output_frame /* i : output frame length */
+ ivas_agc_dec_state_t *hAgcDec, /* i/o: AGC decoder handle */
+ Word32 *pcm_in[], /* i : input audio channels */
+ Word32 *pcm_out[], /* o : output audio channels */
+ const Word16 n_channels, /* i : number of channels */
+ const Word16 output_frame /* i : output frame length */
);
void ivas_agc_read_bits_fx(
- ivas_agc_dec_state_t *hAgcDec, /* i/o: AGC decoder handle */
- Decoder_State *st0, /* i/o: decoder state structure - for bitstream handling */
- const Word16 n_channels, /* i : number of channels */
- const Word16 AGC_flag /* i : AGC on/off flag */
+ ivas_agc_dec_state_t *hAgcDec, /* i/o: AGC decoder handle */
+ Decoder_State *st0, /* i/o: decoder state structure - for bitstream handling */
+ const Word16 n_channels, /* i : number of channels */
+ const Word16 AGC_flag /* i : AGC on/off flag */
);
-// ivas_agc_com_fx.c
void ivas_agc_initWindowFunc_fx(
Word16 *pWinFunc, // o: Q15
- const Word16 length );
+ const Word16 length
+);
void ivas_agc_calcGainParams_fx(
UWord16 *absEmin, // o: Q0
UWord16 *betaE, // o: Q0
UWord16 *maxAttExp, // o: Q0
- const Word16 numCoeffs );
+ const Word16 numCoeffs
+);
void ivas_transient_det_process_fx(
- ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */
- Word32 *pIn_pcm, /* i : input audio channels */
- const Word16 frame_len, /* i : frame length in samples */
- Word16 transient_det[2] /* o : transient det outputs */
+ ivas_trans_det_state_t *hTranDet, /* i/o: SPAR TD handle */
+ Word32 *pIn_pcm, /* i : input audio channels */
+ const Word16 frame_len, /* i : frame length in samples */
+ Word16 transient_det[2] /* o : transient det outputs */
);
void ivas_td_decorr_get_ducking_gains_fx(
- ivas_trans_det_state_t *hTranDet, /* i/o: Transient detector handle */
+ ivas_trans_det_state_t *hTranDet, /* i/o: Transient detector handle */
Word32 *pIn_pcm,
Word32 *pIn_duck_gains,
Word32 *pOut_duck_gains,
const Word16 frame_len,
- const Word16 tdet_flag );
+ const Word16 tdet_flag
+);
-// ivas_stereo_eclvq_dec.c
-void ECSQ_decode(
+void ECSQ_decode_fx(
ECSQ_instance *ecsq_inst,
const Word16 N,
- Word16 *output );
+ Word16 *output
+);
-// bass_psfilter.c
Word16 res_bpf_adapt_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo decoder handle */
- const Word32 *bpf_error_signal_8k, /* i : BPF modification signal */
- Word32 res_buf[STEREO_DFT_N_8k] /* i : residual buffer */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo decoder handle */
+ const Word32 *bpf_error_signal_8k, /* i : BPF modification signal */
+ Word32 res_buf[STEREO_DFT_N_8k] /* i : residual buffer */
);
-// ivas_sns_com_fx.c
void sns_compute_scf_fx(
Word32 spectrum[], /* i : Spectrum (Q_in) */
const PsychoacousticParameters *pPsychParams,
const Word16 L_frame,
Word32 *scf, /* o : Scalefactors (Q16)*/
- Word16 q );
+ Word16 q
+);
void sns_interpolate_scalefactors_fx(
- Word32 *scf_int, /* o : interpolated scalefactors for spectrum shaping q16*/
- const Word32 *scf, /* i : sns scalefactors as derived from the signal or read from the bitstream Q16*/
- Word16 encoder_side /* i : flag, if scalefactors have to be inverted */
+ Word32 *scf_int, /* o : interpolated scalefactors for spectrum shaping q16*/
+ const Word32 *scf, /* i : sns scalefactors as derived from the signal or read from the bitstream Q16*/
+ Word16 encoder_side /* i : flag, if scalefactors have to be inverted */
);
void sns_shape_spectrum_fx(
- Word32 spectrum[], /* i/o: spectrum to be shaped Input Q is q_spectrum and ouput Q is (q_spectrum-1)*/
- Word16 *q_spectrum, /* i/o: Q of spectrum */
- const PsychoacousticParameters *pPsychParams, /* i : psychoacoustic parameters used to get the frequency bands */
- const Word32 *scf_int, /* i : already interpolated SNS scalefactors */
- const Word16 q_scf_int, /* i : Q of interpolated SNS scalefactors q_scf_int*/
- const Word16 L_frame, /* i : frame length */
- Word16 *length );
-
-// ivas_stereo_eclvq_com_fx.c
+ Word32 spectrum[], /* i/o: spectrum to be shaped Input Q is q_spectrum and ouput Q is (q_spectrum-1)*/
+ Word16 *q_spectrum, /* i/o: Q of spectrum */
+ const PsychoacousticParameters *pPsychParams, /* i : psychoacoustic parameters used to get the frequency bands */
+ const Word32 *scf_int, /* i : already interpolated SNS scalefactors */
+ const Word16 q_scf_int, /* i : Q of interpolated SNS scalefactors q_scf_int*/
+ const Word16 L_frame, /* i : frame length */
+ Word16 *length
+);
+
Word32 ECSQ_dequantize_gain_fx(
- const Word16 index );
+ const Word16 index
+);
void stereo_tca_enc_fx(
- CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
- const Word16 input_frame /* i : length of a frame per channel */
+ CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
+ const Word16 input_frame /* i : length of a frame per channel */
);
void ECSQ_dequantize_vector_fx(
const Word16 *input, /*qx*/
const Word32 global_gain, /*q15*/
const Word16 N,
- Word32 *output /*qx*/ );
+ Word32 *output /*qx*/
+);
void ECSQ_init_instance_fx(
ECSQ_instance *ecsq_inst,
const Word16 config_index,
- void *ac_handle );
+ void *ac_handle
+);
void decoder_tcx_invQ_fx(
- Decoder_State *st, /* i/o: coder memory state */
- Word16 prm[], /* i : parameters */
- Word16 A[], /* i : coefficients NxAz[M+1] */
- Word16 Aind[], /* i : frame-independent coefficients Az[M+1] */
+ Decoder_State *st, /* i/o: coder memory state */
+ Word16 prm[], /* i : parameters */
+ Word16 A[], /* i : coefficients NxAz[M+1] */
+ Word16 Aind[], /* i : frame-independent coefficients Az[M+1] */
const Word16 L_spec,
const Word16 L_frame,
const Word16 L_frameTCX,
@@ -392,22 +387,22 @@ void decoder_tcx_invQ_fx(
Word16 *x_e,
Word16 gainlpc2[],
Word16 gainlpc2_e[],
- Word16 xn_buf[], /* Q14 */
- Word16 *fUseTns, /* o : flag that is set if TNS data is present */
+ Word16 xn_buf[], /* Q14 */
+ Word16 *fUseTns, /* o : flag that is set if TNS data is present */
STnsData *tnsData,
Word16 *gain_tcx,
Word16 *gain_tcx_e,
const Word16 **prm_sqQ1,
Word16 *nf_seed,
- const Word16 bfi, /* i : Bad frame indicator */
- const Word16 frame_cnt /* i : frame counter in the super frame */
+ const Word16 bfi, /* i : Bad frame indicator */
+ const Word16 frame_cnt /* i : frame counter in the super frame */
);
void decoder_tcx_noisefilling_fx(
- Decoder_State *st, /* i/o: coder memory state */
+ Decoder_State *st, /* i/o: coder memory state */
const Word32 concealment_noise[L_FRAME48k],
const Word16 concealment_noise_exp,
- const Word16 A[], /* i : coefficients NxAz[M+1] */
+ const Word16 A[], /* i : coefficients NxAz[M+1] */
const Word16 L_frameTCX_glob,
const Word16 L_spec,
const Word16 L_frame,
@@ -421,13 +416,13 @@ void decoder_tcx_noisefilling_fx(
const Word16 gain_tcx_e,
const Word16 *prm_sqQ,
Word16 nf_seed,
- const Word16 bfi, /* i : Bad frame indicator */
+ const Word16 bfi, /* i : Bad frame indicator */
const Word16 MCT_flag,
- const Word16 frame_cnt /* i : frame counter in the super frame*/
+ const Word16 frame_cnt /* i : frame counter in the super frame */
);
void decoder_tcx_noiseshaping_igf_fx(
- Decoder_State *st, /* i/o: coder memory state */
+ Decoder_State *st, /* i/o: coder memory state */
const Word16 L_spec,
const Word16 L_frame,
const Word16 L_frameTCX,
@@ -438,283 +433,293 @@ void decoder_tcx_noiseshaping_igf_fx(
const Word16 gainlpc2_fx[],
const Word16 gainlpc2_e[],
Word16 *temp_concealment_method,
- const Word16 bfi /* i : Bad frame indicator */
+ const Word16 bfi /* i : Bad frame indicator */
);
void init_tcx_info_fx(
- Decoder_State *st, /* i/o: coder memory state */
- const Word16 L_frame_glob, /* i : global frame length */
- const Word16 L_frameTCX_glob, /* i : FB global frame length */
- const Word16 frame_cnt, /* i : frame counter in the super_frame */
- const Word16 bfi, /* i : bad frame indicator */
- Word16 *tcx_offset, /* o : folding point offset relative to the end of the previous frame */
- Word16 *tcx_offsetFB, /* o : FB folding point offset relative to the end of the previous frame*/
- Word16 *L_frame, /* o : frame length */
- Word16 *L_frameTCX, /* o : TCX frame length */
- Word16 *left_rect, /* o : left part is rectangular */
- Word16 *L_spec /* o : spectrum length */
+ Decoder_State *st, /* i/o: coder memory state */
+ const Word16 L_frame_glob, /* i : global frame length */
+ const Word16 L_frameTCX_glob, /* i : FB global frame length */
+ const Word16 frame_cnt, /* i : frame counter in the super_frame */
+ const Word16 bfi, /* i : bad frame indicator */
+ Word16 *tcx_offset, /* o : folding point offset relative to the end of the previous frame */
+ Word16 *tcx_offsetFB, /* o : FB folding point offset relative to the end of the previous frame*/
+ Word16 *L_frame, /* o : frame length */
+ Word16 *L_frameTCX, /* o : TCX frame length */
+ Word16 *left_rect, /* o : left part is rectangular */
+ Word16 *L_spec /* o : spectrum length */
);
void decoder_tcx_IGF_mono_fx(
- Decoder_State *st, /* i/o: coder memory state */
- Word32 x_fx[], /* o : de-quatized coefficients */
- Word16 *x_e, /* o : de-quatized coefficients exponent */
- Word16 *x_len, /* o : de-quatized coefficients length */
- const Word16 L_frame, /* i : frame length */
- const Word16 left_rect, /* i : left part is rectangular */
- const Word16 bfi, /* i : bad frame indicator */
- const Word16 frame_cnt /* i : frame counter in the super_frame */
+ Decoder_State *st, /* i/o: coder memory state */
+ Word32 x_fx[], /* o : de-quatized coefficients */
+ Word16 *x_e, /* o : de-quatized coefficients exponent */
+ Word16 *x_len, /* o : de-quatized coefficients length */
+ const Word16 L_frame, /* i : frame length */
+ const Word16 left_rect, /* i : left part is rectangular */
+ const Word16 bfi, /* i : bad frame indicator */
+ const Word16 frame_cnt /* i : frame counter in the super_frame */
);
void decoder_tcx_IGF_stereo_fx(
- Decoder_State **sts, /* i/o: coder memory states */
- STEREO_MDCT_DEC_DATA_HANDLE hStereoMdct, /* i/o: MDCT stereo structure */
- Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */
- Word32 *x_fx[CPE_CHANNELS][NB_DIV], /* i/o: de-quatized coefficients */
- Word16 x_e[CPE_CHANNELS][NB_DIV], /* i/o: de-quatized coefficients exponents */
- Word16 x_len[CPE_CHANNELS][NB_DIV], /* o : length of de-quantized coefficients */
- const Word16 L_frame, /* i : frame length */
- const Word16 left_rect, /* i : left part is rectangular */
- const Word16 k, /* i : Subframe index */
- const Word16 bfi, /* i : bad frame indicator */
- const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0) */
+ Decoder_State **sts, /* i/o: coder memory states */
+ STEREO_MDCT_DEC_DATA_HANDLE hStereoMdct, /* i/o: MDCT stereo structure */
+ Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */
+ Word32 *x_fx[CPE_CHANNELS][NB_DIV], /* i/o: de-quatized coefficients */
+ Word16 x_e[CPE_CHANNELS][NB_DIV], /* i/o: de-quatized coefficients exponents */
+ Word16 x_len[CPE_CHANNELS][NB_DIV], /* o : length of de-quantized coefficients */
+ const Word16 L_frame, /* i : frame length */
+ const Word16 left_rect, /* i : left part is rectangular */
+ const Word16 k, /* i : Subframe index */
+ const Word16 bfi, /* i : bad frame indicator */
+ const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0) */
);
void IGFDecReplicateTCX10State_fx(
- IGF_DEC_INSTANCE_HANDLE hIGFDec /* i/o: instance handle of IGF Decoder */
+ IGF_DEC_INSTANCE_HANDLE hIGFDec /* i/o: instance handle of IGF Decoder */
);
-Word16 get_igf_startline(
- Decoder_State *st, /* i : decoder state */
- const Word16 L_frame, /* i : length of the frame */
- const Word16 L_frameTCX /* i : full band frame length */
+Word16 get_igf_startline_fx(
+ Decoder_State *st, /* i : decoder state */
+ const Word16 L_frame, /* i : length of the frame */
+ const Word16 L_frameTCX /* i : full band frame length */
);
void stereo_dft_dec_reset_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft /* i/o: decoder DFT stereo handle */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft /* i/o: decoder DFT stereo handle */
);
void stereo_dft_dec_update_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */
- const Word16 output_frame, /* i : output frame length */
- const Word16 sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */
+ const Word16 output_frame, /* i : output frame length */
+ const Word16 sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
);
+
void stereo_dft_res_ecu_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: Decoder DFT stereo handle */
- Word32 *pDFT_RES, /* i/o: residual signal */
- Word32 *const DFT_PRED_RES, /* i/o: residual prediction signal */
- const Word16 k, /* i : Subframe index */
- const Word16 output_frame, /* i : Output frame length */
- const Word16 prev_bfi, /* i : Previous BFI */
- const Word32 dmx_nrg, /* i : Down-mix energy */
- Word16 *num_plocs, /* i/o: Number of peak locations */
- Word16 *plocs, /* i/o: Peak locations (bin) */
- Word32 *plocsi, /* i/o: Peak locations (fractional) */
- Word32 *input_mem /* o : Residual DFT buffer input mem */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: Decoder DFT stereo handle */
+ Word32 *pDFT_RES, /* i/o: residual signal */
+ Word32 *const DFT_PRED_RES, /* i/o: residual prediction signal */
+ const Word16 k, /* i : Subframe index */
+ const Word16 output_frame, /* i : Output frame length */
+ const Word16 prev_bfi, /* i : Previous BFI */
+ const Word32 dmx_nrg, /* i : Down-mix energy */
+ Word16 *num_plocs, /* i/o: Number of peak locations */
+ Word16 *plocs, /* i/o: Peak locations (bin) */
+ Word32 *plocsi, /* i/o: Peak locations (fractional) */
+ Word32 *input_mem /* o : Residual DFT buffer input mem */
);
+
void stereo_dft_res_subst_spec_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: Decoder DFT stereo handle */
- Word32 *pDFT_RES, /* i/o: residual signal */
- const Word32 *const DFT_PRED_RES, /* i : residual prediction signal */
- const Word16 time_offs, /* i : Time offset for phase adjustment*/
- const Word16 L_res, /* i : bandwidth of residual signal */
- const Word16 L_ana, /* i : Length of FFT analysis */
- const Word16 k, /* i : Subframe index */
- Word16 *num_plocs, /* i/o: Number of peak locations */
- Word16 *plocs, /* i/o: Peak locations (bin) */
- Word32 *plocsi, /* i/o: Peak locations (fractional) */
- const Word16 analysis_flag /* i : Flag for running peak analysis */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: Decoder DFT stereo handle */
+ Word32 *pDFT_RES, /* i/o: residual signal */
+ const Word32 *const DFT_PRED_RES, /* i : residual prediction signal */
+ const Word16 time_offs, /* i : Time offset for phase adjustment */
+ const Word16 L_res, /* i : bandwidth of residual signal */
+ const Word16 L_ana, /* i : Length of FFT analysis */
+ const Word16 k, /* i : Subframe index */
+ Word16 *num_plocs, /* i/o: Number of peak locations */
+ Word16 *plocs, /* i/o: Peak locations (bin) */
+ Word32 *plocsi, /* i/o: Peak locations (fractional) */
+ const Word16 analysis_flag /* i : Flag for running peak analysis */
);
+
void stereo_dft_res_ecu_burst_att_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: Decoder DFT stereo handle */
- Word32 *pDFT_RES, /* i/o: residual signal /att. residual */
- const Word32 dmx_nrg, /* i : dmx energy of current frame */
- const Word16 L_res, /* i : Bandwidth of residual */
- const Word16 L_ana /* i : Length of FFT analysis */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: Decoder DFT stereo handle */
+ Word32 *pDFT_RES, /* i/o: residual signal /att. residual */
+ const Word32 dmx_nrg, /* i : dmx energy of current frame */
+ const Word16 L_res, /* i : Bandwidth of residual */
+ const Word16 L_ana /* i : Length of FFT analysis */
);
void stereo_dft_generate_res_pred_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */
- const Word16 samp_ratio, /* i : sampling ratio */
- Word32 *pDFT_DMX, /* i : downmix signal */
- Word32 *DFT_PRED_RES, /* o : residual prediction signal */
- Word32 *pPredGain, /* i : residual prediction gains */
- const Word16 k, /* i : subframe index */
- Word32 *ap_filt_DMX, /* i : enhanced stereo filling signal */
- Word16 *stop, /* o : last FD stereo filling bin */
- const Word16 bfi /* i : BFI flag */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */
+ const Word16 samp_ratio, /* i : sampling ratio */
+ Word32 *pDFT_DMX, /* i : downmix signal */
+ Word32 *DFT_PRED_RES, /* o : residual prediction signal */
+ Word32 *pPredGain, /* i : residual prediction gains */
+ const Word16 k, /* i : subframe index */
+ Word32 *ap_filt_DMX, /* i : enhanced stereo filling signal */
+ Word16 *stop, /* o : last FD stereo filling bin */
+ const Word16 bfi /* i : BFI flag */
);
void stereo_dft_dec_analyze_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- const Word32 *input_fx, /* i : input signal */
- Word32 out_DFT_fx[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
- const Word16 chan, /* i : channel number */
- const Word16 input_frame, /* i : input frame size */
- const Word16 output_frame, /* i : output frame size */
- const DFT_STEREO_DEC_ANA_TYPE ana_type, /* i : signal type to analyze */
- const Word16 k_offset, /* i : offset of DFT */
- const Word16 delay, /* i : delay in samples for input signal */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ const Word32 *input_fx, /* i : input signal */
+ Word32 out_DFT_fx[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
+ const Word16 chan, /* i : channel number */
+ const Word16 input_frame, /* i : input frame size */
+ const Word16 output_frame, /* i : output frame size */
+ const DFT_STEREO_DEC_ANA_TYPE ana_type, /* i : signal type to analyze */
+ const Word16 k_offset, /* i : offset of DFT */
+ const Word16 delay, /* i : delay in samples for input signal */
Word16 *q,
- Word16 *q_out_DFT );
+ Word16 *q_out_DFT
+);
void init_basic_allpass_fx(
basic_allpass_t *ap,
const Word32 *gains_fx,
- const Word16 *delays );
+ const Word16 *delays
+);
void filter_with_allpass_fx(
- const Word32 *sig, /* i : allpass input signal */
- Word32 *out, /* o : filtered output */
- const Word16 len, /* i : length of input */
- basic_allpass_t *ap, /* i/o: basic allpass structure */
- Word16 q_shift );
+ const Word32 *sig, /* i : allpass input signal */
+ Word32 *out, /* o : filtered output */
+ const Word16 len, /* i : length of input */
+ basic_allpass_t *ap, /* i/o: basic allpass structure */
+ Word16 q_shift
+);
Word32 stereo_dft_dmx_swb_nrg_fx(
- const Word32 *dmx_k0, /* i : first subframe spectrum */
- const Word32 *dmx_k1, /* i : second subframe spectrum */
- const Word16 frame_length, /* i : frame lanegth */
+ const Word32 *dmx_k0, /* i : first subframe spectrum */
+ const Word32 *dmx_k1, /* i : second subframe spectrum */
+ const Word16 frame_length, /* i : frame lanegth */
const Word16 q0,
- const Word16 q1 );
+ const Word16 q1
+);
void stereo_dft_dec_core_switching_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 output_fx[], /* i/o: synthesis @internal Fs */
- Word32 synth_fx[], /* i/o: synthesis @output Fs */
- Word32 hb_synth_fx[], /* i/o: hb synthesis */
- Word32 DFT_fx[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
- const Word16 output_frame, /* i : output frame length */
- const Word16 use_cldfb_for_dft, /* i : flag to use of CLDFB FOR DFT Stereo */
- const Word16 sba_dirac_stereo_dtx_flag, /* i : DTX indicator FOR SBA DirAC stereo */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 output_fx[], /* i/o: synthesis @internal Fs */
+ Word32 synth_fx[], /* i/o: synthesis @output Fs */
+ Word32 hb_synth_fx[], /* i/o: hb synthesis */
+ Word32 DFT_fx[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
+ const Word16 output_frame, /* i : output frame length */
+ const Word16 use_cldfb_for_dft, /* i : flag to use of CLDFB FOR DFT Stereo */
+ const Word16 sba_dirac_stereo_dtx_flag, /* i : DTX indicator FOR SBA DirAC stereo */
Word16 *q,
- Word16 *q_DFT );
+ Word16 *q_DFT
+);
Word16 ivas_get_hodirac_flag_fx(
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 sba_order /* i : Ambisonic (SBA) order */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 sba_order /* i : Ambisonic (SBA) order */
);
void ivas_sba_config_fx(
- const Word32 sba_total_brate, /* i : SBA total bitrate */
- Word16 sba_order, /* i : Ambisonic (SBA) order */
- Word16 nb_channels, /* i : Number of ambisonic channels */
- Word16 *nchan_transport, /* o : number of transport channels */
- const Word16 sba_planar, /* i : SBA Planar flag */
- Word16 *nSCE, /* o : number of SCEs */
- Word16 *nCPE, /* o : number of CPEs */
- Word16 *element_mode /* o : element mode of the core coder */
+ const Word32 sba_total_brate, /* i : SBA total bitrate */
+ Word16 sba_order, /* i : Ambisonic (SBA) order */
+ Word16 nb_channels, /* i : Number of ambisonic channels */
+ Word16 *nchan_transport, /* o : number of transport channels */
+ const Word16 sba_planar, /* i : SBA Planar flag */
+ Word16 *nSCE, /* o : number of SCEs */
+ Word16 *nCPE, /* o : number of CPEs */
+ Word16 *element_mode /* o : element mode of the core coder */
);
Word16 ivas_get_bits_to_encode(
- Word32 val );
+ Word32 val
+);
Word16 ivas_get_spar_table_idx_fx(
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word16 bwidth, /* i : audio bandwidth */
- Word16 *bitlen, /* o : number of bits */
- Word16 *ind /* o : indice */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 sba_order, /* i : Ambisonic (SBA) order */
+ const Word16 bwidth, /* i : audio bandwidth */
+ Word16 *bitlen, /* o : number of bits */
+ Word16 *ind /* o : indice */
);
Word16 ivas_get_sba_num_TCs_fx(
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 sba_order /* i : Ambisonic (SBA) order */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 sba_order /* i : Ambisonic (SBA) order */
);
Word16 ivas_sba_get_nchan_fx(
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word16 sba_planar /* i : SBA planar flag */
+ const Word16 sba_order, /* i : Ambisonic (SBA) order */
+ const Word16 sba_planar /* i : SBA planar flag */
);
void ivas_dirac_dec_set_md_map_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 nCldfbTs /* i : number of CLDFB time slots */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 nCldfbTs /* i : number of CLDFB time slots */
);
void ivas_jbm_dec_get_adapted_subframes_fx(
- const Word16 nCldfbTs, /* i : number of time slots in the current frame */
- Word16 *subframe_nbslots, /* i/o: subframe grid */
- Word16 *nb_subframes /* i/o: number of subframes in the frame */
+ const Word16 nCldfbTs, /* i : number of time slots in the current frame */
+ Word16 *subframe_nbslots, /* i/o: subframe grid */
+ Word16 *nb_subframes /* i/o: number of subframes in the frame */
);
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
void ivas_jbm_dec_copy_tc_no_tsm_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle Q0 */
- Word32 *tc_fx[], /* i : transport channels Q11 */
- const Word16 output_frame /* i : output frame size Q0 */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle Q0 */
+ Word32 *tc_fx[], /* i : transport channels Q11 */
+ const Word16 output_frame /* i : output frame size Q0 */
);
void ivas_ism_param_dec_tc_gain_ajust_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nSamples, /* i : number of samples to be compensate */
- const UWord16 nFadeLength, /* i : length of the crossfade in samples */
- Word32 *transport_channels_f[], /* i : synthesized core-coder transport channels/DirAC output Q_tc*/
- Word16 *Q_tc /* i/o : Q of input tc buffer */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nSamples, /* i : number of samples to be compensate */
+ const UWord16 nFadeLength, /* i : length of the crossfade in samples */
+ Word32 *transport_channels_f[], /* i : synthesized core-coder transport channels/DirAC output Q_tc*/
+ Word16 *Q_tc /* i/o : Q of input tc buffer */
);
-
+#endif
/*! r: number of bits read */
Word16 read_GR0(
- const UWord16 *bit_stream, /* i : bitstream to be read */
- Word16 *ind, /* o : parameters read */
- const Word16 len /* i : number of params to be read */
+ const UWord16 *bit_stream, /* i : bitstream to be read */
+ Word16 *ind, /* o : parameters read */
+ const Word16 len /* i : number of params to be read */
);
/*! r: read value */
Word16 get_value(
- const UWord16 *bit_stream, /* i : bitstream */
- const Word16 nbits /* i : number of bits to be read */
+ const UWord16 *bit_stream, /* i : bitstream */
+ const Word16 nbits /* i : number of bits to be read */
);
/*! r: number of bits read */
Word16 read_BS_GR(
- const UWord16 *bit_stream, /* i : bitstream to be read */
- const Word16 nb, /* i : starting point in bitstream */
- Word16 *ind1, /* o : data array read */
- const Word16 len, /* i : number of params to be read */
- Word16 *GR_ord /* o : GR order to be used */
+ const UWord16 *bit_stream, /* i : bitstream to be read */
+ const Word16 nb, /* i : starting point in bitstream */
+ Word16 *ind1, /* o : data array read */
+ const Word16 len, /* i : number of params to be read */
+ Word16 *GR_ord /* o : GR order to be used */
);
/*! r: number of bits read */
Word16 read_BS_adapt_GR_sg(
- const UWord16 *bit_stream, /* i : bitstream to be read */
- const Word16 nb, /* i : starting position in bitstream */
- Word16 *ind1, /* o : decoded side gain values */
- const Word16 len, /* i : number of params to be read */
- Word16 *GR_ord, /* o : GR order used (read from bitstream)*/
- const Word16 *map0 /* i : initial map */
+ const UWord16 *bit_stream, /* i : bitstream to be read */
+ const Word16 nb, /* i : starting position in bitstream */
+ Word16 *ind1, /* o : decoded side gain values */
+ const Word16 len, /* i : number of params to be read */
+ Word16 *GR_ord, /* o : GR order used (read from bitstream) */
+ const Word16 *map0 /* i : initial map */
);
/*! r: number of bits read */
Word16 read_itd(
- Decoder_State *st, /* i : Decoder state */
- Word16 *pI /* o : ITD value */
+ Decoder_State *st, /* i : Decoder state */
+ Word16 *pI /* o : ITD value */
);
/*! r: number of bits read */
Word16 read_BS_adapt_GR_rpg(
- const UWord16 *bit_stream, /* i : bitstream to be read */
- const Word16 nb, /* i : starting point in bitstream */
- Word16 *ind1_pred, /* o : decoded res pred gains */
- const Word16 start, /* i : starting subband */
- const Word16 total_no, /* i : number of params to be read */
- Word16 *GR_ord /* o : GR order - read */
+ const UWord16 *bit_stream, /* i : bitstream to be read */
+ const Word16 nb, /* i : starting point in bitstream */
+ Word16 *ind1_pred, /* o : decoded res pred gains */
+ const Word16 start, /* i : starting subband */
+ const Word16 total_no, /* i : number of params to be read */
+ Word16 *GR_ord /* o : GR order - read */
);
/*! r: number of bits read */
Word16 read_flag_EC_DFT(
- const UWord16 *bit_stream, /* i : bitstream */
- Word16 *flag /* o : flag value */
+ const UWord16 *bit_stream, /* i : bitstream */
+ Word16 *flag /* o : flag value */
);
void ivas_init_dec_get_num_cldfb_instances_fx(
- Decoder_Struct *st_ivas, /* i : IVAS decoder structure */
- Word16 *numCldfbAnalyses, /* o : number of CLDFB analysis instances */
- Word16 *numCldfbSyntheses /* o : number of CLDFB synthesis instances */
+ Decoder_Struct *st_ivas, /* i : IVAS decoder structure */
+ Word16 *numCldfbAnalyses, /* o : number of CLDFB analysis instances */
+ Word16 *numCldfbSyntheses /* o : number of CLDFB synthesis instances */
);
Word16 masa_sq_fx(
- const Word32 in, /* i : input value */
- const Word32 *threshold, /* i : partition */
- const Word16 cb_sz /* i : codebook size */
+ const Word32 in, /* i : input value */
+ const Word32 *threshold, /* i : partition */
+ const Word16 cb_sz /* i : codebook size */
);
void ivas_compute_spar_params_enc_fx(
@@ -737,7 +742,8 @@ void ivas_compute_spar_params_enc_fx(
Word32 *pWscale, /*q_Wscale*/
Word16 *q_Wscale,
const Word16 from_dirac,
- const Word16 dyn_active_w_flag );
+ const Word16 dyn_active_w_flag
+);
void ivas_compute_spar_params_fx(
Word32 *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], /*q_cov_real*/
@@ -759,134 +765,122 @@ void ivas_compute_spar_params_fx(
Word32 *pWscale_fx, /*q_pWscale*/
Word16 *q_pWscale,
const Word16 from_dirac,
- const Word16 dyn_active_w_flag );
+ const Word16 dyn_active_w_flag
+);
ivas_error ivas_ism_metadata_dec_fx(
- const Word32 ism_total_brate, /* i : ISM total bitrate */
- const Word16 nchan_ism, /* i : number of ISM channels */
- Word16 *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 Word16 bfi, /* i : bfi flag */
- Word16 nb_bits_metadata[], /* o : number of metadata bits */
- ISM_MODE ism_mode, /* i : ISM mode */
- ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */
- const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
- Word16 *ism_extmeta_active, /* i/o: Extended metadata active in renderer */
- Word16 *ism_extmeta_cnt, /* i/o: Number of change frames observed */
- DEC_CORE_HANDLE st0 /* i : core-coder handle */
-);
-
-#ifdef OBJ_EDITING_API
-void ivas_ism_renderer_update_md(
- Decoder_Struct *st_ivas /* i/o: main IVAS decoder handle */
+ const Word32 ism_total_brate, /* i : ISM total bitrate */
+ const Word16 nchan_ism, /* i : number of ISM channels */
+ Word16 *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 Word16 bfi, /* i : bfi flag */
+ Word16 nb_bits_metadata[], /* o : number of metadata bits */
+ ISM_MODE ism_mode, /* i : ISM mode */
+ ISM_DTX_DATA_DEC hISMDTX, /* i/o: ISM DTX structure */
+ const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
+ Word16 *ism_extmeta_active, /* i/o: Extended metadata active in renderer */
+ Word16 *ism_extmeta_cnt, /* i/o: Number of change frames observed */
+ DEC_CORE_HANDLE st0 /* i : core-coder handle */
);
-#endif
void ivas_get_ism_sid_quan_bitbudget_fx(
- const Word16 nchan_ism, /* i : number of objects */
- Word16 *nBits_azimuth, /* o : number of Q bits for azimuth */
- Word16 *nBits_elevation, /* o : number of Q bits for elevation */
- Word32 *q_step_fx, /* o : quantization step Q22*/
- Word32 *q_step_border_fx, /* o : quantization step at the border Q22*/
- Word16 *nBits_coh, /* o : number of Q bits for coherence */
- Word16 *nBits_sce_id /* o : number of Q bits for sce_id_dtx */
+ const Word16 nchan_ism, /* i : number of objects */
+ Word16 *nBits_azimuth, /* o : number of Q bits for azimuth */
+ Word16 *nBits_elevation, /* o : number of Q bits for elevation */
+ Word32 *q_step_fx, /* o : quantization step Q22*/
+ Word32 *q_step_border_fx, /* o : quantization step at the border Q22*/
+ Word16 *nBits_coh, /* o : number of Q bits for coherence */
+ Word16 *nBits_sce_id /* o : number of Q bits for sce_id_dtx */
);
void ivas_ism_metadata_sid_dec_fx(
- SCE_DEC_HANDLE hSCE[MAX_SCE], /* i/o: SCE decoder structure */
- const Word32 ism_total_brate, /* i : ISM total bitrate */
- const Word16 bfi, /* i : bfi flag */
- const Word16 nchan_ism, /* i : number of objects */
- const Word16 nchan_transport, /* i : number of transport channels*/
- const ISM_MODE ism_mode, /* i : ISM mode */
- Word16 *flag_noisy_speech, /* o : noisy speech flag */
- Word16 *sce_id_dtx, /* o : SCE DTX ID */
- ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
- Word16 nb_bits_metadata[] /* o : number of metadata bits */
-);
-
-// ivas_sce_dec_fx.c
+ SCE_DEC_HANDLE hSCE[MAX_SCE], /* i/o: SCE decoder structure */
+ const Word32 ism_total_brate, /* i : ISM total bitrate */
+ const Word16 bfi, /* i : bfi flag */
+ const Word16 nchan_ism, /* i : number of objects */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ Word16 *flag_noisy_speech, /* o : noisy speech flag */
+ Word16 *sce_id_dtx, /* o : SCE DTX ID */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ Word16 nb_bits_metadata[] /* o : number of metadata bits */
+);
+
ivas_error create_sce_dec(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 cpe_id, /* i : SCE # identifier */
- const Word32 element_brate /* i : element bitrate */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 cpe_id, /* i : SCE # identifier */
+ const Word32 element_brate /* i : element bitrate */
);
void destroy_sce_dec(
- SCE_DEC_HANDLE hSCE /* i/o: SCE decoder structure */
+ SCE_DEC_HANDLE hSCE /* i/o: SCE decoder structure */
);
void destroy_core_enc_fx(
- ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */
+ ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */
);
void destroy_evs_core_enc_fx(
- ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */
+ ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */
);
ivas_error ivas_sce_dec_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 sce_id, /* i : SCE # identifier */
- Word32 *output[1], /* o : output synthesis signal */
- const Word16 output_frame, /* i : output frame length per channel */
- const Word16 nb_bits_metadata /* i : number of metadata bits */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 sce_id, /* i : SCE # identifier */
+ Word32 *output[1], /* o : output synthesis signal */
+ const Word16 output_frame, /* i : output frame length per channel */
+ const Word16 nb_bits_metadata /* i : number of metadata bits */
);
-// ivas_cpe_dec_fx.c
ivas_error create_cpe_dec(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 cpe_id, /* i : CPE # identifier */
- const Word32 element_brate /* i : element bitrate */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 cpe_id, /* i : CPE # identifier */
+ const Word32 element_brate /* i : element bitrate */
);
void destroy_cpe_dec(
- CPE_DEC_HANDLE hCPE /* i/o: CPE decoder structure */
+ CPE_DEC_HANDLE hCPE /* i/o: CPE decoder structure */
);
ivas_error ivas_cpe_dec_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 cpe_id, /* i : CPE # identifier */
- Word32 *output[CPE_CHANNELS], /* o : output synthesis signal */
- const Word16 output_frame, /* i : output frame length per channel */
- const Word16 nb_bits_metadata /* i : number of metadata bits */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 cpe_id, /* i : CPE # identifier */
+ Word32 *output[CPE_CHANNELS], /* o : output synthesis signal */
+ const Word16 output_frame, /* i : output frame length per channel */
+ const Word16 nb_bits_metadata /* i : number of metadata bits */
);
void ivas_post_proc_fx(
- SCE_DEC_HANDLE hSCE, /* i/o: SCE decoder structure */
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- const Word16 n, /* i : channel number */
- Word32 synth[], /* i/o: output synthesis signal */
- Word32 *output[CPE_CHANNELS], /* i/o: output synthesis signal */
- const Word16 output_frame, /* i : output frame length */
- const Word16 sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
- Word16 output_q );
-
-// ivas_lfe_dec_fx.c
-
-void ivas_lfe_dec_close_fx(
- LFE_DEC_HANDLE *hLFE /* i/o: LFE encoder handle */
+ SCE_DEC_HANDLE hSCE, /* i/o: SCE decoder structure */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ const Word16 n, /* i : channel number */
+ Word32 synth[], /* i/o: output synthesis signal */
+ Word32 *output[CPE_CHANNELS], /* i/o: output synthesis signal */
+ const Word16 output_frame, /* i : output frame length */
+ const Word16 sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
+ Word16 output_q
);
ivas_error ivas_create_lfe_dec_fx(
- LFE_DEC_HANDLE *hLFE_out, /* o : IVAS LFE decoder structure */
- const Word32 output_Fs, /* i : output sampling rate */
- const Word32 delay_ns /* i : additional LFE delay to sync other channel outputs */
+ LFE_DEC_HANDLE *hLFE_out, /* o : IVAS LFE decoder structure */
+ const Word32 output_Fs, /* i : output sampling rate */
+ const Word32 delay_ns /* i : additional LFE delay to sync other channel outputs */
);
void ivas_lfe_dec_fx(
- LFE_DEC_HANDLE hLFE, /* i/o: LFE decoder handle */
- Decoder_State *st0, /* i/o: decoder state structure - for bitstream handling*/
- const Word16 output_frame, /* i : output frame length per channel */
- const Word16 bfi, /* i : BFI flag */
- Word32 output_lfe_ch[] /* o : output LFE synthesis */
+ LFE_DEC_HANDLE hLFE, /* i/o: LFE decoder handle */
+ Decoder_State *st0, /* i/o: decoder state structure - for bitstream handling*/
+ const Word16 output_frame, /* i : output frame length per channel */
+ const Word16 bfi, /* i : BFI flag */
+ Word32 output_lfe_ch[] /* o : output LFE synthesis */
);
void ivas_lfe_tdplc_fx(
- LFE_DEC_HANDLE hLFE, /* i/o: LFE decoder handle */
- const Word32 *prevsynth, /* i : previous frame synthesis */
- Word32 *ytda, /* o : output time-domain buffer */
- const Word16 output_frame /* i : output frame length */
+ LFE_DEC_HANDLE hLFE, /* i/o: LFE decoder handle */
+ const Word32 *prevsynth, /* i : previous frame synthesis */
+ Word32 *ytda, /* o : output time-domain buffer */
+ const Word16 output_frame /* i : output frame length */
);
void ivas_lfe_dec_close_fx(
@@ -894,160 +888,168 @@ void ivas_lfe_dec_close_fx(
);
void td_stereo_param_updt_fx(
- const Word16 lsp_old_PCh_fx[], /* i : primary channel old LSPs Q15 */
- const Word16 lsf_old_PCh_fx[], /* i : primary channel old LSFs Qlog2(2.56) */
- const Word16 pitch_buf_PCh_fx[], /* i : primary channel pitch buffer Q6 */
- Word16 tdm_lsfQ_PCh_fx[], /* o : Q LSFs for primary channel Qlog2(2.56) */
- Word16 tdm_Pri_pitch_buf_fx[], /* o : pitch values for primary channel Q6 */
- const Word16 flag_ACELP16k, /* i : ACELP@16kHz flag */
- const Word16 tdm_use_IAWB_Ave_lpc /* i : flag to indicate the usage of mean inactive LP coefficients */
+ const Word16 lsp_old_PCh_fx[], /* i : primary channel old LSPs Q15 */
+ const Word16 lsf_old_PCh_fx[], /* i : primary channel old LSFs Qlog2(2.56) */
+ const Word16 pitch_buf_PCh_fx[], /* i : primary channel pitch buffer Q6 */
+ Word16 tdm_lsfQ_PCh_fx[], /* o : Q LSFs for primary channel Qlog2(2.56) */
+ Word16 tdm_Pri_pitch_buf_fx[], /* o : pitch values for primary channel Q6 */
+ const Word16 flag_ACELP16k, /* i : ACELP@16kHz flag */
+ const Word16 tdm_use_IAWB_Ave_lpc /* i : flag to indicate the usage of mean inactive LP coefficients */
);
void updt_enc_common_ivas_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- const Word16 Q_new /* i : CUrrent frame scaling */
+ Encoder_State *st, /* i/o: encoder state structure */
+ const Word16 Q_new /* i : CUrrent frame scaling */
);
-
void updateBuffersForDmxMdctStereo_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */
- const Word16 output_frame, /* i : output frame length */
- Word32 output0_fx[], /* i/o: decoder output */
- Word32 output1_fx[], /* i/o: decoder output */
- Word16 synth_fx[CPE_CHANNELS][L_FRAME48k] /* i/o: decoder synthesis */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */
+ const Word16 output_frame, /* i : output frame length */
+ Word32 output0_fx[], /* i/o: decoder output */
+ Word32 output1_fx[], /* i/o: decoder output */
+ Word16 synth_fx[CPE_CHANNELS][L_FRAME48k] /* i/o: decoder synthesis */
);
void stereo_cng_compute_PScorr_fx(
- Word32 output_fx0[], /* i : Output signal */
- Word32 output_fx1[], /* i : Output signal */
+ Word32 output_fx0[], /* i : Output signal */
+ Word32 output_fx1[], /* i : Output signal */
Word16 *output_Q,
- Word32 *c_PS_LT_fx, /* i/o: Correlation */
+ Word32 *c_PS_LT_fx, /* i/o: Correlation */
Word16 Q_c_PS_LT_fx,
- const Word16 L_frame_0, /* i : L_frame channel 0 */
- const Word16 L_frame_1 /* i : L_frame channel 1 */
+ const Word16 L_frame_0, /* i : L_frame channel 0 */
+ const Word16 L_frame_1 /* i : L_frame channel 1 */
);
void ivas_mcmasa_setNumTransportChannels_fx(
- Word16 *nchan_transport, /* o : Pointer to number of transport channels to be set */
- Word16 *element_mode, /* o : Pointer to element mode to be set */
- const Word32 ivas_total_brate /* i : Total bitrate of IVAS */
+ Word16 *nchan_transport, /* o : Pointer to number of transport channels to be set */
+ Word16 *element_mode, /* o : Pointer to element mode to be set */
+ const Word32 ivas_total_brate /* i : Total bitrate of IVAS */
);
void ivas_mcmasa_set_separate_channel_mode_fx(
- UWord8 *separateChannelEnabled, /* o : Pointer to separate channel toggle */
- Word16 *separateChannelIndex, /* o : Pointer to separate channel index */
- const Word32 ivas_total_brate /* i : Total bitrate of IVAS */
+ UWord8 *separateChannelEnabled, /* o : Pointer to separate channel toggle */
+ Word16 *separateChannelIndex, /* o : Pointer to separate channel index */
+ const Word32 ivas_total_brate /* i : Total bitrate of IVAS */
);
void ivas_mcmasa_split_brate_fx(
- const UWord8 separateChannelEnabled, /* i : Transport running in "separate channel" mode */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate available to be split */
- const Word16 nSCE, /* i : Number of SCEs in use (0 or 1) */
- const Word16 nCPE, /* i : Number of CPEs in use (0 or 1) */
- Word32 *brate_sce, /* o : Pointer to SCE element bitrate */
- Word32 *brate_cpe /* o : Pointer to CPE element bitrate */
+ const UWord8 separateChannelEnabled, /* i : Transport running in "separate channel" mode */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate available to be split */
+ const Word16 nSCE, /* i : Number of SCEs in use (0 or 1) */
+ const Word16 nCPE, /* i : Number of CPEs in use (0 or 1) */
+ Word32 *brate_sce, /* o : Pointer to SCE element bitrate */
+ Word32 *brate_cpe /* o : Pointer to CPE element bitrate */
);
void update_last_metadata_fx(
- const Word16 nchan_ism, /* i : number of objects */
- ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
- const Word16 updt_flag[] /* i : last metadata update flag */
+ const Word16 nchan_ism, /* i : number of objects */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ const Word16 updt_flag[] /* i : last metadata update flag */
);
ivas_error ivas_jbm_dec_tc_buffer_reconfigure_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const TC_BUFFER_MODE tc_buffer_mode, /* i : new buffer mode */
- const Word16 nchan_transport_jbm, /* i : new number of real transport channels */
- const Word16 nchan_transport_internal, /* i : new number of totally buffered channels */
- const Word16 nchan_full, /* i : new number of channels to fully store */
- const Word16 n_samples_granularity /* i : new granularity of the renderer/buffer */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const TC_BUFFER_MODE tc_buffer_mode, /* i : new buffer mode */
+ const Word16 nchan_transport_jbm, /* i : new number of real transport channels */
+ const Word16 nchan_transport_internal, /* i : new number of totally buffered channels */
+ const Word16 nchan_full, /* i : new number of channels to fully store */
+ const Word16 n_samples_granularity /* i : new granularity of the renderer/buffer */
);
ivas_error ivas_dirac_allocate_parameters_fx(
- SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i/o: common data for spatial parametric rendering */
- const Word16 params_flag /* i : set of parameters flag */
+ SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i/o: common data for spatial parametric rendering*/
+ const Word16 params_flag /* i : set of parameters flag */
);
Word16 configure_reqularization_factor_fx(
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- const Word32 ivas_total_brate /* i : IVAS total bitrate */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+ const Word32 ivas_total_brate /* i : IVAS total bitrate */
);
ivas_error ivas_ism_config_fx(
- const Word32 ism_total_brate, /* i : ISM total bitrate */
- const Word16 nchan_transport, /* i : number of transport channels */
- const Word16 nchan_ism, /* i : number of objects */
- ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
- const Word16 ism_extended_metadata_flag, /* i : extended metadata flag */
- const Word16 null_metadata_flag[MAX_NUM_OBJECTS], /* i : NULL MD flag */
- const Word16 ism_imp[], /* i : ISM importance flags */
- Word32 element_brate[], /* o : element bitrate per object */
- Word32 total_brate[], /* o : total bitrate per object */
- Word16 nb_bits_metadata[], /* i/o: number of metadata bits */
- const Word16 combined_format_flag /* i : flag indicating combined format */
+ const Word32 ism_total_brate, /* i : ISM total bitrate */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ const Word16 nchan_ism, /* i : number of objects */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ const Word16 ism_extended_metadata_flag, /* i : extended metadata flag */
+ const Word16 null_metadata_flag[MAX_NUM_OBJECTS], /* i : NULL MD flag */
+ const Word16 ism_imp[], /* i : ISM importance flags */
+ Word32 element_brate[], /* o : element bitrate per object */
+ Word32 total_brate[], /* o : total bitrate per object */
+ Word16 nb_bits_metadata[], /* i/o: number of metadata bits */
+ const Word16 combined_format_flag /* i : flag indicating combined format */
);
void stereo_dft_enc_analyze_fx(
- Encoder_State **sts, /* i/o: encoder state structure */
- const Word16 n_channels, /* i : number of input channels */
- const Word16 input_frame, /* i : input frame length */
- STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle */
- STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct, /* i/o: encoder MDCT stereo handle */
- Word32 DFT[CPE_CHANNELS][STEREO_DFT_N_MAX_ENC], /* o : DFT buffers */
- Word16 DFT_e[CPE_CHANNELS], /* o : DFT buffers */
- Word16 *input_mem[CPE_CHANNELS], /* i/o: input buffer memory */
- Word16 *q_input_mem );
+ Encoder_State **sts, /* i/o: encoder state structure */
+ const Word16 n_channels, /* i : number of input channels */
+ const Word16 input_frame, /* i : input frame length */
+ STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle */
+ STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct, /* i/o: encoder MDCT stereo handle */
+ Word32 DFT[CPE_CHANNELS][STEREO_DFT_N_MAX_ENC], /* o : DFT buffers */
+ Word16 DFT_e[CPE_CHANNELS], /* o : DFT buffers */
+ Word16 *input_mem[CPE_CHANNELS], /* i/o: input buffer memory */
+ Word16 *q_input_mem
+);
Word16 IGF_MapBitRateToIndex(
- const Word32 brate, /* i : bitrate */
- const Word16 bwidth, /* i : audio bandwidth */
- const Word16 element_mode, /* i : element mode */
- const Word16 rf_mode /* i : flag to signal the RF mode */
+ const Word32 brate, /* i : bitrate */
+ const Word16 bwidth, /* i : audio bandwidth */
+ const Word16 element_mode, /* i : element mode */
+ const Word16 rf_mode /* i : flag to signal the RF mode */
);
-Word16 ivas_jbm_dec_get_render_granularity(
- const RENDERER_TYPE rendererType, /* i : renderer type */
- const IVAS_FORMAT ivas_format, /* i : ivas format */
- const MC_MODE mc_mode, /* i : MC mode */
- const Word32 output_Fs /* i : sampling rate */
+#ifdef NONBE_1303_REND_GRANULARITY
+Word16 ivas_jbm_dec_get_render_granularity_fx(
+ const RENDERER_TYPE renderer_type, /* i : renderer type */
+ const RENDERER_TYPE renderer_type_sec, /* i : secondary renderer type */
+ const int32_t output_Fs /* i : sampling rate */
);
+#else
+Word16 ivas_jbm_dec_get_render_granularity(
+ const RENDERER_TYPE rendererType, /* i : renderer type */
+ const IVAS_FORMAT ivas_format, /* i : ivas format */
+ const MC_MODE mc_mode, /* i : MC mode */
+ const Word32 output_Fs /* i : sampling rate */
+);
+#endif
-// ivas_stereo_dft_com.c
void stereo_dft_config_fx(
- STEREO_DFT_CONFIG_DATA_HANDLE hConfig, /* o : DFT stereo configuration */
- const Word32 brate, /* i : IVAS/CPE/nominal total bitrate */
- Word16 *bits_frame_nominal, /* o : primary channel nominal bits per frame */
- Word16 *bits_frame_nominal_2 /* o : secondary channel nominal bits per frame*/
+ STEREO_DFT_CONFIG_DATA_HANDLE hConfig, /* o : DFT stereo configuration */
+ const Word32 brate, /* i : IVAS/CPE/nominal total bitrate */
+ Word16 *bits_frame_nominal, /* o : primary channel nominal bits per frame */
+ Word16 *bits_frame_nominal_2 /* o : secondary channel nominal bits per frame */
);
void stereo_td_itd_mdct_stereo_fx(
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder handle */
- const Word16 vad_flag_dtx[], /* i : VAD dtx flags */
- const Word16 vad_hover_flag[], /* i : VAD hangover flags */
- const Word16 input_frame /* i : frame length */
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder handle */
+ const Word16 vad_flag_dtx[], /* i : VAD dtx flags */
+ const Word16 vad_hover_flag[], /* i : VAD hangover flags */
+ const Word16 input_frame /* i : frame length */
);
void stereo_td_itd_fx(
- ITD_DATA *hITD, /* i/o: ITD data structure */
- Word16 input_mem_itd_fx[CPE_CHANNELS][STEREO_DFT_OVL_MAX], /* o : ITD memory (only used in DFT Stereo) */
+ ITD_DATA *hITD, /* i/o: ITD data structure */
+ Word16 input_mem_itd_fx[CPE_CHANNELS][STEREO_DFT_OVL_MAX], /* o : ITD memory (only used in DFT Stereo) */
Word16 *q_input_mem_itd,
- const Word16 hybrid_itd_flag, /* i : flag for hybrid TD/FD ITD processing */
- const Word16 dft_ovl, /* i : size of DFT overlap */
- Encoder_State **sts, /* i/o: Encoder state structure */
- const Word16 input_frame, /* i : input frame length */
- Word16 *input_mem[CPE_CHANNELS], /* i/o: input buffer memory */
- Word16 *q_input_mem );
+ const Word16 hybrid_itd_flag, /* i : flag for hybrid TD/FD ITD processing */
+ const Word16 dft_ovl, /* i : size of DFT overlap */
+ Encoder_State **sts, /* i/o: Encoder state structure */
+ const Word16 input_frame, /* i : input frame length */
+ Word16 *input_mem[CPE_CHANNELS], /* i/o: input buffer memory */
+ Word16 *q_input_mem
+);
void stereo_dft_unify_dmx_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder stereo handle */
- Decoder_State *st0, /* i/o: decoder state structure */
- Word32 DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* i/o: DFT buffers */
- Word32 *input_mem, /* i/o: mem of buffer DFT analysis */
- const Word16 prev_sid_nodata /* i : Previous SID/No data indicator */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder stereo handle */
+ Decoder_State *st0, /* i/o: decoder state structure */
+ Word32 DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* i/o: DFT buffers */
+ Word32 *input_mem, /* i/o: mem of buffer DFT analysis */
+ const Word16 prev_sid_nodata /* i : Previous SID/No data indicator */
);
void stereo_dft_enc_compute_itd_fx(
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
Word32 *DFT_L,
Word16 *DFT_L_e,
Word32 *DFT_R,
@@ -1059,225 +1061,226 @@ void stereo_dft_enc_compute_itd_fx(
Word32 *bin_nrgL,
Word16 *bin_nrgL_e,
Word32 *bin_nrgR,
- Word16 *bin_nrgR_e );
+ Word16 *bin_nrgR_e
+);
Word16 stereo_dft_band_config_fx(
- Word16 *band_limits, /* o : DFT band limits */
- const Word16 band_res, /* i : DFT band resolution */
- const Word16 NFFT, /* i : analysis/synthesis window length */
- const Word16 enc_dec /* i : flag to indicate enc vs dec */
+ Word16 *band_limits, /* o : DFT band limits */
+ const Word16 band_res, /* i : DFT band resolution */
+ const Word16 NFFT, /* i : analysis/synthesis window length */
+ const Word16 enc_dec /* i : flag to indicate enc vs dec */
);
-// ivas_ls_custom_dec.c
void ivas_ls_custom_setup_fx(
- IVAS_OUTPUT_SETUP_HANDLE hOutSetup, /* o : IVAS output setup handle */
- const LSSETUP_CUSTOM_STRUCT *hLsSetupCustom /* i : Custom loudspeaker setup handle */
+ IVAS_OUTPUT_SETUP_HANDLE hOutSetup, /* o : IVAS output setup handle */
+ const LSSETUP_CUSTOM_STRUCT *hLsSetupCustom /* i : Custom loudspeaker setup handle */
);
ivas_error ivas_ls_custom_output_init_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
);
ivas_error ivas_ls_custom_open_fx(
- LSSETUP_CUSTOM_HANDLE *hLsSetupCustom /* o : Custom loudspeaker setup handle */
+ LSSETUP_CUSTOM_HANDLE *hLsSetupCustom /* o : Custom loudspeaker setup handle */
);
ivas_error ivas_ism_renderer_open_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void ivas_ism_render_sf_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const RENDERER_TYPE renderer_type, /* i : active renderer type */
- Word32 *output_fx[], /* i/o: core-coder transport channels/object output */
- const Word16 n_samples_to_render /* i : output frame length per channel */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const RENDERER_TYPE renderer_type, /* i : active renderer type */
+ Word32 *output_fx[], /* i/o: core-coder transport channels/object output */
+ const Word16 n_samples_to_render /* i : output frame length per channel */
);
void ivas_jbm_dec_get_adapted_linear_interpolator_fx(
- const Word16 default_interp_length, /* i : default length of the (full-frame) interpolator */
- const Word16 interp_length, /* i : length of the interpolator to be created */
- Word16 *interpolator_fx /* o : the interpolator */
+ const Word16 default_interp_length, /* i : default length of the (full-frame) interpolator */
+ const Word16 interp_length, /* i : length of the interpolator to be created */
+ Word16 *interpolator_fx /* o : the interpolator */
);
void ivas_omasa_separate_object_render_jbm_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const UWord16 nSamplesRendered, /* i : number of samples rendered */
- Word32 input_fx_in[][L_FRAME48k], /* i : separated object signal */
- Word32 *output_fx[], /* o : rendered time signal */
- const Word16 subframes_rendered, /* i : number of subframes rendered */
- const Word16 slots_rendered /* i : number of CLDFB slots rendered */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const UWord16 nSamplesRendered, /* i : number of samples rendered */
+ Word32 input_fx_in[][L_FRAME48k], /* i : separated object signal */
+ Word32 *output_fx[], /* o : rendered time signal */
+ const Word16 subframes_rendered, /* i : number of subframes rendered */
+ const Word16 slots_rendered /* i : number of CLDFB slots rendered */
);
void get_panning_gain_fx(
const Word16 sinAngleMapped,
- Word16 *panningGains );
+ Word16 *panningGains
+);
void ivas_ism_get_stereo_gains_fx(
- const Word16 aziDeg, /* i : object azimuth */
- const Word16 eleDeg, /* i : object elevation */
- Word16 *left_gain_fx, /* o : left channel gain */
- Word16 *right_gain_fx /* o : right channel gain */
+ const Word16 aziDeg, /* i : object azimuth */
+ const Word16 eleDeg, /* i : object elevation */
+ Word16 *left_gain_fx, /* o : left channel gain */
+ Word16 *right_gain_fx /* o : right channel gain */
);
-// ivas_mct_dec_mct_fx.c
void ivas_mct_dec_mct_fx(
- MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
- Decoder_State **sts, /* i/o: decoder state structure */
- const Word16 nchan /* i : number of channels */
+ MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
+ Decoder_State **sts, /* i/o: decoder state structure */
+ const Word16 nchan /* i : number of channels */
);
void apply_MCT_dec_fx(
- MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
- Decoder_State **sts, /* i/o: decoder state structure */
- Word32 *x[MCT_MAX_CHANNELS][NB_DIV] /* i/o: decoded and dequan. spect. input to MCT */
+ MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
+ Decoder_State **sts, /* i/o: decoder state structure */
+ Word32 *x[MCT_MAX_CHANNELS][NB_DIV] /* i/o: decoded and dequan. spect. input to MCT */
);
void mctStereoIGF_dec_fx(
- MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
- Decoder_State **stm, /* i/o: decoder state structure */
- Word32 *x[MCT_MAX_CHANNELS][NB_DIV], /* i/o: decoded and dequantized spectrum*/
- const Word16 bfi /* i : bad frame flag */
+ MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
+ Decoder_State **stm, /* i/o: decoder state structure */
+ Word32 *x[MCT_MAX_CHANNELS][NB_DIV], /* i/o: decoded and dequantized spectrum */
+ const Word16 bfi /* i : bad frame flag */
);
-// ivas_stereo_mdct_stereo_dec.c
void parse_stereo_from_bitstream(
- STEREO_MDCT_DEC_DATA_HANDLE hStereoMdct, /* i/o: MDCT stereo decoder structure */
- Decoder_State **sts, /* i/o: decoder state structure */
- const Word16 mct_on, /* i : flag mct block (1) or stereo (0)*/
- const Word16 isSBAStereoMode, /* i : flag core coding for SBA */
- Decoder_State *st0, /* i/o: decoder state structure for Bstr*/
- Word16 ms_mask[NB_DIV][MAX_SFB] /* o : bandwise MS mask */
+ STEREO_MDCT_DEC_DATA_HANDLE hStereoMdct, /* i/o: MDCT stereo decoder structure */
+ Decoder_State **sts, /* i/o: decoder state structure */
+ const Word16 mct_on, /* i : flag mct block (1) or stereo (0) */
+ const Word16 isSBAStereoMode, /* i : flag core coding for SBA */
+ Decoder_State *st0, /* i/o: decoder state structure for Bstr */
+ Word16 ms_mask[NB_DIV][MAX_SFB] /* o : bandwise MS mask */
);
void stereo_decoder_tcx_fx(
- STEREO_MDCT_DEC_DATA *hStereoMdct, /* i/o: MDCT stereo decoder structure */
- Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */
- Word32 *spec_r_0[NB_DIV], /* i/o: spectrum right channel */
- Word32 *spec_l[], /* i/o: spectrum left channel [NB_DIV][N] */
- Word32 *spec_r[], /* i/o: spectrum right channel [NB_DIV][N] */
- const Word16 mdct_stereo_mode[], /* i : stereo mode (FB/band wise MS, dual mono */
- const Word16 core_l, /* i : core for left channel (TCX20/TCX10) */
- const Word16 core_r, /* i : core for right channel (TCX20/TCX10) */
- const Word16 igf, /* i : flag for IGF activity */
- const Word16 L_frameTCX_l, /* i : TCX frame length of left channel */
- const Word16 L_frameTCX_r, /* i : TCX frame length of right channel */
- const Word16 mct_on, /* i : flag mct block (1) or stereo (0) */
- const Word16 last_core_l, /* i : last core for left channel */
- const Word16 last_core_r, /* i : last core for right channel */
- const Word16 tmp_plc_upmix /* i : indicates temp upmix for PLC decision */
+ STEREO_MDCT_DEC_DATA *hStereoMdct, /* i/o: MDCT stereo decoder structure */
+ Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */
+ Word32 *spec_r_0[NB_DIV], /* i/o: spectrum right channel */
+ Word32 *spec_l[], /* i/o: spectrum left channel [NB_DIV][N] */
+ Word32 *spec_r[], /* i/o: spectrum right channel [NB_DIV][N] */
+ const Word16 mdct_stereo_mode[], /* i : stereo mode (FB/band wise MS, dual mono */
+ const Word16 core_l, /* i : core for left channel (TCX20/TCX10) */
+ const Word16 core_r, /* i : core for right channel (TCX20/TCX10) */
+ const Word16 igf, /* i : flag for IGF activity */
+ const Word16 L_frameTCX_l, /* i : TCX frame length of left channel */
+ const Word16 L_frameTCX_r, /* i : TCX frame length of right channel */
+ const Word16 mct_on, /* i : flag mct block (1) or stereo (0) */
+ const Word16 last_core_l, /* i : last core for left channel */
+ const Word16 last_core_r, /* i : last core for right channel */
+ const Word16 tmp_plc_upmix /* i : indicates temp upmix for PLC decision */
);
void v_multc_acc_32_16(
- const Word32 x[], /* i : Input vector */
- const Word16 c, /* i : Constant */
- Word32 y[], /* o : Output vector that contains y + c*x */
- const Word16 N /* i : Vector length */
+ const Word32 x[], /* i : Input vector */
+ const Word16 c, /* i : Constant */
+ Word32 y[], /* o : Output vector that contains y + c*x */
+ const Word16 N /* i : Vector length */
);
+
void v_multc_acc_32_32(
- const Word32 x[], /* i : Input vector */
- const Word32 c, /* i : Constant */
- Word32 y[], /* o : Output vector that contains y + c*x */
- const Word16 N /* i : Vector length */
+ const Word32 x[], /* i : Input vector */
+ const Word32 c, /* i : Constant */
+ Word32 y[], /* o : Output vector that contains y + c*x */
+ const Word16 N /* i : Vector length */
);
void ivas_mono_stereo_downmix_mcmasa_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Word32 *output_f_fx[], /* i/o: synthesized core-coder transport channels/mono or stereo output */
- Word16 output_frame /* i : output frame length per channel */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Word32 *output_fx[], /* i/o: synthesized core-coder transport channels/mono or stereo output */
+ Word16 output_frame /* i : output frame length per channel */
);
void ivas_apply_non_diegetic_panning_fx(
- Word32 *input_f_fx, /* i : non-diegetic object */
- Word32 *output_f_fx[], /* i/o: core-coder transport mono channel/stereo output */
- const Word16 non_diegetic_pan_gain_fx, /* i : non-diegetic panning gain */
- const Word16 output_frame /* i : output frame length per channel */
+ Word32 *input_f_fx, /* i : non-diegetic object */
+ Word32 *output_fx[], /* i/o: core-coder transport mono channel/stereo output */
+ const Word16 non_diegetic_pan_gain_fx, /* i : non-diegetic panning gain */
+ const Word16 output_frame /* i : output frame length per channel */
);
void ivas_ism_mono_dmx_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Word32 *output_f_fx[], /* i/o: synthesized core-coder transport channels/mono output */
- const Word16 output_frame /* i : output frame length */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Word32 *output_fx[], /* i/o: synthesized core-coder transport channels/mono output */
+ const Word16 output_frame /* i : output frame length */
);
+
void ivas_sba_dirac_stereo_smooth_parameters_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */
- ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD handle for upmixing */
- const Word16 cross_fade_start_offset, /* i : SPAR mixer delay compensation */
- const Word32 output_Fs, /* i : Fs for delay calculation */
- const Word16 num_md_sub_frames /* i : number of subframes in mixing matrix */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */
+ ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD handle for upmixing */
+ const Word16 cross_fade_start_offset, /* i : SPAR mixer delay compensation */
+ const Word32 output_Fs, /* i : Fs for delay calculation */
+ const Word16 num_md_sub_frames /* i : number of subframes in mixing matrix */
);
void stereo_dft_dec_synthesize_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* i : DFT buffers */
- const Word16 chan, /* i : channel number */
- Word32 output[L_FRAME48k], /* o : output synthesis signal */
- const Word16 output_frame /* i : output frame length */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* i : DFT buffers */
+ const Word16 chan, /* i : channel number */
+ Word32 output[L_FRAME48k], /* o : output synthesis signal */
+ const Word16 output_frame /* i : output frame length */
);
void stereo_dft_dec_smooth_parameters_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */
- const Word16 prev_sid_nodata, /* i : Previous SID/No data indicator */
- const Word16 active_frame_counter, /* i : Active frame counter */
- const Word32 element_brate /* i : Element bitrate */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */
+ const Word16 prev_sid_nodata, /* i : Previous SID/No data indicator */
+ const Word16 active_frame_counter, /* i : Active frame counter */
+ const Word32 element_brate /* i : Element bitrate */
);
void stereo_dft_dec_res_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: decoder CPE handle */
- Word32 res_buf[STEREO_DFT_N_8k], /* i : residual buffer */
- Word16 q_res, /* i : q fact of residural buffer */
- Word32 *output /* o : output */
+ CPE_DEC_HANDLE hCPE, /* i/o: decoder CPE handle */
+ Word32 res_buf[STEREO_DFT_N_8k], /* i : residual buffer */
+ Word16 q_res, /* i : q fact of residural buffer */
+ Word32 *output /* o : output */
);
void stereo_dft_dec_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */
- Decoder_State *st0, /* i/o: decoder state structure */
- Word32 DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* i/o: DFT buffers */
- Word32 *input_mem, /* i/o: mem of buffer DFT analysis */
- STEREO_CNG_DEC_HANDLE hStereoCng, /* i/o: Stereo CNG data structure */
- const Word16 sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
- const Word16 sba_mono_flag, /* i : signal mono output for SBA DirAC */
- ivas_spar_md_dec_state_t *hMdDec, /* i : SPAR MD handle for upmixing */
- const Word16 cross_fade_start_offset, /* i : SPAR mixer delay compensation */
- const Word32 output_Fs, /* i : Fs for delay calculation */
- const Word16 nchan_transport, /* i : number of transpor channels */
- const Word16 num_md_sub_frames /* i : number of MD subframes */
-);
-
-// ivas_stereo_dft_enc.c
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */
+ Decoder_State *st0, /* i/o: decoder state structure */
+ Word32 DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* i/o: DFT buffers */
+ Word32 *input_mem, /* i/o: mem of buffer DFT analysis */
+ STEREO_CNG_DEC_HANDLE hStereoCng, /* i/o: Stereo CNG data structure */
+ const Word16 sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
+ const Word16 sba_mono_flag, /* i : signal mono output for SBA DirAC */
+ ivas_spar_md_dec_state_t *hMdDec, /* i : SPAR MD handle for upmixing */
+ const Word16 cross_fade_start_offset, /* i : SPAR mixer delay compensation */
+ const Word32 output_Fs, /* i : Fs for delay calculation */
+ const Word16 nchan_transport, /* i : number of transpor channels */
+ const Word16 num_md_sub_frames /* i : number of MD subframes */
+);
+
Word32 stereo_dft_enc_synthesize_fx(
- STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle */
- Word32 *output_fx, /* o : output synthesis Q16 */
+ STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle */
+ Word32 *output_fx, /* o : output synthesis Q16 */
Word16 *output_start_index,
Word16 *output_end_index,
- const Word16 chan, /* i : channel number */
- const Word32 input_Fs, /* i : input sampling rate */
- const Word32 output_sampling_rate, /* i : output sampling rate */
- const Word16 L_frame, /* i : frame length at internal Fs */
- Word16 *nrg_out_fx_e );
+ const Word16 chan, /* i : channel number */
+ const Word32 input_Fs, /* i : input sampling rate */
+ const Word32 output_sampling_rate, /* i : output sampling rate */
+ const Word16 L_frame, /* i : frame length at internal Fs */
+ Word16 *nrg_out_fx_e
+);
void ivas_ls_setup_conversion_fx(
- Decoder_Struct *st_ivas, /* i : IVAS decoder structure */
- const Word16 input_chans, /* i : number of input channels to the renderer */
- const Word16 output_frame, /* i : frame length */
- Word32 *input[], /* i : LS input/output synthesis signal */
- Word32 *output[] /* i/o: LS input/output synthesis signal */
+ Decoder_Struct *st_ivas, /* i : IVAS decoder structure */
+ const Word16 input_chans, /* i : number of input channels to the renderer */
+ const Word16 output_frame, /* i : frame length */
+ Word32 *input[], /* i : LS input/output synthesis signal */
+ Word32 *output[] /* i/o: LS input/output synthesis signal */
);
ivas_error ivas_ls_setup_conversion_open_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void ivas_ls_setup_conversion_close_fx(
- LSSETUP_CONVERSION_HANDLE *hLsSetUpConversion /* i/o: LS converter handle */
+ LSSETUP_CONVERSION_HANDLE *hLsSetUpConversion /* i/o: LS converter handle */
);
void ivas_ls_setup_conversion_process_mdct_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Word32 *output[] /* i/o: output synthesis signal */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Word32 *output[] /* i/o: output synthesis signal */
);
void ivas_lssetupconversion_process_param_mc_fx(
- Decoder_Struct *st_ivas, /* i/o: LS setup conversion renderer handle */
+ Decoder_Struct *st_ivas, /* i/o: LS setup conversion renderer handle */
const Word16 num_timeslots,
Word32 Cldfb_RealBuffer_InOut[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals */
Word32 Cldfb_ImagBuffer_InOut[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i/o: LS signals */
@@ -1285,241 +1288,247 @@ void ivas_lssetupconversion_process_param_mc_fx(
);
void convert_coeffs_to_higher_res_fx(
- const Word32 *in1, /* i : first subframe input */
- const Word32 *in2, /* i : second subframe input */
- Word32 *out, /* o : converted output */
- const Word16 len /* i : length of subframes */
+ const Word32 *in1, /* i : first subframe input */
+ const Word32 *in2, /* i : second subframe input */
+ Word32 *out, /* o : converted output */
+ const Word16 len /* i : length of subframes */
);
void create_IDCT_N_Matrix_fx(
- Word32 *inv_matrixFloatQ, /* i/o: RAM buffer */
- const Word16 N, /* i : DCT length, number of time samples */
- const Word16 n_cols, /* i : number of dct coeffs (as DCT may be truncated) */
- const Word16 alloc_size /* i : RAM buffer size in elements */
+ Word32 *inv_matrixFloatQ, /* i/o: RAM buffer */
+ const Word16 N, /* i : DCT length, number of time samples */
+ const Word16 n_cols, /* i : number of dct coeffs (as DCT may be truncated) */
+ const Word16 alloc_size /* i : RAM buffer size in elements */
);
void extend_dctN_input_fx(
- const Word32 *input, /* i : input in fdcng domain */
- const Word32 *dct_input, /* i : input in dctN(fdcng) domain */
- const Word16 in_dim, /* i : in_dim == N */
- Word32 *ext_sig, /* o : extended output in fdcng domain */
- const Word16 out_dim, /* i : output total dim */
- Word32 *matrix, /* i : idct synthesis matrix N rows, n_cols columns */
- const Word16 n_cols, /* i : number of columns == DCT truncation length */
- const DCTTYPE dcttype /* i : matrix operation type */
+ const Word32 *input, /* i : input in fdcng domain */
+ const Word32 *dct_input, /* i : input in dctN(fdcng) domain */
+ const Word16 in_dim, /* i : in_dim == N */
+ Word32 *ext_sig, /* o : extended output in fdcng domain */
+ const Word16 out_dim, /* i : output total dim */
+ Word32 *matrix, /* i : idct synthesis matrix N rows, n_cols columns */
+ const Word16 n_cols, /* i : number of columns == DCT truncation length */
+ const DCTTYPE dcttype /* i : matrix operation type */
);
void ivas_dirac_dec_get_frequency_axis_fx(
Word16 *frequency_axis, /* Q0 */
const Word32 output_Fs,
- const Word16 num_freq_bands );
+ const Word16 num_freq_bands
+);
void ivas_decision_matrix_dec_fx(
- Decoder_State *st, /* i/o: decoder state structure */
- Word16 *sharpFlag, /* o : formant sharpening flag */
- Word16 *core_switching_flag, /* o : ACELP->HQ switching frame flag */
- const Word32 element_brate, /* i : element bitrate */
- const Word16 nchan_out /* i : Number of output channels */
+ Decoder_State *st, /* i/o: decoder state structure */
+ Word16 *sharpFlag, /* o : formant sharpening flag */
+ Word16 *core_switching_flag, /* o : ACELP->HQ switching frame flag */
+ const Word32 element_brate, /* i : element bitrate */
+ const Word16 nchan_out /* i : Number of output channels */
);
void cmplx_matrix_square_fx(
- const Word32 *realX, /* i : real part of the matrix */
- const Word32 *imagX, /* i : imaginary part of the matrix */
- const Word16 mRows, /* i : number of rows of the matrix */
- const Word16 nCols, /* i : number of columns of the matrix */
- Word32 *realZ, /* o : real part of the resulting matrix */
- Word32 *imagZ, /* o : imaginary part of the resulting matrix */
+ const Word32 *realX, /* i : real part of the matrix */
+ const Word32 *imagX, /* i : imaginary part of the matrix */
+ const Word16 mRows, /* i : number of rows of the matrix */
+ const Word16 nCols, /* i : number of columns of the matrix */
+ Word32 *realZ, /* o : real part of the resulting matrix */
+ Word32 *imagZ, /* o : imaginary part of the resulting matrix */
Word16 input_exp,
- Word16 *output_exp );
+ Word16 *output_exp
+);
Word16 matrix_diag_product_fx(
- const Word32 *X, /* i : left hand matrix */
+ const Word32 *X, /* i : left hand matrix */
Word16 X_e,
- const Word16 rowsX, /* i : number of rows of the left hand matrix */
- const Word16 colsX, /* i : number of columns of the left hand matrix */
- const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
- const Word32 *Y, /* i : right hand diagonal matrix as vector containing the diagonal elements */
+ const Word16 rowsX, /* i : number of rows of the left hand matrix */
+ const Word16 colsX, /* i : number of columns of the left hand matrix */
+ const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
+ const Word32 *Y, /* i : right hand diagonal matrix as vector containing the diagonal elements */
Word16 Y_e,
- const Word16 entriesY, /* i : number of entries in the diagonal */
- Word32 *Z, /* o : resulting matrix after the matrix multiplication */
- Word16 *Z_e );
+ const Word16 entriesY, /* i : number of entries in the diagonal */
+ Word32 *Z, /* o : resulting matrix after the matrix multiplication */
+ Word16 *Z_e
+);
Word16 matrix_diag_product_fx_2(
- const Word32 *X, /* i : left hand matrix Q31 - X_e*/
+ const Word32 *X, /* i : left hand matrix Q31 - X_e*/
const Word16 X_e,
- const Word16 rowsX, /* i : number of rows of the left hand matrix Q0*/
- const Word16 colsX, /* i : number of columns of the left hand matrix Q0*/
- const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication Q0*/
- const Word32 *Y, /* i : right hand diagonal matrix as vector containing the diagonal elements Q31 - Y_e*/
+ const Word16 rowsX, /* i : number of rows of the left hand matrix Q0*/
+ const Word16 colsX, /* i : number of columns of the left hand matrix Q0*/
+ const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication Q0*/
+ const Word32 *Y, /* i : right hand diagonal matrix as vector containing the diagonal elements Q31 - Y_e*/
const Word16 *Y_e,
- const Word16 entriesY, /* i : number of entries in the diagonal Q0*/
- Word32 *Z, /* o : resulting matrix after the matrix multiplication Q31 - Z_e*/
- Word16 *Z_e );
+ const Word16 entriesY, /* i : number of entries in the diagonal Q0*/
+ Word32 *Z, /* o : resulting matrix after the matrix multiplication Q31 - Z_e*/
+ Word16 *Z_e
+);
Word16 matrix_diag_product_fx_1(
- const Word32 *X, /* i : left hand matrix */
+ const Word32 *X, /* i : left hand matrix */
const Word16 *X_e,
- const Word16 rowsX, /* i : number of rows of the left hand matrix */
- const Word16 colsX, /* i : number of columns of the left hand matrix */
- const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
- const Word32 *Y, /* i : right hand diagonal matrix as vector containing the diagonal elements */
+ const Word16 rowsX, /* i : number of rows of the left hand matrix */
+ const Word16 colsX, /* i : number of columns of the left hand matrix */
+ const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
+ const Word32 *Y, /* i : right hand diagonal matrix as vector containing the diagonal elements */
const Word16 *Y_e,
- const Word16 entriesY, /* i : number of entries in the diagonal */
- Word32 *Z, /* o : resulting matrix after the matrix multiplication */
- Word16 *Z_e );
+ const Word16 entriesY, /* i : number of entries in the diagonal */
+ Word32 *Z, /* o : resulting matrix after the matrix multiplication */
+ Word16 *Z_e
+);
Word16 diag_matrix_product_fx(
- const Word32 *Y, /* i : left hand diagonal matrix as vector containing the diagonal elements */
+ const Word32 *Y, /* i : left hand diagonal matrix as vector containing the diagonal elements */
Word16 Y_e,
- const Word16 entriesY, /* i : length of the diagonal of the left hand matrix */
- const Word32 *X, /* i : right hand matrix */
+ const Word16 entriesY, /* i : length of the diagonal of the left hand matrix */
+ const Word32 *X, /* i : right hand matrix */
Word16 X_e,
- const Word16 rowsX, /* i : number of rows of the right hand matrix */
- const Word16 colsX, /* i : number of columns of the right hand matrix */
- const Word16 transpX, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
- Word32 *Z, /* o : resulting matrix after the matrix multiplication */
- Word16 *Z_e );
+ const Word16 rowsX, /* i : number of rows of the right hand matrix */
+ const Word16 colsX, /* i : number of columns of the right hand matrix */
+ const Word16 transpX, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
+ Word32 *Z, /* o : resulting matrix after the matrix multiplication */
+ Word16 *Z_e
+);
Word16 matrix_product_diag_fx(
- const Word32 *X, /* i : left hand matrix */
+ const Word32 *X, /* i : left hand matrix */
Word16 X_e,
- const Word16 rowsX, /* i : number of rows of the left hand matrix */
- const Word16 colsX, /* i : number of columns of the left hand matrix */
- const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
- const Word32 *Y, /* i : right hand matrix */
+ const Word16 rowsX, /* i : number of rows of the left hand matrix */
+ const Word16 colsX, /* i : number of columns of the left hand matrix */
+ const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
+ const Word32 *Y, /* i : right hand matrix */
Word16 Y_e,
- const Word16 rowsY, /* i : number of rows of the right hand matrix */
- const Word16 colsY, /* i : number of columns of the right hand matrix */
- const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
- Word32 *Z, /* o : resulting matrix after the matrix multiplication */
- Word16 *Z_e );
+ const Word16 rowsY, /* i : number of rows of the right hand matrix */
+ const Word16 colsY, /* i : number of columns of the right hand matrix */
+ const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
+ Word32 *Z, /* o : resulting matrix after the matrix multiplication */
+ Word16 *Z_e
+);
-// ivas_stereo_mdct_core_dec_fx.c
void stereo_mdct_core_dec_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 *signal_out[CPE_CHANNELS], /* o : synthesis @internal_FS */
- Word16 signal_outFB[CPE_CHANNELS][L_FRAME48k], /* o : synthesis @output_FS */
- Word16 e_sigFB[CPE_CHANNELS] /* o : exponent of synthesis @output_FS */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 *signal_out[CPE_CHANNELS], /* o : synthesis @internal_FS */
+ Word16 signal_outFB[CPE_CHANNELS][L_FRAME48k], /* o : synthesis @output_FS */
+ Word16 e_sigFB[CPE_CHANNELS] /* o : exponent of synthesis @output_FS */
);
-// ivas_stereo_mdct_stereo_com.c
void splitAvailableBits_fx(
- const Word16 total_bits, /* i : total available bits for TCX coding */
- const Word16 split_ratio, /* i : split ratio */
- const Word16 isSBAStereoMode, /* i : signal core coding for SBA */
- Word16 *bits_ch0, /* o : bits for channel 0 */
- Word16 *bits_ch1 /* o : bits for channel 1 */
+ const Word16 total_bits, /* i : total available bits for TCX coding */
+ const Word16 split_ratio, /* i : split ratio */
+ const Word16 isSBAStereoMode, /* i : signal core coding for SBA */
+ Word16 *bits_ch0, /* o : bits for channel 0 */
+ Word16 *bits_ch1 /* o : bits for channel 1 */
);
void stereo_tcx_init_dec_fx(
- Decoder_State *st, /* i/o: decoder state structure */
- const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0)*/
- const Word16 last_element_mode /* i : element mode of previous frame */
+ Decoder_State *st, /* i/o: decoder state structure */
+ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0)*/
+ const Word16 last_element_mode /* i : element mode of previous frame */
);
void stereo_icBWE_enc_ivas_fx(
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
- const Word32 shb_speech_ref_fx[], /* i : SHB speech ref channel */
- const Word16 shb_speech_ref_e, /* i : SHB speech ref channel */
- Word32 shb_speech_nonref_fx[], /* i/o: SHB speech non-ref channel */
- Word16 shb_speech_nonref_e, /* i/o: SHB speech non-ref channel */
- const Word32 *voice_factors_fx /* i : voicing factors Q31 */
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
+ const Word32 shb_speech_ref_fx[], /* i : SHB speech ref channel */
+ const Word16 shb_speech_ref_e, /* i : SHB speech ref channel */
+ Word32 shb_speech_nonref_fx[], /* i/o: SHB speech non-ref channel */
+ Word16 shb_speech_nonref_e, /* i/o: SHB speech non-ref channel */
+ const Word32 *voice_factors_fx /* i : voicing factors Q31 */
);
void initMdctStereoDecData_fx(
- STEREO_MDCT_DEC_DATA *hStereoMdct, /* i/o: mdct stereo parameters structure */
- const Word16 igf, /* i : flag indicating IGF activity */
- const H_IGF_GRID igfGrid, /* i : IGF grid configuration */
- const Word32 element_brate, /* i : element bitrate */
- const Word16 bwidth /* i : audio bandwidth */
+ STEREO_MDCT_DEC_DATA *hStereoMdct, /* i/o: mdct stereo parameters structure */
+ const Word16 igf, /* i : flag indicating IGF activity */
+ const H_IGF_GRID igfGrid, /* i : IGF grid configuration */
+ const Word32 element_brate, /* i : element bitrate */
+ const Word16 bwidth /* i : audio bandwidth */
);
void stereo_tdm_downmix_ivas_fx(
- STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i : TD stereo IVAS encoder structure */
- Word16 *Left_in_fx, /* Qx */
- Word16 *Right_in_fx, /* Qx */
- const Word16 input_frame, /* i : Number of samples */
- const Word16 tdm_ratio_idx, /* i : TDM ratio index */
- const Word16 tdm_SM_flag, /* i : channel combination scheme flag */
- const Word16 tdm_ratio_idx_SM /* i : TDM ratio index for SM mode */
+ STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i : TD stereo IVAS encoder structure */
+ Word16 *Left_in_fx, /* Qx */
+ Word16 *Right_in_fx, /* Qx */
+ const Word16 input_frame, /* i : Number of samples */
+ const Word16 tdm_ratio_idx, /* i : TDM ratio index */
+ const Word16 tdm_SM_flag, /* i : channel combination scheme flag */
+ const Word16 tdm_ratio_idx_SM /* i : TDM ratio index for SM mode */
);
ivas_error initMdctItdHandling_fx(
- STEREO_MDCT_ENC_DATA *hStereoMdct, /* i/o: mdct stereo parameters structure */
- const Word32 input_Fs /* i : input sampling rate */
+ STEREO_MDCT_ENC_DATA *hStereoMdct, /* i/o: mdct stereo parameters structure */
+ const Word32 input_Fs /* i : input sampling rate */
);
void stereo_mdct_enc_destroy_fx(
- STEREO_MDCT_ENC_DATA_HANDLE *hStereoMdct /* i/o: encoder MDCT stereo handle */
+ STEREO_MDCT_ENC_DATA_HANDLE *hStereoMdct /* i/o: encoder MDCT stereo handle */
);
void stereo_mdct_init_bands_fx(
- const Word16 L_frame, /* i : frame length */
- const Word16 tmp_tcx_mode, /* i : tcx mode (TCX10, TCX 20), -1 if transition frame */
- const Word32 element_brate, /* i : element bitrate */
- const Word16 igf, /* i : flag indicating if IGF is used */
- const H_IGF_GRID hIgfGrid, /* i : IGF grid setup */
- Word16 *sfbOffset, /* o : sfb offset table */
- Word16 *sfbCnt /* o : number of sfbs */
+ const Word16 L_frame, /* i : frame length */
+ const Word16 tmp_tcx_mode, /* i : tcx mode (TCX10, TCX 20), -1 if transition frame */
+ const Word32 element_brate, /* i : element bitrate */
+ const Word16 igf, /* i : flag indicating if IGF is used */
+ const H_IGF_GRID hIgfGrid, /* i : IGF grid setup */
+ Word16 *sfbOffset, /* o : sfb offset table */
+ Word16 *sfbCnt /* o : number of sfbs */
);
void stereo_mdct_init_igf_start_band_fx(
- STEREO_MDCT_BAND_PARAMETERS *stbParams, /* i/o: stereo frequency band parameters */
- const Word16 transFac, /* i : transform factor */
- const Word16 bwidth, /* i : audio bandwidth */
- const Word32 element_brate /* i : element bitrate */
+ STEREO_MDCT_BAND_PARAMETERS *stbParams, /* i/o: stereo frequency band parameters */
+ const Word16 transFac, /* i : transform factor */
+ const Word16 bwidth, /* i : audio bandwidth */
+ const Word32 element_brate /* i : element bitrate */
);
void ivas_mdct_dec_side_bits_frame_channel_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word16 param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */
- Word16 p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */
- Decoder_State *st0, /* i : pointer to bitstream handle */
- Word16 nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* o : number of bits for TNS */
- Word16 param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV], /* i/o: parameters buffer */
- const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0)*/
- const Word16 odd_channel_cpe /* i : flag cpe with odd nb of tc channels */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word16 param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */
+ Word16 p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */
+ Decoder_State *st0, /* i : pointer to bitstream handle */
+ Word16 nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* o : number of bits for TNS */
+ Word16 param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV], /* i/o: parameters buffer */
+ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
+ const Word16 odd_channel_cpe /* i : flag cpe with odd nb of tc channels */
);
void mdct_read_IGF_bits_fx(
- Decoder_State *st, /* i/o: Decoder state handle */
- Decoder_State *st0 /* i : pointer to handle where bitstream is read */
+ Decoder_State *st, /* i/o: Decoder state handle */
+ Decoder_State *st0 /* i : pointer to handle where bitstream is read */
);
-void IGFDecReadData_ivas_fx( const IGF_DEC_INSTANCE_HANDLE hInstance, /**< in: | instance handle of IGF Deccoder */
- Decoder_State *st, /**< in: | decoder state */
- const Word16 igfGridIdx, /**< in: Q0 | in case of CELP->TCX switching, use 1.25 framelength */
- const Word16 isIndepFrame /**< in: Q0 | if 1: arith dec force reset, if 0: no reset */
+void IGFDecReadData_ivas_fx(
+ const IGF_DEC_INSTANCE_HANDLE hInstance, /* i : instance handle of IGF Deccoder */
+ Decoder_State *st, /* i : decoder state */
+ const Word16 igfGridIdx, /* i : in case of CELP->TCX switching, use 1.25 framelength */
+ const Word16 isIndepFrame /* i : if 1: arith dec force reset, if 0: no reset */
);
void stereo_tca_init_dec_fx(
- STEREO_TCA_DEC_HANDLE hStereoTCA /* i/o: Stereo TCA handle for Fixed */
+ STEREO_TCA_DEC_HANDLE hStereoTCA /* i/o: Stereo TCA handle for Fixed */
);
void stereo_icBWE_init_dec_fx(
- STEREO_ICBWE_DEC_HANDLE hStereoICBWE /* i/o: Stereo inter-channel BWE handle */
+ STEREO_ICBWE_DEC_HANDLE hStereoICBWE /* i/o: Stereo inter-channel BWE handle */
);
void stereo_icBWE_decproc_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 *output[CPE_CHANNELS], /* i/o: output synthesis */
- Word32 outputHB[CPE_CHANNELS][L_FRAME48k], /* i : HB synthesis */
- const Word16 last_core, /* i : last core, primary channel */
- const Word16 last_bwidth, /* i : last bandwidth */
- const Word16 output_frame /* i : frame length */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 *output[CPE_CHANNELS], /* i/o: output synthesis */
+ Word32 outputHB[CPE_CHANNELS][L_FRAME48k], /* i : HB synthesis */
+ const Word16 last_core, /* i : last core, primary channel */
+ const Word16 last_bwidth, /* i : last bandwidth */
+ const Word16 output_frame /* i : frame length */
);
void add_HB_to_mono_dmx_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 output[L_FRAME48k], /* i/o: output synthesis */
- Word32 outputHB[L_FRAME48k], /* i : HB synthesis */
- const Word16 last_core, /* i : last core, primary channel */
- const Word16 output_frame /* i : frame length */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 output[L_FRAME48k], /* i/o: output synthesis */
+ Word32 outputHB[L_FRAME48k], /* i : HB synthesis */
+ const Word16 last_core, /* i : last core, primary channel */
+ const Word16 output_frame /* i : frame length */
);
void stereo_dft_dmx_out_reset_fx(
- STEREO_DFT_DMX_DATA_HANDLE hStereoDftDmx /* i/o: DFT stereo DMX decoder */
+ STEREO_DFT_DMX_DATA_HANDLE hStereoDftDmx /* i/o: DFT stereo DMX decoder */
);
void ivas_get_dirac_sba_max_md_bits_fx(
@@ -1528,86 +1537,89 @@ void ivas_get_dirac_sba_max_md_bits_fx(
Word16 *metadata_max_bits,
Word16 *qmetadata_max_bit_req,
const Word16 nbands,
- IVAS_FORMAT ivas_format );
+ IVAS_FORMAT ivas_format
+);
ivas_error ivas_dirac_sba_config_fx(
- IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
- Word16 *element_mode, /* i/o: element mode of the core coder */
- Word32 sba_total_brate, /* i : SBA total bitrate */
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word16 nbands /* i : number of frequency bands */
- ,
- IVAS_FORMAT ivas_format );
+ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
+ Word16 *element_mode, /* i/o: element mode of the core coder */
+ Word32 sba_total_brate, /* i : SBA total bitrate */
+ const Word16 sba_order, /* i : Ambisonic (SBA) order */
+ const Word16 nbands, /* i : number of frequency bands */
+ IVAS_FORMAT ivas_format
+);
ivas_error ivas_dirac_config_fx(
- void *st_ivas, /* i/o: IVAS encoder/decoder state structure */
- const Word16 enc_dec /* i : encoder or decoder flag */
+ void *st_ivas, /* i/o: IVAS encoder/decoder state structure */
+ const Word16 enc_dec /* i : encoder or decoder flag */
);
void dtx_read_padding_bits_fx(
DEC_CORE_HANDLE st,
- const Word16 num_bits );
+ const Word16 num_bits
+);
void FdCngEncodeMDCTStereoSID_fx(
- CPE_ENC_HANDLE hCPE /* i/o: CPE encoder state structure */
+ CPE_ENC_HANDLE hCPE /* i/o: CPE encoder state structure */
);
void FdCngDecodeMDCTStereoSID_fx(
- CPE_DEC_HANDLE hCPE /* i/o: CPE decoder state structure */
+ CPE_DEC_HANDLE hCPE /* i/o: CPE decoder state structure */
);
void FdCngEncodeDiracMDCTStereoSID_fx(
- CPE_ENC_HANDLE hCPE /* i/o: CPE encoder state structure */
+ CPE_ENC_HANDLE hCPE /* i/o: CPE encoder state structure */
);
void FdCngDecodeDiracMDCTStereoSID_fx(
- CPE_DEC_HANDLE hCPE /* i/o: CPE decoder state structure */
+ CPE_DEC_HANDLE hCPE /* i/o: CPE decoder state structure */
);
-// tonalMDCTconcealment.c
void TonalMdctConceal_whiten_noise_shape_ivas_fx(
Decoder_State *st,
const Word16 L_frame,
- const TONALMDCTCONC_NOISE_SHAPE_WHITENING_MODE whitening_mode );
+ const TONALMDCTCONC_NOISE_SHAPE_WHITENING_MODE whitening_mode
+);
void stereo_icBWE_dec_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 *synthRef_fx, /* i/o: Reference channel HB synthesis at output Fs */
- Word32 *synth_fx, /* o : Non reference channel HB synthesis at output Fs */
- const Word16 *fb_synth_ref_fx, /* i : ref. high-band synthesis 16-20 kHz */
- const Word16 *voice_factors_fx, /* i : voicing factors */
- const Word16 output_frame, /* i : frame length */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 *synthRef_fx, /* i/o: Reference channel HB synthesis at output Fs */
+ Word32 *synth_fx, /* o : Non reference channel HB synthesis at output Fs */
+ const Word16 *fb_synth_ref_fx, /* i : ref. high-band synthesis 16-20 kHz */
+ const Word16 *voice_factors_fx, /* i : voicing factors */
+ const Word16 output_frame, /* i : frame length */
Word16 *Q_syn,
- const Word16 Q_white_exc /* i : Q of fb_synth_ref_fx */
+ const Word16 Q_white_exc /* i : Q of fb_synth_ref_fx */
);
void decoder_tcx_tns_fx(
- Decoder_State *st, /* i/o: coder memory state */
- const Word16 L_frame_glob, /* i : frame length */
+ Decoder_State *st, /* i/o: coder memory state */
+ const Word16 L_frame_glob, /* i : frame length */
const Word16 L_spec,
const Word16 L_frame,
const Word16 L_frameTCX,
Word32 x_fx[N_MAX],
- const Word16 fUseTns, /* i : flag that is set if TNS data is present */
+ const Word16 fUseTns, /* i : flag that is set if TNS data is present */
STnsData *tnsData,
- const Word16 bfi, /* i : Bad frame indicator */
- const Word16 frame_cnt, /* i : frame counter in the super frame */
+ const Word16 bfi, /* i : Bad frame indicator */
+ const Word16 frame_cnt, /* i : frame counter in the super frame */
const Word16 whitenedDomain,
- Word16 *length );
+ Word16 *length
+);
void ivas_mdct_core_tns_ns_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word16 fUseTns[CPE_CHANNELS][NB_DIV], /* i : two entries for each channel in TCX10 */
- STnsData tnsData[CPE_CHANNELS][NB_DIV], /* o : TNS parameter */
- Word32 *x_fx[CPE_CHANNELS][NB_DIV], /* o : synthesis @internal_FS */
- Word32 Aq_fx[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )], /* o : LP coefficients */
- const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word16 fUseTns[CPE_CHANNELS][NB_DIV], /* i : two entries for each channel in TCX10 */
+ STnsData tnsData[CPE_CHANNELS][NB_DIV], /* o : TNS parameter */
+ Word32 *x_fx[CPE_CHANNELS][NB_DIV], /* o : synthesis @internal_FS */
+ Word32 Aq_fx[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )],/* o : LP coefficients */
+ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
Word16 x_e
);
void decoder_tcx_imdct_fx(
- Decoder_State *st, /* i/o: coder memory state */
- const Word16 L_frame_glob, /* i : frame length */
+ Decoder_State *st, /* i/o: coder memory state */
+ const Word16 L_frame_glob, /* i : frame length */
const Word16 L_frameTCX_glob,
const Word16 L_spec,
const Word16 tcx_offset,
@@ -1620,44 +1632,45 @@ void decoder_tcx_imdct_fx(
Word16 xn_buf_fx[],
Word16 *q_win,
Word16 *q_winFB,
- const UWord16 kernelType, /* i : TCX transform kernel type */
- const Word16 fUseTns, /* i : flag that is set if TNS data is present */
- Word16 synth_fx[], /* i/o: synth[-M..L_frame] */
+ const UWord16 kernelType, /* i : TCX transform kernel type */
+ const Word16 fUseTns, /* i : flag that is set if TNS data is present */
+ Word16 synth_fx[], /* i/o: synth[-M..L_frame] */
Word16 synthFB_fx[],
- const Word16 bfi, /* i : Bad frame indicator */
- const Word16 frame_cnt, /* i : frame counter in the super frame */
- const Word16 sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
+ const Word16 bfi, /* i : Bad frame indicator */
+ const Word16 frame_cnt, /* i : frame counter in the super frame */
+ const Word16 sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
);
void ivas_sba_dirac_stereo_dec_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Word32 *output[CPE_CHANNELS], /* i/o: output synthesis signal */
- const Word16 output_frame, /* i : output frame length per channel */
- const Word16 mcmasa /* i : McMASA flag */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Word32 *output[CPE_CHANNELS], /* i/o: output synthesis signal */
+ const Word16 output_frame, /* i : output frame length per channel */
+ const Word16 mcmasa /* i : McMASA flag */
);
ivas_error ivas_osba_render_sf_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
- UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
- UWord16 *nSamplesAvailableNext, /* o : number of CLDFB slots still to render */
- Word32 *p_output[] /* o : rendered time signal */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
+ UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
+ UWord16 *nSamplesAvailableNext, /* o : number of CLDFB slots still to render */
+ Word32 *p_output[] /* o : rendered time signal */
);
void ivas_hq_core_dec_fx(
- Decoder_State *st_fx, /* i/o: decoder state structure fx */
- Word16 synth[], /* o : output synthesis */
- Word16 *Q_synth, /* o : Q value of synth */
- const Word16 output_frame, /* i : output frame length */
- const Word16 hq_core_type, /* i : HQ core type */
- const Word16 core_switching_flag, /* i : ACELP->HQ switching frame flag */
+ Decoder_State *st_fx, /* i/o: decoder state structure fx */
+ Word16 synth[], /* o : output synthesis */
+ Word16 *Q_synth, /* o : Q value of synth */
+ const Word16 output_frame, /* i : output frame length */
+ const Word16 hq_core_type, /* i : HQ core type */
+ const Word16 core_switching_flag, /* i : ACELP->HQ switching frame flag */
Word16 output[],
- Word16 *Q_output );
+ Word16 *Q_output
+);
void ivas_HQ_FEC_Mem_update_fx(
- Decoder_State *st_fx, /* i/o: decoder state structure */
- Word32 *t_audio_q_fx, /*Q12*/
- Word32 *normq_fx, /*Q14*/
+ Decoder_State *st_fx, /* i/o: decoder state structure */
+ Word32 *t_audio_q_fx, /*Q12*/
+ Word32 *normq_fx, /*Q14*/
Word16 *ynrm,
Word16 *Num_bands_p,
Word16 is_transient,
@@ -1665,83 +1678,86 @@ void ivas_HQ_FEC_Mem_update_fx(
Word16 c_switching_flag,
Word16 nb_sfm,
Word16 num_Sb,
- Word16 *mean_en_high_fx, /*Q5*/
- Word16 hq_core_type, /* i : normal or low-rate MDCT(HQ) core */
- Word16 output_frame );
+ Word16 *mean_en_high_fx, /*Q5*/
+ Word16 hq_core_type, /* i : normal or low-rate MDCT(HQ) core */
+ Word16 output_frame
+);
-Word16 ivas_hq_classifier_dec_fx( /* o : Consumed bits Q0 */
- Decoder_State *st_fx, /* i/o: decoder state structure */
- const Word32 core_brate, /* i : Core bit rate Q0 */
- const Word16 length, /* i : Frame length Q0 */
- Word16 *is_transient, /* o : Transient flag Q0 */
- Word16 *hqswb_clas /* o : HQ class Q0 */
+/* o : Consumed bits Q0 */
+Word16 ivas_hq_classifier_dec_fx(
+ Decoder_State *st_fx, /* i/o: decoder state structure */
+ const Word32 core_brate, /* i : Core bit rate Q0 */
+ const Word16 length, /* i : Frame length Q0 */
+ Word16 *is_transient, /* o : Transient flag Q0 */
+ Word16 *hqswb_clas /* o : HQ class Q0 */
);
void ivas_hq_hr_dec_fx(
- Decoder_State *st_fx, /* i/o: decoder state structure fx */
- Word32 *t_audio_q, /* o : transform-domain coefficients Q12 */
- const Word16 length, /* i : frame length Q0 */
- Word16 num_bits, /* i : number of available bits Q0 */
- Word16 *ynrm, /* o : norm quantization index vector Q0 */
- Word16 *is_transient, /* o : transient flag Q0 */
- Word16 *hqswb_clas, /* o : HQ SWB class Q0 */
- Word16 *SWB_fenv, /* o : SWB frequency envelopes Q1 */
- const Word16 core_switching_flag /* i : Core switching flag */
+ Decoder_State *st_fx, /* i/o: decoder state structure fx */
+ Word32 *t_audio_q, /* o : transform-domain coefficients Q12 */
+ const Word16 length, /* i : frame length Q0 */
+ Word16 num_bits, /* i : number of available bits Q0 */
+ Word16 *ynrm, /* o : norm quantization index vector Q0 */
+ Word16 *is_transient, /* o : transient flag Q0 */
+ Word16 *hqswb_clas, /* o : HQ SWB class Q0 */
+ Word16 *SWB_fenv, /* o : SWB frequency envelopes Q1 */
+ const Word16 core_switching_flag /* i : Core switching flag */
);
void ivas_hq_configure_fx(
- const Word16 length, /* i : Frame length Q0 */
- const Word16 hqswb_clas, /* i : HQ SWB class Q0 */
- const Word32 core_brate, /* i : Codec bitrate Q0 */
- Word16 *num_sfm, /* o : Total number of subbands Q0 */
- Word16 *nb_sfm, /* o : Total number of coded bands Q0 */
- Word16 *start_norm, /* o : First norm to be SDE encoded Q0 */
- Word16 *num_env_bands, /* o : Number coded envelope bands Q0 */
- Word16 *numnrmibits, /* o : Number of bits in fall-back norm encoding Q0 */
- Word16 *hq_generic_offset, /* o : Freq offset for HQ GENERIC Q0 */
- Word16 *sfmsize, /* o : Subband bandwidths Q0 */
- Word16 *sfm_start, /* o : Subband start coefficients Q0 */
- Word16 *sfm_end /* o : Subband end coefficients Q0 */
+ const Word16 length, /* i : Frame length Q0 */
+ const Word16 hqswb_clas, /* i : HQ SWB class Q0 */
+ const Word32 core_brate, /* i : Codec bitrate Q0 */
+ Word16 *num_sfm, /* o : Total number of subbands Q0 */
+ Word16 *nb_sfm, /* o : Total number of coded bands Q0 */
+ Word16 *start_norm, /* o : First norm to be SDE encoded Q0 */
+ Word16 *num_env_bands, /* o : Number coded envelope bands Q0 */
+ Word16 *numnrmibits, /* o : Number of bits in fall-back norm encoding Q0 */
+ Word16 *hq_generic_offset, /* o : Freq offset for HQ GENERIC Q0 */
+ Word16 *sfmsize, /* o : Subband bandwidths Q0 */
+ Word16 *sfm_start, /* o : Subband start coefficients Q0 */
+ Word16 *sfm_end /* o : Subband end coefficients Q0 */
);
void ivas_hq_bit_allocation_fx(
- const Word32 core_brate, /* i : Core bit-rate Q0 */
- const Word16 length, /* i : Frame length Q0 */
- const Word16 hqswb_clas, /* i : HQ class Q0 */
- Word16 *num_bits, /* i/o: Remaining bit budget Q0 */
- const Word16 *normqlg2, /* i : Quantized norms Q0 */
- const Word16 nb_sfm, /* i : Number sub bands to be encoded Q0 */
- const Word16 *sfmsize, /* i : Sub band bandwidths Q0 */
- Word16 *noise_level, /* o : HVQ noise level Q15 */
- Word16 *R, /* o : Bit allocation per sub band Q0 */
- Word16 *Rsubband, /* o : Fractional bit allocation Q3 */
- Word16 *sum, /* o : Sum of allocated shape bits Q0 */
- Word16 *core_sfm, /* o : Last coded band in core Q0 */
- const Word16 num_env_bands /* i : Number sub bands to be encoded for HQ_GEN Q0 */
-);
-
-Word16 ivas_assign_gain_bits_fx( /* o : Number of assigned gain bits */
- const Word16 core, /* i : HQ core */
- const Word16 BANDS, /* i : Number of bands */
- const Word16 *band_width, /* i : Sub band bandwidth */
- Word16 *Rk, /* i/o: Bit allocation/Adjusted bit alloc. Q3 */
- Word16 *gain_bits_array, /* o : Assigned gain bits */
- Word16 *Rcalc /* o : Bit budget for shape quantizer Q3 */
+ const Word32 core_brate, /* i : Core bit-rate Q0 */
+ const Word16 length, /* i : Frame length Q0 */
+ const Word16 hqswb_clas, /* i : HQ class Q0 */
+ Word16 *num_bits, /* i/o: Remaining bit budget Q0 */
+ const Word16 *normqlg2, /* i : Quantized norms Q0 */
+ const Word16 nb_sfm, /* i : Number sub bands to be encoded Q0 */
+ const Word16 *sfmsize, /* i : Sub band bandwidths Q0 */
+ Word16 *noise_level, /* o : HVQ noise level Q15 */
+ Word16 *R, /* o : Bit allocation per sub band Q0 */
+ Word16 *Rsubband, /* o : Fractional bit allocation Q3 */
+ Word16 *sum, /* o : Sum of allocated shape bits Q0 */
+ Word16 *core_sfm, /* o : Last coded band in core Q0 */
+ const Word16 num_env_bands /* i : Number sub bands to be encoded for HQ_GEN Q0 */
+);
+
+/* o : Number of assigned gain bits */
+Word16 ivas_assign_gain_bits_fx(
+ const Word16 core, /* i : HQ core */
+ const Word16 BANDS, /* i : Number of bands */
+ const Word16 *band_width, /* i : Sub band bandwidth */
+ Word16 *Rk, /* i/o: Bit allocation/Adjusted bit alloc. Q3 */
+ Word16 *gain_bits_array, /* o : Assigned gain bits */
+ Word16 *Rcalc /* o : Bit budget for shape quantizer Q3 */
);
void ivas_fine_gain_pred_fx(
- const Word16 *sfm_start, /* i : Sub band start indices */
- const Word16 *sfm_end, /* i : Sub band end indices */
- const Word16 *sfm_size, /* i : Sub band bandwidths */
- const Word16 *i_sort, /* i : Energy sorting indices */
- const Word16 *K, /* i : Number of pulses per band */
- const Word16 *maxpulse, /* i : Maximum pulse per band */
- const Word16 *R, /* i : Bits per sub band Q3 */
- const Word16 num_sfm, /* i : Number of sub bands */
- Word16 *xq, /* i/o: Quantized vector /quantized vector with finegain adj Q15*/
- Word16 *y, /* i/o: Quantized vector (int) Q0*/
- Word16 *fg_pred, /* o : Predicted fine gains Q12 */
- const Word16 core /* i : Core */
+ const Word16 *sfm_start, /* i : Sub band start indices */
+ const Word16 *sfm_end, /* i : Sub band end indices */
+ const Word16 *sfm_size, /* i : Sub band bandwidths */
+ const Word16 *i_sort, /* i : Energy sorting indices */
+ const Word16 *K, /* i : Number of pulses per band */
+ const Word16 *maxpulse, /* i : Maximum pulse per band */
+ const Word16 *R, /* i : Bits per sub band Q3 */
+ const Word16 num_sfm, /* i : Number of sub bands */
+ Word16 *xq, /* i/o: Quantized vector /quantized vector with finegain adj Q15*/
+ Word16 *y, /* i/o: Quantized vector (int) Q0*/
+ Word16 *fg_pred, /* o : Predicted fine gains Q12 */
+ const Word16 core /* i : Core */
);
Word16 ivas_pvq_core_dec_fx(
@@ -1749,117 +1765,119 @@ Word16 ivas_pvq_core_dec_fx(
const Word16 *sfm_start,
const Word16 *sfm_end,
const Word16 *sfmsize,
- Word16 coefs_quant[], /* o : output MDCT */
+ Word16 coefs_quant[], /* o : output MDCT */
Word16 *Q_coefs,
Word16 bits_tot,
Word16 nb_sfm,
- Word16 *R, /* Q3 */
+ Word16 *R, /* Q3 */
Word16 *Rs,
Word16 *npulses,
Word16 *maxpulse,
- const Word16 core );
+ const Word16 core
+);
void ivas_hq_ecu_fx(
- const Word16 *prevsynth, /* i : buffer of previously synthesized signal */
- Word32 *ecu_rec, /* o : reconstructed frame in tda domain */
- Word16 *time_offs, /* i/o: Sample offset for consecutive frame losses */
- Word16 *X_sav, /* i/o: Stored spectrum of prototype frame */
- Word16 *Q_spec, /* i/o: Q value of stored spectrum */
- Word16 *num_p, /* i/o: Number of identified peaks */
- Word16 *plocs, /* i/o: Peak locations */
- Word32 *plocsi, /* i/o: Interpolated peak locations Q16 */
- const Word16 env_stab, /* i : Envelope stability parameter */
- Word16 *last_fec, /* i/o: Flag for usage of pitch dependent ECU */
- const Word16 ph_ecu_HqVoicing, /* i : HQ Voicing flag */
- Word16 *ph_ecu_active, /* i : Phase ECU active flag */
- Word16 *gapsynth, /* o : Gap synthesis */
- const Word16 prev_bfi, /* i : indicating burst frame error */
- const Word16 old_is_transient[2], /* i : flags indicating previous transient frames */
- Word16 *mag_chg_1st, /* i/o: per band magnitude modifier for transients */
- Word16 *Xavg, /* i/o: Frequency group average gain to fade to */
- Word16 *beta_mute, /* o : Factor for long-term mute */
- const Word16 output_frame, /* i : frame length */
- Decoder_State *st_fx /* i/o: decoder state structure */
+ const Word16 *prevsynth, /* i : buffer of previously synthesized signal */
+ Word32 *ecu_rec, /* o : reconstructed frame in tda domain */
+ Word16 *time_offs, /* i/o: Sample offset for consecutive frame losses */
+ Word16 *X_sav, /* i/o: Stored spectrum of prototype frame */
+ Word16 *Q_spec, /* i/o: Q value of stored spectrum */
+ Word16 *num_p, /* i/o: Number of identified peaks */
+ Word16 *plocs, /* i/o: Peak locations */
+ Word32 *plocsi, /* i/o: Interpolated peak locations Q16 */
+ const Word16 env_stab, /* i : Envelope stability parameter */
+ Word16 *last_fec, /* i/o: Flag for usage of pitch dependent ECU */
+ const Word16 ph_ecu_HqVoicing, /* i : HQ Voicing flag */
+ Word16 *ph_ecu_active, /* i : Phase ECU active flag */
+ Word16 *gapsynth, /* o : Gap synthesis */
+ const Word16 prev_bfi, /* i : indicating burst frame error */
+ const Word16 old_is_transient[2], /* i : flags indicating previous transient frames */
+ Word16 *mag_chg_1st, /* i/o: per band magnitude modifier for transients */
+ Word16 *Xavg, /* i/o: Frequency group average gain to fade to */
+ Word16 *beta_mute, /* o : Factor for long-term mute */
+ const Word16 output_frame, /* i : frame length */
+ Decoder_State *st_fx /* i/o: decoder state structure */
);
void ivas_fill_spectrum_fx(
- Word16 *coeff, /* i/o: normalized MLT spectrum / nf spectrum Q12 */
- Word32 *L_coeff_out, /* i/o: Noisefilled MLT spectrum Q12 */
- const Word16 *R, /* i : number of pulses per band Q0 */
- const Word16 is_transient, /* i : transient flag Q0 */
- Word16 norm[], /* i : quantization indices for norms Q0 */
- const Word16 *hq_generic_fenv, /* i : HQ GENERIC envelope Q1 */
- const Word16 hq_generic_offset, /* i : HQ GENERIC offset Q0 */
- const Word16 nf_idx, /* i : noise fill index Q0 */
- const Word16 length, /* i : Length of spectrum (32 or 48 kHz) Q0 */
- const Word16 env_stab, /* i : Envelope stability measure [0..1] Q15 */
- Word16 *no_att_hangover, /* i/o: Frame counter for attenuation hangover Q0 */
- Word32 *L_energy_lt, /* i/o: Long-term energy measure for transient detection Q13 */
- Word16 *bwe_seed, /* i/o: random seed for generating BWE i Q0 */
- const Word16 hq_generic_exc_clas, /* i : BWE excitation class Q0 */
- const Word16 core_sfm, /* i : index of the end band for core Q0 */
- const Word16 HQ_mode, /* i : HQ mode Q0 */
- Word16 noise_level[], /* i : noise levels for harmonic modes Q15 */
- const Word32 L_core_brate, /* i : target bit-rate Q0 */
- Word16 prev_noise_level[], /* i/o: noise factor in previous frame Q15 */
- Word16 *prev_R, /* i/o: bit allocation info. in previous frame Q0 */
- Word32 *prev_coeff_out, /* i/o: decoded spectrum in previous frame Q12 */
- const Word16 *peak_idx, /* i : peak indices for hvq Q0 */
- const Word16 Npeaks, /* i : number of peaks in hvq Q0 */
- const Word16 *npulses, /* i : number of pulses per band Q0 */
- const Word16 prev_is_transient, /* i : previous transient flag Q0 */
- Word32 *prev_normq, /* i/o: previous norms Q14 */
- Word32 *prev_env, /* i/o: previous noise envelopes Q(prev_env_Q) */
- const Word16 prev_bfi, /* i : previous bad frame indicator Q0 */
- const Word16 *sfmsize, /* i : Length of bands Q0 */
- const Word16 *sfm_start, /* i : Start of bands Q0 */
- const Word16 *sfm_end, /* i : End of bands Q0 */
- Word16 *prev_L_swb_norm, /* i/o: HVQ/Harmonic mode normalization length Q0 */
- const Word16 prev_hq_mode, /* i : Previous HQ mode Q0 */
- const Word16 num_sfm, /* i : Total number of bands Q0 */
+ Word16 *coeff, /* i/o: normalized MLT spectrum / nf spectrum Q12 */
+ Word32 *L_coeff_out, /* i/o: Noisefilled MLT spectrum Q12 */
+ const Word16 *R, /* i : number of pulses per band Q0 */
+ const Word16 is_transient, /* i : transient flag Q0 */
+ Word16 norm[], /* i : quantization indices for norms Q0 */
+ const Word16 *hq_generic_fenv, /* i : HQ GENERIC envelope Q1 */
+ const Word16 hq_generic_offset, /* i : HQ GENERIC offset Q0 */
+ const Word16 nf_idx, /* i : noise fill index Q0 */
+ const Word16 length, /* i : Length of spectrum (32 or 48 kHz) Q0 */
+ const Word16 env_stab, /* i : Envelope stability measure [0..1] Q15 */
+ Word16 *no_att_hangover, /* i/o: Frame counter for attenuation hangover Q0 */
+ Word32 *L_energy_lt, /* i/o: Long-term energy measure for transient detection Q13 */
+ Word16 *bwe_seed, /* i/o: random seed for generating BWE i Q0 */
+ const Word16 hq_generic_exc_clas, /* i : BWE excitation class Q0 */
+ const Word16 core_sfm, /* i : index of the end band for core Q0 */
+ const Word16 HQ_mode, /* i : HQ mode Q0 */
+ Word16 noise_level[], /* i : noise levels for harmonic modes Q15 */
+ const Word32 L_core_brate, /* i : target bit-rate Q0 */
+ Word16 prev_noise_level[], /* i/o: noise factor in previous frame Q15 */
+ Word16 *prev_R, /* i/o: bit allocation info. in previous frame Q0 */
+ Word32 *prev_coeff_out, /* i/o: decoded spectrum in previous frame Q12 */
+ const Word16 *peak_idx, /* i : peak indices for hvq Q0 */
+ const Word16 Npeaks, /* i : number of peaks in hvq Q0 */
+ const Word16 *npulses, /* i : number of pulses per band Q0 */
+ const Word16 prev_is_transient, /* i : previous transient flag Q0 */
+ Word32 *prev_normq, /* i/o: previous norms Q14 */
+ Word32 *prev_env, /* i/o: previous noise envelopes Q(prev_env_Q) */
+ const Word16 prev_bfi, /* i : previous bad frame indicator Q0 */
+ const Word16 *sfmsize, /* i : Length of bands Q0 */
+ const Word16 *sfm_start, /* i : Start of bands Q0 */
+ const Word16 *sfm_end, /* i : End of bands Q0 */
+ Word16 *prev_L_swb_norm, /* i/o: HVQ/Harmonic mode normalization length Q0 */
+ const Word16 prev_hq_mode, /* i : Previous HQ mode Q0 */
+ const Word16 num_sfm, /* i : Total number of bands Q0 */
Word16 *prev_env_Q,
const Word16 num_env_bands,
- const Word16 element_mode );
+ const Word16 element_mode
+);
void ivas_de_interleave_spectrum_fx(
- Word32 *coefs, /* i/o: input and output coefficients Q12 */
- const Word16 length /* i : length of spectrum Q0 */
+ Word32 *coefs, /* i/o: input and output coefficients Q12 */
+ const Word16 length /* i : length of spectrum Q0 */
);
void ivas_harm_bwe_fx(
- const Word16 *coeff_fine, /* i : fine structure for BWE */
- const Word16 *coeff, /* i : coded/noisefilled normalized spectrum */
- const Word16 num_sfm, /* i : Number of subbands */
- const Word16 *sfm_start, /* i : Subband start coefficient */
- const Word16 *sfm_end, /* i : Subband end coefficient */
- const Word16 last_sfm, /* i : last coded subband */
- const Word16 *R, /* i : bit allocation */
- const Word16 prev_hq_mode, /* i : previous hq mode */
- Word16 *norm, /* i/o: quantization indices for norms */
- Word16 *noise_level, /* i/o: noise levels for harmonic modes */
- Word16 *prev_noise_level, /* i/o: noise factor in previous frame */
- Word16 *bwe_seed, /* i/o: random seed for generating BWE input */
- Word32 *coeff_out, /* o : coded/noisefilled spectrum */
- const Word16 element_mode /* i : IVAS element mode */
+ const Word16 *coeff_fine, /* i : fine structure for BWE */
+ const Word16 *coeff, /* i : coded/noisefilled normalized spectrum */
+ const Word16 num_sfm, /* i : Number of subbands */
+ const Word16 *sfm_start, /* i : Subband start coefficient */
+ const Word16 *sfm_end, /* i : Subband end coefficient */
+ const Word16 last_sfm, /* i : last coded subband */
+ const Word16 *R, /* i : bit allocation */
+ const Word16 prev_hq_mode, /* i : previous hq mode */
+ Word16 *norm, /* i/o: quantization indices for norms */
+ Word16 *noise_level, /* i/o: noise levels for harmonic modes */
+ Word16 *prev_noise_level, /* i/o: noise factor in previous frame */
+ Word16 *bwe_seed, /* i/o: random seed for generating BWE input */
+ Word32 *coeff_out, /* o : coded/noisefilled spectrum */
+ const Word16 element_mode /* i : IVAS element mode */
);
void ivas_hq_pred_hb_bws_fx(
- Decoder_State *st_fx, /* i/o: decoder state structure */
- const Word16 *ynrm, /* i : norm quantization index vector */
- const Word16 length, /* i : frame length */
- const Word16 hqswb_clas, /* i : HQ SWB class */
- const Word16 *SWB_fenv /* i : SWB frequency envelopes Q1 */
+ Decoder_State *st_fx, /* i/o: decoder state structure */
+ const Word16 *ynrm, /* i : norm quantization index vector */
+ const Word16 length, /* i : frame length */
+ const Word16 hqswb_clas, /* i : HQ SWB class */
+ const Word16 *SWB_fenv /* i : SWB frequency envelopes Q1 */
);
void synchro_synthesis_fx(
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 *output_fx[CPE_CHANNELS], /* i/o: output synthesis signal */
- const Word16 output_frame, /* i : Number of samples */
- const Word16 sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
- Word16 output_fx_q );
-
-// ivas_dirac_output_synthesis_cov
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 *output_fx[CPE_CHANNELS], /* i/o: output synthesis signal */
+ const Word16 output_frame, /* i : Number of samples */
+ const Word16 sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
+ Word16 output_fx_q
+);
+
void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx(
Word32 *RealBuffer_fx, /* i : input channel filter bank samples (real part) */
Word16 RealBuffer_e, /* i : exponent input channel filter bank samples (real part)*/
@@ -1875,109 +1893,113 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx(
);
void configureFdCngDec_ivas_fx(
- HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: Contains the variables related to the FD-based CNG process */
+ HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: Contains the variables related to the FD-based CNG process */
const Word16 bwidth,
const Word32 total_brate,
const Word16 L_frame,
const Word16 last_L_frame,
- const Word16 element_mode );
+ const Word16 element_mode
+);
void synchonize_channels_mdct_sid_fx(
- Decoder_State *sts[CPE_CHANNELS], /* i/o: decoder state structure */
- const Word16 n /* i : channel number */
+ Decoder_State *sts[CPE_CHANNELS], /* i/o: decoder state structure */
+ const Word16 n /* i : channel number */
);
void ivas_interpolate_3_over_1_allpass_fx(
- const Word16 *input_fx,
- /* i : input signal */ /* Q_input */
- const Word16 len, /* i : number of input samples */
- Word16 *out_fx,
- /* o : output signal */ /* Q_input */
- Word16 *mem_fx /* i/o: memory */ /* Q_input */
+ const Word16 *input_fx, /* i : input signal Q_input */
+ const Word16 len, /* i : number of input samples */
+ Word16 *out_fx, /* o : output signal Q_input */
+ Word16 *mem_fx /* i/o: memory Q_input */
);
void tdm_configure_enc_fx(
- const Word16 ivas_format, /* i : IVAS format */
- const Word16 ism_mode, /* i : ISM mode in combined format */
- CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
- const Word16 Etot_last_fx[CPE_CHANNELS], /* i/o: Energy of last frame Q8*/
- const Word16 tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag in TD stereo OR LRTD primary channel */
- const Word16 tdm_ratio_idx, /* i : ratio index */
- const Word16 tdm_ratio_idx_SM, /* i : ratio index in SM mode */
- const Word16 attack_flag, /* i : Primary channel attack flag */
- const Word16 nb_bits_metadata /* i : number of metadata bits */
+ const Word16 ivas_format, /* i : IVAS format */
+ const Word16 ism_mode, /* i : ISM mode in combined format */
+ CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
+ const Word16 Etot_last_fx[CPE_CHANNELS], /* i/o: Energy of last frame Q8*/
+ const Word16 tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag in TD stereo OR LRTD primary channel */
+ const Word16 tdm_ratio_idx, /* i : ratio index */
+ const Word16 tdm_ratio_idx_SM, /* i : ratio index in SM mode */
+ const Word16 attack_flag, /* i : Primary channel attack flag */
+ const Word16 nb_bits_metadata /* i : number of metadata bits */
);
void stereoFdCngCoherence_fx(
- Encoder_State **sts, /* i/o: core encoder structures */
- const Word16 last_element_mode, /* i : last element mode */
- Word16 fft_buff[CPE_CHANNELS][2 * L_FFT], /* i : fft buffers for L and R channels fft_exp*/
- Word16 fft_exp );
+ Encoder_State **sts, /* i/o: core encoder structures */
+ const Word16 last_element_mode, /* i : last element mode */
+ Word16 fft_buff[CPE_CHANNELS][2 * L_FFT], /* i : fft buffers for L and R channels fft_exp*/
+ Word16 fft_exp
+);
void ivas_wb_tbe_dec_fx(
- Decoder_State *st_fx, /* i/o: decoder state structure */
- const Word16 coder_type, /* i : coding type */
- Word32 *bwe_exc_extended, /* i : bandwidth extended exciatation 2*Q_exc*/
+ Decoder_State *st_fx, /* i/o: decoder state structure */
+ const Word16 coder_type, /* i : coding type */
+ Word32 *bwe_exc_extended, /* i : bandwidth extended exciatation 2*Q_exc*/
const Word16 Q_exc,
- const Word16 voice_factors[], /* i : voicing factors */
- Word16 *synth, /* o : WB synthesis/final synthesis */
- Word16 *Q_synth );
+ const Word16 voice_factors[], /* i : voicing factors */
+ Word16 *synth, /* o : WB synthesis/final synthesis */
+ Word16 *Q_synth
+);
void GenShapedWBExcitation_ivas_fx(
- Word16 *excSHB, /* o : synthesized shaped shb exctiation Q_bwe_exc*/
- const Word16 *lpc_shb, /* i : lpc coefficients Q12*/
- Word16 *exc4kWhtnd, /* o : whitened synthesized shb excitation Q_bwe_exc*/
- Word32 *mem_csfilt, /* i/o : memory Q_bwe_exc+16*/
- Word16 *mem_genSHBexc_filt_down1, /* i/o : memory Q_bwe_exc*/
- Word16 *mem_genSHBexc_filt_down2, /* i/o : memory Q_bwe_exc*/
- Word16 *mem_genSHBexc_filt_down3, /* i/o : memory Q_bwe_exc*/
- Word16 *state_lpc_syn, /* i/o : memory Q_bwe_exc*/
- const Word16 coder_type, /* i : coding type */
- const Word16 *bwe_exc_extended, /* i : bwidth extended exciatation Q_bwe_exc*/
+ Word16 *excSHB, /* o : synthesized shaped shb exctiation Q_bwe_exc*/
+ const Word16 *lpc_shb, /* i : lpc coefficients Q12 */
+ Word16 *exc4kWhtnd, /* o : whitened synthesized shb excitation Q_bwe_exc*/
+ Word32 *mem_csfilt, /* i/o : memory Q_bwe_exc+16*/
+ Word16 *mem_genSHBexc_filt_down1, /* i/o : memory Q_bwe_exc*/
+ Word16 *mem_genSHBexc_filt_down2, /* i/o : memory Q_bwe_exc*/
+ Word16 *mem_genSHBexc_filt_down3, /* i/o : memory Q_bwe_exc*/
+ Word16 *state_lpc_syn, /* i/o : memory Q_bwe_exc*/
+ const Word16 coder_type, /* i : coding type */
+ const Word16 *bwe_exc_extended, /* i : bwidth extended exciatation Q_bwe_exc*/
const Word16 Q_bwe_exc,
- Word16 bwe_seed[], /* i/o : random number generator seed */
- const Word16 voice_factors[], /* i : voicing factor Q15*/
- const Word16 uv_flag, /* i : unvoiced flag */
- const Word16 igf_flag );
-
-Word16 ivas_wb_bwe_dec_fx( /* o : Q_syn_hb*/
- Decoder_State *st_fx, /* i/o: decoder state structure */
- const Word16 output[], /* i : suntehsis @ internal Fs Q_input */
- Word16 *synth_fx, /* i/o: ACELP core synthesis/final synthesis Q0/Qpost */
- Word16 *hb_synth_fx, /* o : SHB synthesis/final synthesis Q_syn_hb */
- const Word16 use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */
- const Word16 output_frame, /* i : frame length */
- Word16 *voice_factors_fx, /* i : voicing factors Q15 */
- const Word16 pitch_buf_fx[], /* i : pitch buffer Q6 */
- Word16 *Qpost );
+ Word16 bwe_seed[], /* i/o : random number generator seed */
+ const Word16 voice_factors[], /* i : voicing factor Q15*/
+ const Word16 uv_flag, /* i : unvoiced flag */
+ const Word16 igf_flag
+);
+
+/* o : Q_syn_hb*/
+Word16 ivas_wb_bwe_dec_fx(
+ Decoder_State *st_fx, /* i/o: decoder state structure */
+ const Word16 output[], /* i : suntehsis @ internal Fs Q_input */
+ Word16 *synth_fx, /* i/o: ACELP core synthesis/final synthesis Q0/Qpost */
+ Word16 *hb_synth_fx, /* o : SHB synthesis/final synthesis Q_syn_hb */
+ const Word16 use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo */
+ const Word16 output_frame, /* i : frame length */
+ Word16 *voice_factors_fx, /* i : voicing factors Q15 */
+ const Word16 pitch_buf_fx[], /* i : pitch buffer Q6 */
+ Word16 *Qpost
+);
void ivas_param_ism_config_fx(
- PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i/o: IVAS Param ISM Config Structure */
- const Word16 nchan_obj /* i : number of ISM channels */
+ PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i/o: IVAS Param ISM Config Structure */
+ const Word16 nchan_obj /* i : number of ISM channels */
);
void ivas_mdct_core_invQ_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */
- Word16 nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* i : number of TNS bits */
- Word16 p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to param buffer */
- Word16 param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* i : lpc parameters */
- Word16 param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV], /* i : param buffer */
- Word16 fUseTns[CPE_CHANNELS][NB_DIV], /* i : flag TNS enabled */
- STnsData tnsData[CPE_CHANNELS][NB_DIV], /* i : TNS parameter */
- Word32 *x_0[CPE_CHANNELS][NB_DIV], /* i/o: signal buffer */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE handle */
+ Word16 nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* i : number of TNS bits */
+ Word16 p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to param buffer */
+ Word16 param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* i : lpc parameters */
+ Word16 param[CPE_CHANNELS][DEC_NPRM_DIV * NB_DIV], /* i : param buffer */
+ Word16 fUseTns[CPE_CHANNELS][NB_DIV], /* i : flag TNS enabled */
+ STnsData tnsData[CPE_CHANNELS][NB_DIV], /* i : TNS parameter */
+ Word32 *x_0[CPE_CHANNELS][NB_DIV], /* i/o: signal buffer */
Word16 x_0_e,
- Word32 *x[CPE_CHANNELS][NB_DIV], /* i/o: signal buffer */
+ Word32 *x[CPE_CHANNELS][NB_DIV], /* i/o: signal buffer */
Word16 x_e,
Word16 x_len[CPE_CHANNELS][NB_DIV],
- Word16 Aq[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )], /* i : LP coefficients */
- Word16 ms_mask[NB_DIV][MAX_SFB], /* i : M/S mask */
- const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0) */
+ Word16 Aq[CPE_CHANNELS][( NB_SUBFR16k + 1 ) * ( M + 1 )], /* i : LP coefficients */
+ Word16 ms_mask[NB_DIV][MAX_SFB], /* i : M/S mask */
+ const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0) */
);
void ivas_mdct_tcx10_bit_distribution_fx(
- Word16 target_bitsTCX10[NB_DIV], /* o : target bit distribution */
- const Word16 nbits_tcx, /* i : TCX bits */
- const Word16 nTnsBitsTCX10[NB_DIV] /* i : TNS bits */
+ Word16 target_bitsTCX10[NB_DIV], /* o : target bit distribution */
+ const Word16 nbits_tcx, /* i : TCX bits */
+ const Word16 nTnsBitsTCX10[NB_DIV] /* i : TNS bits */
);
void TonalMDCTConceal_Detect_ivas_fx(
@@ -1985,10 +2007,11 @@ void TonalMDCTConceal_Detect_ivas_fx(
const Word32 pitchLag,
Word16 *numIndices,
const PsychoacousticParameters *psychParamsCurrent,
- Word16 element_mode );
+ Word16 element_mode
+);
Word16 GetPLCModeDecision_ivas_fx(
- Decoder_State *st /* i/o: decoder memory state pointer */
+ Decoder_State *st /* i/o: decoder memory state pointer */
);
void ivas_DetectTonalComponents_fx(
@@ -2007,47 +2030,51 @@ void ivas_DetectTonalComponents_fx(
const Word16 secondLastPowerSpectrum_e,
const Word16 nSamples,
const Word16 nSamplesCore,
- Word16 floorPowerSpectrum, /* i: lower limit for power spectrum bins */
+ Word16 floorPowerSpectrum, /* i : lower limit for power spectrum bins */
const PsychoacousticParameters *psychParamsCurrent,
- Word16 element_mode );
+ Word16 element_mode
+);
ivas_error stereo_dft_dec_create_fx(
- STEREO_DFT_DEC_DATA_HANDLE *hStereoDft, /* i/o: decoder DFT stereo handle */
- const Word32 element_brate, /* i : element bitrate */
- const Word32 output_Fs, /* i : output sampling rate */
- const Word16 sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
- const Word16 nchan_transport /* i : number of transport channels */
+ STEREO_DFT_DEC_DATA_HANDLE *hStereoDft, /* i/o: decoder DFT stereo handle */
+ const Word32 element_brate, /* i : element bitrate */
+ const Word32 output_Fs, /* i : output sampling rate */
+ const Word16 sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
+ const Word16 nchan_transport /* i : number of transport channels */
);
void stereo_cng_init_dec_fx(
- STEREO_CNG_DEC_HANDLE hStereoCng, /* i/o: stereo CNG decoder structure */
- const Word16 *frameSize /* i : pointer to frameSize of channel 0 to be used for channel 1 */
+ STEREO_CNG_DEC_HANDLE hStereoCng, /* i/o: stereo CNG decoder structure */
+ const Word16 *frameSize /* i : pointer to frameSize of channel 0 to be used for channel 1 */
);
ivas_error stereo_memory_dec_fx(
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- CPE_DEC_HANDLE hCPE, /* i : CPE decoder structure */
- const Word16 nb_bits_metadata, /* i : number of metadata bits */
- const Word32 output_Fs, /* i : output sampling rate */
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- const MC_MODE mc_mode, /* i : MC mode */
- const Word16 nchan_transport /* i : number of transport channels*/
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ CPE_DEC_HANDLE hCPE, /* i : CPE decoder structure */
+ const Word16 nb_bits_metadata, /* i : number of metadata bits */
+ const Word32 output_Fs, /* i : output sampling rate */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+ const MC_MODE mc_mode, /* i : MC mode */
+ const Word16 nchan_transport /* i : number of transport channels */
);
void initFdCngDec_ivas_fx(
- DEC_CORE_HANDLE st, /* i/o: decoder state structure */
- Word16 scale );
+ DEC_CORE_HANDLE st, /* i/o: decoder state structure */
+ Word16 scale
+);
-void ivas_initFdCngCom_fx( HANDLE_FD_CNG_COM hFdCngCom, Word16 scale );
+void ivas_initFdCngCom_fx(
+ HANDLE_FD_CNG_COM hFdCngCom, Word16 scale
+);
Word16 set_ACELP_flag_IVAS(
- const Word16 element_mode, /* i : element mode */
- const Word32 element_brate, /* i : element bitrate */
- const Word32 total_brate, /* i : total bitrate per channel */
- const Word16 idchan, /* i : Channel id */
- const Word16 tdm_LRTD_flag, /* i : LRTD stereo mode flag */
- const Word16 bwidth, /* i : audio bandwidth */
- const Word16 cng_type /* i : CNG type */
+ const Word16 element_mode, /* i : element mode */
+ const Word32 element_brate, /* i : element bitrate */
+ const Word32 total_brate, /* i : total bitrate per channel */
+ const Word16 idchan, /* i : Channel id */
+ const Word16 tdm_LRTD_flag, /* i : LRTD stereo mode flag */
+ const Word16 bwidth, /* i : audio bandwidth */
+ const Word16 cng_type /* i : CNG type */
);
void ivas_calc_c_p_coeffs_enc_fx(
@@ -2062,7 +2089,8 @@ void ivas_calc_c_p_coeffs_enc_fx(
const Word16 band_idx,
const Word16 dtx_vad,
const Word16 compute_p_flag,
- const Word16 dyn_active_w_flag );
+ const Word16 dyn_active_w_flag
+);
void ivas_calc_c_p_coeffs_fx(
ivas_spar_md_t *pSparMd,
@@ -2076,103 +2104,105 @@ void ivas_calc_c_p_coeffs_fx(
const Word16 band_idx,
const Word16 dtx_vad,
const Word16 compute_p_flag,
- const Word16 dyn_active_w_flag );
+ const Word16 dyn_active_w_flag
+);
Word16 is_SIDrate(
- const Word32 ivas_total_brate /* i : IVAS total bitrate */
+ const Word32 ivas_total_brate /* i : IVAS total bitrate */
);
Word16 is_DTXrate(
- const Word32 ivas_total_brate /* i : IVAS total bitrate */
+ const Word32 ivas_total_brate /* i : IVAS total bitrate */
);
Word16 ivas_qmetadata_dereorder_generic_fx(
- const UWord16 uns_value /* i : unsigned value result of ReorderGeneric */
+ const UWord16 uns_value /* i : unsigned value result of ReorderGeneric */
);
void update_bits_next_block_fx(
- IVAS_QDIRECTION *q_direction, /* i/o: qdirection */
- Word16 *p_diff, /* i/o: bits to be transferred */
- const Word16 j, /* i : subband to update bit alloc to*/
- const Word16 max_i, /* i : number of subbands */
- const Word16 max_k /* i : n umber of subframes */
+ IVAS_QDIRECTION *q_direction, /* i/o: qdirection */
+ Word16 *p_diff, /* i/o: bits to be transferred */
+ const Word16 j, /* i : subband to update bit alloc to */
+ const Word16 max_i, /* i : number of subbands */
+ const Word16 max_k /* i : number of subframes */
);
UWord32 ivas_syn_output_fx(
- Word32 *synth[], /* i/o: Word32 synthesis signal */
+ Word32 *synth[], /* i/o: Word32 synthesis signal */
const Word16 q_synth,
- const Word16 output_frame, /* i : output frame length (one channel) */
- const Word16 n_channels, /* i : number of output channels */
- Word16 *synth_out /* o : integer 16 bits synthesis signal */
+ const Word16 output_frame, /* i : output frame length (one channel) */
+ const Word16 n_channels, /* i : number of output channels */
+ Word16 *synth_out /* o : integer 16 bits synthesis signal */
);
void stereo_tcx_core_dec_fx(
- Decoder_State *st, /* i/o: decoder state structure */
- const FRAME_MODE frameMode, /* i : Decoder frame mode */
- Word16 *signal_out, /* o : synthesis @internal_Fs, Q0 */
- Word16 *signal_outFB, /* o : synthesis @output_Fs, Q0 */
- Word16 pitch_buf[], /* o : floating pitch for each subframe, Q6 */
- const Word16 sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
- STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle */
- const Word16 last_element_mode, /* i : last element mode */
- const Word16 flag_sec_CNA, /* i : CNA flag for secondary channel */
- STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */
- const Word16 nchan_out, /* i : number of output channels */
- const IVAS_FORMAT ivas_format /* i : IVAS format */
+ Decoder_State *st, /* i/o: decoder state structure */
+ const FRAME_MODE frameMode, /* i : Decoder frame mode */
+ Word16 *signal_out, /* o : synthesis @internal_Fs, Q0 */
+ Word16 *signal_outFB, /* o : synthesis @output_Fs, Q0 */
+ Word16 pitch_buf[], /* o : floating pitch for each subframe, Q6 */
+ const Word16 sba_dirac_stereo_flag, /* i : signal stereo output for SBA DirAC */
+ STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle */
+ const Word16 last_element_mode, /* i : last element mode */
+ const Word16 flag_sec_CNA, /* i : CNA flag for secondary channel */
+ STEREO_CNG_DEC_HANDLE hStereoCng, /* i : Stereo CNG handle */
+ const Word16 nchan_out, /* i : number of output channels */
+ const IVAS_FORMAT ivas_format /* i : IVAS format */
);
void masa_compensate_two_dir_energy_ratio_index_fx(
- const Word16 ratio_index_1, /* i : Input ratio for direction 1 */
- const Word16 ratio_index_2, /* i : Input ratio for direction 2 */
- Word16 *ratio_index_mod1, /* o : Output modified ratio for direction 1 */
- Word16 *ratio_index_mod2, /* o : Output modified ratio for direction 2 */
- const Word16 hodirac_flag /* i : flag to indicate HO-DirAC mode */
+ const Word16 ratio_index_1, /* i : Input ratio for direction 1 */
+ const Word16 ratio_index_2, /* i : Input ratio for direction 2 */
+ Word16 *ratio_index_mod1, /* o : Output modified ratio for direction 1 */
+ Word16 *ratio_index_mod2, /* o : Output modified ratio for direction 2 */
+ const Word16 hodirac_flag /* i : flag to indicate HO-DirAC mode */
);
Word16 stereo_tdm_ener_analysis_fx(
- const Word16 ivas_format, /* i : IVAS format */
- CPE_ENC_HANDLE hCPE, /* i : CPE structure */
- const Word16 input_frame, /* i : Number of samples */
- Word16 *tdm_SM_or_LRTD_Pri, /* o : channel combination scheme flag in TD stereo OR LRTD primary channel */
- Word16 *tdm_ratio_idx_SM /* o : TDM ratio index for SM mode */
+ const Word16 ivas_format, /* i : IVAS format */
+ CPE_ENC_HANDLE hCPE, /* i : CPE structure */
+ const Word16 input_frame, /* i : Number of samples */
+ Word16 *tdm_SM_or_LRTD_Pri, /* o : channel combination scheme flag in TD stereo OR LRTD primary channel */
+ Word16 *tdm_ratio_idx_SM /* o : TDM ratio index for SM mode */
);
/*! r: projected azimuth index */
Word16 ivas_dirac_project_azimuth_index_fx(
- const Word16 az_idx, /* i : azimuth index */
- const Word16 az_alph, /* i : number of azimuth symbols */
- const Word16 az_alph_proj /* i : size of projected alphabet */
+ const Word16 az_idx, /* i : azimuth index */
+ const Word16 az_alph, /* i : number of azimuth symbols */
+ const Word16 az_alph_proj /* i : size of projected alphabet */
);
/*! r: projected elevation index */
Word16 ivas_dirac_project_elevation_index_fx(
- const Word16 el_idx, /* i : elevation index */
- const Word16 el_alph, /* i : number of elevation symbols */
- const Word16 el_alph_proj /* i : size of projected alphabet */
+ const Word16 el_idx, /* i : elevation index */
+ const Word16 el_alph, /* i : number of elevation symbols */
+ const Word16 el_alph_proj /* i : size of projected alphabet */
);
/*! r: projected index in channel mode */
Word16 ivas_chan_project_elevation_index_fx(
- const Word16 el_idx, /* i : elevation index */
- const Word16 el_alph, /* i : number of elevation symbols */
- const Word16 el_alph_proj /* i : size of projected alphabet */
+ const Word16 el_idx, /* i : elevation index */
+ const Word16 el_alph, /* i : number of elevation symbols */
+ const Word16 el_alph_proj /* i : size of projected alphabet */
);
void small_reduction_direction_fx(
- IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */
+ IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */
UWord16 bits_dir[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES],
const Word16 raw_flag[MASA_MAXIMUM_CODING_SUBBANDS],
- Word16 *diff );
+ Word16 *diff
+);
void sort_desc_ind_32_fx(
- Word32 *s, /* i/o: vector to be sorted Qx*/
- const Word16 len, /* i : vector length */
- Word16 *ind /* o : array of indices */
+ Word32 *s, /* i/o: vector to be sorted Qx*/
+ const Word16 len, /* i : vector length */
+ Word16 *ind /* o : array of indices */
);
ivas_error only_reduce_bits_direction_fx(
Word16 *reduce_bits_out,
- IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */
+ IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */
Word16 reduce_bits,
const Word16 coding_subbands,
const Word16 no_subframes,
@@ -2180,89 +2210,90 @@ ivas_error only_reduce_bits_direction_fx(
);
void ivas_qmetadata_azimuth_elevation_to_direction_vector_fx(
- const Word32 az, /* i : azimuth Q22 */
- const Word32 el, /* i : elevation Q22 */
- Word32 *dv /* o : direction vector Q30 */
+ const Word32 az, /* i : azimuth Q22 */
+ const Word32 el, /* i : elevation Q22 */
+ Word32 *dv /* o : direction vector Q30 */
);
void ivas_qmetadata_direction_vector_to_azimuth_elevation_fx(
- const Word32 *dv, /* i : direction vector */
+ const Word32 *dv, /* i : direction vector */
const Word16 div_q,
- Word32 *az, /* o : azimuth */
- Word32 *el /* o : elevation */
+ Word32 *az, /* o : azimuth */
+ Word32 *el /* o : elevation */
);
ivas_error ivas_qmetadata_open_fx(
- IVAS_QMETADATA_HANDLE *hQMetaData /* i/o: q_metadata handle */
+ IVAS_QMETADATA_HANDLE *hQMetaData /* i/o: q_metadata handle */
);
ivas_error ivas_qmetadata_allocate_memory_fx(
- IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
- const Word16 nbands, /* i : new number of frequency bands */
- const Word16 ndirs, /* i : new number of directions */
- const Word16 coherence_flag /* i : new coherence coding status */
+ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
+ const Word16 nbands, /* i : new number of frequency bands */
+ const Word16 ndirs, /* i : new number of directions */
+ const Word16 coherence_flag /* i : new coherence coding status */
);
void ivas_qmetadata_close_fx(
- IVAS_QMETADATA_HANDLE *hQMetaData /* i/o: q_metadata handle */
+ IVAS_QMETADATA_HANDLE *hQMetaData /* i/o: q_metadata handle */
);
ivas_error ivas_spar_dec_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */
- Word16 *nb_bits_read /* o : number of MD bits read */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */
+ Word16 *nb_bits_read /* o : number of MD bits read */
);
void ivas_spar_md_dec_process_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- Decoder_State *st0, /* i/o: decoder state structure - for bitstream handling */
- const Word16 num_bands_out, /* i : number of output bands */
- const Word16 sba_order /* i : Ambisonic (SBA) order */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ Decoder_State *st0, /* i/o: decoder state structure - for bitstream handling */
+ const Word16 num_bands_out, /* i : number of output bands */
+ const Word16 sba_order /* i : Ambisonic (SBA) order */
);
ivas_error TDREND_Update_object_positions_fx(
- BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD Renderer handle */
- const Word16 num_src, /* i : number of sources to render */
- const IVAS_FORMAT in_format, /* i : Format of input sources */
- const ISM_METADATA_HANDLE *hIsmMetaData /* i : Input metadata for ISM objects */
+ BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD Renderer handle */
+ const Word16 num_src, /* i : number of sources to render */
+ const IVAS_FORMAT in_format, /* i : Format of input sources */
+ const ISM_METADATA_HANDLE *hIsmMetaData /* i : Input metadata for ISM objects */
);
ivas_error TDREND_MIX_LIST_SetOrient_fx(
- BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
- const Word32 *FrontVec_p_fx, /* i : Listener's orientation front vector */
- const Word32 *UpVec_p_fx, /* i : Listener's orientation up vector */
- const Word16 orient_q );
+ BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
+ const Word32 *FrontVec_p_fx, /* i : Listener's orientation front vector */
+ const Word32 *UpVec_p_fx, /* i : Listener's orientation up vector */
+ const Word16 orient_q
+);
void TDREND_MIX_LIST_SetPos_fx(
- BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
- const Word32 *Pos_p /* i : Listener's position */
+ BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
+ const Word32 *Pos_p /* i : Listener's position */
);
ivas_error TDREND_Update_listener_orientation_fx(
- BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD Renderer handle */
- const Word16 headRotEnabled, /* i : Headrotation flag */
- const IVAS_QUATERNION *headPosition_fx, /* i : Listener orientation */
- const IVAS_VECTOR3 *Pos_fx /* i : Listener Position */
+ BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD Renderer handle */
+ const Word16 headRotEnabled, /* i : Headrotation flag */
+ const IVAS_QUATERNION *headPosition_fx, /* i : Listener orientation */
+ const IVAS_VECTOR3 *Pos_fx /* i : Listener Position */
);
void QuatToRotMat_fx(
- const IVAS_QUATERNION quat, /* i : quaternion describing the rotation Qx */
- Word32 Rmat[3][3] /* o : real-space rotation matrix for this rotation 2*Qx-32 */
+ const IVAS_QUATERNION quat, /* i : quaternion describing the rotation Qx */
+ Word32 Rmat[3][3] /* o : real-space rotation matrix for this rotation 2*Qx-32 */
);
Word32 TDREND_SPATIAL_VecNorm_fx(
- const Word32 *Vec_p, /* i : Vector for norm calculation */
- const Word16 in_exp, /* i : Input exp */
- Word16 *out_exp /* o : Output exp */
+ const Word32 *Vec_p, /* i : Vector for norm calculation */
+ const Word16 in_exp, /* i : Input exp */
+ Word16 *out_exp /* o : Output exp */
);
void TDREND_SPATIAL_VecMapToNewCoordSystem_fx(
- const Word32 *Vec_p, /* i : Input vector */
- const Word32 *TranslVec_p, /* i : Translation vector */
- const Word32 *DirVec_p, /* i : Direction vector */
- const Word32 *UpVec_p, /* i : Up vector */
- const Word32 *RightVec_p, /* i : Right vector */
- Word32 *MappedVec_p, /* o : Transformed vector */
- Word32 *LisRelPosAbs /* o : Transformed vector ignoring orientation */
+ const Word32 *Vec_p, /* i : Input vector */
+ const Word32 *TranslVec_p, /* i : Translation vector */
+ const Word32 *DirVec_p, /* i : Direction vector */
+ const Word32 *UpVec_p, /* i : Up vector */
+ const Word32 *RightVec_p, /* i : Right vector */
+ Word32 *MappedVec_p, /* o : Transformed vector */
+ Word32 *LisRelPosAbs /* o : Transformed vector ignoring orientation */
);
void ivas_mct_side_bits_fx(
@@ -2333,7 +2364,7 @@ void ivas_dirac_dec_render_fx(
const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
UWord16 *nSamplesAvailableNext, /* o : number of CLDFB slots still to render */
- Word32 *output_f[] /* o : rendered time signal */
+ Word32 *output_fx[] /* o : rendered time signal */
);
void ivas_dirac_dec_read_BS_fx(
@@ -2346,7 +2377,7 @@ void ivas_dirac_dec_read_BS_fx(
const Word16 last_bit_pos, /* i : last read bitstream position */
const Word16 hodirac_flag, /* i : flag to indicate HO-DirAC mode */
const Word16 nchan_transport, /* i : number of transport channels */
- Word16 *dirac_to_spar_md_bands /* o : DirAC->SPAR MD bands */
+ Word16 *dirac_to_spar_md_bands /* o : DirAC->SPAR MD bands */
);
ivas_error ivas_dirac_dec_config_fx(
@@ -2378,11 +2409,6 @@ void ivas_destroy_dec_fx(
ivas_error ivas_ism_dec_config_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const ISM_MODE last_ism_mode /* i/o: last ISM mode */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesRendered, /* o : number of samples flushed when the renderer granularity changes */
- Word16 *data /* o : output synthesis signal */
-#endif
);
ivas_error ivas_ism_metadata_dec_create_fx(
@@ -2397,11 +2423,6 @@ void ivas_ism_reset_metadata_handle_dec_fx(
ivas_error ivas_sba_dec_reconfigure_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesFlushed, /* o : number of samples flushed */
- Word16 *data /* o : output synthesis signal */
-#endif
);
ivas_error ivas_spar_md_dec_matrix_open_fx(
@@ -2438,11 +2459,6 @@ void ivas_omasa_data_close_fx(
ivas_error ivas_mc_dec_config_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const Word16 idx /* i : LS config. index */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesRendered, /* o : samples flushed from last frame (JBM) */
- Word16 *data /* o : output synthesis signal */
-#endif
);
void ivas_lfe_window_init_fx(
@@ -2498,177 +2514,184 @@ void ivas_fb_mixer_cross_fading_fx(
const Word16 cf_offset
);
-// ivas_omasa_dec.c
ivas_error ivas_omasa_dirac_td_binaural_jbm_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nSamplesAsked, /* i : number of samples requested */
- UWord16 *nSamplesRendered, /* o : number of samples rendered */
- UWord16 *nSamplesAvailable, /* o : number of samples still to render */
- const Word16 nchan_transport, /* i : number of transport channels */
- Word32 *output_fx[] /* o : rendered time signal */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nSamplesAsked, /* i : number of samples requested */
+ UWord16 *nSamplesRendered, /* o : number of samples rendered */
+ UWord16 *nSamplesAvailable, /* o : number of samples still to render */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ Word32 *output_fx[] /* o : rendered time signal */
);
Word16 ivas_sba_get_analysis_order_fx(
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 sba_order /* i : Ambisonic (SBA) order */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 sba_order /* i : Ambisonic (SBA) order */
);
Word16 ivas_sba_get_nchan_metadata_fx(
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word32 ivas_total_brate /* i : IVAS total bitrate */
+ const Word16 sba_order, /* i : Ambisonic (SBA) order */
+ const Word32 ivas_total_brate /* i : IVAS total bitrate */
);
/*! r: number of bits in SBQ SID frame */
Word16 ivas_sba_spar_sid_bitlen_fx(
- const Word16 nchan_transport /* i : number of transport channels */
+ const Word16 nchan_transport /* i : number of transport channels */
);
void ivas_sba_get_spar_hoa_ch_ind_fx(
- const Word16 num_md_chs, /* i : number of MD channels */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 num_md_chs, /* i : number of MD channels */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
Word16 HOA_md_ind[IVAS_SPAR_MAX_CH]
);
void ivas_sba_get_spar_hoa_md_flag_fx(
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 sba_order, /* i : Ambisonic (SBA) order */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
Word16 *spar_hoa_md_flag,
Word16 *spar_hoa_dirac2spar_md_flag
);
void ivas_omasa_dirac_rend_jbm_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nSamplesAsked, /* i : number of samples requested */
- UWord16 *nSamplesRendered, /* o : number of samples rendered */
- UWord16 *nSamplesAvailable, /* o : number of samples still to render */
- const Word16 nchan_transport, /* i : number of transport channels */
- Word32 *output_f[] /* o : rendered time signal */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nSamplesAsked, /* i : number of samples requested */
+ UWord16 *nSamplesRendered, /* o : number of samples rendered */
+ UWord16 *nSamplesAvailable, /* o : number of samples still to render */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ Word32 *output_fx[] /* o : rendered time signal */
);
ivas_error ivas_jbm_dec_render_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const UWord16 nSamplesAsked, /* i : number of samples wanted */
- UWord16 *nSamplesRendered, /* o : number of samples rendered */
- UWord16 *nSamplesAvailableNext, /* o : number of samples still available in the rendering pipeline */
- Word16 *data /* o : output synthesis signal */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const UWord16 nSamplesAsked, /* i : number of samples wanted */
+ UWord16 *nSamplesRendered, /* o : number of samples rendered */
+ UWord16 *nSamplesAvailableNext, /* o : number of samples still available in the rendering pipeline */
+ Word16 *data /* o : output synthesis signal */
);
void ivas_sba_zero_vert_comp_fx(
- Word32 *sba_data[], /* i : SBA signals */
- const Word16 sba_order, /* i : SBA order */
- const Word16 sba_planar, /* i : SBA planar flag */
- const Word16 input_frame /* i : frame length */
+ Word32 *sba_data[], /* i : SBA signals */
+ const Word16 sba_order, /* i : SBA order */
+ const Word16 sba_planar, /* i : SBA planar flag */
+ const Word16 input_frame /* i : frame length */
);
/*! r: MC format mode (MCT, McMASA, ParamMC) */
MC_MODE ivas_mc_mode_select_fx(
- const MC_LS_SETUP mc_ls_setup, /* i : MC loudspeaker setup */
- const Word32 total_brate /* i : IVAS total bitrate */
+ const MC_LS_SETUP mc_ls_setup, /* i : MC loudspeaker setup */
+ const Word32 total_brate /* i : IVAS total bitrate */
);
/*! r: number of loudspeaker channels */
Word16 ivas_mc_ls_setup_get_num_channels_fx(
- const MC_LS_SETUP mc_ls_setup /* i : loudspeaker setup (CICP) */
+ const MC_LS_SETUP mc_ls_setup /* i : loudspeaker setup (CICP) */
);
/*! r: multi channel loudspeaker setup */
MC_LS_SETUP ivas_mc_map_output_config_to_mc_ls_setup_fx(
- const AUDIO_CONFIG output_config /* i : output audio configuration */
+ const AUDIO_CONFIG output_config /* i : output audio configuration */
);
/*! r: output configuration */
AUDIO_CONFIG ivas_mc_map_ls_setup_to_output_config_fx(
- const MC_LS_SETUP mc_ls_setup /* i : multi channel loudspeaker setup*/
+ const MC_LS_SETUP mc_ls_setup /* i : multi channel loudspeaker setup */
);
void ivas_wrap_arround_fx(
Word16 *pArr,
const Word16 min_val,
const Word16 max_val,
- const Word16 length );
+ const Word16 length
+);
void ivas_get_cum_freq_model_fx(
const Word16 *pFreq_model,
const Word16 length,
- Word16 *pCum_freq_model );
+ Word16 *pCum_freq_model
+);
Word16 ivas_map_num_pred_r_to_idx_fx(
const Word16 num_quant_points_pred_r,
- const Word16 active_w_flag );
+ const Word16 active_w_flag
+);
Word16 ivas_map_num_drct_r_to_idx_fx(
- const Word16 num_quant_points_drct_r );
+ const Word16 num_quant_points_drct_r
+);
Word16 ivas_map_num_decd_r_to_idx_fx(
- const Word16 num_quant_points_decd_r );
+ const Word16 num_quant_points_decd_r
+);
void ivas_spar_arith_coeffs_com_init_fx(
ivas_arith_coeffs_t *pArith_coeffs,
ivas_spar_md_com_cfg *pSpar_cfg,
const Word16 table_idx,
- const Word16 enc_dec );
+ const Word16 enc_dec
+);
void ivas_spar_huff_coeffs_com_init_fx(
ivas_huff_coeffs_t *pHuff_coeffs,
ivas_spar_md_com_cfg *pSpar_cfg,
const Word16 table_idx,
- const Word16 enc_dec );
+ const Word16 enc_dec
+);
ISM_MODE ivas_omasa_ism_mode_select_fx(
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 nchan_ism /* i : number of input ISM's */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 nchan_ism /* i : number of input ISM's */
);
void ivas_set_omasa_TC_fx(
- const ISM_MODE ism_mode, /* i : ISM mode */
- const Word16 nchan_ism, /* i : number of input ISMs */
- Word16 *nSCE, /* o : number of SCEs */
- Word16 *nCPE /* o : number of CPEs */
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ const Word16 nchan_ism, /* i : number of input ISMs */
+ Word16 *nSCE, /* o : number of SCEs */
+ Word16 *nCPE /* o : number of CPEs */
);
Word32 ivas_interformat_brate_fx(
- const ISM_MODE ism_mode, /* i : ISM mode */
- const Word16 nchan_ism, /* i : number of ISM channels */
- const Word32 element_brate, /* i : element bitrate */
- const Word16 ism_imp, /* i : ISM importance flag */
- const Word16 limit_flag /* i : flag to limit the bitrate increase */
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ const Word16 nchan_ism, /* i : number of ISM channels */
+ const Word32 element_brate, /* i : element bitrate */
+ const Word16 ism_imp, /* i : ISM importance flag */
+ const Word16 limit_flag /* i : flag to limit the bitrate increase */
);
Word16 check_bounds_s_fx(
- const Word16 value, /* i : Input value */
- const Word16 low, /* i : Low limit */
- const Word16 high /* i : High limit */
+ const Word16 value, /* i : Input value */
+ const Word16 low, /* i : Low limit */
+ const Word16 high /* i : High limit */
);
void ivas_combined_format_brate_sanity_fx(
- const Word32 element_brate, /* i : element bitrate */
- const Word16 core, /* i : core */
- const Word32 total_brate, /* i : total bitrate */
- Word32 *core_brate, /* i/o: core bitrate */
- Word16 *inactive_coder_type_flag, /* o : inactive coder_type flag */
- Word16 *diff_nBits /* o : number of differential bits */
+ const Word32 element_brate, /* i : element bitrate */
+ const Word16 core, /* i : core */
+ const Word32 total_brate, /* i : total bitrate */
+ Word32 *core_brate, /* i/o: core bitrate */
+ Word16 *inactive_coder_type_flag, /* o : inactive coder_type flag */
+ Word16 *diff_nBits /* o : number of differential bits */
);
Word16 bits_index_ism_ratio_fx(
- const Word16 nchan_ism /* i : number of objects */
+ const Word16 nchan_ism /* i : number of objects */
);
Word16 calculate_brate_limit_flag_fx(
- const Word16 ism_imp[], /* i : ISM importance flags */
- const Word16 nchan_ism /* i : number of objects */
+ const Word16 ism_imp[], /* i : ISM importance flags */
+ const Word16 nchan_ism /* i : number of objects */
);
+
Word16 ism_quant_meta_fx(
- const Word32 val, /* i : scalar value to quantize Q22 */
- Word32 *valQ, /* o : quantized value Q22 */
- const Word32 borders_fx[], /* i : level borders Q22 */
- const Word32 q_step_fx, /* i : quantization step Q22 */
- const Word32 q_step_border_fx, /* i : quantization step at the border Q22 */
- const Word16 cbsize /* i : codebook size */
+ const Word32 val, /* i : scalar value to quantize Q22 */
+ Word32 *valQ, /* o : quantized value Q22 */
+ const Word32 borders_fx[], /* i : level borders Q22 */
+ const Word32 q_step_fx, /* i : quantization step Q22 */
+ const Word32 q_step_border_fx, /* i : quantization step at the border Q22 */
+ const Word16 cbsize /* i : codebook size */
);
/*! r: number of channels to be analysed */
Word16 getNumChanAnalysis_fx(
- Encoder_Struct *st_ivas /* i : IVAS encoder structure */
+ Encoder_Struct *st_ivas /* i : IVAS encoder structure */
);
@@ -2676,65 +2699,39 @@ Word16 getNumChanAnalysis_fx(
* Limiter prototypes
*----------------------------------------------------------------------------------*/
-void ivas_limiter_close(
- IVAS_LIMITER_HANDLE *phLimiter /* i/o: pointer to limiter handle, can be NULL */
-);
-
void ivas_limiter_dec_fx(
- IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */
- Word32 *output[MAX_OUTPUT_CHANNELS], /* i/o: input/output buffer */
- const Word16 num_channels, /* i : number of channels to be processed */
- const Word16 output_frame, /* i : number of samples per channel in the buffer */
- const Word16 BER_detect, /* i : BER detect flag */
- Word16 q_factor /* i : Q factor of the output samples */
+ IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */
+ Word32 *output[MAX_OUTPUT_CHANNELS], /* i/o: input/output buffer */
+ const Word16 num_channels, /* i : number of channels to be processed */
+ const Word16 output_frame, /* i : number of samples per channel in the buffer */
+ const Word16 BER_detect, /* i : BER detect flag */
+ Word16 q_factor /* i : Q factor of the output samples */
);
void limiter_process_fx(
- IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */
- const Word16 output_frame, /* i : number of samples to be processed per channel in the I/O buffer */
- const Word32 threshold, /* i : signal amplitude above which limiting starts to be applied */
- const Word16 BER_detect, /* i : BER detect flag */
- Word16 *strong_saturation_cnt, /* i/o: counter of strong saturations (can be NULL) */
- Word16 q_factor /* i : Q factor of output samples */
+ IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */
+ const Word16 output_frame, /* i : number of samples to be processed per channel in the I/O buffer */
+ const Word32 threshold, /* i : signal amplitude above which limiting starts to be applied */
+ const Word16 BER_detect, /* i : BER detect flag */
+ Word16 *strong_saturation_cnt, /* i/o: counter of strong saturations (can be NULL) */
+ Word16 q_factor /* i : Q factor of output samples */
);
ivas_error ivas_limiter_open_fx(
- IVAS_LIMITER_HANDLE *hLimiter_out, /* o : limiter struct handle */
- const Word16 max_num_channels, /* i : maximum number of I/O channels to be processed */
- const Word32 sampling_rate /* i : sampling rate for processing */
+ IVAS_LIMITER_HANDLE *hLimiter_out, /* o : limiter struct handle */
+ const Word16 max_num_channels, /* i : maximum number of I/O channels to be processed */
+ const Word32 sampling_rate /* i : sampling rate for processing */
);
void ivas_limiter_close_fx(
- IVAS_LIMITER_HANDLE *phLimiter /* i/o: pointer to limiter handle, can be NULL */
+ IVAS_LIMITER_HANDLE *phLimiter /* i/o: pointer to limiter handle, can be NULL */
);
void copy_masa_descriptive_meta_fx(
- MASA_DECRIPTIVE_META *outMeta, /* o : metadata to be written */
- MASA_DECRIPTIVE_META *inMeta /* i : input metadata */
-);
-
-void efap_free_data_fx(
- EFAP_HANDLE *hEFAPdata /* i/o: EFAP handle to be freed */
-);
-
-void tdm_SCh_LSF_intra_pred_fx(
- const Word32 element_brate, /* i : element bitrate */
- const Word16 *tdm_lsfQ_PCh_fx, /* i : primary channel LSFs */
- Word16 *pred_lsf_SCh_fx /* o : predicted secondary channel LSFs */
-);
-
-ivas_error ivas_create_lfe_lpf_enc_fx(
- ivas_filters_process_state_t **hLfeLpf, /* o : LFE LPF handle */
- const Word32 input_Fs /* i : input sampling rate */
+ MASA_DECRIPTIVE_META *outMeta, /* o : metadata to be written */
+ MASA_DECRIPTIVE_META *inMeta /* i : input metadata */
);
-void ivas_lfe_lpf_enc_apply_fx(
- ivas_filters_process_state_t *hLfeLpf, /* i/o: LFE LPF handle */
- Word32 data_lfe_ch[], /* i/o: LFE signal */
- const Word16 input_frame /* i : input frame length per channel */
-);
-
-// ivas_arith.c
void ivas_ari_done_encoding_14bits_fx(
BSTR_ENC_HANDLE hBstr,
Tastat *s
@@ -2748,152 +2745,150 @@ void ivas_ari_encode_14bits_ext_fx(
);
void ms_inv_mask_processing_fx(
- STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct, /* i/o: MDCT encoder structure */
- Encoder_State **sts, /* i/o: Encoder state structure */
- Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */
- const Word16 iSubframe, /* i : subframe number */
- const Word32 x_0_fx[], /* i : spectrum 1 */
- const Word32 x_1_fx[], /* i : spectrum 2 */
- Word32 x_inv_0_fx[], /* o : inverse spectrum 1 */
- Word32 x_inv_1_fx[], /* o : inverse spectrum 2 */
- Word16 maxSfb /* i : number of stereo frequency bands */
+ STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct, /* i/o: MDCT encoder structure */
+ Encoder_State **sts, /* i/o: Encoder state structure */
+ Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */
+ const Word16 iSubframe, /* i : subframe number */
+ const Word32 x_0_fx[], /* i : spectrum 1 */
+ const Word32 x_1_fx[], /* i : spectrum 2 */
+ Word32 x_inv_0_fx[], /* o : inverse spectrum 1 */
+ Word32 x_inv_1_fx[], /* o : inverse spectrum 2 */
+ Word16 maxSfb /* i : number of stereo frequency bands */
);
void ms_processing_fx(
- STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct, /* i/o: Stereo MDCT encoder structure */
- Encoder_State **sts, /* i/o: Encoder state structure */
- Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */
- const Word16 iSubframe, /* i : subframe number */
- Word32 x_0_fx[], /* i/o: spectrum 1 */
- Word32 x_1_fx[], /* i/o: spectrum 1 */
- Word16 maxSfb /* i : number of stereo frequency bands*/
+ STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct, /* i/o: Stereo MDCT encoder structure */
+ Encoder_State **sts, /* i/o: Encoder state structure */
+ Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */
+ const Word16 iSubframe, /* i : subframe number */
+ Word32 x_0_fx[], /* i/o: spectrum 1 */
+ Word32 x_1_fx[], /* i/o: spectrum 1 */
+ Word16 maxSfb /* i : number of stereo frequency bands */
);
void convertToMS_fx(
- const Word16 L_frame, /* i : frame length */
- Word32 x0[], /* i/o: mid/left channel coefficients */
- Word32 x1[], /* i/o: side/right channel coefficients */
- const Word32 norm_fac /* i : normalization factor */
+ const Word16 L_frame, /* i : frame length */
+ Word32 x0[], /* i/o: mid/left channel coefficients */
+ Word32 x1[], /* i/o: side/right channel coefficients */
+ const Word32 norm_fac /* i : normalization factor */
);
void FindSplitRatio_fx(
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
- Encoder_State **sts /* i/o: Encoder state structure */
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
+ Encoder_State **sts /* i/o: Encoder state structure */
);
void IGFEncStereoEncoder_fx(
- STEREO_MDCT_BAND_PARAMETERS *sfbParam, /* i/o: sfb parameters for the right channel */
- const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i : IGF handle */
- const Word32 *mdctSpectrumL_fx, /* i : left spectrum */
- const Word32 *mdctSpectrumR_fx, /* i : right spectrum */
+ STEREO_MDCT_BAND_PARAMETERS *sfbParam, /* i/o: sfb parameters for the right channel */
+ const IGF_ENC_INSTANCE_HANDLE hIGFEnc, /* i : IGF handle */
+ const Word32 *mdctSpectrumL_fx, /* i : left spectrum */
+ const Word32 *mdctSpectrumR_fx, /* i : right spectrum */
Word16 q_mdctSpectrum,
- Word16 *msMask, /* i/o: MS mask */
- Word16 *igfStereoMode, /* o : IGF stereo mode */
- const Word16 mdct_stereo_mode, /* i : MDCT stereo mode */
- const Word16 isTCX20, /* i : flag for indicating TCX20 */
- const Word16 isTransition /* i : flag for transtition */
+ Word16 *msMask, /* i/o: MS mask */
+ Word16 *igfStereoMode, /* o : IGF stereo mode */
+ const Word16 mdct_stereo_mode, /* i : MDCT stereo mode */
+ const Word16 isTCX20, /* i : flag for indicating TCX20 */
+ const Word16 isTransition /* i : flag for transtition */
);
void stereo_coder_tcx_fx(
- STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct, /* i/o: Stereo MDCT encoder structure */
- Encoder_State **sts, /* i/o: encoder state structure */
- Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */
- Word32 *mdst_spectrum_fx[CPE_CHANNELS][NB_DIV], /* i/o: MDST spectrum */
- Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV], /* i/o: inverse spectrum */
- Word32 *inv_mdst_spectrum_fx[CPE_CHANNELS][NB_DIV], /* i/o: inverse MDST spectrum */
- const Word16 mct_on, /* i : flag mct block (1) or stereo (0) */
+ STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct, /* i/o: Stereo MDCT encoder structure */
+ Encoder_State **sts, /* i/o: encoder state structure */
+ Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */
+ Word32 *mdst_spectrum_fx[CPE_CHANNELS][NB_DIV], /* i/o: MDST spectrum */
+ Word32 *inv_spectrum_fx[CPE_CHANNELS][NB_DIV], /* i/o: inverse spectrum */
+ Word32 *inv_mdst_spectrum_fx[CPE_CHANNELS][NB_DIV], /* i/o: inverse MDST spectrum */
+ const Word16 mct_on, /* i : flag mct block (1) or stereo (0) */
Word16 exp_spec,
- Word16 exp_mdst_spec );
+ Word16 exp_mdst_spec
+);
-// bw_detect_fx.c
Word16 set_bw_mct_fx(
- CPE_ENC_HANDLE hCPE[MCT_MAX_BLOCKS], /* i/o: CPE encoder structures */
- const Word16 nCPE /* i : number of CPEs */
+ CPE_ENC_HANDLE hCPE[MCT_MAX_BLOCKS], /* i/o: CPE encoder structures */
+ const Word16 nCPE /* i : number of CPEs */
);
-
-// ivas_mct_enc_mct.c
void write_mct_bitstream_fx(
- Encoder_State **sts, /* i/o: encoder state structure */
- MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
- const Word16 nchan /* i : number of channels */
+ Encoder_State **sts, /* i/o: encoder state structure */
+ MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
+ const Word16 nchan /* i : number of channels */
);
void getChannelEnergies_fx(
- Encoder_State **sts, /* i/o: Encoder state structure */
- Word32 nrg[MCT_MAX_CHANNELS], /* o : buffer with energies for each channel */
- Word16 nrg_e[MCT_MAX_CHANNELS], /* o : exponents of energies for each channel */
- const Word16 nchan /* i : number of channels */
+ Encoder_State **sts, /* i/o: Encoder state structure */
+ Word32 nrg[MCT_MAX_CHANNELS], /* o : buffer with energies for each channel */
+ Word16 nrg_e[MCT_MAX_CHANNELS], /* o : exponents of energies for each channel */
+ const Word16 nchan /* i : number of channels */
);
void apply_MCT_enc_fx(
- MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
- Encoder_State **sts, /* i/o: encoder state structure */
- Word32 *mdst_spectrum[MCT_MAX_CHANNELS][NB_DIV], /* i/o: MDST spectrum */
- Word32 *inv_spectrum[MCT_MAX_CHANNELS][NB_DIV], /* i/o: inverse spectrum */
- Word32 *inv_mdst_spectrum[MCT_MAX_CHANNELS][NB_DIV], /* i/o: inverse MDST spectrum */
- const Word16 nchan /* i : number of channels */
+ MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
+ Encoder_State **sts, /* i/o: encoder state structure */
+ Word32 *mdst_spectrum[MCT_MAX_CHANNELS][NB_DIV], /* i/o: MDST spectrum */
+ Word32 *inv_spectrum[MCT_MAX_CHANNELS][NB_DIV], /* i/o: inverse spectrum */
+ Word32 *inv_mdst_spectrum[MCT_MAX_CHANNELS][NB_DIV], /* i/o: inverse MDST spectrum */
+ const Word16 nchan /* i : number of channels */
);
void ivas_spar_config_fx(
- Word32 ivas_total_brate, /* i : codec total bitrate */
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- Word16 *nchan_transport, /* o : number of transport channels */
- Word16 *nSCE, /* o : number of SCEs */
- Word16 *nCPE, /* o : number of CPEs */
- Word32 *core_nominal_brate, /* o : core-coding nominal bitrate */
- const Word16 sid_format /* i : IVAS format indicator from SID frame */
+ Word32 ivas_total_brate, /* i : codec total bitrate */
+ const Word16 sba_order, /* i : Ambisonic (SBA) order */
+ Word16 *nchan_transport, /* o : number of transport channels */
+ Word16 *nSCE, /* o : number of SCEs */
+ Word16 *nCPE, /* o : number of CPEs */
+ Word32 *core_nominal_brate, /* o : core-coding nominal bitrate */
+ const Word16 sid_format /* i : IVAS format indicator from SID frame */
);
Word16 ivas_get_bw_idx_from_sample_rate_fx(
- const Word32 sampling_rate /* i : sampling rate */
+ const Word32 sampling_rate /* i : sampling rate */
);
void ivas_spar_bitrate_dist_fx(
- Word32 core_brates_act[], /* o : bitrates per core-coder */
- const Word16 nAvailBits, /* i : number of available bits */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word16 bwidth /* i : audio bandwidth */
+ Word32 core_brates_act[], /* o : bitrates per core-coder */
+ const Word16 nAvailBits, /* i : number of available bits */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 sba_order, /* i : Ambisonic (SBA) order */
+ const Word16 bwidth /* i : audio bandwidth */
);
ivas_error ivas_corecoder_enc_reconfig_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- const Word16 nSCE_old, /* i : number of SCEs in previous frame */
- const Word16 nCPE_old, /* i : number of CPEs in previous frame */
- const Word16 nchan_transport_old, /* i : number of TCs in previous frame */
- const Word32 brate_SCE, /* i : bitrate to be set for the SCEs */
- const Word32 brate_CPE, /* i : bitrate to be set for the CPEs */
- const MC_MODE last_mc_mode /* i : switching between MC modes: last mode */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ const Word16 nSCE_old, /* i : number of SCEs in previous frame */
+ const Word16 nCPE_old, /* i : number of CPEs in previous frame */
+ const Word16 nchan_transport_old, /* i : number of TCs in previous frame */
+ const Word32 brate_SCE, /* i : bitrate to be set for the SCEs */
+ const Word32 brate_CPE, /* i : bitrate to be set for the CPEs */
+ const MC_MODE last_mc_mode /* i : switching between MC modes: last mode */
);
void ivas_sba_zero_vert_comp_fx(
- Word32 *sba_data[], /* i : SBA signals */
- const Word16 sba_order, /* i : SBA order */
- const Word16 sba_planar, /* i : SBA planar flag */
- const Word16 input_frame /* i : frame length */
+ Word32 *sba_data[], /* i : SBA signals */
+ const Word16 sba_order, /* i : SBA order */
+ const Word16 sba_planar, /* i : SBA planar flag */
+ const Word16 input_frame /* i : frame length */
);
void tdm_configure_dec_fx(
- const Word16 ivas_format, /* i : IVAS format */
- const Word16 ism_mode, /* i : ISM mode in combined format */
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word16 *tdm_ratio_idx, /* o : ratio index */
- const Word16 nb_bits_metadata /* i : number of metadata bits */
+ const Word16 ivas_format, /* i : IVAS format */
+ const Word16 ism_mode, /* i : ISM mode in combined format */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word16 *tdm_ratio_idx, /* o : ratio index */
+ const Word16 nb_bits_metadata /* i : number of metadata bits */
);
void ivas_param_mc_metadata_open_fx(
- const MC_LS_SETUP mc_ls_setup, /* i : MC ls setup */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* o : handle for the Parametric MC parameter coding state */
+ const MC_LS_SETUP mc_ls_setup, /* i : MC ls setup */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* o : handle for the Parametric MC parameter coding state */
);
Word16 mdct_classifier_ivas_fx(
- Encoder_State *st, /* i/o: Encoder state variable */
- const Word16 *fft_buff, /* i : FFT spectrum from fft_rel */
- const Word32 enerBuffer[], /* i : energy buffer */
- Word16 enerBuffer_exp, /* i: enenrgy buffer exponent */
- const Word32 brate /* i : current brate, IVAS: nominal bitrate, EVS: st->total_brate */
+ Encoder_State *st, /* i/o: Encoder state variable */
+ const Word16 *fft_buff, /* i : FFT spectrum from fft_rel */
+ const Word32 enerBuffer[], /* i : energy buffer */
+ Word16 enerBuffer_exp, /* i: enenrgy buffer exponent */
+ const Word32 brate /* i : current brate, IVAS: nominal bitrate, EVS: st->total_brate */
);
@@ -2902,105 +2897,106 @@ Word16 mdct_classifier_ivas_fx(
*----------------------------------------------------------------------------------*/
void rc_uni_enc_init_fx(
- RangeUniEncState *rc_st_enc /* i/o: RC state handle */
+ RangeUniEncState *rc_st_enc /* i/o: RC state handle */
);
void rc_uni_enc_encode_fast_fx(
- RangeUniEncState *rc_st_enc, /* i/o: RC state handle */
- const UWord16 cum_freq, /* i : Cumulative frequency up to symbol */
- const UWord16 sym_freq, /* i : Symbol frequency */
- const UWord16 tot_shift /* i : Total frequency as a power of 2 */
+ RangeUniEncState *rc_st_enc, /* i/o: RC state handle */
+ const UWord16 cum_freq, /* i : Cumulative frequency up to symbol */
+ const UWord16 sym_freq, /* i : Symbol frequency */
+ const UWord16 tot_shift /* i : Total frequency as a power of 2 */
);
void rc_uni_enc_encode_symbol_fastS_fx(
- RangeUniEncState *rc_st_enc, /* i/o: Encoder state */
- const UWord16 symbol, /* i : Symbol to encode */
- const UWord16 cum_freq[], /* i : Cumulative frequency up to symbol */
- const UWord16 sym_freq[], /* i : Symbol frequency */
- const UWord16 tot_shift /* i : Total frequency as a power of 2 */
+ RangeUniEncState *rc_st_enc, /* i/o: Encoder state */
+ const UWord16 symbol, /* i : Symbol to encode */
+ const UWord16 cum_freq[], /* i : Cumulative frequency up to symbol */
+ const UWord16 sym_freq[], /* i : Symbol frequency */
+ const UWord16 tot_shift /* i : Total frequency as a power of 2 */
);
/*! r: Total number of bits produced */
Word16 rc_uni_enc_finish_fx(
- RangeUniEncState *rc_st_enc /* i/o: RC state handle */
+ RangeUniEncState *rc_st_enc /* i/o: RC state handle */
);
/*! r: Total number of bits produced */
Word16 rc_uni_enc_virtual_finish_fx(
- RangeUniEncState *rc_st_enc /* i : RC state handle */
+ RangeUniEncState *rc_st_enc /* i : RC state handle */
);
void rc_uni_enc_encode_bits_fx(
- RangeUniEncState *rc_st_enc, /* i/o: RC state handle */
- const UWord16 value, /* i : Value to encode */
- const Word16 bits /* i : Number of bits */
+ RangeUniEncState *rc_st_enc, /* i/o: RC state handle */
+ const UWord16 value, /* i : Value to encode */
+ const Word16 bits /* i : Number of bits */
);
void stereo_dft_enc_process_fx(
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
- const Word16 vad_flag_dtx[], /* i : VAD dtx flags */
- const Word16 vad_hover_flag[], /* i : VAD hangover flags */
- const Word16 input_frame /* i : input frame length */
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
+ const Word16 vad_flag_dtx[], /* i : VAD dtx flags */
+ const Word16 vad_hover_flag[], /* i : VAD hangover flags */
+ const Word16 input_frame /* i : input frame length */
);
void stereo_dft_cng_side_gain_fx(
- STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo handle */
- STEREO_CNG_ENC_HANDLE hStereoCng, /* i/o: Stereo CNG data structure */
- const Word32 core_brate, /* i : core bitrate */
- const Word32 last_core_brate, /* i : last core bitrate */
- const Word16 bwidth /* i : audio band-width */
+ STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo handle */
+ STEREO_CNG_ENC_HANDLE hStereoCng, /* i/o: Stereo CNG data structure */
+ const Word32 core_brate, /* i : core bitrate */
+ const Word32 last_core_brate, /* i : last core bitrate */
+ const Word16 bwidth /* i : audio band-width */
);
Word16 quantize_sns_fx(
- Word32 sns_in_fx[CPE_CHANNELS][NB_DIV][M], /* sns_e */
- Word32 snsQ_out_fx[CPE_CHANNELS][NB_DIV][M], /* sns_e */
+ Word32 sns_in_fx[CPE_CHANNELS][NB_DIV][M], /* sns_e */
+ Word32 snsQ_out_fx[CPE_CHANNELS][NB_DIV][M], /* sns_e */
Word16 sns_e,
Encoder_State **sts,
- Word16 *indices, /* Q0 */
- Word16 *zero_side_flag, /* Q0 */
- Word16 *sns_stereo_mode ); /* Q0 */
+ Word16 *indices, /* Q0 */
+ Word16 *zero_side_flag, /* Q0 */
+ Word16 *sns_stereo_mode /* Q0 */
+);
void stereo_enc_cng_init_fx(
- STEREO_CNG_ENC_HANDLE hStereoCng /* i/o: stereo CNG encoder structure */
+ STEREO_CNG_ENC_HANDLE hStereoCng /* i/o: stereo CNG encoder structure */
);
void stereo_cng_upd_counters_fx(
- STEREO_CNG_ENC_HANDLE hStereoCng, /* i/o: Stereo CNG data structure */
- const Word32 element_mode, /* i : element mode */
- const Word16 nbands, /* i : Number of bands in active */
- const Word32 sidSideGain[], /* i : SID side gains */
- const Word16 burst_ho_count, /* i : Hang-over count */
- Word16 *coh_fade_counter /* i : Coherence fade counter */
+ STEREO_CNG_ENC_HANDLE hStereoCng, /* i/o: Stereo CNG data structure */
+ const Word32 element_mode, /* i : element mode */
+ const Word16 nbands, /* i : Number of bands in active */
+ const Word32 sidSideGain[], /* i : SID side gains */
+ const Word16 burst_ho_count, /* i : Hang-over count */
+ Word16 *coh_fade_counter /* i : Coherence fade counter */
);
-
void stereo_dft_enc_sid_calc_coh_fx(
- STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo handle */
- Word32 prev_cohBand[2 * ( STEREO_DFT_BAND_MAX / 2 )], /* i/o: Previous coherence Q31 */
- Word16 *td_active, /* i/o: TD stereo mode indicator */
- Word16 *first_SID, /* i/o: First SID indicator */
- Word32 *cohBand /* i/o: Coherence per band Q31 */
+ STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo handle */
+ Word32 prev_cohBand[2 * ( STEREO_DFT_BAND_MAX / 2 )], /* i/o: Previous coherence Q31 */
+ Word16 *td_active, /* i/o: TD stereo mode indicator */
+ Word16 *first_SID, /* i/o: First SID indicator */
+ Word32 *cohBand /* i/o: Coherence per band Q31 */
);
void stereo_dft_enc_sid_coh_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
- Word32 *mem_cohBand, /* i/o: Coherence memory */
- const Word16 nbands, /* i : number of DFT stereo bands */
- Word16 *nb_bits, /* i/o: number of bits written */
- Word32 *cohBand /* i/o: Coherence per band */
+ BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
+ Word32 *mem_cohBand, /* i/o: Coherence memory */
+ const Word16 nbands, /* i : number of DFT stereo bands */
+ Word16 *nb_bits, /* i/o: number of bits written */
+ Word32 *cohBand /* i/o: Coherence per band */
);
void stereo_dft_enc_write_BS_fx(
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
- Word16 *nb_bits /* o : number of bits written */
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
+ Word16 *nb_bits /* o : number of bits written */
);
void stereo_dft_enc_res_fx(
- STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle */
- const Word32 *input_8k, /* i : input buffer sampled at 8kHz Q15 */
- BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
- Word16 *nb_bits, /* o : number of bits written */
- const Word16 max_bits );
+ STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle */
+ const Word32 *input_8k, /* i : input buffer sampled at 8kHz Q15 */
+ BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
+ Word16 *nb_bits, /* o : number of bits written */
+ const Word16 max_bits
+);
Word32 ECSQ_encode_target_SNR_fx(
ECSQ_instance *ecsq_inst,
@@ -3010,309 +3006,312 @@ Word32 ECSQ_encode_target_SNR_fx(
const Word32 target_SNR, // Q25
const Word16 max_bits,
Word32 *output,
- Word16 *global_gain_index_output );
+ Word16 *global_gain_index_output
+);
void ECSQ_quantize_vector_fx(
const Word32 *input,
const Word16 input_e,
const Word32 global_gain, // Q15
const Word16 N,
- Word16 *output );
+ Word16 *output
+);
Word32 ECSQ_compute_optimal_gain_fx( // Q15
const Word32 *input,
const Word16 input_e,
const Word16 N,
- const Word16 *output );
+ const Word16 *output
+);
void spectral_balancer_fx16(
- Word16 *signal, /* i/o : signal Qx */
- Word16 *mem, /* i/o : mem Qx */
- const Word16 lg, /* i : input signal length */
- const Word16 coeff_set /* i : coefficient set */
+ Word16 *signal, /* i/o : signal Qx */
+ Word16 *mem, /* i/o : mem Qx */
+ const Word16 lg, /* i : input signal length */
+ const Word16 coeff_set /* i : coefficient set */
);
void spectral_balancer_fx(
- Word32 *signal, /* i/o : signal Qx */
- Word32 *mem, /* i/o : mem Qx */
- const Word16 lg, /* i : input signal length */
- const Word16 coeff_set /* i : coefficient set */
+ Word32 *signal, /* i/o : signal Qx */
+ Word32 *mem, /* i/o : mem Qx */
+ const Word16 lg, /* i : input signal length */
+ const Word16 coeff_set /* i : coefficient set */
);
void stereo_icBWE_preproc_fx(
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
- const Word16 input_frame, /* i : input frame length */
- Word16 shb_speech_nonref[], /* o : SHB speech non-ref channel */
- Word16 q_shb_speech_nonref /* i : Q SHB speech non-ref channel */
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
+ const Word16 input_frame, /* i : input frame length */
+ Word16 shb_speech_nonref[], /* o : SHB speech non-ref channel */
+ Word16 q_shb_speech_nonref /* i : Q SHB speech non-ref channel */
);
void core_switching_pre_enc_ivas_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 *old_inp_12k8, /* i : old input signal @12.8kHz */
- const Word16 q_old_inp_12k8, /* i : Q old input signal @12.8kHz */
- const Word16 *old_inp_16k, /* i : old input signal @16kHz */
- const Word16 q_old_inp_16k, /* i : Q old input signal @16kHz */
- const Word16 active_cnt, /* i : active frame counter */
- const Word16 last_element_mode /* i : last_element_mode */
+ Encoder_State *st_fx, /* i/o: encoder state structure */
+ const Word16 *old_inp_12k8, /* i : old input signal @12.8kHz */
+ const Word16 q_old_inp_12k8, /* i : Q old input signal @12.8kHz */
+ const Word16 *old_inp_16k, /* i : old input signal @16kHz */
+ const Word16 q_old_inp_16k, /* i : Q old input signal @16kHz */
+ const Word16 active_cnt, /* i : active frame counter */
+ const Word16 last_element_mode /* i : last_element_mode */
);
Word16 ivas_acelp_tcx20_switching_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- Word16 *inp_fx, /* i : new input signal */
- Word16 q_inp, /* i : i/p Q */
- Word16 *wsp, /* i : input weighted signal */
- Word32 non_staX, /* i : unbound non-stationarity for sp/mu clas */
- Word16 *pitch_fr, /* i : fraction pitch values */
- Word16 *voicing_fr, /* i : fractional voicing values */
- Word32 currFlatness, /* i : flatness */
- Word16 lsp_mid[M], /* i : LSPs at the middle of the frame */
- Word16 stab_fac, /* i : LP filter stability */
+ Encoder_State *st, /* i/o: encoder state structure */
+ Word16 *inp_fx, /* i : new input signal */
+ Word16 q_inp, /* i : i/p Q */
+ Word16 *wsp, /* i : input weighted signal */
+ Word32 non_staX, /* i : unbound non-stationarity for sp/mu clas */
+ Word16 *pitch_fr, /* i : fraction pitch values */
+ Word16 *voicing_fr, /* i : fractional voicing values */
+ Word32 currFlatness, /* i : flatness */
+ Word16 lsp_mid[M], /* i : LSPs at the middle of the frame */
+ Word16 stab_fac, /* i : LP filter stability */
Word32 *res_cod_SNR_M,
Word16 *res_cod_SNR_M_e,
- const Word16 flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz */
+ const Word16 flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz */
);
void encod_gen_2sbfr(
- Encoder_State *st, /* i/o: state structure */
- const Word16 speech[], /* i : input speech */
- const Word16 Aw[], /* i : weighted A(z) unquantized for subframes */
- const Word16 Aq[], /* i : LP coefficients */
- const Word16 *res, /* i : residual signal */
- Word16 *syn, /* i/o: core synthesis */
- Word16 *exc, /* i/o: current non-enhanced excitation */
- Word16 *exc2, /* i/o: current enhanced excitation */
- Word16 *pitch_buf, /* i/o: floating pitch values for each subframe */
- Word16 *voice_factors, /* o : voicing factors */
- Word16 *bwe_exc, /* o : excitation for SWB TBE */
- const Word16 tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag */
- const Word16 tdm_Pri_pitch_buf[], /* i : pitch values for primary channel */
+ Encoder_State *st, /* i/o: state structure */
+ const Word16 speech[], /* i : input speech */
+ const Word16 Aw[], /* i : weighted A(z) unquantized for subframes */
+ const Word16 Aq[], /* i : LP coefficients */
+ const Word16 *res, /* i : residual signal */
+ Word16 *syn, /* i/o: core synthesis */
+ Word16 *exc, /* i/o: current non-enhanced excitation */
+ Word16 *exc2, /* i/o: current enhanced excitation */
+ Word16 *pitch_buf, /* i/o: floating pitch values for each subframe */
+ Word16 *voice_factors, /* o : voicing factors */
+ Word16 *bwe_exc, /* o : excitation for SWB TBE */
+ const Word16 tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag */
+ const Word16 tdm_Pri_pitch_buf[], /* i : pitch values for primary channel */
Word16 Q_new,
- Word16 shift );
+ Word16 shift
+);
void acelp_fast_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- const Word16 cdk_index, /* i : codebook index */
- const Word16 dn_orig[L_SUBFR],
- /* i : corr. between target and h[]. */ // Q_dn
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ const Word16 cdk_index, /* i : codebook index */
+ const Word16 dn_orig[L_SUBFR], /* i : corr. between target and h[]. Q_dn */
Word16 Q_dn,
- const Word16 cn[L_SUBFR],
- /* i : residual after long term prediction */ // q_cn
+ const Word16 cn[L_SUBFR], /* i : residual after long term prediction q_cn*/
const Word16 q_cn,
- const Word16 H[L_SUBFR],
- /* i : impulse response of weighted synthesis filter */ // e(norm_s(H[0])+1)
- Word16 code[L_SUBFR], /* o : algebraic (fixed) codebook excitation */
- Word16 y[], /* o : filtered fixed codebook excitation */
- const Word16 L_subfr /* i : subframe length */
+ const Word16 H[L_SUBFR], /* i : impulse response of weighted synthesis filter e(norm_s(H[0])+1) */
+ Word16 code[L_SUBFR], /* o : algebraic (fixed) codebook excitation */
+ Word16 y[], /* o : filtered fixed codebook excitation */
+ const Word16 L_subfr /* i : subframe length */
);
void ivas_mdct_quant_coder_fx(
- CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */
- Word16 tnsBits[CPE_CHANNELS][NB_DIV], /* i : bits needed for TNS parameters */
- Word16 tnsSize[CPE_CHANNELS][NB_DIV], /* i : size of TNS */
- Word16 p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to parameter array */
- const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0) */
+ CPE_ENC_HANDLE hCPE, /* i/o: Encoder CPE handle */
+ Word16 tnsBits[CPE_CHANNELS][NB_DIV], /* i : bits needed for TNS parameters */
+ Word16 tnsSize[CPE_CHANNELS][NB_DIV], /* i : size of TNS */
+ Word16 p_param[CPE_CHANNELS][NB_DIV], /* i : pointer to parameter array */
+ const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0) */
);
void ivas_mdct_tcx10_bit_distribution_fx(
- Word16 target_bitsTCX10[NB_DIV], /* o : target bit distribution */
- const Word16 nbits_tcx, /* i : TCX bits */
- const Word16 nTnsBitsTCX10[NB_DIV] /* i : TNS bits */
+ Word16 target_bitsTCX10[NB_DIV], /* o : target bit distribution */
+ const Word16 nbits_tcx, /* i : TCX bits */
+ const Word16 nTnsBitsTCX10[NB_DIV] /* i : TNS bits */
);
void QuantizeSpectrum_ivas_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- const Word16 A_fx[], /* i : quantized coefficients NxAz_q[M+1] */
- const Word16 Aqind[], /* i : frame-independent quantized coefficients (M+1) */
- Word16 gainlpc_fx[], /* i : MDCT gains of the previous frame */
- Word16 gainlpc_e[], /* i : exponents of MDCT gains of the previous frame */
- Word16 synth[], /* o : synthesis buffer, Q0 */
- const Word16 nb_bits, /* i : bit budget */
- const Word16 tnsSize, /* i : number of tns parameters put into prm */
- Word16 prm[], /* o : tcx parameters */
- const Word16 frame_cnt, /* i : frame counter in the super_frame */
- CONTEXT_HM_CONFIG *hm_cfg, /* i : HM configuration */
- const Word16 vad_hover_flag /* i : VAD hangover flag */
+ Encoder_State *st, /* i/o: encoder state structure */
+ const Word16 A_fx[], /* i : quantized coefficients NxAz_q[M+1] */
+ const Word16 Aqind[], /* i : frame-independent quantized coefficients (M+1) */
+ Word16 gainlpc_fx[], /* i : MDCT gains of the previous frame */
+ Word16 gainlpc_e[], /* i : exponents of MDCT gains of the previous frame */
+ Word16 synth[], /* o : synthesis buffer, Q0 */
+ const Word16 nb_bits, /* i : bit budget */
+ const Word16 tnsSize, /* i : number of tns parameters put into prm */
+ Word16 prm[], /* o : tcx parameters */
+ const Word16 frame_cnt, /* i : frame counter in the super_frame */
+ CONTEXT_HM_CONFIG *hm_cfg, /* i : HM configuration */
+ const Word16 vad_hover_flag /* i : VAD hangover flag */
);
void InternalTCXDecoder_fx(
- Encoder_State *st, /* i/o: state handle */
- const Word16 frame_cnt, /* i : frame counter in the super_frame */
- const Word16 L_frameTCX, /* i : full frame length */
- const Word16 L_frame, /* i : frame length */
- const Word16 L_spec, /* i : length of the coded spectrum */
- const Word16 tcx_offset, /* i : folding point offset relative to the end of the previous frame */
- const Word16 noiseFillingBorder, /* i : noise filling border */
- const Word32 *x_quant_fx, /* i : quantized spectrum */
- const Word32 ener_fx, /* i : energy of the quantized spectrum */
- const Word16 ener_e, /* i : energy of the quantized spectrum exponent */
- Word16 lf_deemph_fact_fx[], /* i/o: low frequency deemphasis factors */
- const Word16 fac_ns_fx, /* i : noise filling level, Q15 */
- const Word16 nf_seed, /* i : noise filling random seed, Q0 */
- const Word16 *A_fx, /* i : LPC representation of the FDNS gains */
- Word16 gainlpc_fx[], /* i/o: FDNS gains */
- Word16 gainlpc_e[], /* i/o: FDNS gains exponent */
- const Word16 hm_active, /* i : flag indicating if the harmonic model is active */
- Word16 gain_tcx_fx, /* i/o: global gain / quantized global gain */
- Word16 *gain_tcx_e, /* i/o: global gain / quantized global gain exponent */
- Word32 spectrum_fx[], /* o : dequantized spectrum */
- Word16 *spectrum_e, /* o : dequantized spectrum */
- Word16 synth[], /* o : time domain signal */
- Word16 *gain_tcx_q /* o : quantized global gain (at low bitrates) */
+ Encoder_State *st, /* i/o: state handle */
+ const Word16 frame_cnt, /* i : frame counter in the super_frame */
+ const Word16 L_frameTCX, /* i : full frame length */
+ const Word16 L_frame, /* i : frame length */
+ const Word16 L_spec, /* i : length of the coded spectrum */
+ const Word16 tcx_offset, /* i : folding point offset relative to the end of the previous frame */
+ const Word16 noiseFillingBorder, /* i : noise filling border */
+ const Word32 *x_quant_fx, /* i : quantized spectrum */
+ const Word32 ener_fx, /* i : energy of the quantized spectrum */
+ const Word16 ener_e, /* i : energy of the quantized spectrum exponent */
+ Word16 lf_deemph_fact_fx[], /* i/o: low frequency deemphasis factors */
+ const Word16 fac_ns_fx, /* i : noise filling level, Q15 */
+ const Word16 nf_seed, /* i : noise filling random seed, Q0 */
+ const Word16 *A_fx, /* i : LPC representation of the FDNS gains */
+ Word16 gainlpc_fx[], /* i/o: FDNS gains */
+ Word16 gainlpc_e[], /* i/o: FDNS gains exponent */
+ const Word16 hm_active, /* i : flag indicating if the harmonic model is active */
+ Word16 gain_tcx_fx, /* i/o: global gain / quantized global gain */
+ Word16 *gain_tcx_e, /* i/o: global gain / quantized global gain exponent */
+ Word32 spectrum_fx[], /* o : dequantized spectrum */
+ Word16 *spectrum_e, /* o : dequantized spectrum */
+ Word16 synth[], /* o : time domain signal */
+ Word16 *gain_tcx_q /* o : quantized global gain (at low bitrates) */
);
void stereo_tcx_core_enc(
- Encoder_State *st, /* i/o: encoder state structure */
- const Word16 new_samples_12k8[], /* i : buffer of input signal @12.8 kHz */
- const Word16 new_samples_16k[], /* i : buffer of input signal @16 kHz */
- const Word16 Aw_fx[], /* i : weighted A(z) unquant. for subframes, Q12 */
- Word16 lsp_new_fx[], /* i : LSPs at the end of the frame, Q15 */
- Word16 lsp_mid_fx[], /* i : LSPs in the middle of the frame, Q15 */
- Word16 pitch_buf_fx[NB_SUBFR16k], /* o : pitch for each subframe, Q6 */
- const Word16 last_element_mode, /* i : last element mode, Q0 */
- const Word16 vad_hover_flag, /* i : VAD hangover flag, Q0 */
+ Encoder_State *st, /* i/o: encoder state structure */
+ const Word16 new_samples_12k8[], /* i : buffer of input signal @12.8 kHz */
+ const Word16 new_samples_16k[], /* i : buffer of input signal @16 kHz */
+ const Word16 Aw_fx[], /* i : weighted A(z) unquant. for subframes,Q12*/
+ Word16 lsp_new_fx[], /* i : LSPs at the end of the frame, Q15 */
+ Word16 lsp_mid_fx[], /* i : LSPs in the middle of the frame, Q15 */
+ Word16 pitch_buf_fx[NB_SUBFR16k], /* o : pitch for each subframe, Q6 */
+ const Word16 last_element_mode, /* i : last element mode, Q0 */
+ const Word16 vad_hover_flag, /* i : VAD hangover flag, Q0 */
Word16 Q_new
);
Word16 transient_analysis_ivas_fx(
- TRAN_DET_HANDLE hTranDet, /* i : handle transient detection */
- const Word16 cor_map_LT[], /* i : LT correlation map Q_cor_map = Qx */
+ TRAN_DET_HANDLE hTranDet, /* i : handle transient detection */
+ const Word16 cor_map_LT[], /* i : LT correlation map Q_cor_map = Qx */
const Word16 Q_cor_map,
- const Word16 multi_harm_limit, /* i : multi harmonic threshold Q_multi_harm_limit = Qx */
- const Word16 Q_multi_harm_limit );
+ const Word16 multi_harm_limit, /* i : multi harmonic threshold Q_multi_harm_limit = Qx */
+ const Word16 Q_multi_harm_limit
+);
void set_transient_stereo_fx(
- CPE_ENC_HANDLE hCPE, /* i : CPE structure */
- Word32 currFlatness[] /* i/o: current flatness Q21*/
+ CPE_ENC_HANDLE hCPE, /* i : CPE structure */
+ Word32 currFlatness[] /* i/o: current flatness Q21*/
);
void ivas_smc_mode_selection_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- const Word32 element_brate, /* i : element bitrate */
- Word16 smc_dec, /* i : raw decision of the 1st stage classifier*/
- const Word16 relE, /* i : relative frame energy, Q8 */
- const Word16 Etot, /* i : total frame energy, Q8 */
- Word16 *attack_flag, /* i/o: attack flag (GSC or TC) */
- const Word16 *inp, /* i : input signal */
- const Word16 Q_new, /* i : Q of input signal */
- const Word16 S_map[], /* i : short-term correlation map, Q7 */
- const Word16 flag_spitch /* i : flag to indicate very short stable pitch*/
+ Encoder_State *st, /* i/o: encoder state structure */
+ const Word32 element_brate, /* i : element bitrate */
+ Word16 smc_dec, /* i : raw decision of the 1st stage classifier*/
+ const Word16 relE, /* i : relative frame energy, Q8 */
+ const Word16 Etot, /* i : total frame energy, Q8 */
+ Word16 *attack_flag, /* i/o: attack flag (GSC or TC) */
+ const Word16 *inp, /* i : input signal */
+ const Word16 Q_new, /* i : Q of input signal */
+ const Word16 S_map[], /* i : short-term correlation map, Q7 */
+ const Word16 flag_spitch /* i : flag to indicate very short stable pitch*/
);
/*! r: element mode */
Word16 select_stereo_mode_fx(
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
- const IVAS_FORMAT ivas_format /* i : IVAS format */
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
+ const IVAS_FORMAT ivas_format /* i : IVAS format */
);
void stereo_classifier_features_ivas_fx(
- STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure */
- const Word16 idchan, /* i : channel ID */
- const Word16 element_mode, /* i : element mode */
- const Word16 vad_flag, /* i : VAD flag */
- Word16 lsf_new_fx[], /* i : LSFs at the end of the frame Q1*1.28 */
- Word32 epsP_fx[], /* i : LP analysis residual energies for each iteration*/
- Word16 pitch[], /* i : open-loop pitch values for quantiz. Q0 */
- Word16 voicing_fx[], /* i : OL maximum normalized correlation Q15 */
- Word32 cor_map_sum_fx, /* i : speech/music clasif. parameter */
- Word32 non_staX_fx, /* i : unbound non-stationarity for sp/mu clas. */
- Word16 sp_div_fx, /* i : spectral diversity feature */
- const Word16 clas, /* i : signal class */
- Word16 epsP_e, /*exponent for epsP_fx */
- Word16 cor_map_sum_e, /*exponent for cor_map_sum_fx */
- Word16 non_staX_e, /*exponent for non_staX_fx */
- Word16 sp_div_e /*exponent for sp_div_fx */
+ STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure */
+ const Word16 idchan, /* i : channel ID */
+ const Word16 element_mode, /* i : element mode */
+ const Word16 vad_flag, /* i : VAD flag */
+ Word16 lsf_new_fx[], /* i : LSFs at the end of the frame Q1*1.28 */
+ Word32 epsP_fx[], /* i : LP analysis residual energies for each iteration*/
+ Word16 pitch[], /* i : open-loop pitch values for quantiz. Q0 */
+ Word16 voicing_fx[], /* i : OL maximum normalized correlation Q15 */
+ Word32 cor_map_sum_fx, /* i : speech/music clasif. parameter */
+ Word32 non_staX_fx, /* i : unbound non-stationarity for sp/mu clas. */
+ Word16 sp_div_fx, /* i : spectral diversity feature */
+ const Word16 clas, /* i : signal class */
+ Word16 epsP_e, /*exponent for epsP_fx */
+ Word16 cor_map_sum_e, /*exponent for cor_map_sum_fx */
+ Word16 non_staX_e, /*exponent for non_staX_fx */
+ Word16 sp_div_e /*exponent for sp_div_fx */
);
void tdm_ol_pitch_comparison_fx(
- CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
- Word16 pitch_fr[CPE_CHANNELS][NB_SUBFR], /* i/o: fractional pitch values, Q6 */
- Word16 voicing_fr[CPE_CHANNELS][NB_SUBFR] /* i/o: fractional pitch gains, Q15 */
+ CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
+ Word16 pitch_fr[CPE_CHANNELS][NB_SUBFR], /* i/o: fractional pitch values, Q6 */
+ Word16 voicing_fr[CPE_CHANNELS][NB_SUBFR] /* i/o: fractional pitch gains, Q15 */
);
void xtalk_classifier_td_fx(
- CPE_ENC_HANDLE hCPE /* i/o: CPE encoder structure */
+ CPE_ENC_HANDLE hCPE /* i/o: CPE encoder structure */
);
void unclr_classifier_td_fx(
- CPE_ENC_HANDLE hCPE /* i/o: CPE encoder structure */
+ CPE_ENC_HANDLE hCPE /* i/o: CPE encoder structure */
);
void quantize_direction_frame2D_fx(
- IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */
+ IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */
Word32 azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES], // Q22
Word32 elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES] // Q22
);
Word16 quantize_direction2D_fx(
- Word32 phi, /* i : input azimuth value Q22 */
- const Word16 no_cw, /* i : number of bits */
- Word32 *phi_q, /* o : quantized azimuth value Q22 */
- UWord16 *index_phi, /* o : quantized azimuth index */
- const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
+ Word32 phi, /* i : input azimuth value Q22 */
+ const Word16 no_cw, /* i : number of bits */
+ Word32 *phi_q, /* o : quantized azimuth value Q22 */
+ UWord16 *index_phi, /* o : quantized azimuth index */
+ const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
);
void restore_metadata_buffer_fx(
BSTR_ENC_HANDLE hMetaData,
const Word16 next_ind_start,
- const Word16 bit_pos_start );
-
+ const Word16 bit_pos_start
+);
void small_requantize_direction_frame_fx(
- IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */
+ IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */
Word32 azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES], // Q22
Word32 elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES], // Q22
const Word16 raw_flag[MASA_MAXIMUM_CODING_SUBBANDS],
Word16 bits_dir_bands[MASA_MAXIMUM_CODING_SUBBANDS],
- Word16 *diff );
+ Word16 *diff
+);
void ivas_param_ism_stereo_dmx_fx(
- Encoder_Struct *st_ivas, /* i : IVAS encoder structure */
- Word32 *data[MAX_NUM_OBJECTS], /* i/o: input signal/stereo dmx Qx */
- const Word16 input_frame /* i : Length of input frame */
+ Encoder_Struct *st_ivas, /* i : IVAS encoder structure */
+ Word32 *data[MAX_NUM_OBJECTS], /* i/o: input signal/stereo dmx Qx */
+ const Word16 input_frame /* i : Length of input frame */
);
void ivas_param_ism_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- Word32 *data[MAX_NUM_OBJECTS], /* i : input signal q_pcm_in */
- const Word16 input_frame /* i : input frame length per channel */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ Word32 *data[MAX_NUM_OBJECTS], /* i : input signal q_pcm_in */
+ const Word16 input_frame /* i : input frame length per channel */
);
ISM_MODE ivas_ism_mode_select(
- const Word16 nchan_inp, /* i : number of input objects */
- const Word32 ivas_total_brate /* i : IVAS total bitrate */
+ const Word16 nchan_inp, /* i : number of input objects */
+ const Word32 ivas_total_brate /* i : IVAS total bitrate */
);
void ivas_fb_mixer_update_prior_input_fx(
- IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
- Word32 *pcm_in_fx[], /* i : input audio channels */
- const Word16 length, /* i : length of time slot */
- const Word16 nchan_fb_in /* i : number of analysis channels */
+ IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
+ Word32 *pcm_in_fx[], /* i : input audio channels */
+ const Word16 length, /* i : length of time slot */
+ const Word16 nchan_fb_in /* i : number of analysis channels */
);
void ivas_fb_mixer_get_windowed_fr_fx(
- IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
+ IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
Word32 *pcm_in_fx[],
Word32 *frame_f_real_fx[],
Word32 *frame_f_imag_fx[],
- const Word16 length, /* i : number of new samples in time slot */
- const Word16 mdft_len, /* i : MDFT frame length */
- const Word16 nchan_fb_in, /* i : number of analysis channels */
+ const Word16 length, /* i : number of new samples in time slot */
+ const Word16 mdft_len, /* i : MDFT frame length */
+ const Word16 nchan_fb_in, /* i : number of analysis channels */
Word16 gb
);
void ivas_omasa_set_config_fx(
- OMASA_ENC_HANDLE hOMasa, /* i/o: OMASA encoder handle */
- MASA_ENCODER_HANDLE hMasa, /* i : MASA encoder handle */
- const Word32 input_Fs, /* i : Input sample rate */
- const ISM_MODE ism_mode /* i : ISM mode */
+ OMASA_ENC_HANDLE hOMasa, /* i/o: OMASA encoder handle */
+ MASA_ENCODER_HANDLE hMasa, /* i : MASA encoder handle */
+ const Word32 input_Fs, /* i : Input sample rate */
+ const ISM_MODE ism_mode /* i : ISM mode */
);
Word16 ivas_omasa_ener_brate_fx(
- const Word16 nchan_ism, /* i : number of ISMs */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- Word32 *data_f[], /* i : Input / transport audio signals */
- const Word16 input_frame, /* i : Input frame size */
- const Word16 data_e /* i : exponent for data_f */
+ const Word16 nchan_ism, /* i : number of ISMs */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ Word32 *data_f[], /* i : Input / transport audio signals */
+ const Word16 input_frame, /* i : Input frame size */
+ const Word16 data_e /* i : exponent for data_f */
);
void computeDiffuseness_mdft_fx(
@@ -3326,7 +3325,7 @@ void computeDiffuseness_mdft_fx(
Word16 *q_diffuseness /*Ouput Q*/
);
-void computeDirectionVectors_fixed(
+void computeDirectionVectors_fx2(
Word32 *intensity_real_x,
Word32 *intensity_real_y,
Word32 *intensity_real_z,
@@ -3336,8 +3335,8 @@ void computeDirectionVectors_fixed(
Word32 *direction_vector_y, /*Q30*/
Word32 *direction_vector_z, /*Q30*/
Word16 i_e, /*Exponent of all the intensity buffers*/
- Word16 *i_e_band );
-
+ Word16 *i_e_band
+);
UWord8 ivas_masa_surrcoh_signicant_fx(
Word32 surroundingCoherence[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS], /* i : Surround coherence Q31 */
@@ -3346,33 +3345,35 @@ UWord8 ivas_masa_surrcoh_signicant_fx(
const Word16 nBands /* i : Number of frequency bands */
);
+
/*----------------------------------------------------------------------------------*
* McMASA prototypes
*----------------------------------------------------------------------------------*/
ivas_error ivas_mcmasa_enc_open_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
);
void ivas_mcmasa_enc_close_fx(
- MCMASA_ENC_HANDLE *hMcMasa, /* i/o: encoder McMASA handle */
- const Word32 input_Fs /* i : input sampling rate */
+ MCMASA_ENC_HANDLE *hMcMasa, /* i/o: encoder McMASA handle */
+ const Word32 input_Fs /* i : input sampling rate */
);
ivas_error ivas_mcmasa_enc_reconfig_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
);
void ivas_mcmasa_enc_fx(
- MCMASA_ENC_HANDLE hMcMasa, /* i/o: Encoder McMASA handle */
- IVAS_QMETADATA_HANDLE hQMeta, /* o : Qmetadata handle */
- MASA_ENCODER_HANDLE hMasa, /* i/o: Encoder MASA handle */
- Word32 *data_f[], /* i : Input frame of audio */
- const Word16 input_frame, /* i : Input frame size */
- const Word16 nchan_transport, /* i : Number of transport channels */
- const Word16 nchan_inp, /* i : Number of input channels */
- const Word16 q_inp /* i : Input data q-format */
+ MCMASA_ENC_HANDLE hMcMasa, /* i/o: Encoder McMASA handle */
+ IVAS_QMETADATA_HANDLE hQMeta, /* o : Qmetadata handle */
+ MASA_ENCODER_HANDLE hMasa, /* i/o: Encoder MASA handle */
+ Word32 *data_f[], /* i : Input frame of audio */
+ const Word16 input_frame, /* i : Input frame size */
+ const Word16 nchan_transport, /* i : Number of transport channels */
+ const Word16 nchan_inp, /* i : Number of input channels */
+ const Word16 q_inp /* i : Input data q-format */
);
+
void ivas_mcmasa_param_est_enc_fx(
MCMASA_ENC_HANDLE hMcMasa, /* i : McMASA encoder structure */
MASA_ENCODER_HANDLE hMasa, /* i : MASA encoder structure */
@@ -3388,110 +3389,111 @@ void ivas_mcmasa_param_est_enc_fx(
);
void computeReferencePower_enc_fx(
- const Word16 *band_grouping, /* i : Band grouping for estimation */
- Word32 Cldfb_RealBuffer[][DIRAC_NO_FB_BANDS_MAX], /* i : Real part of input signal */
- Word32 Cldfb_ImagBuffer[][DIRAC_NO_FB_BANDS_MAX], /* i : Imag part of input signal */
- Word32 *reference_power, /* o : Estimated power */
- const Word16 enc_param_start_band, /* i : first band to process */
- const Word16 num_freq_bands, /* i : Number of frequency bands */
- const IVAS_FORMAT ivas_format, /* i : ivas_format */
- Word16 ref_power_w, /* i : use 0 if hodirac is enabled */
- const Word16 nchan_ana, /* i : number of analysis channels */
- Word16 inp_q, /* i : q of cld buffers */
- Word16 q_reference_power[DIRAC_NO_FB_BANDS_MAX] );
+ const Word16 *band_grouping, /* i : Band grouping for estimation */
+ Word32 Cldfb_RealBuffer[][DIRAC_NO_FB_BANDS_MAX], /* i : Real part of input signal */
+ Word32 Cldfb_ImagBuffer[][DIRAC_NO_FB_BANDS_MAX], /* i : Imag part of input signal */
+ Word32 *reference_power, /* o : Estimated power */
+ const Word16 enc_param_start_band, /* i : first band to process */
+ const Word16 num_freq_bands, /* i : Number of frequency bands */
+ const IVAS_FORMAT ivas_format, /* i : ivas_format */
+ Word16 ref_power_w, /* i : use 0 if hodirac is enabled */
+ const Word16 nchan_ana, /* i : number of analysis channels */
+ Word16 inp_q, /* i : q of cld buffers */
+ Word16 q_reference_power[DIRAC_NO_FB_BANDS_MAX]
+);
void computeReferencePower_enc_fx_dirac(
- const Word16 *band_grouping, /* i : Band grouping for estimation */
- Word32 Cldfb_RealBuffer[][DIRAC_NO_FB_BANDS_MAX], /* i : Real part of input signal */
- Word32 Cldfb_ImagBuffer[][DIRAC_NO_FB_BANDS_MAX], /* i : Imag part of input signal */
- Word16 e_Cldfb, /* i : exponent of Cldfb buffer */
- Word32 *reference_power, /* o : Estimated power */
- Word16 *e_reference, /* o : exponent of reference_power */
- const Word16 enc_param_start_band, /* i : first band to process */
- const Word16 num_freq_bands, /* i : Number of frequency bands */
- const IVAS_FORMAT ivas_format, /* i : ivas_format */
- Word16 ref_power_w, /* i : use 0 if hodirac is enabled */
- const Word16 nchan_ana, /* i : number of analysis channels */
- Word16 *mono_frame_count, /* i/o: Mono Frame Count */
- Word16 *dirac_mono_flag /* i/o: Mono Flag */
+ const Word16 *band_grouping, /* i : Band grouping for estimation */
+ Word32 Cldfb_RealBuffer[][DIRAC_NO_FB_BANDS_MAX], /* i : Real part of input signal */
+ Word32 Cldfb_ImagBuffer[][DIRAC_NO_FB_BANDS_MAX], /* i : Imag part of input signal */
+ Word16 e_Cldfb, /* i : exponent of Cldfb buffer */
+ Word32 *reference_power, /* o : Estimated power */
+ Word16 *e_reference, /* o : exponent of reference_power */
+ const Word16 enc_param_start_band, /* i : first band to process */
+ const Word16 num_freq_bands, /* i : Number of frequency bands */
+ const IVAS_FORMAT ivas_format, /* i : ivas_format */
+ Word16 ref_power_w, /* i : use 0 if hodirac is enabled */
+ const Word16 nchan_ana, /* i : number of analysis channels */
+ Word16 *mono_frame_count, /* i/o: Mono Frame Count */
+ Word16 *dirac_mono_flag /* i/o: Mono Flag */
);
void ivas_omasa_enc_fx(
- OMASA_ENC_HANDLE hOMasa, /* i/o: OMASA encoder handle */
- MASA_ENCODER_HANDLE hMasa, /* i/o: MASA encoder handle */
- ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handle */
- Word32 *data_in[], /* i/o: Input / transport audio signals */
- Word16 q_data, /* i:Q0 Stores the q for data_in_f */
- const Word16 input_frame, /* i : Input frame size */
- const Word16 nchan_transport, /* i : Number of transport channels */
- const Word16 nchan_ism, /* i : Number of objects for parameter analysis */
- const ISM_MODE ism_mode, /* i : ISM mode */
- Word32 *data_separated_object_fx, /* o : Separated object audio signal */
- Word16 *idx_separated_object /* o : Index of the separated object */
+ OMASA_ENC_HANDLE hOMasa, /* i/o: OMASA encoder handle */
+ MASA_ENCODER_HANDLE hMasa, /* i/o: MASA encoder handle */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handle */
+ Word32 *data_in[], /* i/o: Input / transport audio signals */
+ Word16 q_data, /* i :Q0 Stores the q for data_in_f */
+ const Word16 input_frame, /* i : Input frame size */
+ const Word16 nchan_transport, /* i : Number of transport channels */
+ const Word16 nchan_ism, /* i : Number of objects for parameter analysis*/
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ Word32 *data_separated_object_fx, /* o : Separated object audio signal */
+ Word16 *idx_separated_object /* o : Index of the separated object */
);
void mctStereoIGF_enc_fx(
- MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
- Encoder_State **sts, /* i/o: encoder state structure */
- Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2], /* i : MDCT spectrum for ITF */
- Word16 q_origSpec, /* i : Q for MDCT spectrum */
- Word32 *powerSpec[MCT_MAX_CHANNELS], /* i/o: MDCT^2 + MDST^2 spectrum,or estimate */
- Word16 q_powerSpec[MCT_MAX_CHANNELS], /* i : Q for powSpec_fx */
- Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i : same as powerSpec_fx but for inverse spect.*/
- Word16 *q_powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV], /* i : Q for powSpecMsInv_fx */
- Word32 *inv_spectrum_fx[MCT_MAX_CHANNELS][NB_DIV], /* i : inverse spectrum */
- const Word16 sp_aud_decision0[MCT_MAX_CHANNELS] /* i : speech audio decision */
+ MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
+ Encoder_State **sts, /* i/o: encoder state structure */
+ Word32 *orig_spectrum_fx[MCT_MAX_CHANNELS][2], /* i : MDCT spectrum for ITF */
+ Word16 q_origSpec, /* i : Q for MDCT spectrum */
+ Word32 *powerSpec[MCT_MAX_CHANNELS], /* i/o: MDCT^2 + MDST^2 spectrum,or estimate */
+ Word16 q_powerSpec[MCT_MAX_CHANNELS], /* i : Q for powSpec_fx */
+ Word32 *powerSpecMsInv_fx[MCT_MAX_CHANNELS][NB_DIV], /* i : same as powerSpec_fx but for inverse spect.*/
+ Word16 *q_powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV], /* i : Q for powSpecMsInv_fx */
+ Word32 *inv_spectrum_fx[MCT_MAX_CHANNELS][NB_DIV], /* i : inverse spectrum */
+ const Word16 sp_aud_decision0[MCT_MAX_CHANNELS] /* i : speech audio decision */
);
void ivas_mct_core_enc_fx(
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
- CPE_ENC_HANDLE hCPE[MCT_MAX_BLOCKS], /* i/o: CPE encoder structures */
- const Word16 nChannels, /* i : number of channels to be coded */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 switch_bw, /* i : flag bandwidth switch occurance */
- const Word16 lfe_bits, /* i : bits spent for LFE */
- const Word16 sba_order /* i : Ambisonic (SBA) order */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+ MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
+ CPE_ENC_HANDLE hCPE[MCT_MAX_BLOCKS], /* i/o: CPE encoder structures */
+ const Word16 nChannels, /* i : number of channels to be coded */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 switch_bw, /* i : flag bandwidth switch occurance */
+ const Word16 lfe_bits, /* i : bits spent for LFE */
+ const Word16 sba_order /* i : Ambisonic (SBA) order */
);
-
ivas_error mct_enc_reconfigure_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- const UWord16 b_nchan_change /* i : flag indicating different channel count */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ const UWord16 b_nchan_change /* i : flag indicating different channel count */
);
Word16 quantize_phi_chan_compand_fx(
- Word32 phi, /* i : azimuth value Q22 */
- Word32 *phi_hat, /* o : quantized azimuth Q22 */
- const Word16 n, /* i : azimuth codebook size */
- const Word16 theta_flag, /* i : flag signaling high elevation */
- const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
+ Word32 phi, /* i : azimuth value Q22 */
+ Word32 *phi_hat, /* o : quantized azimuth Q22 */
+ const Word16 n, /* i : azimuth codebook size */
+ const Word16 theta_flag, /* i : flag signaling high elevation */
+ const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
);
Word16 quantize_phi_chan_lbr_fx(
- const Word32 phi, /* i : azimuth value, Q22 */
- Word32 *phi_hat, /* o : quantized azimuth, Q22 */
- const Word16 n /* i : azimuth codebook size */
+ const Word32 phi, /* i : azimuth value, Q22 */
+ Word32 *phi_hat, /* o : quantized azimuth, Q22 */
+ const Word16 n /* i : azimuth codebook size */
);
UWord16 quantize_direction_fx(
- const Word32 theta, /* i : input elevation value, Q22 */
- Word32 phi, /* i : input azimuth value, Q22 */
- const Word16 no_bits, /* i : number of bits */
- Word32 *theta_q, /* o : quantized elevation, Q22 */
- Word32 *phi_q, /* o : quantized azimuth, Q22 */
- UWord16 *index_theta, /* o : quantized elevation index */
- UWord16 *index_phi, /* o : quantized azimuth index */
- const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
+ const Word32 theta, /* i : input elevation value, Q22 */
+ Word32 phi, /* i : input azimuth value, Q22 */
+ const Word16 no_bits, /* i : number of bits */
+ Word32 *theta_q, /* o : quantized elevation, Q22 */
+ Word32 *phi_q, /* o : quantized azimuth, Q22 */
+ UWord16 *index_theta, /* o : quantized elevation index */
+ UWord16 *index_phi, /* o : quantized azimuth index */
+ const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
);
Word16 quantize_direction2D_fx(
- Word32 phi, /* i : input azimuth value Q22 */
- const Word16 no_cw, /* i : number of bits */
- Word32 *phi_q, /* o : quantized azimuth value Q22 */
- UWord16 *index_phi, /* o : quantized azimuth index */
- const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
+ Word32 phi, /* i : input azimuth value Q22 */
+ const Word16 no_cw, /* i : number of bits */
+ Word32 *phi_q, /* o : quantized azimuth value Q22 */
+ UWord16 *index_phi, /* o : quantized azimuth index */
+ const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
);
+
void quantize_direction_frame_fx(
IVAS_QDIRECTION *q_direction, /* i/o: quantized direction structure */
Word32 azimuth_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES], /* o : Q22 */
@@ -3500,36 +3502,37 @@ void quantize_direction_frame_fx(
);
ivas_error ivas_qmetadata_enc_encode_fx(
- BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
- IVAS_QMETADATA *hQMetaData, /* i/o: metadata handle */
- const Word16 hodirac_flag /* i : flag to indicate HO-DirAC mode */
+ BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
+ IVAS_QMETADATA *hQMetaData, /* i/o: metadata handle */
+ const Word16 hodirac_flag /* i : flag to indicate HO-DirAC mode */
);
ivas_error ivas_qmetadata_enc_encode_hr_384_512_fx(
- BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
- IVAS_QMETADATA *hQMetaData, /* i/o: metadata handle */
+ BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
+ IVAS_QMETADATA *hQMetaData, /* i/o: metadata handle */
const Word16 bits_sph_idx,
const Word16 bits_sp_coh
);
void ivas_merge_masa_metadata_fx(
- 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 */
);
/*! r: number of bits written */
void ivas_qmetadata_enc_sid_encode_fx(
- BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
- IVAS_QMETADATA *q_metadata, /* i/o: metadata handle */
- const Word16 masa_sid_descriptor, /* i : description of MASA SID coding structure*/
- const Word16 nchan_transport, /* i : number of transport channels */
- const Word16 ivas_format /* i : ivas format */
+ BSTR_ENC_HANDLE hMetaData, /* i/o: metadata bitstream handle */
+ IVAS_QMETADATA *q_metadata, /* i/o: metadata handle */
+ const Word16 masa_sid_descriptor, /* i : description of MASA SID coding structure*/
+ const Word16 nchan_transport, /* i : number of transport channels */
+ const Word16 ivas_format /* i : ivas format */
);
+
void ivas_param_mc_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS Encoder handle */
- BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */
- Word32 *data_f_fx[], /* i/o: input/transport MC data Q11 */
- const Word16 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 */
+ Word32 *data_f_fx[], /* i/o: input/transport MC data Q11 */
+ const Word16 input_frame /* i : input frame length */
);
void ivas_merge_masa_transports_fx(
@@ -3541,16 +3544,16 @@ void ivas_merge_masa_transports_fx(
);
void ivas_param_mc_enc_close_fx(
- PARAM_MC_ENC_HANDLE *hParamMC, /* i/o: Parametric MC encoder handle */
- const Word32 input_Fs /* i : input sampling rate */
+ PARAM_MC_ENC_HANDLE *hParamMC, /* i/o: Parametric MC encoder handle */
+ const Word32 input_Fs /* i : input sampling rate */
);
ivas_error ivas_param_mc_enc_open_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
);
ivas_error ivas_param_mc_enc_reconfig_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
);
Word16 ivas_arith_encode_cmplx_cell_array_fx(
@@ -3567,20 +3570,20 @@ Word16 ivas_arith_encode_cmplx_cell_array_fx(
);
ivas_error stereo_dmx_evs_init_encoder_fx(
- STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS_out, /* o : Stereo downmix for EVS encoder handle */
- const Word32 input_Fs /* i : input sampling rate */
+ STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS_out, /* o : Stereo downmix for EVS encoder handle */
+ const Word32 input_Fs /* i : input sampling rate */
);
void stereo_dmx_evs_enc_fx(
- STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS, /* i/o: Stereo downmix for EVS encoder handle */
- const Word32 input_Fs, /* i : input sampling rate */
- Word16 data[CPE_CHANNELS * L_FRAME48k], /* i/o: input signal Q0 */
- const Word16 n_samples, /* i : number of input samples */
- const bool is_binaural /* i : indication that input is binaural audio */
+ STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS, /* i/o: Stereo downmix for EVS encoder handle */
+ const Word32 input_Fs, /* i : input sampling rate */
+ Word16 data[CPE_CHANNELS * L_FRAME48k], /* i/o: input signal Q0 */
+ const Word16 n_samples, /* i : number of input samples */
+ const bool is_binaural /* i : indication that input is binaural audio */
);
void stereo_dmx_evs_close_encoder_fx(
- 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 */
);
void ivas_omasa_encode_masa_to_total_fx(
@@ -3588,74 +3591,78 @@ void ivas_omasa_encode_masa_to_total_fx(
BSTR_ENC_HANDLE hMetaData,
const Word16 low_bitrate_mode,
const Word16 nbands,
- const Word16 nblocks );
+ const Word16 nblocks
+);
+
ivas_error ivas_masa_enc_config_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
);
+
ivas_error ivas_omasa_enc_config_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
);
void ivas_omasa_enc_close_fx(
- OMASA_ENC_HANDLE *hOMasa /* i/o: encoder OMASA handle */
+ OMASA_ENC_HANDLE *hOMasa /* i/o: encoder OMASA handle */
);
+
ivas_error ivas_omasa_enc_open_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
);
void ivas_masa_estimate_energy_fx(
- MASA_ENCODER_HANDLE hMasa, /* i/o: MASA encoder structure */
- Word32 *data_fx[], /* i : Input audio channels Q(q_data) */
- const Word16 input_frame, /* i : frame length */
- const Word16 nchan_transport, /* i : number of MASA input/transport channels */
- Word16 q_data /* i : q for data_fx */
+ MASA_ENCODER_HANDLE hMasa, /* i/o: MASA encoder structure */
+ Word32 *data_fx[], /* i : Input audio channels Q(q_data) */
+ const Word16 input_frame, /* i : frame length */
+ const Word16 nchan_transport, /* i : number of MASA input/transport channels */
+ Word16 q_data /* i : q for data_fx */
);
void ivas_masa_enc_reconfigure_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
);
ivas_error ivas_masa_encode_fx(
- 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 */
- Word16 *nb_bits_metadata, /* o : number of metadata bits written */
- const Word16 nchan_transport, /* i : number of MASA input/transport channels */
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 Opt_DTX_ON, /* i : DTX on flag */
- const Word16 element_mode, /* i : element mode */
- const ISM_MODE ism_mode, /* i : ISM format mode */
- const Word16 nchan_ism, /* i : number of ISM channels */
- ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS], /* i : ISM metadata handle */
- const Word16 idx_separated_object, /* i : index of the separated object */
- OMASA_ENC_HANDLE hOMasa, /* i : OMASA encoder handle */
- const Word16 ism_imp, /* i : importance of separated object */
- const Word16 flag_omasa_ener_brate /* i : less bitrate for objects in OMASA flag */
+ 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 */
+ Word16 *nb_bits_metadata, /* o : number of metadata bits written */
+ const Word16 nchan_transport, /* i : number of MASA input/transport channels */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 Opt_DTX_ON, /* i : DTX on flag */
+ const Word16 element_mode, /* i : element mode */
+ const ISM_MODE ism_mode, /* i : ISM format mode */
+ const Word16 nchan_ism, /* i : number of ISM channels */
+ ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS], /* i : ISM metadata handle */
+ const Word16 idx_separated_object, /* i : index of the separated object */
+ OMASA_ENC_HANDLE hOMasa, /* i : OMASA encoder handle */
+ const Word16 ism_imp, /* i : importance of separated object */
+ const Word16 flag_omasa_ener_brate /* i : less bitrate for objects in OMASA flag */
);
void ivas_write_format_sid_fx(
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- const Word16 element_mode, /* i : element bitrate */
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word16 sba_planar /* i : SBA planar flag */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+ const Word16 element_mode, /* i : element bitrate */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ const Word16 sba_order, /* i : Ambisonic (SBA) order */
+ const Word16 sba_planar /* i : SBA planar flag */
);
void ivas_write_format_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
);
ivas_error create_sce_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- const Word16 sce_id, /* i : SCE # identifier */
- const Word32 element_brate /* i : element bitrate */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ const Word16 sce_id, /* i : SCE # identifier */
+ const Word32 element_brate /* i : element bitrate */
);
ivas_error create_cpe_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- const Word16 cpe_id, /* i : CPE # identifier */
- const Word32 element_brate /* i : element bitrate */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ const Word16 cpe_id, /* i : CPE # identifier */
+ const Word32 element_brate /* i : element bitrate */
);
void ivas_quantise_real_values_fx(
@@ -3665,7 +3672,8 @@ void ivas_quantise_real_values_fx(
const Word32 max_value_fx,
Word16 *index,
Word32 *quant_fx,
- const Word16 dim );
+ const Word16 dim
+);
void ivas_quantise_real_values_enc_fx(
const Word32 *values_fx, // Q28
@@ -3674,7 +3682,8 @@ void ivas_quantise_real_values_enc_fx(
const Word32 max_value_fx, // Q28
Word16 *index,
Word32 *quant_fx, // Q28
- const Word16 dim );
+ const Word16 dim
+);
void ivas_quantise_real_values_enc_fx_varq(
const Word32 *values_fx,
@@ -3684,110 +3693,111 @@ void ivas_quantise_real_values_enc_fx_varq(
Word16 *index,
Word32 *quant_fx,
const Word16 dim,
- Word16 inp_q );
+ Word16 inp_q
+);
void ivas_spar_quant_dtx_init_fx(
ivas_spar_md_t *spar_md,
- Word32 *min_max );
+ Word32 *min_max
+);
void ivas_spar_quant_dtx_init_fx(
ivas_spar_md_t *spar_md,
- Word32 *min_max );
+ Word32 *min_max
+);
void ivas_copy_band_coeffs_idx_to_arr(
ivas_band_coeffs_ind_t *pBands_idx,
const Word16 nB,
Word16 *pSymbol_re,
ivas_cell_dim_t *pCell_dims,
- const ivas_coeffs_type_t coeff_type );
+ const ivas_coeffs_type_t coeff_type
+);
void ivas_clear_band_coeffs_fx(
ivas_band_coeffs_t *pband_coeffs,
- const UWord16 num_bands );
+ const UWord16 num_bands
+);
Word16 ivas_qmetadata_DecodeExtendedGR(
UWord16 *bitstream,
Word16 *index,
const Word16 alph_size,
- const Word16 gr_param );
+ const Word16 gr_param
+);
void ivas_masa_combine_directions_fx(
- MASA_ENCODER_HANDLE hMasa /* i/o: MASA encoder handle */
+ MASA_ENCODER_HANDLE hMasa /* i/o: MASA encoder handle */
);
/*! r: Bits to be used for quantizing distribution ratio of direct-to-total ratios */
Word16 ivas_get_df_ratio_bits_hodirac_fx(
- const Word16 index_diff /* i : index of quantized diffuse-to-total ratio */
+ const Word16 index_diff /* i : index of quantized diffuse-to-total ratio */
);
/*! r: Bits to be used for quantizing distribution ratio of direct-to-total ratios */
Word16 ivas_get_df_ratio_bits_fx(
- const Word16 index_diff /* i : index of quantized diffuse-to-total ratio */
+ const Word16 index_diff /* i : index of quantized diffuse-to-total ratio */
);
void invdct4_transform_fx(
- Word32 *v_fx, /* i : input vector */
- UWord8 *invdct_v, /* o : transformed vector */
- Word16 q );
+ Word32 *v_fx, /* i : input vector */
+ UWord8 *invdct_v, /* o : transformed vector */
+ Word16 q
+);
void ivas_spar_param_to_masa_param_mapping_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder struct */
Word32 inRe_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, real */
Word32 inIm_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Input audio in CLDFB domain, imag */
Word16 q_cldfb[6][CLDFB_SLOTS_PER_SUBFRAME],
- const Word16 subframe /* i : Subframe to map */
+ const Word16 subframe /* i : Subframe to map */
);
ivas_error ivas_binRenderer_open_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void ivas_binRenderer_close_fx(
- BINAURAL_RENDERER_HANDLE *hBinRenderer /* i/o: decoder binaural renderer handle */
+ BINAURAL_RENDERER_HANDLE *hBinRenderer /* i/o: decoder binaural renderer handle */
);
void ivas_init_binaural_hrtf_fx(
- HRTFS_FASTCONV *HrtfFastConv /* i/o: FASTCONV HRTF structure */
+ HRTFS_FASTCONV *HrtfFastConv /* i/o: FASTCONV HRTF structure */
);
ivas_error ivas_allocate_binaural_hrtf_fx(
HRTFS_FASTCONV *HrtfFastConv, /* i/o: FASTCONV HRTF structure */
-#ifdef FIX_CREND_SIMPLIFY_CODE
const int16_t n_channels, /* i : number of input channels */
-#else
- const AUDIO_CONFIG input_config, /* i : input audio configuration */
- const BINAURAL_INPUT_AUDIO_CONFIG bin_input_config, /* i : binaural input audio config */
- const RENDERER_TYPE renderer_type, /* i : renderer type */
-#endif
const int16_t allocate_init_flag /* i : Memory allocation flag */
);
void ivas_binRenderer_fx(
- BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: binaural renderer handle */
- const MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, /* i/o: pose correction data handle */
- COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, /* i : combined head and external orientation handle*/
- const Word16 numTimeSlots, /* i : number of time slots to render */
+ BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: binaural renderer handle */
+ const MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData, /* i/o: pose correction data handle */
+ COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, /* i : combined head and external orientation handle*/
+ const Word16 numTimeSlots, /* i : number of time slots to render */
Word32 Cldfb_RealBuffer_Binaural_fx[][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : Rotated Binaural signals */
Word32 Cldfb_ImagBuffer_Binaural_fx[][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : Rotated Binaural signals */
- Word32 RealBuffer_fx[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : LS signals */
- Word32 ImagBuffer_fx[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : LS signals */
- Word16 *Q_in /* i : LS signals exp */
+ Word32 RealBuffer_fx[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : LS signals */
+ Word32 ImagBuffer_fx[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i : LS signals */
+ Word16 *Q_in /* i : LS signals exp */
);
void ivas_binaural_add_LFE_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Word16 output_frame, /* i : length of input frame */
- Word32 *input_fx[], /* i : transport channels */
- Word32 *output_fx[] /* o : synthesized core-coder transport channels/DirAC output */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Word16 output_frame, /* i : length of input frame */
+ Word32 *input_fx[], /* i : transport channels */
+ Word32 *output_fx[] /* o : synthesized core-coder transport channels/DirAC output */
);
void ivas_mc2sba_fx(
- IVAS_OUTPUT_SETUP hIntSetup, /* i : Format of decoder output */
- Word32 *in_buffer_td[], /* i : MC signals (on input) and the HOA3 (on output) */
- Word32 *buffer_td[], /* i/o: MC signals (on input) and the HOA3 (on output) */
- const Word16 output_frame, /* i : output frame length per channel */
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word16 gain_lfe /* i : gain for LFE, 0 = ignore LFE */
+ IVAS_OUTPUT_SETUP hIntSetup, /* i : Format of decoder output */
+ Word32 *in_buffer_td[], /* i : MC signals (on input) and the HOA3 (on output) */
+ Word32 *buffer_td[], /* i/o: MC signals (on input) and the HOA3 (on output) */
+ const Word16 output_frame, /* i : output frame length per channel */
+ const Word16 sba_order, /* i : Ambisonic (SBA) order */
+ const Word16 gain_lfe /* i : gain for LFE, 0 = ignore LFE */
);
void ivas_param_mc_mc2sba_cldfb_fx(
@@ -3801,150 +3811,155 @@ void ivas_param_mc_mc2sba_cldfb_fx(
);
void ivas_ism2sba_sf_fx(
- Word32 *buffer_in_fx[], /* i : TC buffer */
- Word32 *buffer_out_fx[], /* o : TD signal buffers */
- ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */
- const Word16 num_objects, /* i : number of objects */
- const Word16 n_samples_to_render, /* i : output frame length per channel */
- const Word16 offset, /* i : offset for the interpolatr */
- const Word16 sba_order /* i : Ambisonic (SBA) order */
+ Word32 *buffer_in_fx[], /* i : TC buffer */
+ Word32 *buffer_out_fx[], /* o : TD signal buffers */
+ ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */
+ const Word16 num_objects, /* i : number of objects */
+ const Word16 n_samples_to_render, /* i : output frame length per channel */
+ const Word16 offset, /* i : offset for the interpolatr */
+ const Word16 sba_order /* i : Ambisonic (SBA) order */
);
void panning_wrap_angles_fx(
- const Word32 azi_deg, /* i : azimuth in degrees for panning direction (positive left) Q22 */
- const Word32 ele_deg, /* i : elevation in degrees for panning direction (positive up) Q22 */
- Word32 *azi_wrapped, /* o : wrapped azimuth component Q22 */
- Word32 *ele_wrapped /* o : wrapped elevation component Q22 */
+ const Word32 azi_deg, /* i : azimuth in degrees for panning direction (positive left) Q22 */
+ const Word32 ele_deg, /* i : elevation in degrees for panning direction (positive up) Q22 */
+ Word32 *azi_wrapped, /* o : wrapped azimuth component Q22 */
+ Word32 *ele_wrapped /* o : wrapped elevation component Q22 */
);
-void v_sort_ind_fixed(
- Word32 *x, /* i/o: Vector to be sorted */
- Word16 *idx, /* o : Original index positions */
- const Word16 len /* i : vector length */
+void v_sort_ind_fx(
+ Word32 *x, /* i/o: Vector to be sorted */
+ Word16 *idx, /* o : Original index positions */
+ const Word16 len /* i : vector length */
);
void ivas_ls_setup_conversion_process_mdct_param_mc_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Word32 *x_fx[][NB_DIV], /* i/o: Fixed output synthesis signal */
- Word16 x_e[CPE_CHANNELS][NB_DIV] /* i/o: Exponent for output synthesis signal */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Word32 *x_fx[][NB_DIV], /* i/o: Fixed output synthesis signal */
+ Word16 x_e[CPE_CHANNELS][NB_DIV] /* i/o: Exponent for output synthesis signal */
);
void lls_interp_n_fx(
- Word16 x_fx[], /* i/o: input/output vector */
- const Word16 N, /* i : length of the input vector */
- Word16 *a_fx, /* o : calculated slope */
- Word16 *b_fx, /* o : calculated offset */
- const Word16 upd /* i : use 1 to update x[] with the interpolated output */
+ Word16 x_fx[], /* i/o: input/output vector */
+ const Word16 N, /* i : length of the input vector */
+ Word16 *a_fx, /* o : calculated slope */
+ Word16 *b_fx, /* o : calculated offset */
+ const Word16 upd /* i : use 1 to update x[] with the interpolated output*/
);
void ivas_lfe_synth_with_filters_fx(
- MCMASA_LFE_SYNTH_DATA_HANDLE hMasaLfeSynth, /* i/o: LFE synthesis structure for McMASA */
- Word32 *data_f[], /* o : output signals */
- const Word16 output_frame, /* i : output frame length per channel */
- const Word16 separateChannelIndex, /* i : separate channel index */
- const Word16 lfeChannelIndex /* i : LFE channel index */
+ MCMASA_LFE_SYNTH_DATA_HANDLE hMasaLfeSynth, /* i/o: LFE synthesis structure for McMASA */
+ Word32 *data_f[], /* o : output signals */
+ const Word16 output_frame, /* i : output frame length per channel */
+ const Word16 separateChannelIndex, /* i : separate channel index */
+ const Word16 lfeChannelIndex /* i : LFE channel index */
);
void ivas_lfe_enc_fx(
- LFE_ENC_HANDLE hLFE, /* i/o: LFE encoder handle */
- Word32 data_lfe_ch[], /* i : input LFE signal */
- Word16 q_data_lfe_ch, /* i : Q of input LFE signal */
- const Word16 input_frame, /* i : input frame length per channel */
- BSTR_ENC_HANDLE hBstr /* i/o: bitstream handle */
+ LFE_ENC_HANDLE hLFE, /* i/o: LFE encoder handle */
+ Word32 data_lfe_ch[], /* i : input LFE signal */
+ Word16 q_data_lfe_ch, /* i : Q of input LFE signal */
+ const Word16 input_frame, /* i : input frame length per channel */
+ BSTR_ENC_HANDLE hBstr /* i/o: bitstream handle */
);
void ivas_filter_process_fx(
- ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
- Word32 *pIn_Out_fx, /* i : signal subject to filtering */
- const Word16 length, /* i : filter order */
- Word16 q_factor );
+ ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
+ Word32 *pIn_Out_fx, /* i : signal subject to filtering */
+ const Word16 length, /* i : filter order */
+ Word16 q_factor
+);
void ivas_filter_process_exp_fx(
- ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
- Word32 *pIn_Out_fx, /* i/o: signal subject to filtering (exp[i] : pIn_out_e[i]) */
- const Word16 length, /* i : filter order */
- Word16 *pIn_Out_e );
+ ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
+ Word32 *pIn_Out_fx, /* i/o: signal subject to filtering (exp[i] : pIn_out_e[i]) */
+ const Word16 length, /* i : filter order */
+ Word16 *pIn_Out_e
+);
ivas_error ivas_osba_enc_open_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
);
void ivas_osba_enc_close_fx(
- OSBA_ENC_HANDLE *hOSba /* i/o: encoder OSBA handle */
+ OSBA_ENC_HANDLE *hOSba /* i/o: encoder OSBA handle */
);
void ivas_osba_enc_fx(
- OSBA_ENC_HANDLE hOSba, /* i/o: OSBA encoder handle */
- ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handle */
- Word32 *data_in_fx[], /* i/o: Input / transport audio signals */
- const Word16 input_frame, /* i : Input frame size */
- const Word16 nchan_ism, /* i : Number of objects for parameter analysis */
- const ISM_MODE ism_mode, /* i : ISM mode */
- const Word16 sba_analysis_order, /* i : SBA order evaluated in DirAC/SPAR encoder */
- const Word32 input_Fs, /* i : input sampling rate */
- const Word16 sba_planar, /* i : planar SBA flag */
- Word16 *q_data );
+ OSBA_ENC_HANDLE hOSba, /* i/o: OSBA encoder handle */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handle */
+ Word32 *data_in_fx[], /* i/o: Input / transport audio signals */
+ const Word16 input_frame, /* i : Input frame size */
+ const Word16 nchan_ism, /* i : Number of objects for parameter analysis */
+ const ISM_MODE ism_mode, /* i : ISM mode */
+ const Word16 sba_analysis_order, /* i : SBA order evaluated in DirAC/SPAR encoder */
+ const Word32 input_Fs, /* i : input sampling rate */
+ const Word16 sba_planar, /* i : planar SBA flag */
+ Word16 *q_data
+);
ivas_error ivas_osba_data_open_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
);
+
ivas_error ivas_osba_dirac_td_binaural_jbm_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
- UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
- UWord16 *nSamplesAvailable, /* o : number of CLDFB slots still to render */
- Word32 *output_fx[] /* o : rendered time signal */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
+ UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
+ UWord16 *nSamplesAvailable, /* o : number of CLDFB slots still to render */
+ Word32 *output_fx[] /* o : rendered time signal */
);
ivas_error ivas_osba_ism_metadata_dec_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word32 ism_total_brate, /* i : ISM total bitrate */
- Word16 *nchan_ism, /* o : number of ISM separated channels */
- Word16 nb_bits_metadata[] /* o : number of ISM metadata bits */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word32 ism_total_brate, /* i : ISM total bitrate */
+ Word16 *nchan_ism, /* o : number of ISM separated channels */
+ Word16 nb_bits_metadata[] /* o : number of ISM metadata bits */
);
ivas_error ivas_osba_render_sf_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
- UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
- UWord16 *nSamplesAvailableNext, /* o : number of CLDFB slots still to render */
- Word32 *p_output[] /* o : rendered time signal */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
+ UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
+ UWord16 *nSamplesAvailableNext, /* o : number of CLDFB slots still to render */
+ Word32 *p_output[] /* o : rendered time signal */
);
void ivas_osba_stereo_add_channels_fx(
- Word32 *tc_fx[], /* i : transport channels */
- Word32 *output_fx[], /* i/o: output channels */
- const Word16 gain, /* i : gain bed value Q11 */
- const Word16 nchan_out, /* i : number of output channels */
- const Word16 nchan_ism, /* i : number of ISM channels */
- const UWord16 n_samples_to_render /* i : output frame length per channel */
+ Word32 *tc_fx[], /* i : transport channels */
+ Word32 *output_fx[], /* i/o: output channels */
+ const Word32 gain_bed_fx, /* i : gain bed value Q11 */
+ const Word16 nchan_out, /* i : number of output channels */
+ const Word16 nchan_ism, /* i : number of ISM channels */
+ const Word16 ism_mode, /* i : ISM mode */
+ const UWord16 n_samples_to_render /* i : output frame length per channel */
);
void ivas_osba_data_close_fx(
- SBA_ISM_DATA_HANDLE *hSbaIsmData /* i/o: OSBA rendering handle */
+ SBA_ISM_DATA_HANDLE *hSbaIsmData /* i/o: OSBA rendering handle */
);
ISM_MODE ivas_osba_ism_mode_select(
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 nchan_ism /* i : number of input ISM's */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 nchan_ism /* i : number of input ISM's */
);
void ivas_set_ism_importance_interformat_fx(
- const Word32 ism_total_brate, /* i/o: ISms total bitrate */
- const Word16 nchan_transport, /* i : number of transported channels */
- ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
- SCE_ENC_HANDLE hSCE[], /* i/o: SCE encoder handles */
- const Word16 lp_noise_CPE_fx, /* i : LP filtered total noise estimation */
- Word16 ism_imp[] /* o : ISM importance flags */
+ const Word32 ism_total_brate, /* i/o: ISms total bitrate */
+ const Word16 nchan_transport, /* i : number of transported channels */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ SCE_ENC_HANDLE hSCE[], /* i/o: SCE encoder handles */
+ const Word16 lp_noise_CPE_fx, /* i : LP filtered total noise estimation */
+ Word16 ism_imp[] /* o : ISM importance flags */
);
-
-void ivas_omasa_preProcessStereoTransportsForMovedObjects_fx(
+void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx(
Decoder_Struct *st_ivas,
Word32 inRe_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /*cldfb_buf_q*/
Word32 inIm_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /*cldfb_buf_q*/
Word16 *cldfb_buf_q,
const Word16 nBins,
- const Word16 subframe );
+ const Word16 subframe
+);
void ivas_omasa_decode_masa_to_total_fx(
@@ -3952,7 +3967,8 @@ void ivas_omasa_decode_masa_to_total_fx(
Word16 *index,
Word32 masa_to_total_energy_ratio_fx[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],
const Word16 nbands,
- const Word16 nblocks );
+ const Word16 nblocks
+);
/*----------------------------------------------------------------------------------*
@@ -3960,15 +3976,15 @@ void ivas_omasa_decode_masa_to_total_fx(
*----------------------------------------------------------------------------------*/
ivas_error ivas_td_binaural_open_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
Word16 *SrcInd, /*Temporarily used to store the updated value of SrcInd*/
Word16 *num_src
);
ivas_error ivas_td_binaural_renderer_sf_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Word32 *output_fx[], /* i/o: SCE channels / Binaural synthesis */
- const Word16 n_samples_granularity /* i : granularity of the renderer/buffer */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Word32 *output_fx[], /* i/o: SCE channels / Binaural synthesis */
+ const Word16 n_samples_granularity /* i : granularity of the renderer/buffer */
);
@@ -3977,49 +3993,50 @@ ivas_error ivas_td_binaural_renderer_sf_fx(
*----------------------------------------------------------------------------------*/
void ivas_FB_mixer_close_fx(
- IVAS_FB_MIXER_HANDLE *hFbMixer, /* i/o: FB mixer handle */
- const Word32 sampling_rate, /* i : sampling rate in Hz */
- const Word16 spar_reconfig_flag /* i : SPAR reconfiguration flag */
+ IVAS_FB_MIXER_HANDLE *hFbMixer, /* i/o: FB mixer handle */
+ const Word32 sampling_rate, /* i : sampling rate in Hz */
+ const Word16 spar_reconfig_flag /* i : SPAR reconfiguration flag */
);
void ivas_fb_mixer_pcm_ingest_fx(
- IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
- Word32 *pcm_in[], /* i : input audio channels Qq_data_fix[] */
- Word32 **ppOut_pcm, /* o : output audio channels Qq_ppOut_pcm[] */
- const Word16 frame_len, /* i : frame length */
+ IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
+ Word32 *pcm_in[], /* i : input audio channels Qq_data_fix[] */
+ Word32 **ppOut_pcm, /* o : output audio channels Qq_ppOut_pcm[] */
+ const Word16 frame_len, /* i : frame length */
const Word16 HOA_md_ind[IVAS_SPAR_MAX_CH],
Word16 q_data_fix,
- Word16 *q_ppOut_pcm );
+ Word16 *q_ppOut_pcm
+);
void ivas_fb_mixer_process_fx(
- IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
- Word32 ***mixer_mat_fx, /* i : mixer matrix */
- Word16 *q_mixer_mat_fx, /* i : mixer matrix Q-factor */
- Word32 **ppOut_pcm_fx, /* o : output audio channels */
- Word16 *q_ppOut_pcm_fx, /* o : output audio channels Q-factor */
- const Word16 frame_len, /* i : frame length in samples */
+ IVAS_FB_MIXER_HANDLE hFbMixer, /* i/o: FB mixer handle */
+ Word32 ***mixer_mat_fx, /* i : mixer matrix */
+ Word16 *q_mixer_mat_fx, /* i : mixer matrix Q-factor */
+ Word32 **ppOut_pcm_fx, /* o : output audio channels */
+ Word16 *q_ppOut_pcm_fx, /* o : output audio channels Q-factor */
+ const Word16 frame_len, /* i : frame length in samples */
Word16 in_out_mixer_map[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH] /* i/o: mixing mapping */
);
Word16 ivas_get_num_bands_from_bw_idx(
- const Word16 bwidth /* i : audio bandwidth */
+ const Word16 bwidth /* i : audio bandwidth */
);
void sns_avq_dec_fx(
- Word16 *index, /* i : Quantization indices */
- Word32 SNS_Q[NB_DIV][M], /* o : Quantized SNS vectors */
+ Word16 *index, /* i : Quantization indices */
+ Word32 SNS_Q[NB_DIV][M], /* o : Quantized SNS vectors */
Word16 *q_snsq,
- const Word16 L_frame, /* i : frame length */
- const Word16 numlpc /* i : Number of sets of lpc */
+ const Word16 L_frame, /* i : frame length */
+ const Word16 numlpc /* i : Number of sets of lpc */
);
void sns_avq_dec_stereo_fx(
- Word16 *indexl, /* i : Quantization indices (left channel) */
- Word16 *indexr, /* i : Quantization indices (right channe) */
- const Word16 L_frame, /* i : frame length */
- Word32 *SNS_Ql, /* o : Quantized SNS vectors (left channel) */
+ Word16 *indexl, /* i : Quantization indices (left channel) */
+ Word16 *indexr, /* i : Quantization indices (right channe) */
+ const Word16 L_frame, /* i : frame length */
+ Word32 *SNS_Ql, /* o : Quantized SNS vectors (left channel) */
Word16 *q_l,
- Word32 *SNS_Qr, /* o : Quantized SNS vectors (right channe) */
+ Word32 *SNS_Qr, /* o : Quantized SNS vectors (right channe) */
Word16 *q_r
);
@@ -4030,150 +4047,144 @@ void dequantize_sns_fx(
);
void inverseMS_fx(
- const Word16 L_frame, /* i : frame length Q0*/
- Word32 x0[], /* i/o: mid/left channel coefficients Qx*/
- Word32 x1[], /* i/o: side/right channel coefficients Qx*/
- const Word32 norm_fac /* i : normalization factor Q31*/
+ const Word16 L_frame, /* i : frame length Q0*/
+ Word32 x0[], /* i/o: mid/left channel coefficients Qx*/
+ Word32 x1[], /* i/o: side/right channel coefficients Qx*/
+ const Word32 norm_fac /* i : normalization factor Q31*/
);
void ivas_syn_output_f_fx(
- Word32 *synth[], /* i/o: Word32 synthesis signal */
- const Word16 output_frame, /* i : output frame length (one channel) */
- const Word16 n_channels, /* i : number of output channels */
- Word32 *synth_out /* o : integer 16 bits synthesis signal */
+ Word32 *synth[], /* i/o: Word32 synthesis signal */
+ const Word16 output_frame, /* i : output frame length (one channel) */
+ const Word16 n_channels, /* i : number of output channels */
+ Word32 *synth_out /* o : integer 16 bits synthesis signal */
);
ivas_error ivas_init_encoder_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
);
ivas_error ivas_output_buff_dec_fx(
- Word32 *p_output_f[], /* i/o: output audio buffers */
- const Word16 nchan_out_buff_old, /* i : previous frame number of output channels */
- const Word16 nchan_out_buff /* i : number of output channels */
+ Word32 *p_output_fx[], /* i/o: output audio buffers */
+ const Word16 nchan_out_buff_old, /* i : previous frame number of output channels */
+ const Word16 nchan_out_buff /* i : number of output channels */
);
ivas_error ivas_dec_get_format_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
ivas_error ivas_dec_setup(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesRendered, /* o : number of samples flushed from the previous frame (JBM) */
- Word16 *data /* o : output synthesis signal */
-#endif
);
ivas_error create_mct_dec_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
ivas_error mct_dec_reconfigure_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const UWord16 b_nchan_change /* i : flag indicating different channel count */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const UWord16 b_nchan_change /* i : flag indicating different channel count */
);
ivas_error ivas_corecoder_dec_reconfig_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 nSCE_old, /* i : number of SCEs in previous frame */
- Word16 nCPE_old, /* i : number of CPEs in previous frame */
- const Word16 nchan_transport_old, /* i : number of TCs in previous frame */
- const Word16 sba_dirac_stereo_flag_old, /* i : signal stereo rendering using DFT upmix in previous frame */
- const Word32 brate_SCE, /* i : bitrate to be set for the SCEs */
- const Word32 brate_CPE /* i : bitrate to be set for the CPEs */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 nSCE_old, /* i : number of SCEs in previous frame */
+ Word16 nCPE_old, /* i : number of CPEs in previous frame */
+ const Word16 nchan_transport_old, /* i : number of TCs in previous frame */
+ const Word16 sba_dirac_stereo_flag_old, /* i : signal stereo rendering using DFT upmix in previous frame */
+ const Word32 brate_SCE, /* i : bitrate to be set for the SCEs */
+ const Word32 brate_CPE /* i : bitrate to be set for the CPEs */
);
ivas_error ivas_hp20_dec_reconfig_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 nchan_hp20_old /* i : number of HP20 filters in previous frame*/
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 nchan_hp20_old /* i : number of HP20 filters in previous frame */
);
Word16 getNumChanSynthesis(
- Decoder_Struct *st_ivas /* i : IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i : IVAS decoder structure */
);
void ivas_destroy_dec_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
ivas_error ivas_core_dec_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- SCE_DEC_HANDLE hSCE, /* i/o: SCE decoder structure */
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
- const Word16 n_channels, /* i : number of channels to be decoded */
- Word32 *output_fx[], /* o : output synthesis signal */
- Word32 outputHB[][L_FRAME48k], /* o : output HB synthesis signal */
- Word32 DFT_fx[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
- const Word16 sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ SCE_DEC_HANDLE hSCE, /* i/o: SCE decoder structure */
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
+ const Word16 n_channels, /* i : number of channels to be decoded */
+ Word32 *output_fx[], /* o : output synthesis signal */
+ Word32 outputHB[][L_FRAME48k], /* o : output HB synthesis signal */
+ Word32 DFT_fx[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
+ const Word16 sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
);
void decod_gen_2sbfr_fx(
- Decoder_State *st, /* i/o: decoder static memory */
- const Word16 sharpFlag, /* i : formant sharpening flag `Q0*/
- const Word16 *Aq, /* i : LP filter coefficient Q12*/
- Word16 *pitch_buf, /* o : Word16 pitch values for each subframe Q6*/
- Word16 *voice_factors, /* o : voicing factors Q15*/
- Word16 *exc, /* i/o: adapt. excitation exc Q_exc*/
- Word16 *exc2, /* i/o: adapt. excitation/total exc Q_exc*/
- Word16 *bwe_exc, /* o : excitation for SWB TBE Q_exc*/
- Word16 *gain_buf, /* o : Word16 pitch gain for each subframe Q14*/
- const Word16 tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag Q0*/
- const Word16 tdm_Pri_pitch_buf[] /* i : pitch values for primary channel Q6*/
+ Decoder_State *st, /* i/o: decoder static memory */
+ const Word16 sharpFlag, /* i : formant sharpening flag Q0*/
+ const Word16 *Aq, /* i : LP filter coefficient Q12*/
+ Word16 *pitch_buf, /* o : Word16 pitch values for each subframe Q6*/
+ Word16 *voice_factors, /* o : voicing factors Q15*/
+ Word16 *exc, /* i/o: adapt. excitation exc Q_exc*/
+ Word16 *exc2, /* i/o: adapt. excitation/total exc Q_exc*/
+ Word16 *bwe_exc, /* o : excitation for SWB TBE Q_exc*/
+ Word16 *gain_buf, /* o : Word16 pitch gain for each subframe Q14*/
+ const Word16 tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag Q0*/
+ const Word16 tdm_Pri_pitch_buf[] /* i : pitch values for primary channe Q6*/
);
Word16 ivas_smc_gmm_fx(
- Encoder_State *st, /* i/o: state structure */
- STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure */
- const Word16 localVAD_HE_SAD, /* i : HE-SAD flag without hangover */
- const Word16 Etot_fx, /* i : total frame energy */
- const Word16 lsp_new_fx[M], /* i : LSPs in current frame Q15 */
- const Word16 cor_map_sum_fx, /* i : correlation map sum (from multi-harmonic anal.) Q8 */
- const Word32 epsP_fx[M + 1], /* i : LP prediciton error */
- const Word32 PS_fx[], /* i : energy spectrum */
- const Word32 non_sta_fx, /* i : unbound non-stationarity Q20 */
- const Word16 relE_fx, /* i : relative frame energy Q8 */
- Word16 *high_lpn_flag, /* i/o: sp/mus LPN flag */
- const Word16 flag_spitch, /* i : flag to indicate very short stable pitch */
+ Encoder_State *st, /* i/o: state structure */
+ STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure */
+ const Word16 localVAD_HE_SAD, /* i : HE-SAD flag without hangover */
+ const Word16 Etot_fx, /* i : total frame energy */
+ const Word16 lsp_new_fx[M], /* i : LSPs in current frame Q15 */
+ const Word16 cor_map_sum_fx, /* i : correlation map sum (from multi-harmonic anal.) Q8 */
+ const Word32 epsP_fx[M + 1], /* i : LP prediciton error */
+ const Word32 PS_fx[], /* i : energy spectrum */
+ const Word32 non_sta_fx, /* i : unbound non-stationarity Q20 */
+ const Word16 relE_fx, /* i : relative frame energy Q8 */
+ Word16 *high_lpn_flag, /* i/o: sp/mus LPN flag */
+ const Word16 flag_spitch, /* i : flag to indicate very short stable pitch */
Word16 Qfact_PS,
Word16 Q_esp,
Word16 Qfact_PS_past
);
void ivas_signaling_enc_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
- const Word32 element_brate, /* i : element bitrate */
- const Word16 tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag in TD stereo OR LRTD primary channel */
- const Word16 tdm_Pitch_reuse_flag /* i : primary channel pitch reuse flag in TD stereo */
+ Encoder_State *st, /* i/o: encoder state structure */
+ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
+ const Word32 element_brate, /* i : element bitrate */
+ const Word16 tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag in TD stereo OR LRTD primary channel */
+ const Word16 tdm_Pitch_reuse_flag /* i : primary channel pitch reuse flag in TD stereo */
);
void smooth_dft2td_transition_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 *output_fx[CPE_CHANNELS], /* i/o: synthesis @external Fs Q11*/
- const Word16 output_frame /* i : output frame lenght Q0*/
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 *output_fx[CPE_CHANNELS], /* i/o: synthesis @external Fs Q11*/
+ const Word16 output_frame /* i : output frame lenght Q0*/
);
-
Word16 is_IVAS_bitrate_fx(
- const Word32 ivas_total_brate /* i : IVAS total bitrate */
+ const Word32 ivas_total_brate /* i : IVAS total bitrate */
);
void ivas_mdft_fx(
- const Word32 *pIn, /* i : input time-domain signal Qin */
- Word32 *pOut_re, /* o : Real part of MDFT signal Qin */
- Word32 *pOut_im, /* o : Imag. part of MDFT signal Qin */
- const Word16 length, /* i : signal length */
- const Word16 mdft_length /* i : MDFT length */
+ const Word32 *pIn, /* i : input time-domain signal Qin */
+ Word32 *pOut_re, /* o : Real part of MDFT signal Qin */
+ Word32 *pOut_im, /* o : Imag. part of MDFT signal Qin */
+ const Word16 length, /* i : signal length */
+ const Word16 mdft_length /* i : MDFT length */
);
void ivas_imdft_fx(
- const Word32 *pRe, /* i : Real part of MDFT signal Qin */
- const Word32 *pIm, /* i : Imag. part of MDFT signal Qin */
- Word32 *pOut, /* o : output time-domain signal Qin */
- const Word16 length /* i : signal length */
+ const Word32 *pRe, /* i : Real part of MDFT signal Qin */
+ const Word32 *pIm, /* i : Imag. part of MDFT signal Qin */
+ Word32 *pOut, /* o : output time-domain signal Qin */
+ const Word16 length /* i : signal length */
);
void TonalMdctConceal_create_concealment_noise_ivas_fx(
@@ -4195,225 +4206,214 @@ Word16 rand_triangular_signed_fx(
);
Word64 var_32_fx(
- const Word32 *x, /* i : input vector */
- const Word16 len, /* i : length of inputvector */
- Word16 q /* q : q-factor for the array */
+ const Word32 *x, /* i : input vector */
+ const Word16 len, /* i : length of inputvector */
+ Word16 q /* q : q-factor for the array */
);
ivas_error ivas_jbm_dec_tc_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+#ifndef LIB_DEC_REVISION
+ ,
Word32 *data_fx
+#endif
);
ivas_error ivas_jbm_dec_flush_renderer_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 tc_granularity_new, /* i : new renderer granularity */
- const RENDERER_TYPE renderer_type_old, /* i : old renderer type */
- const AUDIO_CONFIG intern_config_old, /* i : old internal config */
- const IVAS_OUTPUT_SETUP_HANDLE hIntSetupOld, /* i : old internal output setup */
- const MC_MODE mc_mode_old, /* i : old MC mode */
- const ISM_MODE ism_mode_old, /* i : old ISM mode */
- UWord16 *nSamplesRendered, /* o : number of samples flushed */
- Word16 *data /* o : output synthesis signal */
-);
-
-void ivas_jbm_dec_feed_tc_to_renderer_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 nSamplesForRendering, /* i : number of TC samples available for rendering */
- Word16 *nSamplesResidual, /* o : number of samples not fitting into the renderer grid and buffer for the next call*/
- Word32 *data /* i/o: transport channels/output synthesis signal */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 tc_granularity_new, /* i : new renderer granularity */
+ const RENDERER_TYPE renderer_type_old, /* i : old renderer type */
+ const AUDIO_CONFIG intern_config_old, /* i : old internal config */
+ const IVAS_OUTPUT_SETUP_HANDLE hIntSetupOld, /* i : old internal output setup */
+ const MC_MODE mc_mode_old, /* i : old MC mode */
+ const ISM_MODE ism_mode_old, /* i : old ISM mode */
+ UWord16 *nSamplesRendered, /* o : number of samples flushed */
+ Word16 *data /* o : output synthesis signal */
);
void ivas_jbm_dec_feed_tc_to_renderer_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 nSamplesForRendering, /* i : number of TC samples available for rendering */
- Word16 *nSamplesResidual, /* o : number of samples not fitting into the renderer grid and buffer for the next call*/
- Word32 *data /* i/o: transport channels/output synthesis signal */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 nSamplesForRendering, /* i : number of TC samples available for rendering */
+ Word16 *nSamplesResidual, /* o : number of samples not fitting into the renderer grid and buffer for the next call*/
+ Word32 *data_fx /* i/o: transport channels/output synthesis signal */
);
-#ifdef OBJ_EDITING_API
-void ivas_jbm_dec_prepare_renderer(
+void ivas_dec_prepare_renderer_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
-#endif
void ivas_jbm_dec_get_adapted_subframes(
- const Word16 nCldfbTs, /* i : number of time slots in the current frame */
- Word16 *subframe_nbslots, /* i/o: subframe grid */
- Word16 *nb_subframes /* i/o: number of subframes in the frame */
+ const Word16 nCldfbTs, /* i : number of time slots in the current frame */
+ Word16 *subframe_nbslots, /* i/o: subframe grid */
+ Word16 *nb_subframes /* i/o: number of subframes in the frame */
);
void ivas_jbm_dec_get_md_map(
- const Word16 default_len, /* i : default frame length in metadata slots */
- const Word16 len, /* i : length of the modfied frames in metadata slots */
- const Word16 subframe_len, /* i : default length of a subframe */
- const Word16 offset, /* i : current read offset into the md buffer */
- const Word16 buf_len, /* i : length of the metadata buffer */
- Word16 *map /* o : metadata index map */
+ const Word16 default_len, /* i : default frame length in metadata slots */
+ const Word16 len, /* i : length of the modfied frames in metadata slots */
+ const Word16 subframe_len, /* i : default length of a subframe */
+ const Word16 offset, /* i : current read offset into the md buffer */
+ const Word16 buf_len, /* i : length of the metadata buffer */
+ Word16 *map /* o : metadata index map */
);
void ivas_jbm_dec_get_md_map_even_spacing(
- const Word16 len, /* i : length of the modfied frames in metadata slots */
- const Word16 subframe_len, /* i : default length of a subframe */
- const Word16 offset, /* i : current read offset into the md buffer */
- const Word16 buf_len, /* i : length of the metadata buffer */
- Word16 *map /* o : metadata index map */
+ const Word16 len, /* i : length of the modfied frames in metadata slots */
+ const Word16 subframe_len, /* i : default length of a subframe */
+ const Word16 offset, /* i : current read offset into the md buffer */
+ const Word16 buf_len, /* i : length of the metadata buffer */
+ Word16 *map /* o : metadata index map */
);
void bitbudget_to_brate(
- const Word16 x[], /* i : bitbudgets */
- Word32 y[], /* o : bitrates */
- const Word16 N /* i : number of entries to be converted */
+ const Word16 x[], /* i : bitbudgets */
+ Word32 y[], /* o : bitrates */
+ const Word16 N /* i : number of entries to be converted */
);
Word16 ism_quant_meta_fx(
- const Word32 val, /* i : scalar value to quantize */
- Word32 *valQ, /* o : quantized value */
- const Word32 borders_fx[], /* i : level borders */
- const Word32 q_step_fx, /* i : quantization step */
- const Word32 q_step_border_fx, /* i : quantization step at the border */
- const Word16 cbsize /* i : codebook size */
+ const Word32 val, /* i : scalar value to quantize */
+ Word32 *valQ, /* o : quantized value */
+ const Word32 borders_fx[], /* i : level borders */
+ const Word32 q_step_fx, /* i : quantization step */
+ const Word32 q_step_border_fx, /* i : quantization step at the border */
+ const Word16 cbsize /* i : codebook size */
);
ivas_error ivas_set_ism_metadata_fx(
- ISM_METADATA_HANDLE hIsmMeta, /* o : ISM metadata handle */
- const Word32 azimuth, /* i : azimuth value */
- const Word32 elevation, /* i : elevation value */
- const Word16 radius_meta, /* i : radius */
- const Word32 yaw, /* i : yaw */
- const Word32 pitch, /* i : pitch */
- const Word16 non_diegetic_flag /* i : non-diegetic object flag */
+ ISM_METADATA_HANDLE hIsmMeta, /* o : ISM metadata handle */
+ const Word32 azimuth, /* i : azimuth value */
+ const Word32 elevation, /* i : elevation value */
+ const Word16 radius_meta, /* i : radius */
+ const Word32 yaw, /* i : yaw */
+ const Word32 pitch, /* i : pitch */
+ const Word16 non_diegetic_flag /* i : non-diegetic object flag */
);
ivas_error ivas_ism_metadata_enc_fx(
- Word32 *ism_total_brate, /* i/o: ISM total bitrate */
- const Word16 nchan_ism, /* i : number of ISM channels */
- const Word16 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 */
- Word16 nb_bits_metadata[], /* o : number of metadata bits */
- const Word16 localVAD[], /* i : VAD flag */
- const Word16 ism_mode, /* i : ISM mode */
- const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
- const Word16 ism_extended_metadata_flag, /* i : Extended metadata flag */
- const Word16 lp_noise_CPE, /* i : LP filtered total noise estimation */
- const Word16 flag_omasa_ener_brate, /* i : less bitrate for objects in OMASA flag */
+ Word32 *ism_total_brate, /* i/o: ISM total bitrate */
+ const Word16 nchan_ism, /* i : number of ISM channels */
+ const Word16 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 */
+ Word16 nb_bits_metadata[], /* o : number of metadata bits */
+ const Word16 localVAD[], /* i : VAD flag */
+ const Word16 ism_mode, /* i : ISM mode */
+ const PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i : Param ISM Config Handle */
+ const Word16 ism_extended_metadata_flag, /* i : Extended metadata flag */
+ const Word16 lp_noise_CPE, /* i : LP filtered total noise estimation */
+ const Word16 flag_omasa_ener_brate, /* i : less bitrate for objects in OMASA flag */
Word16 *omasa_stereo_sw_cnt,
- const Word16 ini_frame );
+ const Word16 ini_frame
+);
ivas_error ivas_ism_dec_config(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const ISM_MODE last_ism_mode /* i/o: last ISM mode */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesRendered, /* o : number of samples flushed when the renderer granularity changes */
- Word16 *data /* o : output synthesis signal */
-#endif
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const ISM_MODE last_ism_mode /* i/o: last ISM mode */
);
ivas_error ivas_param_ism_dec_open_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void ivas_param_ism_dec_close_fx(
- PARAM_ISM_DEC_HANDLE *hParamIsmDec, /* i/o: decoder ParamISM handle */
- SPAT_PARAM_REND_COMMON_DATA_HANDLE *hSpatParamRendCom_out, /* i/o: common spatial renderer data */
- const AUDIO_CONFIG output_config /* i : output audio configuration */
+ PARAM_ISM_DEC_HANDLE *hParamIsmDec, /* i/o: decoder ParamISM handle */
+ SPAT_PARAM_REND_COMMON_DATA_HANDLE *hSpatParamRendCom_out, /* i/o: common spatial renderer data */
+ const AUDIO_CONFIG output_config /* i : output audio configuration */
);
void ivas_ism_dec_digest_tc_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void ivas_param_ism_dec_digest_tc_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nCldfbSlots, /* i : number of CLFBS slots in the transport channels */
- Word32 *transport_channels[], /* i : synthesized core-coder transport channels/DirAC output */
- Word16 q_tc_in );
-
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nCldfbSlots, /* i : number of CLDFB slots in transport channels */
+ Word32 *p_data_fx[], /* i/o: synthesized core-coder transport channels/DirAC output */
+ const Word16 q_data_in /* i : Q-factor of input signal for single channel */
+);
-#ifdef OBJ_EDITING_API
void ivas_param_ism_dec_dequant_md_fx(
- Decoder_Struct *st_ivas
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
);
void ivas_param_ism_dec_prepare_renderer_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const Word16 nCldfbSlots /* i : number of CLFBS slots in the transport channels */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const Word16 nCldfbSlots /* i : number of CLDFB slots in transport channels */
);
-#endif
void ivas_param_ism_dec_render_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
- UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
- UWord16 *nSamplesAvailable, /* o : number of CLDFB slots still to render */
- Word32 *output_f_fx[] );
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
+ UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
+ UWord16 *nSamplesAvailable, /* o : number of CLDFB slots still to render */
+ Word32 *output_fx[] /* i/o: synthesized core-coder TCs / rendered signal*/
+);
void ivas_param_ism_params_to_masa_param_mapping_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
Word16 ivas_ism_dtx_enc_fx(
- ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
- SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 nchan_ism, /* i : number of objects */
- const Word16 nchan_transport, /* i : number of transport channels */
- Word16 vad_flag[MAX_NUM_OBJECTS], /* i : VAD flag */
- ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
- Word16 md_diff_flag[], /* o : metadata differential flag */
- Word16 *sid_flag /* o : indication of SID frame */
+ ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
+ SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word16 nchan_ism, /* i : number of objects */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ Word16 vad_flag[MAX_NUM_OBJECTS], /* i : VAD flag */
+ ISM_METADATA_HANDLE hIsmMeta[], /* i/o: ISM metadata handles */
+ Word16 md_diff_flag[], /* o : metadata differential flag */
+ Word16 *sid_flag /* o : indication of SID frame */
);
void ivas_ism_dtx_dec_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Word16 *nb_bits_metadata /* o : number of metadata bits */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Word16 *nb_bits_metadata /* o : number of metadata bits */
);
void ivas_ism_get_sce_id_dtx_fx(
- ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
- SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */
- const Word16 nchan_transport, /* i : number of transport channels */
- const Word16 input_frame /* i : input frame length per channel */
+ ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
+ SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ const Word16 input_frame /* i : input frame length per channel */
);
void ivas_ism_coh_estim_dtx_enc_fx(
- ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
- SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */
- const Word16 nchan_transport, /* i : number of transport channels */
- const Word16 input_frame /* i : input frame length */
+ ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
+ SCE_ENC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ const Word16 input_frame /* i : input frame length */
);
void ivas_ism_dtx_limit_noise_energy_for_near_silence_fx(
- SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder structures */
- const Word16 sce_id_dtx, /* i : SCE DTX ID */
- const Word16 nchan_transport, /* i : number of transport channels */
- Word16 *Q_cngNoiseLevel );
-
+ SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder structures */
+ const Word16 sce_id_dtx, /* i : SCE DTX ID */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ Word16 *Q_cngNoiseLevel
+);
ivas_error stereo_dft_enc_create_fx(
- STEREO_DFT_ENC_DATA_HANDLE *hStereoDft, /* o : encoder DFT stereo handle */
- const Word32 input_Fs, /* i : input sampling rate */
- const Word16 max_bwidth /* i : maximum encoded bandwidth */
+ STEREO_DFT_ENC_DATA_HANDLE *hStereoDft, /* o : encoder DFT stereo handle */
+ const Word32 input_Fs, /* i : input sampling rate */
+ const Word16 max_bwidth /* i : maximum encoded bandwidth */
);
void stereo_dft_enc_reset_fx(
- STEREO_DFT_ENC_DATA_HANDLE hStereoDft /* i/o: encoder stereo handle */
+ STEREO_DFT_ENC_DATA_HANDLE hStereoDft /* i/o: encoder stereo handle */
);
void stereo_enc_itd_init_fx(
- ITD_DATA_HANDLE hItd /* i/o: encoder ITD handle */
+ ITD_DATA_HANDLE hItd /* i/o: encoder ITD handle */
);
void stereo_dft_enc_update_fx(
- STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle */
- const Word16 max_bwidth /* i : maximum encoded bandwidth */
+ STEREO_DFT_ENC_DATA_HANDLE hStereoDft, /* i/o: encoder stereo handle */
+ const Word16 max_bwidth /* i : maximum encoded bandwidth */
);
void stereo_dft_enc_destroy_fx(
- STEREO_DFT_ENC_DATA_HANDLE *hStereoDft /* i/o: encoder DFT stereo handle */
+ STEREO_DFT_ENC_DATA_HANDLE *hStereoDft /* i/o: encoder DFT stereo handle */
);
void stereo_dft_quantize_res_gains_fx(
@@ -4422,7 +4422,8 @@ void stereo_dft_quantize_res_gains_fx(
Word32 *gq, // Q31
Word32 *rq, // Q31
Word16 *ig,
- Word16 *ir );
+ Word16 *ir
+);
void stereo_dft_dequantize_itd_fx(
Word16 *ind, /* Q0 */
@@ -4431,283 +4432,287 @@ void stereo_dft_dequantize_itd_fx(
);
Word16 stereo_dft_sg_recovery_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft /* i/o: Decoder DFT stereo handle */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft /* i/o: Decoder DFT stereo handle */
);
Word16 res_bpf_adapt_ivas_fx(
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo decoder handle */
- const Word32 *bpf_error_signal_8k, /* i : BPF modification signal */
- Word32 res_buf[STEREO_DFT_N_8k], /* i : residual buffer Q_res */
- Word16 q_res );
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo decoder handle */
+ const Word32 *bpf_error_signal_8k, /* i : BPF modification signal */
+ Word32 res_buf[STEREO_DFT_N_8k], /* i : residual buffer Q_res */
+ Word16 q_res
+);
void stereo_dft_dec_read_BS_fx(
- const Word32 ivas_total_brate, /* i : IVAS total bitrate Q0*/
- const Word32 element_brate, /* i : element bitrate Q0*/
- Word32 *total_brate, /* o : total bitrate Q0*/
- Decoder_State *st, /* i/o: decoder state structure */
- STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder stereo handle */
- const Word16 bwidth, /* i : bandwidth Q0*/
- const Word16 output_frame, /* i : output frame length Q0*/
- Word32 res_buf_fx[STEREO_DFT_N_8k], /* o : residual buffer Q0*/
- Word16 *nb_bits, /* o : number of bits read Q0*/
- Word16 *coh_fx, /* i/o: Coherence Q15*/
- const Word16 ivas_format /* i : ivas format Q0*/
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate Q0*/
+ const Word32 element_brate, /* i : element bitrate Q0*/
+ Word32 *total_brate, /* o : total bitrate Q0*/
+ Decoder_State *st, /* i/o: decoder state structure */
+ STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder stereo handle */
+ const Word16 bwidth, /* i : bandwidth Q0*/
+ const Word16 output_frame, /* i : output frame length Q0*/
+ Word32 res_buf_fx[STEREO_DFT_N_8k], /* o : residual buffer Q0*/
+ Word16 *nb_bits, /* o : number of bits read Q0*/
+ Word16 *coh_fx, /* i/o: Coherence Q15*/
+ const Word16 ivas_format /* i : ivas format Q0*/
);
Word16 write_bitstream_adapt_GR_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle */
- const Word16 ind, /* i : bitstream index */
- const Word16 *in, /* i : values to be written in bitstream */
- const Word16 len, /* i : values vector length */
- const Word16 GR_ord, /* i : GR order to be used */
- const Word16 no_GR_ord /* i : speech/music 0/1 */
+ BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle */
+ const Word16 ind, /* i : bitstream index */
+ const Word16 *in, /* i : values to be written in bitstream */
+ const Word16 len, /* i : values vector length */
+ const Word16 GR_ord, /* i : GR order to be used */
+ const Word16 no_GR_ord /* i : speech/music 0/1 */
);
Word16 adapt_GR_ief_fx(
- const Word16 *in, /* i : vector to encode */
- Word16 *in_diff, /* o : encoded symbols in case of differential encoding */
- const Word16 *prev, /* i : previous frame data */
- const Word16 len, /* i : input vector length */
- const Word16 no_symb, /* i : number of symbols */
- Word16 *nbits, /* o : number of used bits */
- Word16 *in_enc, /* o : symbold actually encoded after adapt_GR */
- const Word16 *map0, /* i : mapping array */
- const Word16 no_GR_ord, /* i : number of GR order to try 2: 0,1; 3:0,1,2 */
- Word16 *nbits_diff, /* o : number bits in diff encoding */
- const Word16 side_gain_counter, /* i : number of frames since last abs coding */
- Word16 *side_gain_bitdiff_lp, /* i/o: LP-filtered bit difference between abs/diff */
- Word16 *q_side_gain_bitdiff_lp, /* i/o: Q of LP-filtered bit difference between abs/diff */
- const Word16 try_diff /* i : diff coding allowed 1/0 */
+ const Word16 *in, /* i : vector to encode */
+ Word16 *in_diff, /* o : encoded symbols in case of differential encoding */
+ const Word16 *prev, /* i : previous frame data */
+ const Word16 len, /* i : input vector length */
+ const Word16 no_symb, /* i : number of symbols */
+ Word16 *nbits, /* o : number of used bits */
+ Word16 *in_enc, /* o : symbold actually encoded after adapt_GR */
+ const Word16 *map0, /* i : mapping array */
+ const Word16 no_GR_ord, /* i : number of GR order to try 2: 0,1; 3:0,1,2 */
+ Word16 *nbits_diff, /* o : number bits in diff encoding */
+ const Word16 side_gain_counter, /* i : number of frames since last abs coding */
+ Word16 *side_gain_bitdiff_lp, /* i/o: LP-filtered bit difference between abs/diff */
+ Word16 *q_side_gain_bitdiff_lp, /* i/o: Q of LP-filtered bit difference between abs/diff */
+ const Word16 try_diff /* i : diff coding allowed 1/0 */
);
Word16 adapt_GR_rpg1_ief_fx(
- const Word16 *in, /* i : res pred gains input vector */
- Word16 *in_diff, /* o : encoded symbols in case of differential encoding */
- const Word16 *prev, /* i : previous frame data */
- const Word16 len, /* i : input vector length */
- const Word16 no_symb, /* i : number of symbols */
- Word16 *nbits, /* o : number of used bits */
- Word16 *in_enc, /* o : symbold actually encoded after adapt_GR */
- const Word16 *maps, /* i : mapping array */
- Word16 *nbits_diff, /* o : estimated no of bits for differential encoding */
- const Word16 no_GR_ord, /* i : number of GR order to try 2: 0,1; 3:0,1,2 */
- const Word16 try_diff /* i : diff coding allowed 1/0 */
+ const Word16 *in, /* i : res pred gains input vector */
+ Word16 *in_diff, /* o : encoded symbols in case of differential encoding */
+ const Word16 *prev, /* i : previous frame data */
+ const Word16 len, /* i : input vector length */
+ const Word16 no_symb, /* i : number of symbols */
+ Word16 *nbits, /* o : number of used bits */
+ Word16 *in_enc, /* o : symbold actually encoded after adapt_GR */
+ const Word16 *maps, /* i : mapping array */
+ Word16 *nbits_diff, /* o : estimated no of bits for differential encoding */
+ const Word16 no_GR_ord, /* i : number of GR order to try 2: 0,1; 3:0,1,2 */
+ const Word16 try_diff /* i : diff coding allowed 1/0 */
);
Word16 write_GR1_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle */
- const Word16 ind, /* i : bitstream index */
- const Word16 *in, /* i : data to be encoded */
- const Word16 len /* i : input data length */
+ BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle */
+ const Word16 ind, /* i : bitstream index */
+ const Word16 *in, /* i : data to be encoded */
+ const Word16 len /* i : input data length */
);
Word16 write_bitstream_GR_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle */
- const Word16 ind, /* i : bitstream index */
- const Word16 *in, /* i : input vector */
- const Word16 len, /* i : input vector length */
- const Word16 GR_ord /* i : GR order */
+ BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle */
+ const Word16 ind, /* i : bitstream index */
+ const Word16 *in, /* i : input vector */
+ const Word16 len, /* i : input vector length */
+ const Word16 GR_ord /* i : GR order */
);
void stereo_dft_hybrid_ITD_flag_fx(
- STEREO_DFT_CONFIG_DATA_HANDLE hConfig, /* o : DFT stereo configuration */
- const Word32 input_Fs, /* i : CPE element sampling rate */
- const Word16 hybrid_itd_max /* i : flag for hybrid ITD for very large ITDs */
+ STEREO_DFT_CONFIG_DATA_HANDLE hConfig, /* o : DFT stereo configuration */
+ const Word32 input_Fs, /* i : CPE element sampling rate */
+ const Word16 hybrid_itd_max /* i : flag for hybrid ITD for very large ITDs */
);
void rc_uni_dec_init_fx(
- RangeUniDecState *rc_st_dec, /* i/o: RC state handle */
- UWord16 *bit_buffer, /* i : Bit buffer */
- const Word16 max_available_bits /* i : Total maximum bits available */
+ RangeUniDecState *rc_st_dec, /* i/o: RC state handle */
+ UWord16 *bit_buffer, /* i : Bit buffer */
+ const Word16 max_available_bits /* i : Total maximum bits available */
);
UWord16 rc_uni_dec_read_symbol_fastS_fx(
- RangeUniDecState *rc_st_dec, /* i/o: Decoder State */
- const UWord16 cum_freq_table[], /* i : Cumulative frequency up to symbol */
- const UWord16 sym_freq_table[], /* i : Symbol frequency */
- const UWord16 alphabet_size, /* i : Number of symbols in the alphabet */
- const UWord16 tot_shift /* i : Total frequency as a power of 2 */
+ RangeUniDecState *rc_st_dec, /* i/o: Decoder State */
+ const UWord16 cum_freq_table[], /* i : Cumulative frequency up to symbol */
+ const UWord16 sym_freq_table[], /* i : Symbol frequency */
+ const UWord16 alphabet_size, /* i : Number of symbols in the alphabet */
+ const UWord16 tot_shift /* i : Total frequency as a power of 2 */
);
Word16 rc_uni_dec_virtual_finish_fx(
- RangeUniDecState *rc_st_dec /* i/o: RC state handle */
+ RangeUniDecState *rc_st_dec /* i/o: RC state handle */
);
void unclr_classifier_dft_fx(
- CPE_ENC_HANDLE hCPE /* i/o: CPE encoder structure */
+ CPE_ENC_HANDLE hCPE /* i/o: CPE encoder structure */
);
void xtalk_classifier_dft_fx(
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
- const Word16 itd, /* i : ITD from DFT stereo - used as a feature */
- const Word32 gcc_phat[] /* i : GPHAT cross-channel correlation function Q31*/
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
+ const Word16 itd, /* i : ITD from DFT stereo - used as a feature */
+ const Word32 gcc_phat[] /* i : GPHAT cross-channel correlation function Q31*/
);
void stereo_td_init_enc_fx(
- STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle */
- const Word16 last_element_mode /* i : last element mode */
+ STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle */
+ const Word16 last_element_mode /* i : last element mode */
);
ivas_error stereo_set_tdm_fx(
- CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
- const Word16 input_frame, /* i : input frame length per channel */
- Word16 input_q );
+ CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
+ const Word16 input_frame, /* i : input frame length per channel */
+ Word16 input_q
+);
void stereo_tdm_prep_dwnmx_fx(
- CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
- const Word32 *input1, /* i : right channel input */
- const Word16 input_frame, /* i : frame lenght */
- const Word16 input_q /* i : frame lenght */
+ CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
+ const Word32 *input1, /* i : right channel input */
+ const Word16 input_frame, /* i : frame lenght */
+ const Word16 input_q /* i : frame lenght */
);
void tdm_upmix_plain_fx(
- Word32 Left_fx[], /* o : left channel Qx*/
- Word32 Right_fx[], /* o : right channel Qx*/
- const Word32 PCh_2_L_fx[], /* i : primary channel Qx*/
- const Word32 SCh_2_R_fx[], /* i : secondary channel Qx*/
- const Word32 LR_ratio_fx, /* i : mixing ratio Q31*/
- const Word32 inv_den_LR_ratio_fx, /* i : inverse mixing ration Q31*/
- const Word16 start_index, /* i : start index Q0*/
- const Word16 end_index, /* i : end index Q0*/
- const Word16 plus_minus_flag /* i : plus/minus flag Q0*/
+ Word32 Left_fx[], /* o : left channel Qx*/
+ Word32 Right_fx[], /* o : right channel Qx*/
+ const Word32 PCh_2_L_fx[], /* i : primary channel Qx*/
+ const Word32 SCh_2_R_fx[], /* i : secondary channel Qx*/
+ const Word32 LR_ratio_fx, /* i : mixing ratio Q31*/
+ const Word32 inv_den_LR_ratio_fx, /* i : inverse mixing ration Q31*/
+ const Word16 start_index, /* i : start index Q0*/
+ const Word16 end_index, /* i : end index Q0*/
+ const Word16 plus_minus_flag /* i : plus/minus flag Q0*/
);
void stereo_tdm_combine_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 *PCh_2_L_fx, /* i/o: Primary channel -> output as left channel Qx*/
- Word32 *SCh_2_R_fx, /* i/o: Secondary channel -> output as right channel Qx*/
- const Word16 output_frame, /* i : Number of samples Q0*/
- const Word16 flag_HB, /* i : flag to distinguish between core (0) and HB (1) synthesis Q0*/
- const Word16 tdm_ratio_idx /* i : TDM ratio index Q0*/
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 *PCh_2_L_fx, /* i/o: Primary channel -> output as left channel Qx*/
+ Word32 *SCh_2_R_fx, /* i/o: Secondary channel -> output as right channel Qx*/
+ const Word16 output_frame, /* i : Number of samples Q0*/
+ const Word16 flag_HB, /* i : flag to distinguish between core (0) and HB (1) synthesis Q0*/
+ const Word16 tdm_ratio_idx /* i : TDM ratio index Q0*/
);
Word16 tdm_lp_comparison_fx(
- STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle */
- STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure */
- Encoder_State *st, /* i/o: Encoder structure */
- Word32 *speech_buff, /* i : Current speech frame Q_speech */
- const Word16 *A_PCh_fx, /* i : primary channel LP coefficients Q12*/
- const Word16 *A_SCh_fx, /* i : secondary channel LP coeff. Q12*/
- const Word16 m, /* i : filter length */
- const Word16 *isp_PCh_fx, /* i : primary channel LSPs Q15 */
- const Word16 *isp_SCh_fx, /* i : secondary channel LSPs Q15 */
- const Word16 L_frame, /* i : frame length */
- const Word32 element_brate_wo_meta, /* i : element bitrate without metadata*/
- Word16 Q_speech );
+ STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle */
+ STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure */
+ Encoder_State *st, /* i/o: Encoder structure */
+ Word32 *speech_buff, /* i : Current speech frame Q_speech */
+ const Word16 *A_PCh_fx, /* i : primary channel LP coefficients Q12*/
+ const Word16 *A_SCh_fx, /* i : secondary channel LP coeff. Q12*/
+ const Word16 m, /* i : filter length */
+ const Word16 *isp_PCh_fx, /* i : primary channel LSPs Q15 */
+ const Word16 *isp_SCh_fx, /* i : secondary channel LSPs Q15 */
+ const Word16 L_frame, /* i : frame length */
+ const Word32 element_brate_wo_meta, /* i : element bitrate without metadata */
+ Word16 Q_speech
+);
ivas_error signaling_enc_secondary_fx(
- Encoder_State *st, /* i/o: Encoder structure */
- const Word16 tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag OR LRTD primary channel */
- const Word16 tdm_Pitch_reuse_flag /* i : primary channel pitch reuse flag*/
+ Encoder_State *st, /* i/o: Encoder structure */
+ const Word16 tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag OR LRTD primary channel */
+ const Word16 tdm_Pitch_reuse_flag /* i : primary channel pitch reuse flag */
);
void tdm_low_rate_enc(
- Encoder_State *st, /* i/o: State structure */
- const Word16 Aq[], /* i : 12k8 Lp coefficient */
- const Word16 *res,
- /* i : residual signal */ // Q_new
- Word16 *synth,
- /* i/o: core synthesis */ // Q_new
- Word16 *exc_fx,
- /* i/o: current non-enhanced excitation */ // Q_new
- Word16 *pitch_buf,
- /* i/o: floating pitch values for each subframe */ // Q6
- Word16 *voice_factors,
- /* o : voicing factors */ // Q15
- Word16 *bwe_exc_fx,
- /* o : excitation for SWB TBE */ // Q_new
- const Word16 attack_flag, /* i : attck flag */
- const Word16 *lsf_new,
- /* i : current frame ISF vector */ // x2.56
- Word16 *tmp_noise,
- /* o : long-term noise energy */ // Q8
- Word16 Q_new );
+ Encoder_State *st, /* i/o: State structure */
+ const Word16 Aq[], /* i : 12k8 Lp coefficient */
+ const Word16 *res, /* i : residual signal Q_new*/
+ Word16 *synth, /* i/o: core synthesis Q_new*/
+ Word16 *exc_fx, /* i/o: current non-enhanced excitation Q_new*/
+ Word16 *pitch_buf, /* i/o: floating pitch values for each subframe Q6*/
+ Word16 *voice_factors, /* o : voicing factors Q15*/
+ Word16 *bwe_exc_fx, /* o : excitation for SWB TBE Q_new*/
+ const Word16 attack_flag, /* i : attack flag */
+ const Word16 *lsf_new, /* i : current frame ISF vector x2.56 */
+ Word16 *tmp_noise, /* o : long-term noise energy Q8 */
+ Word16 Q_new
+);
void tdm_low_rate_dec_fx(
- Decoder_State *st, /* i/o: decoder static memory */
- Word16 dct_epit[], /* o : GSC excitation in DCT domain Q_exc*/
- Word16 *pitch_buf, /* o : Word16 pitch values for each subframe Q6*/
- Word16 *voice_factors, /* o : voicing factors Q15*/
- Word16 *exc, /* i/o: adapt. excitation exc Q_exc*/
- Word16 *exc2, /* i/o: adapt. excitation/total exc Q_exc*/
- Word16 *bwe_exc, /* o : excitation for SWB TBE Q_exc*/
- const Word16 *lsf_new /* i : ISFs at the end of the frame Q8/100 (2.56x)*/
+ Decoder_State *st, /* i/o: decoder static memory */
+ Word16 dct_epit[], /* o : GSC excitation in DCT domain Q_exc*/
+ Word16 *pitch_buf, /* o : Word16 pitch values for each subframe Q6*/
+ Word16 *voice_factors, /* o : voicing factors Q15*/
+ Word16 *exc, /* i/o: adapt. excitation exc Q_exc*/
+ Word16 *exc2, /* i/o: adapt. excitation/total exc Q_exc*/
+ Word16 *bwe_exc, /* o : excitation for SWB TBE Q_exc*/
+ const Word16 *lsf_new /* i : ISFs at the end of the frame Q8/100 (2.56x)*/
+);
+
+void tdm_SCh_LSF_intra_pred_fx(
+ const Word32 element_brate, /* i : element bitrate */
+ const Word16 *tdm_lsfQ_PCh_fx, /* i : primary channel LSFs */
+ Word16 *pred_lsf_SCh_fx /* o : predicted secondary channel LSFs */
);
void tdm_SCh_LSF_intra_pred_fx(
- const Word32 element_brate, /* i : element bitrate */
- const Word16 *tdm_lsfQ_PCh_fx, /* i : primary channel LSFs */
- Word16 *pred_lsf_SCh_fx /* o : predicted secondary channel LSFs */
+ const Word32 element_brate, /* i : element bitrate */
+ const Word16 *tdm_lsfQ_PCh_fx, /* i : primary channel LSFs */
+ Word16 *pred_lsf_SCh_fx /* o : predicted secondary channel LSFs */
);
void tdm_SCh_lsf_reuse_fx(
- const Word16 enc_dec, /* i : encoder/decoder flag */
- const Word32 element_brate, /* i : element bitrate */
- Word16 lsf_new_fx[M], /* i/o: LSFs at the end of the frame */
- Word16 lsp_new_fx[M], /* i/o: LSPs at the end of the frame */
- const Word16 tdm_lsfQ_PCh_fx[M], /* i : primary channel LSFs */
- const Word16 lsf_wgts_fx[M], /* i : LSF weights */
- Word16 *beta_index /* i/o: quantization index */
+ const Word16 enc_dec, /* i : encoder/decoder flag */
+ const Word32 element_brate, /* i : element bitrate */
+ Word16 lsf_new_fx[M], /* i/o: LSFs at the end of the frame */
+ Word16 lsp_new_fx[M], /* i/o: LSPs at the end of the frame */
+ const Word16 tdm_lsfQ_PCh_fx[M], /* i : primary channel LSFs */
+ const Word16 lsf_wgts_fx[M], /* i : LSF weights */
+ Word16 *beta_index /* i/o: quantization index */
);
void EstimateStereoTCXNoiseLevel_fx(
- Encoder_State **sts, /* i : state handle */
- Word32 *q_spectrum[CPE_CHANNELS][NB_DIV], /* i : quantized MDCT spectrum */
- Word16 gain_tcx[][NB_DIV], /* i : global gain */
- Word16 gain_tcx_e[][NB_DIV], /* i : global gain exponent */
- Word16 L_frame[][NB_DIV], /* i : frame length */
- Word16 noiseFillingBorder[][NB_DIV], /* i : noise filling border */
- Word16 hm_active[][NB_DIV], /* i : flag indicating if the harmonic model is active */
- const Word16 ignore_chan[], /* i : flag indicating whether the channel should be ignored */
- Word16 fac_ns[][NB_DIV], /* o : noise filling level */
- Word16 param_core[][NB_DIV * NPRM_DIV], /* o : quantized noise filling level */
- const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0) */
+ Encoder_State **sts, /* i : state handle */
+ Word32 *q_spectrum[CPE_CHANNELS][NB_DIV], /* i : quantized MDCT spectrum */
+ Word16 gain_tcx[][NB_DIV], /* i : global gain */
+ Word16 gain_tcx_e[][NB_DIV], /* i : global gain exponent */
+ Word16 L_frame[][NB_DIV], /* i : frame length */
+ Word16 noiseFillingBorder[][NB_DIV], /* i : noise filling border */
+ Word16 hm_active[][NB_DIV], /* i : flag indicating if the harmonic model is active */
+ const Word16 ignore_chan[], /* i : flag indicating whether the channel should be ignored */
+ Word16 fac_ns[][NB_DIV], /* o : noise filling level */
+ Word16 param_core[][NB_DIV * NPRM_DIV], /* o : quantized noise filling level */
+ const Word16 MCT_flag /* i : hMCT handle allocated (1) or not (0) */
);
void TNSAnalysisStereo_fx(
- Encoder_State **sts, /* i : encoder state handle */
- Word32 *mdst_spectrum_fx[CPE_CHANNELS][NB_DIV], /* o : MDST spectrum Qx*/
- const Word16 bWhitenedDomain, /* i : whitened domain flag Q0*/
- Word16 tnsSize[CPE_CHANNELS][NB_DIV], /* i : number of tns parameters put into prm Q0*/
- Word16 tnsBits[CPE_CHANNELS][NB_DIV], /* i : number of tns bits in the frame Q0*/
- Word16 param_core[][NB_DIV * NPRM_DIV], /* o : TNS parameters Q0*/
- const Word16 mct_on /* i : flag mct block (1) or stereo (0) Q0*/
+ Encoder_State **sts, /* i : encoder state handle */
+ Word32 *mdst_spectrum_fx[CPE_CHANNELS][NB_DIV], /* o : MDST spectrum Qx*/
+ const Word16 bWhitenedDomain, /* i : whitened domain flag Q0*/
+ Word16 tnsSize[CPE_CHANNELS][NB_DIV], /* i : number of tns parameters put into prm Q0*/
+ Word16 tnsBits[CPE_CHANNELS][NB_DIV], /* i : number of tns bits in the frame Q0*/
+ Word16 param_core[][NB_DIV * NPRM_DIV], /* o : TNS parameters Q0*/
+ const Word16 mct_on /* i : flag mct block (1) or stereo (0) Q0*/
);
void init_tcx_enc_info_fx(
- Encoder_State *st, /* i/o: coder memory state */
+ Encoder_State *st, /* i/o: coder memory state */
Word16 *L_frame,
Word16 *L_frameTCX,
- Word16 *L_spec );
+ Word16 *L_spec
+);
void SetCurrentPsychParams(
const Word16 core,
const Word16 last_frame_was_concealed_cng,
- TCX_CONFIG_HANDLE hTcxCfg );
+ TCX_CONFIG_HANDLE hTcxCfg
+);
void sns_avq_cod_fx(
- const Word32 *sns_fx, /* i : Input sns vectors */
+ const Word32 *sns_fx, /* i : Input sns vectors */
Word16 exp_sns,
- const Word32 *snsmid_fx, /* i : Input mid-sns vectors */
+ const Word32 *snsmid_fx, /* i : Input mid-sns vectors */
Word16 exp_snsmid,
- Word32 *sns_q_fx, /* o : Quantized LFS vectors Q16 */
- Word32 *snsmid_q_fx, /* o : Quantized mid-LFS vectors Q16 */
- Word16 *index, /* o : Quantization indices */
- const Word16 core, /* i : core */
+ Word32 *sns_q_fx, /* o : Quantized LFS vectors Q16 */
+ Word32 *snsmid_q_fx, /* o : Quantized mid-LFS vectors Q16 */
+ Word16 *index, /* o : Quantization indices */
+ const Word16 core, /* i : core */
const Word16 L_frame,
- const Word16 low_brate_mode /* i : flag low bit operating mode */
+ const Word16 low_brate_mode /* i : flag low bit operating mode */
);
void sns_avq_cod_stereo_fx(
- const Word32 *snsl_fx, /* i : Input sns vector (left channel) */
+ const Word32 *snsl_fx, /* i : Input sns vector (left channel) */
Word16 exp_snl,
- const Word32 *snsr_fx, /* i : Input sns vector (right channel) */
+ const Word32 *snsr_fx, /* i : Input sns vector (right channel) */
Word16 exp_snr,
const Word16 L_frame,
- Word32 *snsl_q_fx, /* o : Quantized sns vector (left channel) Q16 */
- Word32 *snsr_q_fx, /* o : Quantized sns vector (right channel) Q16 */
- Word16 *indexl, /* o : Quantization indices (left channel) */
- Word16 *indexr /* o : Quantization indices (right channel) */
+ Word32 *snsl_q_fx, /* o : Quantized sns vector (left channel) Q16 */
+ Word32 *snsr_q_fx, /* o : Quantized sns vector (right channel) Q16 */
+ Word16 *indexl, /* o : Quantization indices (left channel) */
+ Word16 *indexr /* o : Quantization indices (right channel) */
);
ivas_error initMdctStereoDtxData_fx(
@@ -4715,297 +4720,259 @@ ivas_error initMdctStereoDtxData_fx(
);
void applyDmxMdctStereo_fx(
- const CPE_DEC_HANDLE hCPE, /* i : CPE handle */
- Word32 *output_fx[CPE_CHANNELS], /* o : output from core decoder q_out*/
- const Word16 output_frame /* i : output frame length Q0*/
+ const CPE_DEC_HANDLE hCPE, /* i : CPE handle */
+ Word32 *output_fx[CPE_CHANNELS], /* o : output from core decoder q_out*/
+ const Word16 output_frame /* i : output frame length Q0*/
);
ivas_error front_vad_create_fx(
- FRONT_VAD_ENC_HANDLE *hFrontVad, /* i/o: front-VAD handle */
- const ENCODER_CONFIG_HANDLE hEncoderConfig /* i : configuration structure */
+ FRONT_VAD_ENC_HANDLE *hFrontVad, /* i/o: front-VAD handle */
+ const ENCODER_CONFIG_HANDLE hEncoderConfig /* i : configuration structure */
);
void front_vad_destroy_fx(
- FRONT_VAD_ENC_HANDLE *hFrontVad /* i/o: front-VAD handle */
+ FRONT_VAD_ENC_HANDLE *hFrontVad /* i/o: front-VAD handle */
);
ivas_error front_vad_fx(
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure, nullable */
- Encoder_State *st, /* i/o: encoder state structure */
- const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
- FRONT_VAD_ENC_HANDLE *hFrontVads, /* i/o: FrontVad handles */
- const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
- const Word16 input_frame, /* i : frame length */
- Word16 vad_flag_dtx[], /* o : HE-SAD flag with additional DTX HO */
- Word32 fr_bands_fx[][2 * NB_BANDS], /* o : energy in frequency bands q_fr_bands_fx */
- Word16 q_fr_bands[], /* o : Q of fr_bands_fx Q0 */
- Word16 Etot_LR_fx[], /* o : total energy Left & Right channel Q8 */
- Word32 lf_E_fx[][2 * VOIC_BINS], /* i : per bin spectrum energy in lf, LR channels q_lf_E */
- Word16 q_lf_E[], /* o : Q of lf_E_fx */
- Word16 localVAD_HE_SAD[], /* o : HE-SAD flag without hangover, LR channels */
- Word16 vad_hover_flag[], /* o : VAD hangover flag */
- Word32 band_energies_LR_fx[2 * NB_BANDS], /* o : energy in critical bands without minimum noise floor E_MIN q_band_energies_LR */
- Word16 *q_band_energies_LR, /* o : Q of band_energies_LR_fx */
- Word32 *PS_out_fx, /* o : energy spectrum q_PS_out */
- Word16 *q_PS_out, /* o : Q of PS_out_fx Q0 */
- Word16 *Bin_E_out_fx, /* o : log-energy spectrum of the current frame Q7 */
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure, nullable */
+ Encoder_State *st, /* i/o: encoder state structure */
+ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
+ FRONT_VAD_ENC_HANDLE *hFrontVads, /* i/o: FrontVad handles */
+ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) */
+ const Word16 input_frame, /* i : frame length */
+ Word16 vad_flag_dtx[], /* o : HE-SAD flag with additional DTX HO */
+ Word32 fr_bands_fx[][2 * NB_BANDS], /* o : energy in frequency bands q_fr_bands_fx */
+ Word16 q_fr_bands[], /* o : Q of fr_bands_fx Q0 */
+ Word16 Etot_LR_fx[], /* o : total energy Left & Right channel Q8 */
+ Word32 lf_E_fx[][2 * VOIC_BINS], /* i : per bin spectrum energy in lf, LR channels q_lf_E */
+ Word16 q_lf_E[], /* o : Q of lf_E_fx */
+ Word16 localVAD_HE_SAD[], /* o : HE-SAD flag without hangover, LR channels */
+ Word16 vad_hover_flag[], /* o : VAD hangover flag */
+ Word32 band_energies_LR_fx[2 * NB_BANDS], /* o : energy in critical bands without minimum noise floor E_MIN q_band_energies_LR */
+ Word16 *q_band_energies_LR, /* o : Q of band_energies_LR_fx */
+ Word32 *PS_out_fx, /* o : energy spectrum q_PS_out */
+ Word16 *q_PS_out, /* o : Q of PS_out_fx Q0 */
+ Word16 *Bin_E_out_fx, /* o : log-energy spectrum of the current frame Q7 */
Word16 Q_inp,
Word16 *Q_buffer,
Word16 Q_add,
- Word16 *front_create_flag );
-
-void stereo_cna_update_params_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 *output_fx[CPE_CHANNELS], /* i : Output signal OUTPUT_Q*/
- const Word16 output_frame, /* i : Output frame length Q0*/
- const Word16 tdm_ratio_idx /* i : TDM ratio index Q0*/
+ Word16 *front_create_flag
);
-void mvr2r_inc_fixed_one(
- const Word32 x_fx[], /* i : input vector */
- const Word16 x_inc, /* i : increment for vector x[] */
- Word32 y_fx[], /* o : output vector */
- const Word16 y_inc, /* i : increment for vector y[] */
- const Word16 n /* i : vector size */
+void stereo_cna_update_params_fx(
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 *output_fx[CPE_CHANNELS], /* i : Output signal OUTPUT_Q*/
+ const Word16 output_frame, /* i : Output frame length Q0*/
+ const Word16 tdm_ratio_idx /* i : TDM ratio index Q0*/
);
-void mvr2r_inc_fixed(
- const Word32 x_fx[], /* i : input vector */
- const Word16 x_inc, /* i : increment for vector x[] */
- Word32 y_fx[], /* o : output vector */
- const Word16 y_inc, /* i : increment for vector y[] */
- const Word16 n /* i : vector size */
-);
-
-void v_mult_inc_fx(
- const Word32 x1_fx[], /* i : Input vector 1 */
- Word16 *x1_q_fx,
- const Word16 x1_inc, /* i : Increment for input vector 1 */
- const Word32 x2_fx[], /* i : Input vector 2 */
- Word16 *x2_q_fx,
- const Word16 x2_inc, /* i : Increment for input vector 1 */
- Word32 y_fx[], /* o : Output vector that contains vector 1 .* vector 2 */
- Word16 *y_q_fx,
- const Word16 y_inc, /* i : increment for vector y[i] */
- const Word16 N /* i : Vector length */
+void mvr2r_inc_fx(
+ const Word32 x_fx[], /* i : input vector */
+ const Word16 x_inc, /* i : increment for vector x[] */
+ Word32 y_fx[], /* o : output vector */
+ const Word16 y_inc, /* i : increment for vector y[] */
+ const Word16 n /* i : vector size */
);
void v_add_inc_fx(
- const Word32 x1[], /* i : Input vector 1 */
- const Word16 x_inc, /* i : Increment for input vector 1 */
- const Word32 x2[], /* i : Input vector 2 */
- const Word16 x2_inc, /* i : Increment for input vector 2 */
- Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */
- const Word16 y_inc, /* i : increment for vector y[] */
- const Word16 N /* i : Vector length */
+ const Word32 x1[], /* i : Input vector 1 */
+ const Word16 x_inc, /* i : Increment for input vector 1 */
+ const Word32 x2[], /* i : Input vector 2 */
+ const Word16 x2_inc, /* i : Increment for input vector 2 */
+ Word32 y[], /* o : Output vector containing vector 1 + vector 2*/
+ const Word16 y_inc, /* i : increment for vector y[] */
+ const Word16 N /* i : Vector length */
);
+
Word32 logsumexp_fx(
- const Word32 x[], /* i : input array x */
+ const Word32 x[], /* i : input array x */
const Word16 x_e,
- const Word16 N /* i : number of elements in array x */
+ const Word16 N /* i : number of elements in array x */
);
+
Word32 lin_interp32_fx(
- const Word32 x, /* i : the value to be mapped */
- const Word32 x1, /* i : source range interval: low end */
- const Word32 y1, /* i : source range interval: high end */
- const Word32 x2, /* i : target range interval: low */
- const Word32 y2, /* i : target range interval: high */
- const Word16 flag_sat /* i : flag to indicate whether to apply saturation */
+ const Word32 x, /* i : the value to be mapped */
+ const Word32 x1, /* i : source range interval: low end */
+ const Word32 y1, /* i : source range interval: high end */
+ const Word32 x2, /* i : target range interval: low */
+ const Word32 y2, /* i : target range interval: high */
+ const Word16 flag_sat /* i : flag to indicate whether to apply saturation */
);
void v_addc_fx(
- const Word32 x_fx[], /* i : Input vector */
- const Word32 c_fx, /* i : Constant */
- Word32 y_fx[], /* o : Output vector that contains c*x */
- const Word16 N /* i : Vector length */
-);
-
-void v_addc_fixed(
- const Word32 x[], /* i : Input vector */
- const Word32 c, /* i : Constant */
- Word32 y[], /* o : Output vector that contains c*x */
- const Word16 N /* i : Vector length */
+ const Word32 x_fx[], /* i : Input vector */
+ const Word32 c_fx, /* i : Constant */
+ Word32 y_fx[], /* o : Output vector that contains c*x */
+ const Word16 N /* i : Vector length */
);
void v_min_fx(
- const Word32 x1_fx[], /* i : Input vector 1 */
+ const Word32 x1_fx[], /* i : Input vector 1 */
Word16 *x1_q_fx,
- const Word32 x2_fx[], /* i : Input vector 2 */
+ const Word32 x2_fx[], /* i : Input vector 2 */
Word16 *x2_q_fx,
- Word32 y_fx[], /* o : Output vector that contains vector 1 .* vector 2 */
+ Word32 y_fx[], /* o : Output vector that contains vector 1 .* vector 2 */
Word16 *y_q_fx,
- const Word16 N /* i : Vector length */
+ const Word16 N /* i : Vector length */
);
-void v_mult_inc_fixed(
- const Word32 x1_fx[], /* i : Input vector 1 */
- const Word16 x1_inc, /* i : Increment for input vector 1 */
- const Word32 x2_fx[], /* i : Input vector 2 */
- const Word16 x2_inc, /* i : Increment for input vector 1 */
- Word32 y_fx[], /* o : Output vector that contains vector 1 .* vector 2 */
- const Word16 y_inc, /* i : increment for vector y[i] */
- const Word16 N /* i : Vector length */
+void v_mult_inc_fx(
+ const Word32 x1_fx[], /* i : Input vector 1 */
+ const Word16 x1_inc, /* i : Increment for input vector 1 */
+ const Word32 x2_fx[], /* i : Input vector 2 */
+ const Word16 x2_inc, /* i : Increment for input vector 1 */
+ Word32 y_fx[], /* o : Output vector that contains vector 1 .* vector 2 */
+ const Word16 y_inc, /* i : increment for vector y[i] */
+ const Word16 N /* i : Vector length */
);
void v_sqrt_fx(
- const Word32 x[], /* i : Input vector */
+ const Word32 x[], /* i : Input vector */
Word16 exp[],
- Word32 y[], /* o : Output vector that contains sqrt(x) */
- const Word16 N /* i : Vector length */
+ Word32 y[], /* o : Output vector that contains sqrt(x) */
+ const Word16 N /* i : Vector length */
);
Word32 sumAbs_fx(
- const Word32 *vec, /* i : input vector */
- const Word16 lvec /* i : length of input vector */
+ const Word32 *vec, /* i : input vector */
+ const Word16 lvec /* i : length of input vector */
);
-Word32 dot_product_cholesky_fx(
- const Word32 *x, /* i : vector x */
- const Word32 *A, /* i : Cholesky matrix A */
- const Word16 N /* i : vector & matrix size */
-);
-
-Word64 dot_product_cholesky_fixed(
- const Word32 *x, /* i : vector x */
- const Word32 *A, /* i : Cholesky matrix A */
- const Word16 N /* i : vector & matrix size */
+Word64 dot_product_cholesky_fx(
+ const Word32 *x, /* i : vector x */
+ const Word32 *A, /* i : Cholesky matrix A */
+ const Word16 N /* i : vector & matrix size */
);
void v_mult_mat_fx(
- Word32 *y_fx, /* o : the product x*A */
- Word16 *y_q_fx,
- const Word32 *x_fx, /* i : vector x */
- Word16 *x_q_fx,
- const Word32 *A_fx, /* i : matrix A */
- Word16 *A_q_fx,
- const Word16 N, /* i : number of rows */
- const Word16 C /* i : number of columns */
-);
-void v_mult_mat_fixed(
- Word32 *y, /* o : the product x*A */
- const Word32 *x, /* i : vector x */
- const Word32 *A, /* i : matrix A */
- const Word16 Nr, /* i : number of rows */
- const Word16 Nc, /* i : number of columns */
- Word16 guardbits );
+ Word32 *y, /* o : the product x*A */
+ const Word32 *x, /* i : vector x */
+ const Word32 *A, /* i : matrix A */
+ const Word16 Nr, /* i : number of rows */
+ const Word16 Nc, /* i : number of columns */
+ Word16 guardbits
+);
Word32 check_bounds_l(
- const Word32 value, /* i : Input value */
- const Word32 low, /* i : Low limit */
- const Word32 high /* i : High limit */
+ const Word32 value, /* i : Input value */
+ const Word32 low, /* i : Low limit */
+ const Word32 high /* i : High limit */
);
Word16 check_bounds_s_fx(
- const Word16 value, /* i : Input value */
- const Word16 low, /* i : Low limit */
- const Word16 high /* i : High limit */
+ const Word16 value, /* i : Input value */
+ const Word16 low, /* i : Low limit */
+ const Word16 high /* i : High limit */
);
ivas_error stereo_memory_enc_fx(
- CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
- const Word32 input_Fs, /* i : input sampling rate */
- const Word16 max_bwidth, /* i : maximum audio bandwidth */
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- const Word16 nchan_transport /* i : number transport chans */
+ CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
+ const Word32 input_Fs, /* i : input sampling rate */
+ const Word16 max_bwidth, /* i : maximum audio bandwidth */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+ const Word16 nchan_transport /* i : number transport chans */
);
void stereo_switching_enc_fx(
- CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
- Word32 old_input_signal_pri[], /* i : old input signal of primary channel */
- const Word16 input_frame, /* i : input frame length */
- const Word16 q_inp );
-
+ CPE_ENC_HANDLE hCPE, /* i : CPE encoder structure */
+ Word32 old_input_signal_pri[], /* i : old input signal of primary channel */
+ const Word16 input_frame, /* i : input frame length */
+ const Word16 q_inp
+);
void stereo_td2dft_update_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- const Word16 n, /* i : channel number Q0*/
- Word32 output_fx[], /* i/o: synthesis @internal Fs Q11*/
- Word32 synth_fx[], /* i/o: synthesis @output Fs Q11*/
- Word32 hb_synth_fx[], /* i/o: hb synthesis Q11*/
- const Word16 output_frame /* i : frame length Q0*/
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ const Word16 n, /* i : channel number Q0*/
+ Word32 output_fx[], /* i/o: synthesis @internal Fs Q11*/
+ Word32 synth_fx[], /* i/o: synthesis @output Fs Q11*/
+ Word32 hb_synth_fx[], /* i/o: hb synthesis Q11*/
+ const Word16 output_frame /* i : frame length Q0*/
);
void stereo_mdct2dft_update_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 output0_fx[], /* i/o: synthesis @internal Fs, ch0 Q11*/
- Word32 synth0_fx[] /* i/o: synthesis @output Fs, ch0 Q11*/
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 output0_fx[], /* i/o: synthesis @internal Fs, ch0 Q11*/
+ Word32 synth0_fx[] /* i/o: synthesis @output Fs, ch0 Q11*/
);
Word16 write_GR0_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle */
- const Word16 ind, /* i : bitstream index */
- const Word16 *in, /* i : data to be encoded */
- const Word16 len /* i : input data length */
+ BSTR_ENC_HANDLE hBstr, /* i/o: Encoder bitstream handle */
+ const Word16 ind, /* i : bitstream index */
+ const Word16 *in, /* i : data to be encoded */
+ const Word16 len /* i : input data length */
);
void ivas_mct_core_dec(
- MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
- CPE_DEC_HANDLE hCPE[MCT_MAX_BLOCKS], /* i/o: CPE decoder structure */
- const Word16 nCPE, /* i : number of CPEs */
+ MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
+ CPE_DEC_HANDLE hCPE[MCT_MAX_BLOCKS], /* i/o: CPE decoder structure */
+ const Word16 nCPE, /* i : number of CPEs */
Word32 *signal_out_fx[],
- Word16 q_x[MCT_MAX_CHANNELS] );
+ Word16 q_x[MCT_MAX_CHANNELS]
+);
void ivas_qmetadata_to_dirac_fx(
- const IVAS_QMETADATA_HANDLE hQMetaData, /* i : frame of MASA q_metadata */
- DIRAC_DEC_HANDLE hDirAC, /* i : DirAC decoder structure */
- MASA_DECODER_HANDLE hMasa, /* i : MASA decoder structure */
- SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i/o: common spatial renderer data handle */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- const Word16 hodirac_flag, /* i : flag to indicate HO-DirAC mode */
- Word16 *dirac_to_spar_md_bands /* o : DirAC->SPAR MD bands */
+ const IVAS_QMETADATA_HANDLE hQMetaData, /* i : frame of MASA q_metadata */
+ DIRAC_DEC_HANDLE hDirAC, /* i : DirAC decoder structure */
+ MASA_DECODER_HANDLE hMasa, /* i : MASA decoder structure */
+ SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i/o: common spatial renderer data handle */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+ const Word16 hodirac_flag, /* i : flag to indicate HO-DirAC mode */
+ Word16 *dirac_to_spar_md_bands /* o : DirAC->SPAR MD bands */
);
Word16 masa_sq_fx(
- const Word32 in, /* i : input value */
- const Word32 *threshold, /* i : partition */
- const Word16 cb_sz /* i : codebook size */
+ const Word32 in, /* i : input value */
+ const Word32 *threshold, /* i : partition */
+ const Word16 cb_sz /* i : codebook size */
);
Word16 quantize_direction2D_fx(
- Word32 phi, /* i : input azimuth value Q22 */
- const Word16 no_cw, /* i : number of bits */
- Word32 *phi_q, /* o : quantized azimuth value Q22 */
- UWord16 *index_phi, /* o : quantized azimuth index */
- const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
+ Word32 phi, /* i : input azimuth value Q22 */
+ const Word16 no_cw, /* i : number of bits */
+ Word32 *phi_q, /* o : quantized azimuth value Q22 */
+ UWord16 *index_phi, /* o : quantized azimuth index */
+ const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
);
Word32 companding_azimuth_fx(
- const Word32 azi_fx, /* i : input azimuth value */
- const MC_LS_SETUP mc_format, /* i : input channel format */
- const Word16 theta_flag, /* i : zero/non zero elevation flag */
- const Word16 direction /* i : direction of companding (direct or inverse)*/
+ const Word32 azi_fx, /* i : input azimuth value */
+ const MC_LS_SETUP mc_format, /* i : input channel format */
+ const Word16 theta_flag, /* i : zero/non zero elevation flag */
+ const Word16 direction /* i : direction of companding (direct or inverse) */
);
Word16 quantize_phi_fx(
- Word32 phi, /* i : azimuth value */
- const Word16 flag_delta, /* i : flag indicating if the azimuth codebook is translated or not */
- Word32 *phi_hat, /* o : quantized azimuth */
- const Word16 n /* i : azimuth codebook size */
+ Word32 phi, /* i : azimuth value */
+ const Word16 flag_delta, /* i : flag indicating if the azimuth codebook is translated or not */
+ Word32 *phi_hat, /* o : quantized azimuth */
+ const Word16 n /* i : azimuth codebook size */
);
Word32 deindex_elevation_fx(
- UWord16 *id_th, /* i : input index */
- const Word16 no_bits, /* i : number of bits for the spherical grid */
- const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
+ UWord16 *id_th, /* i : input index */
+ const Word16 no_bits, /* i : number of bits for the spherical grid */
+ const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
);
Word32 deindex_azimuth_fx(
- Word16 id_phi, /* i : index */
- const Word16 no_bits, /* i : number of bits for the spherical grid */
- const Word16 id_th, /* i : elevation index */
- const Word16 remap, /* i : remapping flag */
- const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
+ Word16 id_phi, /* i : index */
+ const Word16 no_bits, /* i : number of bits for the spherical grid */
+ const Word16 id_th, /* i : elevation index */
+ const Word16 remap, /* i : remapping flag */
+ const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
);
+
void deindex_spherical_component_fx(
- const UWord16 sph_idx, /* i : spherical index */
- Word32 *az_fx, /* o : decoded azimuth value */
- Word32 *el_fx, /* o : decoded elevation value */
- UWord16 *az_idx, /* o : azimuth index */
- UWord16 *el_idx, /* o : elevation index */
- const UWord16 no_bits, /* i : number of bits for the spherical grid */
- const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
+ const UWord16 sph_idx, /* i : spherical index */
+ Word32 *az_fx, /* o : decoded azimuth value */
+ Word32 *el_fx, /* o : decoded elevation value */
+ UWord16 *az_idx, /* o : azimuth index */
+ UWord16 *el_idx, /* o : elevation index */
+ const UWord16 no_bits, /* i : number of bits for the spherical grid */
+ const MC_LS_SETUP mc_format /* i : channel format if in MC-mode */
);
void ivas_dirac_param_est_enc_fx(
@@ -5022,79 +4989,61 @@ void ivas_dirac_param_est_enc_fx(
const Word16 nchan_fb_in,
Word16 *mono_frame_count,
Word16 *dirac_mono_flag,
- const Word16 shift );
+ const Word16 shift
+);
ivas_error ivas_cldfb_dec_reconfig_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 nchan_transport_old, /* i : number of TCs in previous frame */
- Word16 numCldfbAnalyses_old, /* i : number of CLDFB analysis instances in previous frame */
- const Word16 numCldfbSyntheses_old /* i : number of CLDFB synthesis instances in previous frame */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 nchan_transport_old, /* i : number of TCs in previous frame */
+ Word16 numCldfbAnalyses_old, /* i : number of CLDFB analysis instances in previous frame */
+ const Word16 numCldfbSyntheses_old /* i : number of CLDFB synthesis instances in previous frame */
);
ivas_error ivas_sba_enc_reconfigure_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
-);
-/*! r: Ambisonic (SBA) order used for analysis and coding */
-Word16 ivas_sba_get_analysis_order(
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word16 sba_order /* i : Ambisonic (SBA) order */
-);
-
-Word16 ivas_sba_get_nchan_metadata(
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word32 ivas_total_brate /* i : IVAS total bitrate */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
);
-/*! r: flag indicating to code SPAR HOA MD for all bands */
-void ivas_sba_get_spar_hoa_md_flag(
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- Word16 *spar_hoa_md_flag,
- Word16 *spar_hoa_dirac2spar_md_flag );
-
Word16 ivas_sba_remapTCs_fx(
- Word32 *sba_data[], /* i/o: SBA signals */
- Decoder_Struct *st_ivas, /* i/o: decoder struct */
- const Word16 output_frame /* i : frame length */
+ Word32 *sba_data[], /* i/o: SBA signals */
+ Decoder_Struct *st_ivas, /* i/o: decoder struct */
+ const Word16 output_frame /* i : frame length */
);
-void ivas_sba2mc_cldfb_fixed(
- IVAS_OUTPUT_SETUP hInSetup, /* i : Format of input layout */
- Word32 RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb real part (Q_real) */
- Word32 ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb imag part (Q_imag) */
- const Word16 nb_channels_out, /* i : nb of output channels */
- const Word16 nb_bands, /* i : nb of CLDFB bands to process */
- const Word16 nb_timeslots, /* i : number of time slots to process */
- const Word32 *hoa_dec_mtx /* i : HOA decoding mtx */
+void ivas_sba2mc_cldfb_fx(
+ IVAS_OUTPUT_SETUP hInSetup, /* i : Format of input layout */
+ Word32 RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb real part (Q_real) */
+ Word32 ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb imag part (Q_imag) */
+ const Word16 nb_channels_out, /* i : nb of output channels */
+ const Word16 nb_bands, /* i : nb of CLDFB bands to process */
+ const Word16 nb_timeslots, /* i : number of time slots to process */
+ const Word32 *hoa_dec_mtx /* i : HOA decoding mtx */
);
void ivas_dirac_config_bands_fx(
- Word16 *band_grouping, /* o : band grouping */
- const Word16 nbands, /* i : number of bands */
- const Word16 max_band, /* i : maximal band index +1 */
- Word16 *dirac_to_spar_md_bands, /* o : mapping of DirAC parameter band index to SPAR FB band index */
- const Word8 useLowerBandRes, /* i : flag indicating lower band resolution for DirAC */
- const Word16 enc_param_start_band, /* i : band index of first DirAC parameter band */
+ Word16 *band_grouping, /* o : band grouping */
+ const Word16 nbands, /* i : number of bands */
+ const Word16 max_band, /* i : maximal band index +1 */
+ Word16 *dirac_to_spar_md_bands, /* o : mapping of DirAC parameter band index to SPAR FB band index */
+ const Word8 useLowerBandRes, /* i : flag indicating lower band resolution for DirAC */
+ const Word16 enc_param_start_band, /* i : band index of first DirAC parameter band */
IVAS_FB_MIXER_HANDLE hFbMdft,
- const Word8 BandGroupLowRes );
+ const Word8 BandGroupLowRes
+);
void ivas_dirac_dec_close_fx(
- DIRAC_DEC_HANDLE *hDirAC_out );
+ DIRAC_DEC_HANDLE *hDirAC_out
+);
void generate_masking_noise_lb_dirac_fx(
- HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
- Word32 *tdBuffer, /* i/o: time-domain signal, if NULL no LB-CNA */
- const Word16 nCldfbTs, /* i : number of CLDFB slots that will be rendered */
+ HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
+ Word32 *tdBuffer, /* i/o: time-domain signal, if NULL no LB-CNA */
+ const Word16 nCldfbTs, /* i : number of CLDFB slots that will be rendered */
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i : common spatial rendering parameters handle */
- const Word16 cna_flag /* i : CNA flag for LB and HB */
+ const Word16 cna_flag /* i : CNA flag for LB and HB */
);
void ivas_dirac_dec_close_fx(
- DIRAC_DEC_HANDLE *hDirAC_out );
-
-void ivas_dirac_dec_set_md_map(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 nCldfbTs /* i : number of CLDFB time slots */
+ DIRAC_DEC_HANDLE *hDirAC_out
);
void computeDirectionVectors_fx(
@@ -5106,253 +5055,259 @@ void computeDirectionVectors_fx(
Word32 *direction_vector_x,
Word32 *direction_vector_y,
Word32 *direction_vector_z,
- Word16 *q_factor );
+ Word16 *q_factor
+);
-void computeDiffuseness_fixed(
+void computeDiffuseness_fx(
Word32 *buffer_intensity[DIRAC_NUM_DIMS][DIRAC_NO_COL_AVG_DIFF],
const Word32 *buffer_energy,
const Word16 num_freq_bands,
Word32 *diffuseness,
Word16 *q_factor_intensity,
Word16 *q_factor_energy,
- Word16 *q_diffuseness );
+ Word16 *q_diffuseness
+);
void ivas_dirac_dec_get_response_fx(
const Word16 azimuth,
const Word16 elevation,
Word32 *response_fx, /*Q_out*/
const Word16 ambisonics_order,
- Word16 Q_out );
+ Word16 Q_out
+);
/*This is a derivate to ivas_dirac_dec_get_response_fx with fixed Q_out=29*/
void ivas_dirac_dec_get_response_fx_29(
const Word16 azimuth,
const Word16 elevation,
Word32 *response_fx, /*Q_out=29*/
- const Word16 ambisonics_order );
+ const Word16 ambisonics_order
+);
void calculate_hodirac_sector_parameters_fx(
- DIRAC_ENC_HANDLE hDirAC, /* i : DirAC handle */
- Word32 RealBuffer_fx[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i : signal vector (L+1)^2 x N_bins, real part */
- Word32 ImagBuffer_fx[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i : signal vector, imaginary part */
- Word16 Qfac, /* i : Q-factor of signal vector */
- const Word32 beta_fx, /* i : forgetting factor for average filtering, Q30 */
- const Word16 *band_grouping, /* i : indices of band groups */
- const Word16 N_bands, /* i : number of bands (groups) */
- const Word16 enc_param_start_band, /* i : first band to process */
- Word32 *azi_fx, /* o : array of sector azimuth angles, flat Q23 */
- Word32 *ele_fx, /* o : array of sector elevation angles, flat Q23 */
- Word32 *diff_fx, /* o : array of sector diffuseness values, flat */
- Word16 *diff_exp, /* o : array of sector diffuseness exponents, flat */
- Word32 *ene_fx, /* o : array of sector energy values, flat */
- Word16 *ene_exp /* o : array of sector energy exponents, flat */
+ DIRAC_ENC_HANDLE hDirAC, /* i : DirAC handle */
+ Word32 RealBuffer_fx[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i : signal vector (L+1)^2 x N_bins,real part*/
+ Word32 ImagBuffer_fx[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i : signal vector, imaginary part */
+ Word16 Qfac, /* i : Q-factor of signal vector */
+ const Word32 beta_fx, /* i : forgetting factor for average filtering, Q30 */
+ const Word16 *band_grouping, /* i : indices of band groups */
+ const Word16 N_bands, /* i : number of bands (groups) */
+ const Word16 enc_param_start_band, /* i : first band to process */
+ Word32 *azi_fx, /* o : array of sector azimuth angles, flat Q23 */
+ Word32 *ele_fx, /* o : array of sector elevation angles, flat Q23 */
+ Word32 *diff_fx, /* o : array of sector diffuseness values, flat */
+ Word16 *diff_exp, /* o : array of sector diffuseness exponents, flat */
+ Word32 *ene_fx, /* o : array of sector energy values, flat */
+ Word16 *ene_exp /* o : array of sector energy exponents, flat */
);
void ivas_mc_paramupmix_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS Encoder handle */
- BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */
+ Encoder_Struct *st_ivas, /* i/o: IVAS Encoder handle */
+ BSTR_ENC_HANDLE hMetaData, /* i/o: IVAS Metadata bitstream handle */
Word32 *data_fx[],
- const Word16 input_frame /* i : input frame length */
+ const Word16 input_frame /* i : input frame length */
);
-void ivas_mc_paramupmix_dec_render(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
- UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
- UWord16 *nSamplesAvailable, /* o : number of CLDFB slots still to render */
- Word32 *input_fx[], /* i : core-coder transport channels */
- Word32 *output_fx[] /* i/o: synthesized core-coder transport channels */
+void ivas_mc_paramupmix_dec_render_fx(
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
+ UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
+ UWord16 *nSamplesAvailable, /* o : number of CLDFB slots still to render */
+ Word32 *input_fx[], /* i : core-coder transport channels */
+ Word32 *output_fx[] /* i/o: synthesized core-coder transport channels */
);
Word16 ivas_param_mc_getNumTransportChannels_fx(
- const Word32 ivas_total_bitrate, /* i : IVAS total bitrate */
- const MC_LS_SETUP mc_ls_setup /* i : MC ls setup */
+ const Word32 ivas_total_bitrate, /* i : IVAS total bitrate */
+ const MC_LS_SETUP mc_ls_setup /* i : MC ls setup */
);
ivas_error ivas_param_mc_dec_open_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
ivas_error ivas_param_mc_dec_reconfig_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void ivas_param_mc_dec_close_fx(
- PARAM_MC_DEC_HANDLE *hParamMC_out /* i/o: Parametric MC decoder handle */
+ PARAM_MC_DEC_HANDLE *hParamMC_out /* i/o: Parametric MC decoder handle */
);
void ivas_param_mc_dec_digest_tc_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord8 nCldfbSlots, /* i : number of CLFBS slots in the transport channels */
- Word32 *transport_channels_f_fx[],
- Word16 transport_f_e );
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord8 nCldfbSlots, /* i : number of CLFBS slots in the transport channels */
+ Word32 *p_data_fx[], /* i/o: synthesized core-coder transport channels/DirAC output */
+ const Word16 q_data /* i : Q-factor of input signal for single channel */
+);
-#ifdef OBJ_EDITING_API
void ivas_param_mc_dec_prepare_renderer(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord8 nCldfbSlots /* i : number of CLFBS slots in the transport channels */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord8 nCldfbSlots /* i : number of CLFBS slots in the transport channels */
);
-#endif
void ivas_param_mc_dec_render_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
- UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
- UWord16 *nSamplesAvailable, /* o : number of CLDFB slots still to render */
- Word32 *output_f_fx[], /* o : rendered time signal */
- Word16 channel_active_fx[MAX_OUTPUT_CHANNELS] );
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
+ UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
+ UWord16 *nSamplesAvailable, /* o : number of CLDFB slots still to render */
+ Word32 *output_fx[], /* o : rendered time signal */
+ Word16 channel_active_fx[MAX_OUTPUT_CHANNELS]
+);
Word16 matrix_product_mant_exp_fx(
- const Word32 *X_fx, /* i : left hand matrix */
- const Word16 X_fx_e, /* i : left hand matrix */
- const Word16 rowsX, /* i : number of rows of the left hand matrix */
- const Word16 colsX, /* i : number of columns of the left hand matrix */
- const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
- const Word32 *Y_fx, /* i : right hand matrix */
- const Word16 Y_fx_e, /* i : right hand matrix */
- const Word16 rowsY, /* i : number of rows of the right hand matrix */
- const Word16 colsY, /* i : number of columns of the right hand matrix */
- const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
- Word32 *Z_fx, /* o : resulting matrix after the matrix multiplication */
- Word16 *Z_fx_e /* o : resulting matrix after the matrix multiplication */
+ const Word32 *X_fx, /* i : left hand matrix */
+ const Word16 X_fx_e, /* i : left hand matrix */
+ const Word16 rowsX, /* i : number of rows of the left hand matrix */
+ const Word16 colsX, /* i : number of columns of the left hand matrix */
+ const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
+ const Word32 *Y_fx, /* i : right hand matrix */
+ const Word16 Y_fx_e, /* i : right hand matrix */
+ const Word16 rowsY, /* i : number of rows of the right hand matrix */
+ const Word16 colsY, /* i : number of columns of the right hand matrix */
+ const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
+ Word32 *Z_fx, /* o : resulting matrix after the matrix multiplication */
+ Word16 *Z_fx_e /* o : resulting matrix after the matrix multiplication */
);
Word16 matrix_product_fx(
- const Word32 *X_fx, /* i : left hand matrix */
- const Word16 rowsX, /* i : number of rows of the left hand matrix */
- const Word16 colsX, /* i : number of columns of the left hand matrix */
- const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
- const Word32 *Y_fx, /* i : right hand matrix */
- const Word16 rowsY, /* i : number of rows of the right hand matrix */
- const Word16 colsY, /* i : number of columns of the right hand matrix */
- const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
- Word32 *Z_fx /* o : resulting matrix after the matrix multiplication */
+ const Word32 *X_fx, /* i : left hand matrix */
+ const Word16 rowsX, /* i : number of rows of the left hand matrix */
+ const Word16 colsX, /* i : number of columns of the left hand matrix */
+ const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
+ const Word32 *Y_fx, /* i : right hand matrix */
+ const Word16 rowsY, /* i : number of rows of the right hand matrix */
+ const Word16 colsY, /* i : number of columns of the right hand matrix */
+ const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
+ Word32 *Z_fx /* o : resulting matrix after the matrix multiplication */
);
Word16 matrix_product_q30_fx(
- const Word32 *X_fx, /* i : left hand matrix */
- const Word16 rowsX, /* i : number of rows of the left hand matrix */
- const Word16 colsX, /* i : number of columns of the left hand matrix */
- const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
- const Word32 *Y_fx, /* i : right hand matrix */
- const Word16 rowsY, /* i : number of rows of the right hand matrix */
- const Word16 colsY, /* i : number of columns of the right hand matrix */
- const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
- Word32 *Z_fx /* o : resulting matrix after the matrix multiplication */
+ const Word32 *X_fx, /* i : left hand matrix */
+ const Word16 rowsX, /* i : number of rows of the left hand matrix */
+ const Word16 colsX, /* i : number of columns of the left hand matrix */
+ const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
+ const Word32 *Y_fx, /* i : right hand matrix */
+ const Word16 rowsY, /* i : number of rows of the right hand matrix */
+ const Word16 colsY, /* i : number of columns of the right hand matrix */
+ const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
+ Word32 *Z_fx /* o : resulting matrix after the matrix multiplication */
);
Word16 matrix_product_mant_exp(
- const Word32 *X_fx, /* i : left hand matrix */
- const Word16 *X_e, /* i : left hand matrix */
- const Word16 rowsX, /* i : number of rows of the left hand matrix */
- const Word16 colsX, /* i : number of columns of the left hand matrix */
- const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
- const Word32 *Y_fx, /* i : right hand matrix */
- const Word16 *Y_e, /* i : right hand matrix */
- const Word16 rowsY, /* i : number of rows of the right hand matrix */
- const Word16 colsY, /* i : number of columns of the right hand matrix */
- const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
- Word32 *Z_fx, /* o : resulting matrix after the matrix multiplication */
- Word16 *Z_e /* o : resulting matrix after the matrix multiplication */
+ const Word32 *X_fx, /* i : left hand matrix */
+ const Word16 *X_e, /* i : left hand matrix */
+ const Word16 rowsX, /* i : number of rows of the left hand matrix */
+ const Word16 colsX, /* i : number of columns of the left hand matrix */
+ const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication */
+ const Word32 *Y_fx, /* i : right hand matrix */
+ const Word16 *Y_e, /* i : right hand matrix */
+ const Word16 rowsY, /* i : number of rows of the right hand matrix */
+ const Word16 colsY, /* i : number of columns of the right hand matrix */
+ const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication */
+ Word32 *Z_fx, /* o : resulting matrix after the matrix multiplication */
+ Word16 *Z_e /* o : resulting matrix after the matrix multiplication */
);
void mat2svdMat_fx(
- const Word32 *mat, /* i : matrix as column ordered vector Qx*/
- Word32 svdMat[MAX_OUTPUT_CHANNELS][MAX_OUTPUT_CHANNELS], /* o : matrix as two-dimensional arry Qx*/
- const Word16 nRows, /* i : number of rows of the matrix Q0*/
- const Word16 mCols, /* i : number of columns of the matrix Q0*/
- const Word16 transpose /* i : flag indication transposition Q0*/
+ const Word32 *mat, /* i : matrix as column ordered vector Qx*/
+ Word32 svdMat[MAX_OUTPUT_CHANNELS][MAX_OUTPUT_CHANNELS], /* o : matrix as two-dimensional arry Qx*/
+ const Word16 nRows, /* i : number of rows of the matrix Q0*/
+ const Word16 mCols, /* i : number of columns of the matrix Q0*/
+ const Word16 transpose /* i : flag indication transposition Q0*/
);
void svdMat2mat_fx(
- Word32 svdMat[MAX_OUTPUT_CHANNELS][MAX_OUTPUT_CHANNELS], /* i : matrix as two-dimensional arry Qx*/
- Word32 *mat, /* o : matrix as column ordered vector Qx*/
- const Word16 nRows, /* i : number of rows of the matrix Q0*/
- const Word16 mCols /* i : number of columns of the matrix Q0*/
+ Word32 svdMat[MAX_OUTPUT_CHANNELS][MAX_OUTPUT_CHANNELS], /* i : matrix as two-dimensional arry Qx*/
+ Word32 *mat, /* o : matrix as column ordered vector Qx*/
+ const Word16 nRows, /* i : number of rows of the matrix Q0*/
+ const Word16 mCols /* i : number of columns of the matrix Q0*/
);
Word16 computeMixingMatrices_fx(
- const Word16 num_inputs, /* i : number of input channels */
- const Word16 num_outputs, /* i : number of output channels */
- const Word32 *Cx, /* i : input channel covariance matrix */
+ const Word16 num_inputs, /* i : number of input channels */
+ const Word16 num_outputs, /* i : number of output channels */
+ const Word32 *Cx, /* i : input channel covariance matrix */
Word16 Cx_e,
- const Word32 *Cy, /* i : target covariance matrix */
+ const Word32 *Cy, /* i : target covariance matrix */
Word16 Cy_e,
- const Word32 *Q, /* i : prototype matrix (usually a upmix matrix) */
+ const Word32 *Q, /* i : prototype matrix (usually a upmix matrix) */
Word16 Q_fx_e,
- const Word16 energy_compensation_flag, /* i : flag indicating that the energy compensation should be performed (i.e. no residual mixing matrix will follow) */
- const Word32 reg_Sx_fx, /* i : regularization factor for the input channel singular values */
+ const Word16 energy_compensation_flag, /* i : flag indicating that the energy compensation should be performed (i.e. no residual mixing matrix will follow) */
+ const Word32 reg_Sx_fx, /* i : regularization factor for the input channel singular values */
Word16 reg_Sx_e,
- const Word32 reg_ghat_fx, /* i : regularization factor for the normalization matrix */
+ const Word32 reg_ghat_fx, /* i : regularization factor for the normalization matrix */
Word16 reg_ghat_e,
- Word32 *mixing_matrix_fx, /* o : resulting mixing matrix */
+ Word32 *mixing_matrix_fx, /* o : resulting mixing matrix */
Word16 *mixing_matrix_out_e,
- Word32 *Cr_fx, /* o : residual covariance matrix */
- Word16 *Cr_e );
+ Word32 *Cr_fx, /* o : residual covariance matrix */
+ Word16 *Cr_e
+);
Word16 computeMixingMatricesResidual_fx(
- const Word32 num_outputs, /* i : number of output channels */
- const Word32 *Cx_fx, /* i : vector containing the diagonal diffuse prototype covariance */
+ const Word32 num_outputs, /* i : number of output channels */
+ const Word32 *Cx_fx, /* i : vector containing the diagonal diffuse prototype covariance */
const Word16 Cx_e,
- const Word32 *Cy_fx, /* i : matrix containing the missing cov (Cr from computeMixingMatrices()) */
+ const Word32 *Cy_fx, /* i : matrix containing the missing cov (Cr from computeMixingMatrices()) */
const Word16 Cy_fx_e,
- const Word32 reg_Sx_fx, /* i : regularization factor for the input channel singular values */
+ const Word32 reg_Sx_fx, /* i : regularization factor for the input channel singular values */
const Word16 reg_Sx_e,
- const Word32 reg_ghat_fx, /* i : regularization factor for the normalization matrix */
+ const Word32 reg_ghat_fx, /* i : regularization factor for the normalization matrix */
const Word16 reg_ghat_e,
- Word32 *mixing_matrix_fx, /* o : resulting residual mixing matrix */
- Word16 *mixing_matrix_ret_e );
+ Word32 *mixing_matrix_fx, /* o : resulting residual mixing matrix */
+ Word16 *mixing_matrix_ret_e
+);
Word16 svd_fx(
- Word32 InputMatrix[][MAX_OUTPUT_CHANNELS], /* i : matrix to be decomposed (M) InputMatrix_e*/
+ Word32 InputMatrix[][MAX_OUTPUT_CHANNELS], /* i : matrix to be decomposed (M) InputMatrix_e*/
Word16 InputMatrix_e,
- Word32 singularVectors_Left_fx[][MAX_OUTPUT_CHANNELS], /* o : left singular vectors (U) Q31*/
- Word32 singularValues_fx[MAX_OUTPUT_CHANNELS], /* o : singular values vector (S) singularValues_fx_e*/
- Word32 singularVectors_Right_fx[][MAX_OUTPUT_CHANNELS], /* o : right singular vectors (V) Q31*/
+ Word32 singularVectors_Left_fx[][MAX_OUTPUT_CHANNELS], /* o : left singular vectors (U) Q31*/
+ Word32 singularValues_fx[MAX_OUTPUT_CHANNELS], /* o : singular values vector (S) singularValues_fx_e*/
+ Word32 singularVectors_Right_fx[][MAX_OUTPUT_CHANNELS], /* o : right singular vectors (V) Q31*/
Word16 singularValues_fx_e[MAX_OUTPUT_CHANNELS],
- const Word16 nChannelsL, /* i : number of rows in the matrix to be decomposed Q0*/
- const Word16 nChannelsC /* i : number of columns in the matrix to be decomposed Q0*/
+ const Word16 nChannelsL, /* i : number of rows in the matrix to be decomposed Q0*/
+ const Word16 nChannelsC /* i : number of columns in the matrix to be decomposed Q0*/
);
ivas_error ivas_dirac_dec_output_synthesis_cov_open_fx(
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 Word16 max_band_decorr, /* i : uppermost frequency band where decorrelation is applied */
- const Word16 interp_length, /* i : length for interpolating the mixing matrices in time slots */
- const Word16 num_param_bands, /* i : number of parameter bands */
- const Word16 num_param_bands_residual, /* i : number of parameter bands with a residual mixing matrix (i.e. decorrelation */
- const Word16 nchan_in, /* i : number of input (transport) channels */
- const Word16 nchan_out, /* i : number of output channels */
- const Word32 *proto_matrix /* i : the prototype (upmix) matrix (only used if mode == 1) */
+ DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state, /* i/o: hanlde for the covariance synthesis state */
+ const Word16 max_band_decorr, /* i : uppermost frequency band where decorrelation is applied */
+ const Word16 interp_length, /* i : length for interpolating the mixing matrices in time slots */
+ const Word16 num_param_bands, /* i : number of parameter bands */
+ const Word16 num_param_bands_residual, /* i : number of parameter bands with a residual mixing matrix (i.e. decorrelation */
+ const Word16 nchan_in, /* i : number of input (transport) channels */
+ const Word16 nchan_out, /* i : number of output channels */
+ const Word32 *proto_matrix /* i : the prototype (upmix) matrix (only used if mode == 1) */
);
void ivas_dirac_dec_output_synthesis_get_interpolator_fx(
DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params, /* i/o: handle for the covariance synthesis parameters */
- const UWord16 interp_length /* i : interpolator length */
+ const UWord16 interp_length /* i : interpolator length */
);
void ivas_dirac_dec_output_synthesis_cov_init_fx(
- DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state, /* i/o: pointer to the state of the covariance synthesis */
- const Word16 nchan_in, /* i : number of input (tranport) channels */
- const Word16 nchan_out, /* i : number of output channels */
- const Word16 n_param_bands, /* i : number of total parameter bands */
- const Word16 n_param_bands_res /* i : number of parameter bands with a residual mixing matrix (i.e. decorrelation */
+ DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state, /* i/o: pointer to the state of the covariance synthesis */
+ const Word16 nchan_in, /* i : number of input (tranport) channels */
+ const Word16 nchan_out, /* i : number of output channels */
+ const Word16 n_param_bands, /* i : number of total parameter bands */
+ const Word16 n_param_bands_res /* i : number of parameter bands with a residual mixing matrix (i.e. decorrelation */
);
void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
Word32 *Cldfb_RealBuffer_in_fx,
Word32 *Cldfb_ImagBuffer_in_fx,
- Word32 Cldfb_RealBuffer_fx[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (real part) */
- Word32 Cldfb_ImagBuffer_fx[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (imaginary part) */
- Word32 *mixing_matrix_fx[], /* i : parameter band wise mixing matrices (direct part) */
- Word16 *mixing_matrix_e, /* i : parameter band wise mixing matrices (direct part) */
- Word32 *mixing_matrix_res_fx[], /* i : parameter band wise mixing matrices (residual part) */
- Word16 *mixing_matrix_res_e, /* i : parameter band wise mixing matrices (residual part) */
- const UWord16 slot_idx_sfr, /* i : time slot index for the current slot within the current subframe */
- const UWord16 slot_idx_tot, /* i : time slot index for the current slot within the frame */
- const Word16 nX, /* i : number of input channels */
- const Word16 nY, /* i : number of output channels */
- PARAM_MC_DEC_HANDLE hParamMC /* i : handle to the Parametric MC decoder state */
+ Word32 Cldfb_RealBuffer_fx[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (real part) */
+ Word32 Cldfb_ImagBuffer_fx[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : output channel filter bank samples (imaginary part) */
+ Word32 *mixing_matrix_fx[], /* i : parameter band wise mixing matrices (direct part) */
+ Word16 *mixing_matrix_e, /* i : parameter band wise mixing matrices (direct part) */
+ Word32 *mixing_matrix_res_fx[], /* i : parameter band wise mixing matrices (residual part) */
+ Word16 *mixing_matrix_res_e, /* i : parameter band wise mixing matrices (residual part) */
+ const UWord16 slot_idx_sfr, /* i : time slot index for the current slot within the current subframe */
+ const UWord16 slot_idx_tot, /* i : time slot index for the current slot within the frame */
+ const Word16 nX, /* i : number of input channels */
+ const Word16 nY, /* i : number of output channels */
+ PARAM_MC_DEC_HANDLE hParamMC /* i : handle to the Parametric MC decoder state */
);
Word16 computeMixingMatricesISM_fx(
@@ -5372,132 +5327,136 @@ Word16 computeMixingMatricesISM_fx(
const Word32 reg_Sx_fx,
const Word32 reg_ghat_fx,
Word32 *mixing_matrix_fx,
- Word16 *mixing_matrix_e );
+ Word16 *mixing_matrix_e
+);
ivas_error ivas_spar_enc_open_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder handle */
- const Word16 spar_reconfig_flag /* i : SPAR reconfiguration flag */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder handle */
+ const Word16 spar_reconfig_flag /* i : SPAR reconfiguration flag */
);
void ivas_spar_enc_close_fx(
- SPAR_ENC_HANDLE *hSpar, /* i/o: SPAR encoder handle */
- const Word32 input_Fs, /* i : input sampling rate */
- const Word16 nchan_inp, /* i : number of input channels */
- const Word16 spar_reconfig_flag /* i : SPAR reconfiguration flag */
+ SPAR_ENC_HANDLE *hSpar, /* i/o: SPAR encoder handle */
+ const Word32 input_Fs, /* i : input sampling rate */
+ const Word16 nchan_inp, /* i : number of input channels */
+ const Word16 spar_reconfig_flag /* i : SPAR reconfiguration flag */
);
void ivas_spar_dec_close_fx(
- SPAR_DEC_HANDLE *hSpar, /* i/o: SPAR decoder handle */
- const Word32 output_Fs, /* i : output sampling rate */
- const Word16 spar_reconfig_flag /* i : SPAR reconfiguration flag */
+ SPAR_DEC_HANDLE *hSpar, /* i/o: SPAR decoder handle */
+ const Word32 output_Fs, /* i : output sampling rate */
+ const Word16 spar_reconfig_flag /* i : SPAR reconfiguration flag */
);
ivas_error ivas_sba_linear_renderer_fx(
- Word32 *output_f[], /* i/o: synthesized core-coder transport channels/DirAC output */
- const Word16 output_frame, /* i : output frame length per channel */
- const Word16 nchan_in, /* i : number of input ambisonics channels */
- const Word16 nchan_ism, /* i : number of objects */
- const AUDIO_CONFIG output_config, /* i : output audio configuration */
- const IVAS_OUTPUT_SETUP output_setup /* i : output format setup */
+ Word32 *output_fx[], /* i/o: synthesized core-coder transport channels/DirAC output */
+ const Word16 output_frame, /* i : output frame length per channel */
+ const Word16 nchan_in, /* i : number of input ambisonics channels */
+ const Word16 nchan_ism, /* i : number of objects */
+ const AUDIO_CONFIG output_config, /* i : output audio configuration */
+ const IVAS_OUTPUT_SETUP output_setup /* i : output format setup */
);
void ivas_sba_mix_matrix_determiner_fx(
- SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */
- Word32 *output_fx[], /* i/o: transport/output audio channels */
- const Word16 bfi, /* i : BFI flag */
- const Word16 nchan_remapped, /* i : num channels after remapping of TCs */
- const Word16 output_frame, /* i : output frame length */
- const Word16 num_md_sub_frames, /* i : number of subframes in mixing matrix*/
- const Word16 Q_output /* i : Q of transport/output audio channels */
+ SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */
+ Word32 *output_fx[], /* i/o: transport/output audio channels */
+ const Word16 bfi, /* i : BFI flag */
+ const Word16 nchan_remapped, /* i : num channels after remapping of TCs */
+ const Word16 output_frame, /* i : output frame length */
+ const Word16 num_md_sub_frames, /* i : number of subframes in mixing matrix */
+ const Word16 Q_output /* i : Q of transport/output audio channels */
);
Word16 ivas_agc_enc_get_flag(
- const Word16 nchan_transport /* i : number of transport channels */
+ const Word16 nchan_transport /* i : number of transport channels */
);
ivas_error ivas_spar_agc_enc_open_fx(
- ivas_agc_enc_state_t **hAgcEnc, /* i/o: SPAR AGC encoder handle */
- const Word32 input_Fs, /* i : input sampling rate */
- const Word16 nchan_inp /* i : number of input channels */
+ ivas_agc_enc_state_t **hAgcEnc, /* i/o: SPAR AGC encoder handle */
+ const Word32 input_Fs, /* i : input sampling rate */
+ const Word16 nchan_inp /* i : number of input channels */
);
void ivas_spar_agc_enc_close_fx(
- ivas_agc_enc_state_t **hAgcEnc /* i/o: SPAR AGC encoder handle */
+ ivas_agc_enc_state_t **hAgcEnc /* i/o: SPAR AGC encoder handle */
);
void ivas_agc_enc_process_fx(
- ivas_agc_enc_state_t *hAgcEnc, /* i/o: AGC encoder handle */
- BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */
- Word32 **ppPcm_in, /* i : input audio channels */
- Word32 **ppPcm_out, /* o : output audio channels */
- const Word16 n_channels, /* i : number of channels */
- const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
- Word16 *q_ppPcm );
+ ivas_agc_enc_state_t *hAgcEnc, /* i/o: AGC encoder handle */
+ BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */
+ Word32 **ppPcm_in, /* i : input audio channels */
+ Word32 **ppPcm_out, /* o : output audio channels */
+ const Word16 n_channels, /* i : number of channels */
+ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
+ Word16 *q_ppPcm
+);
void ivas_spar_set_bitrate_config_fx(
- ivas_spar_md_com_cfg *pSpar_md_cfg, /* i/o: SPAR MD config. handle */
- const Word16 table_idx, /* i : config. table index */
- const Word16 num_bands, /* i : number of bands */
+ ivas_spar_md_com_cfg *pSpar_md_cfg, /* i/o: SPAR MD config. handle */
+ const Word16 table_idx, /* i : config. table index */
+ const Word16 num_bands, /* i : number of bands */
const Word16 dirac2spar_md_flag,
const Word16 enc_flag,
const Word16 pca_flag,
- const Word16 agc_flag );
+ const Word16 agc_flag
+);
Word16 ivas_is_res_channel(
- const Word16 ch, /* i : ch index in WYZX ordering */
- const Word16 nchan_transport /* i : number of transport channels (1-4) */
+ const Word16 ch, /* i : ch index in WYZX ordering */
+ const Word16 nchan_transport /* i : number of transport channels (1-4) */
);
void ivas_spar_dec_agc_pca_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- Word32 *output[], /* i/o: input/output audio channels */
- const Word16 output_frame /* i : output frame length */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ Word32 *output[], /* i/o: input/output audio channels */
+ const Word16 output_frame /* i : output frame length */
);
void ivas_spar_dec_set_render_map_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 nCldfbTs /* i : number of CLDFB time slots */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 nCldfbTs /* i : number of CLDFB time slots */
);
void ivas_spar_dec_set_render_params_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const Word16 n_cldfb_slots /* i : number of cldfb slots in this frame */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const Word16 n_cldfb_slots /* i : number of cldfb slots in this frame */
);
void ivas_spar_dec_digest_tc_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const Word16 nchan_transport, /* i : number of transport channels */
- const Word16 nCldfbSlots, /* i : number of CLDFB slots */
- const Word16 nSamplesForRendering /* i : number of samples provided */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ const Word16 nCldfbSlots, /* i : number of CLDFB slots */
+ const Word16 nSamplesForRendering /* i : number of samples provided */
);
void ivas_sba_dec_digest_tc_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const Word16 nCldfbSlots, /* i : number of CLDFB slots */
- const Word16 nSamplesForRendering /* i : number of samples provided */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const Word16 nCldfbSlots, /* i : number of CLDFB slots */
+ const Word16 nSamplesForRendering /* i : number of samples provided */
);
+
ivas_error ivas_sba_dec_render_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
- UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
- UWord16 *nSamplesAvailableNext, /* o : number of CLDFB slots still to render */
- Word32 *output_fx[] /* o : rendered time signal Q11*/
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
+ UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
+ UWord16 *nSamplesAvailableNext, /* o : number of CLDFB slots still to render */
+ Word32 *output_fx[] /* o : rendered time signal Q11*/
);
void ivas_spar_dec_upmixer_sf_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- Word32 *output_fx[], /* o : output audio channels */
- const Word16 nchan_internal /* i : number of internal channels */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ Word32 *output_fx[], /* o : output audio channels */
+ const Word16 nchan_internal /* i : number of internal channels */
);
ivas_error ivas_spar_md_enc_open_fx(
- ivas_spar_md_enc_state_t **hMdEnc_in, /* i/o: SPAR MD encoder handle */
- const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
- const Word16 sba_order /* i : Ambisonic (SBA) order */
+ ivas_spar_md_enc_state_t **hMdEnc_in, /* i/o: SPAR MD encoder handle */
+ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
+ const Word16 sba_order /* i : Ambisonic (SBA) order */
);
void ivas_spar_md_enc_close_fx(
- ivas_spar_md_enc_state_t **hMdEnc /* i/o: SPAR MD encoder handle */
+ ivas_spar_md_enc_state_t **hMdEnc /* i/o: SPAR MD encoder handle */
);
void ivas_create_fullr_dmx_mat_fx(
@@ -5511,7 +5470,8 @@ void ivas_create_fullr_dmx_mat_fx(
const Word16 start_band,
const Word16 end_band,
const Word16 active_w,
- ivas_spar_md_com_cfg *hMdCfg );
+ ivas_spar_md_com_cfg *hMdCfg
+);
void ivas_get_spar_md_from_dirac_enc_fx(
Word32 azi_dirac_fx[IVAS_MAX_NUM_BANDS][MAX_PARAM_SPATIAL_SUBFRAMES], // Q22
@@ -5529,7 +5489,8 @@ void ivas_get_spar_md_from_dirac_enc_fx(
Word32 Wscale_d[IVAS_MAX_NUM_BANDS], // Q29
const UWord8 useLowerRes,
const Word16 active_w_vlbr,
- const Word16 dyn_active_w_flag );
+ const Word16 dyn_active_w_flag
+);
void ivas_get_spar_md_from_dirac_fx(
Word32 azi_dirac_fx[IVAS_MAX_NUM_BANDS][MAX_PARAM_SPATIAL_SUBFRAMES], // Q22
@@ -5547,73 +5508,76 @@ void ivas_get_spar_md_from_dirac_fx(
Word32 Wscale_d[IVAS_MAX_NUM_BANDS], // Q29
const UWord8 useLowerRes,
const Word16 active_w_vlbr,
- const Word16 dyn_active_w_flag );
+ const Word16 dyn_active_w_flag
+);
ivas_error ivas_spar_md_enc_process_fx(
- ivas_spar_md_enc_state_t *hMdEnc, /* i/o: SPAR MD encoder handle */
- const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
+ ivas_spar_md_enc_state_t *hMdEnc, /* i/o: SPAR MD encoder handle */
+ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
Word32 *cov_real_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
Word16 *cov_real_q[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
Word32 *cov_dtx_real_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
Word16 *cov_dtx_real_q[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
- BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */
+ BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */
const Word16 dtx_vad,
const Word16 nchan_inp,
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- Word32 *prior_mixer[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH], /* i : prior mixer_matrix */
- Word16 *q_prior_mixer, /* i/o : q for prior mixer_matrix */
- const Word16 dyn_active_w_flag, /* i : flag to indicate dynamic active W */
- const Word16 dirac_mono_flag, /* i : flag to indicate mono only mode in SBA */
- const Word16 nchan_out );
+ const Word16 sba_order, /* i : Ambisonic (SBA) order */
+ Word32 *prior_mixer[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH], /* i : prior mixer_matrix */
+ Word16 *q_prior_mixer, /* i/o : q for prior mixer_matrix */
+ const Word16 dyn_active_w_flag, /* i : flag to indicate dynamic active W */
+ const Word16 dirac_mono_flag, /* i : flag to indicate mono only mode in SBA */
+ const Word16 nchan_out
+);
Word16 ivas_get_spar_dec_md_num_subframes(
- const Word16 sba_order, /* i : Ambisonic (SBA) order */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word32 ivas_last_active_brate /* i : IVAS last active bitrate */
+ const Word16 sba_order, /* i : Ambisonic (SBA) order */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word32 ivas_last_active_brate /* i : IVAS last active bitrate */
);
void ivas_spar_get_parameters_fx(
- SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */
- const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */
- const Word16 ts, /* i : time slot index */
- const Word16 num_ch_out, /* i : number of channels out */
- const Word16 num_ch_in, /* i : number of channels in */
- const Word16 num_spar_bands, /* i : number of SPAR bands */
- Word32 par_mat_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS] /* o : mixing matrix */
+ SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */
+ const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */
+ const Word16 ts, /* i : time slot index */
+ const Word16 num_ch_out, /* i : number of channels out */
+ const Word16 num_ch_in, /* i : number of channels in */
+ const Word16 num_spar_bands, /* i : number of SPAR bands */
+ Word32 par_mat_fx[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS] /* o : mixing matrix */
);
void ivas_spar_to_dirac_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */
- const Word16 dtx_vad, /* i : DTX frame flag */
- const Word16 num_bands_out, /* i : number of output bands */
- const Word16 bw, /* i : band joining factor */
- const Word16 dyn_active_w_flag /* i : dynamic active W flag */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */
+ const Word16 dtx_vad, /* i : DTX frame flag */
+ const Word16 num_bands_out, /* i : number of output bands */
+ const Word16 bw, /* i : band joining factor */
+ const Word16 dyn_active_w_flag /* i : dynamic active W flag */
);
void ivas_spar_dec_gen_umx_mat_fx(
- ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */
- const Word16 nchan_transport, /* i : number of transport channels */
- const Word16 num_bands_out, /* i : number of output bands */
- const Word16 bfi, /* i : bad frame indicator */
- const Word16 num_md_sub_frames );
+ ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ const Word16 num_bands_out, /* i : number of output bands */
+ const Word16 bfi, /* i : bad frame indicator */
+ const Word16 num_md_sub_frames
+);
ivas_error ivas_spar_covar_enc_open_fx(
- ivas_enc_cov_handler_state_t **hCovEnc, /* i/o: SPAR Covar. encoder handle */
- ivas_filterbank_t *pFb, /* i/o: FB handle */
- const Word32 input_Fs, /* i : input sampling rate */
- const Word16 nchan_inp, /* i : number of input channels */
- const COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC*/
- const Word32 ivas_total_brate /* i : IVAS total bitrate */
+ ivas_enc_cov_handler_state_t **hCovEnc, /* i/o: SPAR Covar. encoder handle */
+ ivas_filterbank_t *pFb, /* i/o: FB handle */
+ const Word32 input_Fs, /* i : input sampling rate */
+ const Word16 nchan_inp, /* i : number of input channels */
+ const COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC */
+ const Word32 ivas_total_brate /* i : IVAS total bitrate */
);
void ivas_spar_covar_enc_close_fx(
- ivas_enc_cov_handler_state_t **hCovEnc, /* i/o: SPAR Covar. encoder handle */
- const Word16 nchan_inp /* i : number of input channels */
+ ivas_enc_cov_handler_state_t **hCovEnc, /* i/o: SPAR Covar. encoder handle */
+ const Word16 nchan_inp /* i : number of input channels */
);
void ivas_enc_cov_handler_process_fx(
- ivas_enc_cov_handler_state_t *hCovEnc, /* i/o: SPAR Covar. encoder handle */
+ ivas_enc_cov_handler_state_t *hCovEnc, /* i/o: SPAR Covar. encoder handle */
Word32 **ppIn_FR_real,
Word32 **ppIn_FR_imag,
Word16 q_ppIn_FR,
@@ -5621,7 +5585,7 @@ void ivas_enc_cov_handler_process_fx(
Word16 *q_cov_real[IVAS_SPAR_MAX_CH],
Word32 *cov_dtx_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
Word16 *q_cov_dtx_real[IVAS_SPAR_MAX_CH],
- ivas_filterbank_t *pFb, /* i/o: FB handle */
+ ivas_filterbank_t *pFb, /* i/o: FB handle */
const Word16 start_band,
const Word16 end_band,
const Word16 num_ch,
@@ -5632,79 +5596,84 @@ void ivas_enc_cov_handler_process_fx(
const Word16 *remix_order,
Word16 *dyn_active_w_flag,
const Word16 nchan_transport,
- const Word16 is_sba );
+ const Word16 is_sba
+);
ivas_error ivas_spar_covar_smooth_enc_open_fx(
- ivas_cov_smooth_state_t **hCovState, /* i/o: SPAR Covar. smoothing handle */
- const ivas_cov_smooth_cfg_t *cov_smooth_cfg, /* i : SPAR config. handle */
- ivas_filterbank_t *pFb, /* i/o: FB handle */
- const Word16 nchan_inp, /* i : number of input channels */
- const COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC */
- const Word32 ivas_total_brate /* i : IVAS total bitrate */
+ ivas_cov_smooth_state_t **hCovState, /* i/o: SPAR Covar. smoothing handle */
+ const ivas_cov_smooth_cfg_t *cov_smooth_cfg, /* i : SPAR config. handle */
+ ivas_filterbank_t *pFb, /* i/o: FB handle */
+ const Word16 nchan_inp, /* i : number of input channels */
+ const COV_SMOOTHING_TYPE smooth_mode, /* i : Smooth covariance for SPAR or MC */
+ const Word32 ivas_total_brate /* i : IVAS total bitrate */
);
void ivas_spar_covar_smooth_enc_close_fx(
- ivas_cov_smooth_state_t **hCovState, /* i/o: SPAR Covar. encoder handle */
- const Word16 nchan_inp /* i : number of input channels */
+ ivas_cov_smooth_state_t **hCovState, /* i/o: SPAR Covar. encoder handle */
+ const Word16 nchan_inp /* i : number of input channels */
);
void ivas_cov_smooth_process_fx(
- ivas_cov_smooth_state_t *hCovState, /* i/o: Covariance state handle */
+ ivas_cov_smooth_state_t *hCovState, /* i/o: Covariance state handle */
Word32 *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],
- ivas_filterbank_t *pFb, /* i/o: FB handle */
+ ivas_filterbank_t *pFb, /* i/o: FB handle */
const Word16 start_band,
const Word16 end_band,
const Word16 num_ch,
const Word16 transient_det[2],
- Word16 *q_cov[IVAS_SPAR_MAX_CH] );
+ Word16 *q_cov[IVAS_SPAR_MAX_CH]
+);
void ivas_pca_enc_init_fx(
- PCA_ENC_STATE *hPCA /* i/o: PCA encoder structure */
+ PCA_ENC_STATE *hPCA /* i/o: PCA encoder structure */
);
void ivas_pca_enc_fx(
- const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
- PCA_ENC_STATE *hPCA, /* i : PCA encoder structure */
- BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */
- Word32 *data_f[8], /* i : input/transformed audio channels Q11 */
- const Word16 input_frame, /* i : input frame length */
- const Word16 n_channels /* i : number of channels */
+ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
+ PCA_ENC_STATE *hPCA, /* i : PCA encoder structure */
+ BSTR_ENC_HANDLE hMetaData, /* i/o: MetaData handle */
+ Word32 *data_f[8], /* i : input/transformed audio channels Q11 */
+ const Word16 input_frame, /* i : input frame length */
+ const Word16 n_channels /* i : number of channels */
);
void cov_subfr_fx(
Word32 **ptr_sig_fx, // Q11
Word64 *r_fx_64, // Q11
const Word16 n_channels,
- const Word16 len );
+ const Word16 len
+);
void ivas_pca_read_bits_fx(
- Decoder_State *st0, /* i/o: decoder state structure - for bitstream handling*/
- PCA_DEC_STATE *hPCA /* i/o: PCA encoder structure */
+ Decoder_State *st0, /* i/o: decoder state structure - for bitstream handling*/
+ PCA_DEC_STATE *hPCA /* i/o: PCA encoder structure */
);
void ivas_pca_dec_init_fx(
- PCA_DEC_STATE *hPCA /* i/o: PCA decoder structure */
+ PCA_DEC_STATE *hPCA /* i/o: PCA decoder structure */
);
void ivas_pca_dec_fx(
- PCA_DEC_STATE *hPCA, /* i/o: PCA decoder structure */
- const Word16 output_frame, /* i : output frame length */
- const Word16 n_channels, /* i : number of channels */
- const Word32 ivas_total_brate, /* i : IVAS total bitrate */
- const Word32 last_ivas_total_brate, /* i : last IVAS total bitrate */
- const Word16 bfi, /* i : bad frame indicator */
- Word32 *pcm_out[] /* o : output audio channels */
+ PCA_DEC_STATE *hPCA, /* i/o: PCA decoder structure */
+ const Word16 output_frame, /* i : output frame length */
+ const Word16 n_channels, /* i : number of channels */
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate */
+ const Word32 last_ivas_total_brate, /* i : last IVAS total bitrate */
+ const Word16 bfi, /* i : bad frame indicator */
+ Word32 *pcm_out[] /* o : output audio channels */
);
void eye_matrix_fx(
Word16 *mat,
const Word16 n,
- const Word16 d );
+ const Word16 d
+);
void eye_matrix_fx32(
Word32 *mat, // Q
const Word16 n,
- const Word32 d ); // Q
+ const Word32 d // Q
+);
void eig_qr_fx(
const Word32 *A_fx, // A_q
@@ -5712,12 +5681,14 @@ void eig_qr_fx(
const Word16 num_iter,
Word32 *EV_fx, // Q31
Word32 *Vals_fx, // A_q
- const Word16 n );
+ const Word16 n
+);
void exhst_4x4_fx(
Word16 *cost_mtx, // Q
Word16 *path,
- const Word16 maximize );
+ const Word16 maximize
+);
Word16 mat_det4_fx(
const Word16 *m // Q15
@@ -5732,13 +5703,15 @@ void mat2dquat_fx(
void dquat2mat_fx(
const Word16 *ql,
const Word16 *qr,
- Word16 *m );
+ Word16 *m
+);
void quat_shortestpath_fx(
const Word16 *q00,
Word16 *q01,
const Word16 *q10,
- Word16 *q11 );
+ Word16 *q11
+);
void pca_interp_preproc_fx(
const Word16 *prev_ql,
@@ -5747,110 +5720,119 @@ void pca_interp_preproc_fx(
const Word16 *qr,
const Word16 len,
Word16 *ql_interp,
- Word16 *qr_interp );
+ Word16 *qr_interp
+);
void pca_dec_s3_fx(
const Word32 index,
- Word16 *q );
+ Word16 *q
+);
void ivas_spar_huff_coeffs_com_init(
ivas_huff_coeffs_t *pHuff_coeffs,
ivas_spar_md_com_cfg *pSpar_cfg,
const Word16 table_idx,
- const Word16 enc_dec );
+ const Word16 enc_dec
+);
void ivas_spar_arith_coeffs_com_init(
ivas_arith_coeffs_t *pArith_coeffs,
ivas_spar_md_com_cfg *pSpar_cfg,
const Word16 table_idx,
- const Word16 enc_dec );
+ const Word16 enc_dec
+);
void ivas_ari_start_decoding_14bits_ext_1_lfe(
Decoder_State *st,
Tastat *s,
- Word16 *extra_bits_read );
+ Word16 *extra_bits_read
+);
UWord16 ivas_ari_decode_14bits_bit_ext_1_lfe(
Decoder_State *st,
Tastat *s,
const UWord16 *cum_freq,
- Word16 *extra_bits_read );
+ Word16 *extra_bits_read
+);
void ivas_ari_done_decoding_14bits_ext_1_lfe(
Decoder_State *st,
- const Word16 extra_bits_read );
+ const Word16 extra_bits_read
+);
Word16 quantize_phi_fx(
- Word32 phi, /* i : azimuth value */
- const Word16 flag_delta, /* i : flag indicating if the azimuth codebook is translated or not */
- Word32 *phi_hat, /* o : quantized azimuth */
- const Word16 n /* i : azimuth codebook size */
+ Word32 phi, /* i : azimuth value */
+ const Word16 flag_delta, /* i : flag indicating if the azimuth codebook is translated or not */
+ Word32 *phi_hat, /* o : quantized azimuth */
+ const Word16 n /* i : azimuth codebook size */
);
Word16 quantize_phi_enc_fx(
- Word32 phi, /* i : azimuth value */
- const Word16 flag_delta, /* i : flag indicating if the azimuth codebook is translated or not */
- Word32 *phi_hat, /* o : quantized azimuth */
- const Word16 n /* i : azimuth codebook size */
+ Word32 phi, /* i : azimuth value */
+ const Word16 flag_delta, /* i : flag indicating if the azimuth codebook is translated or not */
+ Word32 *phi_hat, /* o : quantized azimuth */
+ const Word16 n /* i : azimuth codebook size */
);
Word16 ivas_spar_chk_zero_coefs_fx(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
);
void pca_enc_s3_fx(
Word16 *q, // Q15
- Word32 *index );
+ Word32 *index
+);
void ivas_spar_get_uniform_quant_strat_fx(
ivas_spar_md_com_cfg *pSpar_md_com_cfg,
- const Word16 table_idx );
+ const Word16 table_idx
+);
void ivas_lfe_lpf_select_filt_coeff_fx(
- const Word32 sampling_rate, /* i : sampling rate */
- const Word16 order, /* i : filter order */
- const Word32 **ppFilt_coeff_fx, /* o : filter coefficients */
- const Word16 **ppFilt_coeff_e /* o : exponents of filter coefficients */
+ const Word32 sampling_rate, /* i : sampling rate */
+ const Word16 order, /* i : filter order */
+ const Word32 **ppFilt_coeff_fx, /* o : filter coefficients */
+ const Word16 **ppFilt_coeff_e /* o : exponents of filter coefficients */
);
void ivas_filters_init_fx(
- ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
- const Word32 *filt_coeff, /* i : filter coefficients */
- const Word16 *filt_coeff_e, /* i : exponents of filter coefficients */
- const Word16 order /* i : filter order */
+ ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
+ const Word32 *filt_coeff, /* i : filter coefficients */
+ const Word16 *filt_coeff_e, /* i : exponents of filter coefficients */
+ const Word16 order /* i : filter order */
);
void ivas_decision_matrix_enc_fx(
- Encoder_State *st, /* i : encoder state structure */
- const Word32 element_brate, /* i : element bitrate */
- const Word16 fft_buff[], /* i : FFT buffer */
- const Word32 enerBuffer[], /* i : energy buffer */
+ Encoder_State *st, /* i : encoder state structure */
+ const Word32 element_brate, /* i : element bitrate */
+ const Word16 fft_buff[], /* i : FFT buffer */
+ const Word32 enerBuffer[], /* i : energy buffer */
Word16 enerBuffer_exp,
- const Word16 last_element_mode /* i : last element mode */
+ const Word16 last_element_mode /* i : last element mode */
);
void stereo_dft_dec_sid_coh_fx(
- Decoder_State *st, /* i/o: decoder state structure */
- const Word16 nbands, /* i : number of DFT stereo bands Q0*/
- Word16 *coh, /* i/o: coherence Q15*/
- Word16 *nb_bits /* i/o: number of bits read Q0*/
+ Decoder_State *st, /* i/o: decoder state structure */
+ const Word16 nbands, /* i : number of DFT stereo bands Q0*/
+ Word16 *coh, /* i/o: coherence Q15*/
+ Word16 *nb_bits /* i/o: number of bits read Q0*/
);
void stereo_tca_init_enc_fx(
- STEREO_TCA_ENC_HANDLE hStereoTCA, /* i/o: Stereo ICA handle */
- const Word32 input_Fs /* i : input sampling frequency */
+ STEREO_TCA_ENC_HANDLE hStereoTCA, /* i/o: Stereo ICA handle */
+ const Word32 input_Fs /* i : input sampling frequency */
);
void stereo_tca_dec_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 *synth[CPE_CHANNELS], /* i/o: output synth qsynth*/
- const Word16 output_frame /* i : length of a frame per channel Q0*/
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 *synth[CPE_CHANNELS], /* i/o: output synth qsynth*/
+ const Word16 output_frame /* i : length of a frame per channel Q0*/
);
void stereo_tca_scale_R_channel_fx(
- CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
- Word32 *output_fx, /* i/o: output synthesis, R channel q_out*/
- const Word16 output_frame /* i : frame length Q0*/
+ CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
+ Word32 *output_fx, /* i/o: output synthesis, R channel q_out*/
+ const Word16 output_frame /* i : frame length Q0*/
);
void adjustTargetSignal_fx(
@@ -5858,215 +5840,215 @@ void adjustTargetSignal_fx(
const Word16 prevShift,
const Word16 currShift,
const Word16 L_shift_adapt,
- const Word16 method );
+ const Word16 method
+);
void stereo_icBWE_init_enc_fx(
- STEREO_ICBWE_ENC_HANDLE hStereoICBWE /* i/o: Stereo inter-channel BWE handle */
+ STEREO_ICBWE_ENC_HANDLE hStereoICBWE /* i/o: Stereo inter-channel BWE handle */
);
void stereo_classifier_init_fx(
- STEREO_CLASSIF_HANDLE hStereoClassif /* i/o: stereo classifier structure */
+ STEREO_CLASSIF_HANDLE hStereoClassif /* i/o: stereo classifier structure */
);
void stereo_td_init_dec_fx(
- STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle */
- const Word16 last_element_mode /* i : last element mode Q0*/
+ STEREO_TD_DEC_DATA_HANDLE hStereoTD, /* i/o: TD stereo decoder handle */
+ const Word16 last_element_mode /* i : last element mode Q0*/
);
void initMdctStereoEncData_fx(
- STEREO_MDCT_ENC_DATA *hStereoMdct, /* i/o: mdct stereo parameters structure */
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- const Word16 element_mode, /* i : element mode */
- const Word32 element_brate, /* i : element bitrate */
- const Word16 bwidth, /* i : bandwidth */
- const Word16 igf, /* i : flag indicating IGF activity */
- const H_IGF_GRID hIgfGrid, /* i : IGF grid setup */
- const Word16 mem_init /* i : initialize memory after malloc */
+ STEREO_MDCT_ENC_DATA *hStereoMdct, /* i/o: mdct stereo parameters structure */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+ const Word16 element_mode, /* i : element mode */
+ const Word32 element_brate, /* i : element bitrate */
+ const Word16 bwidth, /* i : bandwidth */
+ const Word16 igf, /* i : flag indicating IGF activity */
+ const H_IGF_GRID hIgfGrid, /* i : IGF grid setup */
+ const Word16 mem_init /* i : initialize memory after malloc */
);
void deindex_sph_idx_fx(
- const UWord16 sphIndex, /* i : Spherical index */
- const SPHERICAL_GRID_DATA *gridData, /* i : Prepared spherical grid */
- Word32 *theta_fx, /* o : Elevation */
- Word32 *phi_fx /* o : Azimuth */
+ const UWord16 sphIndex, /* i : Spherical index */
+ const SPHERICAL_GRID_DATA *gridData, /* i : Prepared spherical grid */
+ Word32 *theta_fx, /* o : Elevation */
+ Word32 *phi_fx /* o : Azimuth */
);
ivas_error ivas_dirac_enc_open_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
);
void ivas_dirac_enc_close_fx(
- DIRAC_ENC_HANDLE *hDirAC, /* i/o: encoder DirAC handle */
- const Word32 input_Fs /* i : input sampling_rate */
+ DIRAC_ENC_HANDLE *hDirAC, /* i/o: encoder DirAC handle */
+ const Word32 input_Fs /* i : input sampling_rate */
);
ivas_error ivas_dirac_enc_fx(
- DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */
- IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
- BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */
- Word32 *data_f[], /* i/o: SBA channels */
- Word32 **ppIn_FR_real, /* o : real freq domain values */
- Word32 **ppIn_FR_imag, /* o : imag freq domain values */
+ DIRAC_ENC_HANDLE hDirAC, /* i/o: encoder DirAC handle */
+ IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
+ BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */
+ Word32 *data_f[], /* i/o: SBA channels */
+ Word32 **ppIn_FR_real, /* o : real freq domain values */
+ Word32 **ppIn_FR_imag, /* o : imag freq domain values */
Word16 pp_fr_q,
- const Word16 input_frame, /* i : input frame length */
- const Word16 dtx_vad, /* i : DTX vad flag */
- const IVAS_FORMAT ivas_format, /* i : ivas format */
- const Word16 nchan_transport, /* i : number of transport channels */
- const Word16 hodirac_flag, /* i : hodirac flag */
+ const Word16 input_frame, /* i : input frame length */
+ const Word16 dtx_vad, /* i : DTX vad flag */
+ const IVAS_FORMAT ivas_format, /* i : ivas format */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ const Word16 hodirac_flag, /* i : hodirac flag */
const Word16 shift
);
ivas_error ivas_spar_md_enc_init_fx(
- ivas_spar_md_enc_state_t *hMdEnc, /* o : MD encoder handle */
- const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
- const Word16 sba_order /* i : Ambisonic (SBA) order */
+ ivas_spar_md_enc_state_t *hMdEnc, /* o : MD encoder handle */
+ const ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : configuration structure */
+ const Word16 sba_order /* i : Ambisonic (SBA) order */
);
void ivas_spar_get_cldfb_gains_fx(
SPAR_DEC_HANDLE hSpar,
HANDLE_CLDFB_FILTER_BANK cldfbAnaDec0,
HANDLE_CLDFB_FILTER_BANK cldfbSynDec0,
- const DECODER_CONFIG_HANDLE hDecoderConfig );
+ const DECODER_CONFIG_HANDLE hDecoderConfig
+);
void ivas_sba_getTCs_fx(
- Word32 *sba_data[], /* i : SBA signals Q11 */
- Encoder_Struct *st_ivas, /* i/o: Encoder struct */
- const Word16 input_frame /* i : frame length */
+ Word32 *sba_data[], /* i : SBA signals Q11 */
+ Encoder_Struct *st_ivas, /* i/o: Encoder struct */
+ const Word16 input_frame /* i : frame length */
);
ivas_error front_vad_spar_fx(
- SPAR_ENC_HANDLE hSpar, /* i/o: SPAR encoder structure */
- const Word32 *omni_in, /* i : omnidirectional input signal Q11 */
- ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : encoder configuration handle */
- const Word16 input_frame /* i : input frame length */
+ SPAR_ENC_HANDLE hSpar, /* i/o: SPAR encoder structure */
+ const Word32 *omni_in, /* i : omnidirectional input signal Q11 */
+ ENCODER_CONFIG_HANDLE hEncoderConfig, /* i : encoder configuration handle */
+ const Word16 input_frame /* i : input frame length */
);
ivas_error ivas_spar_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- Word32 *data_fx[], /* i/o: input/transport audio channel Q11 */
- const Word16 input_frame, /* i : input frame length */
- Word16 *nb_bits_metadata, /* i : number of MD bits written */
- BSTR_ENC_HANDLE hMetaData /* o : MetaData handle */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ Word32 *data_fx[], /* i/o: input/transport audio channel Q11 */
+ const Word16 input_frame, /* i : input frame length */
+ Word16 *nb_bits_metadata, /* i : number of MD bits written */
+ BSTR_ENC_HANDLE hMetaData /* o : MetaData handle */
);
ivas_error ivas_ism_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- Word32 *data[], /* i : input signal [channels][samples] Q(q_data) */
- Word16 q_data, /* i : Q-factor of input signal */
- const Word16 input_frame, /* i : input frame length per channel */
- Word16 *nb_bits_metadata, /* i : number of metadata bits */
- const Word16 flag_omasa_ener_brate /* i : less bitrate for objects in OMASA flag */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ Word32 *data[], /* i : input signal [channels][samples] Q(q_data) */
+ Word16 q_data, /* i : Q-factor of input signal */
+ const Word16 input_frame, /* i : input frame length per channel */
+ Word16 *nb_bits_metadata, /* i : number of metadata bits */
+ const Word16 flag_omasa_ener_brate /* i : less bitrate for objects in OMASA flag */
);
ivas_error ivas_sce_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- const Word16 sce_id, /* i : SCE # identifier */
- const Word32 data_fx[], /* i : input signal for single channel Q(q_data_fx) */
- const Word16 q_data_fx, /* i : Q-factor of input signal for single channel */
- const Word16 input_frame, /* i : input frame length per channel */
- const Word16 nb_bits_metadata /* i : number of metadata bits */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ const Word16 sce_id, /* i : SCE # identifier */
+ const Word32 data_fx[], /* i : input signal for single channel Q(q_data_fx) */
+ const Word16 q_data_fx, /* i : Q-factor of input signal for single channel */
+ const Word16 input_frame, /* i : input frame length per channel */
+ const Word16 nb_bits_metadata /* i : number of metadata bits */
);
ivas_error ivas_cpe_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- const Word16 cpe_id, /* i : CPE # identifier */
- Word32 data_fx_ch0[], /* i : input signal for channel 0 Q(q_data_fx) */
- Word32 data_fx_ch1[], /* i : input signal for channel 1 Q(q_data_fx) */
- Word16 q_data_fx, /* i : Q-factor of input signal for both channels */
- const Word16 input_frame, /* i : input frame length per channel */
- const Word16 nb_bits_metadata, /* i : number of metadata bits */
- Word16 Q_new_out[] );
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ const Word16 cpe_id, /* i : CPE # identifier */
+ Word32 data_fx_ch0[], /* i : input signal for channel 0 Q(q_data_fx) */
+ Word32 data_fx_ch1[], /* i : input signal for channel 1 Q(q_data_fx) */
+ Word16 q_data_fx, /* i : Q-factor of input signal for both channels */
+ const Word16 input_frame, /* i : input frame length per channel */
+ const Word16 nb_bits_metadata, /* i : number of metadata bits */
+ Word16 Q_new_out[]
+);
ivas_error ivas_mct_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- Word32 *data_fx[MCT_MAX_CHANNELS], /* i : input signal buffers Q(q_data_fx) */
- Word16 q_data_fx, /* i : Q-factor of input signal */
- const Word16 input_frame, /* i : input frame length per channel */
- const Word16 nb_bits_metadata /* i : number of metadata bits */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ Word32 *data_fx[MCT_MAX_CHANNELS], /* i : input signal buffers Q(q_data_fx) */
+ Word16 q_data_fx, /* i : Q-factor of input signal */
+ const Word16 input_frame, /* i : input frame length per channel */
+ const Word16 nb_bits_metadata /* i : number of metadata bits */
);
ivas_error ivas_compute_core_buffers_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- Word16 **inp16k_out_fx, /* o : ptr. to inp. signal in the current frame */
- Word16 *old_inp_16k_fx, /* i/o: buffer of old input signal @ 16kHz */
- Word16 new_inp_resamp16k_out_fx[], /* o : new input signal @16kHz, non pre-emphasised, used by the WB TBE/BWE */
- const Word16 input_frame, /* i : frame length */
- const Word16 last_element_mode, /* i : last element mode */
- const Word32 sr_core, /* i : core-coder sampling rate */
- Word32 *ener_fx, /* o : residual energy from Levinson-Durbin Q_r */
- Word16 A_fx[NB_SUBFR16k * ( M + 1 )], /* i/o: A(z) unquantized for the 4 subframes */
- Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* i/o: weighted A(z) unquantized for subframes */
- Word32 epsP[M + 1], /* i/o: LP prediction errors */
- Word16 lsp_new_fx[M], /* i/o: LSPs at the end of the frame */
- Word16 lsp_mid_fx[M], /* i/o: LSPs in the middle of the frame */
+ Encoder_State *st, /* i/o: encoder state structure */
+ Word16 **inp16k_out_fx, /* o : ptr. to inp. signal in the current frame */
+ Word16 *old_inp_16k_fx, /* i/o: buffer of old input signal @ 16kHz */
+ Word16 new_inp_resamp16k_out_fx[], /* o : new input signal @16kHz, non pre-emphasised, used by the WB TBE/BWE */
+ const Word16 input_frame, /* i : frame length */
+ const Word16 last_element_mode, /* i : last element mode */
+ const Word32 sr_core, /* i : core-coder sampling rate */
+ Word32 *ener_fx, /* o : residual energy from Levinson-Durbin Q_r */
+ Word16 A_fx[NB_SUBFR16k * ( M + 1 )], /* i/o: A(z) unquantized for the 4 subframes */
+ Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* i/o: weighted A(z) unquantized for subframes */
+ Word32 epsP[M + 1], /* i/o: LP prediction errors */
+ Word16 lsp_new_fx[M], /* i/o: LSPs at the end of the frame */
+ Word16 lsp_mid_fx[M], /* i/o: LSPs in the middle of the frame */
Word16 Q_old_inp_16k,
Word16 Q_r[2],
- Word16 *Q_new );
+ Word16 *Q_new
+);
ivas_error ivas_enc_fx(
- Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
- const Word16 *data, /* i : input signal Q0 */
- const Word16 n_samples /* i : number of input samples */
+ Encoder_Struct *st_ivas, /* i/o: IVAS encoder structure */
+ const Word16 *data, /* i : input signal Q0 */
+ const Word16 n_samples /* i : number of input samples */
);
void reset_metadata_spatial_fx(
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */
- const Word32 element_brate, /* i : element bitrate */
- Word32 *total_brate, /* o : total bitrate */
- const Word32 core_brate, /* i : core bitrate */
- const Word16 nb_bits_metadata /* i : number of meatdata bits */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+ BSTR_ENC_HANDLE hMetaData, /* i/o: Metadata bitstream handle */
+ const Word32 element_brate, /* i : element bitrate */
+ Word32 *total_brate, /* o : total bitrate */
+ const Word32 core_brate, /* i : core bitrate */
+ const Word16 nb_bits_metadata /* i : number of meatdata bits */
);
void Euler2Quat_fx(
- const Word32 yaw, /* i : yaw (x) Q22 */
- const Word32 pitch, /* i : pitch (y) Q22 */
- const Word32 roll, /* i : roll (z) Q22 */
- IVAS_QUATERNION *quat /* o : quaternion describing the rotation */
+ const Word32 yaw, /* i : yaw (x) Q22 */
+ const Word32 pitch, /* i : pitch (y) Q22 */
+ const Word32 roll, /* i : roll (z) Q22 */
+ IVAS_QUATERNION *quat /* o : quaternion describing the rotation */
);
-float deg2rad(
- float degrees );
Word32 deg2rad_fx(
- Word32 degrees );
+ Word32 degrees
+);
void Quat2EulerDegree_fx(
- const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */
- Word32 *yaw_fx, /* o : yaw */
- Word32 *pitch_fx, /* o : pitch */
- Word32 *roll_fx /* o : roll */
+ const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */
+ Word32 *yaw_fx, /* o : yaw */
+ Word32 *pitch_fx, /* o : pitch */
+ Word32 *roll_fx /* o : roll */
);
void Copy_Quat_fx(
- const IVAS_QUATERNION *in_quat, /* i : quaternion describing the rotation */
- IVAS_QUATERNION *out_quat /* i : quaternion describing the rotation */
+ const IVAS_QUATERNION *in_quat, /* i : quaternion describing the rotation */
+ IVAS_QUATERNION *out_quat /* o : quaternion describing the rotation */
);
void modify_Quat_q_fx(
- const IVAS_QUATERNION *in_quat, /* i : quaternion describing the rotation */
- IVAS_QUATERNION *out_quat, /* i : quaternion describing the rotation */
- Word16 q_new /* i : quaternion describing the rotation */
+ const IVAS_QUATERNION *in_quat, /* i : quaternion describing the rotation */
+ IVAS_QUATERNION *out_quat, /* i : quaternion describing the rotation */
+ Word16 q_new /* o : quaternion describing the rotation */
);
void modify_Rmat_q_fx(
- Word32 Rmat_in[3][3], /* i : real-space rotation matrix for this rotation */
- Word32 Rmat_out[3][3], /* o : real-space rotation matrix for this rotation*/
- Word16 q_cur, /* i : current q factor for rotation matrix */
- Word16 q_new /* i : target q factor for rotation matrix */
+ Word32 Rmat_in[3][3], /* i : real-space rotation matrix for this rotation */
+ Word32 Rmat_out[3][3], /* o : real-space rotation matrix for this rotation */
+ Word16 q_cur, /* i : current q factor for rotation matrix */
+ Word16 q_new /* i : target q factor for rotation matrix */
);
-/*=============================================================================================*/
-/* clang-format off */
+
/*----------------------------------------------------------------------------------*
* General IVAS prototypes
*----------------------------------------------------------------------------------*/
-/*! r: number of channels to be analysed */
-
void copy_encoder_config_ivas_fx(
Encoder_Struct *st_ivas, /* i : IVAS encoder structure */
Encoder_State *st, /* o : encoder state structure */
- const Word16 flag_all /* i : flag 1==update all, 0=partial update Q0*/
+ const Word16 flag_all /* i : flag 1==update all, 0=partial update Q0*/
);
ivas_error create_mct_enc_fx(
@@ -6082,96 +6064,97 @@ void ivas_mct_enc_close_fx(
);
ivas_error pre_proc_front_ivas_fx(
- SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure */
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
- const Word32 element_brate, /* i : SCE/CPE element bitrate Q0*/
- const Word16 nb_bits_metadata, /* i : number of metadata bits Q0*/
- const Word16 input_frame, /* i : frame length Q0*/
- const Word16 n, /* i : channel number Q0*/
- Word16 old_inp_12k8_fx[], /* o : buffer of old input signal Q_new-1*/
- Word16 old_inp_16k_fx[], /* o : buffer of old input signal @16kHz Q_new-1*/
- Word32 *ener_fx, /* o : residual energy from Levinson-Durbin epsP_fx_q*/
- Word16 *relE_fx, /* o : frame relative energy Q8*/
- Word16 A_fx[NB_SUBFR16k * ( M + 1 )], /* o : A(z) unquantized for the 4 subframes Q12*/
- Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* o : weighted A(z) unquantized for subframes Q12*/
- Word32 epsP_fx[M + 1], /* o : LP prediction errors epsP_fx_q*/
+ SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure */
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
+ const Word32 element_brate, /* i : SCE/CPE element bitrate Q0*/
+ const Word16 nb_bits_metadata, /* i : number of metadata bits Q0*/
+ const Word16 input_frame, /* i : frame length Q0*/
+ const Word16 n, /* i : channel number Q0*/
+ Word16 old_inp_12k8_fx[], /* o : buffer of old input signal Q_new-1*/
+ Word16 old_inp_16k_fx[], /* o : buffer of old input signal @16kHz Q_new-1*/
+ Word32 *ener_fx, /* o : residual energy from Levinson-Durbin epsP_fx_q*/
+ Word16 *relE_fx, /* o : frame relative energy Q8*/
+ Word16 A_fx[NB_SUBFR16k * ( M + 1 )], /* o : A(z) unquantized for the 4 subframes Q12*/
+ Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* o : weighted A(z) unquantized for subframes Q12*/
+ Word32 epsP_fx[M + 1], /* o : LP prediction errors epsP_fx_q*/
Word16 *epsP_fx_q,
- Word16 lsp_new_fx[M], /* o : LSPs at the end of the frame Q15*/
- Word16 lsp_mid_fx[M], /* o : LSPs in the middle of the frame Q15*/
- Word16 *vad_hover_flag, /* o : VAD hangover flag Q0*/
- Word16 *attack_flag, /* o : flag signaling attack Q0*/
- Word32 realBuffer_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer Q(q_re_im_buf)*/
- Word32 imagBuffer_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer Q(q_re_im_buf)*/
- Word16 *q_re_im_buf, /* i/o: Q-factor of real and imag buffer */
- Word16 old_wsp_fx[], /* o : weighted input signal buffer q_old_wsp*/
+ Word16 lsp_new_fx[M], /* o : LSPs at the end of the frame Q15*/
+ Word16 lsp_mid_fx[M], /* o : LSPs in the middle of the frame Q15*/
+ Word16 *vad_hover_flag, /* o : VAD hangover flag Q0*/
+ Word16 *attack_flag, /* o : flag signaling attack Q0*/
+ Word32 realBuffer_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer Q(q_re_im_buf)*/
+ Word32 imagBuffer_fx[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer Q(q_re_im_buf)*/
+ Word16 *q_re_im_buf, /* i/o: Q-factor of real and imag buffer */
+ Word16 old_wsp_fx[], /* o : weighted input signal buffer q_old_wsp*/
Word16 *q_old_wsp,
- Word16 pitch_fr_fx[NB_SUBFR], /* o : fractional pitch values Q6*/
- Word16 voicing_fr_fx[NB_SUBFR], /* o : fractional pitch gains Q15*/
- Word16 *loc_harm, /* o : harmonicity flag Q0*/
- Word16 *cor_map_sum_fx, /* o : speech/music clasif. parameter Q8*/
- Word16 *vad_flag_dtx, /* o : HE-SAD flag with additional DTX HO Q0*/
- Word32 enerBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o : energy buffer enerBuffer_fx_exp*/
- Word16 *enerBuffer_fx_exp, /* o : energy buffer */
- Word16 fft_buff_fx[2 * L_FFT], /* o : FFT buffer fft_buff_fx_q*/
- Word16 *fft_buff_fx_q, /* o : FFT buffer */
- const Word16 tdm_A_PCh_fx[M + 1], /* i : unq. LP coeff. of primary channel Q12*/
- const Word16 tdm_lsp_new_PCh_fx[M], /* i : unq. LSPs of primary channel Q15*/
- const Word32 currFlatness_fx, /* i : flatness parameter Q21*/
- const Word16 tdm_ratio_idx, /* i : Current Ratio_L index Q0*/
- Word32 fr_bands_LR_fx[][2 * NB_BANDS], /* i : energy in frequency bands (fr_bands_LR_fx_q) fr_bands_LR_fx_q*/
+ Word16 pitch_fr_fx[NB_SUBFR], /* o : fractional pitch values Q6*/
+ Word16 voicing_fr_fx[NB_SUBFR], /* o : fractional pitch gains Q15*/
+ Word16 *loc_harm, /* o : harmonicity flag Q0*/
+ Word16 *cor_map_sum_fx, /* o : speech/music clasif. parameter Q8*/
+ Word16 *vad_flag_dtx, /* o : HE-SAD flag with additional DTX HO Q0*/
+ Word32 enerBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o : energy buffer enerBuffer_fx_exp*/
+ Word16 *enerBuffer_fx_exp, /* o : energy buffer */
+ Word16 fft_buff_fx[2 * L_FFT], /* o : FFT buffer fft_buff_fx_q*/
+ Word16 *fft_buff_fx_q, /* o : FFT buffer */
+ const Word16 tdm_A_PCh_fx[M + 1], /* i : unq. LP coeff. of primary channel Q12*/
+ const Word16 tdm_lsp_new_PCh_fx[M], /* i : unq. LSPs of primary channel Q15*/
+ const Word32 currFlatness_fx, /* i : flatness parameter Q21*/
+ const Word16 tdm_ratio_idx, /* i : Current Ratio_L index Q0*/
+ Word32 fr_bands_LR_fx[][2 * NB_BANDS], /* i : energy in frequency bands (fr_bands_LR_fx_q) fr_bands_LR_fx_q*/
Word16 fr_bands_LR_fx_q[CPE_CHANNELS],
- const Word16 Etot_LR_fx[], /* i : total energy Left & Right channel Q8*/
- Word32 lf_E_LR_fx[][2 * VOIC_BINS], /* i : per bin spectrum energy in lf, LR channels (lf_E_LR_fx_q)*/
+ const Word16 Etot_LR_fx[], /* i : total energy Left & Right channel Q8*/
+ Word32 lf_E_LR_fx[][2 * VOIC_BINS], /* i : per bin spectrum energy in lf, LR channels (lf_E_LR_fx_q)*/
Word16 lf_E_LR_fx_q,
- const Word16 localVAD_HE_SAD_LR[], /* i : HE-SAD flag without hangover, LR channels Q0*/
- Word32 band_energies_LR_fx[2 * NB_BANDS], /* o : energy in critical bands without minimum noise floor E_MIN (band_energies_LR_fx_q)*/
+ const Word16 localVAD_HE_SAD_LR[], /* i : HE-SAD flag without hangover, LR channels Q0*/
+ Word32 band_energies_LR_fx[2 * NB_BANDS], /* o : energy in critical bands without minimum noise floor E_MIN (band_energies_LR_fx_q)*/
Word16 band_energies_LR_fx_q,
- const Word16 flag_16k_smc, /* i : flag to indicate if the OL SMC is run at 16 kHz Q0*/
- const Word16 front_vad_flag, /* i : front-VAD flag to overwrite VAD decision Q0*/
- const Word16 force_front_vad, /* i : flag to force VAD decision Q0*/
- const Word16 front_vad_dtx_flag, /* i : front-VAD DTX flag to overwrite VAD decision Q0*/
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) Q0*/
- const Word32 last_ivas_total_brate, /* i : last IVAS total bitrate Q0*/
- const Word32 ivas_total_brate, /* i : IVAS total bitrate - for setting the DTX Q0*/
+ const Word16 flag_16k_smc, /* i : flag to indicate if the OL SMC is run at 16 kHz Q0*/
+ const Word16 front_vad_flag, /* i : front-VAD flag to overwrite VAD decision Q0*/
+ const Word16 force_front_vad, /* i : flag to force VAD decision Q0*/
+ const Word16 front_vad_dtx_flag, /* i : front-VAD DTX flag to overwrite VAD decision Q0*/
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) Q0*/
+ const Word32 last_ivas_total_brate, /* i : last IVAS total bitrate Q0*/
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate - for setting the DTX Q0*/
Word16 *Q_new
#ifdef DEBUG_MODE_INFO
,
const Word16 ch_idx
#endif
);
+
ivas_error pre_proc_ivas_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- const Word16 last_element_mode, /* i : last element mode Q0*/
- const Word32 element_brate, /* i : element bitrate Q0*/
- const Word32 last_element_brate, /* i : last element bitrate Q0*/
- const Word16 input_frame, /* i : frame length Q0*/
- Word16 old_inp_12k8_fx[], /* i/o: buffer of old input signal Q_new-1 */
- Word16 old_inp_16k_fx[], /* i/o: buffer of old input signal @ 16kHz Q_new-1 */
- Word16 **inp_fx, /* o : ptr. to inp. signal in the current frame Q_new*/
- Word32 *ener_fx, /* o : residual energy from Levinson-Durbin epsP_fx_q*/
- Word16 A_fx[NB_SUBFR16k * ( M + 1 )], /* i/o: A(z) unquantized for the 4 subframes Q12*/
- Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* i/o: weighted A(z) unquantized for subframes Q14*/
- Word32 epsP_fx[M + 1], /* i : LP prediction errors epsP_fx_q*/
- Word16 *epsP_fx_q, /* i : LP prediction errors */
- Word16 lsp_new_fx[M], /* i/o: LSPs at the end of the frame Q15*/
- Word16 lsp_mid_fx[M], /* i/o: LSPs in the middle of the frame Q15*/
- Word16 *new_inp_resamp16k_fx, /* o : new input signal @16kHz, non pre-emphasised, used by the WB TBE/BWE Q_new-1*/
- Word16 *Voicing_flag, /* o : voicing flag for HQ FEC Q0*/
- Word16 old_wsp_fx[], /* i : weighted input signal buffer e_old_wsp*/
+ Encoder_State *st, /* i/o: encoder state structure */
+ const Word16 last_element_mode, /* i : last element mode Q0*/
+ const Word32 element_brate, /* i : element bitrate Q0*/
+ const Word32 last_element_brate, /* i : last element bitrate Q0*/
+ const Word16 input_frame, /* i : frame length Q0*/
+ Word16 old_inp_12k8_fx[], /* i/o: buffer of old input signal Q_new-1 */
+ Word16 old_inp_16k_fx[], /* i/o: buffer of old input signal @ 16kHz Q_new-1 */
+ Word16 **inp_fx, /* o : ptr. to inp. signal in the current frame Q_new*/
+ Word32 *ener_fx, /* o : residual energy from Levinson-Durbin epsP_fx_q*/
+ Word16 A_fx[NB_SUBFR16k * ( M + 1 )], /* i/o: A(z) unquantized for the 4 subframes Q12*/
+ Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* i/o: weighted A(z) unquantized for subframes Q14*/
+ Word32 epsP_fx[M + 1], /* i : LP prediction errors epsP_fx_q*/
+ Word16 *epsP_fx_q, /* i : LP prediction errors */
+ Word16 lsp_new_fx[M], /* i/o: LSPs at the end of the frame Q15*/
+ Word16 lsp_mid_fx[M], /* i/o: LSPs in the middle of the frame Q15*/
+ Word16 *new_inp_resamp16k_fx, /* o : new input signal @16kHz, non pre-emphasised, used by the WB TBE/BWE Q_new-1*/
+ Word16 *Voicing_flag, /* o : voicing flag for HQ FEC Q0*/
+ Word16 old_wsp_fx[], /* i : weighted input signal buffer e_old_wsp*/
Word16 e_old_wsp,
- const Word16 loc_harm, /* i : harmonicity flag Q0*/
- const Word16 vad_flag_dtx, /* i : HE-SAD flag with additional DTX HO Q0*/
- const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) Q0*/
- const Word16 vad_hover_flag, /* i : VAD hangover flag Q0*/
- const Word16 flag_16k_smc, /* i : flag to indicate if the OL SMC is run at 16 kHz Q0*/
- Word32 enerBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* e_enerBuffer */
+ const Word16 loc_harm, /* i : harmonicity flag Q0*/
+ const Word16 vad_flag_dtx, /* i : HE-SAD flag with additional DTX HO Q0*/
+ const Word16 MCT_flag, /* i : hMCT handle allocated (1) or not (0) Q0*/
+ const Word16 vad_hover_flag, /* i : VAD hangover flag Q0*/
+ const Word16 flag_16k_smc, /* i : flag to indicate if the OL SMC is run at 16 kHz Q0*/
+ Word32 enerBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* e_enerBuffer */
Word16 e_enerBuffer,
- Word16 fft_buff_fx[2 * L_FFT], /* Qx */
- Word16 cor_map_sum_fx, /* Q8 */
+ Word16 fft_buff_fx[2 * L_FFT], /* Qx */
+ Word16 cor_map_sum_fx, /* Q8 */
Word16 *Q_new
);
-/*! r: number of clipped samples */
+
void ivas_initialize_handles_enc_fx(
Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
);
@@ -6197,13 +6180,10 @@ ivas_error ivas_init_decoder_front(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
-
void ivas_mct_dec_close(
MCT_DEC_HANDLE *hMCT /* i/o: MCT decoder structure */
);
-/*! r: number of channels to be synthesised */
-
void copy_decoder_config(
Decoder_Struct *st_ivas, /* i : IVAS decoder structure */
Decoder_State *st /* o : decoder state structure */
@@ -6214,48 +6194,46 @@ void ivas_initialize_handles_dec(
);
ivas_error ivas_core_enc_fx(
- SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure */
- CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
- MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
- const Word16 n_CoreChannels, /* i : number of core channels to be coded Q0*/
- Word16 old_inp_12k8_fx[][L_INP_12k8], /* i : buffer of old input signal Q_new-1*/
- Word16 old_inp_16k_fx[][L_INP], /* i : buffer of old input signal Q_new-1*/
- Word16 Q_new[], /* i : Q factor of speech buffers */
- Word32 ener_fx[], /* i : residual energy from Levinson-Durbin epsP_fx_q*/
- Word16 A_fx[][NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes Q12*/
- Word16 Aw_fx[][NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquantized for subframes Q12*/
- Word32 epsP_fx[][M + 1], /* i : LP prediction errors epsP_fx_q*/
- Word16 epsP_fx_q[], /* i : LP prediction errors */
- Word16 lsp_new_fx[][M], /* i : LSPs at the end of the frame Q15*/
- Word16 lsp_mid_fx[][M], /* i : LSPs in the middle of the frame Q15*/
- const Word16 vad_hover_flag[], /* i : VAD hanglover flag Q0*/
- Word16 attack_flag[], /* i : attack flag (GSC or TC) Q0*/
- Word32 realBuffer_fx[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer q_re_im_buf*/
- Word32 imagBuffer_fx[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer q_re_im_buf*/
- Word16 *q_re_im_buf, /* i : Q factor of re/in CLDFB buffers */
- Word16 old_wsp_fx[][L_WSP], /* i : weighted input signal buffer e_old_wsp*/
- Word16 e_old_wsp[], /* i : Q factor of old_wsp buffer */
- const Word16 loc_harm[], /* i : harmonicity flag Q0*/
- const Word16 cor_map_sum_fx[], /* i : speech/music clasif. parameter Q8*/
- const Word16 vad_flag_dtx[], /* i : HE-SAD flag with additional DTX HO Q0*/
- Word32 enerBuffer_fx[][CLDFB_NO_CHANNELS_MAX], /* o : energy buffer enerBuffer_fx_exp*/
- Word16 enerBuffer_fx_exp[], /* o : energy buffer */
- Word16 fft_buff_fx[][2 * L_FFT], /* i : FFT buffer Qx*/
- const Word16 tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag Q0*/
- const Word16 ivas_format, /* i : IVAS format Q0*/
- const Word16 flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz Q0*/
+ SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure */
+ CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
+ MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
+ const Word16 n_CoreChannels, /* i : number of core channels to be coded Q0*/
+ Word16 old_inp_12k8_fx[][L_INP_12k8], /* i : buffer of old input signal Q_new-1*/
+ Word16 old_inp_16k_fx[][L_INP], /* i : buffer of old input signal Q_new-1*/
+ Word16 Q_new[], /* i : Q factor of speech buffers */
+ Word32 ener_fx[], /* i : residual energy from Levinson-Durbin epsP_fx_q*/
+ Word16 A_fx[][NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes Q12*/
+ Word16 Aw_fx[][NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquantized for subframes Q12*/
+ Word32 epsP_fx[][M + 1], /* i : LP prediction errors epsP_fx_q*/
+ Word16 epsP_fx_q[], /* i : LP prediction errors */
+ Word16 lsp_new_fx[][M], /* i : LSPs at the end of the frame Q15*/
+ Word16 lsp_mid_fx[][M], /* i : LSPs in the middle of the frame Q15*/
+ const Word16 vad_hover_flag[], /* i : VAD hanglover flag Q0*/
+ Word16 attack_flag[], /* i : attack flag (GSC or TC) Q0*/
+ Word32 realBuffer_fx[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer q_re_im_buf*/
+ Word32 imagBuffer_fx[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer q_re_im_buf*/
+ Word16 *q_re_im_buf, /* i : Q factor of re/in CLDFB buffers */
+ Word16 old_wsp_fx[][L_WSP], /* i : weighted input signal buffer e_old_wsp*/
+ Word16 e_old_wsp[], /* i : Q factor of old_wsp buffer */
+ const Word16 loc_harm[], /* i : harmonicity flag Q0*/
+ const Word16 cor_map_sum_fx[], /* i : speech/music clasif. parameter Q8*/
+ const Word16 vad_flag_dtx[], /* i : HE-SAD flag with additional DTX HO Q0*/
+ Word32 enerBuffer_fx[][CLDFB_NO_CHANNELS_MAX], /* o : energy buffer enerBuffer_fx_exp*/
+ Word16 enerBuffer_fx_exp[], /* o : energy buffer */
+ Word16 fft_buff_fx[][2 * L_FFT], /* i : FFT buffer Qx*/
+ const Word16 tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag Q0*/
+ const Word16 ivas_format, /* i : IVAS format Q0*/
+ const Word16 flag_16k_smc /* i : flag to indicate if the OL SMC is run @16 kHz Q0*/
);
void ivas_renderer_select(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
-#ifdef FIX_CREND_SIMPLIFY_CODE
/*! r: secondary binaural renderer type */
-RENDERER_TYPE ivas_renderer_secondary_select(
+RENDERER_TYPE ivas_renderer_secondary_select_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
-#endif
ivas_error ivas_mc_enc_config_fx(
Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
@@ -6266,8 +6244,8 @@ Word16 is_IVAS_bitrate_fx(
const Word32 ivas_total_brate /* i : IVAS total bitrate */
);
-int16_t is_DTXrate(
- const int32_t ivas_total_brate /* i : IVAS total bitrate */
+Word16 is_DTXrate(
+ const Word32 ivas_total_brate /* i : IVAS total bitrate */
);
@@ -6275,28 +6253,28 @@ int16_t is_DTXrate(
* JBM prototypes
*----------------------------------------------------------------------------------*/
-ivas_error ivas_jbm_dec_set_discard_samples(
- Decoder_Struct *st_ivas /* i/o: main IVAS decoder structre */
+ivas_error ivas_jbm_dec_set_discard_samples_fx(
+ Decoder_Struct *st_ivas /* i/o: main IVAS decoder structre */
);
-TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(
- Decoder_Struct *st_ivas /* i : IVAS decoder handle */
+TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode_fx(
+ Decoder_Struct *st_ivas /* i : IVAS decoder handle */
);
-void ivas_jbm_dec_tc_buffer_close(
- DECODER_TC_BUFFER_HANDLE *phTcBuffer /* i/o: TC buffer handle */
+void ivas_jbm_dec_tc_buffer_close_fx(
+ DECODER_TC_BUFFER_HANDLE *phTcBuffer /* i/o: TC buffer handle */
);
void ivas_jbm_dec_td_renderers_adapt_subframes(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
ivas_error ivas_jbm_dec_metadata_open(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void ivas_jbm_masa_sf_to_sf_map(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
@@ -6317,6 +6295,7 @@ void ivas_ism_reset_metadata(
void ivas_ism_reset_metadata_enc(
ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle */
);
+
void ivas_ism_reset_metadata_API(
ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handles */
);
@@ -6371,23 +6350,22 @@ ivas_error ivas_ism_dtx_open(
void ivas_ism_metadata_sid_enc_fx(
ISM_DTX_HANDLE hISMDTX, /* i/o: ISM DTX handle */
- const Word16 flag_noisy_speech, /* i : noisy speech flag */
- const Word16 nchan_ism, /* i : number of objects */
- const Word16 nchan_transport, /* i : number of transport channels */
+ const Word16 flag_noisy_speech, /* i : noisy speech flag */
+ const Word16 nchan_ism, /* i : number of objects */
+ const Word16 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 Word16 sid_flag, /* i : indication of SID frame */
- const Word16 md_diff_flag[], /* i : metadata differental flag */
+ const Word16 sid_flag, /* i : indication of SID frame */
+ const Word16 md_diff_flag[], /* i : metadata differental flag */
BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
- Word16 nb_bits_metadata[] /* o : number of metadata bits */
+ Word16 nb_bits_metadata[] /* o : number of metadata bits */
);
-
-
void ivas_param_ism_compute_noisy_speech_flag_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
);
+
/*----------------------------------------------------------------------------------*
* DFT Stereo prototypes
*----------------------------------------------------------------------------------*/
@@ -6408,14 +6386,14 @@ UWord16 rc_uni_dec_read_bit(
/*! r: Read bit */
UWord16 rc_uni_dec_read_bit_prob_fast(
RangeUniDecState *rc_st_dec, /* i/o: RC state handle */
- const Word16 freq0, /* i : Frequency for symbol 0 */
- const UWord16 tot_shift /* i : Total frequency as a power of 2 */
+ const Word16 freq0, /* i : Frequency for symbol 0 */
+ const UWord16 tot_shift /* i : Total frequency as a power of 2 */
);
/*! r: Read bits */
UWord16 rc_uni_dec_read_bits(
RangeUniDecState *rc_st_dec, /* i/o: RC state handle */
- const Word16 bits /* i : Number of bits */
+ const Word16 bits /* i : Number of bits */
);
@@ -6443,7 +6421,7 @@ void tdm_bit_alloc(
);
/*! r: value of the indice */
-uint16_t get_indice_st(
+UWord16 get_indice_st(
Decoder_State *st, /* i/o: decoder state structure */
const Word32 element_brate, /* i : element bitrate */
const Word16 pos, /* i : absolute position in the bitstream */
@@ -6457,17 +6435,17 @@ uint16_t get_indice_st(
void stereo_mdct_core_enc_fx(
CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
- Word16 new_samples[CPE_CHANNELS][L_INP], /* i : new samples Q0*/
- Word16 old_wsp[CPE_CHANNELS][L_WSP], /* i : 12.8kHz weighted speech (for LTP Qx*/
- Word16 pitch_buf_fx[CPE_CHANNELS][NB_SUBFR16k] /* o : floating pitch for each subframe Q6*/
+ Word16 new_samples[CPE_CHANNELS][L_INP], /* i : new samples Q0*/
+ Word16 old_wsp[CPE_CHANNELS][L_WSP], /* i : 12.8kHz weighted speech (for LTP Qx*/
+ Word16 pitch_buf_fx[CPE_CHANNELS][NB_SUBFR16k] /* o : floating pitch for each subframe Q6*/
);
Word16 write_stereo_to_bitstream_fx
(
STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct, /* i/o: Stereo MDCT encoder structure */
Encoder_State **sts, /* i/o: Encoder state structure */
- Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask Q0*/
- const Word16 mct_on, /* i : flag mct block (1) or stereo (0) Q0*/
+ Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask Q0*/
+ const Word16 mct_on, /* i : flag mct block (1) or stereo (0) Q0*/
BSTR_ENC_HANDLE hBstr /* i/o: bitstream handle */
);
@@ -6487,9 +6465,9 @@ void stereo_cng_dec_update(
*----------------------------------------------------------------------------------*/
void mvc2c(
- const uint8_t x[], /* i : input vector */
- uint8_t y[], /* o : output vector */
- const int16_t n /* i : vector size */
+ const UWord8 x[], /* i : input vector */
+ UWord8 y[], /* o : output vector */
+ const Word16 n /* i : vector size */
);
void stereo_switching_dec(
@@ -6498,28 +6476,25 @@ void stereo_switching_dec(
);
-/*! r: number of bits written */
-
-
-
/*----------------------------------------------------------------------------------*
* MCT prototypes
*----------------------------------------------------------------------------------*/
+
void ivas_mdct_core_whitening_enc_fx(
CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
- Word16 new_samples_fx[CPE_CHANNELS][L_INP], /* i : new samples */
- Word16 old_wsp_fx[CPE_CHANNELS][L_WSP], /* i : 12.8kHz weighted speech (for LTP */
- Word16 pitch_buf[CPE_CHANNELS][NB_SUBFR16k], /* o : floating pitch for each subframe */
- Word32 *mdst_spectrum_long[CPE_CHANNELS], /* o : buffer for MDST spectrum */
- Word16 tnsBits[CPE_CHANNELS][NB_DIV], /* o : buffer TNS bits */
- Word32 *orig_spectrum_long[CPE_CHANNELS], /* o : origingal spectrum w/o whitening */
- Word16 tnsSize[CPE_CHANNELS][NB_DIV], /* o : size of TNS */
- Word16 p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to parameter array */
+ Word16 new_samples_fx[CPE_CHANNELS][L_INP], /* i : new samples */
+ Word16 old_wsp_fx[CPE_CHANNELS][L_WSP], /* i : 12.8kHz weighted speech (for LTP */
+ Word16 pitch_buf[CPE_CHANNELS][NB_SUBFR16k], /* o : floating pitch for each subframe */
+ Word32 *mdst_spectrum_long[CPE_CHANNELS], /* o : buffer for MDST spectrum */
+ Word16 tnsBits[CPE_CHANNELS][NB_DIV], /* o : buffer TNS bits */
+ Word32 *orig_spectrum_long[CPE_CHANNELS], /* o : origingal spectrum w/o whitening */
+ Word16 tnsSize[CPE_CHANNELS][NB_DIV], /* o : size of TNS */
+ Word16 p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to parameter array */
BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- const Word16 mct_on, /* i : flag mct block (1) or stereo (0) */
+ const Word16 mct_on, /* i : flag mct block (1) or stereo (0) */
const Word16 nChannels, /* i : total number of coded channels */
-Word16 mdst_spectrum_e[CPE_CHANNELS][NB_DIV],
-Word16 orig_spectrum_e[CPE_CHANNELS][NB_DIV]
+ Word16 mdst_spectrum_e[CPE_CHANNELS][NB_DIV],
+ Word16 orig_spectrum_e[CPE_CHANNELS][NB_DIV]
);
void splitAvailableBitsMCT_fx(
@@ -6535,24 +6510,24 @@ void enc_prm_igf_mdct(
BSTR_ENC_HANDLE hBstr /* i/o: Bitstream handle */
);
+
/*----------------------------------------------------------------------------------*
* Q Metadata prototypes for DirAC and MASA
*----------------------------------------------------------------------------------*/
-/*! r: number of bits written */
/*! r: number of bits read */
Word16 ivas_qmetadata_dec_decode(
IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
- UWord16 *bitstream, /* i : bitstream */
- Word16 *index, /* i/o: bitstream position */
- const Word16 hodirac_flag /* i : flag to indicate HO-DirAC mode */
+ UWord16 *bitstream, /* i : bitstream */
+ Word16 *index, /* i/o: bitstream position */
+ const Word16 hodirac_flag /* i : flag to indicate HO-DirAC mode */
);
/*! r: number of bits read */
Word16 ivas_qmetadata_dec_decode_hr_384_512(
IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: hQMetaData handle */
- UWord16 *bitstream, /* i : bitstream */
- Word16 *index, /* i/o: bitstream position */
+ UWord16 *bitstream, /* i : bitstream */
+ Word16 *index, /* i/o: bitstream position */
const SPHERICAL_GRID_DATA *sph_grid16, /* i : spherical grid for deindexing */
const Word16 bits_sph_idx,
const Word16 bits_sp_coh,
@@ -6562,14 +6537,13 @@ Word16 ivas_qmetadata_dec_decode_hr_384_512(
/*! r: number of bits read */
Word16 ivas_qmetadata_dec_sid_decode(
IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle */
- UWord16 *bitstream, /* i : bitstream */
- Word16 *index, /* i/o: bitstream position */
- const Word16 nchan_transport, /* i : number of transport channels */
- Word16 *element_mode, /* o : element mode */
- const Word16 ivas_format /* i : IVAS format */
+ UWord16 *bitstream, /* i : bitstream */
+ Word16 *index, /* i/o: bitstream position */
+ const Word16 nchan_transport, /* i : number of transport channels */
+ Word16 *element_mode, /* o : element mode */
+ const Word16 ivas_format /* i : IVAS format */
);
-
UWord16 ivas_qmetadata_reorder_generic_fx(
const Word16 signed_value
);
@@ -6594,39 +6568,38 @@ Word16 ivas_get_sba_dirac_stereo_flag(
* DirAC prototypes
*----------------------------------------------------------------------------------*/
-
ivas_error ivas_dirac_enc_reconfigure(
Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
);
ivas_error ivas_mc_paramupmix_enc_open_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
);
void ivas_mc_paramupmix_enc_close_fx(
- MC_PARAMUPMIX_ENC_HANDLE *hMCParamUpmix, /* i/o: MC Param-Upmix encoder handle */
- const int32_t input_Fs /* i : input sampling rate */
+ MC_PARAMUPMIX_ENC_HANDLE *hMCParamUpmix, /* i/o: MC Param-Upmix encoder handle */
+ const Word32 input_Fs /* i : input sampling rate */
);
ivas_error ivas_mc_paramupmix_dec_open(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void ivas_mc_paramupmix_dec_close(
- MC_PARAMUPMIX_DEC_HANDLE *hMCParamUpmix_out /* i/o: Parametric MC decoder handle */
+ MC_PARAMUPMIX_DEC_HANDLE *hMCParamUpmix_out /* i/o: Parametric MC decoder handle */
);
void ivas_mc_paramupmix_dec_read_BS(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Decoder_State *st, /* i/o: decoder state structure */
- MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix, /* i/o: decoder MC Param-Upmix handle */
- Word16 *nb_bits /* o : number of bits written */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Decoder_State *st, /* i/o: decoder state structure */
+ MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix, /* i/o: decoder MC Param-Upmix handle */
+ Word16 *nb_bits /* o : number of bits written */
);
-void ivas_mc_paramupmix_dec_digest_tc(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord8 nCldfbSlots, /* i : number of CLFBS slots in the transport channels */
- const Word16 nSamplesForRendering /* i : number of samples provided */
+void ivas_mc_paramupmix_dec_digest_tc_fx(
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord8 nCldfbSlots, /* i : number of CLFBS slots in the transport channels */
+ const Word16 nSamplesForRendering /* i : number of samples provided */
);
void ivas_param_mc_set_coded_bands_fx(
@@ -6634,10 +6607,11 @@ void ivas_param_mc_set_coded_bands_fx(
);
UWord16 ivas_param_mc_get_configuration_index_fx(
- const MC_LS_SETUP mc_ls_setup, /* i : MC ls setup */
- const Word32 ivas_total_brate /* i : IVAS total bitrate */
+ const MC_LS_SETUP mc_ls_setup, /* i : MC ls setup */
+ const Word32 ivas_total_brate /* i : IVAS total bitrate */
);
+
/*----------------------------------------------------------------------------------*
* SPAR prototypes
*----------------------------------------------------------------------------------*/
@@ -6648,10 +6622,10 @@ UWord16 ivas_param_mc_get_configuration_index_fx(
ivas_error ivas_spar_md_dec_open(
ivas_spar_md_dec_state_t **hMdDec_out, /* i/o: SPAR MD decoder handle */
const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */
- const Word16 num_channels, /* i : number of internal channels */
- const Word16 sba_order, /* i : SBA order */
- const Word16 sid_format, /* i : SID format */
- const Word32 last_active_ivas_total_brate /* i : IVAS last active bitrate */
+ const Word16 num_channels, /* i : number of internal channels */
+ const Word16 sba_order, /* i : SBA order */
+ const Word16 sid_format, /* i : SID format */
+ const Word32 last_active_ivas_total_brate /* i : IVAS last active bitrate */
);
void ivas_spar_md_dec_close(
@@ -6661,14 +6635,14 @@ void ivas_spar_md_dec_close(
ivas_error ivas_spar_md_dec_init(
ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle */
const DECODER_CONFIG_HANDLE hDecoderConfig, /* i : configuration structure */
- const Word16 num_channels, /* i : number of internal channels */
- const Word16 sba_order /* i : SBA order */
+ const Word16 num_channels, /* i : number of internal channels */
+ const Word16 sba_order /* i : SBA order */
);
/* Transient detector module */
ivas_error ivas_transient_det_open_fx(
ivas_trans_det_state_t **hTranDet, /* i/o: Transient detector handle */
- const Word32 sampling_rate /* i : sampling rate */
+ const Word32 sampling_rate /* i : sampling rate */
);
void ivas_transient_det_close_fx(
@@ -6714,29 +6688,31 @@ void ivas_clear_band_coeff_idx(
/*----------------------------------------------------------------------------------*
* MASA prototypes
*----------------------------------------------------------------------------------*/
+
ivas_error ivas_masa_enc_open_fx(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder handle */
);
void ivas_masa_enc_close_fx(
- MASA_ENCODER_HANDLE *hMasa /* i/o: MASA metadata structure */
+ MASA_ENCODER_HANDLE *hMasa /* i/o: MASA metadata structure */
);
-int16_t ivas_qmetadata_encode_extended_gr_length_fx(
+Word16 ivas_qmetadata_encode_extended_gr_length_fx(
const UWord16 value,
const UWord16 alphabet_size,
- const Word16 gr_param);
+ const Word16 gr_param
+);
void ivas_qmetadata_encode_extended_gr_fx(
- BSTR_ENC_HANDLE hMetaData, /* i/o: q_metadata handle */
- const UWord16 value, /* i : value to be encoded */
- const UWord16 alphabet_size, /* i : alphabet size */
- const Word16 gr_param); /* i : GR order */
-
+ BSTR_ENC_HANDLE hMetaData, /* i/o: q_metadata handle */
+ const UWord16 value, /* i : value to be encoded */
+ const UWord16 alphabet_size, /* i : alphabet size */
+ const Word16 gr_param /* i : GR order */
+);
void ivas_set_qmetadata_maxbit_req_fx(
IVAS_QMETADATA_HANDLE hQMetaData, /* o : qmetadata structure where the requirement value is set */
- const IVAS_FORMAT ivas_format /* i : IVAS format */
+ const IVAS_FORMAT ivas_format /* i : IVAS format */
);
@@ -6745,7 +6721,7 @@ void ivas_set_qmetadata_maxbit_req_fx(
*-----------------------------------------------------------------------------------*/
void ivas_binaural_hrtf_close_fx(
- HRTFS_FASTCONV_HANDLE *hHrtfFastConv /* i/o: decoder binaural hrtf handle */
+ HRTFS_FASTCONV_HANDLE *hHrtfFastConv /* i/o: decoder binaural hrtf handle */
);
/*----------------------------------------------------------------------------------*
@@ -6753,7 +6729,7 @@ void ivas_binaural_hrtf_close_fx(
*----------------------------------------------------------------------------------*/
void ivas_ism_renderer_close(
- ISM_RENDERER_HANDLE *hIsmRendererData /* i/o: ISM renderer handle */
+ ISM_RENDERER_HANDLE *hIsmRendererData /* i/o: ISM renderer handle */
);
@@ -6773,26 +6749,24 @@ void panning_wrap_angles(
* McMASA prototypes
*----------------------------------------------------------------------------------*/
-
ivas_error ivas_mcmasa_dec_reconfig(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder handle */
);
void ivas_mcmasa_dmx_modify_fx(
- const Word16 n_samples, /* i : input frame length in samples */
- Word32 dmx_fx[][L_FRAME48k + NS2SA(48000, IVAS_FB_ENC_DELAY_NS)], /* i/o: downmix signal to be transformed into another format Qx*/
- Word16 dmx_Q[], /* i/o : Q of the intput signal which is being transformed*/
- const Word16 n_chnls_dmx_old, /* i : number of downmix channels in the old format Q0 */
- const Word16 n_chnls_dmx_new /* i : number of downmix channels in the target format Q0*/
+ const Word16 n_samples, /* i : input frame length in samples */
+ Word32 dmx_fx[][L_FRAME48k + NS2SA(48000, IVAS_FB_ENC_DELAY_NS)], /* i/o: downmix signal to be transformed into another format Qx*/
+ Word16 dmx_Q[], /* i/o : Q of the intput signal which is being transformed */
+ const Word16 n_chnls_dmx_old, /* i : number of downmix channels in the old format Q0 */
+ const Word16 n_chnls_dmx_new /* i : number of downmix channels in the target format Q0 */
);
ivas_error ivas_mono_dmx_renderer_open(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
-
void ivas_mono_dmx_renderer_close(
- MONO_DOWNMIX_RENDERER_HANDLE *hMonoDmxRenderer /* i/ i/o: Mono downmix structure */
+ MONO_DOWNMIX_RENDERER_HANDLE *hMonoDmxRenderer /* i/ i/o: Mono downmix structure */
);
@@ -6804,6 +6778,17 @@ void ivas_lfe_lpf_enc_close_fx(
ivas_filters_process_state_t **hLfeLpf /* i/o: LFE LPF handle */
);
+ivas_error ivas_create_lfe_lpf_enc_fx(
+ ivas_filters_process_state_t **hLfeLpf, /* o : LFE LPF handle */
+ const Word32 input_Fs /* i : input sampling rate */
+);
+
+void ivas_lfe_lpf_enc_apply_fx(
+ ivas_filters_process_state_t *hLfeLpf, /* i/o: LFE LPF handle */
+ Word32 data_lfe_ch[], /* i/o: LFE signal */
+ const Word16 input_frame /* i : input frame length per channel */
+);
+
/*----------------------------------------------------------------------------------*
* LFE Coding prototypes
@@ -6811,7 +6796,7 @@ void ivas_lfe_lpf_enc_close_fx(
ivas_error ivas_create_lfe_enc_fx(
LFE_ENC_HANDLE *hLFE, /* o : IVAS LFE encoder structure */
- const Word32 input_Fs /* i : input sampling rate */
+ const Word32 input_Fs /* i : input sampling rate */
);
void ivas_lfe_enc_close_fx(
@@ -6819,60 +6804,62 @@ void ivas_lfe_enc_close_fx(
);
void ivas_filters_init_fx(
- ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
- const Word32 *filt_coeff_fx, /* i : filter coefficients Q31- *filt_coeff_e */
- const Word16 *filt_coeff_e, /* i : exponents of filter coefficients */
- const Word16 order ) ;
+ ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
+ const Word32 *filt_coeff_fx, /* i : filter coefficients Q31- *filt_coeff_e */
+ const Word16 *filt_coeff_e, /* i : exponents of filter coefficients */
+ const Word16 order
+);
void ivas_filter_process_fx(
- ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
- Word32 *pIn_Out_fx, /* i/o: signal subject to filtering Q(q_factor) */
- const Word16 length, /* i : filter order */
- Word16 q_factor );
+ ivas_filters_process_state_t *filter_state, /* i/o: filter state handle */
+ Word32 *pIn_Out_fx, /* i/o: signal subject to filtering Q(q_factor) */
+ const Word16 length, /* i : filter order */
+ Word16 q_factor
+);
/*----------------------------------------------------------------------------------*
* OSBA prototypes
*----------------------------------------------------------------------------------*/
+
ivas_error ivas_osba_enc_reconfig(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
);
void ivas_set_surplus_brate_enc(
- Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
+ Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
#ifdef DEBUG_MODE_INFO
,
- const int16_t *nb_bits_metadata /* i : number of metadata bits */
+ const int16_t *nb_bits_metadata /* i : number of metadata bits */
#endif
);
void ivas_set_surplus_brate_dec(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- int32_t *ism_total_brate /* i : ISM total bitrate */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ Word32 *ism_total_brate /* i : ISM total bitrate */
);
ivas_error ivas_omasa_separate_object_renderer_open(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
void ivas_omasa_separate_object_renderer_close(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
);
+
/*----------------------------------------------------------------------------------*
* Filter-bank (FB) Mixer
*----------------------------------------------------------------------------------*/
ivas_error ivas_fb_set_cfg(
IVAS_FB_CFG **pFb_cfg_out, /* o : FB config. handle */
- const Word16 ivas_format, /* i : IVAS format */
- const Word16 num_in_chans, /* i : number of FB input channels */
- const Word16 num_out_chans, /* i : number of FB output channels */
- const Word16 active_w_mixing, /* i : active_w_mixing flag */
- const Word32 sampling_Fs, /* i : sampling rate */
- const Word16 nachan_dirac_ana /* i : number of DirAR analysis channels */
+ const Word16 ivas_format, /* i : IVAS format */
+ const Word16 num_in_chans, /* i : number of FB input channels */
+ const Word16 num_out_chans, /* i : number of FB output channels */
+ const Word16 active_w_mixing, /* i : active_w_mixing flag */
+ const Word32 sampling_Fs, /* i : sampling rate */
+ const Word16 nachan_dirac_ana /* i : number of DirAR analysis channels */
);
-
-/*=============================================================================================*/
-
+/* clang-format on */
#endif
diff --git a/lib_com/ivas_rom_com.h b/lib_com/ivas_rom_com.h
index 3c24b682315d2f2f108f56482978e7c6a0efcccf..5072e385f79bdc52d1785322daae59dde072cfa3 100644
--- a/lib_com/ivas_rom_com.h
+++ b/lib_com/ivas_rom_com.h
@@ -294,6 +294,9 @@ extern const Word32 diffuseness_thresholds_hr_fx[HR_MASA_ER_LEVELS + 1];
extern const Word32 no_phi_masa_inv_fx[NO_SPHERICAL_GRIDS][MAX_NO_THETA];
extern const Word32 azimuth_cb_fx[8];
extern const Word32 delta_theta_masa_fx[NO_SPHERICAL_GRIDS - 2];
+#ifdef OBJ_EDIT_BASOP
+extern const Word32 delta_theta_masa_inv_fx[NO_SPHERICAL_GRIDS - 2];
+#endif
extern const Word16 coherence_cb0_masa_Q14[DIRAC_DIFFUSE_LEVELS * 2 * MASA_NO_CV_COH];
extern const Word32 coherence_cb0_masa_fx[DIRAC_DIFFUSE_LEVELS * 2 * MASA_NO_CV_COH];
extern const Word16 coherence_cb1_masa_Q15[MASA_NO_CV_COH1 * MASA_MAXIMUM_CODING_SUBBANDS]; /* 25 */
diff --git a/lib_com/ivas_rom_com_fx.c b/lib_com/ivas_rom_com_fx.c
index 395a3c08f49c990f899bcab877a20a60ff2f5bf6..4b14f6d5acaa16e1b3e765a0169d67a7e0659e50 100644
--- a/lib_com/ivas_rom_com_fx.c
+++ b/lib_com/ivas_rom_com_fx.c
@@ -4406,6 +4406,13 @@ const Word32 delta_theta_masa_fx[NO_SPHERICAL_GRIDS - 2] = {
188743680, 188743680, 150994944, 106954752, 83886080, 62914560, 45214596, 28101836, 20971520
};
+#ifdef OBJ_EDIT_BASOP
+// Q31
+const Word32 delta_theta_masa_inv_fx[NO_SPHERICAL_GRIDS - 2] = {
+ 47721859, 47721859, 59652324, 84215045, 107374182, 143165577, 199209986, 320519947, 429496730
+};
+#endif
+
// q = 14
const Word16 coherence_cb0_masa_Q14[DIRAC_DIFFUSE_LEVELS * 2 * MASA_NO_CV_COH] = {
783, 4173, 9036, 16163, 22238, 27587, 32234, 0,
diff --git a/lib_com/ivas_rotation_com_fx.c b/lib_com/ivas_rotation_com_fx.c
index a922082f7242efab7483136bb97b39b77346eec8..d399c6a660e352ebd6ad625d8d13753c88d432a0 100644
--- a/lib_com/ivas_rotation_com_fx.c
+++ b/lib_com/ivas_rotation_com_fx.c
@@ -85,9 +85,10 @@ void Euler2Quat_fx(
*
* Quaternion q factor modification
*------------------------------------------------------------------------*/
+
void Copy_Quat_fx(
const IVAS_QUATERNION *in_quat, /* i : quaternion describing the rotation */
- IVAS_QUATERNION *out_quat /* i : quaternion describing the rotation */
+ IVAS_QUATERNION *out_quat /* o : quaternion describing the rotation */
)
{
out_quat->q_fact = in_quat->q_fact;
@@ -104,14 +105,16 @@ void Copy_Quat_fx(
return;
}
+
/*-------------------------------------------------------------------------
* Scale_Quat_fx()
*
* Quaternion q factor modification
*------------------------------------------------------------------------*/
+
void modify_Quat_q_fx(
const IVAS_QUATERNION *in_quat, /* i : quaternion describing the rotation */
- IVAS_QUATERNION *out_quat, /* i : quaternion describing the rotation */
+ IVAS_QUATERNION *out_quat, /* o : quaternion describing the rotation */
Word16 q_new /* i : quaternion describing the rotation */
)
{
@@ -123,16 +126,18 @@ void modify_Quat_q_fx(
return;
}
+
/*-------------------------------------------------------------------------
* modify_Rmat_q_fx()
*
* Rotation matrix q factor modification
*------------------------------------------------------------------------*/
+
void modify_Rmat_q_fx(
- Word32 Rmat_in[3][3], /* i : real-space rotation matrix for this rotation */
- Word32 Rmat_out[3][3], /* o : real-space rotation matrix for this rotation*/
+ Word32 Rmat_in[3][3], /* i : real-space rotation matrix for this rotation */
+ Word32 Rmat_out[3][3], /* o : real-space rotation matrix for this rotation */
Word16 q_cur, /* i : current q factor for rotation matrix */
- Word16 q_new /* i : target q factor for rotation matrix */
+ Word16 q_new /* i : target q factor for rotation matrix */
)
{
Word16 j, k;
@@ -148,11 +153,13 @@ void modify_Rmat_q_fx(
return;
}
+
/*-------------------------------------------------------------------------
* Quat2EulerDegree()
*
* Quaternion handling: calculate corresponding Euler angles in degrees
*------------------------------------------------------------------------*/
+
void Quat2EulerDegree_fx(
const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */
Word32 *yaw_fx, /* o : yaw */
@@ -240,6 +247,7 @@ void Quat2EulerDegree_fx(
*
* Converts degrees to normalized radians
*------------------------------------------------------------------------*/
+
Word32 deg2rad_fx(
Word32 degrees // Q22
)
@@ -255,18 +263,3 @@ Word32 deg2rad_fx(
return Mpy_32_32( PI_OVER_180_FX, degrees ); // Q22
}
-
-float deg2rad(
- float degrees )
-{
- while ( degrees >= 180.0f )
- {
- degrees = degrees - 360.0f;
- }
- while ( degrees <= -180.0f )
- {
- degrees = degrees + 360.0f;
- }
-
- return PI_OVER_180 * degrees;
-}
diff --git a/lib_com/ivas_spar_com_fx.c b/lib_com/ivas_spar_com_fx.c
index 685d8de54245ba5dc3b79f32e24167c8d77ecb91..afb639ef00c92528308d8e5ceabf7085007fd8c4 100644
--- a/lib_com/ivas_spar_com_fx.c
+++ b/lib_com/ivas_spar_com_fx.c
@@ -2369,7 +2369,6 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
}
ELSE IF( EQ_16( num_dmx, 3 ) )
{
-#ifdef FIX_1970_SBA_CRASH
Word64 re64[2];
Word32 re32[2], re32_2;
Word16 qtmp2;
@@ -2399,80 +2398,6 @@ static void ivas_calc_p_coeffs_per_band_enc_fx(
q_tmp = s_min( 63, qtmp2 );
recon_uu_re[0][0] = L_max( 0, re32_2 );
move32();
-#else
- Word32 re1[2], re2;
- Word16 q_re1[2];
- set32_fx( re1, 0, 2 );
- set16_fx( q_re1, 31, 2 );
-
- FOR( j = 0; j < 2; j++ )
- {
- FOR( k = 0; k < 2; k++ )
- {
- Word32 re;
- W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[0][k], cov_dd_re[k][j] ); // q_C_re+q_cov_dd_re
- q_tmp = sub( W_norm( W_tmp ), 33 );
- re = W_shl_sat_l( W_tmp, q_tmp ); // q_C_re+q_cov_dd_re+q_tmp
- q_tmp = add( add( q_C_re, q_tmp ), q_cov_dd_re );
- if ( W_tmp == 0 )
- {
- q_tmp = 31;
- move16();
- }
-
- IF( LT_16( q_tmp, q_re1[j] ) )
- {
- re1[j] = L_shr( re1[j], sub( q_re1[j], q_tmp ) ); // q_tmp
- move32();
- q_re1[j] = q_tmp;
- move16();
- }
- ELSE
- {
- re = L_shr( re, sub( q_tmp, q_re1[j] ) ); // q_re1[j]
- }
- re1[j] = L_add( re1[j], re ); // q_re1[j]
- move32();
- }
- }
-
- W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[0][0], re1[0] ); // q_C_re+q_re1[0]
- q_tmp = sub( W_norm( W_tmp ), 33 );
- re2 = W_shl_sat_l( W_tmp, q_tmp ); // q_C_re+q_re1[0]+q_tmp
- q_tmp = add( add( q_C_re, q_tmp ), q_re1[0] );
- if ( W_tmp == 0 )
- {
- q_tmp = 31;
- move16();
- }
- recon_uu_re[0][0] = re2; // q_C_re+q_re1[0]+q_tmp-32
- move32();
-
- W_tmp = W_mult0_32_32( pSparMd->band_coeffs[b_ts_idx].C_re_fx[0][1], re1[1] ); // q_C_re+q_re1[1]
- q_tmp1 = sub( W_norm( W_tmp ), 33 );
- re2 = W_shl_sat_l( W_tmp, q_tmp1 ); // q_C_re+q_re1[1]+q_tmp1
- q_tmp1 = add( add( q_C_re, q_tmp1 ), q_re1[1] );
- if ( W_tmp == 0 )
- {
- q_tmp1 = 31;
- move16();
- }
-
- IF( LT_16( q_tmp, q_tmp1 ) )
- {
- re2 = L_shr( re2, sub( q_tmp1, q_tmp ) ); // q_tmp
- }
- ELSE
- {
- recon_uu_re[0][0] = L_shr( recon_uu_re[0][0], sub( q_tmp, q_tmp1 ) ); // q_tmp1
- move32();
- q_tmp = q_tmp1;
- move16();
- }
-
- recon_uu_re[0][0] = L_add( recon_uu_re[0][0], re2 ); // q_tmp
- move32();
-#endif
IF( LT_16( q_cov_uu_re, q_tmp ) )
{
diff --git a/lib_com/ivas_stat_com.h b/lib_com/ivas_stat_com.h
index 1f7ea778d06534d594480c2be3ad04c0278fed6d..4678acd3191020245245df72f3af7e46e914a5bb 100644
--- a/lib_com/ivas_stat_com.h
+++ b/lib_com/ivas_stat_com.h
@@ -65,8 +65,7 @@ typedef struct
Word32 yaw_fx; /* yaw value read from the input metadata file */ /* Q22 */
Word32 pitch_fx; /* pitch value read from the input metadata file */ /* Q22 */
-#ifdef OBJ_EDITING_API
- Word32 gain_fx; /* Q31 */
+ Word32 gain_fx; /* Q29 */
Word32 edited_azimuth_fx; /* Q22 */
Word32 edited_elevation_fx; /* Q22 */
@@ -74,8 +73,7 @@ typedef struct
Word32 edited_yaw_fx; /* Q22 */
Word32 edited_pitch_fx; /* Q22 */
- Word32 edited_gain_fx; /* Q31 */
-#endif
+ Word32 edited_gain_fx; /* Q29 */
Word16 non_diegetic_flag; /* Non-diegetic (non-headtracked) object flag */
diff --git a/lib_com/ivas_tools_fx.c b/lib_com/ivas_tools_fx.c
index 9001276bf722b5119aeb3458377a247a80ed0add..46067d828c93467479e6b71edf697f4f246736ec 100644
--- a/lib_com/ivas_tools_fx.c
+++ b/lib_com/ivas_tools_fx.c
@@ -189,57 +189,8 @@ void ivas_syn_output_f_fx(
*
*
*-------------------------------------------------------------------*/
-void mvr2r_inc_fixed_one(
- const Word32 x_fx[], /* i : input vector Q29*/
- const Word16 x_inc, /* i : increment for vector x[] Q0*/
- Word32 y_fx[], /* o : output vector Q29*/
- const Word16 y_inc, /* i : increment for vector y[] Q0*/
- const Word16 n /* i : vector size Q0*/
-)
-{
- Word16 i;
- Word16 ix;
- Word16 iy;
-
- IF( n <= 0 )
- {
- /* cannot transfer vectors with size 0 */
- return;
- }
-
- IF( y_fx < x_fx )
- {
- ix = 0;
- move16();
- iy = 0;
- move16();
- FOR( i = 0; i < n; i++ )
- {
- y_fx[iy] = x_fx[ix]; /*Q29*/
- move32();
- ix = ix + x_inc;
- iy = iy + y_inc;
- }
- }
- ELSE
- {
- ix = imult1616( sub( n, 1 ), x_inc ); /*Q0*/
- iy = imult1616( sub( n, 1 ), y_inc ); /*Q0*/
- FOR( i = ( n - 1 ); i >= 0; i-- )
- {
- y_fx[iy] = x_fx[ix]; /*Q29*/
- move32();
-
- ix = ix - x_inc;
- iy = iy - y_inc;
- }
- }
-
- return;
-}
-
-void mvr2r_inc_fixed(
+void mvr2r_inc_fx(
const Word32 x_fx[], /* i : input vector Q29*/
const Word16 x_inc, /* i : increment for vector x[] Q0*/
Word32 y_fx[], /* o : output vector Q29*/
@@ -348,45 +299,8 @@ void v_add_inc_fx(
* Multiplication of two vectors with explicit increments
*-------------------------------------------------------------------*/
-void v_mult_inc_fx(
- const Word32 x1_fx[], /* i : Input vector 1 x1_q_fx*/
- Word16 *x1_q_fx,
- const Word16 x1_inc, /* i : Increment for input vector 1 Q0*/
- const Word32 x2_fx[], /* i : Input vector 2 x2_q_fx*/
- Word16 *x2_q_fx,
- const Word16 x2_inc, /* i : Increment for input vector 1 Q0*/
- Word32 y_fx[], /* o : Output vector that contains vector 1 .* vector 2 y_q_fx*/
- Word16 *y_q_fx,
- const Word16 y_inc, /* i : increment for vector y[i] Q0*/
- const Word16 N /* i : Vector length Q0*/
-)
-{
- Word16 i;
- Word16 ix1 = 0;
- Word16 ix2 = 0;
- Word16 iy = 0;
-
- move16();
- move16();
- move16();
-
- FOR( i = 0; i < N; i++ )
- {
- y_fx[iy] = Mpy_32_32( x1_fx[ix1], x2_fx[ix2] ); /* x1_q_fx + x2_q_fx - 31 */
- move32();
- y_q_fx[iy] = sub( add( x1_q_fx[ix1], x2_q_fx[ix2] ), 31 );
- move16();
-
- ix1 = add( ix1, x1_inc ); /*Q0*/
- ix2 = add( ix2, x2_inc ); /*Q0*/
- iy = add( iy, y_inc ); /*Q0*/
- }
-
- return;
-}
-
// when buffers have constant q/
-void v_mult_inc_fixed(
+void v_mult_inc_fx(
const Word32 x1_fx[], /* i : Input vector 1 Qx1*/
const Word16 x1_inc, /* i : Increment for input vector 1 Q0*/
const Word32 x2_fx[], /* i : Input vector 2 Qx2*/
@@ -441,28 +355,6 @@ void v_addc_fx(
return;
}
-/*-------------------------------------------------------------------*
- * v_addc()
- *
- * Addition of constant to vector
- *-------------------------------------------------------------------*/
-void v_addc_fixed(
- const Word32 x[], /* i : Input vector Qx*/
- const Word32 c, /* i : Constant Qx*/
- Word32 y[], /* o : Output vector that contains c*x Qx*/
- const Word16 N /* i : Vector length Q0*/
-)
-{
- Word16 i;
-
- FOR( i = 0; i < N; i++ )
- {
- y[i] = L_add( c, x[i] ); /*Qx*/
- move32();
- }
-
- return;
-}
/*-------------------------------------------------------------------*
* v_min_fx()
@@ -528,6 +420,7 @@ void v_min_fx(
*
* square root of vector
*-------------------------------------------------------------------*/
+
void v_sqrt_fx(
const Word32 x[], /* i : Input vector Qx*/
Word16 exp[],
@@ -546,6 +439,7 @@ void v_sqrt_fx(
return;
}
+
/*-------------------------------------------------------------------*
* v_sub_s()
*
@@ -589,6 +483,7 @@ void v_sub32_fx(
return;
}
+
/*---------------------------------------------------------------------*
* dot_product_cholesky()
*
@@ -598,7 +493,7 @@ void v_sub32_fx(
*---------------------------------------------------------------------*/
/*! r: the dot product x'*A*A'*x */
-Word64 dot_product_cholesky_fixed(
+Word64 dot_product_cholesky_fx(
const Word32 *x, /* i : vector x Q31 - exp_x*/
const Word32 *A, /* i : Cholesky matrix A Q31 - exp_A*/
const Word16 N /* i : vector & matrix size Q0*/
@@ -630,7 +525,16 @@ Word64 dot_product_cholesky_fixed(
return suma;
}
-void v_mult_mat_fixed(
+
+/*---------------------------------------------------------------------*
+ * v_mult_mat_fx()
+ *
+ * Multiplication of row vector x by matrix A, where x has size Nr and
+ * A has size Nr x Nc ans it is stored column-wise in memory.
+ * The resulting row vector y has size Nc
+ *---------------------------------------------------------------------*/
+
+void v_mult_mat_fx(
Word32 *y, /* o : the product x*A Qx - guardbits*/
const Word32 *x, /* i : vector x Qx*/
const Word32 *A, /* i : matrix A Q31*/
@@ -662,108 +566,6 @@ void v_mult_mat_fixed(
MVR2R_WORD32( tmp_y, y, Nc ); /*Qx - guardbits*/
}
-Word32 dot_product_cholesky_fx(
- const Word32 *x, /* i : vector x Qx1*/
- const Word32 *A, /* i : Cholesky matrix A Qx2*/
- const Word16 N /* i : vector & matrix size Q0*/
-)
-{
- Word16 i, j;
- Word32 suma, tmp_sum;
- const Word32 *pt_x, *pt_A;
-
- pt_A = A;
- suma = 0;
- move32();
-
- FOR( i = 0; i < N; i++ )
- {
- tmp_sum = 0;
- move32();
- pt_x = x;
- FOR( j = 0; j <= i; j++ )
- {
- tmp_sum = L_add( tmp_sum, Mpy_32_32( *pt_x++, *pt_A++ ) ); /*Qx1 + Qx2 - 31*/
- }
-
- suma = L_add( suma, Mpy_32_32( tmp_sum, tmp_sum ) );
- }
-
- return suma;
-}
-
-
-/*---------------------------------------------------------------------*
- * v_mult_mat_fx()
- *
- * Multiplication of row vector x by matrix A, where x has size Nr and
- * A has size Nr x Nc ans it is stored column-wise in memory.
- * The resulting row vector y has size Nc
- *---------------------------------------------------------------------*/
-
-void v_mult_mat_fx(
- Word32 *y_fx, /* o : the product x*A y_q_fx*/
- Word16 *y_q_fx,
- const Word32 *x_fx, /* i : vector x x_q_fx*/
- Word16 *x_q_fx,
- const Word32 *A_fx, /* i : matrix A A_q_fx*/
- Word16 *A_q_fx,
- const Word16 Nr, /* i : number of rows Q0*/
- const Word16 Nc /* i : number of columns Q0*/
-)
-{
- Word16 i, j;
- const Word32 *pt_x_fx, *pt_A_fx;
- Word32 *pt_y_fx;
- Word32 tmp_y_fx[MAX_V_MULT_MAT];
- Word32 temp;
- Word16 temp_q;
-
- pt_y_fx = tmp_y_fx;
- pt_A_fx = A_fx; /*A_q_fx*/
- pt_x_fx = x_fx; /*x_q_fx*/
-
- FOR( i = 0; i < Nc; i++ )
- {
- pt_x_fx = x_fx; /*x_q_fx*/
- *pt_y_fx = 0;
- move32();
- y_q_fx[i] = 0;
- move32();
- FOR( j = 0; j < Nr; j++ )
- {
- temp = Mpy_32_32( *pt_x_fx++, *pt_A_fx++ ); /*x_q_fx + A_q_fx - 31*/
- temp_q = sub( add( x_q_fx[j], A_q_fx[Nr * i + j] ), 31 );
- IF( j == 0 )
- {
- *pt_y_fx = temp;
- move32();
- y_q_fx[i] = temp_q;
- move16();
- }
- ELSE
- {
- IF( GT_16( y_q_fx[i], temp_q ) )
- {
- *pt_y_fx = L_add( L_shr( *pt_y_fx, sub( y_q_fx[i], temp_q ) ), temp );
- move32();
- y_q_fx[i] = temp_q;
- move16();
- }
- ELSE
- {
- *pt_y_fx = L_add( *pt_y_fx, L_shr( temp, sub( temp_q, y_q_fx[i] ) ) );
- move32();
- }
- }
- }
- pt_y_fx++;
- }
-
- MVR2R_WORD32( tmp_y_fx, y_fx, Nc ); /*y_q_fx*/
-
- return;
-}
/*---------------------------------------------------------------------*
* logsumexp()
@@ -812,14 +614,17 @@ Word32 logsumexp_fx(
temp32 = L_add( BASOP_Util_Log2( sum ), L_shl( sum_e, Q25 ) ); /*Q25*/
temp32 = Mpy_32_32( temp32, 1488522239 ); /*logf(x) = log2(x)*logf(2) Q25*/
temp32 = L_add( L_shr( temp32, sub( x_e, 6 ) ), max_exp ); // q = 31-x_e
- return temp32; /*31-x_e*/
+
+ return temp32; /*31-x_e*/
}
+
/*---------------------------------------------------------------------*
* lin_interp()
*
* Linearly maps x from source range to the target range
*---------------------------------------------------------------------*/
+
/*! r: mapped output value */
Word32 lin_interp32_fx(
const Word32 x, /* i : the value to be mapped Qx */
@@ -858,6 +663,7 @@ Word32 lin_interp32_fx(
return temp32;
}
+
/*-------------------------------------------------------------------*
* check_bounds_s_fx()
*
@@ -2124,6 +1930,7 @@ static float wrap_azi(
return azi;
}
+
/* helper function for panning_wrap_angles */
static Word32 wrap_azi_fx(
const Word32 azi_deg /* Q22 */ )
@@ -2144,6 +1951,8 @@ static Word32 wrap_azi_fx(
return azi; /*Q22*/
}
+
+
/*-------------------------------------------------------------------*
* panning_wrap_angles()
*
@@ -2152,6 +1961,7 @@ static Word32 wrap_azi_fx(
* elevation = [-90, 90]
* Considers direction changes from large elevation values
*-------------------------------------------------------------------*/
+
void panning_wrap_angles(
const float azi_deg, /* i : azimuth in degrees for panning direction (positive left) */
const float ele_deg, /* i : elevation in degrees for panning direction (positive up) */
@@ -2211,6 +2021,8 @@ void panning_wrap_angles(
return;
}
}
+
+
/*-------------------------------------------------------------------*
* panning_wrap_angles_fx()
*
@@ -2219,6 +2031,7 @@ void panning_wrap_angles(
* elevation = [-90, 90]
* Considers direction changes from large elevation values
*-------------------------------------------------------------------*/
+
void panning_wrap_angles_fx(
const Word32 azi_deg, /* i : azimuth in degrees for panning direction (positive left) Q22 */
const Word32 ele_deg, /* i : elevation in degrees for panning direction (positive up) Q22 */
@@ -2294,7 +2107,7 @@ void panning_wrap_angles_fx(
* (modified version of v_sort() to return an index array)
*-------------------------------------------------------------------------*/
-void v_sort_ind_fixed(
+void v_sort_ind_fx(
Word32 *x, /* i/o: Vector to be sorted Qx*/
Word16 *idx, /* o : Original index positions Q0*/
const Word16 len /* i : vector length Q0*/
diff --git a/lib_com/lerp_fx.c b/lib_com/lerp_fx.c
index 88492ecdb11e61a9c65645076a111ef749dda374..e35814b12b18064be9cfbc9d996509398609833d 100644
--- a/lib_com/lerp_fx.c
+++ b/lib_com/lerp_fx.c
@@ -132,13 +132,22 @@ void lerp( const Word16 *f /*Qx*/, Word16 *f_out /*Qx*/, Word16 bufferNewSize /*
{
lerp_proc( f, f_out, bufferNewSize, bufferOldSize );
}
+
+ return;
}
+
+
/*-------------------------------------------------------------*
* procedure lerp_proc() *
* *
* *
*-------------------------------------------------------------*/
-static void lerp_proc( const Word16 *f /*Qx*/, Word16 *f_out /*Qx*/, Word16 bufferNewSize /*Q0*/, Word16 bufferOldSize /*Q0*/ )
+
+static void lerp_proc(
+ const Word16 *f /*Qx*/,
+ Word16 *f_out /*Qx*/,
+ Word16 bufferNewSize /*Q0*/,
+ Word16 bufferOldSize /*Q0*/ )
{
Word16 i, idx, n;
@@ -236,7 +245,11 @@ static void lerp_proc( const Word16 *f /*Qx*/, Word16 *f_out /*Qx*/, Word16 buff
}
-static void lerp_proc32( Word32 *f /*Qx*/, Word32 *f_out /*Qx*/, Word16 bufferNewSize /*Q0*/, Word16 bufferOldSize /*Q0*/ )
+static void lerp_proc32(
+ Word32 *f /*Qx*/,
+ Word32 *f_out /*Qx*/,
+ Word16 bufferNewSize /*Q0*/,
+ Word16 bufferOldSize /*Q0*/ )
{
Word16 i, idx, n;
@@ -338,7 +351,12 @@ static void L_lerp_proc_fx( const Word32 *f_fx, Word32 *f_out_fx, const Word16 b
* *
*-------------------------------------------------------------*/
-void L_lerp_fx( Word32 *f /*q*/, Word32 *f_out /*q*/, Word16 bufferNewSize /*Q0*/, Word16 bufferOldSize /*Q0*/, Word16 *q )
+void L_lerp_fx(
+ Word32 *f /*q*/,
+ Word32 *f_out /*q*/,
+ Word16 bufferNewSize /*Q0*/,
+ Word16 bufferOldSize /*Q0*/,
+ Word16 *q )
{
Word16 tmpNewSize;
Word16 tmp1, tmp2, tmp_e;
diff --git a/lib_com/low_rate_band_att_fx.c b/lib_com/low_rate_band_att_fx.c
index 8b323e96aba8615f793409f2753ad7e006cfcadc..f0fbf9bd67327f65120c8506261167690e7a75e6 100644
--- a/lib_com/low_rate_band_att_fx.c
+++ b/lib_com/low_rate_band_att_fx.c
@@ -39,12 +39,6 @@ void ivas_fine_gain_pred_fx(
Word16 tmp, exp, exp2;
Word32 L_tmp;
UWord16 lsb;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
FOR( band = 0; band < num_sfm; band++ )
{
@@ -83,11 +77,7 @@ void ivas_fine_gain_pred_fx(
tmp1 = shr( tmp1, sub( sub( 15, tmp_exp ), Q11 ) );
Mpy_32_16_ss( L_tmp, tmp1, &L_tmp, &lsb ); /*31-exp+11-15=27-exp */
-#ifdef ISSUE_1836_replace_overflow_libcom
gp = round_fx_sat( L_shl_sat( L_tmp, add( 1, exp ) ) ); /*27-exp+1+exp-16=12 */
-#else
- gp = round_fx_o( L_shl_o( L_tmp, add( 1, exp ), &Overflow ), &Overflow ); /*27-exp+1+exp-16=12 */
-#endif
test();
test();
IF( EQ_16( core, HQ_CORE ) && R != NULL && LE_16( R[i_sort[band]], 256 ) ) /* 256 is 32 in Q3 */
@@ -102,12 +92,8 @@ void ivas_fine_gain_pred_fx(
exp = add( exp, exp2 );
/*gp *= 1.0f - 0.05f / accuracy; */
- tmp = div_s( 13107, accuracy ); /* 0.05 in Q18 */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp = div_s( 13107, accuracy ); /* 0.05 in Q18 */
tmp = shr_sat( tmp, sub( 34, exp ) ); /*15+18-exp+16-15=34-exp */
-#else
- tmp = shr_sat( tmp, sub( 34, exp ) ); /*15+18-exp+16-15=34-exp */
-#endif
tmp = sub( 32767, tmp );
tmp = s_max( 27554, tmp ); /* Limit attenuation to norm quantizer error, 2^-0.25 in Q15 */
gp = mult_r( tmp, gp ); /*15+12+1-16=12 */
@@ -164,12 +150,6 @@ void fine_gain_pred_fx(
Word16 tmp, exp, exp2;
Word32 L_tmp;
UWord16 lsb;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
FOR( band = 0; band < num_sfm; band++ )
{
@@ -201,11 +181,7 @@ void fine_gain_pred_fx(
exp = sub( 31, add( exp, sub( 30, shl( shift, 1 ) ) ) );
L_tmp = Isqrt_lc( L_tmp, &exp ); /*31 - exp */
Mpy_32_16_ss( L_tmp, fine_gain_pred_sqrt_bw[bw_idx], &L_tmp, &lsb ); /*31-exp+11-15=27-exp */
-#ifdef ISSUE_1836_replace_overflow_libcom
- gp = round_fx_sat( L_shl_sat( L_tmp, add( 1, exp ) ) ); /*27-exp+1+exp-16=12 */
-#else
- gp = round_fx_o( L_shl_o( L_tmp, add( 1, exp ), &Overflow ), &Overflow ); /*27-exp+1+exp-16=12 */
-#endif
+ gp = round_fx_sat( L_shl_sat( L_tmp, add( 1, exp ) ) ); /*27-exp+1+exp-16=12 */
test();
test();
IF( EQ_16( core, HQ_CORE ) && R != NULL && LE_16( R[i_sort[band]], 256 ) ) /* 256 is 32 in Q3 */
@@ -220,12 +196,8 @@ void fine_gain_pred_fx(
exp = add( exp, exp2 );
/*gp *= 1.0f - 0.05f / accuracy; */
- tmp = div_s( 13107, accuracy ); /* 0.05 in Q18 */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp = div_s( 13107, accuracy ); /* 0.05 in Q18 */
tmp = shr_sat( tmp, sub( 34, exp ) ); /*15+18-exp+16-15=34-exp */
-#else
- tmp = shr_sat( tmp, sub( 34, exp ) ); /*15+18-exp+16-15=34-exp */
-#endif
tmp = sub( 32767, tmp );
tmp = s_max( 27554, tmp ); /* Limit attenuation to norm quantizer error, 2^-0.25 in Q15 */
gp = mult_r( tmp, gp ); /*15+12+1-16=12 */
diff --git a/lib_com/lpc_tools_fx.c b/lib_com/lpc_tools_fx.c
index c8cc09e7308abd312616ee304c2aae9a9b9e1fe1..a5aee205d0d15c8c7dd833ce858cc9749881d56a 100644
--- a/lib_com/lpc_tools_fx.c
+++ b/lib_com/lpc_tools_fx.c
@@ -409,11 +409,6 @@ static Word32 Div_32_opt( Word32 L_num /*Q31*/, Word16 denom_hi /*Qx -16*/, Word
{
Word16 approx /*, hi, lo, n_hi , n_lo*/;
Word32 L_32;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/* First approximation: 1 / L_denom = 1/denom_hi */
@@ -429,11 +424,7 @@ static Word32 Div_32_opt( Word32 L_num /*Q31*/, Word16 denom_hi /*Qx -16*/, Word
L_32 = Mpy_32_32( L_num, L_32 );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_32 = L_shl_sat( L_32, 2 );
-#else
- L_32 = L_shl_o( L_32, 2, &Overflow );
-#endif
return ( L_32 );
}
@@ -469,12 +460,6 @@ Word16 E_LPC_lev_dur_stab( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*QR
Word32 t0, t1, t2; /* temporary variables */
Word16 flag;
Word16 Ah[TCXLTP_LTP_ORDER + 1], Al[TCXLTP_LTP_ORDER + 1]; /* LPC coef. in double prec. */
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-
BASOP_SATURATE_WARNING_OFF_EVS
if ( epsP != NULL )
@@ -534,21 +519,12 @@ Word16 E_LPC_lev_dur_stab( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*QR
t0 = Mac_32( t0, Rh[j], Rl[j], Ah[i - j], Al[i - j] );
}
-#ifdef ISSUE_1836_replace_overflow_libcom
t0 = L_shl_sat( t0, 4 ); /* result in Q27 -> convert to Q31 */
-#else
- t0 = L_shl_o( t0, 4, &Overflow ); /* result in Q27 -> convert to Q31 */
-#endif
- /* No overflow possible */
+ /* No overflow possible */
/* Compose and add R[i] in Q3 */
-#ifdef ISSUE_1836_replace_overflow_libcom
t0 = L_mac_sat( t0, Rl[i], 1 );
t0 = L_msu_sat( t0, Rh[i], -32768 );
-#else
- t0 = L_mac_o( t0, Rl[i], 1, &Overflow );
- t0 = L_msu_o( t0, Rh[i], -32768, &Overflow );
-#endif
/* K = -t0 / Alpha */
t1 = L_abs( t0 );
@@ -563,11 +539,7 @@ Word16 E_LPC_lev_dur_stab( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*QR
{
t2 = L_negate( t2 ); /* K =-t0/Alpha */
}
-#ifdef ISSUE_1836_replace_overflow_libcom
t2 = L_shl_sat( t2, alp_exp ); /* denormalize; compare to Alpha */
-#else
- t2 = L_shl_o( t2, alp_exp, &Overflow ); /* denormalize; compare to Alpha */
-#endif
test();
if ( ( mem != NULL ) && ( ( GT_16( abs_s( extract_h( t2 ) ), k_max ) ) ) )
{
@@ -584,7 +556,7 @@ Word16 E_LPC_lev_dur_stab( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*QR
/*------------------------------------------*
* Compute new LPC coeff. -> An[i]
- * An[j]= A[j] + K*A[i-j] , j=1 to i-1
+ * An[j]= A[j] + K*A[i-j], j=1 to i-1
* An[i]= K
*------------------------------------------*/
@@ -606,11 +578,7 @@ Word16 E_LPC_lev_dur_stab( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*QR
L_Extract( t2, &Ah[i], &Al[i] ); /* An[i] in Q27 */
/* Alpha = Alpha * (1-K**2) */
-#ifdef ISSUE_1836_replace_overflow_libcom
t1 = L_mult_sat( Kh, Kh ); /* K*K in Q31 */
-#else
- t1 = L_mult_o( Kh, Kh, &Overflow ); /* K*K in Q31 */
-#endif
t0 = L_mac( t1, mult( Kh, Kl ), 2 );
t0 = L_abs( t0 ); /* Some case <0 !! */
t0 = L_sub( (Word32) 0x7fffffffL, t0 ); /* 1 - K*K in Q31 */
@@ -646,11 +614,7 @@ Word16 E_LPC_lev_dur_stab( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*QR
FOR( i = 1; i <= order; i++ )
{
t0 = L_Comp( Ah[i], Al[i] );
-#ifdef ISSUE_1836_replace_overflow_libcom
A[i] = round_fx_sat( L_shl_sat( t0, k ) );
-#else
- A[i] = round_fx_o( L_shl_o( t0, k, &Overflow ), &Overflow );
-#endif
move16();
}
@@ -686,12 +650,6 @@ Word16 E_LPC_lev_dur_stab_ivas_fx( const Word16 Rh[], const Word16 Rl[], Word16
Word32 t0, t1, t2; /* temporary variables */
Word16 flag;
Word16 Ah[TCXLTP_LTP_ORDER + 1], Al[TCXLTP_LTP_ORDER + 1]; /* LPC coef. in double prec. */
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-
BASOP_SATURATE_WARNING_OFF_EVS
if ( epsP != NULL )
@@ -751,21 +709,12 @@ Word16 E_LPC_lev_dur_stab_ivas_fx( const Word16 Rh[], const Word16 Rl[], Word16
t0 = Mac_32( t0, Rh[j], Rl[j], Ah[i - j], Al[i - j] );
}
-#ifdef ISSUE_1836_replace_overflow_libcom
t0 = L_shl_sat( t0, 4 ); /* result in Q27 -> convert to Q31 */
-#else
- t0 = L_shl_o( t0, 4, &Overflow ); /* result in Q27 -> convert to Q31 */
-#endif
- /* No overflow possible */
+ /* No overflow possible */
/* Compose and add R[i] in Q3 */
-#ifdef ISSUE_1836_replace_overflow_libcom
t0 = L_mac_sat( t0, Rl[i], 1 );
t0 = L_msu_sat( t0, Rh[i], -32768 );
-#else
- t0 = L_mac_o( t0, Rl[i], 1, &Overflow );
- t0 = L_msu_o( t0, Rh[i], -32768, &Overflow );
-#endif
/* K = -t0 / Alpha */
t1 = L_abs( t0 );
@@ -780,11 +729,7 @@ Word16 E_LPC_lev_dur_stab_ivas_fx( const Word16 Rh[], const Word16 Rl[], Word16
{
t2 = L_negate( t2 ); /* K =-t0/Alpha */
}
-#ifdef ISSUE_1836_replace_overflow_libcom
t2 = L_shl_sat( t2, alp_exp ); /* denormalize; compare to Alpha */
-#else
- t2 = L_shl_o( t2, alp_exp, &Overflow ); /* denormalize; compare to Alpha */
-#endif
test();
if ( ( mem != NULL ) && ( ( GT_16( abs_s( extract_h( t2 ) ), k_max ) ) ) )
{
@@ -801,7 +746,7 @@ Word16 E_LPC_lev_dur_stab_ivas_fx( const Word16 Rh[], const Word16 Rl[], Word16
/*------------------------------------------*
* Compute new LPC coeff. -> An[i]
- * An[j]= A[j] + K*A[i-j] , j=1 to i-1
+ * An[j]= A[j] + K*A[i-j], j=1 to i-1
* An[i]= K
*------------------------------------------*/
@@ -823,11 +768,7 @@ Word16 E_LPC_lev_dur_stab_ivas_fx( const Word16 Rh[], const Word16 Rl[], Word16
L_Extract( t2, &Ah[i], &Al[i] ); /* An[i] in Q27 */
/* Alpha = Alpha * (1-K**2) */
-#ifdef ISSUE_1836_replace_overflow_libcom
t1 = L_mult_sat( Kh, Kh ); /* K*K in Q31 */
-#else
- t1 = L_mult_o( Kh, Kh, &Overflow ); /* K*K in Q31 */
-#endif
t0 = L_mac( t1, mult( Kh, Kl ), 2 );
t0 = L_abs( t0 ); /* Some case <0 !! */
t0 = L_sub( (Word32) 0x7fffffffL, t0 ); /* 1 - K*K in Q31 */
@@ -863,11 +804,7 @@ Word16 E_LPC_lev_dur_stab_ivas_fx( const Word16 Rh[], const Word16 Rl[], Word16
FOR( i = 1; i <= order; i++ )
{
t0 = L_Comp( Ah[i], Al[i] );
-#ifdef ISSUE_1836_replace_overflow_libcom
A[i] = round_fx_sat( L_shl_sat( t0, k ) );
-#else
- A[i] = round_fx_o( L_shl_o( t0, k, &Overflow ), &Overflow );
-#endif
move16();
}
@@ -903,13 +840,6 @@ Word16 E_LPC_lev_dur_stab_fx( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*
Word32 t0, t1, t2; /* temporary variables */
Word16 flag;
Word16 Ah[TCXLTP_LTP_ORDER + 1], Al[TCXLTP_LTP_ORDER + 1]; /* LPC coef. in double prec. */
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
BASOP_SATURATE_WARNING_OFF_EVS
if ( epsP != NULL )
@@ -969,21 +899,12 @@ Word16 E_LPC_lev_dur_stab_fx( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*
t0 = Mac_32( t0, Rh[j], Rl[j], Ah[i - j], Al[i - j] );
}
-#ifdef ISSUE_1836_replace_overflow_libcom
t0 = L_shl_sat( t0, 4 ); /* result in Q27 -> convert to Q31 */
-#else
- t0 = L_shl_o( t0, 4, &Overflow ); /* result in Q27 -> convert to Q31 */
-#endif
- /* No overflow possible */
+ /* No overflow possible */
/* Compose and add R[i] in Q3 */
-#ifdef ISSUE_1836_replace_overflow_libcom
t0 = L_mac_sat( t0, Rl[i], 1 );
t0 = L_msu_sat( t0, Rh[i], -32768 );
-#else
- t0 = L_mac_o( t0, Rl[i], 1, &Overflow );
- t0 = L_msu_o( t0, Rh[i], -32768, &Overflow );
-#endif
/* K = -t0 / Alpha */
t1 = L_abs( t0 );
@@ -998,11 +919,7 @@ Word16 E_LPC_lev_dur_stab_fx( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*
{
t2 = L_negate( t2 ); /* K =-t0/Alpha */
}
-#ifdef ISSUE_1836_replace_overflow_libcom
t2 = L_shl_sat( t2, alp_exp ); /* denormalize; compare to Alpha */
-#else
- t2 = L_shl_o( t2, alp_exp, &Overflow ); /* denormalize; compare to Alpha */
-#endif
test();
if ( ( mem != NULL ) && ( ( GT_16( abs_s( extract_h( t2 ) ), k_max ) ) ) )
{
@@ -1019,7 +936,7 @@ Word16 E_LPC_lev_dur_stab_fx( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*
/*------------------------------------------*
* Compute new LPC coeff. -> An[i]
- * An[j]= A[j] + K*A[i-j] , j=1 to i-1
+ * An[j]= A[j] + K*A[i-j], j=1 to i-1
* An[i]= K
*------------------------------------------*/
@@ -1041,11 +958,7 @@ Word16 E_LPC_lev_dur_stab_fx( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*
L_Extract( t2, &Ah[i], &Al[i] ); /* An[i] in Q27 */
/* Alpha = Alpha * (1-K**2) */
-#ifdef ISSUE_1836_replace_overflow_libcom
t1 = L_mult_sat( Kh, Kh ); /* K*K in Q31 */
-#else
- t1 = L_mult_o( Kh, Kh, &Overflow ); /* K*K in Q31 */
-#endif
t0 = L_mac( t1, mult( Kh, Kl ), 2 );
t0 = L_abs( t0 ); /* Some case <0 !! */
t0 = L_sub( (Word32) 0x7fffffffL, t0 ); /* 1 - K*K in Q31 */
@@ -1081,11 +994,7 @@ Word16 E_LPC_lev_dur_stab_fx( const Word16 Rh[] /*QR -16*/, const Word16 Rl[] /*
FOR( i = 1; i <= order; i++ )
{
t0 = L_Comp( Ah[i], Al[i] );
-#ifdef ISSUE_1836_replace_overflow_libcom
A[i] = L_shl_sat( t0, k );
-#else
- A[i] = L_shl_o( t0, k, &Overflow );
-#endif
move16();
}
@@ -1553,13 +1462,6 @@ void E_LPC_a_lsf_isf_conversion( Word16 *lpcCoeffs /*Qx*/, Word16 *lsf /*15Q16*/
Word16 lpc[19];
move16();
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
/* half length FFT */
scale = add( norm_s( lpcCoeffs[0] ), 1 ) + 5;
move16();
@@ -1733,7 +1635,6 @@ void E_LPC_a_lsf_isf_conversion( Word16 *lpcCoeffs /*Qx*/, Word16 *lsf /*15Q16*/
Word16 ImAr = extract_h( L_sub( ImagFFT[i], ImagFFT[N / 2 - i] ) );
Word16 ImBr = extract_h( L_add( ImagFFT[i], ImagFFT[N / 2 - i] ) );
BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef ISSUE_1836_replace_overflow_libcom
tmpw15.v.re = mac_r_sat( L_mult( ptwiddle->v.re, pwn17->v.re ), ptwiddle->v.im, pwn17->v.im );
move16();
tmpw15.v.im = msu_r_sat( L_mult( ptwiddle->v.re, pwn17->v.im ), ptwiddle->v.im, pwn17->v.re );
@@ -1748,22 +1649,6 @@ void E_LPC_a_lsf_isf_conversion( Word16 *lpcCoeffs /*Qx*/, Word16 *lsf /*15Q16*/
move16();
tmpw15.v.im = mac_r_sat( L_mult( ptwiddle->v.re, pwn17i->v.im ), ptwiddle->v.im, pwn17i->v.re );
move16();
-#else
- tmpw15.v.re = mac_ro( L_mult( ptwiddle->v.re, pwn17->v.re ), ptwiddle->v.im, pwn17->v.im, &Overflow );
- move16();
- tmpw15.v.im = msu_ro( L_mult( ptwiddle->v.re, pwn17->v.im ), ptwiddle->v.im, pwn17->v.re, &Overflow );
- move16();
- BASOP_SATURATE_WARNING_ON_EVS
- RealOut[i] = mac_r( L_msu( L_msu( L_mult( ReAr, pwn17->v.re ), ImAr, pwn17->v.im ), ReBr, pwn15->v.im ), ImBr, pwn15->v.re );
- move16();
- ImagOut[i] = mac_r( L_mac( L_mac( L_mult( ReAr, pwn17->v.im ), ImAr, pwn17->v.re ), ReBr, pwn15->v.re ), ImBr, pwn15->v.im );
- move16();
- BASOP_SATURATE_WARNING_OFF_EVS
- tmpw15.v.re = msu_ro( L_mult( ptwiddle->v.im, pwn17i->v.im ), ptwiddle->v.re, pwn17i->v.re, &Overflow );
- move16();
- tmpw15.v.im = mac_ro( L_mult( ptwiddle->v.re, pwn17i->v.im ), ptwiddle->v.im, pwn17i->v.re, &Overflow );
- move16();
-#endif
BASOP_SATURATE_WARNING_ON_EVS
RealOut[N / 2 - i] = msu_r( L_mac( L_mac( L_mult( ReAr, pwn17i->v.re ), ImAr, pwn17i->v.im ), ImBr, pwn15i->v.re ), ReBr, pwn15i->v.im );
move16();
@@ -1784,7 +1669,6 @@ void E_LPC_a_lsf_isf_conversion( Word16 *lpcCoeffs /*Qx*/, Word16 *lsf /*15Q16*/
Word16 ImAr = extract_h( L_sub( ImagFFT[i], ImagFFT[N / 2 - i] ) );
Word16 ImBr = extract_h( L_add( ImagFFT[i], ImagFFT[N / 2 - i] ) );
BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef ISSUE_1836_replace_overflow_libcom
tmpw15.v.re = mac_r_sat( L_mult( ptwiddle->v.im, pwn17->v.re ), ptwiddle->v.re, pwn17->v.im );
move16();
tmpw15.v.im = msu_r_sat( L_mult( ptwiddle->v.im, pwn17->v.im ), ptwiddle->v.re, pwn17->v.re );
@@ -1799,22 +1683,6 @@ void E_LPC_a_lsf_isf_conversion( Word16 *lpcCoeffs /*Qx*/, Word16 *lsf /*15Q16*/
move16();
tmpw15.v.im = mac_r_sat( L_mult( ptwiddle->v.im, pwn17i->v.im ), ptwiddle->v.re, pwn17i->v.re );
move16();
-#else
- tmpw15.v.re = mac_ro( L_mult( ptwiddle->v.im, pwn17->v.re ), ptwiddle->v.re, pwn17->v.im, &Overflow );
- move16();
- tmpw15.v.im = msu_ro( L_mult( ptwiddle->v.im, pwn17->v.im ), ptwiddle->v.re, pwn17->v.re, &Overflow );
- move16();
- BASOP_SATURATE_WARNING_ON_EVS
- RealOut[i] = mac_r( L_msu( L_msu( L_mult( ReAr, pwn17->v.re ), ImAr, pwn17->v.im ), ReBr, pwn15->v.im ), ImBr, pwn15->v.re );
- move16();
- ImagOut[i] = mac_r( L_mac( L_mac( L_mult( ReAr, pwn17->v.im ), ImAr, pwn17->v.re ), ReBr, pwn15->v.re ), ImBr, pwn15->v.im );
- move16();
- BASOP_SATURATE_WARNING_OFF_EVS
- tmpw15.v.re = msu_ro( L_mult( ptwiddle->v.re, pwn17i->v.im ), ptwiddle->v.im, pwn17i->v.re, &Overflow );
- move16();
- tmpw15.v.im = mac_ro( L_mult( ptwiddle->v.im, pwn17i->v.im ), ptwiddle->v.re, pwn17i->v.re, &Overflow );
- move16();
-#endif
BASOP_SATURATE_WARNING_ON_EVS
RealOut[N / 2 - i] = msu_r( L_mac( L_mac( L_mult( ReAr, pwn17i->v.re ), ImAr, pwn17i->v.im ), ImBr, pwn15i->v.re ), ReBr, pwn15i->v.im );
move16();
diff --git a/lib_com/lsf_tools_fx.c b/lib_com/lsf_tools_fx.c
index 80e597e1a07643a50a49c3ab2572ba08989a3cea..0fbc7f7586c164b6b838b95dfc9d58c6ca6198de 100644
--- a/lib_com/lsf_tools_fx.c
+++ b/lib_com/lsf_tools_fx.c
@@ -69,11 +69,6 @@ static Word16 chebyshev( Word16 x, Word32 *f, const Word16 n, const Word16 shift
Word16 cheb;
Word32 t0, b1, b2;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
cheb = norm_s( x );
if ( cheb )
@@ -110,26 +105,16 @@ static Word16 chebyshev( Word16 x, Word32 *f, const Word16 n, const Word16 shift
b2 = L_add( t0, *f++ ); /* b0 = 2*x*b1 - b2 + f[i] */
/* i = 5 */
t0 = Mpy_32_16_1( b2, x ); /* t0 = x*b1 */
-#ifdef ISSUE_1836_replace_overflow_libcom
if ( !cheb )
t0 = L_shl_sat( t0, 1 ); /* t0 = 2*x*b1 */
-#else
- if ( !cheb )
- t0 = L_shl_o( t0, 1, &Overflow ); /* t0 = 2*x*b1 */
-#endif
- t0 = L_sub( t0, b1 ); /* t0 = 2*x*b1 - b2 */
- b1 = L_add( t0, *f++ ); /* b0 = 2*x*b1 - b2 + f[i] */
+ t0 = L_sub( t0, b1 ); /* t0 = 2*x*b1 - b2 */
+ b1 = L_add( t0, *f++ ); /* b0 = 2*x*b1 - b2 + f[i] */
/* i = 6 */
t0 = Mpy_32_16_1( b1, x ); /* t0 = x*b1 */
-#ifdef ISSUE_1836_replace_overflow_libcom
if ( !cheb )
t0 = L_shl_sat( t0, 1 ); /* t0 = 2*x*b1 */
-#else
- if ( !cheb )
- t0 = L_shl_o( t0, 1, &Overflow ); /* t0 = 2*x*b1 */
-#endif
- t0 = L_sub( t0, b2 ); /* t0 = 2*x*b1 - b2 */
+ t0 = L_sub( t0, b2 ); /* t0 = 2*x*b1 - b2 */
}
/* IF (sub(n,8) == 0) */
IF( n == 8 )
@@ -137,15 +122,10 @@ static Word16 chebyshev( Word16 x, Word32 *f, const Word16 n, const Word16 shift
b2 = L_add( t0, *f++ ); /* b0 = 2*x*b1 - b2 + f[i] */
/* i = 7 */
t0 = Mpy_32_16_1( b2, x ); /* t0 = x*b1 */
-#ifdef ISSUE_1836_replace_overflow_libcom
if ( !cheb )
t0 = L_shl_sat( t0, 1 ); /* t0 = 2*x*b1 */
-#else
- if ( !cheb )
- t0 = L_shl_o( t0, 1, &Overflow ); /* t0 = 2*x*b1 */
-#endif
- t0 = L_sub( t0, b1 ); /* t0 = 2*x*b1 - b2 */
- /*b1 = L_add(b2,0);*/
+ t0 = L_sub( t0, b1 ); /* t0 = 2*x*b1 - b2 */
+ /*b1 = L_add(b2,0);*/
}
ELSE
{
@@ -163,13 +143,8 @@ static Word16 chebyshev( Word16 x, Word32 *f, const Word16 n, const Word16 shift
BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef ISSUE_1836_replace_overflow_libcom
- t0 = L_shl_sat( t0, shift ); /* Qx to Q30 with saturation */
- cheb = round_fx_sat( t0 ); /* Result in Q14 */
-#else
- t0 = L_shl_o( t0, shift, &Overflow ); /* Qx to Q30 with saturation */
- cheb = round_fx_o( t0, &Overflow ); /* Result in Q14 */
-#endif
+ t0 = L_shl_sat( t0, shift ); /* Qx to Q30 with saturation */
+ cheb = round_fx_sat( t0 ); /* Result in Q14 */
cheb = s_max( -32767, cheb ); /* to avoid saturation */
BASOP_SATURATE_WARNING_ON_EVS
return ( cheb );
@@ -184,11 +159,6 @@ void E_LPC_a_isp_conversion( const Word16 a[], Word16 isp[], const Word16 old_is
Word32 t0, t1;
Word16 scale = 1024;
move16();
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/*-------------------------------------------------------------*
* find the sum and diff polynomials F1(z) and F2(z)
@@ -310,11 +280,7 @@ void E_LPC_a_isp_conversion( const Word16 a[], Word16 isp[], const Word16 old_is
* xint = xlow - ylow*(xhigh-xlow)/(yhigh-ylow)
*--------------------------------------------------------*/
-#ifdef ISSUE_1836_replace_overflow_libcom
y = sub_sat( yhigh, ylow );
-#else
- y = sub_o( yhigh, ylow, &Overflow );
-#endif
IF( y != 0 )
{
x = sub( xhigh, xlow );
@@ -1243,19 +1209,16 @@ void E_LPC_a_lsp_conversion(
* Returns:
* void
*/
-void E_LPC_f_lsp_a_conversion( const Word16 *lsp, Word16 *a, const Word16 m )
+void E_LPC_f_lsp_a_conversion(
+ const Word16 *lsp,
+ Word16 *a,
+ const Word16 m )
{
Word16 i, j, k;
Word32 f1[NC_MAX + 1], f2[NC_MAX + 1];
Word16 nc;
Word32 t0;
Word16 Ovf, Ovf2;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-
/*-----------------------------------------------------*
* Find the polynomials F1(z) and F2(z) *
@@ -1285,11 +1248,7 @@ void E_LPC_f_lsp_a_conversion( const Word16 *lsp, Word16 *a, const Word16 m )
{
f1[nc - i] = L_add( f1[nc - i], f1[nc - i - 1] );
move32();
-#ifdef ISSUE_1836_replace_overflow_libcom
f2[nc - i] = L_sub_sat( f2[nc - i], f2[nc - i - 1] );
-#else
- f2[nc - i] = L_sub_o( f2[nc - i], f2[nc - i - 1], &Overflow );
-#endif
move32();
}
@@ -1299,19 +1258,11 @@ void E_LPC_f_lsp_a_conversion( const Word16 *lsp, Word16 *a, const Word16 m )
*-----------------------------------------------------*/
t0 = L_deposit_l( 0 );
-#ifdef ISSUE_1836_replace_overflow_libcom
FOR( i = 1; i <= nc; i++ )
{
t0 = L_max( t0, L_abs( L_add_sat( f1[i], f2[i] ) ) );
t0 = L_max( t0, L_abs( L_sub_sat( f1[i], f2[i] ) ) );
}
-#else
- FOR( i = 1; i <= nc; i++ )
- {
- t0 = L_max( t0, L_abs( L_add_o( f1[i], f2[i], &Overflow ) ) );
- t0 = L_max( t0, L_abs( L_sub_o( f1[i], f2[i], &Overflow ) ) );
- }
-#endif
k = s_min( norm_l( t0 ), 6 );
a[0] = shl( 256, k );
move16();
@@ -1325,7 +1276,6 @@ void E_LPC_f_lsp_a_conversion( const Word16 *lsp, Word16 *a, const Word16 m )
FOR( i = 1; i <= nc; i++ )
{
/* a[i] = 0.5*(f1[i] + f2[i]) */
-#ifdef ISSUE_1836_replace_overflow_libcom
t0 = L_add_sat( f1[i], f2[i] );
t0 = L_shl( t0, k );
a[i] = round_fx_sat( t0 ); /* from Q23 to Qx and * 0.5 */
@@ -1334,16 +1284,6 @@ void E_LPC_f_lsp_a_conversion( const Word16 *lsp, Word16 *a, const Word16 m )
t0 = L_sub_sat( f1[i], f2[i] );
t0 = L_shl( t0, k );
a[j] = round_fx_sat( t0 ); /* from Q23 to Qx and * 0.5 */
-#else
- t0 = L_add_o( f1[i], f2[i], &Overflow );
- t0 = L_shl( t0, k );
- a[i] = round_fx_o( t0, &Overflow ); /* from Q23 to Qx and * 0.5 */
-
- /* a[j] = 0.5*(f1[i] - f2[i]) */
- t0 = L_sub_o( f1[i], f2[i], &Overflow );
- t0 = L_shl( t0, k );
- a[j] = round_fx_o( t0, &Overflow ); /* from Q23 to Qx and * 0.5 */
-#endif
j--;
}
@@ -1787,11 +1727,7 @@ void a2rc_fx( const Word16 *a, /* i: can be any Q */
Word16 m, j, n;
Word16 q, q_a, q_a2, One_Qx;
Word32 One_Qx2;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
+
q = add( norm_s( a[-1] ), 1 );
q_a = sub( 15, q );
q_a2 = add( shl( q_a, 1 ), 1 );
@@ -1851,8 +1787,7 @@ void a2rc_fx( const Word16 *a, /* i: can be any Q */
FOR( j = 0; j < m / 2; j++ )
{
n = sub( sub( m, (Word16) 1 ), j );
- L_tmp1 = L_mult( denom_mant, f_fx[j] ); /* denom*f[j]. Q15*Q12 = Q28 (floating with exp) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ L_tmp1 = L_mult( denom_mant, f_fx[j] ); /* denom*f[j]. Q15*Q12 = Q28 (floating with exp) */
L_tmp1 = L_mac_sat( L_tmp1, tmp, f_fx[n] ); /* denom*f[j]+km*denom*f[n] in Q28 (floating with exp) */
L_tmp2 = L_mult( denom_mant, f_fx[n] ); /* denom*f[n]. Q15*Q12 = Q28 (floating with exp) */
L_tmp2 = L_mac_sat( L_tmp2, tmp, f_fx[j] ); /* denom*f[n]+km*denom*f[j] in Q28 (floating with exp) */
@@ -1860,31 +1795,15 @@ void a2rc_fx( const Word16 *a, /* i: can be any Q */
L_tmp2 = L_shr_sat( L_tmp2, exp ); /* bringing to true Q28 */
f_fx[j] = round_fx_sat( L_tmp1 ); /* extracting in q_a */
f_fx[n] = round_fx_sat( L_tmp2 ); /* extracting in q_a */
-#else
- L_tmp1 = L_mac_o( L_tmp1, tmp, f_fx[n], &Overflow ); /* denom*f[j]+km*denom*f[n] in Q28 (floating with exp) */
- L_tmp2 = L_mult( denom_mant, f_fx[n] ); /* denom*f[n]. Q15*Q12 = Q28 (floating with exp) */
- L_tmp2 = L_mac_o( L_tmp2, tmp, f_fx[j], &Overflow ); /* denom*f[n]+km*denom*f[j] in Q28 (floating with exp) */
- L_tmp1 = L_shr_o( L_tmp1, exp, &Overflow ); /* bringing to true Q28 */
- L_tmp2 = L_shr_o( L_tmp2, exp, &Overflow ); /* bringing to true Q28 */
- f_fx[j] = round_fx_o( L_tmp1, &Overflow ); /* extracting in q_a */
- f_fx[n] = round_fx_o( L_tmp2, &Overflow ); /* extracting in q_a */
-#endif
}
IF( m & 1 )
{
- L_tmp1 = L_mult( denom_mant, f_fx[j] ); /* denom*f[j]. Q15*Q12 = Q28 (floating with exp) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ L_tmp1 = L_mult( denom_mant, f_fx[j] ); /* denom*f[j]. Q15*Q12 = Q28 (floating with exp) */
L_tmp1 = L_mac_sat( L_tmp1, tmp, f_fx[j] ); /* denom*f[j]+km*denom*f[j] in Q28 (floating with exp) */
L_tmp1 = L_shr_sat( L_tmp1, exp ); /* bringing to true Q28 */
f_fx[j] = round_fx_sat( L_tmp1 ); /* extracting in q_a */
move16();
-#else
- L_tmp1 = L_mac_o( L_tmp1, tmp, f_fx[j], &Overflow ); /* denom*f[j]+km*denom*f[j] in Q28 (floating with exp) */
- L_tmp1 = L_shr_o( L_tmp1, exp, &Overflow ); /* bringing to true Q28 */
- f_fx[j] = round_fx_o( L_tmp1, &Overflow ); /* extracting in q_a */
- move16();
-#endif
}
}
@@ -2336,11 +2255,6 @@ Word16 lsf_stab_fx( /* o : LP filter stability Q15*/
Word16 i, m;
Word32 L_tmp;
Word16 tmp, e;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/*-------------------------------------------------------------------*
* Check stability on lsf: distance between old lsf and current lsf
@@ -2385,18 +2299,10 @@ Word16 lsf_stab_fx( /* o : LP filter stability Q15*/
}
e = sub( 30 - 21 - 1, e );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = round_fx_sat( L_shl_sat( L_tmp, e ) ); /*Q14*/
-#else
- tmp = round_fx_o( L_shl_o( L_tmp, e, &Overflow ), &Overflow ); /*Q14*/
-#endif
tmp = sub( 20480, tmp ); /* 1.25 - tmp in Q14 */
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = shl_sat( tmp, 1 ); /* Q14 -> Q15 with saturation */
-#else
- tmp = shl_o( tmp, 1, &Overflow ); /* Q14 -> Q15 with saturation */
-#endif
tmp = s_max( tmp, 0 );
@@ -2433,11 +2339,6 @@ Word16 lsf_stab_ivas_fx( /* o : LP filter stability
Word16 i, m;
Word32 L_tmp;
Word16 tmp, e;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/*-------------------------------------------------------------------*
* Check stability on lsf: distance between old lsf and current lsf
@@ -2488,11 +2389,7 @@ Word16 lsf_stab_ivas_fx( /* o : LP filter stability
}
e = sub( 30 - 21 - 1, e );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = round_fx_sat( L_shl_sat( L_tmp, e ) ); /*Q12*/
-#else
- tmp = round_fx_o( L_shl_o( L_tmp, e, &Overflow ), &Overflow ); /*Q12*/
-#endif
// tmp = sub(20480, tmp); /* 1.25 - tmp in Q14 */
tmp = sub( 5120, tmp ); /* 1.25 - tmp in Q12 */
@@ -3851,11 +3748,6 @@ Word16 root_search_fx( Word16 low,
Word32 v_high, vh;
Word32 Ltemp, L_tmp1, L_tmp, Ltmp;
Word16 exp1, tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
v_high = polynomial_eval_fx( high, coef, order ); /* v_high has the value at high index */
@@ -3922,13 +3814,9 @@ Word16 root_search_fx( Word16 low,
L_tmp1 = L_shl( L_tmp, exp1 );
tmp = extract_h( L_tmp1 );
exp1 = sub( 30 - 25, exp1 );
- tmp = div_s( 16384, tmp ); /* 15+exp1 */
- Ltmp = Mult_32_16( *v_low, tmp ); /* 15+exp1+25-15 */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp = div_s( 16384, tmp ); /* 15+exp1 */
+ Ltmp = Mult_32_16( *v_low, tmp ); /* 15+exp1+25-15 */
Ltemp = L_shl_sat( Ltmp, ( 6 - exp1 ) ); /* Q31 */
-#else
- Ltemp = L_shl_o( Ltmp, ( 6 - exp1 ), &Overflow ); /* Q31 */
-#endif
if ( LT_32( *v_low, vh ) )
{
Ltemp = L_negate( Ltemp );
@@ -4147,7 +4035,7 @@ void dec_FDCNG_MSVQ_stage1_fx(
{
dct_vec[col] = shl( cbpW8[col], dct_col_shift_tab[col] ); // Q0
move32();
- /* LOGIC( 1 ) , SHIFT( 1 );
+ /* LOGIC( 1 ), SHIFT( 1 );
in BASOP: s_and(for W8->W16), shl()
*/
}
diff --git a/lib_com/lsp_conv_poly_fx.c b/lib_com/lsp_conv_poly_fx.c
index e9d5413b3bbb9c30f0616b1a225bb6ebe7b986a3..e9b4a559b8ebee99b86abef60ea53dd8fbae1fbc 100644
--- a/lib_com/lsp_conv_poly_fx.c
+++ b/lib_com/lsp_conv_poly_fx.c
@@ -335,28 +335,16 @@ static Word32 b_inv_sq(
Word16 m_den, exp_den;
Word16 div_out;
Word32 Ltmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
exp_den = norm_l( in32 );
m_den = extract_h( L_shl( in32, exp_den ) );
exp_den = add( sub( 30, exp_den ), sub( 16, exp_in ) );
m_den = mult_r( m_den, m_den );
-#ifdef ISSUE_1836_replace_overflow_libcom
exp_den = shl( exp_den, 1 );
div_out = div_s( 8192, m_den );
Ltmp = L_shl_sat( div_out, add( sub( 30 - 13, exp_den ), 15 ) ); /*Q15*/
-#else
- exp_den = shl_o( exp_den, 1, &Overflow );
-
- div_out = div_s( 8192, m_den );
- Ltmp = L_shl_o( div_out, add( sub( 30 - 13, exp_den ), 15 ), &Overflow ); /*Q15*/
-#endif
return Ltmp;
}
@@ -372,11 +360,6 @@ static Word32 inv_pow(
Word32 mh;
UWord16 ml;
Word32 r0, s0;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
IF( re == 0 )
{
@@ -388,11 +371,7 @@ static Word32 inv_pow(
{
exp1 = norm_l( re );
tmp = extract_h( L_shl( re, exp1 ) );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shr( L_mult_sat( tmp, tmp ), 1 );
-#else
- L_tmp = L_shr( L_mult_o( tmp, tmp, &Overflow ), 1 );
-#endif
Mpy_32_16_ss( L_tmp, x, &mh, &ml );
r0 = L_add( L_tmp, mh );
}
@@ -407,11 +386,7 @@ static Word32 inv_pow(
{
exp2 = norm_l( se );
tmp = extract_h( L_shl( se, exp2 ) );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shr( L_mult_sat( tmp, tmp ), 1 );
-#else
- L_tmp = L_shr( L_mult_o( tmp, tmp, &Overflow ), 1 );
-#endif
Mpy_32_16_ss( L_tmp, x, &mh, &ml );
s0 = L_sub( L_tmp, mh );
}
@@ -441,11 +416,7 @@ static Word32 inv_pow(
}
tmp = div_s( (Word16) ( ( 1 << 14 ) - 1 ), tmp );
exp1 = add( exp1, exp2 );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shr_sat( tmp, sub( 31, exp1 ) ); /* result in Q15 */
-#else
- L_tmp = L_shr_o( tmp, sub( 31, exp1 ), &Overflow ); /* result in Q15 */
-#endif
return ( L_tmp );
}
@@ -523,11 +494,6 @@ static void spectautocorr_fx(
UWord16 ml;
Word32 r[M + 1];
Word16 exp0;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/*---------------------------------------------------------------------*
* The mid point of the cosine table x of m entries assuming an odd m.
@@ -549,11 +515,7 @@ static void spectautocorr_fx(
move32();
FOR( i = 2; i < N - 1; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
r[0] = L_add_sat( r[0], G[i] );
-#else
- r[0] = L_add_o( r[0], G[i], &Overflow );
-#endif
move32();
}
@@ -587,27 +549,18 @@ static void spectautocorr_fx(
move16(); /* 1.0 in Q15 */
FOR( i = 1; i < imid; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
gp = L_add_sat( G[i], G[N - i - 1] );
-#else
- gp = L_add_o( G[i], G[N - i - 1], &Overflow );
-#endif
gn = L_sub( G[i], G[N - i - 1] );
/*r[1] = L_mac(r[1], x[i-1], gn);*/
Mpy_32_16_ss( gn, x[i - 1], &mh, &ml );
-#ifdef ISSUE_1836_replace_overflow_libcom
r[1] = L_add_sat( r[1], mh );
-#else
- r[1] = L_add_o( r[1], mh, &Overflow );
-#endif
move32();
c[1] = x[i - 1];
move16();
FOR( j = 2; j < M; j += 2 )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
c[j] = mult_r( c[j - 1], x[i - 1] );
move16();
c[j] = add_sat( c[j], sub_sat( c[j], c[j - 2] ) );
@@ -627,75 +580,34 @@ static void spectautocorr_fx(
Mpy_32_16_ss( gn, c[j + 1], &mh, &ml );
r[j + 1] = L_add_sat( r[j + 1], mh );
move32();
-#else
- c[j] = mult_r( c[j - 1], x[i - 1] );
- move16();
- c[j] = add_o( c[j], sub_o( c[j], c[j - 2], &Overflow ), &Overflow );
- move16();
-
- /*r[j] = L_mac(r[j], c[j], gp);*/
- Mpy_32_16_ss( gp, c[j], &mh, &ml );
- r[j] = L_add_o( r[j], mh, &Overflow );
- move32();
-
- c[j + 1] = mult_r( c[j], x[i - 1] );
- move16();
- c[j + 1] = add_o( c[j + 1], sub_o( c[j + 1], c[j - 1], &Overflow ), &Overflow );
- move16();
-
- /*r[j+1] = L_mac(r[j+1], c[j+1], gn);*/
- Mpy_32_16_ss( gn, c[j + 1], &mh, &ml );
- r[j + 1] = L_add_o( r[j + 1], mh, &Overflow );
- move32();
-#endif
}
c[j] = mult_r( c[j - 1], x[i - 1] );
move16();
-#ifdef ISSUE_1836_replace_overflow_libcom
c[j] = add_sat( c[j], sub_sat( c[j], c[j - 2] ) );
move16();
Mpy_32_16_ss( gp, c[j], &mh, &ml );
r[j] = L_add_sat( r[j], mh );
move32();
-#else
- c[j] = add_o( c[j], sub_o( c[j], c[j - 2], &Overflow ), &Overflow );
- move16();
-
- Mpy_32_16_ss( gp, c[j], &mh, &ml );
- r[j] = L_add_o( r[j], mh, &Overflow );
- move32();
-#endif
}
/*---------------------------------------------------------------------*
* Add the endpoints x = cos(0) = 1 and x = cos(pi) = -1 as
* well as the lower half of the unit circle.
*---------------------------------------------------------------------*/
-#ifdef ISSUE_1836_replace_overflow_libcom
+
gp = L_shr( L_add_sat( G[0], G[N - 1] ), 1 );
gn = L_shr( L_sub( G[0], G[N - 1] ), 1 );
r[0] = L_add_sat( r[0], gp );
-#else
- gp = L_shr( L_add_o( G[0], G[N - 1], &Overflow ), 1 );
- gn = L_shr( L_sub( G[0], G[N - 1] ), 1 );
-
- r[0] = L_add_o( r[0], gp, &Overflow );
-#endif
move32();
exp0 = norm_l( r[0] );
L_Extract( L_shl( r[0], exp0 ), &rh[0], &rl[0] );
FOR( j = 1; j < M; j += 2 )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L_Extract( L_shl( L_add_sat( r[j], gn ), exp0 ), &rh[j], &rl[j] );
L_Extract( L_shl( L_add_sat( r[j + 1], gp ), exp0 ), &rh[j + 1], &rl[j + 1] );
-#else
- L_Extract( L_shl( L_add_o( r[j], gn, &Overflow ), exp0 ), &rh[j], &rl[j] );
- L_Extract( L_shl( L_add_o( r[j + 1], gp, &Overflow ), exp0 ), &rh[j + 1], &rl[j + 1] );
-#endif
}
return;
diff --git a/lib_com/math_op.c b/lib_com/math_op.c
index ac92eec20ec7091e9f5da4e3394e4b13395dbdb8..12d14ca6a0d1fe86141d377ef7907d0150aa6f4e 100644
--- a/lib_com/math_op.c
+++ b/lib_com/math_op.c
@@ -228,30 +228,16 @@ Word32 Energy_scale( /* (o) : Q31: normalized result (1 < val
{
Word16 i, sft, tmp;
Word32 L_sum;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-
L_sum = 0; /* just to avoid superflous compiler warning about uninitialized use of L_sum */
IF( expi == 0 )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L_sum = L_mac_sat( 1, x[0], x[0] );
FOR( i = 1; i < lg; i++ )
{
L_sum = L_mac_sat( L_sum, x[i], x[i] );
}
-#else
- L_sum = L_mac_o( 1, x[0], x[0], &Overflow );
- FOR( i = 1; i < lg; i++ )
- {
- L_sum = L_mac_o( L_sum, x[i], x[i], &Overflow );
- }
-#endif
}
IF( expi < 0 )
{
@@ -261,16 +247,11 @@ Word32 Energy_scale( /* (o) : Q31: normalized result (1 < val
FOR( i = 1; i < lg; i++ )
{
tmp = mult_r( x[i], sft );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_sum = L_mac_sat( L_sum, tmp, tmp );
-#else
- L_sum = L_mac_o( L_sum, tmp, tmp, &Overflow );
-#endif
}
}
IF( expi > 0 )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = shl_sat( x[0], expi );
L_sum = L_mac_sat( 1, tmp, tmp );
FOR( i = 1; i < lg; i++ )
@@ -278,15 +259,6 @@ Word32 Energy_scale( /* (o) : Q31: normalized result (1 < val
tmp = shl_sat( x[i], expi );
L_sum = L_mac_sat( L_sum, tmp, tmp );
}
-#else
- tmp = shl_o( x[0], expi, &Overflow );
- L_sum = L_mac_o( 1, tmp, tmp, &Overflow );
- FOR( i = 1; i < lg; i++ )
- {
- tmp = shl_o( x[i], expi, &Overflow );
- L_sum = L_mac_o( L_sum, tmp, tmp, &Overflow );
- }
-#endif
}
/* Normalize acc in Q31 */
diff --git a/lib_com/modif_fs_fx.c b/lib_com/modif_fs_fx.c
index b54efcea8f15dcb60e1ddc3e8d62432d40016aff..6bd1e7a699ffd2d697a0c496939321f67864bcef 100644
--- a/lib_com/modif_fs_fx.c
+++ b/lib_com/modif_fs_fx.c
@@ -75,12 +75,6 @@ Word16 modify_Fs_ivas_fx( /* o : length of output Q
Word16 flag_low_order = 0;
move16();
Word16 filt_len_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
const Resampling_cfg *cfg_ptr_fx;
/*-------------------------------------------------------------------*
@@ -279,11 +273,7 @@ Word16 modify_Fs_ivas_fx( /* o : length of output Q
test();
IF( GT_32( fin, 16000 ) && ( EQ_16( lg_out, L_FRAME ) || EQ_16( lg_out, L_FRAME16k ) || EQ_16( lg_out, 512 ) ) )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
num_den = shl_sat( num_den, 1 );
-#else
- num_den = shl_o( num_den, 1, &Overflow );
-#endif
*Q_new_inp = add( *Q_new_inp, 1 );
move16();
}
@@ -364,12 +354,6 @@ Word16 modify_Fs_fx( /* o : length of output Q0 */
Word16 flag_low_order = 0;
move16();
Word16 filt_len_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
const Resampling_cfg *cfg_ptr_fx;
/*-------------------------------------------------------------------*
@@ -565,11 +549,7 @@ Word16 modify_Fs_fx( /* o : length of output Q0 */
if ( GT_32( fin, 16000 ) && ( EQ_16( lg_out, L_FRAME ) || EQ_16( lg_out, L_FRAME16k ) || EQ_16( lg_out, 512 ) ) )
{
#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifdef ISSUE_1836_replace_overflow_libcom
num_den = shl_sat( num_den, 1 );
-#else
- num_den = shl_o( num_den, 1, &Overflow );
-#endif
#else
num_den = shl( num_den, 1 );
#endif
@@ -941,176 +921,95 @@ void Decimate_allpass_steep_fx(
Word32 Lacc, Lacc1;
Word16 temp1, temp2;
Word16 sum = 0;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
move16();
/*upper allpass filter chain */
-
-
FOR( k = 0; k < N / 2; k++ )
{
- Lacc = L_deposit_h( mem[0] ); /* Q(16+x) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ Lacc = L_deposit_h( mem[0] ); /* Q(16+x) */
Lacc = L_mac_sat( Lacc, AP1_STEEP_FX[0], in_fx[2 * k] ); /* Q(16+x) */
Lacc1 = L_deposit_h( in_fx[2 * k] ); /* Q16+Qx */
temp1 = extract_h( Lacc ); /* Qx */
Lacc1 = L_msu_sat( Lacc1, AP1_STEEP_FX[0], temp1 ); /* Q16+Qx */
-#else
- Lacc = L_mac_o( Lacc, AP1_STEEP_FX[0], in_fx[2 * k], &Overflow ); /* Q(16+x) */
- Lacc1 = L_deposit_h( in_fx[2 * k] ); /* Q16+Qx */
- temp1 = extract_h( Lacc ); /* Qx */
- Lacc1 = L_msu_o( Lacc1, AP1_STEEP_FX[0], temp1, &Overflow ); /* Q16+Qx */
-#endif
- mem[0] = extract_h( Lacc1 ); /* Qx */
+ mem[0] = extract_h( Lacc1 ); /* Qx */
temp[0] = temp1;
move16();
move16();
- Lacc1 = L_deposit_h( mem[1] ); /* Q16+Qx */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ Lacc1 = L_deposit_h( mem[1] ); /* Q16+Qx */
Lacc1 = ( L_mac_sat( Lacc1, AP1_STEEP_FX[1], temp1 ) ); /* Q16+Qx */
temp2 = extract_h( Lacc1 ); /* Qx */
Lacc = L_msu_sat( Lacc, AP1_STEEP_FX[1], temp2 ); /* Q16+Qx */
-#else
- Lacc1 = ( L_mac_o( Lacc1, AP1_STEEP_FX[1], temp1, &Overflow ) ); /* Q16+Qx */
-
- temp2 = extract_h( Lacc1 ); /* Qx */
- Lacc = L_msu_o( Lacc, AP1_STEEP_FX[1], temp2, &Overflow ); /* Q16+Qx */
-#endif
- mem[1] = extract_h( Lacc ); /* Qx */
+ mem[1] = extract_h( Lacc ); /* Qx */
temp[1] = temp2;
move16();
move16();
-
- Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x) */
out_fx[k] = extract_h( L_mac_sat( Lacc, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2 ) ); /* Qx format */
move16();
mem[ALLPASSSECTIONS_STEEP - 1] = extract_h( L_msu_sat( Lacc1, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[k] ) ); /* Qx */
move16();
-#else
- out_fx[k] = extract_h( L_mac_o( Lacc, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2, &Overflow ) ); /* Qx format */
- move16();
- mem[ALLPASSSECTIONS_STEEP - 1] = extract_h( L_msu_o( Lacc1, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[k], &Overflow ) ); /* Qx */
- move16();
-#endif
}
/* lower allpass filter chain */
-
- Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] ); /* Q(16+x) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] ); /* Q(16+x) */
Lacc = L_mac_sat( Lacc, AP2_STEEP_FX[0], mem[2 * ALLPASSSECTIONS_STEEP] ); /* Q(16+x) */
Lacc1 = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP] ); /* Q(16+x) */
temp1 = extract_h( Lacc ); /* Qx */
Lacc1 = L_msu_sat( Lacc1, AP2_STEEP_FX[0], temp1 ); /* Q(16+x) */
-#else
- Lacc = L_mac_o( Lacc, AP2_STEEP_FX[0], mem[2 * ALLPASSSECTIONS_STEEP], &Overflow ); /*Q(16+x) */
- Lacc1 = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP] ); /* Q(16+x) */
- temp1 = extract_h( Lacc ); /* Qx */
- Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[0], temp1, &Overflow ); /* Q(16+x) */
-#endif
mem[ALLPASSSECTIONS_STEEP] = extract_h( Lacc1 );
temp[0] = temp1;
move16();
Lacc1 = L_deposit_h( mem[ALLPASSSECTIONS_STEEP + 1] ); /* Q(16+x) */
-#ifdef ISSUE_1836_replace_overflow_libcom
- Lacc1 = L_mac_sat( Lacc1, AP2_STEEP_FX[1], temp1 ); /* Q(16+x) */
- temp2 = extract_h( Lacc1 ); /* Qx */
+ Lacc1 = L_mac_sat( Lacc1, AP2_STEEP_FX[1], temp1 ); /* Q(16+x) */
+ temp2 = extract_h( Lacc1 ); /* Qx */
temp[1] = temp2;
move16();
- Lacc = L_msu_sat( Lacc, AP2_STEEP_FX[1], temp2 ); /* Q(16+x) */
-#else
- Lacc1 = L_mac_o( Lacc1, AP2_STEEP_FX[1], temp1, &Overflow ); /* Q(16+x) */
- temp2 = extract_h( Lacc1 ); /* Qx */
- temp[1] = temp2;
- move16();
- Lacc = L_msu_o( Lacc, AP2_STEEP_FX[1], temp2, &Overflow ); /* Q(16+x) */
-#endif
+ Lacc = L_msu_sat( Lacc, AP2_STEEP_FX[1], temp2 ); /* Q(16+x) */
mem[ALLPASSSECTIONS_STEEP + 1] = extract_h( Lacc ); /* Qx */
move16();
- Lacc = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ Lacc = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x) */
Lacc = L_mac_sat( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2 ); /* Q(16+x) temp[ALLPASSSECTIONS_STEEP-1] */
temp[2] = extract_h( Lacc ); /* temp[2] in Qx */
move16();
Lacc1 = L_msu_sat( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[2] ); /* Q(16+x) */
-#else
- Lacc = L_mac_o( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2, &Overflow ); /* Q(16+x) temp[ALLPASSSECTIONS_STEEP-1] */
- temp[2] = extract_h( Lacc ); /* temp[2] in Qx */
- move16();
- Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[2], &Overflow ); /* Q(16+x) */
-#endif
- mem[2 * ALLPASSSECTIONS_STEEP - 1] = extract_h( Lacc1 ); /* Qx */
+ mem[2 * ALLPASSSECTIONS_STEEP - 1] = extract_h( Lacc1 ); /* Qx */
move16();
sum = mult_r( out_fx[0], 16384 ); /* Qx */
out_fx[0] = add_sat( sum, mult_r( temp[ALLPASSSECTIONS_STEEP - 1], 16384 ) ); /* Qx */
move16();
-
FOR( k = 1; k < N / 2; k++ )
{
-
-
- Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] ); /* Q(16+x) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] ); /* Q(16+x) */
Lacc = L_mac_sat( Lacc, AP2_STEEP_FX[0], in_fx[2 * k - 1] ); /* Q(16+x):temp[0] */
Lacc1 = L_deposit_h( in_fx[2 * k - 1] ); /* Q(16+x) */
temp1 = extract_h( Lacc ); /* Qx */
Lacc1 = L_msu_sat( Lacc1, AP2_STEEP_FX[0], temp1 ); /* Q(16+x) */
-#else
- Lacc = L_mac_o( Lacc, AP2_STEEP_FX[0], in_fx[2 * k - 1], &Overflow ); /* Q(16+x):temp[0] */
- Lacc1 = L_deposit_h( in_fx[2 * k - 1] ); /* Q(16+x) */
- temp1 = extract_h( Lacc ); /* Qx */
- Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[0], temp1, &Overflow ); /* Q(16+x) */
-#endif
mem[ALLPASSSECTIONS_STEEP] = extract_h( Lacc1 ); /* Qx */
move16();
temp[0] = temp1;
move16();
-
Lacc1 = L_deposit_h( mem[ALLPASSSECTIONS_STEEP + 1] ); /* Q(16+x) */
-#ifdef ISSUE_1836_replace_overflow_libcom
- Lacc1 = L_mac_sat( Lacc1, AP2_STEEP_FX[1], temp1 ); /* Q(16+x) */
- temp2 = extract_h( Lacc1 ); /* Qx */
+ Lacc1 = L_mac_sat( Lacc1, AP2_STEEP_FX[1], temp1 ); /* Q(16+x) */
+ temp2 = extract_h( Lacc1 ); /* Qx */
temp[1] = temp2;
move16();
Lacc = L_msu_sat( Lacc, AP2_STEEP_FX[1], temp2 ); /* Q(16+x) */
mem[ALLPASSSECTIONS_STEEP + 1] = extract_h( Lacc ); /* Qx */
-
Lacc = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x) */
Lacc = L_mac_sat( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[1] ); /* Q(16+x) temp[ALLPASSSECTIONS_STEEP-1] */
temp[2] = extract_h( Lacc ); /*temp[2] in Qx */
Lacc1 = L_msu_sat( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[2] ); /* Q(16+x) */
-#else
- Lacc1 = L_mac_o( Lacc1, AP2_STEEP_FX[1], temp1, &Overflow ); /* Q(16+x) */
- temp2 = extract_h( Lacc1 ); /* Qx */
- temp[1] = temp2;
- move16();
- Lacc = L_msu_o( Lacc, AP2_STEEP_FX[1], temp2, &Overflow ); /* Q(16+x) */
- mem[ALLPASSSECTIONS_STEEP + 1] = extract_h( Lacc ); /* Qx */
-
-
- Lacc = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x) */
- Lacc = L_mac_o( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[1], &Overflow ); /* Q(16+x) temp[ALLPASSSECTIONS_STEEP-1] */
- temp[2] = extract_h( Lacc ); /*temp[2] in Qx */
- Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp[2], &Overflow ); /* Q(16+x) */
-#endif
- mem[2 * ALLPASSSECTIONS_STEEP - 1] = extract_h( Lacc1 ); /* Qx */
-
+ mem[2 * ALLPASSSECTIONS_STEEP - 1] = extract_h( Lacc1 ); /* Qx */
sum = mult_r( out_fx[k], 16384 ); /* Qx */
out_fx[k] = add_sat( sum, mult_r( temp[ALLPASSSECTIONS_STEEP - 1], 16384 ) );
@@ -1225,20 +1124,13 @@ void Interpolate_allpass_steep_fx(
Word16 k;
Word32 Lacc = 0, Lacc1 = 0;
Word16 temp1, temp2;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
/*** State in Q0,in_fx Q0, AP1_STEEP in Q15 AP2_STEEP in Q15 OP in Q0 ************/
/*upper allpass filter chain */
FOR( k = 0; k < N; k++ )
{
-
- Lacc = L_deposit_h( mem[0] ); /* Q(16+x) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ Lacc = L_deposit_h( mem[0] ); /* Q(16+x) */
Lacc = L_mac_sat( Lacc, AP2_STEEP_FX[0], in_fx[k] ); /* Q(16+x):temp[0] */
Lacc1 = L_deposit_h( in_fx[k] ); /* Q(16+x) */
temp1 = round_fx_sat( Lacc ); /* Qx */
@@ -1261,37 +1153,13 @@ void Interpolate_allpass_steep_fx(
move16();
mem[ALLPASSSECTIONS_STEEP - 1] = round_fx_sat( L_msu_sat( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[2 * k + 1] ) ); /* Qx */
move16();
-#else
- Lacc1 = L_deposit_h( in_fx[k] ); /* Q(16+x) */
- temp1 = round_fx_o( Lacc, &Overflow ); /* Qx */
- Lacc1 = L_msu_o( Lacc1, AP2_STEEP_FX[0], temp1, &Overflow ); /* Q(16+x) */
-
- mem[0] = round_fx_o( Lacc1, &Overflow );
- move16();
- Lacc1 = L_deposit_h( mem[1] ); /* Q(16+x) */
- Lacc1 = ( L_mac_o( Lacc1, AP2_STEEP_FX[1], temp1, &Overflow ) ); /* Q(16+x):temp[1] */
- Lacc = L_deposit_h( temp1 );
-
- temp2 = round_fx_o( Lacc1, &Overflow ); /* Qx */
- Lacc = L_msu_o( Lacc, AP2_STEEP_FX[1], temp2, &Overflow ); /* Q(16+x) */
- mem[1] = round_fx_o( Lacc, &Overflow ); /* Qx */
- move16();
-
- Lacc1 = L_deposit_h( temp2 );
- Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x) */
- out_fx[2 * k + 1] = round_fx_o( L_mac_o( Lacc, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2, &Overflow ), &Overflow ); /* Qx format */
- move16();
- mem[ALLPASSSECTIONS_STEEP - 1] = round_fx_o( L_msu_o( Lacc1, AP2_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[2 * k + 1], &Overflow ), &Overflow ); /* Qx */
- move16();
-#endif
}
/* lower allpass filter chain */
FOR( k = 0; k < N; k++ )
{
- Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] ); /* Q(16+x) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ Lacc = L_deposit_h( mem[ALLPASSSECTIONS_STEEP] ); /* Q(16+x) */
Lacc = L_mac_sat( Lacc, AP1_STEEP_FX[0], in_fx[k] ); /* Q(16+x):temp[0] */
Lacc1 = L_deposit_h( in_fx[k] ); /* Q(16+x) */
temp1 = round_fx_sat( Lacc ); /* Qx */
@@ -1312,28 +1180,6 @@ void Interpolate_allpass_steep_fx(
move16();
mem[2 * ALLPASSSECTIONS_STEEP - 1] = round_fx_sat( L_msu_sat( Lacc1, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[2 * k] ) ); /* Qx */
move16();
-#else
- Lacc = L_mac_o( Lacc, AP1_STEEP_FX[0], in_fx[k], &Overflow ); /* Q(16+x):temp[0] */
- Lacc1 = L_deposit_h( in_fx[k] ); /* Q(16+x) */
- temp1 = round_fx_o( Lacc, &Overflow ); /* Qx */
- Lacc1 = L_msu_o( Lacc1, AP1_STEEP_FX[0], temp1, &Overflow ); /* Q(16+x) */
-
- mem[ALLPASSSECTIONS_STEEP] = round_fx_o( Lacc1, &Overflow );
- Lacc1 = L_deposit_h( mem[ALLPASSSECTIONS_STEEP + 1] ); /* Q(16+x) */
- Lacc1 = L_mac_o( Lacc1, AP1_STEEP_FX[1], temp1, &Overflow ); /* Q(16+x):temp[1] */
-
- temp2 = round_fx_o( Lacc1, &Overflow ); /* Qx */
- Lacc = L_deposit_h( temp1 );
- Lacc = L_msu_o( Lacc, AP1_STEEP_FX[1], temp2, &Overflow ); /* Q(16+x) */
- mem[ALLPASSSECTIONS_STEEP + 1] = round_fx_o( Lacc, &Overflow ); /* Qx */
-
- Lacc = L_deposit_h( mem[2 * ALLPASSSECTIONS_STEEP - 1] ); /* Q(16+x) */
- Lacc1 = L_deposit_h( temp2 );
- out_fx[2 * k] = round_fx_o( L_mac_o( Lacc, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], temp2, &Overflow ), &Overflow ); /* Qx format */
- move16();
- mem[2 * ALLPASSSECTIONS_STEEP - 1] = round_fx_o( L_msu_o( Lacc1, AP1_STEEP_FX[ALLPASSSECTIONS_STEEP - 1], out_fx[2 * k], &Overflow ), &Overflow ); /* Qx */
- move16();
-#endif
}
return;
diff --git a/lib_com/oper_32b.c b/lib_com/oper_32b.c
index d8966dbab9914381ca5466a2d2772b34f3665c18..cb8c773004d605c06b6b3b595db70639be814a36 100644
--- a/lib_com/oper_32b.c
+++ b/lib_com/oper_32b.c
@@ -124,20 +124,10 @@ Word32 L_Comp( Word16 hi, Word16 lo )
Word32 Mpy_32( Word16 hi1, Word16 lo1, Word16 hi2, Word16 lo2 )
{
Word32 L_32;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
L_32 = L_mult( hi1, hi2 );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_32 = L_mac_sat( L_32, mult( hi1, lo2 ), 1 );
L_32 = L_mac_sat( L_32, mult( lo1, hi2 ), 1 );
-#else
- L_32 = L_mac_o( L_32, mult( hi1, lo2 ), 1, &Overflow );
- L_32 = L_mac_o( L_32, mult( lo1, hi2 ), 1, &Overflow );
-#endif
return ( L_32 );
}
@@ -166,21 +156,10 @@ Word32 Mpy_32( Word16 hi1, Word16 lo1, Word16 hi2, Word16 lo2 )
Word32 Mac_32( Word32 L_num, Word16 hi1, Word16 lo1, Word16 hi2, Word16 lo2 )
{
Word32 L_32;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-#ifdef ISSUE_1836_replace_overflow_libcom
L_32 = L_mac_sat( L_num, hi1, hi2 );
L_32 = L_mac_sat( L_32, mult( hi1, lo2 ), 1 );
L_32 = L_mac_sat( L_32, mult( lo1, hi2 ), 1 );
-#else
- L_32 = L_mac_o( L_num, hi1, hi2, &Overflow );
- L_32 = L_mac_o( L_32, mult( hi1, lo2 ), 1, &Overflow );
- L_32 = L_mac_o( L_32, mult( lo1, hi2 ), 1, &Overflow );
-#endif
return ( L_32 );
}
@@ -208,19 +187,9 @@ Word32 Mac_32( Word32 L_num, Word16 hi1, Word16 lo1, Word16 hi2, Word16 lo2 )
Word32 Sqr_32( Word16 hi, Word16 lo )
{
Word32 L_32;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-#ifdef ISSUE_1836_replace_overflow_libcom
L_32 = L_mult_sat( hi, hi );
L_32 = L_mac_sat( L_32, mult( hi, lo ), 2 );
-#else
- L_32 = L_mult_o( hi, hi, &Overflow );
- L_32 = L_mac_o( L_32, mult( hi, lo ), 2, &Overflow );
-#endif
return ( L_32 );
}
diff --git a/lib_com/options.h b/lib_com/options.h
index 4eb4bc82aa5b99056e0a0a1054237876516f7053..4d2514eb3ae76b335ea63598ba22c5583fb3f208 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -71,104 +71,61 @@
#define BASOP_NOGLOB_DECLARE_LOCAL
#endif
-/* Note: each compile switch (FIX_1101_...) is independent from the other ones */
-
-#define FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW /* FhG: bit-exact, replace carry and overflow operations by 64-bit operations, MR 2166 */
-#define ISSUE_1836_replace_overflow_libcom /* FhG: BE - replace overflow operators by non-overflow-alternatives in lib_com */
-#define ISSUE_1867_replace_overflow_libenc /* FhG: BE - replace overflow operators by non-overflow-alternatives all over the lib_enc module */
-#define FIX_1942_ASSERTION_LOWSHELF /* FhG: Modified the target_gains_db_fx calculation in compute_t60_coeffs_fx() */
-#define FIX_1944_CRASH_FOR_STEREO /* FhG: improve TonalMDCTConceal_InsertNoise calculation precision */
-#define FIX_1970_SBA_CRASH /* Dlb: Fix for issue 1970, SBA crash */
-
-#define FIX_1978_SAT_MISSING_IN_GAIN_ENC /* VA: Fix add saturation missing that lead to a crash in P800-10 */
-#define FIX_1981_MAXIMUM_EXP_FX /* FhG: Fix bug in function to find maximum value in vector */
-#define FIX_1981_MAXIMUM_EXP_FX_ZEROMANTISSA /* FhG: Fix bug in function to find maximum value in vector:zero-mantissa fix*/
-
-#define FIX_1979_SAT_MISSING_IN_LSF_ENC /* VA: Proposal to fix 1979, saturation in lsf_enc, NOkia to review */
-#define FIX_1946_CRASH_JBM_PROCESSING /* FhG: Increased guard bits of DFT_fx */
-#define FIX_1980_CRASH_FDCNG_ENCODESID /* FhG: Add one bit of headroom in e_fx calculation in FdCng_encodeSID_ivas_fx() */
-#define FIX_1987_CRASH_OMASA_ENERGY /* FhG: Replace cldfbAnalysis_ts_fx_fix_q() with cldfbAnalysis_ts_fx_var_q() to avoid assertion error */
-#define FIX_1985_SBA_714_HF_LOSS /* Dlb: Fix for issue 1985, improved dirac ref pow precision*/
-#define FIX_1819_EIGENVALUE_ERROR /* FhG: Workaround for zero eigenvalue: replace with epsilon if det != 0*/
-#define FIX_1990_SANITIZER_IN_REVERB_LOAD /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure. */
-#define FIX_1995_REVERB_INIT /* VA/Nokia: issue 1995: Fix use-of-uninitialized-value in ivas_binaural_reverb_init() */
-#define FIX_1996_MASKING_NOISE /* Dlb: Heavy precision loss in ola buffers causing discontinuity*/
-#define FIX1998_APA_EXEC_SCALING /* FhG: fix scaling of apa_exec_ivas_fx(); avoid continuously worse scaling with previous data */
-#define FIX2007_BASSPSFILTER_OVERFLOW /* FhG: use saturing operator, to avoid overflow in bass_psfilter_fx() */
-#define FIX_ISSUE_2004_LPC_SHB_SAT /* Dolby: Issue 2004: prevent saturation of the LPC SHB filter */
-
-#define FIX_2009_HIGH_NOISE_FLOOR_FOR_FX_DEC /* FhG: Corrected the q_input in the input of generate_masking_noise_dirac_ivas_fx() */
-#define FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES /* Eri/FhG: Issue 2013 fix for dtx discontinuities */
-#define FIX_ISSUE_2013_MDCT_STEREO_FER_DISCONTINUITIES /* Eri/FhG: Issue 2013 fix for FER discontinuities */
-#define FIX_2000_NON_LINEARITY_OVERSHOOT /* Eri: Issue 2000: SWB TBE energy overshoot in non-linearity. Aligns with float */
-#define FIX_2010_PREP_TBE_EXC /* FhG: fix issues with varying Q-values for code_preQ_fx[] */
-#define FIX_2025_FDCNG_MULT /* Nokia, FhG: Fix LB FDCNG noise introduced by changing mult to i_mult */
-
-#define FIX_1962_FORMAT_CONV_SPECTRAL_DIFF /* FhG: Improved precision of targetEnergy in ivas_ls_setup_conversion_process_mdct_fx() */
-#define FIX_2003_CON_TCX_OVERFLOW /* FhG: Use a dynamic scaling factor for the synth buffer at the output of con_tcx_ivas_fx() */
-#define HP20_FIX32_RECODING /* FhG: optimized hp20_fx_32 calculation and applied it as hp20_fx_32_opt in decoder */
-#define OPT_TCXLTP_FILTER_LOOP /* FhG: optimize loop in tcx_ltp_synth_filter */
-#define FIX_2049_DIFF_IN_DECORR_TAIL /* FhG: correct scale values in ivas_dirac_dec_binaural_process_output_fx() */
-#define FIX_2602_NONBE_SAT_IN_SWB_TBE_SCALE /* Dolby/FhG: fix for issue 2026: Saturation in SWB TBE re-scaling function preventing StereoDownmix complexity job to complete */
-#define FIX_2021_BANDWIDTH_EXTENSION_PROBLEM /* FhG: increase cldfb buffer precision*/
-
-#define FIX_2083_FLOATING_POINT_LEFTOVERS /* FhG: convert floating-point leftovers in makeCustomLsSetup()*/
-#define FIX_2085_FLOATING_POINT_LEFTOVERS /* FhG: convert floating-point leftovers in ivas_dirac_config_fx() */
+/* ################### Start FIXES switches ########################### */
+
+#define FIX_1990_SANITIZER_IN_REVERB_LOAD /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */
+#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/
+#define TEMP_FIX_2088_MSAN_INIT_ERROR /* Eri: Temporary fix for Issue 2088 - MSAN error. Will come with later port of JBM+Split rendering update */
+#define FIX_2092_ASSERT_IN_OMASA_RENDER /* FhG, Nokia: Fix LTV crash due to overflow in OMASA EXT output */
+#define FIX_2084_FLOATING_POINT_LEFTOVERS /* FhG: convert floating-point leftovers in IVAS_ENC_FeedObjectMetadata() */
+#define FIX_2141_ASSERT_IN_OMASA_BITRATE_SWITSCHING /* FhG: Replace L_shl with L_shl_sat to prevent overflow when calculating scale factors for very small numbers in the logarithmic domain */
+/* ################### End FIXES switches ########################### */
+
/* #################### Start BASOP porting switches ############################ */
#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
-#define FIX_1129_EXT_REND_OUTPUT_HIGH /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */
#define NONBE_1302_FIX_OMASA_JBM_FLUSH /* VA: issue 1302: fix OMASA JBM bitrate switching flush in binaural output */
#define NONBE_1328_FIX_NON_LINEARITY /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0, float issue 1328 */
#define FIX_1319_STACK_SBA_DECODER /* VA: issue 1319: Optimize the definition of buffer lengths in the SBA decoder */
#define FIX_1320_STACK_CPE_DECODER /* VA: issue 1320: Optimize the stack memory consumption in the CPE decoder */
-#define FIX_1984_SAT_IN_PSYCHAD /* VA: Issue 1984: proposal to fix an assert */
#define NONBE_FIX_1261_MASA_EXT_META_JBM /* Nokia: issue #1261: MASA metadata EXT output delay buffer init in JBM */
-#define NONBE_FIX_1143_MASA_BRSW /* Nok: Fix for issue 1143: MSAN use of uninitialized value in masa decoding to binaural with dtx bitrate switching and 5 % FER */
-#define NONBE_FIX_1220_OMASA_JBM_EXT_USAN /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */
#define NONBE_FIX_1376_MDCT_CONCEALMENT /* FhG: fix concealment artifact in MDCT Stereo with DTX, in case transition frame gets lost */
-#define FIX_989_TD_REND_ROM /* Eri: Clean-up for TD renderer and completion of ROM generation tool */
-#define FIX_CREND_SIMPLIFY_CODE
-#ifdef FIX_CREND_SIMPLIFY_CODE
-#define FIX_989_TD_REND_ROM /* Eri: Clean-up for TD renderer and completion of ROM generation tool */
-#define USE_REVERB_16BIT_ROM /* if desactivated old rom hrtf tables is used */
-#define USE_TDREND_16BIT_ROM /* if desactivated old rom hrtf tables is used. when active some tests case with 4 ISM fail due to owerflow in round_fixed function */
-#define USE_FASTCONV_PARAMBIN_16BIT_ROM /* if desactivated old rom hrtf tables is used */
-#define FIX_HRTF_LOAD /* VA: issue 1187: fix memory issue when HRTFs are loaded from a binary file */
-#endif
#define NONBE_1377_REND_DIRATT_CONF /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */
#define FIX_1377_HANDLE_ERROR_CODE /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */
-#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/
-#define ADJUST_MCT_CHANNELS_MAX /* FhG: set correct max mct channels constant*/
#define FIX_1053_REVERB_RECONFIGURATION
#define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
#define FIX_1113_EXTREND_ISAR /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */
-#define FIX_1166_TDREND_DIV0 /* FhG,Eri: issue 1166: potential divide by zero in TD Renderer */
-#define NONBE_1203_MDCT2DFT_SWITCHING /* VA: issue 1203: fix severe artifacts during MDCT to DFT stereo switching when MDCT ITD is not used */
-#define NONBE_1122_JBM_FIX_PLAYOUT_DELAY_IN_DTX /* FhG: Avoid JBM ignoring safety margin and setting playout delay to 0 during DTX */
#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */
#define FIX_938_COMPILER_WARNING /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */
#define FIX_1376_MISSING_ISM_METADATA /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */
#define FIX_1385_INIT_IGF_STOP_FREQ /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */
#define FIX_1387_INIT_PRM_SQQ /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */
-#define NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS /* Eri: issue 1296: ITD resampling can occasionally read out of bounds, especially when the requested subframes are short (1.25 ms). Seen for headtracking+JBM. */
#define FIX_1349_TNS_CRASH /* FhG: Fix crash in TNS entropy coding, in case order of joint TNS coding is reduced to 0 */
-#define NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING /* Ericsson: issue 1180, corrected long term mute loop attnuation after 200ms in PhECU-PLC */
#define FIX_1179_USAN_PHASEECU /* Eri: issue 1179: better handling of 16 bit wrap around for very long(>200ms) FER-bursts */
-#define NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH /* VA: issue 1199: fix bug in renderer flush in OMASA JBM bitrate switching */
-#define NONBE_1200_ISM_JBM_BRATE_SW_FLUSH /* VA: issue 1200: fix bug in renderer flush in ISM JBM bitrate switching */
#define NONBE_1293_CRASH_FIRST_FRAME_LOST /* VA: issue 1293: fix G.192 decoder crash when first frame is lost */
#define FIX_1384_MSAN_stereo_tcx_core_enc /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */
-#define NONBE_FIX_1297_SPAR_JBM_MEM_SAN /* Dolby: issue 1297, SPAR + JBM + BR switch memory sanitizer */
+#define NONBE_1303_REND_GRANULARITY /* VA: issue 1303: Renderer granularity revision */
+#define NONBE_1300_TDREND_LARGE_ITD /* Eri: issue 1300: There was a bug feeding 1.25 ms frames to the TD renderer, causing out-of-buffer access. This was resolved. However, it is still possible that modeled HRTF with large ITDs could trigger out-of-buffer access. This adds a check to prevent this.*/
+#define FIX_1384_MSAN_ivas_spar_dec_open /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */
+#define FIX_1388_MSAN_ivas_init_decoder /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */
+#define FIX_1288_SPLIT_REND_XSAN /* Dlb: Fix asan, msan and usan issues in split rendering mode*/
+#define LIB_DEC_REVISION /* VA: cleaning and simplification of lib_dec.c */
+#define UNIFIED_DECODING_PATHS_LEFTOVERS /* VA: issue 880: remove leftovers after NONBE_UNIFIED_DECODING_PATHS */
+#define FIX_NCHAN_BUFFERS /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */
+#define FIX_RENDERER_STACK /* VA: issue 1322: reduction of renderers' buffers size */
#define CODE_IMPROVEMENTS
// object-editing feature porting
-#define OBJ_EDITING_API /* object editing changes related to the API */
-#ifdef OBJ_EDITING_API
-#define FIX_HRTF_LOAD_API // solves API conflicts between HRTF and object-editing features
#define TMP_FIX_SPLIT_REND // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)
#define TMP_FIX_OMASA_SR_BE // temporary fix to keep OMASA split-rendering BE
-#endif
+#define NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES // Nokia: Fix 1399_1400 issue in float, this is essential for the BASOP porting
+#define OBJ_EDIT_BASOP
+#define NONBE_1217_INIT_OBJ_EDIT /* VA: issue 1217: do object editing only when objects metadata is available */
+#define FIX_1217_OBJECT_EDIT_FILE_INTERFACE /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */
+#define NONBE_1217_OBJ_EDIT_FOA /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */
+#define NONBE_FIX_1255_OBJ_EDIT_JBM /* VA: issue 1255: restore object editing in JBM */
+#define FIX_1372_OSBA_OBJECT_EDITING /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */
+#define FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES /* Nokia: Issue 2140, fixes three different sanitizer issues persisting in object editing code. */
/* #################### End BASOP porting switches ############################ */
diff --git a/lib_com/phase_dispersion_fx.c b/lib_com/phase_dispersion_fx.c
index 055513dd1ff8bcd4dbf070240a342bd33a669d4a..ce4f70e5a5c98944957ecbbc0f8f785090a471fb 100644
--- a/lib_com/phase_dispersion_fx.c
+++ b/lib_com/phase_dispersion_fx.c
@@ -31,12 +31,6 @@ void phase_dispersion(
Word32 x32[2 * L_SUBFR];
Word16 *code_real, *code_imag;
const Word16 *h_real, *h_imag;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-
move16();
state = 2;
@@ -60,11 +54,7 @@ void phase_dispersion(
move16();
prev_gain_pit[0] = gain_pit;
-#ifdef ISSUE_1836_replace_overflow_libcom
IF( GT_32( gain_code, L_add_sat( *prev_gain_code, L_shl_sat( *prev_gain_code, 1 ) ) ) )
-#else
- IF( GT_32( gain_code, L_add_o( *prev_gain_code, L_shl_o( *prev_gain_code, 1, &Overflow ), &Overflow ) ) )
-#endif
{
IF( LT_16( state, 2 ) )
{
@@ -172,11 +162,7 @@ void phase_dispersion(
scale2 = getScaleFactor32( x32, L_subfr );
FOR( i = 0; i < L_subfr; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
code[i] = round_fx_sat( L_shl_sat( x32[i], scale2 ) );
-#else
- code[i] = round_fx_o( L_shl_o( x32[i], scale2, &Overflow ), &Overflow );
-#endif
move16();
}
j = sub( j, scale2 );
diff --git a/lib_com/ppp_fx.c b/lib_com/ppp_fx.c
index fd8b0acef8d9adf42572deb5e57bf2ba49a0be7f..c0824124977b34308ef68a814d6496bfd3b1f771 100644
--- a/lib_com/ppp_fx.c
+++ b/lib_com/ppp_fx.c
@@ -97,12 +97,7 @@ void deemph_lpc_fx(
Word16 k, temp;
Word16 b_fx[M + 2]; /* Q12 */
Word16 a_fx[2] = { -22282, 32767 }; /* Q15 {-PREEMPH_FAC,1.0} */
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
b_fx[0] = 4096;
move16(); /* 1 in Q12 */
FOR( k = 0; k < M; k++ )
@@ -117,11 +112,7 @@ void deemph_lpc_fx(
{
/* LPC_de_curr[k] = a[0]*b[k] + a[1]*b[k+1]; */
temp = mult( a_fx[0], b_fx[k] ); /* Q12 */
-#ifdef ISSUE_1836_replace_overflow_libcom
LPC_de_curr_fx[k] = add_sat( temp, b_fx[k + 1] );
-#else
- LPC_de_curr_fx[k] = add_o( temp, b_fx[k + 1], &Overflow );
-#endif
move16(); /* Q12 */
}
@@ -143,11 +134,7 @@ void deemph_lpc_fx(
{
/* LPC_de_old[k] = a[0]*b[k] + a[1]*b[k+1]; */
temp = mult( a_fx[0], b_fx[k] ); /* Q12 */
-#ifdef ISSUE_1836_replace_overflow_libcom
LPC_de_old_fx[k] = add_sat( temp, b_fx[k + 1] );
-#else
- LPC_de_old_fx[k] = add_o( temp, b_fx[k + 1], &Overflow );
-#endif
move16(); /* Q12 */
}
}
diff --git a/lib_com/pred_lt4_fx.c b/lib_com/pred_lt4_fx.c
index 146ecc2cea79fc2a4aa7c562aad4d59a1cbeab11..869edfd1b89911da958ad63bdbed4235353d4690 100644
--- a/lib_com/pred_lt4_fx.c
+++ b/lib_com/pred_lt4_fx.c
@@ -34,12 +34,7 @@ void pred_lt4_ivas_fx(
Word32 s;
const Word16 *x0, *x1, *x2;
const Word32 *c1, *c2;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
x0 = &excI[-T0];
frac = negate( frac );
@@ -72,13 +67,10 @@ void pred_lt4_ivas_fx(
s = W_sat_l( W_shr( s64, 16 ) ); /* Q_exc + Q16 */
}
-#ifdef ISSUE_1836_replace_overflow_libcom
excO[j] = round_fx_sat( s ); /* Q_exc */
-#else
- excO[j] = round_fx_o( s, &Overflow ); /* Q_exc */
-#endif
move16();
}
+
return;
}
@@ -96,14 +88,8 @@ void pred_lt4(
Word16 i, j;
Word32 s;
const Word16 *x0, *x1, *x2, *c1, *c2;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
- x0 = &excI[-T0];
+ x0 = &excI[-T0];
frac = negate( frac );
@@ -134,22 +120,14 @@ void pred_lt4(
}
s = W_sat_l( s64 ); /* Q_exc + Q14 */
}
-#ifdef ISSUE_1836_replace_overflow_libcom
#if ( INTERP_EXP != -1 )
s = L_shl_sat( s, INTERP_EXP + 1 ); /* Q_exc + Q15 */
#endif
excO[j] = round_fx_sat( s ); /* Q_exc */
move16();
-#else
-#if ( INTERP_EXP != -1 )
- s = L_shl_o( s, INTERP_EXP + 1, &Overflow ); /* Q_exc + Q15 */
-#endif
-
- excO[j] = round_fx_o( s, &Overflow ); /* Q_exc */
- move16();
-#endif
}
+
return;
}
@@ -193,12 +171,7 @@ void pred_lt4_tc_fx(
Word16 excO[L_SUBFR + 1];
Word32 L_sum;
Word16 excI[2 * L_SUBFR];
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
Copy( exc + sub( i_subfr, L_SUBFR ), excI, L_SUBFR * 2 ); /* Q0 */
test();
@@ -230,25 +203,15 @@ void pred_lt4_tc_fx(
k += UP_SAMP;
L_sum = L_mac( L_sum, x0[i], win[k] ); /* Q15 */
}
-#ifdef ISSUE_1836_replace_overflow_libcom
L_sum = L_shl_sat( L_sum, 1 ); /* Q16 */
excO[j] = round_fx_sat( L_sum ); /* Q0 */
-#else
- L_sum = L_shl_o( L_sum, 1, &Overflow ); /* Q16 */
- excO[j] = round_fx_o( L_sum, &Overflow ); /* Q0 */
-#endif
-
move16();
x0++;
}
FOR( i = T0; i < L_SUBFR; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
exc[i + i_subfr] = add_sat( exc[i + i_subfr], mult_r( PIT_SHARP_fx, excO[i] ) ); /* Q0 */
-#else
- exc[i + i_subfr] = add_o( exc[i + i_subfr], mult_r( PIT_SHARP_fx, excO[i] ), &Overflow ); /* Q0 */
-#endif
move16();
}
}
diff --git a/lib_com/preemph_fx.c b/lib_com/preemph_fx.c
index db3949bca986349d860738d79c765d9386422616..0184a4aa3b31c265b23594424419c4997f614362 100644
--- a/lib_com/preemph_fx.c
+++ b/lib_com/preemph_fx.c
@@ -22,15 +22,10 @@ void preemph_copy_fx(
)
{
Word16 i, temp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
temp = x[lg - 1]; /* Qx */
move16();
-#ifdef ISSUE_1836_replace_overflow_libcom
+
FOR( i = lg - 1; i > 0; i-- )
{
y[i] = msu_r_sat( L_deposit_h( x[i] ), x[i - 1], mu ); /* Qx */
@@ -38,19 +33,11 @@ void preemph_copy_fx(
}
y[0] = msu_r_sat( L_deposit_h( x[0] ), *mem, mu ); /* Qx */
move16();
-#else
- FOR( i = lg - 1; i > 0; i-- )
- {
- y[i] = msu_ro( L_deposit_h( x[i] ), x[i - 1], mu, &Overflow ); /* Qx */
- move16();
- }
- y[0] = msu_ro( L_deposit_h( x[0] ), *mem, mu, &Overflow ); /* Qx */
- move16();
-#endif
-
*mem = temp; /* Qx */
move16();
+
+ return;
}
void preemph_copy_32fx(
@@ -62,15 +49,10 @@ void preemph_copy_32fx(
)
{
Word16 i, temp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
temp = x[lg - 1]; /* Qx */
move16();
-#ifdef ISSUE_1836_replace_overflow_libcom
+
FOR( i = lg - 1; i > 0; i-- )
{
y[i] = L_msu_sat( L_deposit_h( x[i] ), x[i - 1], mu ); /* Qx+16 */
@@ -78,18 +60,11 @@ void preemph_copy_32fx(
}
y[0] = L_msu_sat( L_deposit_h( x[0] ), *mem, mu ); /* Qx+16 */
move16();
-#else
- FOR( i = lg - 1; i > 0; i-- )
- {
- y[i] = L_msu_o( L_deposit_h( x[i] ), x[i - 1], mu, &Overflow ); /* Qx+16 */
- move16();
- }
- y[0] = L_msu_o( L_deposit_h( x[0] ), *mem, mu, &Overflow ); /* Qx+16 */
- move16();
-#endif
*mem = temp; /* Qx */
move16();
+
+ return;
}
/*-------------------------------------------------------------*
@@ -150,16 +125,10 @@ void E_UTIL_f_preemph2(
{
Word16 i, temp;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
temp = signal[lg - 1]; /* Qx */
move16();
-#ifdef ISSUE_1836_replace_overflow_libcom
FOR( i = lg - 1; i > 0; i-- )
{
L_tmp = L_mult( signal[i], 16384 ); /* Qx + 15 */
@@ -174,22 +143,6 @@ void E_UTIL_f_preemph2(
L_tmp = L_shl_sat( L_tmp, add( shift, 1 ) ); /* Qx + shift + 16 */
signal[0] = round_fx_sat( L_tmp ); /* Qx + shift */
move16();
-#else
- FOR( i = lg - 1; i > 0; i-- )
- {
- L_tmp = L_mult( signal[i], 16384 ); /* Qx + 15 */
- L_tmp = L_msu0_o( L_tmp, signal[i - 1], mu, &Overflow ); /* Qx + 15 */
- L_tmp = L_shl_o( L_tmp, add( shift, 1 ), &Overflow ); /* Qx + shift + 16 */
- signal[i] = round_fx_o( L_tmp, &Overflow ); /* Qx + shift */
- move16();
- }
-
- L_tmp = L_mult( signal[0], 16384 ); /* Qx + 15 */
- L_tmp = L_msu0_o( L_tmp, *mem, mu, &Overflow ); /* Qx + 15 */
- L_tmp = L_shl_o( L_tmp, add( shift, 1 ), &Overflow ); /* Qx + shift + 16 */
- signal[0] = round_fx_o( L_tmp, &Overflow ); /* Qx + shift */
- move16();
-#endif
*mem = temp; /* Qx */
move16();
diff --git a/lib_com/prot_fx.h b/lib_com/prot_fx.h
index d5583074029523cae0e89ed9c6f22ee087d32e2e..32b8a00ee5d5457391c29147ac2dbdce9bcbde59 100644
--- a/lib_com/prot_fx.h
+++ b/lib_com/prot_fx.h
@@ -32,6 +32,7 @@
#ifndef PROT_FX2_H
#define PROT_FX2_H
+
/*----------------------------------------------------------------------------------*
* Prototypes of RAM counting tool macros
*----------------------------------------------------------------------------------*/
@@ -56,6 +57,8 @@
#include "ivas_error.h"
#include "ivas_error_utils.h"
#include "complex_basop.h"
+
+
#define TCX_IMDCT_SCALE 15
#define TCX_IMDCT_HEADROOM 1
@@ -166,6 +169,7 @@ Word16 L_get_q_buf1( float *ptr_flt, Word16 length );
/*================================================================================*/
/* conversion functions: */
/*================================================================================*/
+
Word32 sum_l_fx(
const Word32 *vec, /* i : input vector */
const Word16 lvec /* i : length of input vector */
@@ -212,8 +216,9 @@ void set32_fx(
);
// tools.c
-Word16 Random( /* o : output random value */
- Word16 *seed /* i/o: random seed */
+/* o : output random value */
+Word16 Random(
+ Word16 *seed /* i/o: random seed */
);
// tools.c
@@ -241,7 +246,6 @@ void Copy_pword(
const Word16 L /* i : vector length */
);
-// tools.c
void Scale_sig(
Word16 x[], /* i/o: signal to scale Qx */
const Word16 lg, /* i : size of x[] Q0 */
@@ -254,15 +258,16 @@ void scale_sig(
const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */
);
-// tools.c
-Word32 sum2_fx( /* o : sum of all squared vector elements Q(2x+1)*/
- const Word16 *vec, /* i : i vector Qx*/
- const Word16 lvec /* i : length of i vector */
+/* o : sum of all squared vector elements Q(2x+1)*/
+Word32 sum2_fx(
+ const Word16 *vec, /* i : i vector Qx*/
+ const Word16 lvec /* i : length of i vector */
);
-Word64 sum2_fx_no_sat( /* o : sum of all squared vector elements Q(2x)*/
- const Word16 *vec, /* i : i vector Qx*/
- const Word16 lvec /* i : length of i vector */
+/* o : sum of all squared vector elements Q(2x)*/
+Word64 sum2_fx_no_sat(
+ const Word16 *vec, /* i : i vector Qx*/
+ const Word16 lvec /* i : length of i vector */
);
Word16 sign_fx(
@@ -272,11 +277,11 @@ Word16 sign_fx(
Word16 sign16_fx(
const Word16 x /* i : input value of x */
);
+
/*========================================================================================================/
mslvq_com_fx.c
/========================================================================================================*/
-// mslvq_com_fx
Word16 deindex_lvq_fx(
Word16 *index, /* i : index to be decoded, as an array of 3 short */
Word16 *x_lvq, /* o : decoded codevector Q(x2.56)*/
@@ -293,7 +298,9 @@ void deindex_lvq_SHB_fx(
const Word16 nbits,
const Word16 mode );
-Word32 encode_comb_fx( Word16 *cv, Word16 idx_lead );
+Word32 encode_comb_fx(
+ Word16 *cv,
+ Word16 idx_lead );
Word32 mslvq_ivas_16(
Word16 *pTmp_fx, /* i : M-dimensional input vector */
@@ -350,8 +357,8 @@ swb_bwe_com_fx.c
void calc_normal_length_fx(
const Word16 core, /* i : core */
- const Word16 *sp, /* i : i signal */
- const Word16 mode, /* i : i mode */
+ const Word16 *sp, /* i : i signal */
+ const Word16 mode, /* i : i mode */
const Word16 extl, /* i : extension layer */
Word16 *L_swb_norm, /* o : normalize length */
Word16 *prev_L_swb_norm, /*i/o : last normalize length */
@@ -359,17 +366,16 @@ void calc_normal_length_fx(
void calc_normal_length_fx_32(
const Word16 core, /* i : core : Q0 */
- const Word32 *sp, /* i : i signal : Q12 */
- const Word16 mode, /* i : i mode : Q0 */
+ const Word32 *sp, /* i : i signal : Q12 */
+ const Word16 mode, /* i : i mode : Q0 */
const Word16 extl, /* i : extension layer : Q0 */
Word16 *L_swb_norm, /* o : normalize length : Q0 */
Word16 *prev_L_swb_norm /*i/o : last normalize length : Q0 */
);
-
void hq_generic_decoding_fx(
const Word16 HQ_mode, /* i : HQ mode */
- Word32 *coeff_out1_fx, /* i/o: BWE i & temporary buffer */
+ Word32 *coeff_out1_fx, /* i/o: BWE i & temporary buffer */
const Word16 *hq_generic_fenv_fx, /* i : SWB frequency envelopes */
Word32 *coeff_out_fx, /* o : SWB signal in MDCT domain */
const Word16 hq_generic_offset, /* i : frequency offset for representing hq generic*/
@@ -386,14 +392,14 @@ Word16 WB_BWE_gain_pred_fx(
Word16 *voice_factors, /* i : voicing factors Q15 */
const Word16 pitch_buf[], /* i : pitch buffer Q6 */
Word32 last_core_brate, /* i : previous frame core bitrate */
- Word16 last_wb_bwe_ener, /* i : previous frame wb bwe signal energy */
+ Word16 last_wb_bwe_ener, /* i : previous frame wb bwe signal energy */
Word16 Q_syn,
Word16 last_extl_fx,
Word16 tilt_wb_fx );
/* o : Tilt in Q24 */
Word32 calc_tilt_bwe_fx(
- const Word16 *sp0, /* i : i signal */
+ const Word16 *sp0, /* i : i signal */
const Word16 exp, /* i : Exp of inp signal */
const Word16 N /* i : signal length */
);
@@ -402,7 +408,7 @@ void calc_norm_envelop_fx(
const Word16 SWB_signal[], /* i : SWB spectrum Q_syn*/
Word32 *envelope, /* o : normalized envelope Q_syn*/
const Word16 L_swb_norm, /* i : length of envelope Q0 */
- const Word16 SWB_flength, /* i : Length of i /output */
+ const Word16 SWB_flength, /* i : Length of i /output */
const Word16 st_offset /* i : offset */
);
@@ -410,7 +416,7 @@ void WB_BWE_decoding_fx(
const Word16 *core_dec_freq, /* i : Frequency domain core decoded signal */
Word16 *WB_fenv, /* i : WB frequency envelopes */
Word32 *WB_signal32, /* o : WB signal in MDCT domain */
- const Word16 WB_flength, /* i : Length of i /output */
+ const Word16 WB_flength, /* i : Length of i /output */
const Word16 mode, /* i : classification for WB signal */
const Word16 last_extl, /* i : extl. layer for last frame */
Word32 *prev_Energy, /* i/o: energy for last frame */
@@ -423,14 +429,14 @@ void WB_BWE_decoding_fx(
Word16 *prev_flag, /* i/o: attenu flag of last frame */
Word16 prev_coder_type, /* i : coding type of last frame */
Word16 Q_syn,
- Word16 *Q_syn_hb /*o : Q value of WB_signal_32 */
+ Word16 *Q_syn_hb /* o : Q value of WB_signal_32 */
);
void SWB_BWE_decoding_fx(
const Word16 *core_dec_freq, /* i : Frequency domain core decoded signal */
Word16 *SWB_fenv, /* i/o: SWB frequency envelopes */
Word32 *SWB_signal, /* o : SWB signal in MDCT domain */
- const Word16 SWB_flength, /* i : Length of i /output */
+ const Word16 SWB_flength, /* i : Length of i /output */
const Word16 mode, /* i : classification for SWB signal */
Word16 *frica_flag, /* o : fricative signal flag */
Word16 *prev_Energy, /* i/o: energy for last frame */
@@ -463,13 +469,13 @@ void calc_norm_envelop_fx_32(
const Word32 SWB_signal_fx[], /* i : SWB spectrum : Q12 */
Word32 *envelope_fx, /* o : normalized envelope : Q16 */
const Word16 L_swb_norm, /* i : length of envelope : Q0 */
- const Word16 SWB_flength, /* i : Length of i /output : Q0 */
+ const Word16 SWB_flength, /* i : Length of i /output : Q0 */
const Word16 st_offset /* i : offset : Q0 */
);
void hq_generic_decoding_fx(
const Word16 HQ_mode, /* i : HQ mode */
- Word32 *coeff_out1_fx, /* i/o: BWE i & temporary buffer */
+ Word32 *coeff_out1_fx, /* i/o: BWE i & temporary buffer */
const Word16 *hq_generic_fenv_fx, /* i : SWB frequency envelopes */
Word32 *coeff_out_fx, /* o : SWB signal in MDCT domain */
const Word16 hq_generic_offset, /* i : frequency offset for representing hq generic*/
@@ -479,7 +485,7 @@ void hq_generic_decoding_fx(
void hq_generic_decoding_ivas_fx(
const Word16 HQ_mode, /* i : HQ mode */
- Word32 *coeff_out1_fx, /* i/o: BWE i & temporary buffer */
+ Word32 *coeff_out1_fx, /* i/o: BWE i & temporary buffer */
const Word16 *hq_generic_fenv_fx, /* i : SWB frequency envelopes */
Word32 *coeff_out_fx, /* o : SWB signal in MDCT domain */
const Word16 hq_generic_offset, /* i : frequency offset for representing hq generic*/
@@ -502,7 +508,7 @@ lognorm_fx.c
void logqnorm_fx(
const Word32 *x, /* i : coefficient vector Qx */
- const Word16 qx, /* i : Q value of i */
+ const Word16 qx, /* i : Q value of i */
Word16 *k, /* o : index Q0 */
const Word16 L, /* i : codebook length Q0 */
const Word16 N, /* i : sub-vector size Q0 */
@@ -521,7 +527,7 @@ void logqnorm_2_fx(
void calc_norm_fx(
const Word32 *L_x, /* i : Input vector. Qx */
- const Word16 qx, /* i : Q value of i */
+ const Word16 qx, /* i : Q value of i */
Word16 *norm, /* o : Quantization indices for norms Q0 */
Word16 *normlg, /* o : Quantized norms in log2 Q0 */
const Word16 start_band, /* i : Indice of band to start coding Q0 */
@@ -529,15 +535,17 @@ void calc_norm_fx(
const Word16 *band_len, /* i : Length of bands Q0 */
const Word16 *band_start /* i : Start of bands Q0 */
);
+
void calc_norm_ivas_fx(
- const Word32 *x_fx, /* i : Input vector.(Qin) */
- Word16 *norm, /* o : Quantization indices for norms Q0 */
- Word16 *normlg, /* o : Quantized norms in log2 Q0 */
+ const Word32 *x_fx, /* i : Input vector.(Qin) */
+ Word16 *norm, /* o : Quantization indices for norms Q0 */
+ Word16 *normlg, /* o : Quantized norms in log2 Q0 */
const Word16 start_band, /* i : Indice of band to start coding */
const Word16 num_bands, /* i : Number of bands */
const Word16 *band_len, /* i : Length of bands */
const Word16 *band_start /* i : Start of bands */
);
+
void logqnorm_ivas_fx(
const Word32 *x_fx, /* i : coefficient vector Qq*/
const Word16 q, /* i : q of coefficient vector */
@@ -546,15 +554,16 @@ void logqnorm_ivas_fx(
const Word16 N, /* i : sub-vector size */
const Word32 *thre_fxn /* i : quantization thresholds Q14*/
);
+
/*========================================================================================================/
hq_tools_fx.c
/========================================================================================================*/
void hq_swb_harmonic_calc_norm_envelop_fx(
- const Word32 *L_SWB_signal, /* i : i signal Q=12*/
+ const Word32 *L_SWB_signal, /* i : i signal Q=12*/
Word32 *L_envelope, /* o : output envelope Q=12*/
const Word16 L_swb_norm, /* i : length of normaliztion */
- const Word16 SWB_flength /* i : length of i signal */
+ const Word16 SWB_flength /* i : length of i signal */
);
/* o : Number of coefficients in nf codebook */
@@ -585,7 +594,7 @@ Word16 find_last_band_fx(
void apply_noisefill_HQ_fx(
const Word16 *R, /* i : bit allocation */
- const Word16 length, /* i : i frame length */
+ const Word16 length, /* i : i frame length */
const Word16 flag_32K_env_ho, /* i : envelope stability hangover flag*/
const Word32 L_core_brate, /* i : core bit rate */
const Word16 last_sfm, /* i : last coded subband */
@@ -637,16 +646,16 @@ void harm_bwe_fx(
Word16 *norm, /* i/o: quantization indices for norms */
Word16 *noise_level, /* i/o: noise levels for harmonic modes */
Word16 *prev_noise_level, /* i/o: noise factor in previous frame */
- Word16 *bwe_seed, /* i/o: random seed for generating BWE i */
+ Word16 *bwe_seed, /* i/o: random seed for generating BWE i */
Word32 *coeff_out, /* o : coded/noisefilled spectrum */
- const Word16 element_mode /* i : IVAS element mode */
+ const Word16 element_mode /* i : IVAS element mode */
);
void hq_fold_bwe_fx(
const Word16 last_sfm, /* i : last coded subband Q0 */
const Word16 *sfm_end, /* i : Subband end coefficient Q0 */
const Word16 num_sfm, /* i : Number of subbands Q0 */
- Word16 *coeff /* i/o: coded/noisefilled normalized spectrum Q12 */
+ Word16 *coeff /* i/o: coded/noisefilled normalized spectrum Q12*/
);
void apply_nf_gain_fx(
@@ -655,7 +664,7 @@ void apply_nf_gain_fx(
const Word16 *R, /* i : bit allocation Q0 */
const Word16 *sfm_start, /* i : Subband start coefficient Q0 */
const Word16 *sfm_end, /* i : Subband end coefficient Q0 */
- Word16 *coeff /* i/o: coded/noisefilled normalized spectrum Q12 */
+ Word16 *coeff /* i/o: coded/noisefilled normalized spectrum Q12*/
);
void hvq_bwe_fx(
@@ -674,7 +683,7 @@ void hvq_bwe_fx(
Word16 *norm, /* i/o: quantization indices for norms Q0 */
Word16 *noise_level, /* i/o: noise levels for harmonic modes Q15 */
Word16 *prev_noise_level, /* i/o: noise factor in previous frame Q15 */
- Word16 *bwe_seed, /* i/o: random seed for generating BWE i Q0 */
+ Word16 *bwe_seed, /* i/o: random seed for generating BWE i Q0 */
Word32 *L_coeff_out, /* o : coded/noisefilled spectrum Qout*/
const Word16 qin,
const Word16 qout );
@@ -696,7 +705,7 @@ void noise_mix_fx(
const Word16 istart, /* i : start coefficient Q0 */
const Word16 iend, /* i : end coefficient Q0 */
const Word16 noise_level, /* i : noise_level Q0 */
- Word32 *L_coeff_out, /* o : noisemixed spectrum Qout */
+ Word32 *L_coeff_out, /* o : noisemixed spectrum Qout*/
const Word16 qin,
const Word16 qout );
@@ -705,8 +714,8 @@ void hq_generic_fine_fx(
const Word16 last_sfm, /* i : Last coded band */
const Word16 *sfm_start, /* i : Subband start coefficient */
const Word16 *sfm_end, /* i : Subband end coefficient */
- Word16 *bwe_seed, /* i/o: random seed for generating BWE i */
- Word16 *coeff_out1 /* o : HQ Generic i */
+ Word16 *bwe_seed, /* i/o: random seed for generating BWE i */
+ Word16 *coeff_out1 /* o : HQ Generic i */
);
void map_hq_generic_fenv_norm_fx(
@@ -752,7 +761,7 @@ Word16 calc_nor_delta_hf_ivas_fx(
void hq_bwe_fx(
const Word16 HQ_mode, /* i : HQ mode */
- Word32 *coeff_out1, /* i/o: BWE i & temporary buffer */
+ Word32 *coeff_out1, /* i/o: BWE i & temporary buffer */
const Word16 *hq_generic_fenv, /* i : SWB frequency envelopes */
Word32 *coeff_out, /* o : SWB signal in MDCT domain */
const Word16 hq_generic_offset, /* i : frequency offset for representing hq generic bwe*/
@@ -765,7 +774,7 @@ void hq_bwe_fx(
void hq_bwe_ivas_fx(
const Word16 HQ_mode, /* i : HQ mode */
- Word32 *coeff_out1, /* i/o: BWE i & temporary buffer */
+ Word32 *coeff_out1, /* i/o: BWE i & temporary buffer */
const Word16 *hq_generic_fenv, /* i : SWB frequency envelopes */
Word32 *coeff_out, /* o : SWB signal in MDCT domain */
const Word16 hq_generic_offset, /* i : frequency offset for representing hq generic bwe*/
@@ -861,12 +870,13 @@ Word32 sub_lsp2lsf_fx(
void E_LPC_lsp_lsf_conversion(
const Word16 lsp[], /* i : lsp[m] (range: -1<=val<1) */
- Word16 lsf[], /* output : lsf[m] normalized (range: 0<=val<=6400) */
- const Word16 m /* i : LPC order */
+ Word16 lsf[], /* o : lsf[m] normalized (range: 0<=val<=6400) */
+ const Word16 m /* i : LPC order */
);
+
void E_LPC_lsf_lsp_conversion(
const Word16 lsf[], /* i : lsf[m] normalized (range: 0<=val<=6400) */
- Word16 lsp[], /* o : lsp[m] (range: -1<=val<1) */
+ Word16 lsp[], /* o : lsp[m] (range: -1<=val<1) */
const Word16 m /* i : LPC order */
);
@@ -877,7 +887,7 @@ void E_LPC_f_lsp_a_conversion(
void E_LPC_a_isp_conversion(
const Word16 *a, /* i : LP filter coefficients */
- Word16 *isp, /* o : Line spectral pairs (in the cosine domain) */
+ Word16 *isp, /* o : Line spectral pairs (in the cosine domain) */
const Word16 *old_isp, /* i : LSP vector from past frame */
const Word16 m /* i : LPC order */
);
@@ -899,7 +909,7 @@ void E_LPC_f_isp_a_conversion(
void E_LPC_a_lsp_conversion(
const Word16 *a, /* i : LP filter coefficients */
- Word16 *lsp, /* o : Line spectral pairs (in the cosine domain) */
+ Word16 *lsp, /* o : Line spectral pairs (in the cosine domain) */
const Word16 *old_lsp, /* i : LSP vector from past frame */
const Word16 m /* i : LPC order */
);
@@ -923,10 +933,10 @@ void lsp2lpc_fx(
Word16 order );
void E_LPC_a_lsp_conversion(
- const Word16 *a, /* i : LP filter coefficients */
+ const Word16 *a, /* i : LP filter coefficients */
Word16 *lsp, /* o : Line spectral pairs (in the cosine domain) */
- const Word16 *old_lsp, /* i : LSP vector from past frame */
- const Word16 m /* i : LPC order */
+ const Word16 *old_lsp, /* i : LSP vector from past frame */
+ const Word16 m /* i : LPC order */
);
void v_sort(
@@ -1055,9 +1065,9 @@ void lsf2lsp_fx(
void lsp2lsf_fx(
const Word16 lsp[], /* i : lsp[m] (range: -1<=val<1) Q15*/
- Word16 lsf[], /* o : lsf[m] normalized (range: 0.0<=val<=0.5) Q(x2.56)*/
+ Word16 lsf[], /* o : lsf[m] normalized (range: 0.0<=val<=0.5) Q(x2.56)*/
const Word16 m, /* i : LPC order Q0*/
- const Word32 int_fs /* i : internal sampling frequency */
+ const Word32 int_fs /* i : internal sampling frequency */
);
void isf2lsf_fx(
@@ -1146,8 +1156,8 @@ Word16 vq_dec_lvq_fx(
Word16 indices[], /* i : Indices */
Word16 stages, /* i : Number of stages */
Word16 N, /* i : Vector dimension */
- Word16 mode, /* (i): mode_lvq, or mode_lvq_p */
- Word16 no_bits, /* (i): no. bits for lattice */
+ Word16 mode, /* i : mode_lvq, or mode_lvq_p */
+ Word16 no_bits, /* i : no. bits for lattice */
Word32 *p_offset_scale1,
Word32 *p_offset_scale2,
Word32 *p_offset_scale1_p,
@@ -1161,10 +1171,14 @@ Word16 vq_dec_lvq_ivas_fx(
Word16 indices[], /* i : Indices */
Word16 stages, /* i : Number of stages */
Word16 N, /* i : Vector dimension */
- Word16 mode, /* (i): mode_lvq, or mode_lvq_p */
- Word16 no_bits /* (i): no. bits for lattice */
+ Word16 mode, /* i : mode_lvq, or mode_lvq_p */
+ Word16 no_bits /* i : no. bits for lattice */
);
-void a2rc_fx( const Word16 *a, Word16 *refl, Word16 lpcorder );
+
+void a2rc_fx(
+ const Word16 *a,
+ Word16 *refl,
+ Word16 lpcorder );
Word16 vq_dec_lvq_ivas_fx(
Word16 sf_flag, /* i : safety net flag */
@@ -1172,8 +1186,8 @@ Word16 vq_dec_lvq_ivas_fx(
Word16 indices[], /* i : Indices */
Word16 stages, /* i : Number of stages */
Word16 N, /* i : Vector dimension */
- Word16 mode, /* (i): mode_lvq, or mode_lvq_p */
- Word16 no_bits /* (i): no. bits for lattice */
+ Word16 mode, /* i : mode_lvq, or mode_lvq_p */
+ Word16 no_bits /* i : no. bits for lattice */
);
void a2rc_fx(
@@ -1366,13 +1380,13 @@ void get_next_indice_tmp_fx(
/* o : value of the indice */
UWord16 get_indice_1_fx(
- Decoder_State *st_fx, /* i/o: decoder state structure */
+ Decoder_State *st_fx, /* i/o: decoder state structure */
Word16 pos /* i : absolute position in the bitstream */
);
void reset_indices_enc_fx(
BSTR_ENC_HANDLE hBstr, /* i/o: encoder state structure */
- const Word16 max_num_indices /* i : max number of indices */
+ const Word16 max_num_indices /* i : max number of indices */
);
Word16 BRATE2IDX_fx(
@@ -1437,7 +1451,7 @@ scale_mem_fx.c
Word16 Rescale_exc(
Word16 dct_post_old_exc_fx[], /* i/o: Music post processing memory Q_exc*/
- Word16 exc[], /* i/o: excitation to rescale Q_exc */
+ Word16 exc[], /* i/o: excitation to rescale Q_exc*/
Word16 bwe_exc[], /* Q_exc */
Word16 *last_exc_dct_in, /* Q_exc */
Word16 lg, /* i : frame size */
@@ -1445,12 +1459,12 @@ Word16 Rescale_exc(
Word32 L_gain_code, /* i : decoded codebook gain Q16 */
Word16 *sQ_exc, /* i/o: Excitation scaling factor */
Word16 *sQsubfr, /* i/o: Past excitation scaling factors */
- Word16 exc2[], /* o : local excitation vector Q_exc */
+ Word16 exc2[], /* o : local excitation vector Q_exc */
Word16 i_subfr, /* i : subframe number */
const Word16 coder_type );
void Rescale_mem(
- const Word16 Q_exc, /* i : current excitation scaling (>=0) */
+ const Word16 Q_exc, /* i : current excitation scaling (>=0) */
Word16 *prev_Q_syn, /* i/o : scaling factor of previous frame */
Word16 *Q_syn, /* i/o : scaling factor of frame */
Word16 *mem_syn2, /* i/o : modified synthesis memory Qexp_scale */
@@ -1469,7 +1483,7 @@ void Rescale_mem(
void scale_sig32(
Word32 x[], /* i/o: signal to scale Qx */
const Word16 lg, /* i : size of x[] Q0 */
- const Word16 exp0 /* i : exponent: x = round(x << exp) Qx xx exp */
+ const Word16 exp0 /* i : exponent: x = round(x << exp) Qx xx exp */
);
void Scale_sig64(
@@ -1483,6 +1497,7 @@ void scale_sig32_r(
const Word16 lg, /* i : size of x[] Q0 */
const Word16 exp0 /* i : exponent: x = round(x << exp) Qx exp */
);
+
Word16 rescale_mem(
const Word16 *Q_exc, /* i : current excitation scaling (>=0) */
Word16 *prev_Q_syn, /* i/o : scaling factor of previous frame */
@@ -1551,9 +1566,10 @@ Word32 get_gain2(
const Word16 y[], /*Q13/o->Q13 */
- Word16 Mbands_gn, /* i : number of bands */
- const Word16 ReUseGain, /* i : Reuse the gain in Ener_per_bd_yQ */
+ Word16 Mbands_gn, /* i : number of bands */
+ const Word16 ReUseGain, /* i : Reuse the gain in Ener_per_bd_yQ */
Word16 Qexc_diff,
Word16 Q_exc );
@@ -1834,8 +1848,8 @@ void Comp_and_apply_gain_ivas_fx(
Word16 exc_diffQ[], /* i/o: Quantized excitation */
Word16 Ener_per_bd_iQ[], /* i : Target ener per band Q13 */
Word16 Ener_per_bd_yQ[], /* i/o : Ener per band for norm vector i->Q13/o->Q13 */
- Word16 Mbands_gn, /* i : number of bands */
- const Word16 ReUseGain, /* i : Reuse the gain in Ener_per_bd_yQ */
+ Word16 Mbands_gn, /* i : number of bands */
+ const Word16 ReUseGain, /* i : Reuse the gain in Ener_per_bd_yQ */
Word16 Qexc_diff,
Word16 *Q_exc );
@@ -1907,7 +1921,7 @@ void GetPredictedSignal_fx(
);
void Get20Log10Spec_fx(
- const Word32 *L_inBuf, /* i : i Q_inBuf */
+ const Word32 *L_inBuf, /* i : i Q_inBuf */
Word16 *outBuf_fx, /* o : output Q7 */
const Word16 fLen, /* i : loop length */
const Word16 Q_inBuf /* i : Qvalue of L_inBuf */
@@ -1915,7 +1929,7 @@ void Get20Log10Spec_fx(
void GetSynthesizedSpecThinOut_fx(
const Word16 *predBuf_fx, /* i : Qss: prediction buffer (i.e., lowband) */
- const Word16 Qss, /* i : Q value of i vector */
+ const Word16 Qss, /* i : Q value of i vector */
Word32 *L_outBuf, /* o : QsL: synthesized spectrum */
Word16 QsL, /* o : Q value of synthesized spectrum */
const Word16 nBands_fx, /* i : Q0: number of subbands calculated */
@@ -2094,8 +2108,8 @@ void ton_ene_est_fx(
);
void norm_vec_32_16_scale_fx(
- Word32 *L_vec_in, /* i : i vector */
- Word16 Qin, /* i : Q value for i vector */
+ Word32 *L_vec_in, /* i : i vector */
+ Word16 Qin, /* i : Q value for i vector */
Word16 length_fx, /* i :vector size */
Word16 *vec_out_fx, /* o : output vectror */
Word16 *Qout, /* o : Q value for output vectro */
@@ -2107,7 +2121,7 @@ void updat_prev_frm_fx(
Word32 L_t_audio[], /* o: core coder buffer */
Word32 L_bwe_br, /* i: core bitrate */
Word16 length_fx, /* i: frame length coded bw */
- const Word16 inner_frame_fx, /* i: i frame length */
+ const Word16 inner_frame_fx, /* i: i frame length */
Word16 bands_fx, /* i: sub band resolution */
Word16 bwidth_fx, /* i: NB/WB/SWB indicator */
const Word16 is_transient_fx, /* i: signal class information */
@@ -2171,8 +2185,8 @@ Word16 har_est_fx(
);
void FindNBiggest2_simple_fx_har(
- const Word32 *L_inBuf, /* i : i buffer (searched) */
- const Word16 Qabs_in, /* i : Q value of i buffer */
+ const Word32 *L_inBuf, /* i : i buffer (searched) */
+ const Word16 Qabs_in, /* i : Q value of i buffer */
GainItem_fx *pk_sf_fx, /* o : N biggest components found */
const Word16 nIdx_fx, /* i : search length */
Word16 *n_fx, /* i : number of components searched (N biggest) */
@@ -2417,7 +2431,7 @@ Word32 syn_kern_16(
void syn_filt_s_lc_fx(
const Word16 shift, /* i : scaling to apply Q0 */
const Word16 a[], /* i : LP filter coefficients Q12 */
- const Word16 x[], /* i : i signal Qx */
+ const Word16 x[], /* i : i signal Qx */
Word16 y[], /* o : output signal Qx-s */
const Word16 lg /* i : size of filtering Q0 */
);
@@ -2426,7 +2440,7 @@ void Syn_filt_s(
const Word16 shift, /* i : scaling to apply Q0 */
const Word16 a[], /* i : LP filter coefficients Q12 */
const Word16 m, /* i : order of LP filter Q0 */
- const Word16 x[], /* i : i signal Qx */
+ const Word16 x[], /* i : i signal Qx */
Word16 y[], /* o : output signal Qx-s */
const Word16 lg, /* i : size of filtering Q0 */
Word16 mem[], /* i/o: memory associated with this filtering. Qx-s */
@@ -2621,8 +2635,8 @@ Word16 modify_Fs_ivas_fx(
/* o : length of output Q0 */
Word16 modify_Fs_fx(
const Word16 sigIn_fx[], /* i : signal to decimate Q0 */
- Word16 lg, /* i : length of i Q0 */
- const Word32 fin, /* i : frequency of i Q0 */
+ Word16 lg, /* i : length of i Q0 */
+ const Word32 fin, /* i : frequency of i Q0 */
Word16 sigOut_fx[], /* o : decimated signal Q0 */
const Word32 fout, /* i : frequency of output Q0 */
Word16 mem_fx[], /* i/o: filter memory Q0 */
@@ -2773,6 +2787,7 @@ Word16 E_UTIL_f_preemph3(
Word16 *mem, /* Qx */
Word16 bits /* Q0 */
);
+
Word16 E_UTIL_f_preemph3_ivas_fx(
Word16 *signal, /* Qx */
const Word16 mu, /* Q15 */
@@ -2914,7 +2929,6 @@ void save_old_syn_fx(
Word16 *mem_deemph /* i/o: deemphasis filter memory */
);
-// swb_tbe_com_fx.c
void find_td_envelope_fx(
const Word16 inp[], /* i : input signal Qx */
const Word16 len, /* i : length of the input signal */
@@ -3308,18 +3322,16 @@ void prep_tbe_exc_fx(
Word16 bwe_exc_fx[], /* i/o: excitation for TBE Q_exc*/
const Word16 gain_preQ_fx, /* i : prequantizer excitation gain */
const Word16 code_preQ_fx[], /* i : prequantizer excitation */
-#ifdef FIX_2010_PREP_TBE_EXC
- const Word16 Q_code_preQ, /* i : Q, prequantizer excitation */
-#endif
- const Word16 Q_exc, /* i : Excitation, bwe_exc Q-factor */
- const Word16 T0, /* i : integer pitch variables Q0 */
- const Word16 T0_frac, /* i : Fractional pitch variables Q0*/
- const Word16 coder_type, /* i : coding type */
- const Word32 core_brate, /* i : core bitrate */
- const Word16 element_mode, /* i : element mode */
- const Word16 idchan, /* i : channel ID */
- const Word16 flag_TD_BWE, /* i : flag indicating whether hTD_BWE exists */
- const Word16 tdm_LRTD_flag /* i : LRTD stereo mode flag */
+ const Word16 Q_code_preQ, /* i : Q, prequantizer excitation */
+ const Word16 Q_exc, /* i : Excitation, bwe_exc Q-factor */
+ const Word16 T0, /* i : integer pitch variables Q0 */
+ const Word16 T0_frac, /* i : Fractional pitch variables Q0*/
+ const Word16 coder_type, /* i : coding type */
+ const Word32 core_brate, /* i : core bitrate */
+ const Word16 element_mode, /* i : element mode */
+ const Word16 idchan, /* i : channel ID */
+ const Word16 flag_TD_BWE, /* i : flag indicating whether hTD_BWE exists */
+ const Word16 tdm_LRTD_flag /* i : LRTD stereo mode flag */
);
/*! r: Formant filter strength [0,1] */
@@ -3625,9 +3637,7 @@ Word16 ppp_extract_pitch_period_fx(
Word16 *out, /* o : output residual */
Word16 l, /* i : lag */
Word16 *out_of_bound, /* o : out of bound flag */
- Word16 Qres
-
-);
+ Word16 Qres );
void DTFS_peaktoaverage_fx(
DTFS_STRUCTURE X_fx, /* i : DTFS */
@@ -3690,14 +3700,6 @@ Word32 DTFS_getEngy_band_wb_fx(
Word16 lband,
Word16 hband );
-// tns_base.c
-/** Init TNS configuration.
- * Fills STnsConfig structure with sensible content.
- * @param nSampleRate Sampling rate of the i .
- * @param nFrameLength Frame length.
- * @param pTnsConfig TNS configuration to be initialized.
- * @return 0 on success, otherwise 1.
- */
void InitTnsConfiguration(
const Word16 bwidth,
const Word16 frameLength,
@@ -3716,19 +3718,6 @@ void InitTnsConfiguration_ivas_fx(
const Word16 element_mode,
const Word16 is_mct );
-/** Modify spectrum using TNS filter.
- * Modifies spectrum unsing TNS filter defined by pTnsData.
- * If fIsAnalyses is true considers spectrum to be
- * an i of encoder and returns residum.
- * If fIsAnalyses is false considers spectrum to be
- * a residum from decoder and returns output spectrum.
- * @param pTnsConfig TNS configuration.
- * @param pTnsData TNS data describing filters.
- * @param spectrum Input/output spectrum.
- * @param fIsAnalysis Defines if TNS filter is applied
- * in encoder (TRUE) or in decoder (FALSE).
- * @return 0 on success, otherwise 1.
- */
void ApplyTnsFilter(
STnsConfig const *pTnsConfig,
STnsData const *pTnsData,
@@ -3824,17 +3813,8 @@ void *SetTnsEnabledSingleFilter( void *p, const Word16 index, const Word16 value
void const *GetTnsOnWhite( void const *p, const Word16 index, Word16 *pValue );
void *SetTnsOnWhite( void *p, const Word16 index, const Word16 value );
-/*tns_base.h*/
-/** Reset TNS data.
- * Resets TNS data to the initial state.
- * @param pTnsData pointer to a TNS data to be reset.
- */
void ResetTnsData( STnsData *pTnsData );
-/** Clear TNS filter data.
- * Resets TNS filter order and all coefficients to 0.
- * @param pTnsFilter pointer to a TNS filter to be cleared.
- */
void ClearTnsFilterCoefficients( STnsFilter *pTnsFilter );
/*========================================================================================================/
@@ -4263,7 +4243,6 @@ Word16 getTcxLpcShapedAri(
const Word16 element_mode /* i : IVAS element mode */
);
-// tcx_mdct_window.c
void mdct_window_sine(
PWord16 *window, /* Qx */
Word16 n /* Q0 */
@@ -4288,7 +4267,7 @@ Word16 getInvFrameLen(
const Word16 L_frame ); /* returns 1/L_frame in Q21 format */
void tcx_get_windows(
- TCX_CONFIG_HANDLE hTcxCfg, /* i : TCX configuration */
+ TCX_CONFIG_HANDLE hTcxCfg, /* i : TCX configuration */
const Word16 left_mode, /* i: overlap mode of left window half */
const Word16 right_mode, /* i: overlap mode of right window half */
Word16 *left_overlap, /* o: left overlap length */
@@ -4305,7 +4284,7 @@ void WindowSignal(
Word16 right_overlap_mode, /* i : overlap mode of right window half */
Word16 *left_overlap_length, /* o : TCX window left overlap length */
Word16 *right_overlap_length, /* o : TCX window right overlap length */
- const Word16 in[], /* i : i signal */
+ const Word16 in[], /* i : i signal */
Word16 *L_frame, /* i/o: frame length */
Word16 out[], /* o : output windowed signal */
const Word16 truncate_aldo, /* i : nonzero to truncate long ALDO slope */
@@ -4452,13 +4431,9 @@ void InitTnsConfigs_ivas_fx(
const Word16 element_mode,
const Word16 is_mct );
-#define IVAS_CODE_TCX_UTIL
-#ifdef IVAS_CODE_TCX_UTIL
void SetAllowTnsOnWhite(
STnsConfig tnsConfig[2][2],
const Word8 allowTnsOnWhite );
-#endif
-#undef IVAS_CODE_TCX_UTIL
void SetTnsConfig(
TCX_CONFIG_HANDLE hTcxCfg, /* i : configuration of TCX */
@@ -4484,7 +4459,6 @@ void init_TCX_config(
Word16 L_frameTCX,
Word16 fscaleFB );
-// tec_com.c
void resetTecDec_Fx(
TEC_DEC_HANDLE hTecDec );
@@ -4543,7 +4517,6 @@ void set_TEC_TFA_code_fx(
Word16 *tec_flag,
Word16 *tfa_flag );
-// tcx_mdct_fx.c
void TCX_MDCT(
const Word16 *x, /* Qx */
Word32 *y, /* exp(y_e) */
@@ -4593,8 +4566,6 @@ void TCX_MDXT_Inverse_fx(
const UWord16 kernel_type /* Q0 */
);
-// edct_fx.c
-#define EDCT_FACTOR_SCALE 2
void edct_fx(
const Word32 *x, /* i : i signal Qq */
Word32 *y, /* o : output transform Qq */
@@ -4638,12 +4609,10 @@ void edxt_fx(
const UWord16 synthesis /* i : nonzero for inverse */
);
-// fft_evs.c
void fft16( Word32 *re, Word32 *im, Word16 s, Word16 bScale );
void BASOP_cfft( cmplx *pComplexBuf, Word16 sizeOfFft, Word16 *scale, Word32 workBuffer[2 * BASOP_CFFT_MAX_LENGTH] );
void BASOP_rfft( Word32 *x, Word16 sizeOfFft, Word16 *scale, Word16 isign );
-// fft_fx_evs.c
void DoRTFTn_fx(
Word32 *x, /* i/o : real part of i and output data */
Word32 *y, /* i/o : imaginary part of i and output data */
@@ -4722,7 +4691,7 @@ void DoRTFTn_fx_ivas(
);
-Word16 find_guarded_bits_fx( Word32 n );
+Word16 find_guarded_bits_fx( const Word32 n );
Word16 L_norm_arr( const Word32 *arr, Word16 size );
Word16 norm_arr( Word16 *arr, Word16 size );
@@ -4750,6 +4719,7 @@ void edct2_fx(
Word16 *q,
const Word16 *ip,
const Word16 *w );
+
void DoRTFT160_16fx(
Word16 x[], /* i/o : real part of i and output data */
Word16 y[] /* i/o : imaginary part of i and output data */
@@ -4759,12 +4729,21 @@ void DoRTFT320_16fx(
Word16 *x, /* i/o : real part of i and output data */
Word16 *y /* i/o : imaginary part of i and output data */
);
+
void DoRTFT128_16fx(
Word16 *x, /* i/o : real part of i and output data Q(Qx+Q_edct)*/
Word16 *y /* i/o : imaginary part of i and output data Q(Qx+Q_edct)*/
);
-void fft3_fx( const Word16[], Word16[], const Word16 );
-void ifft3_fx( const Word16[], Word16[], const Word16 );
+
+void fft3_fx(
+ const Word16[],
+ Word16[],
+ const Word16 );
+
+void ifft3_fx(
+ const Word16[],
+ Word16[],
+ const Word16 );
void fft3_fx_ivas(
const Word32 X[],
@@ -4775,7 +4754,6 @@ void ifft3_fx_ivas(
Word32 Y[],
const Word16 n );
-// fft_rel_fx.c
void r_fft_fx_lc(
const Word16 *phs_tbl, /* i : Table of phase */
const Word16 SIZE, /* i : Size of the FFT */
@@ -4786,7 +4764,6 @@ void r_fft_fx_lc(
const Word16 isign /* i : 1=fft, otherwize it's ifft */
);
-// cldfb_evs
void cldfbAnalysis_fx(
HANDLE_CLDFB_FILTER_BANK anaCldfb, /*!< Handle of Cldfb Analysis Bank */
Word32 **cldfbReal, /*!< Pointer to real subband slots */
@@ -4959,7 +4936,6 @@ void E_UTIL_voice_factor(
Word16 shift /* i : scaling to get 12bit */
);
-// window_ola_fx.c
void sinq_fx(
const Word16 tmp, /* i : sinus factor cos(tmp*i+phi) Q15*/
const Word16 phi, /* i : sinus phase cos(tmp*i+phi) Q15*/
@@ -5057,10 +5033,10 @@ void bands_and_bit_alloc_fx(
Word16 *out_bits_per_bands, /* i/o: Number of bit allowed per allowed subband Q3 */
Word16 *nb_subbands, /* o : Number of subband allowed */
const Word16 *exc_diff, /* i : Difference signal to quantize (encoder side only) */
- Word16 *concat_in, /* o : Concatened PVQ's i vector (encoder side only) */
+ Word16 *concat_in, /* o : Concatened PVQ's i vector (encoder side only) */
Word16 *pvq_len, /* o : Number of bin covered with the PVQ */
const Word16 coder_type, /* i : coding type */
- const Word16 bwidth, /* i : i signal bandwidth */
+ const Word16 bwidth, /* i : i signal bandwidth */
const Word16 GSC_noisy_speech, /* i : GSC noisy speech flag */
const Word16 L_frame, /* i : frame length */
const Word16 element_mode, /* i : element mode */
@@ -5369,6 +5345,7 @@ void scalebands(
const Word16 nband, /* i : Number of bands */
Word32 *bandpow, /* o : Power for each band */
const Word16 flag_fft_en );
+
void scalebands_fx(
const Word32 *partpow, /* i : Power for each partition */
Word16 *part, /* i : Partition upper boundaries (band indices starting from 0) */
@@ -5967,7 +5944,6 @@ void tcx_arith_render_envelope(
Word32 env[] /* o: shaped signal envelope Q16*/
);
-
/* returns innovation gain Q16 */
Word32 calc_gain_inov(
const Word16 *code, /* i : algebraic excitation Q9 */
@@ -5986,11 +5962,11 @@ void ResetSHBbuffer_Dec_fx(
);
void wb_tbe_dec_fx(
- Decoder_State *st_fx, /* i/o: decoder state structure */
- const Word16 coder_type, /* i : coding type */
- Word32 *bwe_exc_extended, /* i : bandwidth extended exciatation */
+ Decoder_State *st_fx, /* i/o: decoder state structure */
+ const Word16 coder_type, /* i : coding type */
+ Word32 *bwe_exc_extended, /* i : bandwidth extended exciatation */
const Word16 Q_exc,
- const Word16 voice_factors[], /* i : voicing factors */
+ const Word16 voice_factors[], /* i : voicing factors */
Word16 *synth, /* i/o: ACELP core synthesis/final synthesis */
Word16 *Q_synth );
@@ -6050,7 +6026,7 @@ void GenTransition_fx(
);
void GenTransition_fx32(
- TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle */
+ TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle */
Word32 *outputHB_fx, /* o : synthesized HB transitions signal : Q11 */
const Word32 output_Fs, /* i : output sampling rate : Q0 */
const Word16 L_frame, /* i : ACELP frame length : Q0 */
@@ -6104,28 +6080,28 @@ Word16 minimum_l(
Word32 *min_val /* o : minimum value in the input vector */
);
-void v_multc_fixed(
+void v_multc_fx(
const Word32 x[], /* i : Input vector */
const Word32 c, /* i : Constant */
Word32 y[], /* o : Output vector that contains c*x */
const Word16 N /* i : Vector length */
);
-void v_multc_fixed_16(
+void v_multc_fx_16(
const Word32 x[], /* i : Input vector */
const Word16 c, /* i : Constant */
Word32 y[], /* o : Output vector that contains c*x */
const Word16 N /* i : Vector length */
);
-void v_multc_fixed_16_16(
+void v_multc_fx_16_16(
const Word16 x[], /* i : Input vector */
const Word16 c, /* i : Constant */
Word16 y[], /* o : Output vector that contains c*x */
const Word16 N /* i : Vector length */
);
-void v_add_fixed(
+void v_add_fx_hdrm(
const Word32 x1[], /* i : Input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */
@@ -6133,14 +6109,14 @@ void v_add_fixed(
const Word16 hdrm /* i : headroom for when subtraction result > 1 or < -1 */
);
-void v_add_fixed_no_hdrm(
+void v_add_fx_no_hdrm(
const Word32 x1[], /* i : Input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */
const Word16 N /* i : Vector length */
);
-void v_add_fixed_me(
+void v_add_fx_me(
const Word32 x1[], /* i : Input vector 1 */
const Word16 x1_e, /* i : Exponent for input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
@@ -6159,14 +6135,7 @@ void v_add_w64(
const Word16 hdrm /* i : headroom for when subtraction result > 1 or < -1 */
);
-void v_multc_32_16_fixed(
- const Word32 x[], /* i : Input vector */
- const Word16 c, /* i : Constant */
- Word32 y[], /* o : Output vector that contains c*x */
- const Word16 N /* i : Vector length */
-);
-
-void v_sub_fixed(
+void v_sub_fx(
const Word32 x1[], /* i : Input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */
@@ -6174,7 +6143,7 @@ void v_sub_fixed(
const Word16 hdrm /* i : headroom for when subtraction result > 1 or < -1 */
);
-void v_sub_fixed_no_hdrm(
+void v_sub_fx_no_hdrm(
const Word32 x1[], /* i : Input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */
@@ -6182,21 +6151,21 @@ void v_sub_fixed_no_hdrm(
);
/*! r: dot product of x[] and y[] */
-Word32 dotp_fixed(
+Word32 dotp_fx32(
const Word32 x[], /* i : vector x[] */
const Word32 y[], /* i : vector y[] */
const Word16 n /* i : vector length */
);
/*! r: dot product of x[] and y[] in case of overflow*/
-Word32 dotp_fixed_o(
+Word32 dotp_fx32_o(
const Word32 x[], /* i : vector x[] */
const Word32 y[], /* i : vector y[] */
const Word16 n, /* i : vector length */
const Word16 log_len, /* i : max factor added to result q after dot product (equal to log2(n)) */
Word16 *res_q );
-Word32 dotp_fixed_32(
+Word32 dotp_fx32_fac(
const Word32 x[], /* i : vector x[] */
const Word32 y[], /* i : vector y[] */
const Word16 n, /* i : vector length */
@@ -6204,7 +6173,7 @@ Word32 dotp_fixed_32(
Word16 *res_q /*stores resultant Q*/
);
-Word32 dotp_fixed_ivas_fx(
+Word32 dotp_fx_ivas_fx(
const Word32 x[], /* i : vector x[] */
Word16 x_e,
const Word32 y[], /* i : vector y[] */
@@ -6212,7 +6181,7 @@ Word32 dotp_fixed_ivas_fx(
const Word16 n, /* i : vector length */
Word16 *out_e );
-Word32 dotp_fixed_guarded(
+Word32 dotp_fx_guarded(
const Word32 x[], /* i : vector x[] */
const Word32 y[], /* i : vector y[] */
const Word16 n /* i : vector length */
@@ -7346,30 +7315,30 @@ void rc_dec_init_fx(
/* o : Decoded cumulative frequency */
UWord32 rc_decode_fx(
Word16 *BER_detect, /* o : Bit error detection flag */
- PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle */
+ PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle */
UWord32 tot /* i : Total cumulative frequency */
);
void rc_dec_update_fx(
- Decoder_State *st_fx, /* i/o: Decoder State */
+ Decoder_State *st_fx, /* i/o: Decoder State */
PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle */
UWord32 cum_freq, /* i : Cumulative frequency */
UWord32 sym_freq /* i : Symbol frequency */
);
-/* i : Decoded value */
+/* o : Decoded value */
Word32 rc_dec_bits_fx(
- Decoder_State *st_fx, /* i/o: Decoder State */
+ Decoder_State *st_fx, /* i/o: Decoder State */
PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle */
- Word16 bits /* i : Number of bits */
+ Word16 bits /* i : Number of bits */
);
-/* i : Decoded value */
+/* o : Decoded value */
UWord32 rc_dec_uniform_fx(
- Decoder_State *st_fx, /* i/o: Decoder State */
+ Decoder_State *st_fx, /* i/o: Decoder State */
PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle */
- UWord32 tot /* i : Maximum value */
+ UWord32 tot /* i : Maximum value */
);
void rc_dec_finish_fx(
@@ -7379,8 +7348,8 @@ void rc_dec_finish_fx(
void pvq_decode_fx(
Decoder_State *st_fx,
- PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle */
- Word16 *xq, /* o: decoded vector (Q15) */
+ PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle */
+ Word16 *xq, /* o: decoded vector (Q15) */
Word16 *y, /* o: decoded vector (non-scaled int) */
const Word16 k_val, /* i: number of allocated pulses */
const Word16 dim, /* i: Length of vector */
@@ -7395,6 +7364,7 @@ void nelp_decoder_fx(
const Word16 coder_type, /* i : coding type Q0 */
Word16 *gain_buf /* Q14 */
);
+
void decod_nelp_fx(
Decoder_State *st_fx, /* i/o: decoder static memory */
Word16 *tmp_noise_fx, /* o : long term temporary noise energy */
@@ -7486,7 +7456,7 @@ void FdCng_decodeSID_fx(
void noisy_speech_detection_fx(
HANDLE_FD_CNG_DEC hFdCngDec, /* i/o: FD_CNG structure */
const Word16 vad, /* i : VAD flag */
- const Word16 *syn, /* i : i time-domain frame */
+ const Word16 *syn, /* i : i time-domain frame */
const Word16 Q );
void generate_comfort_noise_dec_fx(
@@ -7569,7 +7539,6 @@ void destroy_cldfb_encoder_fx(
Encoder_State *st /* i/o: state structure */
);
-// swb_bwe_dec_fx.c
Word16 WB_BWE_gain_deq_fx(
Decoder_State *st_fx, /* i/o: decoder state structure */
Word16 *WB_fenv /*Q15*/
@@ -7624,21 +7593,15 @@ void hq_core_dec_fx(
const Word16 hq_core_type, /* i : HQ core type Q0*/
const Word16 core_switching_flag /* i : ACELP->HQ switching frame flag Q0*/
);
+
void HQ_core_dec_init_fx(
HQ_DEC_HANDLE hHQ_core /* i/o: HQ core data handle */
);
+
void HQ_nbfec_init_fx(
HQ_NBFEC_HANDLE hHQ_nbfec /* i/o: HQ NB FEC data handle */
);
-void GetAttackForTCXDecision_fx(
- Word32 const *pSubblockNrg,
- Word32 const *pAccSubblockNrg,
- Word16 nSubblocks,
- Word16 nPastSubblocks,
- Word16 attackRatioThreshold,
- Word16 *pbIsAttackPresent,
- Word16 *pAttackIndex );
void hq_ecu_fx(
const Word16 *prevsynth, /* i : buffer of previously synthesized signal */
@@ -7827,7 +7790,6 @@ void hvq_dec_fx(
Word32 *coefsq_norm, /* o : Output vector in Q12 */
const Word16 core );
-// hvq_pvq_bitalloc_fx.c
Word16 hvq_pvq_bitalloc_fx(
Word16 num_bits, /* i/o: Number of available bits (including gain bits) */
const Word32 brate, /* i : bitrate */
@@ -8149,14 +8111,14 @@ void sc_vbr_dec_init(
);
ivas_error ppp_quarter_decoder_fx(
- DTFS_STRUCTURE *CURRCW_Q_DTFS_FX, /* i/o: Current CW DTFS */
+ DTFS_STRUCTURE *CURRCW_Q_DTFS_FX, /* i/o: Current CW DTFS */
Word16 prevCW_lag_fx, /* i : Previous lag */
Word16 *lastLgainD_fx, /* i/o: Last gain lowband Q11 */
- Word16 *lastHgainD_fx, /* i/o: Last gain highwband Q11 */
- Word16 *lasterbD_fx, /* i/o: Last ERB vector Q13 */
+ Word16 *lastHgainD_fx, /* i/o: Last gain highwband Q11 */
+ Word16 *lasterbD_fx, /* i/o: Last ERB vector Q13 */
Word16 bfi, /* i : FER flag */
- Word16 *S_fx, /* i : sine table, Q15 */
- Word16 *C_fx, /* i : cosine table, Q15 */
+ Word16 *S_fx, /* i : sine table, Q15 */
+ Word16 *C_fx, /* i : cosine table, Q15 */
DTFS_STRUCTURE PREV_CW_D_FX, /* i : Previous DTFS */
Decoder_State *st_fx );
@@ -8192,7 +8154,8 @@ void acelp_plc_mdct_transition_fx(
);
void cldfb_reset_memory_fx(
- HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */ );
+ HANDLE_CLDFB_FILTER_BANK hs /* i/o: filter bank handle */
+);
void tcxltp_dec_init_fx(
TCX_LTP_DEC_HANDLE hTcxLtpDec, /* Q0 */
@@ -8628,7 +8591,8 @@ void getTCXparam_fx(
const Word16 *no_param_tns, /* i : number of TNS parameters per subframe Q0 */
Word16 p_param[2], /* o : pointer to parameters for next round of bs reading Q0 */
Word16 nTnsBitsTCX10[2], /*Q0*/
- const Word16 pre_past_flag /*Q0*/ );
+ const Word16 pre_past_flag /*Q0*/
+);
void dec_prm_fx(
Word16 *coder_type,
@@ -8724,7 +8688,8 @@ void GetParameters_fx(
void const *pParameter, // Q0
Word16 **pStream, // Q0
Word16 *pnSize, // Q0
- Word16 *pnBits ); // Q0
+ Word16 *pnBits // Q0
+);
void EncodeTnsData_ivas_fx(
STnsConfig const *pTnsConfig, /* i : TNS Configuration struct */
@@ -9288,14 +9253,14 @@ void delay_signal_q_adj_fx(
const Word16 q_x,
const Word16 q_mem );
-Word32 anint_fixed(
- Word32 x, /* i: Round to the nearest integer */
- Word16 exp /* i: Exponent for round step */
+Word32 anint_fx(
+ const Word32 x, /* i: Round to the nearest integer */
+ const Word16 exp /* i: Exponent for round step */
);
-Word32 ceil_fixed(
- Word32 x, /* i: number to ceil */
- Word16 exp /* i: Exponent for ceil step */
+Word32 ceil_fx(
+ const Word32 x, /* i: number to ceil */
+ const Word16 exp /* i: Exponent for ceil step */
);
void v_add_fx(
@@ -9406,7 +9371,6 @@ void cldfbSynthesis_ivas_fx(
HANDLE_CLDFB_FILTER_BANK h_cldfb /* i : filter bank state */
);
-// bass_psfilter.c
void addBassPostFilter_ivas_fx(
const Word32 *harm_timeIn_fx,
const Word16 samplesToProcess,
@@ -9542,7 +9506,7 @@ void IMDCT_ivas_fx(
Word16 *q_acelp_zir_fx,
Word16 *pq_win );
-void v_mult16_fixed(
+void v_mult16_fx(
const Word16 x1[], /* i : Input vector 1 */
const Word16 x2[], /* i : Input vector 2 */
Word16 y[], /* o : Output vector that contains vector 1 .* vector 2 */
@@ -9561,6 +9525,7 @@ Word32 sum2_f_16_fx(
const Word16 *vec, /* i : input vector */
const Word16 lvec /* i : length of input vector */
);
+
Word32 sum2_f_16_gb_fx(
const Word16 *vec, /* i : input vector */
const Word16 lvec, /* i : length of input vector */
@@ -9734,14 +9699,12 @@ void Copy_Scale_sig_16_32_DEPREC(
const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */
);
-#ifdef FIX_CREND_SIMPLIFY_CODE
void Copy_Scale_sig_16_32_r(
const Word16 x[], /* i : signal to scale input Qx */
Word32 y[], /* o : scaled signal output Qx */
const Word16 lg, /* i : size of x[] Q0 */
const Word16 exp0 /* i : exponent: x = round(x << exp) Qx ?exp */
);
-#endif
void Copy_Scale_sig_16_32_no_sat(
const Word16 x[], /* i : signal to scale input Qx */
@@ -9922,7 +9885,6 @@ Word32 dot_product_mat_fx(
const Word16 *x, /* i : vector x Q15 */
const Word32 *A, /* i : matrix A Q0*/
const Word16 m /* i : vector & matrix size */
-
);
void Vr_subt(
@@ -10395,7 +10357,7 @@ Word32 sum2_32_fx(
const Word16 lvec, /* i : length of input vector */
Word16 *e );
-void v_mult_fixed(
+void v_mult_fx(
const Word32 x1[], /* i : Input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */
@@ -10490,13 +10452,11 @@ void hp20_fx_32(
Word32 mem_fx[],
const Word32 Fs );
-#ifdef HP20_FIX32_RECODING
void hp20_fx_32_opt(
Word32 signal_fx[],
const Word16 lg,
Word32 mem_fx[],
const Word32 Fs );
-#endif
void getTCXMode_ivas_fx(
Decoder_State *st, /* i/o: decoder memory state */
@@ -10608,7 +10568,7 @@ void core_encode_update_ivas_fx(
);
void updt_enc_common_ivas_fx(
- Encoder_State *st, /* i/o: encoder state structure */
+ Encoder_State *st, /* i/o: encoder state structure */
const Word16 Q_new /* i : CUrrent frame scaling */
);
@@ -11301,7 +11261,7 @@ ivas_error acelp_core_enc_ivas_fx(
Word16 *q_old_syn_12k8_16,
Word16 pitch_buf[NB_SUBFR16k], /* o : floating pitch for each subframe Q6*/
Word16 *unbits, /* o : number of unused bits Q0*/
- STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle */
+ STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle */
Word16 tdm_lsfQ_PCh[M], /* i : Q LSFs for primary channel X2.56*/
Word16 Q_new );
@@ -11413,10 +11373,8 @@ void UnmapIndex_fx(
Word32 *Lag /* Q0 */
);
-#define GET_ADJ( T, L ) GET_ADJ2( T, L, *FractionalResolution )
#define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) )
-
Word32 tcx_hm_render_fx(
const Word32 lag, /* i: pitch lag Q0 */
const Word16 fract_res, /* i: fractional resolution of the lag Q0 */
@@ -11450,7 +11408,7 @@ void writeTCXMode_fx(
);
void writeTCXWindowing_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
+ BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
const Word16 overlap_mode /* i : overlap mode Q0*/
);
diff --git a/lib_com/pvq_com_fx.c b/lib_com/pvq_com_fx.c
index 9e2f58ed02467a79c769d9a0e27b205884e1a85a..98ca8c4ab1dce71ba25c07df33b3cc7238dbd829 100644
--- a/lib_com/pvq_com_fx.c
+++ b/lib_com/pvq_com_fx.c
@@ -427,12 +427,6 @@ void NearOppSplitAdjustment_fx(
Word16 qac, qboth, qskew, qavg, qmin, Midx;
Word32 L_QIb, L_qnum;
Word16 QIb, QIa;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
rangeCoderFinalizationFBits_fx( Qac, INTac, &qac );
qboth = sub( qband, sub( qac, qzero ) ); /* Q0 */
@@ -458,11 +452,7 @@ void NearOppSplitAdjustment_fx(
}
*qnear = qboth; /* Q3 */
move16();
-#ifdef ISSUE_1836_replace_overflow_libcom
QIb = extract_h( L_shl_sat( L_QIb, 16 ) ); /* may saturate Q0*/
-#else
- QIb = extract_h( L_shl_o( L_QIb, 16, &Overflow ) ); /* may saturate Q0*/
-#endif
if ( LE_16( QIb, qboth ) )
{
*qnear = QIb; /* Q0 */
@@ -533,12 +523,6 @@ void fine_gain_quant_fx(
Word16 tmp1, tmp2, exp1, exp2;
Word32 L_tmp;
UWord16 lsb;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
FOR( band = 0; band < num_sfm; band++ )
{
@@ -560,11 +544,7 @@ void fine_gain_quant_fx(
tmp1 = sub( tmp1, exp1 );
L_tmp = L_Comp( tmp1, exp2 );
Mpy_32_16_ss( L_tmp, 24660, &L_tmp, &lsb ); /* 24660 = 20*log10(2) in Q12 */ /*16+12-15=13 */
-#ifdef ISSUE_1836_replace_overflow_libcom
gain_db = round_fx_sat( L_shl_sat( L_tmp, 17 ) );
-#else
- gain_db = round_fx_sat( L_shl_o( L_tmp, 17, &Overflow ) );
-#endif
idx = squant_fx( gain_db, &gain_dbq, finegain_fx[gbits - 1], gain_cb_size[gbits - 1] );
push_indice( hBstr, IND_PVQ_FINE_GAIN, idx, gbits );
diff --git a/lib_com/residu_fx.c b/lib_com/residu_fx.c
index d338e316356ce908ed95ae7621921ab588eed2b5..ecfb672b06e02809f463966e6f5a1228a87a72a1 100644
--- a/lib_com/residu_fx.c
+++ b/lib_com/residu_fx.c
@@ -62,19 +62,12 @@ void Residu3_lc_fx(
Word16 i, j;
Word32 s;
Word16 q;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
q = add( norm_s( a[0] ), 1 );
if ( shift > 0 )
{
q = add( q, shift );
}
-#ifdef ISSUE_1836_replace_overflow_libcom
*y++ = shl_sat( x[0], shift );
move16();
@@ -103,36 +96,7 @@ void Residu3_lc_fx(
*y++ = round_fx_sat( s );
}
-#else
- *y++ = shl_o( x[0], shift, &Overflow );
- move16();
-
- FOR( i = 1; i < m; i++ )
- {
- s = L_mult_o( x[i], a[0], &Overflow );
- /* Stop at i to Avoid Mults with Zeros */
- FOR( j = 1; j <= i; j++ )
- {
- s = L_mac_o( s, x[i - j], a[j], &Overflow );
- }
-
- s = L_shl_o( s, q, &Overflow );
- *y++ = round_fx_o( s, &Overflow );
- }
-
- FOR( ; i < lg; i++ )
- {
- s = L_mult_o( x[i], a[0], &Overflow );
- FOR( j = 1; j <= m; j++ )
- {
- s = L_mac_o( s, x[i - j], a[j], &Overflow );
- }
-
- s = L_shl_o( s, q, &Overflow );
- *y++ = round_fx_o( s, &Overflow );
- }
-
-#endif
+ return;
}
/*--------------------------------------------------------------------*
@@ -166,7 +130,10 @@ void Residu3_10_fx(
s = W_shl_sat_l( s64, q );
y[i] = round_fx_sat( s );
}
+
+ return;
}
+
/*--------------------------------------------------------------------*
* Residu3_fx:
*
@@ -185,12 +152,7 @@ void Residu3_fx(
Word64 s64;
Word32 s32;
Word16 q;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
+
q = add( norm_s( a[0] ), 1 );
if ( shift != 0 )
{
@@ -206,14 +168,13 @@ void Residu3_fx(
}
s64 = W_mac_16_16( s64, x[i - 16], a[16] );
s32 = W_shl_sat_l( s64, q );
-#ifdef ISSUE_1836_replace_overflow_libcom
y[i] = round_fx_sat( s32 );
-#else
- y[i] = round_fx_o( s32, &Overflow );
-#endif
move16();
}
+
+ return;
}
+
/*==========================================================================*/
/* FUNCTION : void calc_residu() */
/*--------------------------------------------------------------------------*/
diff --git a/lib_com/stat_com.h b/lib_com/stat_com.h
index c50e99711624758634d8b9079aa60536f85a3db6..7b5c9fd104ab5458a2676b909691b5a492bff1ac 100644
--- a/lib_com/stat_com.h
+++ b/lib_com/stat_com.h
@@ -577,7 +577,6 @@ typedef struct
UWord8 nBits;
} Coding;
-
/* Scale TCX setup */
typedef struct
{
@@ -590,7 +589,6 @@ typedef struct
} SCALE_TCX_SETUP;
-
typedef struct
{
UWord16 frame_bits; /*Bits per frame*/
@@ -604,7 +602,7 @@ typedef struct
} FrameSizeParams;
-typedef struct cldfb_filter_bank_struct
+typedef struct ivas_cldfb_filter_bank_struct
{
Word16 no_channels;
Word16 no_col;
@@ -648,7 +646,6 @@ typedef struct cldfb_filter_bank_struct
Word16 outScalefactor; /*!< Scale factor of output data (syn only) Q0*/
Word16 synFilterHeadroom; /*!< Headroom for states in synthesis cldfb filterbank Q0*/
-
/* memory helper states */
Word16 *memory; // Qx
Word32 *memory32; // Q_cldfb_state /*because cldfb_state_fx is word32 which is used to assign values*/
@@ -669,7 +666,6 @@ typedef struct cldfb_filter_bank_struct
} CLDFB_FILTER_BANK, *HANDLE_CLDFB_FILTER_BANK;
-
typedef enum
{
FRAME_0 = 0,
@@ -691,6 +687,7 @@ typedef enum
} FRAME_SIZE;
+
/*---------------------------------------------------------------*
* IGF *
*---------------------------------------------------------------*/
@@ -742,7 +739,6 @@ typedef struct IGF_INFO_struct
Word16 bitRateIndex;
} IGF_INFO, *H_IGF_INFO;
-
typedef struct
{
Word16 *indexBuffer;
diff --git a/lib_com/stat_noise_uv_mod_fx.c b/lib_com/stat_noise_uv_mod_fx.c
index 9b0bae1e5803d75d8a5baea5b8cbadbbfe320276..7a5519c04263c79137d724d5abf77cfb8bf6d201 100644
--- a/lib_com/stat_noise_uv_mod_fx.c
+++ b/lib_com/stat_noise_uv_mod_fx.c
@@ -74,12 +74,6 @@ void stat_noise_uv_mod_fx(
Word16 En_shift, Tmp;
Word16 Exc2_local[L_FRAME]; /* local_copy in scaled Q_local*/
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*---------------------------------------------------------*
* Init local variables
@@ -111,11 +105,7 @@ void stat_noise_uv_mod_fx(
move16();
tmp_res = div_l( L_tmp_res, tmp_den );
move16();
-#ifdef ISSUE_1836_replace_overflow_libcom
min_alpha = add_sat( tmp_res, 16384 );
-#else
- min_alpha = add_o( tmp_res, 16384, &Overflow );
-#endif
move16();
/**st_min_alpha = sub(*st_min_alpha, 1638); move16();*/
@@ -166,13 +156,8 @@ void stat_noise_uv_mod_fx(
{
FOR( i_subfr = 0; i_subfr < L_FRAME; i_subfr += L_SUBFR )
{
- exctilt = calc_tilt_fx( &Exc2_local[i_subfr], En_shift, L_SUBFR ); /*Q15 */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ exctilt = calc_tilt_fx( &Exc2_local[i_subfr], En_shift, L_SUBFR ); /*Q15 */
exctilt = mult( shl_sat( sub( TILT_COMP_LIM_FX, min_alpha ), 2 ), exctilt ); /*Q15 */
-#else
- exctilt = mult( shl_o( sub( TILT_COMP_LIM_FX, min_alpha ), 2, &Overflow ), exctilt ); /*Q15 */
-#endif
-
PREEMPH_FX( &Exc2_local[i_subfr], exctilt, L_SUBFR, exc_pe );
}
}
@@ -196,11 +181,7 @@ void stat_noise_uv_mod_fx(
tmp_shift = norm_s( tmp_den );
tmp_den = shl( tmp_den, tmp_shift );
tmp_res = div_s( tmp_nom, tmp_den );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp_res = shl_sat( tmp_res, tmp_shift );
-#else
- tmp_res = shl_o( tmp_res, tmp_shift, &Overflow );
-#endif
alpha = add( 32767, mult( tmp_res, sub( min_alpha, 32767 ) ) );
*act_count = 0;
@@ -264,13 +245,8 @@ void stat_noise_uv_mod_fx(
L_tmp_res = Mult_32_16( *ge_sm, tmp_res ); /* Q_stat_noise_ge+45-Q_local-Q_ge-tmp_shift-15 */
L_tmp_res = Mult_32_16( L_tmp_res, sub( 32767, beta ) ); /*30-Q_local-tmp_shift+15-15 */
L_tmp_res = L_add_sat( L_shl_sat( L_tmp_res, sub( add( Q_local, tmp_shift ), 15 ) ), beta ); /* Q15 */
-#ifdef ISSUE_1836_replace_overflow_libcom
- tmp_res = extract_h( L_shl_sat( L_tmp_res, 15 ) ); /* 15+15-16=14 */
-#else
- tmp_res = extract_h( L_shl_o( L_tmp_res, 15, &Overflow ) ); /* 15+15-16=14 */
-#endif
-
- Noimix_fract = extract_l( Mult_32_16( L_tmp_res, Noimix_fract ) ); /*15+15-15 */
+ tmp_res = extract_h( L_shl_sat( L_tmp_res, 15 ) ); /* 15+15-16=14 */
+ Noimix_fract = extract_l( Mult_32_16( L_tmp_res, Noimix_fract ) ); /*15+15-15 */
FOR( i = 0; i < L_FRAME; i++ )
{
@@ -402,12 +378,6 @@ void stat_noise_uv_mod_ivas_fx(
Word16 En_shift, Tmp;
Word16 Exc2_local[L_FRAME]; /* local_copy in scaled Q_local*/
Word32 L_Exc2_local[L_FRAME]; /* local_copy in scaled Q_local*/
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*---------------------------------------------------------*
* Init local variables
@@ -436,11 +406,7 @@ void stat_noise_uv_mod_ivas_fx(
L_tmp_res = L_shl( L_tmp_res, sub( tmp_shift, 1 ) );
tmp_den = shl( tmp_den, tmp_shift );
tmp_res = div_l( L_tmp_res, tmp_den );
-#ifdef ISSUE_1836_replace_overflow_libcom
min_alpha = add_sat( tmp_res, 16384 );
-#else
- min_alpha = add_o( tmp_res, 16384, &Overflow );
-#endif
/**st_min_alpha = sub(*st_min_alpha, 1638); move16();*/
min_alpha = s_max( min_alpha, sub( *st_min_alpha, 1638 ) );
@@ -490,13 +456,8 @@ void stat_noise_uv_mod_ivas_fx(
{
FOR( i_subfr = 0; i_subfr < L_FRAME; i_subfr += L_SUBFR )
{
- exctilt = calc_tilt_fx( &Exc2_local[i_subfr], En_shift, L_SUBFR ); /*Q15 */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ exctilt = calc_tilt_fx( &Exc2_local[i_subfr], En_shift, L_SUBFR ); /*Q15 */
exctilt = mult( shl_sat( sub( TILT_COMP_LIM_FX, min_alpha ), 2 ), exctilt ); /*Q15 */
-#else
- exctilt = mult( shl_o( sub( TILT_COMP_LIM_FX, min_alpha ), 2, &Overflow ), exctilt ); /*Q15 */
-#endif
-
PREEMPH_FX( &Exc2_local[i_subfr], exctilt, L_SUBFR, exc_pe );
}
}
@@ -520,11 +481,7 @@ void stat_noise_uv_mod_ivas_fx(
tmp_shift = norm_s( tmp_den );
tmp_den = shl( tmp_den, tmp_shift );
tmp_res = div_s( tmp_nom, tmp_den );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp_res = shl_sat( tmp_res, tmp_shift );
-#else
- tmp_res = shl_o( tmp_res, tmp_shift, &Overflow );
-#endif
alpha = add( 32767, mult( tmp_res, sub( min_alpha, 32767 ) ) );
*act_count = 0;
diff --git a/lib_com/swb_tbe_com_fx.c b/lib_com/swb_tbe_com_fx.c
index 7aef5baa3a541cfc792300a8274bac56070279ad..bfe9db62d269efef90004808a98090c8691b71ec 100644
--- a/lib_com/swb_tbe_com_fx.c
+++ b/lib_com/swb_tbe_com_fx.c
@@ -999,10 +999,6 @@ static void filt_mu_fx(
Word16 mu, ga, temp;
const Word16 *ptrs;
Word16 tmp, exp;
-#ifndef ISSUE_1836_replace_overflow_libcom
- Flag Overflow = 0;
- move32();
-#endif
IF( EQ_16( SubFrameLength, L_SUBFR ) )
{
@@ -1042,11 +1038,7 @@ static void filt_mu_fx(
{
temp = mult_r( mu, ( *ptrs++ ) );
temp = add_sat( temp, *ptrs ); /*Q12 */
-#ifdef ISSUE_1836_replace_overflow_libcom
sig_out[n] = shl_sat( mult_r( ga, temp ), 1 );
-#else
- sig_out[n] = shl_o( mult_r( ga, temp ), 1, &Overflow );
-#endif
move16(); /*Q12 */
}
@@ -1453,12 +1445,6 @@ void GenShapedWBExcitation_ivas_fx(
Word32 LepsP[LPC_WHTN_ORDER_WB + 1];
Word16 tmp_vfac;
Word16 avg_voice_fac;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
/*0.25f*sum_f(voice_factors, NB_SUBFR)*/
L_tmp = L_mult( voice_factors[0], 8192 /* 0.25 in Q15 */ );
@@ -1547,39 +1533,23 @@ void GenShapedWBExcitation_ivas_fx(
n1 = norm_s( max_val );
FOR( i = 0; i < L_FRAME16k / 4; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
excTmp2_frac[i] = shl( excTmp2[i], n1 ); // Q_bwe_exc + n1 // saturation not possible
-#else
- excTmp2_frac[i] = shl_o( excTmp2[i], n1, &Overflow ); // Q_bwe_exc + n1
-#endif
- move16(); /* Q14 */
+ move16(); /* Q14 */
}
n1 = sub( sub( 14, n1 ), Q_bwe_exc );
pow1 = 1;
move32();
-#ifdef ISSUE_1836_replace_overflow_libcom
FOR( i = 0; i < L_FRAME16k / 4; i++ )
{
L_tmp = L_mult( excTmp2_frac[i], excTmp2_frac[i] ); /* Q29 */ // saturation not possible: excTmp2_frac[i] < MIN_16
pow1 = L_add_sat( pow1, L_shr( L_tmp, 10 ) ); /* Q22 */
}
-#else
- FOR( i = 0; i < L_FRAME16k / 4; i++ )
- {
- L_tmp = L_mult_o( excTmp2_frac[i], excTmp2_frac[i], &Overflow ); /* Q29 */
- pow1 = L_add_o( pow1, L_shr( L_tmp, 10 ), &Overflow ); /* Q22 */
- }
-#endif
}
FOR( i = 0; i < L_FRAME16k / 4; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
excNoisyEnv[i] = L_add_sat( *mem_csfilt, L_mult( csfilt_num2[0], excTmp2[i] ) ); // L_mult: sat not poosible, excTmp2 > 0
-#else
- excNoisyEnv[i] = L_add_o( *mem_csfilt, L_mult_o( csfilt_num2[0], excTmp2[i], &Overflow ), &Overflow );
-#endif
- move32(); /* Q_bwe_exc+16 */
+ move32(); /* Q_bwe_exc+16 */
*mem_csfilt = Mult_32_16( excNoisyEnv[i], neg_csfilt_den2[1] );
move32(); /* Q_bwe_exc+16 */
}
@@ -1608,11 +1578,7 @@ void GenShapedWBExcitation_ivas_fx(
n2 = norm_l( Lmax );
FOR( i = 0; i < L_FRAME16k / 4; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
exc4k_frac[i] = extract_h( L_shl( exc4k_32[i], n2 ) ); /* Q(14-n2) */
-#else
- exc4k_frac[i] = extract_h( L_shl_o( exc4k_32[i], n2, &Overflow ) ); /* Q(14-n2) */
-#endif
move16();
}
n2 = 30 - n2 - ( Q_bwe_exc + 6 );
@@ -1620,13 +1586,8 @@ void GenShapedWBExcitation_ivas_fx(
move32();
FOR( i = 0; i < L_FRAME16k / 4; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mult_sat( exc4k_frac[i], exc4k_frac[i] ); /* Q29 */
pow22 = L_add( pow22, L_shr( L_tmp, 10 ) ); /* Q22 */
-#else
- L_tmp = L_mult_o( exc4k_frac[i], exc4k_frac[i], &Overflow ); /* Q29 */
- pow22 = L_add_o( pow22, L_shr( L_tmp, 10 ), &Overflow ); /* Q22 */
-#endif
}
}
@@ -1635,19 +1596,11 @@ void GenShapedWBExcitation_ivas_fx(
IF( EQ_16( coder_type, UNVOICED ) || ( igf_flag != 0 && LT_16( avg_voice_fac, 6654 /* 0.2 in Q15 */ ) ) )
{
L_tmp = root_a_over_b_fx( pow1, sub( 19, shl( n1, 1 ) ), pow22, sub( 19, shl( n2, 1 ) ), &exp );
-#ifdef ISSUE_1836_replace_overflow_libcom
scale = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q15 */
-#else
- scale = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /*Q15 */
-#endif
sc = sub( add( n2, Q_bwe_exc ), 14 );
FOR( i = 0; i < L_FRAME16k / 4; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
exc4kWhtnd[i] = round_fx_sat( L_shl_sat( L_mult_sat( exc4k_frac[i], scale ), sc ) ); /* Q_bwe_exc+n2-10+16+ Q_bwe_exc + n2 -14 -16 = //Q_bwe_exc */
-#else
- exc4kWhtnd[i] = round_fx_o( L_shl_o( L_mult_o( exc4k_frac[i], scale, &Overflow ), sc, &Overflow ), &Overflow ); /* Q_bwe_exc+n2-10+16+ Q_bwe_exc + n2 -14 -16 = //Q_bwe_exc */
-#endif
move16();
}
}
@@ -1663,11 +1616,7 @@ void GenShapedWBExcitation_ivas_fx(
{
/*tmp_vfac = 2*voice_factors[i];
tmp_vfac = min(1, tmp_vfac);*/
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp_vfac = shl_sat( voice_factors[i], 1 );
-#else
- tmp_vfac = shl_o( voice_factors[i], 1, &Overflow );
-#endif
}
ELSE
{
@@ -1676,7 +1625,6 @@ void GenShapedWBExcitation_ivas_fx(
}
Ltemp1 = root_a_fx( L_deposit_h( tmp_vfac ), 31, &exp );
-#ifdef ISSUE_1836_replace_overflow_libcom
temp1 = round_fx_sat( L_shl_sat( Ltemp1, exp ) ); /* Q15 */
L_tmp = Mult_32_16( pow1, sub( 32767, tmp_vfac ) ); /* Q22*/
Ltemp2 = root_a_over_b_fx( L_tmp, sub( 19, shl( n1, 1 ) ), pow22, sub( 19, shl( n2, 1 ) ), &exp );
@@ -1689,20 +1637,6 @@ void GenShapedWBExcitation_ivas_fx(
move16();
k++;
}
-#else
- temp1 = round_fx_o( L_shl_o( Ltemp1, exp, &Overflow ), &Overflow ); /* Q15 */
- L_tmp = Mult_32_16( pow1, sub( 32767, tmp_vfac ) ); /* Q22*/
- Ltemp2 = root_a_over_b_fx( L_tmp, sub( 19, shl( n1, 1 ) ), pow22, sub( 19, shl( n2, 1 ) ), &exp );
- temp2 = round_fx_o( L_shl_o( Ltemp2, exp, &Overflow ), &Overflow ); /* Q15 */
- FOR( j = 0; j < L_FRAME16k / 16; j++ )
- {
- L_tmp = L_mult_o( temp1, exc4kWhtnd[k], &Overflow ); /* Q(16+Q_bwe_exc) */
- L_tmp = L_add_o( L_tmp, L_shl_o( L_mult_o( temp2, exc4k_frac[k], &Overflow ), sc, &Overflow ), &Overflow ); /* Q(16+Q_bwe_exc) */
- exc4kWhtnd[k] = round_fx_o( L_tmp, &Overflow ); /* Q_bwe_exc */
- move16();
- k++;
- }
-#endif
}
}
}
@@ -1757,12 +1691,6 @@ void GenShapedWBExcitation_fx(
Word32 LepsP[LPC_WHTN_ORDER_WB + 1];
Word16 tmp_vfac;
Word16 avg_voice_fac;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
move16();
move16();
move16();
@@ -1853,11 +1781,7 @@ void GenShapedWBExcitation_fx(
n1 = norm_s( max_val );
FOR( i = 0; i < L_FRAME16k / 4; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
excTmp2_frac[i] = shl( excTmp2[i], n1 );
-#else
- excTmp2_frac[i] = shl_o( excTmp2[i], n1, &Overflow );
-#endif
move16(); /* Q14 */
}
n1 = sub( sub( 14, n1 ), Q_bwe_exc );
@@ -1865,23 +1789,14 @@ void GenShapedWBExcitation_fx(
move32();
FOR( i = 0; i < L_FRAME16k / 4; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mult_sat( excTmp2_frac[i], excTmp2_frac[i] ); /* Q29 */
pow1 = L_add_sat( pow1, L_shr( L_tmp, 7 ) ); /* Q22 */
-#else
- L_tmp = L_mult_o( excTmp2_frac[i], excTmp2_frac[i], &Overflow ); /* Q29 */
- pow1 = L_add_o( pow1, L_shr( L_tmp, 7 ), &Overflow ); /* Q22 */
-#endif
}
}
FOR( i = 0; i < L_FRAME16k / 4; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
excNoisyEnv[i] = L_add_sat( *mem_csfilt, L_mult( csfilt_num2[0], excTmp2[i] ) );
-#else
- excNoisyEnv[i] = L_add_o( *mem_csfilt, L_mult_o( csfilt_num2[0], excTmp2[i], &Overflow ), &Overflow );
-#endif
move32(); /* Q_bwe_exc+16 */
*mem_csfilt = Mpy_32_16_1( excNoisyEnv[i], neg_csfilt_den2[1] );
move32(); /* Q_bwe_exc+16 */
@@ -1912,11 +1827,7 @@ void GenShapedWBExcitation_fx(
n2 = norm_l( Lmax );
FOR( i = 0; i < L_FRAME16k / 4; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
exc4k_frac[i] = extract_h( L_shl( exc4k_32[i], n2 ) ); /* Q(14-n2) */
-#else
- exc4k_frac[i] = extract_h( L_shl_o( exc4k_32[i], n2, &Overflow ) ); /* Q(14-n2) */
-#endif
move16();
}
n2 = sub( sub( 30, n2 ), add( Q_bwe_exc, 6 ) );
@@ -1924,13 +1835,8 @@ void GenShapedWBExcitation_fx(
move32();
FOR( i = 0; i < L_FRAME16k / 4; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mult_sat( exc4k_frac[i], exc4k_frac[i] ); /* Q29 */
pow22 = L_add( pow22, L_shr( L_tmp, 7 ) ); /* Q22 */
-#else
- L_tmp = L_mult_o( exc4k_frac[i], exc4k_frac[i], &Overflow ); /* Q29 */
- pow22 = L_add_o( pow22, L_shr( L_tmp, 7 ), &Overflow ); /* Q22 */
-#endif
}
}
@@ -1939,7 +1845,6 @@ void GenShapedWBExcitation_fx(
IF( EQ_16( coder_type, UNVOICED ) || ( igf_flag != 0 && LT_16( avg_voice_fac, 6654 /*0.2 in Q15 */ ) ) )
{
L_tmp = root_a_over_b_fx( pow1, sub( 22, shl( n1, 1 ) ), pow22, sub( 22, shl( n2, 1 ) ), &exp );
-#ifdef ISSUE_1836_replace_overflow_libcom
scale = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q15 */
sc = sub( add( n2, Q_bwe_exc ), 14 );
FOR( i = 0; i < L_FRAME16k / 4; i++ )
@@ -1947,15 +1852,6 @@ void GenShapedWBExcitation_fx(
exc4kWhtnd[i] = round_fx_sat( L_shl_sat( L_mult_sat( exc4k_frac[i], scale ), sc ) ); /* Q_bwe_exc+n2-10+16+ Q_bwe_exc + n2 -14 -16 = //Q_bwe_exc */
move16();
}
-#else
- scale = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /*Q15 */
- sc = sub( add( n2, Q_bwe_exc ), 14 );
- FOR( i = 0; i < L_FRAME16k / 4; i++ )
- {
- exc4kWhtnd[i] = round_fx_o( L_shl_o( L_mult_o( exc4k_frac[i], scale, &Overflow ), sc, &Overflow ), &Overflow ); /* Q_bwe_exc+n2-10+16+ Q_bwe_exc + n2 -14 -16 = //Q_bwe_exc */
- move16();
- }
-#endif
}
ELSE
{
@@ -1970,11 +1866,7 @@ void GenShapedWBExcitation_fx(
{
/*tmp_vfac = 2*voice_factors[i];
tmp_vfac = min(1, tmp_vfac);*/
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp_vfac = shl_sat( voice_factors[i], 1 );
-#else
- tmp_vfac = shl_o( voice_factors[i], 1, &Overflow );
-#endif
}
ELSE
{
@@ -1983,7 +1875,6 @@ void GenShapedWBExcitation_fx(
}
Ltemp1 = root_a_fx( L_deposit_h( tmp_vfac ), 31, &exp );
-#ifdef ISSUE_1836_replace_overflow_libcom
temp1 = round_fx_sat( L_shl_sat( Ltemp1, exp ) ); /* Q15 */
L_tmp = Mpy_32_16_1( pow1, sub( 32767, tmp_vfac ) ); /* Q22*/
Ltemp2 = root_a_over_b_fx( L_tmp, sub( 22, shl( n1, 1 ) ), pow22, sub( 22, shl( n2, 1 ) ), &exp );
@@ -1996,30 +1887,16 @@ void GenShapedWBExcitation_fx(
move16();
k = add( k, 1 );
}
-#else
- temp1 = round_fx_o( L_shl_o( Ltemp1, exp, &Overflow ), &Overflow ); /* Q15 */
- L_tmp = Mpy_32_16_1( pow1, sub( 32767, tmp_vfac ) ); /* Q22*/
- Ltemp2 = root_a_over_b_fx( L_tmp, sub( 22, shl( n1, 1 ) ), pow22, sub( 22, shl( n2, 1 ) ), &exp );
- temp2 = round_fx_o( L_shl_o( Ltemp2, exp, &Overflow ), &Overflow ); /* Q15 */
- FOR( j = 0; j < L_FRAME16k / 16; j++ )
- {
- L_tmp = L_mult_o( temp1, exc4kWhtnd[k], &Overflow ); /* Q(16+Q_bwe_exc) */
- L_tmp = L_add_o( L_tmp, L_shl_o( L_mult_o( temp2, exc4k_frac[k], &Overflow ), sc, &Overflow ), &Overflow ); /* Q(16+Q_bwe_exc) */
- exc4kWhtnd[k] = round_fx_o( L_tmp, &Overflow ); /* Q_bwe_exc */
- move16();
- k = add( k, 1 );
- }
-#endif
}
}
}
Syn_filt_s( 0, lpc_shb, LPC_SHB_ORDER_WB, exc4kWhtnd, excSHB, L_FRAME16k / 4, state_lpc_syn, 1 );
-
return;
}
+
/*-------------------------------------------------------------------*
* GenWBSynth()
*
@@ -3085,7 +2962,7 @@ void GenShapedSHBExcitation_ivas_enc_fx(
/*Word16 out_exp;
Word32 temp_pow1 = root_a_over_b_fx(pow1, Q_pow1, pow22, Q_pow22, &out_exp);
temp_pow1 = L_shl(temp_pow1, out_exp);*/
- // v_multc_fixed_16_16(White_exc16k, round_fx(temp_pow), White_exc16k, L_FRAME16k);
+ // v_multc_fx_16_16(White_exc16k, round_fx(temp_pow), White_exc16k, L_FRAME16k);
L_tmp = 0;
move32();
Q_White_exc16k = add( getScaleFactor16( White_exc16k, L_FRAME16k ), norm_l( temp_pow ) );
@@ -4104,7 +3981,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
/*Word16 out_exp;
Word32 temp_pow1 = root_a_over_b_fx(pow1, Q_pow1, pow22, Q_pow22, &out_exp);
temp_pow1 = L_shl(temp_pow1, out_exp);*/
- // v_multc_fixed_16_16(White_exc16k, round_fx(temp_pow), White_exc16k, L_FRAME16k);
+ // v_multc_fx_16_16(White_exc16k, round_fx(temp_pow), White_exc16k, L_FRAME16k);
L_tmp = 0;
move32();
shift = getScaleFactor16( White_exc16k, L_FRAME16k );
@@ -4434,7 +4311,7 @@ void GenShapedSHBExcitation_ivas_dec_fx(
L_tmp = root_a_over_b_fx( pow1, Q_pow1, pow22, Q_pow22, &exp );
Word16 temp_fac = round_fx_sat( L_shl_sat( L_tmp, exp ) ); // Q15
shift = sub( sub( *Q_bwe_exc, NOISE_QADJ ), Q_White_exc16k );
- // v_multc_fixed_16_16(White_exc16k,shr(temp_fac, temp_fac_exp) , mixExc16k, L_FRAME16k);
+ // v_multc_fx_16_16(White_exc16k,shr(temp_fac, temp_fac_exp) , mixExc16k, L_FRAME16k);
FOR( k = 0; k < L_FRAME16k; k++ )
{
mixExc16k[k] = mult_r( shl_sat( White_exc16k[k], shift ), temp_fac );
@@ -5784,13 +5661,6 @@ void non_linearity_fx(
Word16 nframes;
Word32 prev_scale;
Word16 length_half;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
IF( EQ_16( L_frame, L_FRAME16k ) )
{
@@ -5888,20 +5758,10 @@ void non_linearity_fx(
tmp = div_s( shl( 1, sub( 14, exp ) ), j ); /* Q(29-exp) */
/* (log2(scale / prev_scale))/length */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shl_sat( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ) ); /* Q(16+29-exp+1-16+exp-14)->Q16 */
-#else
- L_tmp = L_shl_o( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ), &Overflow ); /* Q(16+29-exp+1-16+exp-14)->Q16 */
-#endif
-
- frac = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
-
+ frac = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
tmp = extract_l( Pow2( 14, frac ) );
-#ifdef ISSUE_1836_replace_overflow_libcom
scale_step = shl_sat( tmp, exp ); /* Q14 */
-#else
- scale_step = shl_o( tmp, exp, &Overflow ); /* Q14 */
-#endif
}
}
@@ -5924,12 +5784,8 @@ void non_linearity_fx(
IF( GT_16( max_val, shl( 1, Q_inp ) ) )
{
exp = norm_s( max_val );
- tmp = div_s( shl( 1, sub( 14, exp ) ), max_val ); /* Q(29-exp-Q_inp) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp = div_s( shl( 1, sub( 14, exp ) ), max_val ); /* Q(29-exp-Q_inp) */
scale = L_shl_sat( L_mult( 21955 /* 0.67 in Q15 */, tmp ), add( exp, sub( Q_inp, 14 ) ) ); /* Q31 */
-#else
- scale = L_shl_o( L_mult( 21955 /* 0.67 in Q15 */, tmp ), add( exp, sub( Q_inp, 14 ) ), &Overflow ); /* Q31 */
-#endif
}
ELSE
{
@@ -5970,28 +5826,15 @@ void non_linearity_fx(
L_tmp = L_sub( L_tmp, L_tmp1 ); /* Q16 */
/* Computing 1/(j - length/2) */
-
tmp = sub( j, length_half );
exp = norm_s( tmp );
-
-
tmp = div_s( shl( 1, sub( 14, exp ) ), tmp ); /* Q(29-exp) */
/* (log2(scale / prev_scale))/length */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shl_sat( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ) ); /*Q(16+29-exp+1-16+exp-14)->Q16 */
-#else
- L_tmp = L_shl_o( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ), &Overflow ); /*Q(16+29-exp+1-16+exp-14)->Q16 */
-#endif
-
- frac = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
-
+ frac = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
tmp = extract_l( Pow2( 14, frac ) );
-#ifdef ISSUE_1836_replace_overflow_libcom
scale_step = shl_sat( tmp, exp ); /*Q14 */
-#else
- scale_step = shl_o( tmp, exp, &Overflow ); /*Q14 */
-#endif
}
}
@@ -6058,12 +5901,6 @@ void non_linearity_ivas_fx(
Word16 nframes;
Word32 prev_scale;
Word16 length_half;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
#ifdef NONBE_1328_FIX_NON_LINEARITY
Word16 sc_factor;
#endif
@@ -6128,21 +5965,10 @@ void non_linearity_ivas_fx(
}
#ifdef NONBE_1328_FIX_NON_LINEARITY
-#ifdef FIX_2000_NON_LINEARITY_OVERSHOOT
sc_factor = s_max( sub( 13, norm_s( add( j, 1 ) ) ), 0 ); /* Adapt the scaling factor allowed depending of max position */
sc_factor = s_max( sc_factor, 1 ); /* Note: The sc_factor is the log2 of the sc_factor in the float code to simplify condition below */
-#else
- /* sc_factor = 32; */ /* Here we divide prev_scale, so 32 == 2 << (15-10) 1024.0 corresponds to 10 bits and 32 to 5 bits */
- /* if ( element_mode > EVS_MONO ) */ /* element mode is not needed because the function is duplicated for IVAS */
- sc_factor = shl_sat( 1, sub( 16, max( 13 - norm_s( add( j, 1 ) ), 0 ) ) ); /* Adapt the scaling factor allowed depending of max position */
- sc_factor = s_max( s_min( sc_factor, 16384 ), 2 * 32 ); /* note: The thresholding is purposely different between float and BASOP implementations. */
-#endif
test();
-#ifdef FIX_2000_NON_LINEARITY_OVERSHOOT
IF( prev_scale <= 0 || GT_32( L_shr( prev_scale, sub( sc_factor, 1 ) /*Q30 -> Q31*/ ), scale /*Q31*/ ) ) /* Since the sc_factor is the log2 of sc_factor in float, we apply it using L_shr */
-#else
- IF( prev_scale <= 0 || GT_32( Mult_32_16( prev_scale, sc_factor ) /*Q30 -> Q31*/, scale /*Q31*/ ) )
-#endif
#else
test();
IF( prev_scale <= 0 || GT_32( Mult_32_16( prev_scale, 64 ) /*Q30 -> Q31*/, scale /*Q31*/ ) )
@@ -6182,20 +6008,12 @@ void non_linearity_ivas_fx(
tmp = div_s( shl( 1, sub( 14, exp ) ), j ); /* Q(29-exp) */
/* (log2(scale / prev_scale))/length */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shl_sat( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ) ); /* Q(16+29-exp+1-16+exp-14)->Q16 */
-#else
- L_tmp = L_shl_o( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ), &Overflow ); /* Q(16+29-exp+1-16+exp-14)->Q16 */
-#endif
frac = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
tmp = extract_l( Pow2( 14, frac ) );
-#ifdef ISSUE_1836_replace_overflow_libcom
scale_step = shl_sat( tmp, exp ); /* Q14 */
-#else
- scale_step = shl_o( tmp, exp, &Overflow ); /* Q14 */
-#endif
}
}
@@ -6218,12 +6036,8 @@ void non_linearity_ivas_fx(
IF( GT_16( max_val, shl_sat( 1, Q_inp ) ) )
{
exp = norm_s( max_val );
- tmp = div_s( shl( 1, sub( 14, exp ) ), max_val ); /* Q(29-exp-Q_inp) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp = div_s( shl( 1, sub( 14, exp ) ), max_val ); /* Q(29-exp-Q_inp) */
scale = L_shl_sat( L_mult( 21955, tmp ), add( exp, sub( Q_inp, 14 ) ) ); /* Q31 */
-#else
- scale = L_shl_o( L_mult( 21955, tmp ), add( exp, sub( Q_inp, 14 ) ), &Overflow ); /* Q31 */
-#endif
}
ELSE
{
@@ -6232,23 +6046,12 @@ void non_linearity_ivas_fx(
}
#ifdef NONBE_1328_FIX_NON_LINEARITY
-#ifdef FIX_2000_NON_LINEARITY_OVERSHOOT
/* if ( element_mode > EVS_MONO ) */ /* element mode is not needed because the function is duplicated for IVAS */
sc_factor = s_max( sub( 12, norm_s( add( sub( j, length_half ), 1 ) ) ), 0 ); /* allowed intra frame jump is smaller */
sc_factor = s_max( sc_factor, 1 ); /* Note: The sc_factor is the log2 of the sc_factor in the float code to simplify condition below */
-#else
- /* sc_factor = 32; */ /* Here we divide prev_scale, so 32 == 2 << (15-10) 1024.0 corresponds to 10 bits and 32 to 5 bits */
- /* if ( element_mode > EVS_MONO ) */ /* element mode is not needed because the function is duplicated for IVAS */
- sc_factor = shl_sat( 1, sub( 16, max( 12 - norm_s( add( j, 1 ) ), 0 ) ) ); /* Adapt the scaling factor allowed depending of max position */
- sc_factor = s_max( s_min( sc_factor, 16384 ), 2 * 32 ); /* note: The thresholding is purposely different between float and BASOP implementations. */
-#endif
test();
-#ifdef FIX_2000_NON_LINEARITY_OVERSHOOT
IF( prev_scale <= 0 || GT_32( L_shr( prev_scale, sub( sc_factor, 1 ) /*Q30 -> Q31*/ ), scale /*Q31*/ ) ) /* Since the sc_factor is the log2 of sc_factor in float, we apply it using L_shr */
-#else
- IF( prev_scale <= 0 || GT_32( Mult_32_16( prev_scale, sc_factor ) /*Q30 -> Q31*/, scale /*Q31*/ ) )
-#endif
#else
IF( prev_scale <= 0 || GT_32( Mult_32_16( prev_scale, 64 ), scale ) )
#endif
@@ -6283,28 +6086,15 @@ void non_linearity_ivas_fx(
L_tmp = L_sub( L_tmp, L_tmp1 ); /* Q16 */
/* Computing 1/(j - length/2) */
-
tmp = sub( j, length_half );
exp = norm_s( tmp );
-
-
tmp = div_s( shl( 1, sub( 14, exp ) ), tmp ); /* Q(29-exp) */
/* (log2(scale / prev_scale))/length */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shl_sat( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ) ); /*Q(16+29-exp+1-16+exp-14)->Q16 */
-#else
- L_tmp = L_shl_o( Mult_32_16( L_tmp, tmp ), sub( exp, 14 ), &Overflow ); /*Q(16+29-exp+1-16+exp-14)->Q16 */
-#endif
-
- frac = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
-
+ frac = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */
tmp = extract_l( Pow2( 14, frac ) );
-#ifdef ISSUE_1836_replace_overflow_libcom
scale_step = shl_sat( tmp, exp ); /*Q14 */
-#else
- scale_step = shl_o( tmp, exp, &Overflow ); /*Q14 */
-#endif
}
}
@@ -6566,7 +6356,7 @@ void wb_tbe_extras_reset_synth_fx(
*-------------------------------------------------------------------*/
void elliptic_bpf_48k_generic_fx(
- const int16_t element_mode,
+ const Word16 element_mode,
Word16 IsUpsampled3,
Word16 input_fx[], /* i : input signal Q_input_fx*/
Word16 *Q_input_fx,
@@ -6884,7 +6674,7 @@ void synthesise_fb_high_band_fx(
Word32 bpf_memory[][4], /* i/o: memory for elliptic bpf 48k */
Word16 bpf_memory_Q[],
Word16 Qout,
- int16_t element_mode )
+ Word16 element_mode )
{
Word16 i, j;
Word16 excitation_in_interp3_buffer[L_FRAME48k + 4];
@@ -7039,12 +6829,6 @@ void Estimate_mix_factors_fx(
Word16 exp1, exp2, expa, expb, fraca, fracb, scale, num_flag, den_flag;
Word16 tmp, tmp1, sc1, sc2;
Word32 L_tmp1, L_tmp2;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
Copy( shb_res, shb_res_local, L_FRAME16k );
Copy( White_exc16k_frac, WN_exc_local, L_FRAME16k );
@@ -7102,11 +6886,7 @@ void Estimate_mix_factors_fx(
expa = sub( 30, expa );
expb = norm_l( temp_p1_p2 );
-#ifdef ISSUE_1836_replace_overflow_libcom
fracb = round_fx_sat( L_shl( temp_p1_p2, expb ) );
-#else
- fracb = round_fx_o( L_shl_o( temp_p1_p2, expb, &Overflow ), &Overflow );
-#endif
expb = sub( 30, expb );
num_flag = 0;
@@ -7206,18 +6986,16 @@ void prep_tbe_exc_fx(
Word16 bwe_exc_fx[], /* i/o: excitation for TBE Q_exc*/
const Word16 gain_preQ_fx, /* i : prequantizer excitation gain */
const Word16 code_preQ_fx[], /* i : prequantizer excitation */
-#ifdef FIX_2010_PREP_TBE_EXC
- const Word16 Q_code_preQ, /* i : Q, prequantizer excitation */
-#endif
- const Word16 Q_exc, /* i : Excitation, bwe_exc Q-factor */
- const Word16 T0, /* i : integer pitch variables Q0 */
- const Word16 T0_frac, /* i : Fractional pitch variables Q0*/
- const Word16 coder_type, /* i : coding type */
- const Word32 core_brate, /* i : core bitrate */
- const Word16 element_mode, /* i : element mode */
- const Word16 idchan, /* i : channel ID */
- const Word16 flag_TD_BWE, /* i : flag indicating whether hTD_BWE exists */
- const Word16 tdm_LRTD_flag /* i : LRTD stereo mode flag */
+ const Word16 Q_code_preQ, /* i : Q, prequantizer excitation */
+ const Word16 Q_exc, /* i : Excitation, bwe_exc Q-factor */
+ const Word16 T0, /* i : integer pitch variables Q0 */
+ const Word16 T0_frac, /* i : Fractional pitch variables Q0*/
+ const Word16 coder_type, /* i : coding type */
+ const Word32 core_brate, /* i : core bitrate */
+ const Word16 element_mode, /* i : element mode */
+ const Word16 idchan, /* i : channel ID */
+ const Word16 flag_TD_BWE, /* i : flag indicating whether hTD_BWE exists */
+ const Word16 tdm_LRTD_flag /* i : LRTD stereo mode flag */
)
{
@@ -7233,12 +7011,6 @@ void prep_tbe_exc_fx(
Word32 L_tmp, Ltemp1, Ltemp2;
Word32 tempQ31;
Word16 tempQ15;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/**voice_factors = VF_0th_PARAM + VF_1st_PARAM * voice_fac + VF_2nd_PARAM * voice_fac * voice_fac;
= VF_0th_PARAM + voice_fac * (VF_1st_PARAM + VF_2nd_PARAM * voice_fac )
@@ -7252,11 +7024,7 @@ void prep_tbe_exc_fx(
tmp = MAX_16;
move16();
-#ifdef ISSUE_1836_replace_overflow_libcom
pitch = shl_sat( add( shl_sat( T0, 2 ), T0_frac ), 5 ); /* Q7 */
-#else
- pitch = shl_o( add( shl_o( T0, 2, &Overflow ), T0_frac ), 5, &Overflow ); /* Q7 */
-#endif
test();
test();
@@ -7285,8 +7053,7 @@ void prep_tbe_exc_fx(
IF( EQ_16( L_frame_fx, L_FRAME ) )
{
- interp_code_5over2_fx( code_fx, tmp_code_fx, L_subfr ); /* code: Q9, tmp_code: Q9 */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ interp_code_5over2_fx( code_fx, tmp_code_fx, L_subfr ); /* code: Q9, tmp_code: Q9 */
gain_code16 = round_fx_sat( L_shl_sat( gain_code_fx, Q_exc ) ); /*Q_exc */
FOR( i = 0; i < L_subfr * HIBND_ACB_L_FAC; i++ )
{
@@ -7297,60 +7064,30 @@ void prep_tbe_exc_fx(
bwe_exc_fx[i + i_subfr_fx * HIBND_ACB_L_FAC] = round_fx_sat( L_tmp ); /*Q_exc */
move16();
}
-#else
- gain_code16 = round_fx_o( L_shl_o( gain_code_fx, Q_exc, &Overflow ), &Overflow ); /*Q_exc */
- FOR( i = 0; i < L_subfr * HIBND_ACB_L_FAC; i++ )
- {
- L_tmp = L_mult( gain_code16, tmp_code_fx[i] ); /* Q9 + Q_exc + 1*/
- L_tmp = L_shl_o( L_tmp, 5, &Overflow ); /* Q9 + Q_exc + Q6*/
- L_tmp = L_mac_o( L_tmp, gain_pit_fx, bwe_exc_fx[i + i_subfr_fx * HIBND_ACB_L_FAC], &Overflow ); /*Q15+Q_exc */
- L_tmp = L_shl_o( L_tmp, 1, &Overflow ); /*16+Q_exc */ /* saturation can occur here */
- bwe_exc_fx[i + i_subfr_fx * HIBND_ACB_L_FAC] = round_fx_o( L_tmp, &Overflow ); /*Q_exc */
- move16();
- }
-#endif
}
ELSE
{
Word16 shift = 4;
-#ifdef FIX_2010_PREP_TBE_EXC
- /* multrus 2025-09-15
- TODO:
- - leave shift = 4, since this is legacy code from EVS;
- - check with vaillancourt, whether we really have a different scaling of code_preQ_fx[] for IVAS
- - if the different scalings are confirmed, this condition could be simplified
- */
IF( NE_16( element_mode, EVS_MONO ) )
{
/* shift of 4 assumes code_preQ_fx[] in Q10 - this is however not always given */
shift = add( 2 + 1 - 1, Q_code_preQ ); /* gain_preQ_fx in Q2, code_preQ_fx[] in Q_code_preQ, 1 additional left-shift by L_mult() - factor of 2 (from "2 * gain_preQ * code_preQ[i]") */
shift = sub( 16, shift );
}
-#endif
+
move16();
IF( gain_preQ_fx != 0 )
{
FOR( i = 0; i < L_subfr; i++ )
{
/*code in the encoder is Q9 and there is no <<1 with Mult_32_16 Q16 * Q9 -> Q9 */
- Ltemp1 = Mult_32_16( gain_code_fx, code_fx[i] ); /* Q16 + Q9 + 1 - 16 = Q10 */
-#ifdef FIX_2010_PREP_TBE_EXC
+ Ltemp1 = Mult_32_16( gain_code_fx, code_fx[i] ); /* Q16 + Q9 + 1 - 16 = Q10 */
Ltemp2 = L_mult( gain_preQ_fx, code_preQ_fx[i] ); /* Q2 + Q_code_preQ */
-#else
- Ltemp2 = L_mult( gain_preQ_fx, code_preQ_fx[i] ); /*Q2 * Q10 -> Q12 */
-#endif
-#ifdef ISSUE_1836_replace_overflow_libcom
Ltemp1 = L_shl_sat( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/ ); /*Q_exc+16 */
Ltemp2 = L_shl_sat( Ltemp2, add( Q_exc, shift ) /*Q_exc+ 2 + 6 (or) 10 - 13*/ ); /*Q_exc+16 */
tmp_code_preInt_fx[i] = round_fx_sat( L_add_sat( Ltemp1, Ltemp2 ) ); /* Q_exc */
-#else
- Ltemp1 = L_shl_o( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */
- Ltemp2 = L_shl_o( Ltemp2, add( Q_exc, shift ) /*Q_exc+ 2 + 6 (or) 10 - 13*/, &Overflow ); /*Q_exc+16 */
-
- tmp_code_preInt_fx[i] = round_fx_o( L_add_o( Ltemp1, Ltemp2, &Overflow ), &Overflow ); /* Q_exc */
-#endif
move16();
}
}
@@ -7359,14 +7096,9 @@ void prep_tbe_exc_fx(
FOR( i = 0; i < L_subfr; i++ )
{
/*code in the encoder is Q9 and there is no <<1 with Mult_32_16 Q16 * Q9 -> Q9 */
- Ltemp1 = Mult_32_16( gain_code_fx, code_fx[i] ); /* Q16 + Q9 + 1 - 16 = Q10 */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ Ltemp1 = Mult_32_16( gain_code_fx, code_fx[i] ); /* Q16 + Q9 + 1 - 16 = Q10 */
Ltemp1 = L_shl_sat( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/ ); /*Q_exc+16 */
tmp_code_preInt_fx[i] = round_fx_sat( Ltemp1 ); /* Q_exc */
-#else
- Ltemp1 = L_shl_o( Ltemp1, add( Q_exc, 6 ) /*Q_exc+16-19*/, &Overflow ); /*Q_exc+16 */
- tmp_code_preInt_fx[i] = round_fx_o( Ltemp1, &Overflow ); /* Q_exc */
-#endif
move16();
}
}
@@ -7374,15 +7106,9 @@ void prep_tbe_exc_fx(
interp_code_4over2_fx( tmp_code_preInt_fx, tmp_code_fx, L_subfr ); /* o: tmp_code in Q_exc */
FOR( i = 0; i < shl( L_subfr, 1 ); i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mult( gain_pit_fx, bwe_exc_fx[i + ( i_subfr_fx << 1 )] ); /*Q14+Q_exc+1 */
tmp = round_fx_sat( L_shl_sat( L_tmp, 1 /* (Q_exc+16)-(14+Q_exc+1)*/ ) ); /* tmp in Q_exc */
bwe_exc_fx[i + ( i_subfr_fx << 1 )] = add_sat( tmp, tmp_code_fx[i] ); /*Q_exc */
-#else
- L_tmp = L_mult( gain_pit_fx, bwe_exc_fx[i + shl( i_subfr_fx, 1 )] ); /*Q14+Q_exc+1 */
- tmp = round_fx_o( L_shl_o( L_tmp, 1 /* (Q_exc+16)-(14+Q_exc+1)*/, &Overflow ), &Overflow ); /* tmp in Q_exc */
- bwe_exc_fx[i + shl( i_subfr_fx, 1 )] = add_o( tmp, tmp_code_fx[i], &Overflow ); /*Q_exc */
-#endif
move16();
}
}
@@ -7418,11 +7144,6 @@ Word16 swb_formant_fac_fx(
{
Word16 formant_fac;
Word16 tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/* Smoothen tilt value */
/* tmp = 0.5f * (float)fabs(lpc_shb2) + 0.5f * *tilt_mem; */
@@ -7449,11 +7170,8 @@ Word16 swb_formant_fac_fx(
/* formant_fac = 1.0f - 0.5f*formant_fac */
tmp = mult_r( 16384, formant_fac ); /* 0.5 in Q15 */
-#ifdef ISSUE_1836_replace_overflow_libcom
formant_fac = shl_sat( sub( 4096 /* 1 in Q12 */, tmp ), 3 );
-#else
- formant_fac = shl_o( sub( 4096 /* 1 in Q12 */, tmp ), 3, &Overflow );
-#endif
+
return formant_fac; /*Q15 */
}
diff --git a/lib_com/syn_filt_fx.c b/lib_com/syn_filt_fx.c
index 891314fe216ecb025a0fd8f61e0ccca98ada73c1..cfa254042c6c823b921156e0265d369e40ffffa4 100644
--- a/lib_com/syn_filt_fx.c
+++ b/lib_com/syn_filt_fx.c
@@ -11,16 +11,8 @@
static Word32 syn_kern_2( Word32 L_tmp, const Word16 a[], const Word16 y[] )
{
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
- L_tmp = L_msu_o( L_tmp, y[-1], a[1], &Overflow );
- return L_msu_o( L_tmp, y[-2], a[2], &Overflow );
-#else
L_tmp = L_msu_sat( L_tmp, y[-1], a[1] );
return L_msu_sat( L_tmp, y[-2], a[2] );
-#endif
}
static Word32 syn_kern_4( Word32 L_tmp, const Word16 a[], const Word16 y[] )
@@ -340,18 +332,20 @@ void syn_filt_fx32(
* Returns:
* void
*/
-void E_UTIL_synthesis( const Word16 shift, const Word16 a[], const Word16 x[], Word16 y[], const Word16 lg, Word16 mem[], const Word16 update, const Word16 m )
+void E_UTIL_synthesis(
+ const Word16 shift,
+ const Word16 a[],
+ const Word16 x[],
+ Word16 y[],
+ const Word16 lg,
+ Word16 mem[],
+ const Word16 update,
+ const Word16 m )
{
Word16 i, j, a0;
Word32 L_tmp;
Word16 q;
Word32 ( *syn_kern )( Word32 L_tmp, const Word16 a[], const Word16 y[] ) = NULL;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
if ( EQ_16( m, 6 ) )
{
@@ -384,13 +378,8 @@ void E_UTIL_synthesis( const Word16 shift, const Word16 a[], const Word16 x[], W
*-----------------------------------------------------------------------*/
/* Filtering Only from Input + Memory */
L_tmp = syn_kern( L_mult( a0, *x++ ), a, mem );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shl_sat( L_tmp, q );
*y++ = round_fx_sat( L_tmp );
-#else
- L_tmp = L_shl_o( L_tmp, q, &Overflow );
- *y++ = round_fx_o( L_tmp, &Overflow );
-#endif
move16();
/* Filtering from Input + Mix of Memory & Output Signal Past */
@@ -400,24 +389,15 @@ void E_UTIL_synthesis( const Word16 shift, const Word16 a[], const Word16 x[], W
/* Process Output Signal Past */
FOR( j = 1; j <= i; j++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_msu_sat( L_tmp, a[j], y[-j] );
-#else
- L_tmp = L_msu_o( L_tmp, a[j], y[-j], &Overflow );
-#endif
}
/* Process Memory */
FOR( ; j <= m; j++ )
{
L_tmp = L_msu_sat( L_tmp, a[j], mem[i - j] );
}
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shl_sat( L_tmp, q );
*y++ = round_fx_sat( L_tmp );
-#else
- L_tmp = L_shl_o( L_tmp, q, &Overflow );
- *y++ = round_fx_o( L_tmp, &Overflow );
-#endif
move16();
}
@@ -425,13 +405,8 @@ void E_UTIL_synthesis( const Word16 shift, const Word16 a[], const Word16 x[], W
FOR( ; i < lg; i++ )
{
L_tmp = syn_kern( L_mult( a0, *x++ ), a, y );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shl_sat( L_tmp, q );
*y++ = round_fx_sat( L_tmp );
-#else
- L_tmp = L_shl_o( L_tmp, q, &Overflow );
- *y++ = round_fx_o( L_tmp, &Overflow );
-#endif
move16();
}
@@ -471,17 +446,21 @@ void E_UTIL_synthesis( const Word16 shift, const Word16 a[], const Word16 x[], W
* Returns:
* void
*/
-void E_UTIL_synthesis_fx( const Word16 shift, const Word32 a[], const Word32 x[], Word32 y[], const Word16 lg, Word32 mem[], const Word16 update, const Word16 m )
+void E_UTIL_synthesis_fx(
+ const Word16 shift,
+ const Word32 a[],
+ const Word32 x[],
+ Word32 y[],
+ const Word16 lg,
+ Word32 mem[],
+ const Word16 update,
+ const Word16 m )
{
Word16 i, j;
Word32 a0;
Word32 L_tmp;
Word16 q;
Word32 ( *syn_kern )( Word32 L_tmp, const Word32 a[], const Word32 y[] ) = NULL;
-#ifndef ISSUE_1836_replace_overflow_libcom
- Flag Overflow = 0;
- move32();
-#endif
if ( EQ_16( m, 6 ) )
{
@@ -508,22 +487,14 @@ void E_UTIL_synthesis_fx( const Word16 shift, const Word32 a[], const Word32 x[]
*-----------------------------------------------------------------------*/
mem += m; /*move32();*/
-#ifdef ISSUE_1836_replace_overflow_libcom
a0 = L_shr_sat( a[0], shift ); /* input / 2^shift */
-#else
- a0 = L_shr_o( a[0], shift, &Overflow ); /* input / 2^shift */
-#endif
/*-----------------------------------------------------------------------*
* Do the filtering
*-----------------------------------------------------------------------*/
/* Filtering Only from Input + Memory */
L_tmp = syn_kern( Mpy_32_32( a0, *x++ ), a, mem );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shl_sat( L_tmp, q );
-#else
- L_tmp = L_shl_o( L_tmp, q, &Overflow );
-#endif
*y++ = L_tmp;
move32();
@@ -541,11 +512,7 @@ void E_UTIL_synthesis_fx( const Word16 shift, const Word32 a[], const Word32 x[]
{
L_tmp = Msub_32_32_r( L_tmp, a[j], mem[i - j] );
}
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shl_sat( L_tmp, q );
-#else
- L_tmp = L_shl_o( L_tmp, q, &Overflow );
-#endif
*y++ = L_tmp;
move32();
}
@@ -554,11 +521,7 @@ void E_UTIL_synthesis_fx( const Word16 shift, const Word32 a[], const Word32 x[]
FOR( ; i < lg; i++ )
{
L_tmp = syn_kern( Mpy_32_32( a0, *x++ ), a, y );
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_shl_sat( L_tmp, q );
-#else
- L_tmp = L_shl_o( L_tmp, q, &Overflow );
-#endif
*y++ = L_tmp;
move32();
}
diff --git a/lib_com/tcx_ltp_fx.c b/lib_com/tcx_ltp_fx.c
index d9112ffa04ec74421beef4149d3a44d369762dd1..a584de16a44a3c19fffa68bb3f4127f40be88e20 100644
--- a/lib_com/tcx_ltp_fx.c
+++ b/lib_com/tcx_ltp_fx.c
@@ -375,6 +375,8 @@ static void tcx_ltp_get_zir_fx(
move32();
alpha = sub( alpha, step );
}
+
+ return;
}
void predict_signal(
@@ -389,12 +391,7 @@ void predict_signal(
Word16 j;
Word32 s;
const Word16 *x0, *win;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
x0 = &excI[-T0 - 1];
frac = negate( frac );
@@ -410,21 +407,16 @@ void predict_signal(
FOR( j = 0; j < L_subfr; j++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
s = L_mult_sat( win[0], x0[0] ); /* Qx + 16 */
s = L_mac_sat( s, win[1], x0[1] ); /* Qx + 16 */
s = L_mac_sat( s, win[2], x0[2] ); /* Qx + 16 */
excO[j] = mac_r_sat( s, win[3], x0[3] ); /* Qx + 16 */
-#else
- s = L_mult_o( win[0], x0[0], &Overflow ); /* Qx + 16 */
- s = L_mac_o( s, win[1], x0[1], &Overflow ); /* Qx + 16 */
- s = L_mac_o( s, win[2], x0[2], &Overflow ); /* Qx + 16 */
- excO[j] = mac_ro( s, win[3], x0[3], &Overflow ); /* Qx + 16 */
-#endif
move16();
x0++;
}
+
+ return;
}
static void tcx_ltp_synth_filter(
@@ -492,7 +484,6 @@ static void tcx_ltp_synth_filter(
step = negate( step );
}
-#ifdef OPT_TCXLTP_FILTER_LOOP
IF( zir != NULL )
{
IF( fade != 0 )
@@ -640,57 +631,16 @@ static void tcx_ltp_synth_filter(
}
}
}
-#else
- FOR( j = 0; j < length; j++ )
- {
- s = L_deposit_l( 0 );
- s2 = L_deposit_l( 0 );
- k = 0;
- move16();
- FOR( i = 0; i < L; i++ )
- {
- s = L_mac_sat( L_mac_sat( s, w0[k], x0[i] ), w1[k], x1[-i] ); /* Qx */
- s2 = L_mac_sat( L_mac_sat( s2, v0[k], y0[i] ), v1[k], y1[-i] ); /* Qx */
- k = k + pitch_res;
- }
-
- /* s2 *= ALPHA;
- normal: synth_ltp[j] = synth[j] - gain * s2 + gain * s;
- zir: synth_ltp[j] = synth[j] - gain * s2 + gain * s - zir[j];
- fade-in/out: synth_ltp[j] = synth[j] - alpha * gain * s2 + alpha * gain * s; */
- i = sub_sat( round_fx_sat( s ), mult_r_sat( round_fx_sat( s2 ), ALPHA ) ); /* Qx */
- k = mult_r( gain, i ); /* Qx */
- if ( fade != 0 )
- k = mult_r( k, alpha ); /* Qx */
- k = add_sat( synth[j], k ); /* Qx */
- if ( zir != NULL )
- {
- k = sub_sat( k, zir[j] ); /* Qx */
- }
-
- synth_ltp[j] = k; /* Qx */
- move16();
-
- BASOP_SATURATE_WARNING_OFF_EVS;
- if ( fade != 0 )
- {
- alpha = add_sat( alpha, step );
- }
- BASOP_SATURATE_WARNING_ON_EVS;
-
- x0++;
- x1++;
- y0++;
- y1++;
- }
-#endif
}
ELSE
{
Copy( synth, synth_ltp, length ); /* Qx */
}
+
+ return;
}
+
static void tcx_ltp_synth_filter32(
Word32 *synth_ltp, /* Qx */
Word32 *synth, /* Qx */
@@ -752,10 +702,11 @@ static void tcx_ltp_synth_filter32(
}
if ( fade < 0 )
+ {
step = negate( step );
+ }
}
-#ifdef OPT_TCXLTP_FILTER_LOOP
IF( fade != 0 )
{
IF( zir != NULL )
@@ -902,57 +853,16 @@ static void tcx_ltp_synth_filter32(
}
}
}
-#else
- FOR( j = 0; j < length; j++ )
- {
- s = L_deposit_l( 0 );
- s2 = L_deposit_l( 0 );
- k = 0;
- move16();
- FOR( i = 0; i < L; i++ )
- {
- s = Madd_32_16_r( Madd_32_16_r( s, x0[i], w0[k] ), x1[-i], w1[k] ); /* Qx */
- s2 = Madd_32_16_r( Madd_32_16_r( s2, y0[i], v0[k] ), y1[-i], v1[k] ); /* Qx */
- k = k + pitch_res;
- }
-
- /* s2 *= ALPHA;
- normal: synth_ltp[j] = synth[j] - gain * s2 + gain * s;
- zir: synth_ltp[j] = synth[j] - gain * s2 + gain * s - zir[j];
- fade-in/out: synth_ltp[j] = synth[j] - alpha * gain * s2 + alpha * gain * s; */
- L_tmp = L_sub_sat( s, Mpy_32_16_r( s2, ALPHA ) ); /* Qx */
- L_tmp2 = Mpy_32_16_r( L_tmp, gain ); /* Qx */
- IF( fade != 0 )
- L_tmp2 = Mpy_32_16_r( L_tmp2, alpha ); /* Qx */
- L_tmp2 = L_add_sat( synth[j], L_tmp2 ); /* Qx */
- if ( zir != NULL )
- {
- L_tmp2 = L_sub_sat( L_tmp2, zir[j] ); /* Qx */
- }
-
- synth_ltp[j] = L_tmp2; /* Qx */
- move16();
-
- BASOP_SATURATE_WARNING_OFF_EVS;
- if ( fade != 0 )
- {
- alpha = add_sat( alpha, step );
- }
- BASOP_SATURATE_WARNING_ON_EVS;
-
- x0++;
- x1++;
- y0++;
- y1++;
- }
-#endif
}
ELSE
{
Copy32( synth, synth_ltp, length ); /* Qx */
}
+
+ return;
}
+
static void tcx_ltp_synth_filter_10(
Word16 *out, /* Qx */
Word16 *in, /* Qx */
diff --git a/lib_com/tcx_mdct_fx.c b/lib_com/tcx_mdct_fx.c
index 29827b9356a4a659b723b083d3402555cfb6770e..475a0079c74117488f23cebe48365dd3d8e611d1 100644
--- a/lib_com/tcx_mdct_fx.c
+++ b/lib_com/tcx_mdct_fx.c
@@ -107,19 +107,13 @@ void TCX_MDCT(
Word16 factor, neg_factor;
Word16 factor_e;
(void) element_mode;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
factor = TCX_MDCT_GetScaleFactor( add( add( shr( l, 1 ), m ), shr( r, 1 ) ), &factor_e );
*y_e = add( *y_e, factor_e );
move16();
neg_factor = negate( factor );
-
/* Init */
FOR( i = 0; i < m / 2; i++ )
{
@@ -128,11 +122,7 @@ void TCX_MDCT(
}
FOR( i = 0; i < l / 2; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
y[m / 2 + r / 2 + m / 2 + i] = L_msu_sat( L_mult( x[i], factor ), x[l - 1 - i], factor ); /* exp(y_e) */
-#else
- y[m / 2 + r / 2 + m / 2 + i] = L_msu_o( L_mult( x[i], factor ), x[l - 1 - i], factor, &Overflow ); /* exp(y_e) */
-#endif
move32();
}
FOR( i = 0; i < m / 2; i++ )
@@ -142,11 +132,7 @@ void TCX_MDCT(
}
FOR( i = 0; i < r / 2; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
y[m / 2 + r / 2 - 1 - m / 2 - i] = L_mac_sat( L_mult( x[l + m + i], neg_factor ), x[l + m + r - 1 - i], neg_factor ); /* exp(y_e) */
-#else
- y[m / 2 + r / 2 - 1 - m / 2 - i] = L_mac_o( L_mult( x[l + m + i], neg_factor ), x[l + m + r - 1 - i], neg_factor, &Overflow ); /* exp(y_e) */
-#endif
move32();
}
@@ -173,12 +159,7 @@ void TCX_MDST(
Word16 factor, neg_factor;
Word16 factor_e;
(void) element_mode;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
factor = TCX_MDCT_GetScaleFactor( add( add( shr( l, 1 ), m ), shr( r, 1 ) ), &factor_e ); /* exp(factor_e) */
*y_e = add( *y_e, factor_e );
move16();
@@ -194,11 +175,7 @@ void TCX_MDST(
}
FOR( i = 0; i < l / 2; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
y[m / 2 + r / 2 + m / 2 + i] = L_msu_sat( L_mult( x[i], neg_factor ), x[l - 1 - i], factor ); /* exp(y_e) */
-#else
- y[m / 2 + r / 2 + m / 2 + i] = L_msu_o( L_mult( x[i], neg_factor ), x[l - 1 - i], factor, &Overflow ); /* exp(y_e) */
-#endif
move32();
}
FOR( i = 0; i < m / 2; i++ )
diff --git a/lib_com/tcx_utils_fx.c b/lib_com/tcx_utils_fx.c
index 326ec622160e3281067d2dc8c507261401dfd77a..a6b32f31040b2c362336ad848a422d6b3b622a40 100644
--- a/lib_com/tcx_utils_fx.c
+++ b/lib_com/tcx_utils_fx.c
@@ -681,10 +681,6 @@ void lpc2mdct(
const PWord16 *ptwiddle;
Word32 workBuffer[2 * BASOP_CFFT_MAX_LENGTH];
-#ifndef IVAS_CODE_TCX_UTIL
- (void) noInverse;
-#endif
-
assert( length <= FDNS_NPTS );
sizeN = shl( length, 1 ); /*Q0*/
@@ -709,28 +705,17 @@ void lpc2mdct(
move32();
}
- move16();
-#ifdef IVAS_CODE_TCX_UTIL
if ( noInverse )
{
- /* half length FFT */
- scale = add( norm_s( lpcCoeffs[0] ), 1 );
- BASOP_cfft( (cmplx *) ComplexData, FDNS_NPTS, &scale, workBuffer ); // tbv -> In float the fft type changes as well
- /*Get amplitude*/
- j = sub( length, 1 );
- k = 0;
- for ( i = 0; i < length; i++ )
- {
- mdct_gains[i] = (float) ( sqrt( RealData[i] * RealData[i] + ImagData[i] * ImagData[i] ) );
- }
+ assert( !"not supported option in lpc2mdct()" );
}
else
-#endif
{
/* half length FFT */
scale = add( norm_s( lpcCoeffs[0] ), 1 );
BASOP_cfft( (cmplx *) ComplexData, FDNS_NPTS, &scale, workBuffer ); /*Q31 - scale*/
- /*Get amplitude*/
+
+ /* Get amplitude */
j = sub( length, 1 );
k = 0;
FOR( i = 0; i < length / 2; i++ )
@@ -991,11 +976,6 @@ void mdct_shaping(
Word32 *px = x; /*Qx*/
Word16 const *pgains = gains;
Word16 const *pgainsexp = gains_exp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/* FDNS_NPTS = 64 */
k = shr( lg, 6 ); /*Q0*/
@@ -1046,11 +1026,7 @@ void mdct_shaping(
FOR( l = 0; l < k; l++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
*x = L_shl_sat( Mpy_32_16_r( *x, *gains ), *gains_exp ); /*Qx*/
-#else
- *x = L_shl_o( Mpy_32_16_r( *x, *gains ), *gains_exp, &Overflow ); /*Qx*/
-#endif
move32();
x++;
}
@@ -1069,11 +1045,7 @@ void mdct_shaping(
gains_exp = pgainsexp;
FOR( i = 0; i < FDNS_NPTS; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
*x = L_shl_sat( Mpy_32_16_r( *x, *gains ), *gains_exp ); /*Qx*/
-#else
- *x = L_shl_o( Mpy_32_16_r( *x, *gains ), *gains_exp, &Overflow ); /*Qx*/
-#endif
move32();
x += k;
gains++;
@@ -1399,12 +1371,6 @@ void PsychAdaptLowFreqDeemph(
Word16 i;
Word16 max_val, max_e, fac, min, min_e, tmp, tmp_e;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
-
assert( lpcGains[0] >= 0x4000 );
@@ -1445,21 +1411,13 @@ void PsychAdaptLowFreqDeemph(
/* fac = tmp = (float)pow(max_val / min, 0.0078125f); */
tmp_e = min_e;
move16();
- tmp = Inv16( min, &tmp_e ); /*Q15 - tmp_e*/
-#ifdef FIX_1984_SAT_IN_PSYCHAD
+ tmp = Inv16( min, &tmp_e ); /*Q15 - tmp_e*/
L_tmp = L_shl_sat( L_mult_sat( tmp, max_val ), add( tmp_e, max_e ) ); /* Q31 */
-#else
- L_tmp = L_shl( L_mult( tmp, max_val ), add( tmp_e, max_e ) ); /* Q31 */
-#endif
- L_tmp = BASOP_Util_Log2( L_tmp ); /* Q25 */
- L_tmp = L_shr( L_tmp, 7 ); /* 0.0078125f = 1.f/(1<<7) */
- L_tmp = BASOP_Util_InvLog2( L_tmp ); /* Q31 */
-#ifdef ISSUE_1836_replace_overflow_libcom
- tmp = round_fx_sat( L_tmp ); /* Q15 */
-#else
- tmp = round_fx_o( L_tmp, &Overflow ); /* Q15 */
-#endif
- fac = tmp; /* Q15 */
+ L_tmp = BASOP_Util_Log2( L_tmp ); /* Q25 */
+ L_tmp = L_shr( L_tmp, 7 ); /* 0.0078125f = 1.f/(1<<7) */
+ L_tmp = BASOP_Util_InvLog2( L_tmp ); /* Q31 */
+ tmp = round_fx_sat( L_tmp ); /* Q15 */
+ fac = tmp; /* Q15 */
move16();
/* gradual lowering of lowest 32 bins; DC is lowered by (max_val/tmp)^1/4 */
@@ -2049,7 +2007,6 @@ void InitTnsConfigs_ivas_fx(
InitTnsConfiguration_ivas_fx( bwidth, add( L_frame, shr( L_frame, 2 ) ), &tnsConfig[1][1], igfStopFreq, total_brate, element_mode, MCT_flag );
}
-
void SetTnsConfig(
TCX_CONFIG_HANDLE hTcxCfg, /* i : configuration of TCX */
const Word16 isTCX20, /*Q0*/
@@ -2059,8 +2016,7 @@ void SetTnsConfig(
hTcxCfg->pCurrentTnsConfig = &hTcxCfg->tnsConfig[isTCX20][isAfterACELP];
assert( hTcxCfg->pCurrentTnsConfig != NULL );
}
-#define IVAS_CODE_TCX_UTIL
-#ifdef IVAS_CODE_TCX_UTIL
+
/*-------------------------------------------------------------------*
* SetAllowTnsOnWhite
*
@@ -2082,8 +2038,6 @@ void SetAllowTnsOnWhite(
move16();
return;
}
-#endif
-#undef IVAS_CODE_TCX_UTIL
void tcx_get_gain(
Word32 *x, /* i: spectrum 1 Q31 - x_e*/
@@ -2101,11 +2055,6 @@ void tcx_get_gain(
Word32 corr, ener;
Word16 sx, sy, corr_e, ener_e;
Word16 i, tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
maxX = L_deposit_l( 1 );
maxY = L_deposit_l( 1 );
@@ -2151,11 +2100,8 @@ void tcx_get_gain(
ener = L_shl( ener, tmp ); /*Q31 - ener_e + tmp*/
ener_e = sub( ener_e, tmp );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = div_s( abs_s( round_fx_sat( corr ) ), round_fx_sat( ener ) ); /*Q15 - (corr_e - ener_e)*/
-#else
- tmp = div_s( abs_s( round_fx_o( corr, &Overflow ) ), round_fx_o( ener, &Overflow ) ); /*Q15 - (corr_e - ener_e)*/
-#endif
+
if ( corr < 0 )
tmp = negate( tmp );
diff --git a/lib_com/tns_base.c b/lib_com/tns_base.c
index 42c0db406dcaa7c5ecdd3341101526aaa4e4b716..54e6478d45df63fd6324ce70b84f20528e9523b5 100755
--- a/lib_com/tns_base.c
+++ b/lib_com/tns_base.c
@@ -174,7 +174,7 @@ void InitTnsConfiguration(
FOR( iFilter = 0; iFilter < pTnsConfig->nMaxFilters; iFilter++ )
{
- assert( pTnsConfig->pTnsParameters[iFilter].startLineFrequency < 0.5f * nSampleRate );
+ assert( pTnsConfig->pTnsParameters[iFilter].startLineFrequency < nSampleRate / 2 );
assert( nSampleRate <= 96000 );
move16();
startLineFilter[iFilter] = divide3232( L_mult0( frameLength, pTnsConfig->pTnsParameters[iFilter].startLineFrequency ), L_shl( nSampleRate, 14 ) );
@@ -438,13 +438,6 @@ Word16 ITF_Detect_fx(
Word32 L_tmp, tmp32;
Word16 tmpbuf[325];
Word16 n, i;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
move16();
move16();
move16();
@@ -476,11 +469,7 @@ Word16 ITF_Detect_fx(
/* Check threshold HLM_MIN_NRG */
BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp32 = L_sub( L_shl_sat( L_tmp, sub( shift, sub( 24, Q ) ) ), 4194304l /*HLM_MIN_NRG Q7*/ ); /*Q7*/
-#else
- tmp32 = L_sub( L_shl_o( L_tmp, sub( shift, sub( 24, Q ) ), &Overflow ), 4194304l /*HLM_MIN_NRG Q7*/ ); /*Q7*/
-#endif
BASOP_SATURATE_WARNING_ON_EVS;
/* get pre-shift for autocorrelation */
diff --git a/lib_com/tools_fx.c b/lib_com/tools_fx.c
index 0d60446b361124bfa23f30695332afbbe1dad29d..1be575c2410063c75a5b55b0cc2d6a3976fcc634 100644
--- a/lib_com/tools_fx.c
+++ b/lib_com/tools_fx.c
@@ -667,7 +667,7 @@ Word16 minimum_l(
*---------------------------------------------------------------------*/
/*! r: dot product of x[] and y[] */
-Word32 dotp_fixed(
+Word32 dotp_fx32(
const Word32 x[], /* i : vector x[] Qx */
const Word32 y[], /* i : vector y[] Qy */
const Word16 n /* i : vector length */
@@ -687,7 +687,7 @@ Word32 dotp_fixed(
}
/*To calculate dot product of two 32 bit arrays in case of overflow*/
-Word32 dotp_fixed_o(
+Word32 dotp_fx32_o(
const Word32 x[], /* i : vector x[] */
const Word32 y[], /* i : vector y[] */
const Word16 n, /* i : vector length */
@@ -719,7 +719,7 @@ Word32 dotp_fixed_o(
}
-Word32 dotp_fixed_32(
+Word32 dotp_fx32_fac(
const Word32 x[], /* i : vector x[] */
const Word32 y[], /* i : vector y[] */
const Word16 n, /* i : vector length */
@@ -777,12 +777,12 @@ void v_add_w64(
/*-------------------------------------------------------------------*
- * v_sub_fixed()
+ * v_sub_fx()
*
* Subtraction of two vectors sample by sample
*-------------------------------------------------------------------*/
-void v_sub_fixed(
+void v_sub_fx(
const Word32 x1[], /* i : Input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */
@@ -801,7 +801,7 @@ void v_sub_fixed(
return;
}
-void v_sub_fixed_no_hdrm(
+void v_sub_fx_no_hdrm(
const Word32 x1[], /* i : Input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */
@@ -820,12 +820,12 @@ void v_sub_fixed_no_hdrm(
}
/*-------------------------------------------------------------------*
- * v_multc_fixed()
+ * v_multc()
*
* Multiplication of vector by constant
*-------------------------------------------------------------------*/
-void v_multc_fixed(
+void v_multc_fx(
const Word32 x[], /* i : Input vector */
const Word32 c, /* i : Constant */
Word32 y[], /* o : Output vector that contains c*x */
@@ -843,7 +843,7 @@ void v_multc_fixed(
return;
}
-void v_multc_fixed_16(
+void v_multc_fx_16(
const Word32 x[], /* i : Input vector */
const Word16 c, /* i : Constant */
Word32 y[], /* o : Output vector that contains c*x */
@@ -861,7 +861,7 @@ void v_multc_fixed_16(
return;
}
-void v_multc_fixed_16_16(
+void v_multc_fx_16_16(
const Word16 x[], /* i : Input vector */
const Word16 c, /* i : Constant */
Word16 y[], /* o : Output vector that contains c*x */
@@ -1185,35 +1185,21 @@ Word16 usquant_fx(
Word16 idx;
Word16 tmp, exp;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* idx = (short)( (x - qlow)/delta + 0.5f); */
exp = norm_s( delta );
- tmp = div_s( shl( 1, sub( 14, exp ) ), delta ); /*Q(29-exp-(Qx-1))->Q(30-exp-Qx) */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ tmp = div_s( shl( 1, sub( 14, exp ) ), delta ); /*Q(29-exp-(Qx-1))->Q(30-exp-Qx) */
L_tmp = L_mult( sub_sat( x, qlow ), tmp ); /*Q(31-exp) */
idx = extract_l( L_shr_r( L_add( L_tmp, shl_sat( 1, sub( 30, exp ) ) ), sub( 31, exp ) ) ); /*Q0 */
-#else
- L_tmp = L_mult( sub_o( x, qlow, &Overflow ), tmp ); /*Q(31-exp) */
- idx = extract_l( L_shr_r( L_add( L_tmp, shl_o( 1, sub( 30, exp ), &Overflow ) ), sub( 31, exp ) ) ); /*Q0 */
-#endif
idx = s_min( idx, sub( cbsize, 1 ) );
idx = s_max( idx, 0 );
/* *xq = idx*delta + qlow; */
- L_tmp = L_deposit_l( qlow ); /*Qx */
- L_tmp = L_mac( L_tmp, idx, delta ); /*Qx */
-#ifdef ISSUE_1836_replace_overflow_libcom
+ L_tmp = L_deposit_l( qlow ); /*Qx */
+ L_tmp = L_mac( L_tmp, idx, delta ); /*Qx */
*xq = round_fx_sat( L_shl_sat( L_tmp, 16 ) ); /*Qx */
-#else
- *xq = round_fx_o( L_shl_o( L_tmp, 16, &Overflow ), &Overflow ); /*Qx */
-#endif
+
return idx;
}
@@ -1287,20 +1273,11 @@ Word32 sum2_fx(
{
Word16 i;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
L_tmp = L_deposit_l( 0 );
FOR( i = 0; i < lvec; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_mac_sat( L_tmp, vec[i], vec[i] ); /*Q(2x+1) */
-#else
- L_tmp = L_mac_o( L_tmp, vec[i], vec[i], &Overflow ); /*Q(2x+1) */
-#endif
}
return L_tmp;
@@ -1357,21 +1334,11 @@ Word32 sum2_fx_mod(
{
Word16 i;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
L_tmp = L_deposit_l( 0 );
FOR( i = 0; i < lvec; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
L_tmp = L_add_sat( L_tmp, L_shr( L_mult_sat( vec[i], vec[i] ), 9 ) );
-#else
- L_tmp = L_add_o( L_tmp, L_shr( L_mult_o( vec[i], vec[i], &Overflow ), 9 ), &Overflow );
-#endif
}
return L_tmp;
@@ -1602,12 +1569,7 @@ void Copy_Scale_sig(
{
Word16 i;
Word16 tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
IF( exp0 == 0 )
{
FOR( i = 0; i < lg; i++ )
@@ -1629,11 +1591,7 @@ void Copy_Scale_sig(
}
FOR( i = 0; i < lg; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
y[i] = shl_sat( x[i], exp0 );
-#else
- y[i] = shl_o( x[i], exp0, &Overflow );
-#endif
move16(); /* saturation can occur here */
}
@@ -1656,13 +1614,6 @@ void Copy_Scale_sig_16_32_DEPREC(
{
Word16 i;
Word16 tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
IF( exp0 == 0 )
{
@@ -1678,11 +1629,7 @@ void Copy_Scale_sig_16_32_DEPREC(
/*Should not happen */
FOR( i = 0; i < lg; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
y[i] = L_deposit_l( shl_sat( x[i], exp0 ) );
-#else
- y[i] = L_deposit_l( shl_o( x[i], exp0, &Overflow ) );
-#endif
move32();
}
return;
@@ -1695,11 +1642,7 @@ void Copy_Scale_sig_16_32_DEPREC(
#else
assert( exp0 < 16 );
#endif
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = shl_sat( 1, exp0 );
-#else
- tmp = shl_o( 1, exp0, &Overflow );
-#endif
FOR( i = 0; i < lg; i++ )
{
y[i] = L_mult0( x[i], tmp );
@@ -1709,7 +1652,6 @@ void Copy_Scale_sig_16_32_DEPREC(
return;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
void Copy_Scale_sig_16_32_r(
const Word16 x[], /* i : signal to scale input Qx */
Word32 y[], /* o : scaled signal output Qx */
@@ -1718,12 +1660,14 @@ void Copy_Scale_sig_16_32_r(
)
{
Word16 i;
- for ( i = 0; i < lg; i++ )
+
+ FOR( i = 0; i < lg; i++ )
{
y[i] = L_shl_r( L_deposit_l( x[i] ), exp0 );
}
+
+ return;
}
-#endif
void Copy_Scale_sig_16_32_no_sat(
const Word16 x[], /* i : signal to scale input Qx */
@@ -1734,13 +1678,6 @@ void Copy_Scale_sig_16_32_no_sat(
{
Word16 i;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
IF( exp0 == 0 )
{
@@ -1756,20 +1693,13 @@ void Copy_Scale_sig_16_32_no_sat(
/*Should not happen */
FOR( i = 0; i < lg; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
y[i] = L_deposit_l( shl_sat( x[i], exp0 ) );
-#else
- y[i] = L_deposit_l( shl_o( x[i], exp0, &Overflow ) );
-#endif
move32();
}
return;
}
-#ifdef ISSUE_1836_replace_overflow_libcom
+
L_tmp = L_shl_sat( 1, exp0 - 1 );
-#else
- L_tmp = L_shl_o( 1, exp0 - 1, &Overflow );
-#endif
IF( L_tmp >= 0x7FFF )
{
@@ -1804,23 +1734,13 @@ void Copy_Scale_sig_32_16(
{
Word16 i;
Word16 tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
tmp = add( 16, exp0 );
IF( tmp != 0 )
{
FOR( i = 0; i < lg; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
y[i] = round_fx_sat( L_shl_sat( x[i], tmp ) );
-#else
- y[i] = round_fx_o( L_shl_o( x[i], tmp, &Overflow ), &Overflow );
-#endif
move16();
}
}
@@ -1828,11 +1748,7 @@ void Copy_Scale_sig_32_16(
{
FOR( i = 0; i < lg; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
y[i] = round_fx_sat( x[i] );
-#else
- y[i] = round_fx_o( x[i], &Overflow );
-#endif
move16();
}
}
@@ -1854,12 +1770,7 @@ void Scale_sig32(
)
{
Word16 i;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
IF( 0 == exp0 )
{
return;
@@ -1867,11 +1778,7 @@ void Scale_sig32(
FOR( i = 0; i < lg; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
x[i] = L_shl_sat( x[i], exp0 );
-#else
- x[i] = L_shl_o( x[i], exp0, &Overflow );
-#endif
move32(); /* saturation can occur here */
}
@@ -2176,7 +2083,6 @@ Word16 maximum_exp_fx(
const Word16 *exp_vec, /* i : exponents of input vector */
const Word16 lvec_fx /* i : length of input vector */
)
-#ifdef FIX_1981_MAXIMUM_EXP_FX
{
Word16 j, ind;
ind = 0;
@@ -2185,49 +2091,23 @@ Word16 maximum_exp_fx(
FOR( j = 1; j < lvec_fx; j++ )
{
Word16 scale = sub( exp_vec[j], exp_vec[ind] );
-#ifdef FIX_1981_MAXIMUM_EXP_FX_ZEROMANTISSA
+
test();
if ( vec_fx[j] == 0 || vec_fx[ind] == 0 )
{
scale = 0;
move16();
}
-#endif
- if ( L_mac0_sat( L_shl_sat( L_deposit_l( vec_fx[j] ), scale ), vec_fx[ind], -0x0001 ) > 0 )
- {
- ind = j;
- move16();
- }
- }
- return ind;
-}
-#else
-{
- Word16 j, ind;
- Word16 tmp, exp;
- ind = 0;
- move16();
- tmp = vec_fx[0];
- move16();
- exp = exp_vec[0];
- move16();
- FOR( j = 1; j < lvec_fx; j++ )
- {
- IF( LT_16( tmp, shr_sat( vec_fx[j], sub( exp, exp_vec[j] ) ) ) )
+ if ( L_mac0_sat( L_shl_sat( L_deposit_l( vec_fx[j] ), scale ), vec_fx[ind], -0x0001 ) > 0 )
{
ind = j;
move16();
- tmp = vec_fx[j];
- move16();
- exp = exp_vec[j];
- move16();
}
}
return ind;
}
-#endif
/*---------------------------------------------------------------------*
@@ -2954,13 +2834,6 @@ Word16 w_vquant_fx(
Word16 tmp;
Word16 c, idx, j;
Word32 dist, minDist;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
idx = 0;
move16();
@@ -2976,7 +2849,6 @@ Word16 w_vquant_fx(
{
dist = L_deposit_l( 0 );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = sub_sat( x[3], shr( cb[j++], Qx ) );
if ( weights[3] != 0 )
{
@@ -2997,28 +2869,6 @@ Word16 w_vquant_fx(
{
dist = L_mac0_sat( dist, tmp, tmp );
}
-#else
- tmp = sub_o( x[3], shr( cb[j++], Qx ), &Overflow );
- if ( weights[3] != 0 )
- {
- dist = L_mac0_o( dist, tmp, tmp, &Overflow );
- }
- tmp = sub_o( x[2], shr( cb[j++], Qx ), &Overflow );
- if ( weights[2] != 0 )
- {
- dist = L_mac0_o( dist, tmp, tmp, &Overflow );
- }
- tmp = sub_o( x[1], shr( cb[j++], Qx ), &Overflow );
- if ( weights[1] != 0 )
- {
- dist = L_mac0_o( dist, tmp, tmp, &Overflow );
- }
- tmp = sub_o( x[0], shr( cb[j++], Qx ), &Overflow );
- if ( weights[0] != 0 )
- {
- dist = L_mac0_o( dist, tmp, tmp, &Overflow );
- }
-#endif
if ( LT_32( dist, minDist ) )
{
idx = c;
@@ -3048,7 +2898,6 @@ Word16 w_vquant_fx(
{
dist = L_deposit_l( 0 );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = sub_sat( x[0], shr( cb[j++], Qx ) );
if ( weights[0] != 0 )
{
@@ -3069,28 +2918,6 @@ Word16 w_vquant_fx(
{
dist = L_mac0_sat( dist, tmp, tmp );
}
-#else
- tmp = sub_o( x[0], shr( cb[j++], Qx ), &Overflow );
- if ( weights[0] != 0 )
- {
- dist = L_mac0_o( dist, tmp, tmp, &Overflow );
- }
- tmp = sub_o( x[1], shr( cb[j++], Qx ), &Overflow );
- if ( weights[1] != 0 )
- {
- dist = L_mac0_o( dist, tmp, tmp, &Overflow );
- }
- tmp = sub_o( x[2], shr( cb[j++], Qx ), &Overflow );
- if ( weights[2] != 0 )
- {
- dist = L_mac0_o( dist, tmp, tmp, &Overflow );
- }
- tmp = sub_o( x[3], shr( cb[j++], Qx ), &Overflow );
- if ( weights[3] != 0 )
- {
- dist = L_mac0_o( dist, tmp, tmp, &Overflow );
- }
-#endif
if ( LT_32( dist, minDist ) )
{
idx = c;
@@ -3584,12 +3411,7 @@ Word32 root_a_over_b_fx(
Word16 tmp, num, den, scale;
Word16 exp, exp_num, exp_den;
Word32 L_tmp;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
test();
IF( ( a <= 0 ) || ( b <= 0 ) )
{
@@ -3599,27 +3421,15 @@ Word32 root_a_over_b_fx(
}
exp_num = norm_l( b );
-#ifdef ISSUE_1836_replace_overflow_libcom
num = round_fx_sat( L_shl_sat( b, exp_num ) );
-#else
- num = round_fx_o( L_shl_o( b, exp_num, &Overflow ), &Overflow );
-#endif
exp_num = sub( sub( 30, exp_num ), Q_b );
exp_den = norm_l( a );
-#ifdef ISSUE_1836_replace_overflow_libcom
den = round_fx_sat( L_shl_sat( a, exp_den ) );
-#else
- den = round_fx_o( L_shl_o( a, exp_den, &Overflow ), &Overflow );
-#endif
exp_den = sub( sub( 30, exp_den ), Q_a );
scale = shr( sub( den, num ), 15 );
-#ifdef ISSUE_1836_replace_overflow_libcom
num = shl_sat( num, scale );
-#else
- num = shl_o( num, scale, &Overflow );
-#endif
exp_num = sub( exp_num, scale );
tmp = div_s( num, den );
@@ -3778,12 +3588,7 @@ void fir_fx(
Word16 buf_in[L_FRAME32k + L_FILT_MAX];
Word16 i, j;
Word32 s;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
/* prepare the input buffer (copy and update memory) */
Copy( mem, buf_in, K );
Copy( x, buf_in + K, L );
@@ -3795,27 +3600,15 @@ void fir_fx(
/* do the filtering */
FOR( i = 0; i < L; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
s = L_mult_sat( buf_in[K + i], h[0] );
-#else
- s = L_mult_o( buf_in[K + i], h[0], &Overflow );
-#endif
FOR( j = 1; j <= K; j++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
s = L_mac_sat( s, h[j], buf_in[K + i - j] );
-#else
- s = L_mac_o( s, h[j], buf_in[K + i - j], &Overflow );
-#endif
}
-#ifdef ISSUE_1836_replace_overflow_libcom
+
s = L_shl_sat( s, shift );
y[i] = round_fx_sat( s ); /*Qx */
-#else
- s = L_shl_o( s, shift, &Overflow );
- y[i] = round_fx_o( s, &Overflow ); /*Qx */
-#endif
move16();
}
@@ -3956,11 +3749,6 @@ Word16 squant_fx(
Word16 tmp;
Word16 c, idx;
Word32 L_mindist, L_dist;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
idx = 0;
move16();
@@ -3970,18 +3758,10 @@ Word16 squant_fx(
FOR( c = 0; c < cbsize; c++ )
{
L_dist = L_deposit_l( 0 );
-#ifdef ISSUE_1836_replace_overflow_libcom
tmp = sub_sat( x, cb[c] );
-#else
- tmp = sub_o( x, cb[c], &Overflow );
-#endif
/*dist += tmp*tmp; */
-#ifdef ISSUE_1836_replace_overflow_libcom
L_dist = L_mac_sat( L_dist, tmp, tmp );
-#else
- L_dist = L_mac_o( L_dist, tmp, tmp, &Overflow );
-#endif
if ( LT_32( L_dist, L_mindist ) )
{
@@ -4123,12 +3903,7 @@ void Copy_Scale_sig32(
Word16 i;
Word32 L_tmp;
Word16 tmp = exp0;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
IF( exp0 == 0 )
{
FOR( i = 0; i < lg; i++ )
@@ -4142,20 +3917,14 @@ void Copy_Scale_sig32(
{
FOR( i = 0; i < lg; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
y[i] = L_shl_sat( x[i], tmp );
-#else
- y[i] = L_shl_o( x[i], tmp, &Overflow );
-#endif
move16();
}
return;
}
-#ifdef ISSUE_1836_replace_overflow_libcom
+
L_tmp = L_shl_sat( 1, exp0 - 1 );
-#else
- L_tmp = L_shl_o( 1, exp0 - 1, &Overflow );
-#endif
+
FOR( i = 0; i < lg; i++ )
{
y[i] = W_extract_l( W_mult_32_32( L_tmp, x[i] ) );
@@ -4345,23 +4114,14 @@ void add_vec_fx(
)
{
Word16 i, Qyx1, Qyx2;
-#ifndef ISSUE_1836_replace_overflow_libcom
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
Qyx1 = sub( Qx1, Qy );
Qyx2 = sub( Qx2, Qy );
IF( Qyx1 == 0 )
{
FOR( i = 0; i < N; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
y[i] = add_sat( x1[i], shr_r_sat( x2[i], Qyx2 ) );
-#else
- y[i] = add_o( x1[i], shr_r_sat( x2[i], Qyx2 ), &Overflow );
-#endif
move16();
}
}
@@ -4369,11 +4129,7 @@ void add_vec_fx(
{
FOR( i = 0; i < N; i++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
y[i] = add_sat( shr_r_sat( x1[i], Qyx1 ), shr_r_sat( x2[i], Qyx2 ) ); //!!sat //!!sat
-#else
- y[i] = add_o( shr_r_sat( x1[i], Qyx1 ), shr_r_sat( x2[i], Qyx2 ), &Overflow );
-#endif
move16();
}
}
@@ -4512,11 +4268,7 @@ Word32 Calc_Energy_Autoscaled(
FOR( i = 0; i < j; i++ )
{
/* divide by 2 so energy will be divided by 4 */
-#ifdef ISSUE_1836_replace_overflow_libcom
temp = mult_r( *signal++, 16384 );
-#else
- temp = mult_ro( *signal++, 16384, &Overflow );
-#endif
L_Energy = L_mac0_o( L_Energy, temp, temp, &Overflow );
}
FOR( i = j; i < len; i += 8 ) /* Process 8 Samples at a time */
@@ -4526,11 +4278,7 @@ Word32 Calc_Energy_Autoscaled(
L_temp = L_mult0( temp, temp );
FOR( j = 1; j < 8; j++ )
{
-#ifdef ISSUE_1836_replace_overflow_libcom
temp = mult_r( *signal++, 16384 );
-#else
- temp = mult_ro( *signal++, 16384, &Overflow );
-#endif
L_temp = L_mac0_o( L_temp, temp, temp, &Overflow );
}
/*Overfloe will never happen because temp2 is always positive*/
@@ -5402,23 +5150,6 @@ void delay_signal_q_adj_fx(
return;
}
-void v_add_fx(
- const Word32 x1[], /* i : Input vector 1 */
- const Word32 x2[], /* i : Input vector 2 */
- Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */
- const Word16 N /* i : Vector length */
-)
-{
- Word16 i;
-
- FOR( i = 0; i < N; i++ )
- {
- y[i] = L_add_sat( x1[i], x2[i] );
- move32();
- }
-
- return;
-}
Word16 floor_log_2( Word32 num )
{
@@ -5569,7 +5300,7 @@ Word32 sign_l(
}
}
-void v_mult16_fixed(
+void v_mult16_fx(
const Word16 x1[], /* i : Input vector 1 */
const Word16 x2[], /* i : Input vector 2 */
Word16 y[], /* o : Output vector that contains vector 1 .* vector 2 */
@@ -5736,7 +5467,7 @@ Word32 dotp_me_fx(
return suma;
}
-Word32 dotp_fixed_guarded(
+Word32 dotp_fx_guarded(
const Word32 x[], /* i : vector x[] */
const Word32 y[], /* i : vector y[] */
const Word16 n /* i : vector length */
@@ -5756,7 +5487,7 @@ Word32 dotp_fixed_guarded(
}
-Word32 dotp_fixed_ivas_fx(
+Word32 dotp_fx_ivas_fx(
const Word32 x[], /* i : vector x[] */
Word16 x_e,
const Word32 y[], /* i : vector y[] */
@@ -5777,6 +5508,7 @@ Word32 dotp_fixed_ivas_fx(
*out_e = exp;
move16();
+
return suma;
}
@@ -5787,8 +5519,7 @@ Word32 dotp_fixed_ivas_fx(
* Multiplication of two vectors
*-------------------------------------------------------------------*/
-
-void v_mult_fixed(
+void v_mult_fx(
const Word32 x1[], /* i : Input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
Word32 y[], /* o : Output vector that contains vector 1 .* vector 2 */
@@ -5808,12 +5539,14 @@ void v_mult_fixed(
/*-------------------------------------------------------------------*
- * anint_fixed()
+ * anint_fx()
*
* Round to the nearest integer.
*-------------------------------------------------------------------*/
-Word32 anint_fixed( Word32 x, Word16 exp )
+Word32 anint_fx(
+ const Word32 x,
+ const Word16 exp )
{
IF( x == 0 )
{
@@ -5831,14 +5564,14 @@ Word32 anint_fixed( Word32 x, Word16 exp )
/*-------------------------------------------------------------------*
- * ceil_fixed()
+ * ceil_fx()
*
* Ceil to the next multiple of (1 << exp).
*-------------------------------------------------------------------*/
-Word32 ceil_fixed(
- Word32 x,
- Word16 exp )
+Word32 ceil_fx(
+ const Word32 x,
+ const Word16 exp )
{
Word32 step;
@@ -5878,12 +5611,31 @@ void sort_l(
/*-------------------------------------------------------------------*
- * v_add_fixed()
+ * v_add()
*
* Subtraction of two vectors sample by sample
*-------------------------------------------------------------------*/
-void v_add_fixed(
+void v_add_fx(
+ const Word32 x1[], /* i : Input vector 1 */
+ const Word32 x2[], /* i : Input vector 2 */
+ Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */
+ const Word16 N /* i : Vector length */
+)
+{
+ Word16 i;
+
+ FOR( i = 0; i < N; i++ )
+ {
+ y[i] = L_add_sat( x1[i], x2[i] );
+ move32();
+ }
+
+ return;
+}
+
+
+void v_add_fx_hdrm(
const Word32 x1[], /* i : Input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
Word32 y[], /* o : Output vector that contains vector 1 - vector 2 */
@@ -5902,7 +5654,7 @@ void v_add_fixed(
return;
}
-void v_add_fixed_no_hdrm(
+void v_add_fx_no_hdrm(
const Word32 x1[], /* i : Input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
Word32 y[], /* o : Output vector that contains vector 1 + vector 2 */
@@ -5920,7 +5672,7 @@ void v_add_fixed_no_hdrm(
return;
}
-void v_add_fixed_me(
+void v_add_fx_me(
const Word32 x1[], /* i : Input vector 1 */
const Word16 x1_e, /* i : Exponent for input vector 1 */
const Word32 x2[], /* i : Input vector 2 */
@@ -5948,7 +5700,7 @@ void v_add_fixed_me(
}
Word16 find_guarded_bits_fx(
- Word32 n )
+ const Word32 n )
{
// return n <= 1 ? 0 : n <= 2 ? 1
// : n <= 4 ? 2
diff --git a/lib_dec/FEC_HQ_phase_ecu_fx.c b/lib_dec/FEC_HQ_phase_ecu_fx.c
index 17fece8ec22471c714edab1f22ae3121116290b0..de3f39799a81714002e4b9833fc2f4c3c0f182be 100644
--- a/lib_dec/FEC_HQ_phase_ecu_fx.c
+++ b/lib_dec/FEC_HQ_phase_ecu_fx.c
@@ -63,11 +63,7 @@ static Word16 sqrt2ndOrder( const Word16 );
static void windowing( const Word16 *, Word16 *, const Word16 *, const Word16, const Word16 );
static void windowing_ROM_optimized( const Word16 *, Word16 *, const Word16, const Word16, const Word16 );
static void fft_spec2_fx( const Word16[], Word32[], const Word16 );
-#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING
static void trans_ana_fx( const Word16 *, Word16 *, Word16 *, Word16 *, const Word16, const Word16, const Word16, const Word16, const Word16, Word16 *, Word16 *, Word16 *, Word16 * );
-#else
-static void trans_ana_fx( const Word16 *, Word16 *, Word16 *, Word16 *, const Word16, const Word16, const Word16, const Word16, Word16 *, Word16 *, Word16 *, Word16 * );
-#endif
static void peakfinder_fx( const Word16 *, const Word16, Word16 *, Word16 *, const Word16 );
static Word16 imax_fx( const Word16 *, const Word16 );
static void spec_ana_fx( const Word16 *prevsynth, Word16 *plocs, Word32 *plocsi, Word16 *num_plocs, Word16 *X_sav, const Word16 output_frame, const Word16 bwidth_fx, Word16 *Q );
@@ -234,13 +230,11 @@ static void trans_ana_fx(
const Word16 time_offs, /* i : Time offset (integral multiple of output_frame) */
const Word16 est_mus_content, /* i : 0.0=speech_like ... 1.0=Music (==st->env_stab ) */
const Word16 last_fec, /* i : signal that previous frame was concealed with fec_alg */
-#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING
- const Word16 element_mode, /* i : element_mode req to handle EVS_MONO specific BE path */
-#endif
- Word16 *alpha, /* o : Magnitude modification factors for fade to average */
- Word16 *beta, /* o : Magnitude modification factors for fade to average */
- Word16 *beta_mute, /* o : Factor for long-term mute Q15 */
- Word16 *Xavg /* o : Frequency group average gain to fade to */
+ const Word16 element_mode, /* i : element_mode req to handle EVS_MONO specific BE path */
+ Word16 *alpha, /* o : Magnitude modification factors for fade to average */
+ Word16 *beta, /* o : Magnitude modification factors for fade to average */
+ Word16 *beta_mute, /* o : Factor for long-term mute Q15 */
+ Word16 *Xavg /* o : Frequency group average gain to fade to */
)
{
const Word16 *w_hamm, *pFftTbl;
@@ -562,7 +556,6 @@ static void trans_ana_fx(
mag_chg[k] = mult_r( mag_chg_1st[k], att_val ); /* Q15 */
move16();
-#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING
IF( NE_16( element_mode, EVS_MONO ) )
{
IF( EQ_16( k, 0 ) && GT_16( burst_len, BETA_MUTE_THR ) ) /* beta_mute final long term attenuation adjusted only once per frame in the first sub-band, Ref Eq(184) in 26.447 */
@@ -579,13 +572,7 @@ static void trans_ana_fx(
move16();
}
}
-#else
- IF( GT_16( burst_len, BETA_MUTE_THR ) )
- {
- *beta_mute = shr( *beta_mute, 1 );
- move16();
- }
-#endif
+
alpha[k] = mag_chg[k];
move16();
/*beta[k] = sqrt(1.0f - SQR(alpha[k])) * *beta_mute;*/
@@ -2728,7 +2715,7 @@ static void ivas_rec_wtda_fx(
tmp = div_s( 1, shl( ola_len, 1 ) ); // Q15
tmp = round_fx( L_shl( L_mult( tmp, EVS_PI_FX ), 2 ) ); // Q15
sinq_fx( tmp, 0, ola_len, xfwin );
- v_mult16_fixed( xfwin, xfwin, xfwin, ola_len ); /* xfwin = sin^2 of 0..pi/4 */
+ v_mult16_fx( xfwin, xfwin, xfwin, ola_len ); /* xfwin = sin^2 of 0..pi/4 */
pOldW = xfwin + sub( ola_len, 1 );
pNewW = xfwin;
FOR( i = 0; i < ola_len; i++ )
@@ -4545,13 +4532,9 @@ static void ivas_hq_phase_ecu_fx(
#endif
offset = add( sub( sub( shl( output_frame, 1 ), lprot ), *time_offs ), ph_ecu_lookahead );
-#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING
+
trans_ana_fx( prevsynth + offset, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab,
*last_fec, element_mode, alpha, beta, beta_mute, Xavg );
-#else
- trans_ana_fx( prevsynth + offset, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab,
- *last_fec, alpha, beta, beta_mute, Xavg );
-#endif
ivas_spec_ana_fx( prevsynth + offset, plocs, plocsi, num_p, X_sav, output_frame, bwidth_fx, Q_spec, element_mode, &noise_fac, pcorr );
@@ -4571,13 +4554,9 @@ static void ivas_hq_phase_ecu_fx(
*time_offs = add_sat( *time_offs, output_frame );
move16();
offset = sub( shl( output_frame, 1 ), lprot );
-#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING
+
trans_ana_fx( prevsynth + offset, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab,
0, element_mode, alpha, beta, beta_mute, Xavg );
-#else
- trans_ana_fx( prevsynth + offset, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab,
- 0, alpha, beta, beta_mute, Xavg );
-#endif
}
Copy( X_sav, X, lprot );
@@ -4666,13 +4645,9 @@ static void hq_phase_ecu_fx(
}
offset = sub( sub( shl( output_frame, 1 ), lprot ), *time_offs );
-#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING
+
trans_ana_fx( prevsynth + offset, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab,
*last_fec, EVS_MONO, alpha, beta, beta_mute, Xavg );
-#else
- trans_ana_fx( prevsynth + offset, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab,
- *last_fec, alpha, beta, beta_mute, Xavg );
-#endif
spec_ana_fx( prevsynth + offset, plocs, plocsi, num_p, X_sav, output_frame, bwidth_fx, Q_spec );
@@ -4697,13 +4672,9 @@ static void hq_phase_ecu_fx(
move16();
offset = sub( shl( output_frame, 1 ), lprot );
-#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING
+
trans_ana_fx( prevsynth + offset, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab,
0, EVS_MONO, alpha, beta, beta_mute, Xavg );
-#else
- trans_ana_fx( prevsynth + offset, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab,
- 0, alpha, beta, beta_mute, Xavg );
-#endif
}
Copy( X_sav, X, lprot );
diff --git a/lib_dec/FEC_adapt_codebook_fx.c b/lib_dec/FEC_adapt_codebook_fx.c
index fae55ab5b0aff3d63693e2829d9556c779d66b54..24ddc6463b456cab77b31fec330af17b6b00b081 100644
--- a/lib_dec/FEC_adapt_codebook_fx.c
+++ b/lib_dec/FEC_adapt_codebook_fx.c
@@ -15,14 +15,12 @@
* Create an artificial onset when it is lost
*---------------------------------------------------------------------*/
Word16 FEC_SinOnset_fx(
- Word16 *exc,
- /* i/o : exc vector to modify */ // Qin = Qold, Qout = Q_exc
- Word16 puls_pos, /* i : last pulse position desired */
- const Word16 T0, /* i : Pitch information of the 1 subfr */
- Word32 enr_q, /* i : energy provide by the encoder */
- Word16 *Aq, /* i : A(z) filter Q12 */
- const Word16 L_frame /* i : frame length */
- ,
+ Word16 *exc, /* i/o : exc vector to modify Qin = Qold, Qout = Q_exc */
+ Word16 puls_pos, /* i : last pulse position desired */
+ const Word16 T0, /* i : Pitch information of the 1 subfr */
+ Word32 enr_q, /* i : energy provide by the encoder */
+ Word16 *Aq, /* i : A(z) filter Q12 */
+ const Word16 L_frame, /* i : frame length */
const Word16 Qold )
{
Word16 P0, onset_len, sign, i, len, L_subfr, L_subfr2;
diff --git a/lib_dec/FEC_pitch_estim_fx.c b/lib_dec/FEC_pitch_estim_fx.c
index b7ad94f8931293ef25288170d9be242c4e0fabc8..4ea25cd857b2ed36ddbceda1a6f27dc1cbaafa9d 100644
--- a/lib_dec/FEC_pitch_estim_fx.c
+++ b/lib_dec/FEC_pitch_estim_fx.c
@@ -44,10 +44,9 @@ void FEC_pitch_estim_fx(
const Word32 old_pitch_buf[], /* i : buffer of old subframe pitch values 15Q16 */
Word16 *bfi_pitch, /* i/o: update of the estimated pitch for FEC Q6*/
Word16 *bfi_pitch_frame, /* o : frame length when pitch was updated */
- Word16 *upd_cnt /* i/o: update counter */
- ,
- const Word16 coder_type, /* i : coder_type */
- Word16 element_mode /* i : element mode */
+ Word16 *upd_cnt, /* i/o: update counter */
+ const Word16 coder_type, /* i : coder_type */
+ Word16 element_mode /* i : element mode */
)
{
Word16 tmp, tmp1, tmp2, tmp3;
diff --git a/lib_dec/LD_music_post_filter_fx.c b/lib_dec/LD_music_post_filter_fx.c
index f07feac96a5a375ea4cec286dbce448833984e93..d1ec20b0b88a35f8e3217eb632e085cbaabf384f 100644
--- a/lib_dec/LD_music_post_filter_fx.c
+++ b/lib_dec/LD_music_post_filter_fx.c
@@ -941,11 +941,10 @@ void Post_music_postP_fx(
Word16 *mem_deemph, /* i/o: speech deemph filter memory Q_syn*/
Word16 *st_pst_old_syn_fx, /* i/o: psfiler Q_syn*/
Word16 *st_pst_mem_deemp_err_fx, /* i/o: psfiler Q_syn*/
- Word16 *mem_agc, /*Q_syn*/
+ Word16 *mem_agc, /* Q_syn */
PFSTAT *pf_stat, /* i/o: All memories related to NB post filter */
- const Word16 *tmp_buffer /* tmp_buffer in Q-1 */
- ,
- Word16 *mem_tmp2 /* Temporary memory used with scale_syn Q_syn*/
+ const Word16 *tmp_buffer, /* tmp_buffer in Q-1 */
+ Word16 *mem_tmp2 /* Temporary memory used with scale_syn Q_syn*/
)
{
Word16 exc16[DCT_L_POST];
diff --git a/lib_dec/acelp_core_dec_fx.c b/lib_dec/acelp_core_dec_fx.c
index cf32fdf5685c85d1ad738182bcf7bb4e3fc3dcf1..00d6ce926a97d88692e32fce0752f5ab116279f7 100644
--- a/lib_dec/acelp_core_dec_fx.c
+++ b/lib_dec/acelp_core_dec_fx.c
@@ -1637,16 +1637,11 @@ ivas_error acelp_core_dec_fx(
IF( NE_16( st->element_mode, last_element_mode ) )
{
set16_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0, st->hFdCngDec->hFdCngCom->fftlen );
-#ifdef FIX_1996_MASKING_NOISE
set32_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, 0, st->hFdCngDec->hFdCngCom->fftlen );
-#endif
}
Word32 psyn_32_fx[L_FRAME16k];
Copy_Scale_sig_16_32_no_sat( psyn_fx, psyn_32_fx, st->hFdCngDec->hFdCngCom->frameSize, sub( Q6, st->Q_syn ) ); // Q6
-#ifndef FIX_1996_MASKING_NOISE
- Copy_Scale_sig_16_32_no_sat( st->hFdCngDec->hFdCngCom->olapBufferSynth2, st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, shl( st->hFdCngDec->hFdCngCom->frameSize, 1 ), Q15 ); // Q15
-#endif
generate_masking_noise_ivas_fx( psyn_32_fx, &exp, st->hFdCngDec->hFdCngCom, st->hFdCngDec->hFdCngCom->frameSize, 0, 0, 0, st->element_mode, hStereoCng, nchan_out );
Copy_Scale_sig_32_16( psyn_32_fx, psyn_fx, st->hFdCngDec->hFdCngCom->frameSize, sub( st->Q_syn, exp ) ); // Q = st->Q_syn
@@ -1738,9 +1733,7 @@ ivas_error acelp_core_dec_fx(
IF( st->idchan == 0 )
{
set16_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2, 0, st->hFdCngDec->hFdCngCom->fftlen );
-#ifdef FIX_1996_MASKING_NOISE
set32_fx( st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, 0, st->hFdCngDec->hFdCngCom->fftlen );
-#endif
}
IF( hStereoCng != NULL && ( st->idchan == 0 ) )
{
diff --git a/lib_dec/arith_coder_dec_fx.c b/lib_dec/arith_coder_dec_fx.c
index 77ae166b450b57fd108d9f0a948e902fb0772a3f..2919210dc2aab107d81789eb08cf8149730fb927 100644
--- a/lib_dec/arith_coder_dec_fx.c
+++ b/lib_dec/arith_coder_dec_fx.c
@@ -28,27 +28,16 @@ static Word16 tcx_arith_decode_fx(
Word16 exp_k;
Word16 tmp;
#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Word32 L_tmp, Q;
- Flag Overflow = 0;
- move32();
- Flag Carry = 0;
-#else
Word32 Q;
Word64 W_tmp;
-#endif
move32();
#endif
-
bp = ari_start_decoding_14bits_prm_fx( prm, 0, &as );
tmp = sub( envelope_e, 1 + 15 );
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_tmp = L_deposit_l( 0 );
-#else
W_tmp = 0;
-#endif
+
FOR( k = 0; k < L_frame; k++ )
{
IF( envelope[k] == 0 ) /* safety check in case of bit errors */
@@ -72,11 +61,7 @@ static Word16 tcx_arith_decode_fx(
{
bp = ari_decode_14bits_sign_fx( prm, bp, target_bits, &s, &as );
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_tmp = L_macNs_co( L_tmp, q, k, &Carry, &Overflow );
-#else
W_tmp = W_mac_16_16( W_tmp, q, k );
-#endif
Q = L_mult( q, negate( shl( 1, sub( 30, SPEC_EXP_DEC ) ) ) );
IF( EQ_16( s, 0 ) )
@@ -101,11 +86,7 @@ static Word16 tcx_arith_decode_fx(
set32_fx( q_spectrum + k, 0, sub( L_frame, k ) );
/* noise filling seed */
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- *nf_seed = extract_l( L_tmp );
-#else
*nf_seed = extract_l( W_extract_l( W_tmp ) );
-#endif
move16();
return bp;
@@ -125,9 +106,8 @@ void tcx_arith_decode_envelope_fx(
Word16 tcxltp_pitch, /* i: TCX LTP pitch in FD, -1 if n/a Q0*/
Word16 *arith_bits, /* o: bits used for ari. coding Q0 */
Word16 *signaling_bits, /* o: bits used for signaling Q0 */
- Word16 *nf_seed /* o: noise filling seed Q0 */
- ,
- Word16 low_complexity /* i: low-complexity flag Q0 */
+ Word16 *nf_seed, /* o: noise filling seed Q0 */
+ Word16 low_complexity /* i: low-complexity flag Q0 */
)
{
Word32 env[N_MAX_ARI]; /* unscaled envelope */
@@ -165,7 +145,6 @@ void tcx_arith_decode_envelope_fx(
return;
}
-
*signaling_bits = 0;
move16();
assert( st->hTcxDec->enableTcxLpc );
diff --git a/lib_dec/bass_psfilter_fx.c b/lib_dec/bass_psfilter_fx.c
index 599c3aa987e9d0bea88edef76cab6c89f2166a17..bb2158057b63e82df5cfe08b5efba649baf0a148 100644
--- a/lib_dec/bass_psfilter_fx.c
+++ b/lib_dec/bass_psfilter_fx.c
@@ -555,11 +555,7 @@ void bass_psfilter_fx(
FOR( i = 0; i < subfr_len; i++ )
{
/* err[i] = syn_fx[i] - gain*syn2_fx[i] */
-#ifdef FIX2007_BASSPSFILTER_OVERFLOW
err[i] = msu_r( L_shr_sat( L_mult0( gain, syn2_fx[i] ), exp2 ), syn_fx[i], 16384 ); /* Q15 */
-#else
- err[i] = msu_r( L_shr( L_mult0( gain, syn2_fx[i] ), exp2 ), syn_fx[i], 16384 ); /* Q15 */
-#endif
move16();
/* the sign is inverted but it is not important because
we calculate energy with 'err[i]' x 'err[i]'
diff --git a/lib_dec/core_switching_dec_fx.c b/lib_dec/core_switching_dec_fx.c
index be95ebaf006cbfe800c81c7fa7be8a18403beb8f..162e45812e34fc8f984f705eaf8b8a3a876d65b2 100644
--- a/lib_dec/core_switching_dec_fx.c
+++ b/lib_dec/core_switching_dec_fx.c
@@ -1630,26 +1630,18 @@ ivas_error core_switching_post_dec_ivas_fx(
test();
IF( EQ_16( st_fx->last_core, HQ_CORE ) || st_fx->last_core == TCX_20_CORE || st_fx->last_core == TCX_10_CORE ) /* MDCT to ACELP transition */
{
-#ifdef FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES
Word16 Q_old_postdec = 0;
move16();
-#endif
Qtmp = s_min( *Qsynth, 0 );
IF( hHQ_core != NULL )
{
Qtmp = s_min( s_min( *Qsynth, hHQ_core->Q_old_postdec ), hHQ_core->Q_old_wtda );
-#ifdef FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES
Q_old_postdec = hHQ_core->Q_old_postdec;
move16();
-#endif
}
- Scale_sig( synth, output_frame, sub( Qtmp, *Qsynth ) ); /* Qtmp */
-#ifndef FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES
- Scale_sig( st_fx->delay_buf_out_fx, delay_comp, Qtmp ); /*delay buff_out_fx is Q0*/
-#else
+ Scale_sig( synth, output_frame, sub( Qtmp, *Qsynth ) ); /* Qtmp */
Scale_sig( st_fx->delay_buf_out_fx, delay_comp, sub( Qtmp, Q_old_postdec ) ); /* delay buff_out_fx is Qtmp */
-#endif
IF( hHQ_core != NULL )
{
Scale_sig( hHQ_core->old_out_fx, L_FRAME48k, sub( Qtmp, hHQ_core->Q_old_wtda ) ); /* Qtmp */
@@ -1707,9 +1699,7 @@ ivas_error core_switching_post_dec_ivas_fx(
move16();
ptmp1++;
ptmp2++;
-#ifdef FIX_ISSUE_2013_MDCT_STEREO_FER_DISCONTINUITIES
tmpF = add( tmpF, tmp ); /* Q15 */
-#endif
}
}
ELSE
diff --git a/lib_dec/dec_ace_fx.c b/lib_dec/dec_ace_fx.c
index b6554e02c7343616afa751b98551660230abc8bf..8453a16cf1e309bfee4336387e866b86300949a9 100644
--- a/lib_dec/dec_ace_fx.c
+++ b/lib_dec/dec_ace_fx.c
@@ -526,19 +526,15 @@ void decoder_acelp_fx(
/*-----------------------------------------------------------------*
* Prepare TBE excitation
*-----------------------------------------------------------------*/
+
gain_code = gain_code_tmp;
move32();
gain_pit = gain_pit_tmp;
move16();
IF( st->igf != 0 )
{
-#ifdef FIX_2010_PREP_TBE_EXC
prep_tbe_exc_fx( st->L_frame, L_SUBFR, i_subfr, gain_pit, gain_code, code, st->voice_fac, &voice_factors[idx], bwe_exc,
gain_preQ, code_preQ, Q10, st->Q_exc, T0, T0_frac, st->coder_type, st->core_brate, st->element_mode, st->idchan, st->hBWE_TD != NULL, 0 );
-#else
- prep_tbe_exc_fx( st->L_frame, L_SUBFR, i_subfr, gain_pit, gain_code, code, st->voice_fac, &voice_factors[idx], bwe_exc,
- gain_preQ, code_preQ, st->Q_exc, T0, T0_frac, st->coder_type, st->core_brate, st->element_mode, st->idchan, st->hBWE_TD != NULL, 0 );
-#endif
}
/*---------------------------------------------------------*
diff --git a/lib_dec/dec_gen_voic_fx.c b/lib_dec/dec_gen_voic_fx.c
index 39412a22e85a936a91905ce3689b58f7f82658ea..53da3c36ad2a3f5d5a22780dfdd8b70f32881537 100644
--- a/lib_dec/dec_gen_voic_fx.c
+++ b/lib_dec/dec_gen_voic_fx.c
@@ -100,9 +100,7 @@ ivas_error decod_gen_voic_fx(
Word16 pf_temp[MAXLAG_WI];
Word16 pf_n2[MAXLAG_WI];
MUSIC_POSTFILT_HANDLE hMusicPF;
-#ifdef FIX_2010_PREP_TBE_EXC
Word16 Q_code_preQ;
-#endif
gain_pit_fx = 0;
gain_code_fx = 0;
@@ -326,15 +324,6 @@ ivas_error decod_gen_voic_fx(
idx = idiv1616( i_subfr_fx, L_SUBFR );
}
-#ifdef FIX_2010_PREP_TBE_EXC
- /*
- 2025-09-15 multrus:
- TODO:
- check with vaillancourt
- - where this difference between EVS and IVAS comes from
- - where Q_code_preQ could be derived
- - whether any of the above calculations need to be adjusted
- */
Q_code_preQ = Q6;
move16();
if ( EQ_16( st_fx->element_mode, EVS_MONO ) )
@@ -347,13 +336,6 @@ ivas_error decod_gen_voic_fx(
&voice_factors_fx[idx], bwe_exc_fx, gain_preQ_fx, code_preQ_fx, Q_code_preQ,
st_fx->Q_exc, T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,
st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#else
- prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
- &voice_factors_fx[idx], bwe_exc_fx, gain_preQ_fx, code_preQ_fx,
- st_fx->Q_exc, T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,
- st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#endif
-
/*----------------------------------------------------------------*
* Excitation enhancements (update of total excitation signal)
diff --git a/lib_dec/dec_tcx_fx.c b/lib_dec/dec_tcx_fx.c
index 68f7f02f39a92bc42b8f642461d8a87661dcf817..ee8273a7b1b169da8679322e3ec9942974edaadd 100644
--- a/lib_dec/dec_tcx_fx.c
+++ b/lib_dec/dec_tcx_fx.c
@@ -622,14 +622,11 @@ void decoder_tcx_fx(
test();
IF( ( bfi == 0 ) && ( hTcxCfg->resq != 0 ) )
{
-
IF( hTcxDec->tcx_lpc_shaped_ari != 0 ) /* new arithmetic coder */
{
-
Word16 *prm_resq;
- prm_resq = prm_sqQ + sub( *prm_target /* = targetBits */
- ,
+ prm_resq = prm_sqQ + sub( *prm_target, /* = targetBits */
hTcxDec->resQBits[frame_cnt] );
i = tcx_ari_res_invQ_spec( x, x_e, L_spec,
@@ -663,7 +660,6 @@ void decoder_tcx_fx(
}
/* for FAC */
-
test();
IF( bfi == 0 && st->tcxonly == 0 )
{
@@ -733,7 +729,6 @@ void decoder_tcx_fx(
}
}
-
IF( hTcxDec->tcx_lpc_shaped_ari == 0 ) /* old arithmetic coder */
{
/* noise filling seed */
@@ -3323,7 +3318,7 @@ void IMDCT_ivas_fx(
move32();
}
q_tmp_fx_32 = sub( q_xn_buf_fx_32, res_e );
- // v_multc_fixed( xn_buf_fx_32 + overlap / 2 + nz, (float) sqrt( (float) L_frame / NORM_MDCT_FACTOR ), tmp_fx_32, L_frame );
+ // v_multc_fx( xn_buf_fx_32 + overlap / 2 + nz, (float) sqrt( (float) L_frame / NORM_MDCT_FACTOR ), tmp_fx_32, L_frame );
if ( allow_qwin_change )
{
@@ -4093,7 +4088,7 @@ void decoder_tcx_ivas_fx(
*-------------------------------------------------------------------*/
void decoder_tcx_invQ_fx(
Decoder_State *st, /* i/o: coder memory state */
- int16_t prm[], /* i : parameters */
+ Word16 prm[], /* i : parameters */
Word16 A[], /* i : coefficients NxAz[M+1] */
Word16 Aind[], /* i : frame-independent coefficients Az[M+1] */
const Word16 L_spec,
@@ -4728,7 +4723,7 @@ void decoder_tcx_noisefilling_fx(
*-----------------------------------------------------------------*/
/* Init lengths */
- infoIGFStartLine = get_igf_startline( st, L_frame, L_frameTCX );
+ infoIGFStartLine = get_igf_startline_fx( st, L_frame, L_frameTCX );
noiseFillingSize = L_spec;
move16();
diff --git a/lib_dec/dec_tran_fx.c b/lib_dec/dec_tran_fx.c
index b30b1a8c066576225a9db240ba71d830c1e00e21..4bee037ef79bbf8673525ed0be6110a3f61922d4 100644
--- a/lib_dec/dec_tran_fx.c
+++ b/lib_dec/dec_tran_fx.c
@@ -71,15 +71,12 @@ void decod_tran_fx(
Word16 gain_code16;
Word32 L_tmp;
Word16 tmp16, tmp1_fx, tmp_fx;
-#ifdef FIX_2010_PREP_TBE_EXC
Word16 Q_code_preQ;
-#endif
GSC_DEC_HANDLE hGSCDec;
hGSCDec = st_fx->hGSCDec;
MUSIC_POSTFILT_HANDLE hMusicPF;
hMusicPF = st_fx->hMusicPF;
-
gain_code_fx = 0; /* Quantized algebraic codeebook gain */
move32();
norm_gain_code_fx = 0; /* normalized algebraic codeebook gain Q16 */
@@ -257,15 +254,6 @@ void decod_tran_fx(
tmp_idx_2 = idiv1616( i_subfr, L_SUBFR );
}
-#ifdef FIX_2010_PREP_TBE_EXC
- /*
- 2025-09-15 multrus:
- TODO:
- check with vaillancourt
- - where this difference between EVS and IVAS comes from
- - where Q_code_preQ could be derived
- - whether any of the above calculations need to be adjusted
- */
Q_code_preQ = Q6;
move16();
if ( EQ_16( st_fx->element_mode, EVS_MONO ) )
@@ -278,12 +266,6 @@ void decod_tran_fx(
&voice_factors_fx[tmp_idx_2], bwe_exc_fx, gain_preQ_fx, code_preQ_fx, Q_code_preQ,
st_fx->Q_exc, T0, T0_frac, st_fx->coder_type, st_fx->core_brate,
st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#else
- prep_tbe_exc_fx( L_frame_fx, L_SUBFR, i_subfr, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
- &voice_factors_fx[tmp_idx_2], bwe_exc_fx, gain_preQ_fx, code_preQ_fx,
- st_fx->Q_exc, T0, T0_frac, st_fx->coder_type, st_fx->core_brate,
- st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#endif
/*----------------------------------------------------------------*
* Excitation enhancements (update of total excitation signal)
diff --git a/lib_dec/dlpc_avq_fx.c b/lib_dec/dlpc_avq_fx.c
index 07f1ea6f21206fa6b7d77d2886afc525462e6f85..4be63062f666f69a378635d29c244b182a670ae1 100644
--- a/lib_dec/dlpc_avq_fx.c
+++ b/lib_dec/dlpc_avq_fx.c
@@ -285,10 +285,9 @@ Word16 decode_lpc_avq_fx(
}
Word16 decode_lpc_avq_ivas_fx(
- Decoder_State *st, /* i/o: decoder state structure */
- const Word16 numlpc, /* i : Number of sets of lpc */
- Word16 *param_lpc /* o : lpc parameters */
- ,
+ Decoder_State *st, /* i/o: decoder state structure */
+ const Word16 numlpc, /* i : Number of sets of lpc */
+ Word16 *param_lpc, /* o : lpc parameters */
const Word16 ch, /* i : channel */
const Word16 element_mode, /* i : element mode */
const Word16 sns_low_br_mode /* i : SNS low-bitrate mode */
diff --git a/lib_dec/er_dec_tcx_fx.c b/lib_dec/er_dec_tcx_fx.c
index 2b112c00e752b8cfa234884ed4e9e4eec964bb9d..7cb4f897b24cc393f5589f14aaf2d0530ee9de4c 100644
--- a/lib_dec/er_dec_tcx_fx.c
+++ b/lib_dec/er_dec_tcx_fx.c
@@ -16,35 +16,14 @@
static void calcGainc_fx( Word16 *exc, Word16 Q_exc, Word32 old_fpitch /*Q16*/, Word16 L_subfr /*Q0*/, Word32 lp_gainp /*Q16*/, Word32 *lp_gainc /*Q16*/ )
{
Word16 tmp16, tmp16_2, tmp16_3, tmp_e, tmp2_e, tmp_loop, i;
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Word32 L_c;
- Word32 L_acc, L_tmp;
-#else
Word64 W_acc;
Word32 L_tmp;
-#endif
#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Flag Overflow = 0;
- Flag Carry = 0;
-#endif
move32();
move32();
#endif
-
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_acc = L_deposit_l( 0 );
- L_c = L_deposit_l( 0 );
-#else
W_acc = 0;
-#endif
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Overflow = 0;
- move16();
- Carry = 0;
- move16();
-#endif
tmp16 = round_fx( old_fpitch ); /*Q0*/
tmp_loop = shl( L_subfr, 1 );
@@ -57,22 +36,9 @@ static void calcGainc_fx( Word16 *exc, Word16 Q_exc, Word32 old_fpitch /*Q16*/,
/*st->lp_gainc += ( exc[i-2*L_subfr] - st->Mode2_lp_gainp * exc[i-2*L_subfr-(int)(st->old_fpitch+0.5f)] ) *
( exc[i-2*L_subfr] - st->Mode2_lp_gainp * exc[i-2*L_subfr-(int)(st->old_fpitch+0.5f)] );*/
tmp16_3 = sub_sat( exc[( i - ( L_subfr * 2 ) )] /*Q1*/, mult_r( tmp16_2 /*Q15*/, exc[( ( i - ( L_subfr * 2 ) ) - tmp16 )] /*Q1*/ ) /*Q1*/ );
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_acc = L_macNs_co( L_acc, tmp16_3, tmp16_3, &Carry, &Overflow ); /*Q3*/
- Overflow = 0;
- move16();
- L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /*Accumulate Carrys Q-1*/
- Carry = 0;
- move16();
-#else
W_acc = W_mac_16_16( W_acc, tmp16_3, tmp16_3 ); /*Q3*/
-#endif
}
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_tmp = norm_llQ31( L_c, L_acc, &tmp_e ); /*Q3,norm,tmp_e*/
-#else
- L_tmp = w_norm_llQ31( W_acc, &tmp_e ); /*Q3,norm,tmp_e*/
-#endif
+ L_tmp = w_norm_llQ31( W_acc, &tmp_e ); /*Q3,norm,tmp_e*/
tmp_e = add( tmp_e, 31 - ( add( shl( Q_exc, 1 ), 1 ) ) ); /*L_tmp is Q31, now*/
tmp16 = BASOP_Util_Divide3216_Scale( L_tmp /*Q31,norm,tmp_e*/, shl( L_subfr, 1 ) /*Q15,15*/, &tmp2_e ) /*Q15,tmp2_e+tmp_e-15*/;
tmp_e = sub( add( tmp2_e, tmp_e ), 15 );
@@ -88,56 +54,24 @@ static void calcGainc_fx( Word16 *exc, Word16 Q_exc, Word32 old_fpitch /*Q16*/,
static void calcGainc2_fx( Word16 *exc, Word16 Q_exc, Word16 L_subfr /*Q0*/, Word32 *lp_gainc /*Q16*/ )
{
Word16 i, cnt, tmp16, tmp_e, tmp2_e;
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Word32 L_c, L_acc, L_tmp;
-#else
Word64 W_acc;
Word32 L_tmp;
-#endif
#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Flag Overflow = 0;
- Flag Carry = 0;
-#endif
-#endif
- move16();
- move16();
-
-
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Carry = 0;
move16();
- Overflow = 0;
move16();
+#endif
- L_c = L_deposit_l( 0 );
- L_acc = L_deposit_l( 0 );
-#else
W_acc = 0;
-#endif
cnt = shl( L_subfr, 1 );
FOR( i = 0; i < cnt; i++ )
{
/* *gainc += ( exc[i-2*L_subfr] ) * ( exc[i-2*L_subfr]); */
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_acc = L_macNs_co( L_acc, exc[( i - ( L_subfr * 2 ) )] /*Q1*/, exc[( i - ( L_subfr * 2 ) )] /*Q1*/, &Carry, &Overflow ); /*Q3*/
- Overflow = 0;
- move16();
- L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow ); /* Accumulate Carrys Q-1*/
- Carry = 0;
- move16();
-#else
W_acc = W_mac_16_16( W_acc, exc[( i - ( L_subfr * 2 ) )] /*Q1*/, exc[( i - ( L_subfr * 2 ) )] /*Q1*/ ); /*Q3*/
-#endif
}
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_tmp = norm_llQ31( L_c, L_acc, &tmp_e ); /*Q3,norm,tmp_e*/
-#else
- L_tmp = w_norm_llQ31( W_acc, &tmp_e ); /*Q3,norm,tmp_e*/
-#endif
+ L_tmp = w_norm_llQ31( W_acc, &tmp_e ); /*Q3,norm,tmp_e*/
tmp_e = add( tmp_e, sub( 31, ( add( shl( Q_exc, 1 ), 1 ) ) ) ); /*L_tmp is Q31, now*/
tmp16 = BASOP_Util_Divide3216_Scale( L_tmp /*Q31,norm,tmp_e*/, shl( L_subfr, 1 ) /*Q15,15*/, &tmp2_e ) /*Q15,tmp2_e+tmp_e-15*/;
tmp_e = sub( add( tmp2_e, tmp_e ), 15 );
@@ -990,13 +924,12 @@ void con_tcx_fx(
}
void con_tcx_ivas_fx(
- Decoder_State *st, /* i/o: coder memory state */
- Word16 synth[],
- /* i/o: synth[] */ /*Q0 */
- const Word16 coh, /* i : coherence of stereo signal Q14*/
- Word16 *noise_seed, /* i/o: noise seed for stereo Q0*/
- const Word16 only_left, /* i : TD-PLC only in left channel Q0*/
- const Word16 *A_cng /* i : CNG LP filter coefficients Q14*/
+ Decoder_State *st, /* i/o: coder memory state */
+ Word16 synth[], /* i/o: synth[] Q0 */
+ const Word16 coh, /* i : coherence of stereo signal Q14*/
+ Word16 *noise_seed, /* i/o: noise seed for stereo Q0 */
+ const Word16 only_left, /* i : TD-PLC only in left channel Q0 */
+ const Word16 *A_cng /* i : CNG LP filter coefficients Q14*/
)
{
Word16 i, s, c, L_frame, L_subfr, fLowPassFilter, T0;
@@ -1007,11 +940,7 @@ void con_tcx_ivas_fx(
Word16 pre_emph_buf;
Word16 hp_filt[L_FIR_FER2];
Word16 alpha;
-#ifdef FIX_2003_CON_TCX_OVERFLOW
Word16 tmp_deemph, gain, gainCNG, gain_inov, scf;
-#else
- Word16 tmp_deemph, gain, gainCNG, gain_inov;
-#endif
Word16 *pt_exc, *pt1_exc;
Word16 Tc, tmpSeed;
Word16 fUseExtrapolatedPitch;
@@ -1086,32 +1015,20 @@ void con_tcx_ivas_fx(
/* set excitation memory*/
exc = buf + OLD_EXC_SIZE_DEC;
-#ifdef FIX_2003_CON_TCX_OVERFLOW
tmp_deemph = synth[-1]; /*st->Q_syn_factor*/
move16();
pre_emph_buf = synth[-1]; /*st->Q_syn_factor*/
move16();
-#else
- tmp_deemph = synth[-1]; /*Q0*/
- move16();
- pre_emph_buf = synth[-1]; /*Q0*/
-#endif
test();
IF( ( EQ_16( st->nbLostCmpt, 1 ) ) || hTcxDec->tcxConceal_recalc_exc )
{
/* apply pre-emphasis to the signal */
-#ifdef FIX_2003_CON_TCX_OVERFLOW
mem = shl( synth[( -( ( ( L_frame / 2 ) + hTcxDec->pit_max_TCX ) + M + M ) - 1 )], st->Q_syn_factor );
-#else
- mem = synth[( -( ( ( L_frame / 2 ) + hTcxDec->pit_max_TCX ) + M + M ) - 1 )]; /*Q0*/
-#endif
move16();
Q_exc = E_UTIL_f_preemph3_ivas_fx( &( synth[-( ( ( L_frame / 2 ) + hTcxDec->pit_max_TCX ) + 2 * M )] ), st->preemph_fac, add( add( shr( L_frame, 1 ), hTcxDec->pit_max_TCX ), shl( M, 1 ) ), &mem, 1 );
-#ifdef FIX_2003_CON_TCX_OVERFLOW
scale_sig( &( synth[-( ( ( L_frame / 2 ) + hTcxDec->pit_max_TCX ) + 2 * M )] ), add( add( shr( L_frame, 1 ), hTcxDec->pit_max_TCX ), shl( M, 1 ) ), negate( st->Q_syn_factor ) ); /*Q0, Setting back to Q0, as the following calculations are implemented assuming synth is in Q0 */
-#endif
st->Mode2_lp_gainc = L_deposit_l( 0 );
@@ -1155,17 +1072,11 @@ void con_tcx_ivas_fx(
ELSE
{
/* apply pre-emphasis to the signal */
-#ifdef FIX_2003_CON_TCX_OVERFLOW
mem = shl( synth[( -L_frame - 1 )], st->Q_syn_factor ); /*hTcxDec->Q_synth_factor_old*/
-#else
- mem = synth[( -L_frame - 1 )]; /*Q0*/
-#endif
move16();
Q_exc = E_UTIL_f_preemph3_ivas_fx( &( synth[-L_frame] ), st->preemph_fac, L_frame, &mem, 1 );
-#ifdef FIX_2003_CON_TCX_OVERFLOW
scale_sig( &synth[-L_frame], L_frame, negate( st->Q_syn_factor ) ); /*Q0, Setting back to Q0, as the following calculations are implemented assuming synth is in Q0 */
-#endif
- Copy( st->old_Aq_12_8_fx, A_local, M + 1 ); /*Q14*/
+ Copy( st->old_Aq_12_8_fx, A_local, M + 1 ); /*Q14*/
offset = shr( L_frame, 1 );
IF( GE_16( st->last_good, UNVOICED_TRANSITION ) )
@@ -1780,18 +1691,10 @@ void con_tcx_ivas_fx(
syn = buf + M; /*Q_syn*/
Copy( synth - M, buf, M ); /*Q_syn*/
-#ifdef FIX_2003_CON_TCX_OVERFLOW
scf = norm_s( tmp_deemph );
new_Q = sub( Q_exc, 4 ); // deemph_fx filter gain can be up to 10 (~2^3.32), so 4 bits of headroom are needed to avoid overflow
-#else
- new_Q = sub( Q_exc, 3 );
-#endif
new_Q = s_max( new_Q, -1 );
-#ifdef FIX_2003_CON_TCX_OVERFLOW
new_Q = s_min( new_Q, scf );
-#else
- new_Q = s_min( new_Q, norm_s( tmp_deemph ) );
-#endif
tmp16 = s_min( new_Q, st->prev_Q_syn );
st->prev_Q_syn = new_Q;
@@ -1802,15 +1705,11 @@ void con_tcx_ivas_fx(
move16();
Copy_Scale_sig( buf, mem_syn, M, exp_scale ); /* Q: tmp16 */
-#ifdef FIX_2003_CON_TCX_OVERFLOW
if ( GT_16( sub( Q_syn, st->Q_syn_factor ), scf ) )
{
Q_syn = add( scf, st->Q_syn_factor ); // so that (Q_syn - st->Q_syn_factor) = scf;
}
tmp_deemph = shl( tmp_deemph, sub( Q_syn, st->Q_syn_factor ) );
-#else
- tmp_deemph = shl_sat( tmp_deemph, Q_syn );
-#endif
st->Q_syn = Q_syn;
move16();
@@ -1875,9 +1774,6 @@ void con_tcx_ivas_fx(
/* Deemphasis and output synth and ZIR */
deemph_fx( syn, st->preemph_fac, add( L_frame, shr( L_frame, 1 ) ), &tmp_deemph );
-#ifndef FIX_2003_CON_TCX_OVERFLOW
- bufferCopyFx( syn + sub( L_frame, M + 1 ), st->syn, 1 + M, Q_syn, 0, 0, 0 ); /*Q_syn*/
-#endif
lerp( syn + sub( L_frame, shr( L_frame, 1 ) ), hTcxDec->old_syn_Overl, shr( st->L_frame, 1 ), shr( L_frame, 1 ) );
hTcxDec->Q_old_syn_Overl = Q_syn;
@@ -1900,7 +1796,6 @@ void con_tcx_ivas_fx(
hHQ_core->Q_old_wtda = Q_syn;
move16();
-#ifdef FIX_2003_CON_TCX_OVERFLOW
scf = add( getScaleFactor16( syn, L_frame ), Q_syn );
IF( LT_16( scf, 0 ) ) // Only avoid left shift in bufferCopyFX when overflow could occur
{
@@ -1917,17 +1812,6 @@ void con_tcx_ivas_fx(
Copy_Scale_sig( syn + L_frame, hTcxDec->syn_OverlFB, shr( L_frame, 1 ), sub( st->Q_syn_factor, Q_syn ) );
hTcxDec->Q_syn_OverlFB = st->Q_syn_factor;
-#else
- /* As long as there is no synth scaling factor introduced, which
- is given to the outside, there might occur overflows here */
- BASOP_SATURATE_WARNING_OFF_EVS
- bufferCopyFx( syn, synth, L_frame, Q_syn, 0, 0, 0 ); /*Q_syn*/
- BASOP_SATURATE_WARNING_ON_EVS
-
- Copy_Scale_sig( syn + L_frame, hTcxDec->syn_OverlFB, shr( L_frame, 1 ), sub( 0, Q_syn ) ); /*Q0*/
- hTcxDec->Q_syn_OverlFB = 0;
- move16();
-#endif
/* copy total excitation exc2 as 16kHz for acelp mode1 decoding */
IF( st->hWIDec != NULL )
diff --git a/lib_dec/fd_cng_dec_fx.c b/lib_dec/fd_cng_dec_fx.c
index d3b9634522e9c7e7ed83c4c2a6784a0ac57c2ca7..d8805c4f268703c5b33ae3d35f456b6e61aa3a6a 100644
--- a/lib_dec/fd_cng_dec_fx.c
+++ b/lib_dec/fd_cng_dec_fx.c
@@ -88,9 +88,7 @@ void initFdCngDec_ivas_fx(
hFdCngDec->hFdCngCom->olapBufferAna = hFdCngDec->olapBufferAna;
set16_fx( hFdCngDec->olapBufferSynth2, 0, FFTLEN );
hFdCngDec->hFdCngCom->olapBufferSynth2 = hFdCngDec->olapBufferSynth2;
-#ifdef FIX_1996_MASKING_NOISE
set32_fx( hFdCngDec->hFdCngCom->olapBufferSynth2_fx, 0, FFTLEN );
-#endif
/* Set some counters and flags */
@@ -3644,9 +3642,8 @@ void generate_comfort_noise_dec_hf_ivas_fx(
void generate_masking_noise_fx(
Word16 *timeDomainBuffer, /* i/o : pointer to time domain output buffer 15Q0 */
Word16 Q,
- HANDLE_FD_CNG_COM hFdCngCom /* i/o : pointer to FD_CNG_COM structure */
- ,
- Word16 length, /*Q0*/
+ HANDLE_FD_CNG_COM hFdCngCom, /* i/o : pointer to FD_CNG_COM structure */
+ Word16 length, /*Q0*/
Word16 core /*Q0*/ )
{
Word16 i, s, s1, s2, sq, cnt, startBand2, stopFFTbin2;
@@ -3858,10 +3855,9 @@ void generate_masking_noise_update_seed_fx(
* Generate additional comfort noise (kind of noise filling) *
************************************************************/
void generate_masking_noise_mdct_fx(
- Word32 *mdctBuffer, /* i/o: time-domain signal Q31 - mdctBuffer_e*/
- Word16 *mdctBuffer_e, /* i/o: exponent time-domain signal */
- HANDLE_FD_CNG_COM hFdCngCom /* i/o: FD_CNG structure containing all buffers and variables */
- ,
+ Word32 *mdctBuffer, /* i/o: time-domain signal Q31 - mdctBuffer_e*/
+ Word16 *mdctBuffer_e, /* i/o: exponent time-domain signal */
+ HANDLE_FD_CNG_COM hFdCngCom, /* i/o: FD_CNG structure containing all buffers and variables */
Word16 L_frame )
{
Word16 i, s, s1, s2, sq, cnt;
@@ -4115,12 +4111,12 @@ void generate_masking_noise_mdct_ivas_fx(
}
/*re-normalization of energy level: M/sqrt(2)*/
- v_multc_fixed( maskingNoise, SQRT_NORM_MDCT_FACTOR_Q27, maskingNoise, hFdCngCom->stopFFTbin ); // Q11
+ v_multc_fx( maskingNoise, SQRT_NORM_MDCT_FACTOR_Q27, maskingNoise, hFdCngCom->stopFFTbin ); // Q11
scale_sig32( maskingNoise, hFdCngCom->stopFFTbin, sub( 20, *mdctBuffer_e ) ); // exp = *mdctBuffer_e
/* Add some comfort noise on top of decoded signal */
- v_add_fixed( maskingNoise, mdctBuffer, mdctBuffer, hFdCngCom->stopFFTbin, 1 );
+ v_add_fx_hdrm( maskingNoise, mdctBuffer, mdctBuffer, hFdCngCom->stopFFTbin, 1 );
*mdctBuffer_e = sub( *mdctBuffer_e, 1 );
move16();
}
@@ -4661,7 +4657,7 @@ void generate_masking_noise_ivas_fx(
}
ELSE
{
- v_add_fixed_no_hdrm( maskingNoise_fx, timeDomainBuffer, timeDomainBuffer, s_min( hFdCngCom->frameSize, length ) ); /*Q31 - *exp_out*/
+ v_add_fx_no_hdrm( maskingNoise_fx, timeDomainBuffer, timeDomainBuffer, s_min( hFdCngCom->frameSize, length ) ); /*Q31 - *exp_out*/
}
return;
@@ -4996,29 +4992,18 @@ void generate_masking_noise_lb_dirac_fx(
overwriting it with the synthesis in case of shared tc and synth channel memory, i.e. non-TSM mode */
slot_size_cng = shr( hFdCngCom->frameSize, 4 /* DEFAULT_JBM_CLDFB_TIMESLOTS */ );
/* move start indices forward to the end of the last subframe */
-#ifdef FIX_2025_FDCNG_MULT
cur_subframe_start_outfs = i_mult( nCldfbTs, hSpatParamRendCom->slot_size );
cur_subframe_start_cngfs = i_mult( nCldfbTs, slot_size_cng );
-#else
- cur_subframe_start_outfs = mult( nCldfbTs, hSpatParamRendCom->slot_size );
- cur_subframe_start_cngfs = mult( nCldfbTs, slot_size_cng );
-#endif
/* go from the last subframe back and move the LB noise */
FOR( cur_subframe = sub( hSpatParamRendCom->nb_subframes, 1 ); cur_subframe >= 0; cur_subframe-- )
{
Word16 move_size, subframe_size_outfs;
-#ifdef FIX_2025_FDCNG_MULT
move_size = i_mult( slot_size_cng, hSpatParamRendCom->subframe_nbslots[cur_subframe] );
subframe_size_outfs = i_mult( hSpatParamRendCom->subframe_nbslots[cur_subframe], hSpatParamRendCom->slot_size );
cur_subframe_start_outfs = sub( cur_subframe_start_outfs, i_mult( hSpatParamRendCom->subframe_nbslots[cur_subframe], hSpatParamRendCom->slot_size ) );
cur_subframe_start_cngfs = sub( cur_subframe_start_cngfs, i_mult( hSpatParamRendCom->subframe_nbslots[cur_subframe], slot_size_cng ) );
-#else
- move_size = mult( slot_size_cng, hSpatParamRendCom->subframe_nbslots[cur_subframe] );
- subframe_size_outfs = mult( hSpatParamRendCom->subframe_nbslots[cur_subframe], hSpatParamRendCom->slot_size );
- cur_subframe_start_outfs = sub( cur_subframe_start_outfs, mult( hSpatParamRendCom->subframe_nbslots[cur_subframe], hSpatParamRendCom->slot_size ) );
- cur_subframe_start_cngfs = sub( cur_subframe_start_cngfs, mult( hSpatParamRendCom->subframe_nbslots[cur_subframe], slot_size_cng ) );
-#endif
+
/* move cna */
Copy32( tdBuffer + cur_subframe_start_cngfs, tdBuffer + cur_subframe_start_outfs, move_size );
diff --git a/lib_dec/gs_dec_amr_wb_fx.c b/lib_dec/gs_dec_amr_wb_fx.c
index eea37431a865aba1ec1ddcc180a859525f672e45..4a0bf352fab3e016e426fa83dbf34ed89d4259ee 100644
--- a/lib_dec/gs_dec_amr_wb_fx.c
+++ b/lib_dec/gs_dec_amr_wb_fx.c
@@ -122,8 +122,7 @@ static void Ener_per_band_fx(
static void Apply_gain_fx(
Word16 exc_diffQ_fx[], /* i/o: Quantized excitation Qx*/
Word32 L_Ener_per_bd_iQ[], /* i : Target ener per band Q16*/
- Word32 L_Ener_per_bd_yQ[] /* i : Ener per band for norm vector Qx*/
- ,
+ Word32 L_Ener_per_bd_yQ[], /* i : Ener per band for norm vector Qx*/
const Word16 Q_out )
{
Word16 i_band;
diff --git a/lib_dec/hq_core_dec_fx.c b/lib_dec/hq_core_dec_fx.c
index 5153215dbc021b5fe2ade623fbf2b8e0dea68933..e30fb0ec22cc962b64d9c472ae20a9fd65bde639 100644
--- a/lib_dec/hq_core_dec_fx.c
+++ b/lib_dec/hq_core_dec_fx.c
@@ -892,7 +892,7 @@ void ivas_hq_core_dec_fx(
{
/* Rough resampling, but reduces energy loss in case of switch to ACELP in first good frame */
L_lerp_fx_q11( t_audio_q, wtda_audio_LB, st_fx->L_frame, inner_frame );
- v_multc_fixed_16( t_audio_q, ONE_IN_Q14, wtda_audio_LB, st_fx->L_frame );
+ v_multc_fx_16( t_audio_q, ONE_IN_Q14, wtda_audio_LB, st_fx->L_frame );
Q_audio = 15;
move16();
}
@@ -903,7 +903,7 @@ void ivas_hq_core_dec_fx(
tmp = Sqrt16( tmp, &tmp_e );
ener_match = shr( tmp, sub( 2, tmp_e ) ); // Q13
- v_multc_fixed_16( t_audio_q, ener_match, t_audio_q, inner_frame ); // Q10
+ v_multc_fx_16( t_audio_q, ener_match, t_audio_q, inner_frame ); // Q10
Scale_sig32( t_audio_q, inner_frame, Q2 ); // Q10 + Q2
Q_audio = Q_G_audio;
diff --git a/lib_dec/hq_env_dec_fx.c b/lib_dec/hq_env_dec_fx.c
index 7c5af1b2aa8d796a21141a34e20bdce3601d41d0..5011dcf86f35da45f47522514903eafdad35afd7 100644
--- a/lib_dec/hq_env_dec_fx.c
+++ b/lib_dec/hq_env_dec_fx.c
@@ -13,15 +13,15 @@
* Decode envelope indices
*------------------------------------------------------------------------*/
-Word16 decode_envelope_indices_fx( /* o : Number of bits Q0*/
- Decoder_State *st_fx, /* i/o: decoder state structure */
- const Word16 start_norm, /* i : starting band index Q0*/
- const Word16 num_sfm, /* i : Number of subbands Q0*/
- const Word16 numnrmibits, /* i : Bitrate of fall-back coding mode Q0*/
- Word16 *difidx, /* o : Diff indices/encoded diff indices Q0*/
- const Word16 flag_HQ2 /* i : indicator of HQ2 core Q0*/
- ,
- const Word16 is_transient /* i : indicator of HQ_TRANSIENT Q0*/
+/* o : Number of bits Q0*/
+Word16 decode_envelope_indices_fx(
+ Decoder_State *st_fx, /* i/o: decoder state structure */
+ const Word16 start_norm, /* i : starting band index Q0*/
+ const Word16 num_sfm, /* i : Number of subbands Q0*/
+ const Word16 numnrmibits, /* i : Bitrate of fall-back coding mode Q0*/
+ Word16 *difidx, /* o : Diff indices/encoded diff indices Q0*/
+ const Word16 flag_HQ2, /* i : indicator of HQ2 core Q0*/
+ const Word16 is_transient /* i : indicator of HQ_TRANSIENT Q0*/
)
{
Word16 hcode_l;
diff --git a/lib_dec/igf_dec_fx.c b/lib_dec/igf_dec_fx.c
index ee462d7c550d1871a6ae948c118c270f310e556c..686882fd3ed748598f9fb81d41058d6e384a3739 100644
--- a/lib_dec/igf_dec_fx.c
+++ b/lib_dec/igf_dec_fx.c
@@ -909,9 +909,9 @@ static void IGF_prepStereo(
H_IGF_INFO hInfoL, hInfoR;
Word16 tb, sfb, strt_cpy, tile_idx;
Word16 *swb_offset;
- const Word32 c_fx = SQRT2_OVER_2_FIXED; // Q31
- Word16 selectionL = 0; // 0 -> IGF, 1 -> pSpecFlat
- Word16 selectionR = 0; // 0 -> IGF, 1 -> pSpecFlat
+ const Word32 c_fx = SQRT2_OVER_2_FX; // Q31
+ Word16 selectionL = 0; // 0 -> IGF, 1 -> pSpecFlat
+ Word16 selectionR = 0; // 0 -> IGF, 1 -> pSpecFlat
move32();
move16();
move16();
@@ -1482,15 +1482,8 @@ static void IGF_appl( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData, /**< in
Word16 dS[IGF_MAX_SFB];
Word16 dS_e[IGF_MAX_SFB];
Word32 energyTmp[24];
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Word32 L_c;
-#endif
Word16 Hr;
#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Flag Overflow = 0;
- Flag Carry = 0;
-#endif
move16();
move16();
#endif
@@ -1569,22 +1562,7 @@ static void IGF_appl( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData, /**< in
&dE_e,
negate( tmp ) );
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_c = 0;
- move32();
- FOR( tb = 0; tb < 24; tb++ )
- {
- Carry = 0;
- move16();
- L_tmp = L_add_co( L_tmp, energyTmp[tb], &Carry, &Overflow ); // Q31 - dE_e
- Overflow = 0;
- move16();
- L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );
- }
- L_tmp = norm_llQ31( L_c, L_tmp, &shift ); // Q31
-#else
L_tmp = sum_array_norm( energyTmp, 24, &shift );
-#endif
/* float: dE = (float)sqrt(dE / 24.f); basop: */
shift = add( sub( shift, 4 ), dE_e ); /* x/24 = (x >> 4) * 1/1.5 */
dE = Sqrt16norm( extract_h( L_tmp ), &shift );
@@ -2176,20 +2154,8 @@ static void IGF_appl_ivas( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData, /**< in
Word16 dS[IGF_MAX_SFB];
Word16 dS_e[IGF_MAX_SFB];
Word32 energyTmp[24];
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Word32 L_c;
-#endif
Word16 spec_e_arr[N_MAX];
Word16 vspec_e_arr[N_MAX_TCX - IGF_START_MN];
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Flag Overflow = 0;
- move16();
- Flag Carry = 0;
- move16();
-#endif
-#endif
-
/* initialize variables */
w0 = 6586; // Q15
@@ -2266,21 +2232,7 @@ static void IGF_appl_ivas( IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData, /**< in
&dE_e,
negate( tmp ) );
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_c = 0;
- move32();
- FOR( tb = 0; tb < 24; tb++ )
- {
- Carry = 0;
- move16();
- L_tmp = L_add_co( L_tmp, energyTmp[tb], &Carry, &Overflow ); // Q31 - dE_e
- Overflow = 0;
- L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );
- }
- L_tmp = norm_llQ31( L_c, L_tmp, &shift ); // Q31
-#else
L_tmp = sum_array_norm( energyTmp, 24, &shift );
-#endif
/* float: dE = (float)sqrt(dE / 24.f); basop: */
shift = add( sub( shift, 4 ), dE_e ); /* x/24 = (x >> 4) * 1/1.5 */
dE = Sqrt16norm( extract_h( L_tmp ), &shift );
@@ -2905,6 +2857,7 @@ static void IGF_getWhiteSpectralData_ivas(
Word16 tmp_e;
Word16 out_e_arr[IGF_START_MX + MAX_IGF_SFB_LEN];
Word16 max_out_e;
+ Word64 window_sum;
assert( LT_16( stop, IGF_START_MX + MAX_IGF_SFB_LEN ) );
/* inits */
@@ -2930,16 +2883,18 @@ static void IGF_getWhiteSpectralData_ivas(
ak_e = add( tmp_e, sub( shl( sub( in_e, s_l ), 1 ), 15 ) ); // tmp_e + 2 * (in_e - s_l) - 15
ak_e = sub( ak_e, 1 );
- FOR( i = start; i < stop - level; i++ )
+ window_sum = 0;
+ move64();
+ FOR( j = start - level; j < start + level; j++ )
{
- Word64 temp = 0;
- move64();
- FOR( j = i - level; j < i + level + 1; j++ )
- {
- temp = W_mac_32_32( temp, in[j], in[j] );
- }
- ak = Mult_32_16( W_shl_sat_l( temp, shift ), quo ); // add( shl( level, 1 ), 1 ), &tmp_e ) );
+ window_sum = W_mac_32_32( window_sum, in[j], in[j] );
+ }
+ FOR( i = start; i < stop - level; i++ )
+ {
+ window_sum = W_mac_32_32( window_sum, in[i + level], in[i + level] ); /* add the right one */
+ ak = Mult_32_16( W_shl_sat_l( window_sum, shift ), quo ); // add( shl( level, 1 ), 1 ), &tmp_e ) );
+ window_sum = W_sub( window_sum, W_mult_32_32( in[i - level], in[i - level] ) ); /* subtract the left one */
n = sub( ak_e, norm_l( ak ) );
n = shr( n, 1 );
@@ -2951,16 +2906,10 @@ static void IGF_getWhiteSpectralData_ivas(
FOR( ; i < stop; i++ )
{
- Word64 temp = 0;
- move64();
+ ak = L_deposit_h( BASOP_Util_Divide3216_Scale( W_shl_sat_l( window_sum, shift ), sub( stop, sub( i, level ) ), &tmp_e ) );
+ window_sum = W_sub( window_sum, W_mult_32_32( in[i - level], in[i - level] ) ); /* subtract the left one */
+ ak_e = add( tmp_e, eff_e ); // tmp_e + 2 * (in_e - s_l) - 15
- FOR( j = i - level; j < stop; j++ )
- {
- temp = W_mac_32_32( temp, in[j], in[j] );
- }
-
- ak = L_deposit_h( BASOP_Util_Divide3216_Scale( W_shl_sat_l( temp, shift ), sub( stop, sub( i, level ) ), &tmp_e ) );
- ak_e = add( tmp_e, eff_e ); // tmp_e + 2 * (in_e - s_l) - 15
n = sub( ak_e, add( norm_l( ak ), 1 ) );
n = shr( n, 1 );
@@ -4122,16 +4071,17 @@ void IGFDecReplicateTCX10State_fx(
/**********************************************************************/ /*
copy the LPC flat spectrum to IGF buffer
**************************************************************************/
-void IGFDecCopyLPCFlatSpectrum( const IGF_DEC_INSTANCE_HANDLE hInstance, /**< in: | instance handle of IGF Decoder */
- const Word32 *pSpectrumFlat, /**< in: Q31 | LPC flattend spectrum from TCX dec */
- const Word16 pSpectrumFlat_exp, /**< in: | exponent of pSpectrumFlat */
- const Word16 igfGridIdx /**< in: Q0 | IGF grid index */
+
+void IGFDecCopyLPCFlatSpectrum(
+ const IGF_DEC_INSTANCE_HANDLE hInstance, /**< in: | instance handle of IGF Decoder */
+ const Word32 *pSpectrumFlat, /**< in: Q31 | LPC flattend spectrum from TCX dec */
+ const Word16 pSpectrumFlat_exp, /**< in: | exponent of pSpectrumFlat */
+ const Word16 igfGridIdx /**< in: Q0 | IGF grid index */
)
{
IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData;
H_IGF_GRID hGrid;
-
IF( hInstance )
{
hPrivateData = &hInstance->igfData;
@@ -4144,6 +4094,8 @@ void IGFDecCopyLPCFlatSpectrum( const IGF_DEC_INSTANCE_HANDLE hInstance, /**< in
Copy32( pSpectrumFlat, hPrivateData->pSpecFlat, hGrid->startLine );
}
+
+ return;
}
void IGFDecCopyLPCFlatSpectrum_fx(
@@ -4168,13 +4120,18 @@ void IGFDecCopyLPCFlatSpectrum_fx(
Copy_Scale_sig32( pSpectrumFlat, hPrivateData->pSpecFlat, hGrid->startLine, sub( pSpectrumFlat_exp, 20 ) ); // Q11
}
+
+ return;
}
-/**********************************************************************/ /*
- store the IGF bitstream information for TCX10 subframes
- **************************************************************************/
-void IGFDecStoreTCX10SubFrameData( const IGF_DEC_INSTANCE_HANDLE hInstance, /**< in: | instance handle of IGF Decoder */
- const Word16 subFrameIdx /**< in: Q0 | index of subframe */
+
+/**********************************************************************/ /*
+store the IGF bitstream information for TCX10 subframes
+**************************************************************************/
+
+void IGFDecStoreTCX10SubFrameData(
+ const IGF_DEC_INSTANCE_HANDLE hInstance, /**< in: | instance handle of IGF Decoder */
+ const Word16 subFrameIdx /**< in: Q0 | index of subframe */
)
{
IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData;
@@ -4192,13 +4149,18 @@ void IGFDecStoreTCX10SubFrameData( const IGF_DEC_INSTANCE_HANDLE hInstance, /**<
/* store flattening trigger for current subframe */
hPrivateData->igf_flatteningTrigger_subframe[subFrameIdx] = hInstance->flatteningTrigger;
move16();
+
+ return;
}
-/**********************************************************************/ /*
- restore the IGF bitstream information for TCX10 subframes
- **************************************************************************/
-void IGFDecRestoreTCX10SubFrameData( const IGF_DEC_INSTANCE_HANDLE hInstance, /**< in: | instance handle of IGF Decoder */
- const Word16 subFrameIdx /**< in: Q0 | index of subframe */
+
+/**********************************************************************/ /*
+restore the IGF bitstream information for TCX10 subframes
+**************************************************************************/
+
+void IGFDecRestoreTCX10SubFrameData(
+ const IGF_DEC_INSTANCE_HANDLE hInstance, /**< in: | instance handle of IGF Decoder */
+ const Word16 subFrameIdx /**< in: Q0 | index of subframe */
)
{
IGF_DEC_PRIVATE_DATA_HANDLE hPrivateData;
@@ -4249,11 +4211,13 @@ void IGFDecRestoreTCX10SubFrameData_fx(
return;
}
+
/*-----------------------------------------------------------------------*
* init_igf_dec()
*
* Initialize IGF decoder parameters
*-----------------------------------------------------------------------*/
+
void init_igf_dec(
IGF_DEC_INSTANCE_HANDLE hIGFDec /* i/o: IGF decoder handle */
)
@@ -4300,7 +4264,14 @@ void init_igf_dec(
return;
}
-Word16 get_igf_startline(
+
+/*-----------------------------------------------------------------------*
+ * init_igget_igf_startline()
+ *
+ *
+ *-----------------------------------------------------------------------*/
+
+Word16 get_igf_startline_fx(
Decoder_State *st, /* i : decoder state */
const Word16 L_frame, /* i : length of the frame */
const Word16 L_frameTCX /* i : full band frame length */
diff --git a/lib_dec/ivas_binRenderer_internal_fx.c b/lib_dec/ivas_binRenderer_internal_fx.c
index a92d8a3d58e67282c2d78929eae13697e613d3f5..70e288ba31ad46a3f8ab5fa3535d4d8da892973d 100644
--- a/lib_dec/ivas_binRenderer_internal_fx.c
+++ b/lib_dec/ivas_binRenderer_internal_fx.c
@@ -56,8 +56,14 @@
#define NUM_TAPS_F0_3 ( Word16 )( 29 ) // (Word16) ceil( 0.3f * hBinRenConvModule->numTaps )
#define REVERB_INPUT_DOWNMIX_CHANNELS ( 11 )
+
+#define NUM_TAPS_F0_6 ( Word16 )( 58 ) // (Word16) ceil( 0.6f * hBinRenConvModule->numTaps )
+#define NUM_TAPS_F0_5 ( Word16 )( 48 ) // (Word16) ceil( 0.5f * hBinRenConvModule->numTaps )
+#define NUM_TAPS_F0_4 ( Word16 )( 39 ) // (Word16) ceil( 0.4f * hBinRenConvModule->numTaps )
+#define NUM_TAPS_F0_3 ( Word16 )( 29 ) // (Word16) ceil( 0.3f * hBinRenConvModule->numTaps )
+
/* Downmix table for sparse frequency domain reverberator*/
-const Word32 dmxmtx_table_fx[BINAURAL_CHANNELS][REVERB_INPUT_DOWNMIX_CHANNELS] = {
+static const Word32 dmxmtx_table_fx[BINAURAL_CHANNELS][REVERB_INPUT_DOWNMIX_CHANNELS] = {
// Q31
{ 0x7fffffff, 0, 1518485623, 0x7fffffff, 0, 0x7fffffff, 0, 0x7fffffff, 0, 0x7fffffff, 0 },
{ 0, 0x7fffffff, 1518485623, 0, 0x7fffffff, 0, 0x7fffffff, 0, 0x7fffffff, 0, 0x7fffffff },
@@ -69,6 +75,7 @@ const Word32 dmxmtx_table_fx[BINAURAL_CHANNELS][REVERB_INPUT_DOWNMIX_CHANNELS] =
*
*
*-------------------------------------------------------------------------*/
+
static void ivas_binRenderer_filterModule_fx(
Word32 out_Conv_CLDFB_real[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : real part of Binaural signals Q6 */
Word32 out_Conv_CLDFB_imag[BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : imag part of Binaural signals Q6 */
@@ -168,11 +175,13 @@ static void ivas_binRenderer_filterModule_fx(
return;
}
+
/*-------------------------------------------------------------------------
* ivas_binRenderer_convModuleOpen()
*
* Open convolution module handle of fastconv binaural renderer
*-------------------------------------------------------------------------*/
+
static ivas_error ivas_binRenderer_convModuleOpen(
BINAURAL_RENDERER_HANDLE hBinRenderer,
const Word16 renderer_type,
@@ -207,17 +216,11 @@ static ivas_error ivas_binRenderer_convModuleOpen(
move16();
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
hBinRenConvModule->numTaps = hHrtf->ntaps;
move16();
-#endif
IF( EQ_16( renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
{
-#ifndef FIX_CREND_SIMPLIFY_CODE
- hBinRenConvModule->numTaps = BINAURAL_NTAPS_MAX;
- move16();
-#endif
/* Use variable order filtering */
bandIdx = 0;
move16();
@@ -249,18 +252,6 @@ static ivas_error ivas_binRenderer_convModuleOpen(
}
ELSE
{
-#ifndef FIX_CREND_SIMPLIFY_CODE
- IF( EQ_16( hBinRenderer->ivas_format, SBA_FORMAT ) )
- {
- hBinRenConvModule->numTaps = BINAURAL_NTAPS_SBA;
- move16();
- }
- ELSE
- {
- hBinRenConvModule->numTaps = BINAURAL_NTAPS;
- move16();
- }
-#endif
/* Use fixed order filtering */
bandIdx = 0;
move16();
@@ -342,7 +333,6 @@ static ivas_error ivas_binRenderer_convModuleOpen(
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
}
-
FOR( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ )
{
IF( ( hBinRenConvModule->filterStatesLeftReal_fx[pos_idx][bandIdx] = (Word32 **) malloc( hBinRenderer->nInChannels * sizeof( Word32 * ) ) ) == NULL )
@@ -376,12 +366,8 @@ static ivas_error ivas_binRenderer_convModuleOpen(
{
FOR( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
Word16 tmp;
tmp = chIdx;
-#else
- Word16 tmp = 0;
-#endif
move16();
IF( isLoudspeaker )
@@ -413,66 +399,10 @@ static ivas_error ivas_binRenderer_convModuleOpen(
}
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
hBinRenConvModule->filterTapsLeftReal_fx[bandIdx][chIdx] = hHrtf->leftReal_fx[bandIdx][tmp];
hBinRenConvModule->filterTapsLeftImag_fx[bandIdx][chIdx] = hHrtf->leftImag_fx[bandIdx][tmp];
hBinRenConvModule->filterTapsRightReal_fx[bandIdx][chIdx] = hHrtf->rightReal_fx[bandIdx][tmp];
hBinRenConvModule->filterTapsRightImag_fx[bandIdx][chIdx] = hHrtf->rightImag_fx[bandIdx][tmp];
-#else
- IF( EQ_16( renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
- {
- /* set the memories to zero */
- IF( isLoudspeaker )
- {
- hBinRenConvModule->filterTapsLeftReal_fx[bandIdx][chIdx] = hHrtf->leftBRIRReal_fx[bandIdx][tmp];
- hBinRenConvModule->filterTapsLeftImag_fx[bandIdx][chIdx] = hHrtf->leftBRIRImag_fx[bandIdx][tmp];
- hBinRenConvModule->filterTapsRightReal_fx[bandIdx][chIdx] = hHrtf->rightBRIRReal_fx[bandIdx][tmp];
- hBinRenConvModule->filterTapsRightImag_fx[bandIdx][chIdx] = hHrtf->rightBRIRImag_fx[bandIdx][tmp];
- }
- }
- ELSE
- {
- /* set the memories to zero */
- IF( isLoudspeaker )
- {
- hBinRenConvModule->filterTapsLeftReal_fx[bandIdx][chIdx] = hHrtf->leftHRIRReal_fx[bandIdx][tmp];
- hBinRenConvModule->filterTapsLeftImag_fx[bandIdx][chIdx] = hHrtf->leftHRIRImag_fx[bandIdx][tmp];
- hBinRenConvModule->filterTapsRightReal_fx[bandIdx][chIdx] = hHrtf->rightHRIRReal_fx[bandIdx][tmp];
- hBinRenConvModule->filterTapsRightImag_fx[bandIdx][chIdx] = hHrtf->rightHRIRImag_fx[bandIdx][tmp];
- }
- ELSE
- {
- IF( EQ_16( input_config, IVAS_AUDIO_CONFIG_HOA3 ) )
- {
- /* HOA3 filter coefficients */
- hBinRenConvModule->filterTapsLeftReal_fx[bandIdx][chIdx] = hHrtf->leftHRIRReal_HOA3_fx[bandIdx][chIdx];
- hBinRenConvModule->filterTapsLeftImag_fx[bandIdx][chIdx] = hHrtf->leftHRIRImag_HOA3_fx[bandIdx][chIdx];
- hBinRenConvModule->filterTapsRightReal_fx[bandIdx][chIdx] = hHrtf->rightHRIRReal_HOA3_fx[bandIdx][chIdx];
- hBinRenConvModule->filterTapsRightImag_fx[bandIdx][chIdx] = hHrtf->rightHRIRImag_HOA3_fx[bandIdx][chIdx];
- }
- ELSE IF( EQ_16( input_config, IVAS_AUDIO_CONFIG_HOA2 ) )
- {
- /* HOA2 filter coefficients */
- hBinRenConvModule->filterTapsLeftReal_fx[bandIdx][chIdx] = hHrtf->leftHRIRReal_HOA2_fx[bandIdx][chIdx];
- hBinRenConvModule->filterTapsLeftImag_fx[bandIdx][chIdx] = hHrtf->leftHRIRImag_HOA2_fx[bandIdx][chIdx];
- hBinRenConvModule->filterTapsRightReal_fx[bandIdx][chIdx] = hHrtf->rightHRIRReal_HOA2_fx[bandIdx][chIdx];
- hBinRenConvModule->filterTapsRightImag_fx[bandIdx][chIdx] = hHrtf->rightHRIRImag_HOA2_fx[bandIdx][chIdx];
- }
- ELSE IF( EQ_16( input_config, IVAS_AUDIO_CONFIG_FOA ) )
- {
- /* FOA filter coefficients */
- hBinRenConvModule->filterTapsLeftReal_fx[bandIdx][chIdx] = hHrtf->leftHRIRReal_FOA_fx[bandIdx][chIdx];
- hBinRenConvModule->filterTapsLeftImag_fx[bandIdx][chIdx] = hHrtf->leftHRIRImag_FOA_fx[bandIdx][chIdx];
- hBinRenConvModule->filterTapsRightReal_fx[bandIdx][chIdx] = hHrtf->rightHRIRReal_FOA_fx[bandIdx][chIdx];
- hBinRenConvModule->filterTapsRightImag_fx[bandIdx][chIdx] = hHrtf->rightHRIRImag_FOA_fx[bandIdx][chIdx];
- }
- ELSE
- {
- return IVAS_ERR_INVALID_INPUT_FORMAT;
- }
- }
- }
-#endif
}
}
@@ -529,7 +459,6 @@ void ivas_init_binaural_hrtf_fx(
{
Word16 i;
-#ifdef FIX_CREND_SIMPLIFY_CODE
HrtfFastConv->leftReal_fx = NULL;
HrtfFastConv->leftImag_fx = NULL;
HrtfFastConv->rightReal_fx = NULL;
@@ -538,48 +467,10 @@ void ivas_init_binaural_hrtf_fx(
move32();
HrtfFastConv->n_channels = 0;
move16();
-#else
- HrtfFastConv->leftHRIRReal_HOA3_fx = NULL;
- HrtfFastConv->leftHRIRImag_HOA3_fx = NULL;
- HrtfFastConv->rightHRIRReal_HOA3_fx = NULL;
- HrtfFastConv->rightHRIRImag_HOA3_fx = NULL;
- HrtfFastConv->FASTCONV_HOA3_latency_s_fx = 0;
- move32();
-
- HrtfFastConv->leftHRIRReal_fx = NULL;
- HrtfFastConv->leftHRIRImag_fx = NULL;
- HrtfFastConv->rightHRIRReal_fx = NULL;
- HrtfFastConv->rightHRIRImag_fx = NULL;
- HrtfFastConv->FASTCONV_HRIR_latency_s_fx = 0;
- move32();
-
- HrtfFastConv->leftBRIRReal_fx = NULL;
- HrtfFastConv->leftBRIRImag_fx = NULL;
- HrtfFastConv->rightBRIRReal_fx = NULL;
- HrtfFastConv->rightBRIRImag_fx = NULL;
- HrtfFastConv->FASTCONV_BRIR_latency_s_fx = 0;
- move32();
-
- HrtfFastConv->leftHRIRReal_HOA2_fx = NULL;
- HrtfFastConv->leftHRIRImag_HOA2_fx = NULL;
- HrtfFastConv->rightHRIRReal_HOA2_fx = NULL;
- HrtfFastConv->rightHRIRImag_HOA2_fx = NULL;
- HrtfFastConv->FASTCONV_HOA2_latency_s_fx = 0;
- move32();
-
- HrtfFastConv->leftHRIRReal_FOA_fx = NULL;
- HrtfFastConv->leftHRIRImag_FOA_fx = NULL;
- HrtfFastConv->rightHRIRReal_FOA_fx = NULL;
- HrtfFastConv->rightHRIRImag_FOA_fx = NULL;
- HrtfFastConv->FASTCONV_FOA_latency_s_fx = 0;
- move32();
-#endif
HrtfFastConv->allocate_init_flag = 0;
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
HrtfFastConv->ntaps = 0;
move16();
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
HrtfFastConv->FASTCONV_latency_s_Q_fx = 0;
move16();
HrtfFastConv->FASTCONV_taps_s_Q_fx = 0;
@@ -588,8 +479,6 @@ void ivas_init_binaural_hrtf_fx(
move16();
HrtfFastConv->FASTCONV_reverbEne_s_Q_fx = 0;
move16();
-#endif
-#endif
FOR( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )
{
@@ -653,18 +542,11 @@ return IVAS_ERR_OK;
*-------------------------------------------------------------------------*/
ivas_error ivas_allocate_binaural_hrtf_fx(
- HRTFS_FASTCONV *HrtfFastConv, /* i/o: FASTCONV HRTF structure */
-#ifdef FIX_CREND_SIMPLIFY_CODE
- const int16_t n_channels, /* i : number of input channels */
-#else
- const AUDIO_CONFIG input_config, /* i : input audio configuration */
- const BINAURAL_INPUT_AUDIO_CONFIG bin_input_config, /* i : binaural input audio config */
- const RENDERER_TYPE renderer_type, /* i : renderer type */
-#endif
+ HRTFS_FASTCONV *HrtfFastConv, /* i/o: FASTCONV HRTF structure */
+ const int16_t n_channels, /* i : number of input channels */
const Word16 allocate_init_flag /* i : Memory allocation flag */
)
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
HrtfFastConv->n_channels = n_channels;
move16();
@@ -694,162 +576,7 @@ ivas_error ivas_allocate_binaural_hrtf_fx(
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for HrtfFastConv->rightImag" );
}
}
-#else
- test();
- IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_HOA3 ) || EQ_32( bin_input_config, BINAURAL_INPUT_AUDIO_CONFIG_HOA3 ) )
- {
- test();
- test();
- test();
- IF( ( HrtfFastConv->leftHRIRReal_HOA3_fx != NULL ) && ( HrtfFastConv->leftHRIRImag_HOA3_fx != NULL ) && ( HrtfFastConv->rightHRIRReal_HOA3_fx != NULL ) && ( HrtfFastConv->rightHRIRImag_HOA3_fx != NULL ) )
- {
- return IVAS_ERR_OK;
- }
- ELSE
- {
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->leftHRIRReal_HOA3_fx, BINAURAL_CONVBANDS, HOA3_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal_HOA3" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->leftHRIRImag_HOA3_fx, BINAURAL_CONVBANDS, HOA3_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag_HOA3" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->rightHRIRReal_HOA3_fx, BINAURAL_CONVBANDS, HOA3_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal_HOA3" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->rightHRIRImag_HOA3_fx, BINAURAL_CONVBANDS, HOA3_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag_HOA3" );
- }
- }
- }
-
- test();
- IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_HOA2 ) || EQ_32( bin_input_config, BINAURAL_INPUT_AUDIO_CONFIG_HOA2 ) )
- {
- test();
- test();
- test();
- IF( ( HrtfFastConv->leftHRIRReal_HOA2_fx != NULL ) && ( HrtfFastConv->leftHRIRImag_HOA2_fx != NULL ) && ( HrtfFastConv->rightHRIRReal_HOA2_fx != NULL ) && ( HrtfFastConv->rightHRIRImag_HOA2_fx != NULL ) )
- {
- return IVAS_ERR_OK;
- }
- ELSE
- {
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->leftHRIRReal_HOA2_fx, BINAURAL_CONVBANDS, HOA2_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal_HOA2" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->leftHRIRImag_HOA2_fx, BINAURAL_CONVBANDS, HOA2_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag_HOA2" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->rightHRIRReal_HOA2_fx, BINAURAL_CONVBANDS, HOA2_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal_HOA2" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->rightHRIRImag_HOA2_fx, BINAURAL_CONVBANDS, HOA2_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag_HOA2" );
- }
- }
- }
-
- test();
- IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_FOA ) || EQ_32( bin_input_config, BINAURAL_INPUT_AUDIO_CONFIG_FOA ) )
- {
- test();
- test();
- test();
- IF( ( HrtfFastConv->leftHRIRReal_FOA_fx != NULL ) && ( HrtfFastConv->leftHRIRImag_FOA_fx != NULL ) && ( HrtfFastConv->rightHRIRReal_FOA_fx != NULL ) && ( HrtfFastConv->rightHRIRImag_FOA_fx != NULL ) )
- {
- return IVAS_ERR_OK;
- }
- ELSE
- {
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->leftHRIRReal_FOA_fx, BINAURAL_CONVBANDS, FOA_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal_FOA" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->leftHRIRImag_FOA_fx, BINAURAL_CONVBANDS, FOA_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag_FOA" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->rightHRIRReal_FOA_fx, BINAURAL_CONVBANDS, FOA_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal_FOA" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->rightHRIRImag_FOA_fx, BINAURAL_CONVBANDS, FOA_CHANNELS, BINAURAL_NTAPS_SBA, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag_FOA" );
- }
- }
- }
-
- test();
- IF( EQ_32( renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( bin_input_config, BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) )
- {
- test();
- test();
- test();
- IF( ( HrtfFastConv->leftHRIRReal_fx != NULL ) && ( HrtfFastConv->leftHRIRImag_fx != NULL ) && ( HrtfFastConv->rightHRIRReal_fx != NULL ) && ( HrtfFastConv->rightHRIRImag_fx != NULL ) )
- {
- return IVAS_ERR_OK;
- }
- ELSE
- {
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->leftHRIRReal_fx, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, BINAURAL_NTAPS, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->leftHRIRImag_fx, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, BINAURAL_NTAPS, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->rightHRIRReal_fx, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, BINAURAL_NTAPS, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->rightHRIRImag_fx, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, BINAURAL_NTAPS, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag" );
- }
- }
- }
- test();
- IF( EQ_32( renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || EQ_32( bin_input_config, BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) )
- {
- test();
- test();
- test();
- IF( ( HrtfFastConv->leftBRIRReal_fx != NULL ) && ( HrtfFastConv->leftBRIRImag_fx != NULL ) && ( HrtfFastConv->rightBRIRReal_fx != NULL ) && ( HrtfFastConv->rightBRIRImag_fx != NULL ) )
- {
- return IVAS_ERR_OK;
- }
- ELSE
- {
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->leftBRIRReal_fx, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, BINAURAL_NTAPS_MAX, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftBRIRReal" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->leftBRIRImag_fx, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, BINAURAL_NTAPS_MAX, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftBRIRImag" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->rightBRIRReal_fx, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, BINAURAL_NTAPS_MAX, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightBRIRReal" );
- }
- IF( NE_32( IVAS_ERR_OK, ivas_alloc_pppMem_fx( &HrtfFastConv->rightBRIRImag_fx, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, BINAURAL_NTAPS_MAX, allocate_init_flag ) ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightBRIRImag" );
- }
- }
- }
-#endif
return IVAS_ERR_OK;
}
@@ -868,9 +595,7 @@ static ivas_error ivas_binaural_hrtf_open_fx(
{
Word16 i, j;
ivas_error error;
-#ifdef FIX_CREND_SIMPLIFY_CODE
Word16 n_channels;
-#endif
test();
IF( hHrtfFastConv != NULL && *hHrtfFastConv != NULL )
@@ -893,84 +618,55 @@ static ivas_error ivas_binaural_hrtf_open_fx(
test();
IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( renderer_type, RENDERER_BINAURAL_FASTCONV ) )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
HrtfFastConv->FASTCONV_latency_s_fx = FASTCONV_HRIR_latency_s_fx;
move32();
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
HrtfFastConv->FASTCONV_latency_s_Q_fx = Q31 - FASTCONV_factor_Q_HRIR_latency_s_fx;
move16();
HrtfFastConv->FASTCONV_taps_s_Q_fx = Q15 - FASTCONV_factor_Q_HRIR_fx;
move16();
-#endif
HrtfFastConv->ntaps = BINAURAL_NTAPS;
move16();
-#else
- HrtfFastConv->FASTCONV_HRIR_latency_s_fx = FASTCONV_HRIR_latency_s_fx;
- move32();
-#endif
}
+
IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_HOA2 ) )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
HrtfFastConv->FASTCONV_latency_s_fx = FASTCONV_HOA2_latency_s_fx;
move32();
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
HrtfFastConv->FASTCONV_latency_s_Q_fx = Q31 - FASTCONV_factor_Q_HOA2_latency_s_fx;
move16();
HrtfFastConv->FASTCONV_taps_s_Q_fx = Q15 - FASTCONV_factor_Q_HOA2_fx;
move16();
-#endif
-
HrtfFastConv->ntaps = BINAURAL_NTAPS_SBA;
move16();
-#else
- HrtfFastConv->FASTCONV_HOA2_latency_s_fx = FASTCONV_HOA2_latency_s_fx;
- move32();
-#endif
}
IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_HOA3 ) )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
HrtfFastConv->FASTCONV_latency_s_fx = FASTCONV_HOA3_latency_s_fx;
move32();
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
HrtfFastConv->FASTCONV_latency_s_Q_fx = Q31 - FASTCONV_factor_Q_HOA3_latency_s_fx;
move16();
HrtfFastConv->FASTCONV_taps_s_Q_fx = Q15 - FASTCONV_factor_Q_HOA3_fx;
move16();
-#endif
HrtfFastConv->ntaps = BINAURAL_NTAPS_SBA;
move16();
-#else
- HrtfFastConv->FASTCONV_HOA3_latency_s_fx = FASTCONV_HOA3_latency_s_fx;
- move32();
-#endif
}
IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_FOA ) )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
HrtfFastConv->FASTCONV_latency_s_fx = FASTCONV_FOA_latency_s_fx;
move32();
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
HrtfFastConv->FASTCONV_latency_s_Q_fx = Q31 - FASTCONV_factor_Q_FOA_latency_s_fx;
move16();
HrtfFastConv->FASTCONV_taps_s_Q_fx = Q15 - FASTCONV_factor_Q_FOA_fx;
move16();
-#endif
HrtfFastConv->ntaps = BINAURAL_NTAPS_SBA;
move16();
-#else
- HrtfFastConv->FASTCONV_FOA_latency_s_fx = FASTCONV_FOA_latency_s_fx;
- move32();
-#endif
}
+
test();
IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
HrtfFastConv->FASTCONV_latency_s_fx = FASTCONV_BRIR_latency_s_fx;
move32();
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
HrtfFastConv->FASTCONV_latency_s_Q_fx = Q31 - FASTCONV_factor_Q_BRIR_latency_s_fx;
move16();
HrtfFastConv->FASTCONV_taps_s_Q_fx = Q15 - FASTCONV_factor_Q_BRIR_fx;
@@ -979,23 +675,13 @@ static ivas_error ivas_binaural_hrtf_open_fx(
move16();
HrtfFastConv->FASTCONV_reverbEne_s_Q_fx = Q15 - FASTCONV_factor_Q_reverberationEneCorrections_fx;
move16();
-#endif
HrtfFastConv->ntaps = BINAURAL_NTAPS_MAX;
move16();
-#else
- HrtfFastConv->FASTCONV_BRIR_latency_s_fx = FASTCONV_BRIR_latency_s_fx;
- move32();
-#endif
}
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
HrtfFastConv->allocate_init_flag = 0;
-#else
- HrtfFastConv->allocate_init_flag = 1;
-#endif
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
n_channels = 0;
move16();
@@ -1025,174 +711,78 @@ static ivas_error ivas_binaural_hrtf_open_fx(
move16();
}
}
+
IF( NE_32( ( error = ivas_allocate_binaural_hrtf_fx( HrtfFastConv, n_channels, HrtfFastConv->allocate_init_flag ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_allocate_binaural_hrtf_fx( HrtfFastConv, input_config, BINAURAL_INPUT_AUDIO_CONFIG_INVALID, renderer_type, HrtfFastConv->allocate_init_flag ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
+
FOR( i = 0; i < BINAURAL_CONVBANDS; i++ )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
test();
test();
IF( EQ_32( renderer_type, RENDERER_BINAURAL_FASTCONV ) && EQ_32( HrtfFastConv->n_channels, HRTF_LS_CHANNELS ) )
-#else
- IF( EQ_32( renderer_type, RENDERER_BINAURAL_FASTCONV ) )
-#endif
{
FOR( j = 0; j < HRTF_LS_CHANNELS; j++ )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
Copy_Scale_sig_16_32_r( leftHRIRReal_fx[i][j], HrtfFastConv->leftReal_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HRIR_fx );
Copy_Scale_sig_16_32_r( leftHRIRImag_fx[i][j], HrtfFastConv->leftImag_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HRIR_fx );
Copy_Scale_sig_16_32_r( rightHRIRReal_fx[i][j], HrtfFastConv->rightReal_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HRIR_fx );
Copy_Scale_sig_16_32_r( rightHRIRImag_fx[i][j], HrtfFastConv->rightImag_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HRIR_fx );
-#else
- HrtfFastConv->leftReal_fx[i][j] = leftHRIRReal_fx[i][j];
- HrtfFastConv->leftImag_fx[i][j] = leftHRIRImag_fx[i][j];
- HrtfFastConv->rightReal_fx[i][j] = rightHRIRReal_fx[i][j];
- HrtfFastConv->rightImag_fx[i][j] = rightHRIRImag_fx[i][j];
-#endif
-#else
- HrtfFastConv->leftHRIRReal_fx[i][j] = leftHRIRReal_fx[i][j];
- HrtfFastConv->leftHRIRImag_fx[i][j] = leftHRIRImag_fx[i][j];
- HrtfFastConv->rightHRIRReal_fx[i][j] = rightHRIRReal_fx[i][j];
- HrtfFastConv->rightHRIRImag_fx[i][j] = rightHRIRImag_fx[i][j];
-#endif
}
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
ELSE IF( EQ_32( renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) && EQ_32( HrtfFastConv->n_channels, HRTF_LS_CHANNELS ) )
-#else
- ELSE IF( EQ_32( renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
-#endif
{
FOR( j = 0; j < HRTF_LS_CHANNELS; j++ )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
Copy_Scale_sig_16_32_r( leftBRIRReal_fx[i][j], HrtfFastConv->leftReal_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_BRIR_fx );
Copy_Scale_sig_16_32_r( leftBRIRImag_fx[i][j], HrtfFastConv->leftImag_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_BRIR_fx );
Copy_Scale_sig_16_32_r( rightBRIRReal_fx[i][j], HrtfFastConv->rightReal_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_BRIR_fx );
Copy_Scale_sig_16_32_r( rightBRIRImag_fx[i][j], HrtfFastConv->rightImag_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_BRIR_fx );
-#else
- HrtfFastConv->leftReal_fx[i][j] = leftBRIRReal_fx[i][j];
- HrtfFastConv->leftImag_fx[i][j] = leftBRIRImag_fx[i][j];
- HrtfFastConv->rightReal_fx[i][j] = rightBRIRReal_fx[i][j];
- HrtfFastConv->rightImag_fx[i][j] = rightBRIRImag_fx[i][j];
-#endif
-#else
- HrtfFastConv->leftBRIRReal_fx[i][j] = leftBRIRReal_fx[i][j];
- HrtfFastConv->leftBRIRImag_fx[i][j] = leftBRIRImag_fx[i][j];
- HrtfFastConv->rightBRIRReal_fx[i][j] = rightBRIRReal_fx[i][j];
- HrtfFastConv->rightBRIRImag_fx[i][j] = rightBRIRImag_fx[i][j];
-#endif
}
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
test();
IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_HOA3 ) && EQ_32( HrtfFastConv->n_channels, HOA3_CHANNELS ) )
-#else
- IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_HOA3 ) )
-#endif
{
FOR( j = 0; j < HOA3_CHANNELS; j++ )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
Copy_Scale_sig_16_32_r( leftHRIRReal_HOA3_fx[i][j], HrtfFastConv->leftReal_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HOA3_fx );
Copy_Scale_sig_16_32_r( leftHRIRImag_HOA3_fx[i][j], HrtfFastConv->leftImag_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HOA3_fx );
Copy_Scale_sig_16_32_r( rightHRIRReal_HOA3_fx[i][j], HrtfFastConv->rightReal_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HOA3_fx );
Copy_Scale_sig_16_32_r( rightHRIRImag_HOA3_fx[i][j], HrtfFastConv->rightImag_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HOA3_fx );
-#else
- HrtfFastConv->leftReal_fx[i][j] = leftHRIRReal_HOA3_fx[i][j];
- HrtfFastConv->leftImag_fx[i][j] = leftHRIRImag_HOA3_fx[i][j];
- HrtfFastConv->rightReal_fx[i][j] = rightHRIRReal_HOA3_fx[i][j];
- HrtfFastConv->rightImag_fx[i][j] = rightHRIRImag_HOA3_fx[i][j];
-#endif
-#else
- HrtfFastConv->leftHRIRReal_HOA3_fx[i][j] = leftHRIRReal_HOA3_fx[i][j];
- HrtfFastConv->leftHRIRImag_HOA3_fx[i][j] = leftHRIRImag_HOA3_fx[i][j];
- HrtfFastConv->rightHRIRReal_HOA3_fx[i][j] = rightHRIRReal_HOA3_fx[i][j];
- HrtfFastConv->rightHRIRImag_HOA3_fx[i][j] = rightHRIRImag_HOA3_fx[i][j];
-#endif
}
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
/* Note: IVAS_AUDIO_CONFIG_HOA2 and IVAS_AUDIO_CONFIG_FOA input configs. are not relevant in internal renderer
as SBA to binaural always synthesizes HOA3 output for binauralization. However, the external renderer can use them. */
test();
IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_HOA2 ) && EQ_32( HrtfFastConv->n_channels, HOA2_CHANNELS ) )
-#else
- IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_HOA2 ) )
-#endif
{
FOR( j = 0; j < HOA2_CHANNELS; j++ )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
Copy_Scale_sig_16_32_r( leftHRIRReal_HOA2_fx[i][j], HrtfFastConv->leftReal_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HOA2_fx );
Copy_Scale_sig_16_32_r( leftHRIRImag_HOA2_fx[i][j], HrtfFastConv->leftImag_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HOA2_fx );
Copy_Scale_sig_16_32_r( rightHRIRReal_HOA2_fx[i][j], HrtfFastConv->rightReal_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HOA2_fx );
Copy_Scale_sig_16_32_r( rightHRIRImag_HOA2_fx[i][j], HrtfFastConv->rightImag_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_HOA2_fx );
-#else
- HrtfFastConv->leftReal_fx[i][j] = leftHRIRReal_HOA2_fx[i][j];
- HrtfFastConv->leftImag_fx[i][j] = leftHRIRImag_HOA2_fx[i][j];
- HrtfFastConv->rightReal_fx[i][j] = rightHRIRReal_HOA2_fx[i][j];
- HrtfFastConv->rightImag_fx[i][j] = rightHRIRImag_HOA2_fx[i][j];
-#endif
-#else
- HrtfFastConv->leftHRIRReal_HOA2_fx[i][j] = leftHRIRReal_HOA2_fx[i][j];
- HrtfFastConv->leftHRIRImag_HOA2_fx[i][j] = leftHRIRImag_HOA2_fx[i][j];
- HrtfFastConv->rightHRIRReal_HOA2_fx[i][j] = rightHRIRReal_HOA2_fx[i][j];
- HrtfFastConv->rightHRIRImag_HOA2_fx[i][j] = rightHRIRImag_HOA2_fx[i][j];
-#endif
}
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
test();
IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_FOA ) && EQ_32( HrtfFastConv->n_channels, FOA_CHANNELS ) )
-#else
- IF( EQ_32( input_config, IVAS_AUDIO_CONFIG_FOA ) )
-#endif
{
FOR( j = 0; j < FOA_CHANNELS; j++ )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
Copy_Scale_sig_16_32_r( leftHRIRReal_FOA_fx[i][j], HrtfFastConv->leftReal_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_FOA_fx );
Copy_Scale_sig_16_32_r( leftHRIRImag_FOA_fx[i][j], HrtfFastConv->leftImag_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_FOA_fx );
Copy_Scale_sig_16_32_r( rightHRIRReal_FOA_fx[i][j], HrtfFastConv->rightReal_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_FOA_fx );
Copy_Scale_sig_16_32_r( rightHRIRImag_FOA_fx[i][j], HrtfFastConv->rightImag_fx[i][j], HrtfFastConv->ntaps, Q29 - FASTCONV_factor_Q_FOA_fx );
-#else
- HrtfFastConv->leftReal_fx[i][j] = leftHRIRReal_FOA_fx[i][j];
- HrtfFastConv->leftImag_fx[i][j] = leftHRIRImag_FOA_fx[i][j];
- HrtfFastConv->rightReal_fx[i][j] = rightHRIRReal_FOA_fx[i][j];
- HrtfFastConv->rightImag_fx[i][j] = rightHRIRImag_FOA_fx[i][j];
-#endif
-#else
- HrtfFastConv->leftHRIRReal_FOA_fx[i][j] = leftHRIRReal_FOA_fx[i][j];
- HrtfFastConv->leftHRIRImag_FOA_fx[i][j] = leftHRIRImag_FOA_fx[i][j];
- HrtfFastConv->rightHRIRReal_FOA_fx[i][j] = rightHRIRReal_FOA_fx[i][j];
- HrtfFastConv->rightHRIRImag_FOA_fx[i][j] = rightHRIRImag_FOA_fx[i][j];
-#endif
}
}
}
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
Copy_Scale_sig_16_32_r( fastconvReverberationTimes_fx, HrtfFastConv->fastconvReverberationTimes_fx, CLDFB_NO_CHANNELS_MAX, Q26 - FASTCONV_factor_Q_reverberationTimes_fx );
Copy_Scale_sig_16_32_r( fastconvReverberationEneCorrections_fx, HrtfFastConv->fastconvReverberationEneCorrections_fx, CLDFB_NO_CHANNELS_MAX, Q31 - FASTCONV_factor_Q_reverberationTimes_fx );
-#else
- Copy32( fastconvReverberationTimes_fx, HrtfFastConv->fastconvReverberationTimes_fx, CLDFB_NO_CHANNELS_MAX );
- Copy32( fastconvReverberationEneCorrections_fx, HrtfFastConv->fastconvReverberationEneCorrections_fx, CLDFB_NO_CHANNELS_MAX );
-#endif
*hHrtfFastConv = HrtfFastConv;
@@ -1209,12 +799,12 @@ static ivas_error ivas_binaural_hrtf_open_fx(
static void ivas_binaural_obtain_DMX_fx(
const Word16 numTimeSlots,
- BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: fastconv binaural renderer handle */
+ BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: fastconv binaural renderer handle */
Word32 RealBuffer[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Contains the LS signals Q_in_out */
Word32 ImagBuffer[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* i : Contains the LS signals Q_in_out */
- Word32 realDMX[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /*Q_in_out*/
- Word32 imagDMX[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /*Q_in_out*/
- Word16 *Q_in_out ) /*i/o: input and output Q*/
+ Word32 realDMX[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* Q_in_out */
+ Word32 imagDMX[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /* Q_in_out */
+ Word16 *Q_in_out ) /* i/o: input and output Q */
{
Word16 chIdx, bandIdx, k;
@@ -1369,6 +959,7 @@ static void ivas_binaural_obtain_DMX_fx(
}
}
}
+
IF( NE_16( hBinRenderer->nInChannels, HOA3_CHANNELS ) )
{
*Q_in_out = sub( *Q_in_out, 1 );
@@ -1433,12 +1024,7 @@ ivas_error ivas_rend_openCldfbRend(
move16();
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
ivas_output_init( hBinRenderer->hInputSetup, inConfig );
-#else
- hBinRenderer->hInputSetup->is_loudspeaker_setup = 0;
- hBinRenderer->hInputSetup->output_config = inConfig;
-#endif
IF( ( error = getAudioConfigNumChannels( inConfig, &hBinRenderer->hInputSetup->nchan_out_woLFE ) ) != IVAS_ERR_OK )
{
@@ -1473,15 +1059,7 @@ ivas_error ivas_rend_openCldfbRend(
return error;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
pCldfbRend->binaural_latency_ns = L_shr_r( Mpy_32_32_r( pCldfbRend->hHrtfFastConv->FASTCONV_latency_s_fx, (Word32) 1000000000 ), pCldfbRend->hHrtfFastConv->FASTCONV_latency_s_Q_fx );
-#else
- pCldfbRend->binaural_latency_ns = Mult_32_32( pCldfbRend->hHrtfFastConv->FASTCONV_latency_s_fx, (Word32) 1000000000 );
-#endif
-#else
- pCldfbRend->binaural_latency_ns = (Word32) ( pCldfbRend->hHrtfFastConv->FASTCONV_HOA3_latency_s_fx * 1000000000 );
-#endif
move32();
hBinRenderer->hReverb = NULL;
move32();
@@ -1586,13 +1164,11 @@ ivas_error ivas_binRenderer_open_fx(
move16();
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
test();
IF( st_ivas->hHrtfFastConv == NULL && st_ivas->hDecoderConfig->Opt_HRTF_binary )
{
return IVAS_ERROR( IVAS_ERR_INTERNAL, "HRTF binary file present but not used in FastConv renderer" );
}
-#endif
/* Load HRTF tables */
IF( NE_32( ( error = ivas_binaural_hrtf_open_fx( &st_ivas->hHrtfFastConv, st_ivas->hIntSetup.output_config, st_ivas->renderer_type ) ), IVAS_ERR_OK ) )
@@ -1621,17 +1197,8 @@ ivas_error ivas_binRenderer_open_fx(
}
hBinRenderer->hoa_dec_mtx = st_ivas->hoa_dec_mtx;
-#ifdef FIX_CREND_SIMPLIFY_CODE
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
- st_ivas->binaural_latency_ns = L_shr_r( Mpy_32_32_r( st_ivas->hHrtfFastConv->FASTCONV_latency_s_fx, (Word32) 1000000000 ), st_ivas->hHrtfFastConv->FASTCONV_latency_s_Q_fx );
-#else
- st_ivas->binaural_latency_ns = st_ivas->hHrtfFastConv->FASTCONV_latency_s_fx;
- move32();
-#endif
-#else
- st_ivas->binaural_latency_ns = st_ivas->hHrtfFastConv->FASTCONV_BRIR_latency_s_fx;
-#endif
move32();
+ st_ivas->binaural_latency_ns = L_shr_r( Mpy_32_32_r( st_ivas->hHrtfFastConv->FASTCONV_latency_s_fx, (Word32) 1000000000 ), st_ivas->hHrtfFastConv->FASTCONV_latency_s_Q_fx );
}
ELSE
{
@@ -1641,51 +1208,7 @@ ivas_error ivas_binRenderer_open_fx(
return error;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
st_ivas->binaural_latency_ns = L_shr_r( Mpy_32_32_r( st_ivas->hHrtfFastConv->FASTCONV_latency_s_fx, (Word32) 1000000000 ), st_ivas->hHrtfFastConv->FASTCONV_latency_s_Q_fx );
-#else
- st_ivas->binaural_latency_ns = st_ivas->hHrtfFastConv->FASTCONV_latency_s_fx;
- move32();
-#endif
-#else
- IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )
- {
- IF( EQ_32( hBinRenderer->ivas_format, MC_FORMAT ) )
- {
- st_ivas->binaural_latency_ns = st_ivas->hHrtfFastConv->FASTCONV_HRIR_latency_s_fx;
- move32();
- }
- ELSE
- {
- IF( EQ_16( hBinRenderer->nInChannels, 16 ) )
- {
- st_ivas->binaural_latency_ns = st_ivas->hHrtfFastConv->FASTCONV_HOA3_latency_s_fx;
- move32();
- }
- ELSE IF( EQ_16( hBinRenderer->nInChannels, 9 ) )
- {
- st_ivas->binaural_latency_ns = st_ivas->hHrtfFastConv->FASTCONV_HOA2_latency_s_fx;
- move32();
- }
- ELSE IF( EQ_16( hBinRenderer->nInChannels, 4 ) )
- {
- st_ivas->binaural_latency_ns = st_ivas->hHrtfFastConv->FASTCONV_FOA_latency_s_fx;
- move32();
- }
- ELSE
- {
- return IVAS_ERR_INVALID_INPUT_FORMAT;
- }
- }
- }
- ELSE
- {
- /* same value for MC or HOA both use MC BRIR*/
- st_ivas->binaural_latency_ns = st_ivas->hHrtfFastConv->FASTCONV_BRIR_latency_s_fx;
- move32();
- }
-#endif
}
/* Allocate memories needed for reverb module */
@@ -1697,12 +1220,11 @@ ivas_error ivas_binRenderer_open_fx(
{
pRoomAcoustics = &( st_ivas->hRenderConfig->roomAcoustics );
}
+
IF( NE_32( ( error = ivas_binaural_reverb_init_fx( &( hBinRenderer->hReverb ), st_ivas->hHrtfStatistics, hBinRenderer->conv_band, hBinRenderer->timeSlots, pRoomAcoustics, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv->fastconvReverberationTimes_fx, st_ivas->hHrtfFastConv->fastconvReverberationEneCorrections_fx, NULL ) ), IVAS_ERR_OK ) )
{
return error;
}
-
- /* initialize the dmx matrix */
}
ELSE
{
@@ -1832,11 +1354,13 @@ static void ivas_binRenderer_convModuleClose_fx(
return;
}
+
/*-------------------------------------------------------------------------
* ivas_binRenderer_close()
*
* Close fastconv binaural renderer memories
*------------------------------------------------------------------------*/
+
void ivas_binRenderer_close_fx(
BINAURAL_RENDERER_HANDLE *hBinRenderer /* i/o: fastconv binaural renderer handle */
)
@@ -1863,11 +1387,13 @@ void ivas_binRenderer_close_fx(
return;
}
+
/*-------------------------------------------------------------------------
* ivas_free_pppHrtfMem()
*
* Free fastconv binaural renderer hrtf memories
*------------------------------------------------------------------------*/
+
static void ivas_free_pppHrtfMem_fx(
Word32 ****ppppHRIR, /*Qx*/
const Word16 dim,
@@ -1909,9 +1435,7 @@ void ivas_binaural_hrtf_close_fx(
)
{
Word16 allocate_init_flag;
-#ifdef FIX_CREND_SIMPLIFY_CODE
Word16 n_channels;
-#endif
test();
IF( hHrtfFastConv == NULL || *hHrtfFastConv == NULL )
@@ -1922,7 +1446,6 @@ void ivas_binaural_hrtf_close_fx(
allocate_init_flag = ( *hHrtfFastConv )->allocate_init_flag;
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
n_channels = ( *hHrtfFastConv )->n_channels;
move16();
@@ -1930,40 +1453,17 @@ void ivas_binaural_hrtf_close_fx(
ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftImag_fx, n_channels, allocate_init_flag );
ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightReal_fx, n_channels, allocate_init_flag );
ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightImag_fx, n_channels, allocate_init_flag );
-#else
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRReal_fx, HRTF_LS_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRImag_fx, HRTF_LS_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRReal_fx, HRTF_LS_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRImag_fx, HRTF_LS_CHANNELS, allocate_init_flag );
-
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftBRIRReal_fx, HRTF_LS_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftBRIRImag_fx, HRTF_LS_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightBRIRReal_fx, HRTF_LS_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightBRIRImag_fx, HRTF_LS_CHANNELS, allocate_init_flag );
-
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRReal_HOA3_fx, HOA3_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRImag_HOA3_fx, HOA3_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRReal_HOA3_fx, HOA3_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRImag_HOA3_fx, HOA3_CHANNELS, allocate_init_flag );
-
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRReal_HOA2_fx, HOA2_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRImag_HOA2_fx, HOA2_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRReal_HOA2_fx, HOA2_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRImag_HOA2_fx, HOA2_CHANNELS, allocate_init_flag );
-
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRReal_FOA_fx, FOA_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->leftHRIRImag_FOA_fx, FOA_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRReal_FOA_fx, FOA_CHANNELS, allocate_init_flag );
- ivas_free_pppHrtfMem_fx( &( *hHrtfFastConv )->rightHRIRImag_FOA_fx, FOA_CHANNELS, allocate_init_flag );
-#endif
+
return;
}
+
/*-------------------------------------------------------------------------*
* ivas_binaural_add_LFE()
*
* The functions adds the LFE to the left and right channels after binaural rendering
*-------------------------------------------------------------------------*/
+
void ivas_binaural_add_LFE_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
Word16 output_frame, /* i : length of input frame */
@@ -2009,7 +1509,8 @@ void ivas_binaural_add_LFE_fx(
}
FOR( idx_lfe = 0; idx_lfe < st_ivas->hIntSetup.num_lfe; idx_lfe++ )
{
- v_multc_fixed_16( input_fx[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain_fx, lfe_tc, output_frame ); // q_input_fx - 1
+ v_multc_fx_16( input_fx[st_ivas->hIntSetup.index_lfe[idx_lfe]], gain_fx, lfe_tc, output_frame ); // q_input_fx - 1
+
/* copy LFE to left and right channels */
FOR( idx = 0; idx < output_frame; idx++ )
{
@@ -2026,6 +1527,7 @@ void ivas_binaural_add_LFE_fx(
return;
}
+
/*-------------------------------------------------------------------------
* ivas_binRenderer_fx()
*
@@ -2077,13 +1579,13 @@ void ivas_binRenderer_fx(
/* Rotation in SHD (HOA3) */
IF( EQ_16( hCombinedOrientationData->shd_rot_max_order, -1 ) )
{
- rotateFrame_shd_cldfb( RealBuffer_fx, ImagBuffer_fx, hCombinedOrientationData->Rmat_fx[hCombinedOrientationData->subframe_idx], hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, 3 );
+ rotateFrame_shd_cldfb_fx( RealBuffer_fx, ImagBuffer_fx, hCombinedOrientationData->Rmat_fx[hCombinedOrientationData->subframe_idx], hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, 3 );
*Q_in = sub( *Q_in, 1 ); //( Q_in + 14 - 15 )
move16();
}
ELSE IF( hCombinedOrientationData->shd_rot_max_order > 0 )
{
- rotateFrame_shd_cldfb( RealBuffer_fx, ImagBuffer_fx, hCombinedOrientationData->Rmat_fx[hCombinedOrientationData->subframe_idx], hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, hCombinedOrientationData->shd_rot_max_order );
+ rotateFrame_shd_cldfb_fx( RealBuffer_fx, ImagBuffer_fx, hCombinedOrientationData->Rmat_fx[hCombinedOrientationData->subframe_idx], hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, hCombinedOrientationData->shd_rot_max_order );
*Q_in = sub( *Q_in, 1 ); //( Q_in + 14 - 15 )
move16();
}
@@ -2091,24 +1593,20 @@ void ivas_binRenderer_fx(
ELSE
{
/* Rotation in SD (CICPx) */
- rotateFrame_sd_cldfb_fixed( hCombinedOrientationData->Rmat_fx[hCombinedOrientationData->subframe_idx], RealBuffer_fx, ImagBuffer_fx,
- hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, numTimeSlots, hBinRenderer->conv_band );
+ rotateFrame_sd_cldfb_fx( hCombinedOrientationData->Rmat_fx[hCombinedOrientationData->subframe_idx], RealBuffer_fx, ImagBuffer_fx,
+ hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, numTimeSlots, hBinRenderer->conv_band );
}
}
/* HOA decoding to CICP19 if needed*/
test();
-#ifdef FIX_CREND_SIMPLIFY_CODE
test();
test();
IF( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 &&
( NE_16( hBinRenderer->nInChannels, HOA3_CHANNELS ) && NE_16( hBinRenderer->nInChannels, HOA2_CHANNELS ) && NE_16( hBinRenderer->nInChannels, FOA_CHANNELS ) ) )
-#else
- IF( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && NE_16( hBinRenderer->nInChannels, 16 ) )
-#endif
{
- ivas_sba2mc_cldfb_fixed( *( hBinRenderer->hInputSetup ), RealBuffer_fx, ImagBuffer_fx,
- hBinRenderer->nInChannels, hBinRenderer->conv_band, numTimeSlots, hBinRenderer->hoa_dec_mtx );
+ ivas_sba2mc_cldfb_fx( *( hBinRenderer->hInputSetup ), RealBuffer_fx, ImagBuffer_fx,
+ hBinRenderer->nInChannels, hBinRenderer->conv_band, numTimeSlots, hBinRenderer->hoa_dec_mtx );
}
ivas_binRenderer_filterModule_fx( Cldfb_RealBuffer_Binaural_fx[0], Cldfb_ImagBuffer_Binaural_fx[0], RealBuffer_fx, ImagBuffer_fx, numTimeSlots, hBinRenderer, 0, *Q_in );
@@ -2169,15 +1667,11 @@ void ivas_binRenderer_fx(
IF( hBinRenderer->hInputSetup->is_loudspeaker_setup )
{
- rotateFrame_sd_cldfb_fixed( Rmat_local, RealBuffer_fx, ImagBuffer_fx, hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, numTimeSlots, hBinRenderer->conv_band );
+ rotateFrame_sd_cldfb_fx( Rmat_local, RealBuffer_fx, ImagBuffer_fx, hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, numTimeSlots, hBinRenderer->conv_band );
}
ELSE
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
- rotateFrame_shd_cldfb( RealBuffer_fx, ImagBuffer_fx, Rmat_local, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, hBinRenderer->hInputSetup->ambisonics_order );
-#else
- rotateFrame_shd_cldfb( RealBuffer_fx, ImagBuffer_fx, Rmat_local, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, 3 );
-#endif
+ rotateFrame_shd_cldfb_fx( RealBuffer_fx, ImagBuffer_fx, Rmat_local, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, hBinRenderer->hInputSetup->ambisonics_order );
}
ivas_binRenderer_filterModule_fx( Cldfb_RealBuffer_Binaural_fx[pos_idx], Cldfb_ImagBuffer_Binaural_fx[pos_idx], RealBuffer_fx, ImagBuffer_fx, numTimeSlots, hBinRenderer, pos_idx, *Q_in );
@@ -2256,6 +1750,7 @@ void ivas_binRenderer_fx(
return;
}
+
/*-------------------------------------------------------------------------
* ivas_rend_CldfbMultiBinRendProcess()
*
@@ -2275,8 +1770,8 @@ void ivas_rend_CldfbMultiBinRendProcess(
const Word16 Q_in /* i : LS signals exp */
)
{
- int16_t slot_idx, ch_idx, idx, pose_idx, i, j;
- int16_t sf_idx;
+ Word16 slot_idx, ch_idx, idx, pose_idx, i, j;
+ Word16 sf_idx;
Word32 Cldfb_RealBuffer_sfIn[MAX_INPUT_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
Word32 Cldfb_ImagBuffer_sfIn[MAX_INPUT_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
Word32 Cldfb_RealBuffer_Binaural[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
diff --git a/lib_dec/ivas_core_dec_fx.c b/lib_dec/ivas_core_dec_fx.c
index de83e8a072fb3e427a731d888b2d1f7a899646b8..f3020662b8c87fd826cc41db8c9b65487b673b13 100644
--- a/lib_dec/ivas_core_dec_fx.c
+++ b/lib_dec/ivas_core_dec_fx.c
@@ -740,13 +740,8 @@ ivas_error ivas_core_dec_fx(
move16();
sts[1]->hHQ_core->Q_old_wtda = sub( 15, sts[1]->hHQ_core->exp_old_out );
move16();
-#ifdef FIX_1944_CRASH_FOR_STEREO
shift1 = getScaleFactor16( sts[0]->hHQ_core->old_out_fx, L_FRAME48k );
shift2 = getScaleFactor16( sts[1]->hHQ_core->old_out_fx, L_FRAME48k );
-#else
- shift1 = norm_arr( sts[0]->hHQ_core->old_out_fx, L_FRAME48k );
- shift2 = norm_arr( sts[1]->hHQ_core->old_out_fx, L_FRAME48k );
-#endif
scale_sig( sts[0]->hHQ_core->old_out_fx, L_FRAME48k, shift1 );
scale_sig( sts[1]->hHQ_core->old_out_fx, L_FRAME48k, shift2 );
sts[0]->hHQ_core->Q_old_wtda = add( sts[0]->hHQ_core->Q_old_wtda, shift1 );
diff --git a/lib_dec/ivas_cpe_dec_fx.c b/lib_dec/ivas_cpe_dec_fx.c
index ac16c4a2d4d94abc8729404d6be2e33bbfff0bfe..743add2729206717059bfa5b5db180ea706b621f 100644
--- a/lib_dec/ivas_cpe_dec_fx.c
+++ b/lib_dec/ivas_cpe_dec_fx.c
@@ -664,11 +664,7 @@ ivas_error ivas_cpe_dec_fx(
IF( NE_16( shift, 31 ) )
{
-#ifdef FIX_1946_CRASH_JBM_PROCESSING
shift = sub( add( hCPE->hStereoDft->q_dft, shift ), Q17 ); /* Q17 for guard bits */
-#else
- shift = sub( add( hCPE->hStereoDft->q_dft, shift ), Q16 ); /* Q16 for guard bits */
-#endif
IF( GT_16( shift, hCPE->hStereoDft->q_dft ) )
{
@@ -973,11 +969,7 @@ static ivas_error stereo_dft_dec_main(
IF( NE_16( shift, 31 ) )
{
-#ifdef FIX_1946_CRASH_JBM_PROCESSING
shift = sub( add( hCPE->hStereoDft->q_dft, shift ), Q17 ); /* Q17 for guard bits */
-#else
- shift = sub( add( hCPE->hStereoDft->q_dft, shift ), Q16 ); /* Q16 for guard bits */
-#endif
IF( GT_16( shift, hCPE->hStereoDft->q_dft ) )
{
diff --git a/lib_dec/ivas_dirac_dec_fx.c b/lib_dec/ivas_dirac_dec_fx.c
index 6d36b342903b909194a52f873911e86a8ebbcc85..6e30bc084031b0268c4a1865f7db633dc795938a 100644
--- a/lib_dec/ivas_dirac_dec_fx.c
+++ b/lib_dec/ivas_dirac_dec_fx.c
@@ -960,11 +960,14 @@ static ivas_error ivas_dirac_rend_config_fx(
return error;
}
+
+
/*-------------------------------------------------------------------------
* ivas_dirac_dec_config()
*
* Open or reconfigure decoder DirAC/MASA handle
*-------------------------------------------------------------------------*/
+
ivas_error ivas_dirac_dec_config_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const DIRAC_CONFIG_FLAG flag_config_inp /* i/ : Flag determining if we open or reconfigure the DirAC decoder */
@@ -1195,15 +1198,16 @@ ivas_error ivas_dirac_dec_config_fx(
}
}
-
return error;
}
+
/*-------------------------------------------------------------------------
* ivas_dirac_dec_close()
*
* Close DirAC memories
*------------------------------------------------------------------------*/
+
void ivas_dirac_dec_close_fx(
DIRAC_DEC_HANDLE *hDirAC_out )
{
@@ -1229,11 +1233,14 @@ void ivas_dirac_dec_close_fx(
return;
}
+
+
/*-------------------------------------------------------------------------
* ivas_dirac_dec_read_BS_fx()
*
* Read DirAC parameters from the bitstream
*------------------------------------------------------------------------*/
+
void ivas_dirac_dec_read_BS_fx(
const Word32 ivas_total_brate, /* i : IVAS total bitrate */
Decoder_State *st, /* i/o: decoder state structure */
@@ -1288,6 +1295,7 @@ void ivas_dirac_dec_read_BS_fx(
*nb_bits = add( *nb_bits, ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), nchan_transport, NULL, SBA_FORMAT ) );
move16();
+
FOR( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
{
hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].azimuth_fx[i] = hQMetaData->q_direction[0].band_data[1].azimuth_fx[0];
@@ -1415,11 +1423,14 @@ void ivas_dirac_dec_read_BS_fx(
return;
}
+
+
/*-----------------------------------------------------------------------*
* ivas_qmetadata_to_dirac()
*
* Copy qmetedata to DirAC parameters for rendering
*-----------------------------------------------------------------------*/
+
void ivas_qmetadata_to_dirac_fx(
const IVAS_QMETADATA_HANDLE hQMetaData, /* i : frame of MASA q_metadata */
DIRAC_DEC_HANDLE hDirAC, /* i : DirAC decoder structure */
@@ -1847,7 +1858,6 @@ void ivas_qmetadata_to_dirac_fx(
move16();
}
-
hSpatParamRendCom->energy_ratio1_fx[tmp_write_idx_band][b] = q_direction->band_data[qBand_idx].energy_ratio_fx[0];
move32();
hSpatParamRendCom->diffuseness_vector_fx[tmp_write_idx_band][b] = diffuseness_fx;
@@ -1924,97 +1934,16 @@ void ivas_qmetadata_to_dirac_fx(
/* update buffer write index */
hSpatParamRendCom->dirac_bs_md_write_idx = add( hSpatParamRendCom->dirac_bs_md_write_idx, MAX_PARAM_SPATIAL_SUBFRAMES ) % hSpatParamRendCom->dirac_md_buffer_length;
move16();
+
return;
}
+
+
/*-------------------------------------------------------------------------
* ivas_dirac_dec_set_md_map()
*
* Set metadata index mapping for DirAC
*------------------------------------------------------------------------*/
-void ivas_dirac_dec_set_md_map(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- const Word16 nCldfbTs /* i : number of CLDFB time slots */
-)
-{
- Word16 num_slots_in_subfr;
- DIRAC_DEC_HANDLE hDirAC;
- SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
-
- hDirAC = st_ivas->hDirAC;
- hSpatParamRendCom = st_ivas->hSpatParamRendCom;
-
- /* adapt subframes */
- hSpatParamRendCom->num_slots = nCldfbTs;
- move16();
- hSpatParamRendCom->slots_rendered = 0;
- move16();
- num_slots_in_subfr = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES;
- move16();
- hSpatParamRendCom->subframes_rendered = 0;
- move16();
-
- ivas_jbm_dec_get_adapted_subframes( nCldfbTs, hSpatParamRendCom->subframe_nbslots, &hSpatParamRendCom->nb_subframes );
-
- /* copy also to tc buffer */
- /* only for non-combined formats and combinded formats w/o discrete objects */
- test();
- test();
- test();
- IF( ( NE_16( st_ivas->ivas_format, MASA_ISM_FORMAT ) || NE_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) ) && !( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_16( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) ) )
- {
- st_ivas->hTcBuffer->nb_subframes = hSpatParamRendCom->nb_subframes;
- move16();
- Copy( hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, hSpatParamRendCom->nb_subframes );
- }
-
- /* set mapping according to dirac_read_idx */
-
- set16_fx( hSpatParamRendCom->render_to_md_map, 0, MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME );
-
- test();
- test();
- IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )
- {
- ivas_jbm_dec_get_md_map_even_spacing( nCldfbTs, num_slots_in_subfr, 0, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );
- }
- ELSE IF( hDirAC == NULL || hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 )
- {
- ivas_jbm_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, 0, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );
- }
- ELSE
- {
- ivas_jbm_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, hSpatParamRendCom->dirac_read_idx, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );
- }
-
- test();
- test();
- IF( hDirAC == NULL || hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 )
- {
- Word64 tmp_fx;
- Word16 sf_idx, slot_idx, slot_idx_abs;
- Word32 quo, rem;
-
- slot_idx_abs = 0;
- move16();
- FOR( sf_idx = 0; sf_idx < hSpatParamRendCom->nb_subframes; sf_idx++ )
- {
- tmp_fx = 0;
- move64();
- FOR( slot_idx = 0; slot_idx < hSpatParamRendCom->subframe_nbslots[sf_idx]; slot_idx++ )
- {
- tmp_fx = W_add_nosat( tmp_fx, W_deposit32_l( L_deposit_l( hSpatParamRendCom->render_to_md_map[slot_idx_abs] ) ) );
- slot_idx_abs = add( slot_idx_abs, 1 );
- }
- iDiv_and_mod_32( W_shl_sat_l( tmp_fx, 16 ), hSpatParamRendCom->subframe_nbslots[sf_idx], &quo, &rem, 0 );
- hSpatParamRendCom->render_to_md_map[sf_idx] = add( round_fx( quo ), hSpatParamRendCom->dirac_read_idx ) % hSpatParamRendCom->dirac_md_buffer_length;
- move16();
- }
-
- set16_fx( &hSpatParamRendCom->render_to_md_map[hSpatParamRendCom->nb_subframes], 0, sub( MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME, hSpatParamRendCom->nb_subframes ) );
- }
-
- return;
-}
void ivas_dirac_dec_set_md_map_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
@@ -2053,7 +1982,6 @@ void ivas_dirac_dec_set_md_map_fx(
}
/* set mapping according to dirac_read_idx */
-
set16_fx( hSpatParamRendCom->render_to_md_map, 0, MAX_JBM_SUBFRAMES_5MS * JBM_CLDFB_SLOTS_IN_SUBFRAME );
test();
@@ -2147,20 +2075,28 @@ void ivas_dirac_dec_render_fx(
Word16 temp = 0;
move16();
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
- Word32 *output_f_local_fx[MAX_OUTPUT_CHANNELS];
- Word32 output_f_local_buff_fx[MAX_OUTPUT_CHANNELS][L_FRAME48k] = { 0 }; // VE2SB: TBV
+ Word32 *output_fx_local[MAX_OUTPUT_CHANNELS];
+#ifdef FIX_RENDERER_STACK
+ Word32 *p_output_fx[MAX_OUTPUT_CHANNELS];
+ Word32 output_fx_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];
+#else
+ Word32 output_fx_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k] = { 0 };
+#endif
hSpatParamRendCom = st_ivas->hSpatParamRendCom;
nchan_intern = add( st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hIntSetup.num_lfe );
FOR( ch = 0; ch < nchan_intern; ch++ )
{
- output_f_local_fx[ch] = output_f_local_buff_fx[ch];
- set_zero_fx( output_f_local_fx[ch], nSamplesAsked );
+ output_fx_local[ch] = output_fx_local_buff[ch];
+#ifdef FIX_RENDERER_STACK
+ p_output_fx[ch] = output_fx[ch];
+#else
+ set_zero_fx( output_fx_local[ch], nSamplesAsked );
+#endif
}
slot_size = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); // cL
-
/* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */
slots_to_render = s_min( sub( hSpatParamRendCom->num_slots, hSpatParamRendCom->slots_rendered ), idiv1616( nSamplesAsked, slot_size ) );
@@ -2180,29 +2116,42 @@ void ivas_dirac_dec_render_fx(
FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
{
- ivas_dirac_dec_render_sf_fx( st_ivas, output_f_local_fx, nchan_transport, NULL, NULL );
+ ivas_dirac_dec_render_sf_fx( st_ivas, output_fx_local, nchan_transport, NULL, NULL );
n_samples_sf = i_mult( hSpatParamRendCom->subframe_nbslots[subframe_idx], hSpatParamRendCom->slot_size );
FOR( ch = 0; ch < nchan_intern; ch++ )
{
- output_f_local_fx[ch] += n_samples_sf;
+#ifdef FIX_RENDERER_STACK
+ /* move to output */
+ test();
+ test();
+ IF( !( ( st_ivas->hDirACRend->hOutSetup.separateChannelEnabled ) && ( EQ_16( st_ivas->hDirACRend->hOutSetup.separateChannelIndex, ch ) || EQ_16( add( st_ivas->hDirACRend->hOutSetup.separateChannelIndex, 1 ), ch ) ) ) )
+ {
+ Copy32( output_fx_local_buff[ch], p_output_fx[ch], n_samples_sf );
+ }
+
+ p_output_fx[ch] += n_samples_sf;
+#else
+ output_fx_local[ch] += n_samples_sf;
+#endif
}
/* update combined orientation access index */
ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );
}
+#ifndef FIX_RENDERER_STACK
FOR( ch = 0; ch < nchan_intern; ch++ )
{
test();
test();
IF( !( ( st_ivas->hDirACRend->hOutSetup.separateChannelEnabled ) && ( ( EQ_16( st_ivas->hDirACRend->hOutSetup.separateChannelIndex, ch ) || EQ_16( add( st_ivas->hDirACRend->hOutSetup.separateChannelIndex, 1 ), ch ) ) ) ) )
{
- Copy32( output_f_local_buff_fx[ch], output_fx[ch], *nSamplesRendered );
+ Copy32( output_fx_local_buff[ch], output_fx[ch], *nSamplesRendered );
}
}
-
+#endif
/* clang-format off */
IF( EQ_16( hSpatParamRendCom->slots_rendered, hSpatParamRendCom->num_slots ) )
{
@@ -2369,7 +2318,9 @@ void ivas_dirac_dec_render_sf_fx(
Word32 Cldfb_RealBuffer_Temp_fx[2][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
Word32 Cldfb_ImagBuffer_Temp_fx[2][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
#endif
+#ifndef FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES
Word16 cldfb_buf_q;
+#endif
Word16 offset = 0, buff_len = 0;
move16();
move16();
@@ -2410,7 +2361,6 @@ void ivas_dirac_dec_render_sf_fx(
}
}
-
hDirAC = st_ivas->hDirAC;
hDirACRend = st_ivas->hDirACRend;
hSpatParamRendCom = st_ivas->hSpatParamRendCom;
@@ -2505,7 +2455,6 @@ void ivas_dirac_dec_render_sf_fx(
move16();
}
-
test();
test();
IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
@@ -2881,13 +2830,16 @@ void ivas_dirac_dec_render_sf_fx(
move16();
}
- test();
- IF( ( NE_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) && NE_16( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) ) )
+ IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
{
#ifdef FIX_1319_STACK_SBA_DECODER
- ivas_omasa_preProcessStereoTransportsForMovedObjects_fx( st_ivas, Cldfb_RealBuffer_Binaural_fx[0], Cldfb_ImagBuffer_Binaural_fx[0], &cldfb_buf_q, hSpatParamRendCom->num_freq_bands, subframe_idx );
+#ifdef FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES
+ ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( st_ivas, Cldfb_RealBuffer_Binaural_fx[0], Cldfb_ImagBuffer_Binaural_fx[0], &q_cldfb, hSpatParamRendCom->num_freq_bands, subframe_idx );
+#else
+ ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( st_ivas, Cldfb_RealBuffer_Binaural_fx[0], Cldfb_ImagBuffer_Binaural_fx[0], &cldfb_buf_q, hSpatParamRendCom->num_freq_bands, subframe_idx );
+#endif
#else
- ivas_omasa_preProcessStereoTransportsForMovedObjects_fx( st_ivas, Cldfb_RealBuffer_Temp_fx, Cldfb_ImagBuffer_Temp_fx, &cldfb_buf_q, hSpatParamRendCom->num_freq_bands, subframe_idx );
+ ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( st_ivas, Cldfb_RealBuffer_Temp_fx, Cldfb_ImagBuffer_Temp_fx, &cldfb_buf_q, hSpatParamRendCom->num_freq_bands, subframe_idx );
#endif
}
}
@@ -3172,12 +3124,13 @@ void ivas_dirac_dec_render_sf_fx(
hDirACRend->q_buffer_energy[index - 1] = DirAC_mem.reference_power_q[0];
move16();
- computeDiffuseness_fixed( hDirACRend->buffer_intensity_real_fx, hDirACRend->buffer_energy_fx, num_freq_bands, hSpatParamRendCom->diffuseness_vector_fx[md_idx], hDirACRend->q_buffer_intensity_real, hDirACRend->q_buffer_energy, &hSpatParamRendCom->q_diffuseness_vector );
+ computeDiffuseness_fx( hDirACRend->buffer_intensity_real_fx, hDirACRend->buffer_energy_fx, num_freq_bands, hSpatParamRendCom->diffuseness_vector_fx[md_idx], hDirACRend->q_buffer_intensity_real, hDirACRend->q_buffer_energy, &hSpatParamRendCom->q_diffuseness_vector );
}
/*-----------------------------------------------------------------*
* frequency domain decorrelation
*-----------------------------------------------------------------*/
+
IF( EQ_16( hDirACRend->proto_signal_decorr_on, 1 ) )
{
/* decorrelate prototype frame */
@@ -3198,9 +3151,9 @@ void ivas_dirac_dec_render_sf_fx(
hDirACRend->h_freq_domain_decorr_ap_params,
hDirACRend->h_freq_domain_decorr_ap_state );
- v_multc_fixed( onset_filter_fx, 536870912 /* 0.25f in Q31 */, onset_filter_fx, hSpatParamRendCom->num_freq_bands );
+ v_multc_fx( onset_filter_fx, 536870912 /* 0.25f in Q31 */, onset_filter_fx, hSpatParamRendCom->num_freq_bands );
- v_add_fixed_no_hdrm( onset_filter_fx, onset_filter_subframe_fx, onset_filter_subframe_fx, hSpatParamRendCom->num_freq_bands ); /* Q31 */
+ v_add_fx_no_hdrm( onset_filter_fx, onset_filter_subframe_fx, onset_filter_subframe_fx, hSpatParamRendCom->num_freq_bands ); /* Q31 */
p_onset_filter_fx = onset_filter_subframe_fx;
}
ELSE
@@ -3254,6 +3207,7 @@ void ivas_dirac_dec_render_sf_fx(
/*-----------------------------------------------------------------*
* output synthesis
*-----------------------------------------------------------------*/
+
test();
IF( ( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_PSD_LS ) || EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_PSD_SHD ) ) )
{
@@ -3373,15 +3327,15 @@ void ivas_dirac_dec_render_sf_fx(
IF( NE_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
{
- v_add_fixed_me( reference_power_fx, sub( 31, DirAC_mem.reference_power_q[0] ),
- reference_power_smooth_fx, sub( 31, q_reference_power_smooth[0] ),
- reference_power_smooth_fx, &temp_q,
- s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), 1 );
+ v_add_fx_me( reference_power_fx, sub( 31, DirAC_mem.reference_power_q[0] ),
+ reference_power_smooth_fx, sub( 31, q_reference_power_smooth[0] ),
+ reference_power_smooth_fx, &temp_q,
+ s_min( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ), 1 );
q_reference_power_smooth[0] = sub( 31, temp_q );
- v_add_fixed_me( reference_power_fx + CLDFB_NO_CHANNELS_HALF, sub( 31, DirAC_mem.reference_power_q[1] ),
- reference_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, sub( 31, q_reference_power_smooth[1] ),
- reference_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, &temp_q,
- s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), 1 );
+ v_add_fx_me( reference_power_fx + CLDFB_NO_CHANNELS_HALF, sub( 31, DirAC_mem.reference_power_q[1] ),
+ reference_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, sub( 31, q_reference_power_smooth[1] ),
+ reference_power_smooth_fx + CLDFB_NO_CHANNELS_HALF, &temp_q,
+ s_max( 0, sub( hSpatParamRendCom->num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), 1 );
q_reference_power_smooth[1] = sub( 31, temp_q );
}
}
@@ -3830,17 +3784,20 @@ void ivas_dirac_dec_render_sf_fx(
Word16 az_q0 = extract_l( L_shr( st_ivas->hIsmMetaData[i]->azimuth_fx, Q22 ) );
Word16 el_q0 = extract_l( L_shr( st_ivas->hIsmMetaData[i]->elevation_fx, Q22 ) );
Word32 az1_32, el1_32;
- rotateAziEle_fixed( az_q0, el_q0, &az1_32, &el1_32, st_ivas->hCombinedOrientationData->Rmat_fx[0], st_ivas->hIntSetup.is_planar_setup );
+
+ rotateAziEle_fx32( az_q0, el_q0, &az1_32, &el1_32, st_ivas->hCombinedOrientationData->Rmat_fx[0], st_ivas->hIntSetup.is_planar_setup );
IF( st_ivas->hEFAPdata != NULL )
{
const Word32 azi_fx = L_shl( az1_32, Q22 - Q16 ); // Q16 -> Q22
const Word32 ele_fx = L_shl( el1_32, Q22 - Q16 ); // Q16 -> Q22
efap_determine_gains_fx( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains_fx[i], azi_fx, ele_fx, EFAP_MODE_EFAP );
-#ifdef OBJ_EDITING_API
- // TODO: Enable gain editing feature
- // v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE ); // Q30, Q30 --> Q30
-#endif
+ // TODO: Align Q-values
+ IF( NE_32( st_ivas->hIsmMetaData[i]->edited_gain_fx, ONE_IN_Q29 ) )
+ {
+ v_multc_fx( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE ); // Q30, Q29 --> Q28
+ Scale_sig32( st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE, Q2 ); // Q28 --> Q30
+ }
}
}
@@ -4097,7 +4054,6 @@ void ivas_dirac_dec_render_sf_fx(
{
FOR( ch = 0; ch < outchannels; ch++ )
{
-
test();
test();
IF( ( hDirACRend->hOutSetup.num_lfe > 0 && ( EQ_16( hDirACRend->hOutSetup.index_lfe[idx_lfe], ch ) ) ) )
@@ -4204,7 +4160,6 @@ void ivas_dirac_dec_render_sf_fx(
hSpatParamRendCom->subframes_rendered = add( hSpatParamRendCom->subframes_rendered, 1 );
move16();
-
IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
{
hDirACRend->h_output_synthesis_psd_state.gains_dir_prev_q = hDirACRend->h_output_synthesis_psd_state.q_cy_cross_dir_smooth_prev;
diff --git a/lib_dec/ivas_dirac_output_synthesis_cov_fx.c b/lib_dec/ivas_dirac_output_synthesis_cov_fx.c
index 954dd5f72e35211386a25ec3703f839b8944ea1e..0ecd015ee407bb092acfb99da8bee139c120d20c 100644
--- a/lib_dec/ivas_dirac_output_synthesis_cov_fx.c
+++ b/lib_dec/ivas_dirac_output_synthesis_cov_fx.c
@@ -30,7 +30,6 @@
*******************************************************************************************************/
-
#include "basop_util.h"
#include "enh32.h"
#include
@@ -470,9 +469,9 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx(
scale_sig32( imag_in_buffer_fx, buf_len, sub( ImagBuffer_e, output_e ) );
cmplx_matrix_square_fx( real_in_buffer_fx, imag_in_buffer_fx, num_bands, nchan_in, real_buffer_fx, imag_buffer_fx, output_e, &output_e );
- v_add_fixed_me( cx_fx, *cx_e, real_buffer_fx, output_e, cx_fx, &tmp1_e, imult1616( nchan_in, nchan_in ), 1 );
+ v_add_fx_me( cx_fx, *cx_e, real_buffer_fx, output_e, cx_fx, &tmp1_e, imult1616( nchan_in, nchan_in ), 1 );
- v_add_fixed_me( cx_imag_fx, *cx_imag_e, imag_buffer_fx, output_e, cx_imag_fx, &tmp2_e, imult1616( nchan_in, nchan_in ), 1 );
+ v_add_fx_me( cx_imag_fx, *cx_imag_e, imag_buffer_fx, output_e, cx_imag_fx, &tmp2_e, imult1616( nchan_in, nchan_in ), 1 );
cx_fx_norm = L_norm_arr( cx_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
cx_imag_fx_norm = L_norm_arr( cx_imag_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
@@ -552,33 +551,32 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
move16();
}
- v_multc_fixed( mixing_matrix_fx[param_band_idx], L_deposit_h( hParamMC->h_output_synthesis_params.interpolator_fx[slot_idx_tot] ), mixing_matrix_smooth_fx, imult1616( nY, nX ) );
+ v_multc_fx( mixing_matrix_fx[param_band_idx], L_deposit_h( hParamMC->h_output_synthesis_params.interpolator_fx[slot_idx_tot] ), mixing_matrix_smooth_fx, imult1616( nY, nX ) );
mixing_matrix_smooth_e = mixing_matrix_e[param_band_idx]; // interpolator is W16
move16();
- v_multc_fixed( h_synthesis_state.mixing_matrix_old_fx[param_band_idx], L_sub( ONE_IN_Q31, L_deposit_h( hParamMC->h_output_synthesis_params.interpolator_fx[slot_idx_tot] ) ), mixing_matrix_buffer_fx, imult1616( nY, nX ) );
+ v_multc_fx( h_synthesis_state.mixing_matrix_old_fx[param_band_idx], L_sub( ONE_IN_Q31, L_deposit_h( hParamMC->h_output_synthesis_params.interpolator_fx[slot_idx_tot] ) ), mixing_matrix_buffer_fx, imult1616( nY, nX ) );
mixing_matrix_buffer_e = h_synthesis_state.mixing_matrix_old_exp[param_band_idx]; // interpolator is W16
move16();
- v_add_fixed_me( mixing_matrix_smooth_fx, mixing_matrix_smooth_e, mixing_matrix_buffer_fx, mixing_matrix_buffer_e, mixing_matrix_smooth_fx, &mixing_matrix_smooth_e, imult1616( nY, nX ), 0 );
+ v_add_fx_me( mixing_matrix_smooth_fx, mixing_matrix_smooth_e, mixing_matrix_buffer_fx, mixing_matrix_buffer_e, mixing_matrix_smooth_fx, &mixing_matrix_smooth_e, imult1616( nY, nX ), 0 );
IF( have_residual )
{
/* residual mixing matrix interpolation*/
- v_multc_fixed( mixing_matrix_res_fx[param_band_idx], L_deposit_h( hParamMC->h_output_synthesis_params.interpolator_fx[slot_idx_tot] ), mixing_matrix_res_smooth_fx, imult1616( nY, nY ) );
+ v_multc_fx( mixing_matrix_res_fx[param_band_idx], L_deposit_h( hParamMC->h_output_synthesis_params.interpolator_fx[slot_idx_tot] ), mixing_matrix_res_smooth_fx, imult1616( nY, nY ) );
mixing_matrix_res_smooth_e = mixing_matrix_res_e[param_band_idx]; // interpolator is W16
move16();
set_zero_fx( mixing_matrix_buffer_fx, imult1616( nY, nY ) );
- v_multc_fixed( h_synthesis_state.mixing_matrix_res_old_fx[param_band_idx], L_sub( ONE_IN_Q31, L_deposit_h( hParamMC->h_output_synthesis_params.interpolator_fx[slot_idx_tot] ) ), mixing_matrix_buffer_fx, imult1616( nY, nY ) );
+ v_multc_fx( h_synthesis_state.mixing_matrix_res_old_fx[param_band_idx], L_sub( ONE_IN_Q31, L_deposit_h( hParamMC->h_output_synthesis_params.interpolator_fx[slot_idx_tot] ) ), mixing_matrix_buffer_fx, imult1616( nY, nY ) );
mixing_matrix_buffer_e = h_synthesis_state.mixing_matrix_res_old_exp[param_band_idx]; // interpolator is W16
move16();
- v_add_fixed_me( mixing_matrix_res_smooth_fx, mixing_matrix_res_smooth_e, mixing_matrix_buffer_fx, mixing_matrix_buffer_e, mixing_matrix_res_smooth_fx, &mixing_matrix_res_smooth_e, imult1616( nY, nY ), 0 );
+ v_add_fx_me( mixing_matrix_res_smooth_fx, mixing_matrix_res_smooth_e, mixing_matrix_buffer_fx, mixing_matrix_buffer_e, mixing_matrix_res_smooth_fx, &mixing_matrix_res_smooth_e, imult1616( nY, nY ), 0 );
}
-
FOR( band = brange[0]; band < brange[1]; band++ )
{
assert( band >= 0 );
@@ -601,17 +599,16 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
shifter = sub( mixing_matrix_res_smooth_e, 32 );
FOR( ch_idx = 0; ch_idx < nY; ch_idx++ )
{
- int i;
+ Word16 i;
Word16 idx;
Word64 temp_real, temp_imag;
-
idx = ch_idx;
temp_real = 0;
temp_imag = 0;
move64();
move64();
- for ( i = 0; i < nY; i++ )
+ FOR( i = 0; i < nY; i++ )
{
temp_real = W_mac_32_32( temp_real, mixing_matrix_res_smooth_fx[idx], diff_f_real_fx[i] );
temp_imag = W_mac_32_32( temp_imag, mixing_matrix_res_smooth_fx[idx], diff_f_imag_fx[i] );
@@ -650,11 +647,10 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
FOR( ch_idx = 0; ch_idx < nY; ch_idx++ )
{
- int i;
+ Word16 i;
Word16 idx;
Word64 temp_real, temp_imag;
-
idx = ch_idx;
temp_real = 0;
temp_imag = 0;
@@ -721,7 +717,6 @@ Word16 computeMixingMatrices_fx(
Word32 svd_s_buffer_fx[MAX_OUTPUT_CHANNELS];
Word16 svd_s_buffer_e[MAX_OUTPUT_CHANNELS];
-
Word32 limit_fx;
Word16 limit_e;
@@ -789,7 +784,6 @@ Word16 computeMixingMatrices_fx(
Cy_fx_e = Cy_e;
move16();
-
/*-----------------------------------------------------------------*
* Decomposition of Cy
*-----------------------------------------------------------------*/
@@ -905,13 +899,11 @@ Word16 computeMixingMatrices_fx(
}
}
-
limit_fx = 0;
move32();
limit_e = 0;
move16();
-
/*-----------------------------------------------------------------*
* regularized Kx-1
*-----------------------------------------------------------------*/
@@ -935,12 +927,10 @@ Word16 computeMixingMatrices_fx(
*-----------------------------------------------------------------*/
/* Computing Q*Cx*Q' */
-
matrix_product_mant_exp_fx( Q_fx, Q_e, lengthCy, lengthCx, 0, Cx_fx, Cx_fx_e, lengthCx, lengthCx, 0, Q_Cx_fx, &Q_Cx_e );
matrix_product_diag_fx( Q_Cx_fx, Q_Cx_e, lengthCy, lengthCx, 0, Q_fx, Q_e, lengthCy, lengthCx, 1, Cy_hat_diag_fx, &Cy_hat_diag_e );
-
Word16 com_e = sub( limit_e, Cy_hat_diag_e );
FOR( i = 0; i < lengthCy; ++i )
{
@@ -978,13 +968,11 @@ Word16 computeMixingMatrices_fx(
move16();
}
-
/*-----------------------------------------------------------------*
* Formulate optimal P
*-----------------------------------------------------------------*/
/* Computing the input matrix Kx'*Q'*G_hat'*Ky */
-
Word16 mat_mult_buffer1_fx_e;
Word16 mat_mult_buffer2_fx_e[MAX_OUTPUT_CHANNELS * MAX_OUTPUT_CHANNELS];
@@ -1047,8 +1035,6 @@ Word16 computeMixingMatrices_fx(
*-----------------------------------------------------------------*/
/* Compute Cy_tilde = M*Cx*M' */
-
-
Word16 Cx_e_arr[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
set16_fx( Cx_e_arr, Cx_fx_e, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
matrix_product_mant_exp( mixing_matrix_fx, mixing_matrix_fx_e, lengthCy, lengthCx, 0, Cx_fx, Cx_e_arr, lengthCx, lengthCx, 0, mat_mult_buffer1_fx, mat_mult_buffer1_fx_e1 );
@@ -1218,6 +1204,7 @@ Word16 computeMixingMatrices_fx(
return out;
}
+
/*-------------------------------------------------------------------*
* computeMixingMatricesResidual()
*
diff --git a/lib_dec/ivas_init_dec_fx.c b/lib_dec/ivas_init_dec_fx.c
index 11fed28cb0ecbb511582a149a4b87ec627404007..00179537e0749a109a66aa1f3bb9899188094d57 100644
--- a/lib_dec/ivas_init_dec_fx.c
+++ b/lib_dec/ivas_init_dec_fx.c
@@ -151,9 +151,6 @@ ivas_error ivas_dec_get_format_fx(
/*-------------------------------------------------------------------*
* Read other signaling (ISM/MC mode, number of channels, etc.)
*-------------------------------------------------------------------*/
-#ifndef FIX_HRTF_LOAD
- k = extract_l( Mpy_32_32_r( ivas_total_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) );
-#endif
IF( is_DTXrate( ivas_total_brate ) == 0 )
{
@@ -175,13 +172,9 @@ ivas_error ivas_dec_get_format_fx(
/* read the number of objects */
nchan_ism = 1;
move16();
-#ifdef FIX_HRTF_LOAD
k = extract_l( Mpy_32_32_r( ivas_total_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) );
k = sub( k, 1 );
WHILE( st_ivas->bit_stream[k] && ( nchan_ism < MAX_NUM_OBJECTS ) )
-#else
- WHILE( st_ivas->bit_stream[k - 1] && nchan_ism < MAX_NUM_OBJECTS )
-#endif
{
nchan_ism = add( nchan_ism, 1 );
k = sub( k, 1 );
@@ -274,19 +267,11 @@ ivas_error ivas_dec_get_format_fx(
*/
nchan_ism = sub( 5, nchan_ism );
test();
-#ifdef FIX_HRTF_LOAD
IF( EQ_16( st_ivas->nchan_transport, 1 ) && EQ_16( nchan_ism, 2 ) )
{
nchan_ism = 1;
move16();
}
-#else
- IF( EQ_16( st_ivas->nchan_transport, 1 ) && EQ_16( st_ivas->nchan_ism, 2 ) )
- {
- st_ivas->nchan_ism = 1;
- move16();
- }
-#endif
/* for MASA_ISM_FORMAT at input the number of MASA transport channels is always 2 and the corresponding bit is not used here*/
st_ivas->nchan_transport = 2;
@@ -354,11 +339,7 @@ ivas_error ivas_dec_get_format_fx(
/* read Ambisonic (SBA) order (0 for signaling OSBA format at low bitrates)*/
sba_order = st_ivas->bit_stream[num_bits_read + 1];
move16();
-#ifdef FIX_HRTF_LOAD
sba_order = add( sba_order, shl( st_ivas->bit_stream[num_bits_read], 1 ) );
-#else
- sba_order = shl( st_ivas->bit_stream[num_bits_read], 1 );
-#endif
num_bits_read = add( num_bits_read, SBA_ORDER_BITS );
/* read the real Ambisonic order when the above bits are used to signal OSBA format */
@@ -366,11 +347,7 @@ ivas_error ivas_dec_get_format_fx(
{
sba_order = st_ivas->bit_stream[num_bits_read + 1];
move16();
-#ifdef FIX_HRTF_LOAD
sba_order = add( sba_order, shl( st_ivas->bit_stream[num_bits_read], 1 ) );
-#else
- sba_order = shl( st_ivas->bit_stream[num_bits_read], 1 );
-#endif
num_bits_read = add( num_bits_read, SBA_ORDER_BITS );
}
@@ -413,7 +390,7 @@ ivas_error ivas_dec_get_format_fx(
return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "wrong MC configuration signalled!" );
}
- st_ivas->mc_mode = ivas_mc_mode_select_fx( ivas_mc_map_output_config_to_mc_ls_setup_fx( signaled_config ), st_ivas->hDecoderConfig->ivas_total_brate );
+ st_ivas->mc_mode = ivas_mc_mode_select_fx( ivas_mc_map_output_config_to_mc_ls_setup_fx( signaled_config ), ivas_total_brate );
st_ivas->transport_config = signaled_config;
move16();
}
@@ -497,13 +474,9 @@ ivas_error ivas_dec_get_format_fx(
/* read the number of objects */
nchan_ism = 1;
move16();
-#ifdef FIX_HRTF_LOAD
k = extract_l( Mpy_32_32_r( ivas_total_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) );
k = sub( sub( k, 1 ), SID_FORMAT_NBITS );
WHILE( st_ivas->bit_stream[k] && ( nchan_ism < MAX_NUM_OBJECTS ) )
-#else
- WHILE( st_ivas->bit_stream[k - 1 - SID_FORMAT_NBITS] && nchan_ism < MAX_NUM_OBJECTS )
-#endif
{
nchan_ism = add( nchan_ism, 1 );
k = sub( k, 1 );
@@ -557,12 +530,7 @@ ivas_error ivas_dec_get_format_fx(
*-------------------------------------------------------------------*/
ivas_error ivas_dec_setup(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesRendered, /* o : number of samples flushed from the previous frame (JBM) */
- Word16 *data /* o : output synthesis signal */
-#endif
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
{
Word16 k, idx, num_bits_read;
@@ -594,7 +562,7 @@ ivas_error ivas_dec_setup(
}
/*-------------------------------------------------------------------*
- * Read other signling (ISM/MC mode, number of channels, etc.)
+ * Read other signaling (ISM/MC mode, number of channels, etc.)
*-------------------------------------------------------------------*/
IF( is_DTXrate( ivas_total_brate ) == 0 )
@@ -630,11 +598,7 @@ ivas_error ivas_dec_setup(
st_ivas->nchan_ism = nchan_ism;
move16();
-#ifdef FIX_HRTF_LOAD
IF( NE_32( ( error = ivas_ism_dec_config_fx( st_ivas, st_ivas->ism_mode ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_ism_dec_config_fx( st_ivas, st_ivas->ism_mode, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -657,11 +621,7 @@ ivas_error ivas_dec_setup(
test();
IF( st_ivas->ini_frame > 0 && NE_32( ivas_total_brate, st_ivas->last_active_ivas_total_brate ) && GT_32( ivas_total_brate, IVAS_SID_5k2 ) )
{
-#ifdef FIX_HRTF_LOAD
IF( NE_32( ( error = ivas_sba_dec_reconfigure_fx( st_ivas ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_sba_dec_reconfigure_fx( st_ivas, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -692,10 +652,8 @@ ivas_error ivas_dec_setup(
}
/* this should be non-zero if original input format was MASA_ISM_FORMAT */
-#ifdef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH
st_ivas->ism_mode = ISM_MODE_NONE;
move16();
-#endif
st_ivas->nchan_ism = add( st_ivas->bit_stream[sub( k, 3 )], shl( st_ivas->bit_stream[sub( k, 2 )], 1 ) );
IF( GT_16( st_ivas->nchan_ism, 0 ) )
@@ -743,11 +701,7 @@ ivas_error ivas_dec_setup(
}
ELSE
{
-#ifdef FIX_HRTF_LOAD
IF( NE_32( ( error = ivas_masa_dec_reconfigure_fx( st_ivas ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_masa_dec_reconfigure_fx( st_ivas, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -755,11 +709,7 @@ ivas_error ivas_dec_setup(
}
ELSE
{
-#ifdef FIX_HRTF_LOAD
IF( NE_32( ( error = ivas_omasa_dec_config_fx( st_ivas, &num_src, SrcInd ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_omasa_dec_config_fx( st_ivas, nSamplesRendered, &num_src, SrcInd, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -785,11 +735,7 @@ ivas_error ivas_dec_setup(
test();
IF( ( GT_32( ivas_total_brate, IVAS_SID_5k2 ) && NE_32( ivas_total_brate, st_ivas->hDecoderConfig->last_ivas_total_brate ) ) || ( st_ivas->ini_active_frame == 0 ) )
{
-#ifdef FIX_HRTF_LOAD
IF( NE_32( ( error = ivas_omasa_dec_config_fx( st_ivas, &num_src, SrcInd ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_omasa_dec_config_fx( st_ivas, nSamplesRendered, &num_src, SrcInd, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -828,11 +774,7 @@ ivas_error ivas_dec_setup(
test();
IF( st_ivas->ini_frame > 0 && NE_32( ivas_total_brate, st_ivas->last_active_ivas_total_brate ) )
{
-#ifdef FIX_HRTF_LOAD
IF( NE_32( ( error = ivas_sba_dec_reconfigure_fx( st_ivas ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_sba_dec_reconfigure_fx( st_ivas, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -849,9 +791,7 @@ ivas_error ivas_dec_setup(
test();
IF( st_ivas->ini_frame > 0 && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
{
- Word16 n;
-
- n = add( st_ivas->nchan_transport, st_ivas->nchan_ism );
+ Word16 n = add( st_ivas->nchan_transport, st_ivas->nchan_ism );
st_ivas->nCPE = shr_r( n, 1 );
}
}
@@ -882,11 +822,7 @@ ivas_error ivas_dec_setup(
num_bits_read = add( num_bits_read, MC_LS_SETUP_BITS );
/* select MC format mode; reconfigure the MC format decoder */
-#ifdef FIX_HRTF_LOAD
IF( NE_32( ( error = ivas_mc_dec_config_fx( st_ivas, idx ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_mc_dec_config_fx( st_ivas, idx, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -997,11 +933,7 @@ ivas_error ivas_dec_setup(
move16();
}
-#ifdef FIX_HRTF_LOAD
IF( NE_32( ( error = ivas_sba_dec_reconfigure_fx( st_ivas ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_sba_dec_reconfigure_fx( st_ivas, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -1013,7 +945,6 @@ ivas_error ivas_dec_setup(
}
}
-#ifdef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH
test();
IF( GT_16( st_ivas->ini_frame, 0 ) && EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )
{
@@ -1023,7 +954,6 @@ ivas_error ivas_dec_setup(
move16();
}
-#endif
IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )
{
ISM_MODE last_ism_mode = st_ivas->ism_mode;
@@ -1069,11 +999,7 @@ ivas_error ivas_dec_setup(
move32();
}
-#ifdef FIX_HRTF_LOAD
IF( NE_32( ( error = ivas_ism_dec_config_fx( st_ivas, last_ism_mode ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_ism_dec_config_fx( st_ivas, last_ism_mode, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -1232,14 +1158,12 @@ static ivas_error ivas_read_format(
st_ivas->ivas_format = SBA_ISM_FORMAT;
move32();
-#ifdef FIX_CREND_SIMPLIFY_CODE
/* read the real Ambisonic order when the above bits are used to signal OSBA format */
IF( LE_32( ivas_total_brate, IVAS_24k4 ) )
{
st_ivas->sba_order = st_ivas->bit_stream[add( *num_bits_read, 2 + SBA_PLANAR_BITS + SBA_ORDER_BITS )];
st_ivas->sba_order = add( st_ivas->sba_order, shl( st_ivas->bit_stream[add( *num_bits_read, 1 + SBA_PLANAR_BITS + SBA_ORDER_BITS )], 1 ) );
}
-#endif
}
}
( *num_bits_read ) = add( ( *num_bits_read ), 1 );
@@ -1356,7 +1280,6 @@ static ivas_error ivas_read_format(
*-------------------------------------------------------------------*/
/*! r: number of channels to be synthesised */
-
Word16 getNumChanSynthesis(
Decoder_Struct *st_ivas /* i : IVAS decoder structure */
)
@@ -1392,6 +1315,7 @@ Word16 getNumChanSynthesis(
return n;
}
+
/*-------------------------------------------------------------------*
* copy_decoder_config()
*
@@ -1457,6 +1381,10 @@ ivas_error ivas_init_decoder_front(
move32();
st_ivas->mc_mode = MC_MODE_NONE;
move32();
+#ifdef FIX_1384_MSAN_ivas_spar_dec_open
+ st_ivas->sid_format = SID_FORMAT_NONE;
+ move16();
+#endif
st_ivas->sba_dirac_stereo_flag = 0;
move16();
@@ -1491,8 +1419,8 @@ ivas_error ivas_init_decoder_front(
{
return error;
}
- error = ivas_orient_trk_SetTrackingType_fx( st_ivas->hHeadTrackData->OrientationTracker, st_ivas->hDecoderConfig->orientation_tracking );
- IF( NE_32( ( error ), IVAS_ERR_OK ) )
+
+ IF( NE_32( ( error = ivas_orient_trk_SetTrackingType_fx( st_ivas->hHeadTrackData->OrientationTracker, st_ivas->hDecoderConfig->orientation_tracking ) ), IVAS_ERR_OK ) )
{
return error;
}
@@ -1504,7 +1432,7 @@ ivas_error ivas_init_decoder_front(
IF( st_ivas->hDecoderConfig->Opt_ExternalOrientation )
{
- IF( NE_32( ( error = ivas_external_orientation_open( &( st_ivas->hExtOrientationData ), st_ivas->hDecoderConfig->render_framesize ) ), IVAS_ERR_OK ) )
+ IF( NE_32( ( error = ivas_external_orientation_open_fx( &( st_ivas->hExtOrientationData ), st_ivas->hDecoderConfig->render_framesize ) ), IVAS_ERR_OK ) )
{
return error;
}
@@ -1517,48 +1445,17 @@ ivas_error ivas_init_decoder_front(
test();
IF( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation )
{
- IF( NE_32( ( error = ivas_combined_orientation_open( &( st_ivas->hCombinedOrientationData ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->render_framesize ) ), IVAS_ERR_OK ) )
+ IF( NE_32( ( error = ivas_combined_orientation_open_fx( &( st_ivas->hCombinedOrientationData ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->render_framesize ) ), IVAS_ERR_OK ) )
{
return error;
}
}
-#ifndef FIX_CREND_SIMPLIFY_CODE
- /*-------------------------------------------------------------------*
- * Allocate HRTF binary handle
- *--------------------------------------------------------------------*/
-
- IF( st_ivas->hDecoderConfig->Opt_HRTF_binary )
- {
- IF( NE_32( ( error = ivas_HRTF_binary_open_fx( &( st_ivas->hHrtfTD ) ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
- IF( NE_32( ( error = ivas_HRTF_CRend_binary_open_fx( &( st_ivas->hSetOfHRTF ) ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
-
- IF( NE_32( ( error = ivas_HRTF_fastconv_binary_open_fx( &st_ivas->hHrtfFastConv ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
-
- IF( NE_32( ( error = ivas_HRTF_parambin_binary_open_fx( &st_ivas->hHrtfParambin ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
-
- IF( NE_32( ( error = ivas_HRTF_statistics_binary_open_fx( &st_ivas->hHrtfStatistics ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
- }
-#endif
/*-------------------------------------------------------------------*
* Allocate and initialize Binaural Renderer configuration handle
*--------------------------------------------------------------------*/
+
test();
test();
test();
@@ -1588,6 +1485,7 @@ ivas_error ivas_init_decoder_front(
*
* Initialize IVAS decoder state structure
*-------------------------------------------------------------------*/
+
ivas_error ivas_init_decoder_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
@@ -1884,6 +1782,14 @@ ivas_error ivas_init_decoder_fx(
{
st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed2 = st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed3;
move16();
+ IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) )
+ {
+ /* reusing OMASA function for allocating and initializing MASA_ISM rendering handle (even though not in OMASA) */
+ IF( NE_32( ( error = ivas_omasa_data_open_fx( st_ivas ) ), IVAS_ERR_OK ) )
+ {
+ return error;
+ }
+ }
}
ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MODE_DISC ) )
{
@@ -1926,7 +1832,7 @@ ivas_error ivas_init_decoder_fx(
test();
test();
test();
- IF( NE_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_FOA ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_MONO ) && !( EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && EQ_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_FOA ) ) )
+ IF( NE_32( output_config, IVAS_AUDIO_CONFIG_FOA ) && NE_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) && NE_32( output_config, IVAS_AUDIO_CONFIG_MONO ) && !( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && EQ_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_FOA ) ) )
{
IF( NE_32( ( error = ivas_dirac_dec_config_fx( st_ivas, DIRAC_OPEN ) ), IVAS_ERR_OK ) )
{
@@ -1951,7 +1857,7 @@ ivas_error ivas_init_decoder_fx(
move16();
}
- ivas_dirac_config_bands_fx( band_grouping, IVAS_MAX_NUM_BANDS, extract_l( Mpy_32_32_r( st_ivas->hDecoderConfig->output_Fs, INV_CLDFB_BANDWIDTH_Q31 ) ),
+ ivas_dirac_config_bands_fx( band_grouping, IVAS_MAX_NUM_BANDS, extract_l( Mpy_32_32_r( output_Fs, INV_CLDFB_BANDWIDTH_Q31 ) ),
st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0, 1 );
}
st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );
@@ -2075,6 +1981,7 @@ ivas_error ivas_init_decoder_fx(
st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );
move16();
+
IF( NE_32( ( error = ivas_qmetadata_open_fx( &( st_ivas->hQMetaData ) ) ), IVAS_ERR_OK ) )
{
return error;
@@ -2103,7 +2010,7 @@ ivas_error ivas_init_decoder_fx(
test();
test();
- IF( NE_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_FOA ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_MONO ) )
+ IF( NE_32( output_config, IVAS_AUDIO_CONFIG_FOA ) && NE_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) && NE_32( output_config, IVAS_AUDIO_CONFIG_MONO ) )
{
IF( NE_32( ( error = ivas_dirac_dec_config_fx( st_ivas, DIRAC_OPEN ) ), IVAS_ERR_OK ) )
{
@@ -2119,6 +2026,7 @@ ivas_error ivas_init_decoder_fx(
st_ivas->hSpar->enc_param_start_band = s_min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND );
move16();
+
IF( ivas_get_hodirac_flag_fx( ivas_total_brate, st_ivas->sba_analysis_order ) )
{
st_ivas->hSpar->enc_param_start_band = 0;
@@ -2128,7 +2036,7 @@ ivas_error ivas_init_decoder_fx(
move16();
}
- ivas_dirac_config_bands_fx( band_grouping, IVAS_MAX_NUM_BANDS, extract_l( Mpy_32_32_r( st_ivas->hDecoderConfig->output_Fs, INV_CLDFB_BANDWIDTH_Q31 ) ),
+ ivas_dirac_config_bands_fx( band_grouping, IVAS_MAX_NUM_BANDS, extract_l( Mpy_32_32_r( output_Fs, INV_CLDFB_BANDWIDTH_Q31 ) ),
st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0, 1 );
}
@@ -2149,9 +2057,7 @@ ivas_error ivas_init_decoder_fx(
st_ivas->nCPE_old = st_ivas->nCPE;
move16();
{
- Word16 n_all;
-
- n_all = add( st_ivas->nchan_transport, st_ivas->nchan_ism );
+ Word16 n_all = add( st_ivas->nchan_transport, st_ivas->nchan_ism );
st_ivas->nCPE = shr( add( n_all, 1 ), 1 );
}
st_ivas->element_mode_init = IVAS_CPE_MDCT;
@@ -2249,19 +2155,9 @@ ivas_error ivas_init_decoder_fx(
reset_indices_dec( st_ivas->hSCE[0]->hCoreCoder[0] );
- IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
+ IF( ( error = ivas_ism_metadata_dec_create_fx( st_ivas, st_ivas->nchan_ism, NULL ) ) != IVAS_ERR_OK )
{
- if ( ( error = ivas_ism_metadata_dec_create_fx( st_ivas, st_ivas->nchan_ism, NULL ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
- else
- {
- IF( NE_32( ( error = ivas_ism_metadata_dec_create_fx( st_ivas, 1, NULL ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
+ return error;
}
}
ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
@@ -2397,7 +2293,6 @@ ivas_error ivas_init_decoder_fx(
FOR( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )
{
IF( NE_32( ( error = create_cpe_dec( st_ivas, cpe_id, tmp_br ) ), IVAS_ERR_OK ) )
-
{
return error;
}
@@ -2465,13 +2360,13 @@ ivas_error ivas_init_decoder_fx(
}
IF( NE_32( ( error = ivas_masa_dec_open_fx( st_ivas ) ), IVAS_ERR_OK ) )
-
{
return error;
}
st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );
move16();
+
test();
IF( NE_32( st_ivas->renderer_type, RENDERER_DISABLE ) && NE_32( st_ivas->renderer_type, RENDERER_MCMASA_MONO_STEREO ) )
{
@@ -2480,6 +2375,7 @@ ivas_error ivas_init_decoder_fx(
return error;
}
}
+
test();
test();
IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && st_ivas->hOutSetup.separateChannelEnabled && !st_ivas->hLsSetupCustom->separate_ch_found )
@@ -2529,6 +2425,7 @@ ivas_error ivas_init_decoder_fx(
{
st_ivas->element_mode_init = IVAS_CPE_MDCT; /* element_mode_init was IVAS_SCE for SCE initialization */
move16();
+
IF( NE_32( ( error = create_cpe_dec( st_ivas, cpe_id, brate_cpe ) ), IVAS_ERR_OK ) )
{
return error;
@@ -2597,6 +2494,7 @@ ivas_error ivas_init_decoder_fx(
/*-------------------------------------------------------------------*
* Allocate and initialize rendering handles
*--------------------------------------------------------------------*/
+
test();
test();
test();
@@ -2656,21 +2554,20 @@ ivas_error ivas_init_decoder_fx(
IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
{
- if ( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
+ if ( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, output_Fs ) ), IVAS_ERR_OK ) )
{
return error;
}
}
-
- granularity = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );
-
+#ifndef NONBE_1303_REND_GRANULARITY
+ granularity = NS2SA_FX2( output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );
n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
-
IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ), IVAS_ERR_OK ) )
{
return error;
}
+#endif
}
ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) )
{
@@ -2691,7 +2588,7 @@ ivas_error ivas_init_decoder_fx(
test();
test();
test();
- IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV_ROOM ) && EQ_32( st_ivas->ivas_format, MC_FORMAT ) && ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )
+ IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV_ROOM ) && EQ_32( st_ivas->ivas_format, MC_FORMAT ) && ( hDecoderConfig->Opt_Headrotation || hDecoderConfig->Opt_ExternalOrientation ) )
{
IF( NE_32( ( error = efap_init_data_fx( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth_fx, st_ivas->hIntSetup.ls_elevation_fx, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ), IVAS_ERR_OK ) )
{
@@ -2699,7 +2596,6 @@ ivas_error ivas_init_decoder_fx(
}
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
Word16 num_poses = 1;
move16();
if ( st_ivas->hSplitBinRend != NULL )
@@ -2708,19 +2604,14 @@ ivas_error ivas_init_decoder_fx(
move16();
}
- IF( NE_32( ( error = ivas_rend_openCrend_fx( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0, num_poses ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_rend_openCrend_fx( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config,
- st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ),
- IVAS_ERR_OK ) )
-#endif
+ IF( NE_32( ( error = ivas_rend_openCrend_fx( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0, num_poses ) ), IVAS_ERR_OK ) )
{
return error;
}
st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;
move32();
-
+#ifndef NONBE_1303_REND_GRANULARITY
test();
IF( ( EQ_32( st_ivas->ivas_format, MC_FORMAT ) ) && ( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMUPMIX ) ) )
{
@@ -2734,7 +2625,7 @@ ivas_error ivas_init_decoder_fx(
}
ELSE
{
- granularity = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );
+ granularity = NS2SA_FX2( output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );
n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
@@ -2743,6 +2634,7 @@ ivas_error ivas_init_decoder_fx(
return error;
}
}
+#endif
}
IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )
@@ -2781,7 +2673,7 @@ ivas_error ivas_init_decoder_fx(
IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
{
- IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
+ IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, output_Fs ) ), IVAS_ERR_OK ) )
{
return error;
}
@@ -2900,7 +2792,7 @@ ivas_error ivas_init_decoder_fx(
}
IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )
{
- IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )
+ IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, output_Fs ) ), IVAS_ERR_OK ) )
{
return error;
}
@@ -2942,7 +2834,7 @@ ivas_error ivas_init_decoder_fx(
test();
test();
test();
- IF( ( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ) && !st_ivas->sba_dirac_stereo_flag && NE_16( st_ivas->hDecoderConfig->nchan_out, 1 ) )
+ IF( ( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ) && !st_ivas->sba_dirac_stereo_flag && NE_16( hDecoderConfig->nchan_out, 1 ) )
{
Word16 Q_cldfbSynDec = Q11;
move16();
@@ -2984,7 +2876,7 @@ ivas_error ivas_init_decoder_fx(
{
IF( st_ivas->hBinRenderer->render_lfe )
{
- IF( NE_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) && NE_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
+ IF( NE_16( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) && NE_16( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
{
/* Account for filterbank delay */
delay_ns = L_add( delay_ns, IVAS_FB_DEC_DELAY_NS );
@@ -3029,9 +2921,16 @@ ivas_error ivas_init_decoder_fx(
IF( st_ivas->hTcBuffer == NULL )
{
/* no module has yet open the TC buffer, open a default one */
+#ifdef NONBE_1303_REND_GRANULARITY
+ granularity = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, ivas_renderer_secondary_select_fx( st_ivas ), output_Fs );
n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
- IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, ivas_jbm_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
+ IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, ivas_jbm_dec_get_tc_buffer_mode_fx( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ), IVAS_ERR_OK ) )
+#else
+ n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
+
+ IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, ivas_jbm_dec_get_tc_buffer_mode_fx( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA_FX2( output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
+#endif
{
return error;
}
@@ -3041,7 +2940,7 @@ ivas_error ivas_init_decoder_fx(
test();
IF( ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) && st_ivas->hDecoderConfig->Opt_tsm )
{
- IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
+ IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
{
IF( NE_32( ( error = ivas_jbm_dec_metadata_open( st_ivas ) ), IVAS_ERR_OK ) )
{
@@ -3051,15 +2950,20 @@ ivas_error ivas_init_decoder_fx(
}
/*-----------------------------------------------------------------*
- * Allocate floating-point output audio buffers
+ * Allocate output audio buffers
*-----------------------------------------------------------------*/
- FOR( n = 0; n < ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )
+#ifdef FIX_NCHAN_BUFFERS
+ k = ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, ivas_total_brate );
+ FOR( n = 0; n < k; n++ )
+#else
+ FOR( n = 0; n < ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, ivas_total_brate ); n++ )
+#endif
{
/* note: these are intra-frame heap memories */
IF( ( st_ivas->p_output_fx[n] = (Word32 *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( Word32 ) ) ) == NULL )
{
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point output audio buffer!\n" ) );
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for output audio buffer!\n" ) );
}
set32_fx( st_ivas->p_output_fx[n], 0, 48000 / FRAMES_PER_SEC );
}
@@ -3220,6 +3124,7 @@ void destroy_core_dec_fx(
return;
}
+
/*-------------------------------------------------------------------------
* ivas_initialize_handles_dec()
*
@@ -3291,11 +3196,7 @@ void ivas_initialize_handles_dec(
st_ivas->hMonoDmxRenderer = NULL;
st_ivas->hCrendWrapper = NULL;
st_ivas->hReverb = NULL;
-#ifdef FIX_CREND_SIMPLIFY_CODE
st_ivas->hHrtfCrend = NULL;
-#else
- st_ivas->hSetOfHRTF = NULL;
-#endif
st_ivas->hHrtfFastConv = NULL;
st_ivas->hHrtfParambin = NULL;
st_ivas->hHrtfStatistics = NULL;
@@ -3319,7 +3220,7 @@ void ivas_initialize_handles_dec(
st_ivas->hTcBuffer = NULL;
st_ivas->hJbmMetadata = NULL;
- /* floating-point output audio buffers */
+ /* output audio buffers */
FOR( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )
{
st_ivas->p_output_fx[i] = NULL;
@@ -3466,11 +3367,7 @@ void ivas_destroy_dec_fx(
ivas_dirac_dec_close_binaural_data_fx( st_ivas->hDiracDecBin );
/* Crend handle */
-#ifdef FIX_CREND_SIMPLIFY_CODE
ivas_rend_closeCrend_fx( &( st_ivas->hCrendWrapper ) );
-#else
- ivas_rend_closeCrend_fx( &( st_ivas->hCrendWrapper ), ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses );
-#endif
/* Reverb handle */
ivas_reverb_close_fx( &st_ivas->hReverb );
@@ -3509,11 +3406,7 @@ void ivas_destroy_dec_fx(
ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
IF( st_ivas->hHrtfTD != NULL )
-#else
- ELSE IF( st_ivas->hHrtfTD != NULL )
-#endif
{
BSplineModelEvalDealloc_fx( &st_ivas->hHrtfTD->ModelParams, &st_ivas->hHrtfTD->ModelEval );
@@ -3521,11 +3414,7 @@ void ivas_destroy_dec_fx(
}
/* CRend binaural renderer handle */
-#ifdef FIX_CREND_SIMPLIFY_CODE
ivas_HRTF_CRend_binary_close_fx( &st_ivas->hHrtfCrend );
-#else
- ivas_HRTF_CRend_binary_close_fx( &st_ivas->hSetOfHRTF );
-#endif
/* Fastconv HRTF memories */
ivas_binaural_hrtf_close_fx( &st_ivas->hHrtfFastConv );
@@ -3551,7 +3440,7 @@ void ivas_destroy_dec_fx(
st_ivas->hDecoderConfig = NULL;
}
- ivas_jbm_dec_tc_buffer_close( &st_ivas->hTcBuffer );
+ ivas_jbm_dec_tc_buffer_close_fx( &st_ivas->hTcBuffer );
IF( st_ivas->hJbmMetadata != NULL )
{
@@ -3559,10 +3448,9 @@ void ivas_destroy_dec_fx(
st_ivas->hJbmMetadata = NULL;
}
- /* floating-point output audio buffers */
+ /* output audio buffers */
FOR( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )
{
-
IF( st_ivas->p_output_fx[i] != NULL )
{
free( st_ivas->p_output_fx[i] );
@@ -3591,6 +3479,7 @@ void ivas_init_dec_get_num_cldfb_instances_fx(
)
{
IVAS_FORMAT ivas_format;
+
*numCldfbAnalyses = st_ivas->nchan_transport;
move16();
*numCldfbSyntheses = st_ivas->hDecoderConfig->nchan_out;
@@ -3880,6 +3769,7 @@ static ivas_error doSanityChecks_IVAS(
move32();
output_config = st_ivas->hDecoderConfig->output_config;
move32();
+
/*-----------------------------------------------------------------*
* Sanity checks
*-----------------------------------------------------------------*/
@@ -3925,6 +3815,8 @@ static ivas_error doSanityChecks_IVAS(
}
}
+ test();
+ test();
IF( ( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) && NE_32( output_Fs, 48000 ) )
{
return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Error: Only 48kHz output sampling rate is supported for split rendering." );
@@ -3967,5 +3859,26 @@ static ivas_error doSanityChecks_IVAS(
}
}
+
+ IF( st_ivas->hDecoderConfig->Opt_ObjEdit_on )
+ {
+ test();
+ test();
+ test();
+ test();
+ IF( !( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) || ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) && GT_16( st_ivas->nchan_ism, 0 ) ) ) )
+ {
+ return IVAS_ERROR( IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED, "Wrong set-up: Obect editing is not supported in this IVAS format." );
+ }
+ }
+
+#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
+ test();
+ IF( st_ivas->hDecoderConfig->Opt_ObjEdit_on && st_ivas->hDecoderConfig->Opt_non_diegetic_pan )
+ {
+ return IVAS_ERROR( IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED, "Wrong set-up: Only object editing or Non-diegetic panning can be used." );
+ }
+#endif
+
return IVAS_ERR_OK;
}
diff --git a/lib_dec/ivas_ism_dec_fx.c b/lib_dec/ivas_ism_dec_fx.c
index 63609317d01f7e41b5a51b96064e694003afe690..f225b793fac2b0a7ca6366f5f2df9c4647f21bbc 100644
--- a/lib_dec/ivas_ism_dec_fx.c
+++ b/lib_dec/ivas_ism_dec_fx.c
@@ -49,11 +49,6 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const Word16 nchan_transport_old, /* i : last number of transport channels */
const ISM_MODE last_ism_mode /* i : last ISM mode */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesRendered, /* o : number of samples rendered */
- Word16 *data /* o : output synthesis signal Q0*/
-#endif
)
{
ivas_error error;
@@ -65,16 +60,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
Word16 tc_nchan_allocate_new;
Word16 tc_granularity_new;
Word16 nchan_out_buff, nchan_out_buff_old;
-#ifndef FIX_HRTF_LOAD
- AUDIO_CONFIG intern_config_old;
- IVAS_OUTPUT_SETUP hIntSetupOld;
- RENDERER_TYPE renderer_type_old;
-#endif
-#ifndef FIX_HRTF_LOAD
- error = IVAS_ERR_OK;
- move32();
-#endif
nCPE_old = st_ivas->nCPE;
move16();
nSCE_old = st_ivas->nSCE;
@@ -122,18 +108,6 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
return error;
}
-
-#ifndef FIX_HRTF_LOAD
- /* save old IntSetup, might be needed for JBM flushing...*/
- intern_config_old = st_ivas->intern_config;
- move32();
- hIntSetupOld = st_ivas->hIntSetup;
- move32();
- tc_granularity_new = 1;
- move16();
- renderer_type_old = st_ivas->renderer_type;
- move32();
-#endif
/*-----------------------------------------------------------------*
* Initialize the needed renderer struct and destroy the unnecessary renderer struct
*-----------------------------------------------------------------*/
@@ -149,64 +123,43 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->hDecoderConfig->output_config );
}
-#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
+ test();
+ test();
+ /* transfer subframe info from DirAC or ParamMC to central tc buffer */
+ /* only do this if we are not having done everything already in the TC decoding part and having only played out from the TC buffer */
+ IF( EQ_32( last_ism_mode, ISM_MODE_PARAM ) && st_ivas->hSpatParamRendCom != NULL && NE_32( st_ivas->hTcBuffer->tc_buffer_mode, TC_BUFFER_MODE_BUFFER ) )
{
-#endif
- test();
- test();
- /* transfer subframe info from DirAC or ParamMC to central tc buffer */
- /* only do this if we are not having done everything already in the TC decoding part and having only played out from the TC buffer */
- IF( EQ_32( last_ism_mode, ISM_MODE_PARAM ) && st_ivas->hSpatParamRendCom != NULL && NE_32( st_ivas->hTcBuffer->tc_buffer_mode, TC_BUFFER_MODE_BUFFER ) )
- {
- st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpatParamRendCom->nb_subframes;
- move16();
- st_ivas->hTcBuffer->subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;
- move16();
- st_ivas->hTcBuffer->num_slots = st_ivas->hSpatParamRendCom->num_slots;
- move16();
- st_ivas->hTcBuffer->slots_rendered = st_ivas->hSpatParamRendCom->slots_rendered;
- move16();
- Copy( st_ivas->hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
- }
-
- /* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv
- render what still fits in the new granularity */
- tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );
-
- IF( LT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
- {
-#ifdef FIX_HRTF_LOAD
- /* flush already done in IVAS_DEC_ReadFormat() */
-#else
-#ifdef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
- /* write back info for correct rendering of the flushable samples */
- int16_t nchan_transport_ref = st_ivas->nchan_transport;
- st_ivas->nchan_transport = nchan_transport_old;
+ st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpatParamRendCom->nb_subframes;
+ move16();
+ st_ivas->hTcBuffer->subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;
+ move16();
+ st_ivas->hTcBuffer->num_slots = st_ivas->hSpatParamRendCom->num_slots;
+ move16();
+ st_ivas->hTcBuffer->slots_rendered = st_ivas->hSpatParamRendCom->slots_rendered;
move16();
+ Copy( st_ivas->hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
+ }
+ /* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv
+ render what still fits in the new granularity */
+#ifdef NONBE_1303_REND_GRANULARITY
+ tc_granularity_new = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );
+#else
+ tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );
#endif
- IF( NE_32( ( error = ivas_jbm_dec_flush_renderer_fx( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &hIntSetupOld, MC_MODE_NONE, last_ism_mode, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
-#ifdef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
- st_ivas->nchan_transport = nchan_transport_ref;
- move16();
-#endif
-#endif
- }
- /* JBM: when granularity goes up set samples to discard at the beginning of the frame */
- ELSE IF( GT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
+ IF( LT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
+ {
+ /* flush already done in IVAS_DEC_ReadFormat() */
+ }
+ /* JBM: when granularity goes up set samples to discard at the beginning of the frame */
+ ELSE IF( GT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
+ {
+ IF( NE_32( ( error = ivas_jbm_dec_set_discard_samples_fx( st_ivas ) ), IVAS_ERR_OK ) )
{
- IF( NE_32( ( error = ivas_jbm_dec_set_discard_samples( st_ivas ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
+ return error;
}
-#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
}
-#endif
IF( NE_16( st_ivas->ism_mode, last_ism_mode ) )
{
@@ -230,6 +183,8 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
{
/* close the parametric binaural renderer */
ivas_dirac_dec_close_binaural_data_fx( st_ivas->hDiracDecBin );
+ /* Close omasa data struct (used for object editing) */
+ ivas_omasa_data_close_fx( &st_ivas->hMasaIsmData );
/* Open the TD Binaural renderer */
test();
@@ -265,12 +220,12 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
/* close the parametric binaural renderer */
ivas_dirac_dec_close_binaural_data_fx( st_ivas->hDiracDecBin );
+
+ /* Close omasa data struct (used for object editing) */
+ ivas_omasa_data_close_fx( &st_ivas->hMasaIsmData );
+
/* Open Crend Binaural renderer */
-#ifdef FIX_CREND_SIMPLIFY_CODE
IF( NE_32( ( error = ivas_rend_openCrend_fx( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0, ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_rend_openCrend_fx( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ), IVAS_ERR_OK ) )
-#endif
st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;
move32();
@@ -300,6 +255,11 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
{
return error;
}
+ /* Open omasa data struct (used for object editing) */
+ IF( ( error = ivas_omasa_data_open_fx( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* Close the TD Binaural renderer */
ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );
@@ -328,12 +288,13 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
return error;
}
+ /* Open omasa data struct (used for object editing) */
+ IF( ( error = ivas_omasa_data_open_fx( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
/* close the crend binaural renderer */
-#ifdef FIX_CREND_SIMPLIFY_CODE
ivas_rend_closeCrend_fx( &( st_ivas->hCrendWrapper ) );
-#else
- ivas_rend_closeCrend_fx( &( st_ivas->hCrendWrapper ), ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses );
-#endif
}
}
@@ -347,86 +308,70 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
}
/*-----------------------------------------------------------------*
- * floating-point output audio buffers
+ * output audio buffers
*-----------------------------------------------------------------*/
-#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
- {
-#endif
- nchan_out_buff = ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 );
+ nchan_out_buff = ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 );
- IF( NE_32( ( error = ivas_output_buff_dec_fx( st_ivas->p_output_fx, nchan_out_buff_old, nchan_out_buff ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
-#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
+ IF( NE_32( ( error = ivas_output_buff_dec_fx( st_ivas->p_output_fx, nchan_out_buff_old, nchan_out_buff ) ), IVAS_ERR_OK ) )
+ {
+ return error;
}
-#endif
/*-----------------------------------------------------------------*
* JBM TC buffers
*-----------------------------------------------------------------*/
-#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
- {
-#endif
- Word16 tc_nchan_full_new;
- DECODER_TC_BUFFER_HANDLE hTcBuffer;
+ Word16 tc_nchan_full_new;
+ DECODER_TC_BUFFER_HANDLE hTcBuffer;
- hTcBuffer = st_ivas->hTcBuffer;
- tc_buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas );
- tc_nchan_tc_new = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
- tc_nchan_allocate_new = tc_nchan_tc_new;
- move16();
- tc_nchan_full_new = tc_nchan_tc_new;
- move16();
+ hTcBuffer = st_ivas->hTcBuffer;
+ tc_buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode_fx( st_ivas );
+ tc_nchan_tc_new = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
+ tc_nchan_allocate_new = tc_nchan_tc_new;
+ move16();
+ tc_nchan_full_new = tc_nchan_tc_new;
+ move16();
- test();
- test();
- test();
- test();
- if ( EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) && ( NE_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) && NE_32( st_ivas->renderer_type, RENDERER_DISABLE ) && NE_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) && NE_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) )
- {
- tc_nchan_full_new = 0;
- move16();
- }
+ test();
+ test();
+ test();
+ test();
+ if ( EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) && ( NE_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) && NE_32( st_ivas->renderer_type, RENDERER_DISABLE ) && NE_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) && NE_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) )
+ {
+ tc_nchan_full_new = 0;
+ move16();
+ }
- /* reconfigure buffer */
- test();
- test();
- test();
- IF( NE_32( hTcBuffer->tc_buffer_mode, tc_buffer_mode_new ) || NE_16( hTcBuffer->nchan_transport_jbm, tc_nchan_tc_new ) ||
- NE_16( hTcBuffer->nchan_buffer_full, tc_nchan_full_new ) || NE_16( hTcBuffer->nchan_transport_internal, tc_nchan_allocate_new ) )
+ /* reconfigure buffer */
+ test();
+ test();
+ test();
+ IF( NE_32( hTcBuffer->tc_buffer_mode, tc_buffer_mode_new ) || NE_16( hTcBuffer->nchan_transport_jbm, tc_nchan_tc_new ) ||
+ NE_16( hTcBuffer->nchan_buffer_full, tc_nchan_full_new ) || NE_16( hTcBuffer->nchan_transport_internal, tc_nchan_allocate_new ) )
+ {
+ IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_reconfigure_fx( st_ivas, tc_buffer_mode_new, tc_nchan_tc_new, tc_nchan_allocate_new, tc_nchan_full_new, tc_granularity_new ) ), IVAS_ERR_OK ) )
{
- IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_reconfigure_fx( st_ivas, tc_buffer_mode_new, tc_nchan_tc_new, tc_nchan_allocate_new, tc_nchan_full_new, tc_granularity_new ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
+ return error;
}
+ }
- /* transfer subframe info from central tc buffer to ParamMC or McMASA (DirAC) */
- IF( st_ivas->hSpatParamRendCom != NULL )
- {
- st_ivas->hSpatParamRendCom->nb_subframes = st_ivas->hTcBuffer->nb_subframes;
- move16();
- st_ivas->hSpatParamRendCom->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered;
- move16();
- st_ivas->hSpatParamRendCom->num_slots = st_ivas->hTcBuffer->num_slots;
- move16();
- st_ivas->hSpatParamRendCom->slots_rendered = st_ivas->hTcBuffer->slots_rendered;
- move16();
+ /* transfer subframe info from central tc buffer to ParamMC or McMASA (DirAC) */
+ IF( st_ivas->hSpatParamRendCom != NULL )
+ {
+ st_ivas->hSpatParamRendCom->nb_subframes = st_ivas->hTcBuffer->nb_subframes;
+ move16();
+ st_ivas->hSpatParamRendCom->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered;
+ move16();
+ st_ivas->hSpatParamRendCom->num_slots = st_ivas->hTcBuffer->num_slots;
+ move16();
+ st_ivas->hSpatParamRendCom->slots_rendered = st_ivas->hTcBuffer->slots_rendered;
+ move16();
- Copy( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
- }
-#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
+ Copy( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
}
-#endif
-#ifdef FIX_HRTF_LOAD
return IVAS_ERR_OK;
-#else
- return error;
-#endif
}
@@ -440,21 +385,12 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
ivas_error ivas_ism_dec_config_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const ISM_MODE last_ism_mode /* i/o: last ISM mode */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesRendered, /* o : number of samples flushed when the renderer granularity changes */
- Word16 *data /* o : output synthesis signal Q0*/
-#endif
)
{
Word32 ivas_total_brate;
ivas_error error;
Word16 nchan_transport_old;
-#ifndef FIX_HRTF_LOAD
- error = IVAS_ERR_OK;
- move32();
-#endif
ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
move32();
/* Assumes that num of input objects are constant */
@@ -495,12 +431,7 @@ ivas_error ivas_ism_dec_config_fx(
test();
IF( ( NE_16( st_ivas->ism_mode, last_ism_mode ) ) || ( NE_32( ivas_total_brate, st_ivas->hDecoderConfig->last_ivas_total_brate ) ) )
{
-#ifdef FIX_HRTF_LOAD
IF( NE_16( ( error = ivas_ism_bitrate_switching_dec_fx( st_ivas, nchan_transport_old, last_ism_mode ) ), IVAS_ERR_OK ) )
-
-#else
- IF( NE_16( ( error = ivas_ism_bitrate_switching_dec_fx( st_ivas, nchan_transport_old, last_ism_mode, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -525,11 +456,7 @@ ivas_error ivas_ism_dec_config_fx(
/* ISM mode switching */
IF( NE_32( st_ivas->ism_mode, last_ism_mode ) )
{
-#ifdef FIX_HRTF_LOAD
IF( NE_16( ( error = ivas_ism_bitrate_switching_dec_fx( st_ivas, nchan_transport_old, last_ism_mode ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_16( ( error = ivas_ism_bitrate_switching_dec_fx( st_ivas, nchan_transport_old, last_ism_mode, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -560,9 +487,5 @@ ivas_error ivas_ism_dec_config_fx(
BREAK;
}
-#ifdef FIX_HRTF_LOAD
return IVAS_ERR_OK;
-#else
- return error;
-#endif
}
diff --git a/lib_dec/ivas_ism_dtx_dec_fx.c b/lib_dec/ivas_ism_dtx_dec_fx.c
index d5943a90cf19cc9744f181178dca2ae722ff154e..19d99a0bb1fe277e13efc6485f7230bb235ffcba 100644
--- a/lib_dec/ivas_ism_dtx_dec_fx.c
+++ b/lib_dec/ivas_ism_dtx_dec_fx.c
@@ -163,11 +163,13 @@ void ivas_ism_dtx_limit_noise_energy_for_near_silence_fx(
Word32 fac_fx, cng_noise_nrg_obj_fx, cng_noise_nrg_dominant_fx;
Word16 ch, cng_noise_level_len, Q_cng_noise_nrg_dominant, exp;
HANDLE_FD_CNG_COM hFdCngCom;
+
hFdCngCom = hSCE[sce_id_dtx]->hCoreCoder[0]->hFdCngDec->hFdCngCom;
cng_noise_level_len = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
- Q_cng_noise_nrg_dominant = add( Q_cngNoiseLevel[sce_id_dtx], Q_cngNoiseLevel[sce_id_dtx] ); /*stores Q for cng_noise_nrg_dominant_fx*/
- cng_noise_nrg_dominant_fx = dotp_fixed_o( hFdCngCom->cngNoiseLevel, hFdCngCom->cngNoiseLevel, cng_noise_level_len, 9 /*log2(len(hFdCngCom->cngNoiseLevel))*/, &Q_cng_noise_nrg_dominant ); /*Resultant Q_cng_noise_nrg_dominant= (Q_cng_noise_nrg_dominant-x)<=31*/
- IF( LT_32( cng_noise_nrg_dominant_fx, L_shl_sat( 1, Q_cng_noise_nrg_dominant ) ) ) /*cng_noise_nrg_dominant<1.f*/
+ Q_cng_noise_nrg_dominant = add( Q_cngNoiseLevel[sce_id_dtx], Q_cngNoiseLevel[sce_id_dtx] ); /*stores Q for cng_noise_nrg_dominant_fx*/
+ cng_noise_nrg_dominant_fx = dotp_fx32_o( hFdCngCom->cngNoiseLevel, hFdCngCom->cngNoiseLevel, cng_noise_level_len, 9 /*log2(len(hFdCngCom->cngNoiseLevel))*/, &Q_cng_noise_nrg_dominant ); /*Resultant Q_cng_noise_nrg_dominant= (Q_cng_noise_nrg_dominant-x)<=31*/
+
+ IF( LT_32( cng_noise_nrg_dominant_fx, L_shl_sat( 1, Q_cng_noise_nrg_dominant ) ) ) /*cng_noise_nrg_dominant<1.f*/
{
FOR( ch = 0; ch < nchan_transport; ch++ )
{
@@ -177,8 +179,8 @@ void ivas_ism_dtx_limit_noise_energy_for_near_silence_fx(
}
hFdCngCom = hSCE[ch]->hCoreCoder[0]->hFdCngDec->hFdCngCom;
cng_noise_level_len = sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand );
- Word16 Q_cng_noise_nrg_obj = add( Q_cngNoiseLevel[ch], Q_cngNoiseLevel[ch] ); /*Stores Q-factor of cng_noise_nrg_obj*/
- cng_noise_nrg_obj_fx = dotp_fixed_o( hFdCngCom->cngNoiseLevel, hFdCngCom->cngNoiseLevel, cng_noise_level_len, 9, &Q_cng_noise_nrg_obj ); /*Resultant Q_cng_noise_nrg_obj= (Q_cng_noise_nrg_obj-x)<=31*/
+ Word16 Q_cng_noise_nrg_obj = add( Q_cngNoiseLevel[ch], Q_cngNoiseLevel[ch] ); /*Stores Q-factor of cng_noise_nrg_obj*/
+ cng_noise_nrg_obj_fx = dotp_fx32_o( hFdCngCom->cngNoiseLevel, hFdCngCom->cngNoiseLevel, cng_noise_level_len, 9, &Q_cng_noise_nrg_obj ); /*Resultant Q_cng_noise_nrg_obj= (Q_cng_noise_nrg_obj-x)<=31*/
IF( GT_32( cng_noise_nrg_obj_fx, cng_noise_nrg_dominant_fx ) )
{
Word32 temp = 0;
@@ -195,8 +197,8 @@ void ivas_ism_dtx_limit_noise_energy_for_near_silence_fx(
}
exp = sub( 31, Q_temp );
fac_fx = Sqrt32( temp, &exp );
- v_multc_fixed( hFdCngCom->cngNoiseLevel, fac_fx, hFdCngCom->cngNoiseLevel, cng_noise_level_len ); /*Resultant Q of cngNoiseLevel is Q_cngNoiseLevel for ch*/
- scale_sig32( hFdCngCom->cngNoiseLevel, cng_noise_level_len, exp ); /*Restoring Q of hFdCngCom->cngNoiseLevel to Q_cngNoiseLevel */
+ v_multc_fx( hFdCngCom->cngNoiseLevel, fac_fx, hFdCngCom->cngNoiseLevel, cng_noise_level_len ); /*Resultant Q of cngNoiseLevel is Q_cngNoiseLevel for ch*/
+ scale_sig32( hFdCngCom->cngNoiseLevel, cng_noise_level_len, exp ); /*Restoring Q of hFdCngCom->cngNoiseLevel to Q_cngNoiseLevel */
}
}
}
diff --git a/lib_dec/ivas_ism_param_dec_fx.c b/lib_dec/ivas_ism_param_dec_fx.c
index 973d726b0b8a8f54d4236c3cec4d7842d0269f24..4821d5cdd0abd61bfd0516c6c31dc259da162f5d 100644
--- a/lib_dec/ivas_ism_param_dec_fx.c
+++ b/lib_dec/ivas_ism_param_dec_fx.c
@@ -44,6 +44,15 @@
#include "debug.h"
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+/*-----------------------------------------------------------------------*
+ * Local function declarations
+ *-----------------------------------------------------------------------*/
+
+static void ivas_ism_param_dec_tc_gain_adjust_fx( Decoder_Struct *st_ivas, const Word16 nSamples, const Word16 nFadeLength, Word32 *p_data_fx[], Word16 *q_data );
+
+#endif
+
/*-----------------------------------------------------------------------*
* Local function definitions
*-----------------------------------------------------------------------*/
@@ -72,6 +81,7 @@ static void ivas_param_ism_dec_dequant_DOA_fx(
return;
}
+
static void ivas_param_ism_dec_dequant_powrat_fx(
PARAM_ISM_DEC_HANDLE hParamIsmDec /* i/o: decoder ParamISM handle */
)
@@ -167,6 +177,7 @@ static void ivas_ism_get_proto_matrix_fx(
return;
}
+
static void ivas_param_ism_collect_slot_fx(
PARAM_ISM_DEC_HANDLE hParamIsmDec, /* i/o: decoder ParamISM handle */
Word32 *Cldfb_RealBuffer_in_fx, /*Q(31-exp_real)*/
@@ -183,7 +194,6 @@ static void ivas_param_ism_collect_slot_fx(
Word16 exp_tmp;
/* loop over parameter bands to collect transport channel energies */
-
FOR( band_idx = 0; band_idx < hParamIsmDec->hParamIsm->nbands; band_idx++ )
{
brange[0] = hParamIsmDec->hParamIsm->band_grouping[band_idx];
@@ -210,6 +220,7 @@ static void ivas_param_ism_collect_slot_fx(
move16();
}
}
+
return;
}
@@ -391,6 +402,7 @@ static void ivas_param_ism_compute_mixing_matrix_fx(
return;
}
+
static void ivas_param_ism_render_slot_fx(
PARAM_ISM_DEC_HANDLE hParamIsmDec,
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom,
@@ -435,6 +447,7 @@ static void ivas_param_ism_render_slot_fx(
}
}
}
+
FOR( bin_idx = 0; bin_idx < hSpatParamRendCom->num_freq_bands; bin_idx++ )
{
/* smooth the mixing matrix */
@@ -519,11 +532,11 @@ static ivas_error ivas_param_ism_rendering_init_fx(
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for proto matrix\n" ) );
}
-
IF( ( hParamIsmRendering->interpolator_fx = (Word16 *) malloc( subframe_nbslots * sizeof( Word16 ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for interpolator\n" ) );
}
+
test();
test();
test();
@@ -539,6 +552,7 @@ static ivas_error ivas_param_ism_rendering_init_fx(
return IVAS_ERR_OK;
}
+
static void ivas_param_ism_update_mixing_matrix_fx(
PARAM_ISM_DEC_HANDLE hParamIsmDec,
Word32 mixing_matrix_fx[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_CHAN * PARAM_ISM_MAX_DMX], /*Q(31-mixing_matrix_exp)*/
@@ -580,11 +594,16 @@ static void ivas_param_ism_update_mixing_matrix_fx(
*
* Open Param ISM handle
*-------------------------------------------------------------------------*/
+
ivas_error ivas_param_ism_dec_open_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
{
+#ifdef NONBE_1303_REND_GRANULARITY
+ Word16 i, granularity;
+#else
Word16 i;
+#endif
PARAM_ISM_DEC_HANDLE hParamIsmDec;
IVAS_OUTPUT_SETUP hOutSetup;
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
@@ -625,6 +644,7 @@ ivas_error ivas_param_ism_dec_open_fx(
move32();
output_config = st_ivas->hDecoderConfig->output_config;
move32();
+
ivas_param_ism_config_fx( hParamIsmDec->hParamIsm, st_ivas->nchan_ism ); // assuming Q14 for gains;
/*-----------------------------------------------------------------*
@@ -747,6 +767,9 @@ ivas_error ivas_param_ism_dec_open_fx(
st_ivas->hParamIsmDec = hParamIsmDec;
st_ivas->hSpatParamRendCom = hSpatParamRendCom;
+#ifdef NONBE_1303_REND_GRANULARITY
+ granularity = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );
+#endif
test();
IF( NE_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) && NE_32( st_ivas->renderer_type, RENDERER_DISABLE ) )
@@ -793,8 +816,11 @@ ivas_error ivas_param_ism_dec_open_fx(
IF( st_ivas->hTcBuffer == NULL )
{
+#ifdef NONBE_1303_REND_GRANULARITY
+ IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, nchan_full, granularity ) ), IVAS_ERR_OK ) )
+#else
IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, nchan_full, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
-
+#endif
{
return error;
}
@@ -807,8 +833,12 @@ ivas_error ivas_param_ism_dec_open_fx(
IF( st_ivas->hTcBuffer == NULL )
{
Word16 nchan_to_allocate = st_ivas->hDecoderConfig->nchan_out;
+#ifdef NONBE_1303_REND_GRANULARITY
+ IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_BUFFER, nchan_to_allocate, nchan_to_allocate, nchan_to_allocate, granularity ) ), IVAS_ERR_OK ) )
+#else
move16(); // NS2SA
IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_BUFFER, nchan_to_allocate, nchan_to_allocate, nchan_to_allocate, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
+#endif
{
return error;
}
@@ -819,6 +849,7 @@ ivas_error ivas_param_ism_dec_open_fx(
return error;
}
+
/*-------------------------------------------------------------------------*
* ivas_param_ism_dec_close()
*
@@ -903,6 +934,7 @@ void ivas_param_ism_dec_close_fx(
*
*
*-------------------------------------------------------------------------*/
+
void ivas_ism_dec_digest_tc_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
@@ -979,34 +1011,26 @@ void ivas_ism_dec_digest_tc_fx(
IF( EQ_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_STEREO ) )
{
-#ifdef OBJ_EDITING_API
- Word16 gains_fx[2];
- ivas_ism_get_stereo_gains_fx( (Word16) L_shr( st_ivas->hIsmMetaData[i]->azimuth_fx, 22 ), (Word16) L_shr( st_ivas->hIsmMetaData[i]->elevation_fx, 22 ), &gains_fx[0], &gains_fx[1] );
- st_ivas->hIsmRendererData->gains_fx[i][0] = L_shr( L_deposit_h( gains_fx[0] ), 1 ); // Q31 -> Q30
- move32();
- st_ivas->hIsmRendererData->gains_fx[i][1] = L_shr( L_deposit_h( gains_fx[1] ), 1 ); // Q31 -> Q30
- move32();
- // TODO: Enable gain editing feature
- // v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], CPE_CHANNELS ); // Q30, Q30 --> Q30
-#else
- Word16 gains_fx[2];
+ Word16 gains_fx[CPE_CHANNELS];
+
ivas_ism_get_stereo_gains_fx( (Word16) L_shr( st_ivas->hIsmMetaData[i]->azimuth_fx, 22 ), (Word16) L_shr( st_ivas->hIsmMetaData[i]->elevation_fx, 22 ), &gains_fx[0], &gains_fx[1] );
+
st_ivas->hIsmRendererData->gains_fx[i][0] = L_shr( L_deposit_h( gains_fx[0] ), 1 ); // Q31 -> Q30
move32();
st_ivas->hIsmRendererData->gains_fx[i][1] = L_shr( L_deposit_h( gains_fx[1] ), 1 ); // Q31 -> Q30
move32();
-#endif
+ // TODO: Align Q values
+ IF( NE_32( st_ivas->hIsmMetaData[i]->edited_gain_fx, ONE_IN_Q29 ) )
+ {
+ v_multc_fx( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], CPE_CHANNELS ); // Q30, Q29 --> Q28
+ Scale_sig32( st_ivas->hIsmRendererData->gains_fx[i], CPE_CHANNELS, Q2 ); // Q28 --> Q30
+ }
}
ELSE
{
// TODO tmu review when #215 is resolved
-#ifdef OBJ_EDITING_API
azimuth_fx = L_shr( L_add( st_ivas->hIsmMetaData[i]->edited_azimuth_fx, 2097152 ), Q22 ); // Q0 ,2097152 = .5f in Q22
elevation_fx = L_shr( L_add( st_ivas->hIsmMetaData[i]->edited_elevation_fx, 2097152 ), Q22 ); // Q0 ,2097152 = .5f in Q22
-#else
- azimuth_fx = L_shr( L_add( st_ivas->hIsmMetaData[i]->azimuth_fx, 2097152 ), Q22 ); // Q0 ,2097152 = .5f in Q22
- elevation_fx = L_shr( L_add( st_ivas->hIsmMetaData[i]->elevation_fx, 2097152 ), Q22 ); // Q0 ,2097152 = .5f in Q22
-#endif
test();
test();
@@ -1033,11 +1057,14 @@ void ivas_ism_dec_digest_tc_fx(
{
azimuth_fx = L_shl( azimuth_fx, Q22 ); // Q22
elevation_fx = L_shl( elevation_fx, Q22 ); // Q22
+
efap_determine_gains_fx( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains_fx[i], azimuth_fx, elevation_fx, EFAP_MODE_EFAP );
-#ifdef OBJ_EDITING_API
- // TODO: Enable gain editing feature
- // v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hEFAPdata->numSpk );
-#endif
+ // TODO: align Q values properly
+ IF( NE_32( st_ivas->hIsmMetaData[i]->edited_gain_fx, ONE_IN_Q29 ) )
+ {
+ v_multc_fx( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hEFAPdata->numSpk ); // Q30, Q29 --> Q28
+ Scale_sig32( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hEFAPdata->numSpk, Q2 ); // Q28 --> Q30
+ }
}
}
ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) ||
@@ -1047,11 +1074,15 @@ void ivas_ism_dec_digest_tc_fx(
/*get HOA gets for direction (ACN/SN3D)*/
Word16 azi = shr( extract_h( st_ivas->hIsmMetaData[i]->azimuth_fx ), 22 - 16 ); // Q0
Word16 ele = shr( extract_h( st_ivas->hIsmMetaData[i]->elevation_fx ), 22 - 16 ); // Q0
+
ivas_dirac_dec_get_response_fx( azi, ele, st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIntSetup.ambisonics_order, Q30 );
-#ifdef OBJ_EDITING_API
- // TODO: Enable gain editing feature
- // v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], ivas_sba_get_nchan_fx( st_ivas->hIntSetup.ambisonics_order, 0 ) ); // Q30, Q30 --> Q30
-#endif
+
+ // TODO: Align Q-values
+ IF( NE_32( st_ivas->hIsmMetaData[i]->edited_gain_fx, ONE_IN_Q29 ) )
+ {
+ v_multc_fx( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], ivas_sba_get_nchan_fx( st_ivas->hIntSetup.ambisonics_order, 0 ) ); // Q30, Q29 --> Q28
+ Scale_sig32( st_ivas->hIsmRendererData->gains_fx[i], ivas_sba_get_nchan_fx( st_ivas->hIntSetup.ambisonics_order, 0 ), Q2 ); // Q28 --> 30
+ }
}
}
}
@@ -1060,176 +1091,87 @@ void ivas_ism_dec_digest_tc_fx(
return;
}
+
/*-------------------------------------------------------------------------*
* ivas_param_ism_dec_digest_tc()
*
*
*-------------------------------------------------------------------------*/
+
void ivas_param_ism_dec_digest_tc_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nCldfbSlots, /* i : number of CLFBS slots in the transport channels */
- Word32 *transport_channels[], /* i : synthesized core-coder transport channels/DirAC output q_tc_in*/
- Word16 q_tc_in )
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nCldfbSlots, /* i : number of CLDFB slots in transport channels */
+ Word32 *p_data_fx[], /* i/o: synthesized core-coder transport channels/DirAC output q_data_in */
+ const Word16 q_data_in /* i : Q-factor of input signal for single channel */
+)
{
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ Word16 i, ch, slot_idx, output_frame;
+ Word16 num_freq_bands, cldfb_ch, n_ch_cldfb;
+ Word32 *cldfb_real_buffer, *cldfb_imag_buffer;
+ Word16 q_data = q_data_in;
move16();
+#else
move16();
move16();
move16();
-#ifndef OBJ_EDITING_API
- Word32 cx_diag_fx[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX];
- Word16 exp_cx_diag[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX];
- Word16 exp_real_tmp = 0, exp_imag_tmp = 0;
-#endif
- Word16 q_tc = q_tc_in;
+ Word16 q_tc = q_data_in;
move16();
-#ifndef OBJ_EDITING_API
- Word16 ch, nchan_transport, nchan_out, nchan_out_woLFE, i;
- Word16 slot_idx, bin_idx;
- Word32 ivas_total_brate;
-#else
Word16 ch, nchan_transport, i;
Word16 slot_idx;
-#endif
Word16 output_frame;
-#ifndef OBJ_EDITING_API
- /* Direct Response/EFAP Gains */
- Word32 direct_response_fx[MAX_NUM_OBJECTS][PARAM_ISM_MAX_CHAN];
-#endif
PARAM_ISM_DEC_HANDLE hParamIsmDec;
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
Word16 fade_len;
-
- /* Initialization */
-#ifndef OBJ_EDITING_API
- set32_fx( &direct_response_fx[0][0], 0, MAX_NUM_OBJECTS * PARAM_ISM_MAX_CHAN );
#endif
- hParamIsmDec = st_ivas->hParamIsmDec;
- assert( hParamIsmDec );
- hSpatParamRendCom = st_ivas->hSpatParamRendCom;
- assert( hSpatParamRendCom );
- output_frame = imult1616( nCldfbSlots, hSpatParamRendCom->num_freq_bands );
- fade_len = shr( output_frame, 1 );
-
- nchan_transport = st_ivas->nchan_transport;
- move16();
-#ifndef OBJ_EDITING_API
- ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
- move32();
- hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_exp = 25;
- move16();
- hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_exp = 25;
+ /* Initialization */
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ num_freq_bands = st_ivas->hSpatParamRendCom->num_freq_bands;
move16();
- IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
- {
- nchan_out = st_ivas->nchan_ism;
- move16();
- nchan_out_woLFE = nchan_out;
- move16();
- st_ivas->hDecoderConfig->nchan_out = nchan_out;
- move16();
- }
- ELSE
- {
- nchan_out = add( st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hIntSetup.num_lfe );
- nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;
- move16();
- }
-#endif
-
- push_wmops( "ivas_param_ism_dec" );
+ output_frame = imult1616( nCldfbSlots, st_ivas->hSpatParamRendCom->num_freq_bands );
+ n_ch_cldfb = sub( st_ivas->hTcBuffer->nchan_transport_jbm, st_ivas->hTcBuffer->nchan_buffer_full );
-#ifndef OBJ_EDITING_API
- /* general setup */
- ivas_jbm_dec_get_adapted_linear_interpolator_fx( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbSlots, hParamIsmDec->hParamIsmRendering->interpolator_fx );
+ cldfb_real_buffer = st_ivas->hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_fx;
+ cldfb_imag_buffer = st_ivas->hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_fx;
- ivas_dirac_dec_set_md_map_fx( st_ivas, nCldfbSlots );
- /* set buffers to zero */
+ ivas_ism_param_dec_tc_gain_adjust_fx( st_ivas, output_frame, shr( output_frame, 1 ), p_data_fx, &q_data );
- set_zero_fx( &cx_diag_fx[0][0], CLDFB_NO_CHANNELS_MAX * PARAM_ISM_MAX_DMX );
- set16_zero_fx( &exp_cx_diag[0][0], CLDFB_NO_CHANNELS_MAX * PARAM_ISM_MAX_DMX );
-
- /* Frame-level Processing */
- /* De-quantization */
- test();
- IF( !( EQ_32( ivas_total_brate, IVAS_SID_5k2 ) || EQ_32( ivas_total_brate, FRAME_NO_DATA ) ) )
+ IF( !st_ivas->hDecoderConfig->Opt_tsm )
{
- ivas_param_ism_dec_dequant_DOA_fx( hParamIsmDec, st_ivas->nchan_ism );
- ivas_param_ism_dec_dequant_powrat_fx( hParamIsmDec );
- st_ivas->hISMDTX.dtx_flag = 0;
- move16();
+ Scale_sig32( p_data_fx[0], output_frame, sub( Q11, q_data ) ); /*keepeing p_data_fx at Q11*/
+ Scale_sig32( p_data_fx[1], output_frame, sub( Q11, q_data ) ); /*keepeing p_data_fx at Q11*/
}
ELSE
{
- st_ivas->hISMDTX.dtx_flag = 1;
- move16();
- }
-
- /* obtain the direct response using EFAP */
- IF( !( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) ) )
- {
- FOR( i = 0; i < st_ivas->nchan_ism; i++ )
- {
- efap_determine_gains_fx( st_ivas->hEFAPdata, direct_response_fx[i], hParamIsmDec->azimuth_values_fx[i], hParamIsmDec->elevation_values_fx[i], EFAP_MODE_EFAP );
- }
- }
- ELSE
- {
- Word16 j;
-
- FOR( i = 0; i < st_ivas->nchan_ism; i++ )
+ IF( NE_16( q_data, q_data_in ) )
{
- FOR( j = 0; j < nchan_out_woLFE; j++ )
- {
- IF( EQ_16( i, j ) )
- {
- direct_response_fx[i][j] = ONE_IN_Q30;
- move32();
- }
- ELSE
- {
- direct_response_fx[i][j] = 0;
- move32();
- }
- }
- }
-
- FOR( j = 0; j < nchan_out_woLFE; j++ )
- {
- IF( hParamIsmDec->azimuth_values_fx[j] > 0 )
- {
- hParamIsmDec->hParamIsmRendering->proto_matrix_fx[j] = 32767; // (1.0f in Q15) - 1
- move16();
- hParamIsmDec->hParamIsmRendering->proto_matrix_fx[nchan_out_woLFE + j] = 0;
- move16();
- }
- ELSE
+ FOR( i = 0; i < MAX_PARAM_ISM_WAVE; i++ )
{
- IF( hParamIsmDec->azimuth_values_fx[j] < 0 )
- {
- hParamIsmDec->hParamIsmRendering->proto_matrix_fx[j] = 0;
- move16();
- hParamIsmDec->hParamIsmRendering->proto_matrix_fx[nchan_out_woLFE + j] = 32767; // (1.0f in Q15) - 1
- move16();
- }
- ELSE /* == 0.0f */
- {
- hParamIsmDec->hParamIsmRendering->proto_matrix_fx[j] = ONE_IN_Q14; // Q15
- move16();
- hParamIsmDec->hParamIsmRendering->proto_matrix_fx[nchan_out_woLFE + j] = ONE_IN_Q14; // Q15
- move16();
- }
+ scale_sig32( p_data_fx[i], output_frame, sub( q_data_in, q_data ) ); // q_data_in
}
+ q_data = q_data_in;
+ move16();
}
}
-#endif
+#else
+ hParamIsmDec = st_ivas->hParamIsmDec;
+ assert( hParamIsmDec );
+ hSpatParamRendCom = st_ivas->hSpatParamRendCom;
+ assert( hSpatParamRendCom );
+ output_frame = imult1616( nCldfbSlots, hSpatParamRendCom->num_freq_bands );
+ fade_len = shr( output_frame, 1 );
+
+ nchan_transport = st_ivas->nchan_transport;
+ move16();
IF( st_ivas->hDecoderConfig->Opt_tsm )
{
/*TODO : FhG to check*/
ivas_ism_param_dec_tc_gain_ajust_fx( st_ivas, output_frame, fade_len, transport_channels, &q_tc );
+
IF( NE_16( q_tc, q_tc_in ) )
{
FOR( i = 0; i < 2; i++ )
@@ -1240,7 +1182,29 @@ void ivas_param_ism_dec_digest_tc_fx(
move16();
}
}
+#endif
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ /* CLDFB Analysis */
+ FOR( ( ch = 0, cldfb_ch = 0 ); cldfb_ch < n_ch_cldfb; ( cldfb_ch++, ch++ ) )
+ {
+ FOR( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )
+ {
+ q_data = q_data_in;
+ move16();
+
+ cldfbAnalysis_ts_fx_fixed_q( &( p_data_fx[ch][num_freq_bands * slot_idx] ),
+ &cldfb_real_buffer[slot_idx * num_freq_bands * n_ch_cldfb + cldfb_ch * num_freq_bands],
+ &cldfb_imag_buffer[slot_idx * num_freq_bands * n_ch_cldfb + cldfb_ch * num_freq_bands],
+ num_freq_bands, st_ivas->cldfbAnaDec[cldfb_ch], &q_data );
+
+ st_ivas->hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_exp = sub( 31, q_data );
+ move16();
+ st_ivas->hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_exp = sub( 31, q_data );
+ move16();
+ }
+ }
+#else
FOR( ch = 0; ch < nchan_transport; ch++ )
{
/* CLDFB Analysis */
@@ -1260,60 +1224,16 @@ void ivas_param_ism_dec_digest_tc_fx(
hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_exp = sub( 31, q_tc );
move16();
}
-
-#ifndef OBJ_EDITING_API
- Word16 scale_factor_real, scale_factor_imag;
- Word16 current_idx;
- exp_real_tmp = hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_exp;
- move16();
- exp_imag_tmp = hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_exp;
- move16();
- current_idx = add( imult1616( imult1616( slot_idx, hSpatParamRendCom->num_freq_bands ), nchan_transport ), imult1616( ch, hSpatParamRendCom->num_freq_bands ) );
- scale_factor_real = getScaleFactor32( &hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_fx[current_idx], hSpatParamRendCom->num_freq_bands );
- scale_factor_imag = getScaleFactor32( &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_fx[current_idx], hSpatParamRendCom->num_freq_bands );
- scale_sig32( &hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_fx[current_idx], hSpatParamRendCom->num_freq_bands, scale_factor_real ); // Q(31-(exp_real_tmp-scale_factor_real))
- scale_sig32( &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_fx[current_idx], hSpatParamRendCom->num_freq_bands, scale_factor_imag ); // Q(31-(exp_imag_tmp-scale_factor_imag))
- exp_real_tmp = sub( exp_real_tmp, scale_factor_real );
- exp_imag_tmp = sub( exp_imag_tmp, scale_factor_imag );
- ivas_param_ism_collect_slot_fx( hParamIsmDec,
- &hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_fx[current_idx],
- exp_real_tmp,
- &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_fx[current_idx],
- exp_imag_tmp,
- ch,
- cx_diag_fx, exp_cx_diag );
-
- exp_real_tmp = add( exp_real_tmp, scale_factor_real );
- exp_imag_tmp = add( exp_imag_tmp, scale_factor_imag );
- scale_sig32( &hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_fx[current_idx], hSpatParamRendCom->num_freq_bands, -scale_factor_real ); // Q(31-(exp_real_tmp))
- scale_sig32( &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_fx[current_idx], hSpatParamRendCom->num_freq_bands, -scale_factor_imag ); // Q(31-(exp_imag_tmp))
-#endif
}
}
-
-#ifndef OBJ_EDITING_API
- /* Obtain Mixing Matrix on a frame-level */
- FOR( bin_idx = 0; bin_idx < CLDFB_NO_CHANNELS_MAX; bin_idx++ )
- {
- set32_fx( hParamIsmDec->hParamIsmRendering->mixing_matrix_lin_fx[bin_idx], 0, PARAM_ISM_MAX_CHAN * PARAM_ISM_MAX_DMX );
- }
-
- /* Compute mixing matrix */
- ivas_param_ism_compute_mixing_matrix_fx( st_ivas->nchan_ism, hParamIsmDec, st_ivas->hISMDTX, direct_response_fx, nchan_transport, nchan_out_woLFE, cx_diag_fx, exp_cx_diag,
- hParamIsmDec->hParamIsmRendering->mixing_matrix_lin_fx, hParamIsmDec->hParamIsmRendering->exp_mixing_matrix_lin_fx );
-
#endif
- pop_wmops();
return;
}
-#ifdef OBJ_EDITING_API
-
-
/*-------------------------------------------------------------------------*
- * ivas_param_ism_dec_prepare_renderer_fx()
+ * ivas_param_ism_dec_dequant_md()
*
*
*-------------------------------------------------------------------------*/
@@ -1322,10 +1242,13 @@ void ivas_param_ism_dec_dequant_md_fx(
Decoder_Struct *st_ivas )
{
/* De-quantization */
+ test();
IF( !( EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, IVAS_SID_5k2 ) || EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, FRAME_NO_DATA ) ) )
{
ivas_param_ism_dec_dequant_DOA_fx( st_ivas->hParamIsmDec, st_ivas->nchan_ism );
+
ivas_param_ism_dec_dequant_powrat_fx( st_ivas->hParamIsmDec );
+
st_ivas->hISMDTX.dtx_flag = 0;
move16();
}
@@ -1338,6 +1261,7 @@ void ivas_param_ism_dec_dequant_md_fx(
return;
}
+
/*-------------------------------------------------------------------------*
* ivas_param_ism_dec_prepare_renderer_fx()
*
@@ -1345,12 +1269,12 @@ void ivas_param_ism_dec_dequant_md_fx(
*-------------------------------------------------------------------------*/
void ivas_param_ism_dec_prepare_renderer_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const Word16 nCldfbSlots /* i : number of CLFBS slots in the transport channels */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const Word16 nCldfbSlots /* i : number of CLDFB slots in transport channels */
)
{
- int16_t ch, nchan_transport, nchan_out, nchan_out_woLFE, i;
- int16_t slot_idx, bin_idx;
+ Word16 ch, nchan_transport, nchan_out, nchan_out_woLFE, i;
+ Word16 slot_idx, bin_idx;
Word32 cx_diag_fx[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX];
Word16 exp_cx_diag[CLDFB_NO_CHANNELS_MAX][PARAM_ISM_MAX_DMX];
Word16 exp_real_tmp = 0, exp_imag_tmp = 0;
@@ -1372,10 +1296,9 @@ void ivas_param_ism_dec_prepare_renderer_fx(
ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
/* Initialization */
-
- hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_exp = 25;
+ hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_exp = Q25;
move16();
- hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_exp = 25;
+ hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_exp = Q25;
move16();
IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
{
@@ -1392,7 +1315,6 @@ void ivas_param_ism_dec_prepare_renderer_fx(
nchan_out_woLFE = st_ivas->hIntSetup.nchan_out_woLFE;
move16();
}
- push_wmops( "ivas_param_ism_dec_digest_tc" );
/* general setup */
ivas_jbm_dec_get_adapted_linear_interpolator_fx( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbSlots, hParamIsmDec->hParamIsmRendering->interpolator_fx );
@@ -1520,34 +1442,32 @@ void ivas_param_ism_dec_prepare_renderer_fx(
ivas_param_ism_compute_mixing_matrix_fx( st_ivas->nchan_ism, hParamIsmDec, st_ivas->hISMDTX, direct_response_fx, nchan_transport, nchan_out_woLFE, cx_diag_fx, exp_cx_diag,
hParamIsmDec->hParamIsmRendering->mixing_matrix_lin_fx, hParamIsmDec->hParamIsmRendering->exp_mixing_matrix_lin_fx );
-
- pop_wmops();
-
return;
}
-#endif
+
/*-------------------------------------------------------------------------*
- * ivas_ism_param_dec_tc_gain_ajust()
+ * ivas_ism_param_dec_tc_gain_adjust()
*
*
*-------------------------------------------------------------------------*/
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+static void ivas_ism_param_dec_tc_gain_adjust_fx(
+#else
void ivas_ism_param_dec_tc_gain_ajust_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nSamples, /* i : number of samples to be compensate */
- const UWord16 nFadeLength, /* i : length of the crossfade in samples */
- Word32 *transport_channels_f[], /* i : synthesized core-coder transport channels/DirAC output Q_tc*/
- Word16 *Q_tc /* i/o : Q of input tc buffer */
+#endif
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const Word16 nSamples, /* i : number of samples to be compensate */
+ const Word16 nFadeLength, /* i : length of the crossfade in samples */
+ Word32 *p_data_fx[], /* i : synthesized core-coder transport channels/DirAC output q_data */
+ Word16 *q_data /* i/o : Q of input data buffer */
)
-
{
Word16 i, tmp_e1, tmp_e2, tmp, tmp2, invFade;
Word32 L_tmp1, L_tmp2;
-
Word16 gain_fx, last_gain_fx;
Word32 ene_tc_fx, ene_sum_fx;
-
Word16 ene_tc_e, ene_sum_e;
ene_tc_fx = 0;
@@ -1559,7 +1479,6 @@ void ivas_ism_param_dec_tc_gain_ajust_fx(
ene_sum_e = 0;
move16();
-
last_gain_fx = st_ivas->hParamIsmDec->hParamIsm->last_dmx_gain_fx;
move16();
@@ -1576,14 +1495,13 @@ void ivas_ism_param_dec_tc_gain_ajust_fx(
move16();
ch1_e = 0;
move16();
- ch0 = transport_channels_f[0][i];
+ ch0 = p_data_fx[0][i];
move16();
- ch1 = transport_channels_f[1][i];
+ ch1 = p_data_fx[1][i];
move16();
ch0 = BASOP_Util_Add_Mant32Exp( ch0, ch0_e, 0, 0, &ch0_e );
ch1 = BASOP_Util_Add_Mant32Exp( ch1, ch1_e, 0, 0, &ch1_e );
-
L_tmp1 = Mpy_32_32( ch0, ch0 ); /*L*L*/
tmp_e1 = add( ch0_e, ch0_e );
L_tmp2 = Mpy_32_32( ch1, ch1 ); /*R*R*/
@@ -1592,7 +1510,6 @@ void ivas_ism_param_dec_tc_gain_ajust_fx(
ene_tc_fx = BASOP_Util_Add_Mant32Exp( ene_tc_fx, ene_tc_e, L_tmp1, tmp_e1, &ene_tc_e );
ene_tc_fx = BASOP_Util_Add_Mant32Exp( ene_tc_fx, ene_tc_e, L_tmp2, tmp_e2, &ene_tc_e );
-
L_tmp1 = BASOP_Util_Add_Mant32Exp( ch0, ch0_e, ch1, ch1_e, &tmp_e1 ); /*L + R*/
L_tmp1 = Mpy_32_32( L_tmp1, L_tmp1 ); // Q(31-(tmp_e1+tmp_e1 /*(L + R)*(L + R)*/
tmp_e1 = add( tmp_e1, tmp_e1 );
@@ -1642,6 +1559,7 @@ void ivas_ism_param_dec_tc_gain_ajust_fx(
{
/* Smoothing */
gain_fx = add( mult_r( 24574, gain_fx ), mult_r( 8192, last_gain_fx ) ); // 24574 =.75f in Q15 , 8192=.25f in Q15
+
/* 10ms ramp */
/* slope between two consecutive gains, 480 samples length */
invFade = div_s( 1, nFadeLength ); // Q15
@@ -1652,18 +1570,18 @@ void ivas_ism_param_dec_tc_gain_ajust_fx(
/* tmp2 = ( last_gain_fx + i * grad_fx )*/
tmp2 = add( mult_r( sub( 32767, tmp ), last_gain_fx ), mult_r( tmp, gain_fx ) ); // 32767= 1.0f in Q15,
- transport_channels_f[0][i] = Mpy_32_16_1( transport_channels_f[0][i], tmp2 ); // Q(Q_tc-tmp_e1)
+ p_data_fx[0][i] = Mpy_32_16_1( p_data_fx[0][i], tmp2 ); // Q(Q_tc-tmp_e1)
move32();
- transport_channels_f[1][i] = Mpy_32_16_1( transport_channels_f[1][i], tmp2 ); // Q(Q_tc-tmp_e1)
+ p_data_fx[1][i] = Mpy_32_16_1( p_data_fx[1][i], tmp2 ); // Q(Q_tc-tmp_e1)
move32();
tmp = add( tmp, invFade );
}
FOR( ; i < nSamples; i++ )
{
- transport_channels_f[0][i] = Mpy_32_16_1( transport_channels_f[0][i], gain_fx ); // Q(Q_tc-tmp_e1)
+ p_data_fx[0][i] = Mpy_32_16_1( p_data_fx[0][i], gain_fx ); // Q(Q_tc-tmp_e1)
move32();
- transport_channels_f[1][i] = Mpy_32_16_1( transport_channels_f[1][i], gain_fx ); // Q(Q_tc-tmp_e1)
+ p_data_fx[1][i] = Mpy_32_16_1( p_data_fx[1][i], gain_fx ); // Q(Q_tc-tmp_e1)
move32();
}
}
@@ -1671,9 +1589,9 @@ void ivas_ism_param_dec_tc_gain_ajust_fx(
{
FOR( i = 0; i < nSamples; i++ )
{
- transport_channels_f[0][i] = Mpy_32_16_1( transport_channels_f[0][i], gain_fx ); // Q(Q_tc-tmp_e1)
+ p_data_fx[0][i] = Mpy_32_16_1( p_data_fx[0][i], gain_fx ); // Q(Q_tc-tmp_e1)
move32();
- transport_channels_f[1][i] = Mpy_32_16_1( transport_channels_f[1][i], gain_fx ); // Q(Q_tc-tmp_e1)
+ p_data_fx[1][i] = Mpy_32_16_1( p_data_fx[1][i], gain_fx ); // Q(Q_tc-tmp_e1)
move32();
}
}
@@ -1683,26 +1601,29 @@ void ivas_ism_param_dec_tc_gain_ajust_fx(
st_ivas->hParamIsmDec->hParamIsm->last_dmx_gain_e = tmp_e1;
move16();
- *Q_tc = sub( *Q_tc, tmp_e1 );
+ *q_data = sub( *q_data, tmp_e1 );
move16();
+
return;
}
+
/*-------------------------------------------------------------------------*
* ivas_ism_param_dec_render_sf()
*
*
*-------------------------------------------------------------------------*/
+
static void ivas_ism_param_dec_render_sf_fx(
Decoder_Struct *st_ivas,
IVAS_OUTPUT_SETUP hSetup,
const Word16 nchan_transport,
const Word16 nchan_out,
const Word16 nchan_out_woLFE,
- Word32 *output_f_fx[], /*Q_output*/
+ Word32 *output_fx[], /*Q_output*/
Word16 Q_output[] )
{
- Word16 ch, slot_idx, i, index_slot;
+ Word16 ch, slot_idx, i, index_slot, cldfb_idx;
/* CLDFB Output Buffers */
Word32 Cldfb_RealBuffer_fx[PARAM_ISM_MAX_CHAN][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; // Q(31-real_exp)
Word32 Cldfb_ImagBuffer_fx[PARAM_ISM_MAX_CHAN][JBM_CLDFB_SLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX]; // Q(31-imag_exp)
@@ -1715,12 +1636,14 @@ static void ivas_ism_param_dec_render_sf_fx(
Word16 idx_lfe;
Word16 subframe_idx;
Word16 samplesProcessed, no_col_cldfb, size_cldfb;
+
hParamIsmDec = st_ivas->hParamIsmDec;
hSpatParamRendCom = st_ivas->hSpatParamRendCom;
slot_idx_start = hSpatParamRendCom->slots_rendered;
move16();
subframe_idx = hSpatParamRendCom->subframes_rendered;
move16();
+
/* Set some memories to zero */
FOR( ch = 0; ch < nchan_out_woLFE; ch++ )
{
@@ -1731,17 +1654,15 @@ static void ivas_ism_param_dec_render_sf_fx(
}
}
-
Word16 real_exp[JBM_CLDFB_SLOTS_IN_SUBFRAME];
Word16 imag_exp[JBM_CLDFB_SLOTS_IN_SUBFRAME];
FOR( slot_idx = 0; slot_idx < hSpatParamRendCom->subframe_nbslots[subframe_idx]; slot_idx++ )
{
index_slot = add( slot_idx_start, slot_idx );
-
FOR( ch = 0; ch < nchan_transport; ch++ )
{
- Word16 cldfb_idx = add( imult1616( imult1616( index_slot, hSpatParamRendCom->num_freq_bands ), nchan_transport ), imult1616( ch, hSpatParamRendCom->num_freq_bands ) );
+ cldfb_idx = add( imult1616( imult1616( index_slot, hSpatParamRendCom->num_freq_bands ), nchan_transport ), imult1616( ch, hSpatParamRendCom->num_freq_bands ) );
Cldfb_RealBuffer_in_fx[ch] = &hParamIsmDec->hParamIsmRendering->Cldfb_RealBuffer_tc_fx[cldfb_idx]; // Q11
Cldfb_ImagBuffer_in_fx[ch] = &hParamIsmDec->hParamIsmRendering->Cldfb_ImagBuffer_tc_fx[cldfb_idx]; // Q11
}
@@ -1769,7 +1690,7 @@ static void ivas_ism_param_dec_render_sf_fx(
test();
IF( ( hSetup.num_lfe > 0 ) && EQ_16( hSetup.index_lfe[idx_lfe], ch ) )
{
- set32_fx( output_f_fx[ch], 0, i_mult( hSpatParamRendCom->subframe_nbslots[subframe_idx], hSpatParamRendCom->num_freq_bands ) );
+ set32_fx( output_fx[ch], 0, i_mult( hSpatParamRendCom->subframe_nbslots[subframe_idx], hSpatParamRendCom->num_freq_bands ) );
if ( LT_16( idx_lfe, sub( hSetup.num_lfe, 1 ) ) )
{
@@ -1778,7 +1699,6 @@ static void ivas_ism_param_dec_render_sf_fx(
}
ELSE
{
-
Word32 *RealBuffer_fx[16];
Word32 *ImagBuffer_fx[16];
@@ -1804,7 +1724,7 @@ static void ivas_ism_param_dec_render_sf_fx(
Scale_sig32( st_ivas->cldfbSynDec[ch]->cldfb_state_fx, st_ivas->cldfbSynDec[ch]->p_filter_length, sub( sub( Q_real, 1 ), Q11 ) ); // Q_real-1
st_ivas->cldfbSynDec[ch]->Q_cldfb_state = sub( Q_real, 1 );
move16();
- cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, output_f_fx[ch], i_mult( hSpatParamRendCom->num_freq_bands, hSpatParamRendCom->subframe_nbslots[subframe_idx] ), 0, 0, st_ivas->cldfbSynDec[ch] );
+ cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, output_fx[ch], i_mult( hSpatParamRendCom->num_freq_bands, hSpatParamRendCom->subframe_nbslots[subframe_idx] ), 0, 0, st_ivas->cldfbSynDec[ch] );
Scale_sig32( st_ivas->cldfbSynDec[ch]->cldfb_state_fx, st_ivas->cldfbSynDec[ch]->p_filter_length, sub( Q11, sub( Q_real, 1 ) ) ); // Q11
st_ivas->cldfbSynDec[ch]->Q_cldfb_state = Q11;
move16();
@@ -1821,7 +1741,7 @@ static void ivas_ism_param_dec_render_sf_fx(
}
size_cldfb = imult1616( st_ivas->cldfbSynDec[ch]->no_channels, no_col_cldfb );
- Scale_sig32( output_f_fx[ch], size_cldfb, sub( Q11, sub( Q_real, 1 ) ) ); // Q11
+ Scale_sig32( output_fx[ch], size_cldfb, sub( Q11, sub( Q_real, 1 ) ) ); // Q11
Q_output[ch] = 11;
move16();
@@ -1843,22 +1763,22 @@ static void ivas_ism_param_dec_render_sf_fx(
*
*
*-------------------------------------------------------------------------*/
+
void ivas_param_ism_dec_render_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
- UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
- UWord16 *nSamplesAvailableNext, /* o : number of CLDFB slots still to render */
- Word32 *output_f_fx[] /*Q11*/
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
+ UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
+ UWord16 *nSamplesAvailableNext, /* o : number of CLDFB slots still to render */
+ Word32 *output_fx[] /* i/o: synthesized core-coder TCs / rendered signal Q11*/
)
{
-
Word16 ch, slots_to_render, first_sf, last_sf, subframe_idx;
UWord16 slot_size, n_samples_sf;
PARAM_ISM_DEC_HANDLE hParamIsmDec;
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
IVAS_OUTPUT_SETUP hSetup;
Word16 nchan_transport, nchan_out, nchan_out_woLFE;
- Word32 *output_f_local_fx[MAX_OUTPUT_CHANNELS];
+ Word32 *output_fx_local[MAX_OUTPUT_CHANNELS];
Word16 Q_output[MAX_OUTPUT_CHANNELS];
set16_fx( Q_output, 0, MAX_OUTPUT_CHANNELS );
@@ -1907,17 +1827,17 @@ void ivas_param_ism_dec_render_fx(
FOR( ch = 0; ch < nchan_out; ch++ )
{
- output_f_local_fx[ch] = &output_f_fx[ch][0];
+ output_fx_local[ch] = &output_fx[ch][0];
}
FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
{
- ivas_ism_param_dec_render_sf_fx( st_ivas, hSetup, nchan_transport, nchan_out, nchan_out_woLFE, output_f_local_fx, Q_output );
+ ivas_ism_param_dec_render_sf_fx( st_ivas, hSetup, nchan_transport, nchan_out, nchan_out_woLFE, output_fx_local, Q_output );
n_samples_sf = i_mult( hSpatParamRendCom->subframe_nbslots[subframe_idx], hSpatParamRendCom->slot_size );
FOR( ch = 0; ch < nchan_out; ch++ )
{
- output_f_local_fx[ch] += n_samples_sf;
+ output_fx_local[ch] += n_samples_sf;
}
}
@@ -1930,7 +1850,6 @@ void ivas_param_ism_dec_render_fx(
/* store MetaData parameters */
FOR( ch = 0; ch < st_ivas->nchan_ism; ch++ )
{
-#ifdef OBJ_EDITING_API
IF( GT_32( st_ivas->hParamIsmDec->azimuth_values_fx[ch], 754974720 ) /*180.f in Q22*/ )
{
st_ivas->hIsmMetaData[ch]->azimuth_fx = L_sub( st_ivas->hParamIsmDec->edited_azimuth_values_fx[ch], 1509949440 ) /*360.0F in Q22*/;
@@ -1943,18 +1862,6 @@ void ivas_param_ism_dec_render_fx(
}
st_ivas->hIsmMetaData[ch]->elevation_fx = st_ivas->hParamIsmDec->edited_elevation_values_fx[ch];
move32();
-#else
- IF( GT_32( st_ivas->hParamIsmDec->azimuth_values_fx[ch], 754974720 ) /*180.f in Q22*/ )
- {
- st_ivas->hIsmMetaData[ch]->azimuth_fx = L_sub( st_ivas->hParamIsmDec->azimuth_values_fx[ch], 1509949440 ) /*360.0F in Q22*/;
- move32();
- }
- ELSE
- {
- st_ivas->hIsmMetaData[ch]->azimuth_fx = st_ivas->hParamIsmDec->azimuth_values_fx[ch];
- move32();
- }
-#endif
st_ivas->hIsmMetaData[ch]->elevation_fx = st_ivas->hParamIsmDec->elevation_values_fx[ch];
move32();
@@ -1963,6 +1870,7 @@ void ivas_param_ism_dec_render_fx(
*nSamplesAvailableNext = imult1616( sub( hSpatParamRendCom->num_slots, hSpatParamRendCom->slots_rendered ), (Word16) slot_size );
move16();
+
return;
}
@@ -1972,6 +1880,7 @@ void ivas_param_ism_dec_render_fx(
*
*
*-------------------------------------------------------------------------*/
+
void ivas_param_ism_params_to_masa_param_mapping_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
@@ -1984,166 +1893,142 @@ void ivas_param_ism_params_to_masa_param_mapping_fx(
Word16 azimuth[2];
Word16 elevation[2];
Word16 power_ratio_fx[2]; /* Q15 */
-#ifndef OBJ_EDITING_API
- Word32 ivas_total_brate;
-#endif
-
+ MASA_ISM_DATA_HANDLE hMasaIsmData;
+ Word16 obj;
+ Word16 obj_idx;
hParamIsmDec = st_ivas->hParamIsmDec;
+ move16();
hSpatParamRendCom = st_ivas->hSpatParamRendCom;
+ move16();
+ hMasaIsmData = st_ivas->hMasaIsmData;
nBins = hSpatParamRendCom->num_freq_bands;
move16();
-#ifndef OBJ_EDITING_API
- ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
- move32();
- test();
- IF( !( EQ_32( ivas_total_brate, IVAS_SID_5k2 ) || ivas_total_brate == FRAME_NO_DATA ) )
+ IF( st_ivas->hISMDTX.dtx_flag )
{
- ivas_param_ism_dec_dequant_DOA_fx( hParamIsmDec, st_ivas->nchan_ism );
- ivas_param_ism_dec_dequant_powrat_fx( hParamIsmDec );
- st_ivas->hISMDTX.dtx_flag = 0;
+ Word32 energy_ratio_fx; /* Q30 */
+ energy_ratio_fx = L_mult0( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence_fx, st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence_fx ); /* Q15 + Q15 -> Q30 */
+
+ hSpatParamRendCom->numSimultaneousDirections = 1;
+ move16();
+ azimuth[0] = extract_l( L_shr( L_add( hParamIsmDec->azimuth_values_fx[0], ONE_IN_Q21 ), 22 ) ); // Q0
move16();
+ elevation[0] = extract_l( L_shr( L_add( hParamIsmDec->elevation_values_fx[0], ONE_IN_Q21 ), 22 ) ); // Q0
+ move16();
+
+ FOR( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
+ {
+ FOR( bin_idx = 0; bin_idx < nBins; bin_idx++ )
+ {
+ hSpatParamRendCom->azimuth[sf_idx][bin_idx] = azimuth[0];
+ move16();
+ hSpatParamRendCom->elevation[sf_idx][bin_idx] = elevation[0];
+ move16();
+ hSpatParamRendCom->energy_ratio1_fx[sf_idx][bin_idx] = energy_ratio_fx;
+ move16();
+ hSpatParamRendCom->spreadCoherence_fx[sf_idx][bin_idx] = 0;
+ move16();
+ hSpatParamRendCom->surroundingCoherence_fx[sf_idx][bin_idx] = 0;
+ move16();
+ }
+ }
}
ELSE
{
- st_ivas->hISMDTX.dtx_flag = 1;
+ hSpatParamRendCom->numSimultaneousDirections = 2;
move16();
- }
-#endif
-
- IF( GT_16( st_ivas->nchan_ism, 1 ) )
- {
- IF( st_ivas->hISMDTX.dtx_flag )
+ FOR( band_idx = 0; band_idx < hParamIsmDec->hParamIsm->nbands; band_idx++ )
{
- Word32 energy_ratio_fx; /* Q30 */
- energy_ratio_fx = L_mult0( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence_fx, st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence_fx ); /* Q15 + Q15 -> Q30 */
+ brange[0] = hParamIsmDec->hParamIsm->band_grouping[band_idx];
+ move16();
+ brange[1] = hParamIsmDec->hParamIsm->band_grouping[band_idx + 1];
+ move16();
- hSpatParamRendCom->numSimultaneousDirections = 1;
+ azimuth[0] = extract_l( L_shr( L_add( hParamIsmDec->edited_azimuth_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0]], ( 1 << 21 ) ), 22 ) ); // Q0
move16();
- azimuth[0] = extract_l( L_shr( L_add( hParamIsmDec->azimuth_values_fx[0], ONE_IN_Q21 ), 22 ) ); // Q0
+ elevation[0] = extract_l( L_shr( L_add( hParamIsmDec->edited_elevation_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0]], ( 1 << 21 ) ), 22 ) ); // Q0
move16();
- elevation[0] = extract_l( L_shr( L_add( hParamIsmDec->elevation_values_fx[0], ONE_IN_Q21 ), 22 ) ); // Q0
+ power_ratio_fx[0] = hParamIsmDec->power_ratios_fx[band_idx][0][0];
+ move16();
+
+ azimuth[1] = extract_l( L_shr( L_add( hParamIsmDec->edited_azimuth_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][1]], ( 1 << 21 ) ), 22 ) ); // Q0
+ move16();
+ elevation[1] = extract_l( L_shr( L_add( hParamIsmDec->edited_elevation_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][1]], ( 1 << 21 ) ), 22 ) ); // Q0
+ move16();
+ power_ratio_fx[1] = hParamIsmDec->power_ratios_fx[band_idx][0][1];
move16();
FOR( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
{
- FOR( bin_idx = 0; bin_idx < nBins; bin_idx++ )
+ FOR( bin_idx = brange[0]; bin_idx < brange[1]; bin_idx++ )
{
hSpatParamRendCom->azimuth[sf_idx][bin_idx] = azimuth[0];
move16();
hSpatParamRendCom->elevation[sf_idx][bin_idx] = elevation[0];
move16();
- hSpatParamRendCom->energy_ratio1_fx[sf_idx][bin_idx] = energy_ratio_fx;
- move16();
- hSpatParamRendCom->spreadCoherence_fx[sf_idx][bin_idx] = 0;
+ hSpatParamRendCom->energy_ratio1_fx[sf_idx][bin_idx] = L_shl( power_ratio_fx[0], Q15 ); // Q30
+ move32();
+ hSpatParamRendCom->azimuth2[sf_idx][bin_idx] = azimuth[1];
move16();
- hSpatParamRendCom->surroundingCoherence_fx[sf_idx][bin_idx] = 0;
+ hSpatParamRendCom->elevation2[sf_idx][bin_idx] = elevation[1];
move16();
+ hSpatParamRendCom->energy_ratio2_fx[sf_idx][bin_idx] = L_shl( power_ratio_fx[1], Q15 ); // Q30
+ move32();
}
}
}
- ELSE
+
+ FOR( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
{
- hSpatParamRendCom->numSimultaneousDirections = 2;
- move16();
- FOR( band_idx = 0; band_idx < hParamIsmDec->hParamIsm->nbands; band_idx++ )
+ FOR( bin_idx = 0; bin_idx < nBins; bin_idx++ )
{
- brange[0] = hParamIsmDec->hParamIsm->band_grouping[band_idx];
- move16();
-#ifdef OBJ_EDITING_API
- brange[1] = hParamIsmDec->hParamIsm->band_grouping[band_idx + 1];
- move16();
-
- azimuth[0] = extract_l( L_shr( L_add( hParamIsmDec->edited_azimuth_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0]], ( 1 << 21 ) ), 22 ) ); // Q0
- move16();
- elevation[0] = extract_l( L_shr( L_add( hParamIsmDec->edited_elevation_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0]], ( 1 << 21 ) ), 22 ) ); // Q0
- move16();
-#else
- brange[1] = hParamIsmDec->hParamIsm->band_grouping[band_idx + 1];
- move16();
-
- azimuth[0] = extract_l( L_shr( L_add( hParamIsmDec->azimuth_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0]], ( 1 << 21 ) ), 22 ) ); // Q0
- move16();
- elevation[0] = extract_l( L_shr( L_add( hParamIsmDec->elevation_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0]], ( 1 << 21 ) ), 22 ) ); // Q0
- move16();
-#endif
- power_ratio_fx[0] = hParamIsmDec->power_ratios_fx[band_idx][0][0];
- move16();
-
-#ifdef OBJ_EDITING_API
- azimuth[1] = extract_l( L_shr( L_add( hParamIsmDec->edited_azimuth_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][1]], ( 1 << 21 ) ), 22 ) ); // Q0
- move16();
- elevation[1] = extract_l( L_shr( L_add( hParamIsmDec->edited_elevation_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][1]], ( 1 << 21 ) ), 22 ) ); // Q0
- move16();
-#else
- azimuth[1] = extract_l( L_shr( L_add( hParamIsmDec->azimuth_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][1]], ( 1 << 21 ) ), 22 ) ); // Q0
+ hSpatParamRendCom->spreadCoherence_fx[sf_idx][bin_idx] = 0;
move16();
- elevation[1] = extract_l( L_shr( L_add( hParamIsmDec->elevation_values_fx[hParamIsmDec->hParamIsm->obj_indices[band_idx][0][1]], ( 1 << 21 ) ), 22 ) ); // Q0
+ hSpatParamRendCom->spreadCoherence2_fx[sf_idx][bin_idx] = 0;
move16();
-#endif
- power_ratio_fx[1] = hParamIsmDec->power_ratios_fx[band_idx][0][1];
+ hSpatParamRendCom->surroundingCoherence_fx[sf_idx][bin_idx] = 0;
move16();
+ }
+ }
- FOR( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
- {
- FOR( bin_idx = brange[0]; bin_idx < brange[1]; bin_idx++ )
- {
- hSpatParamRendCom->azimuth[sf_idx][bin_idx] = azimuth[0];
- move16();
- hSpatParamRendCom->elevation[sf_idx][bin_idx] = elevation[0];
- move16();
- hSpatParamRendCom->energy_ratio1_fx[sf_idx][bin_idx] = L_shl( power_ratio_fx[0], Q15 ); // Q30
- move32();
- hSpatParamRendCom->azimuth2[sf_idx][bin_idx] = azimuth[1];
- move16();
- hSpatParamRendCom->elevation2[sf_idx][bin_idx] = elevation[1];
- move16();
- hSpatParamRendCom->energy_ratio2_fx[sf_idx][bin_idx] = L_shl( power_ratio_fx[1], Q15 ); // Q30
- move32();
- }
- }
+ FOR( obj = 0; obj < st_ivas->nchan_ism; obj++ )
+ {
+ FOR( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
+ {
+ hMasaIsmData->azimuth_ism_fx[obj][sf_idx] = extract_l( L_shr( ( L_add( hParamIsmDec->azimuth_values_fx[obj], ( 1 << 21 ) ) ), 22 ) ); // Q0
+ hMasaIsmData->elevation_ism_fx[obj][sf_idx] = extract_l( L_shr_r( L_add( hParamIsmDec->elevation_values_fx[obj], ( 1 << 21 ) ), 22 ) ); // Scale to Q0
}
+ hMasaIsmData->azimuth_ism_edited_fx[obj] = extract_l( L_shr( ( L_add( hParamIsmDec->edited_azimuth_values_fx[obj], ( 1 << 21 ) ) ), 22 ) );
+ hMasaIsmData->elevation_ism_edited_fx[obj] = extract_l( L_shr( ( L_add( hParamIsmDec->edited_azimuth_values_fx[obj], ( 1 << 21 ) ) ), 22 ) );
+
FOR( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
{
- FOR( bin_idx = 0; bin_idx < nBins; bin_idx++ )
- {
- hSpatParamRendCom->spreadCoherence_fx[sf_idx][bin_idx] = 0;
- move16();
- hSpatParamRendCom->spreadCoherence2_fx[sf_idx][bin_idx] = 0;
- move16();
- hSpatParamRendCom->surroundingCoherence_fx[sf_idx][bin_idx] = 0;
- move16();
- }
+ set_zero_fx( hMasaIsmData->energy_ratio_ism_fx[obj][sf_idx], CLDFB_NO_CHANNELS_MAX );
}
}
- }
- ELSE
- {
- hSpatParamRendCom->numSimultaneousDirections = 1;
- move16();
- azimuth[0] = extract_l( L_shr( ( L_add( hParamIsmDec->azimuth_values_fx[0], ( 1 << 21 ) ) ), 22 ) ); // Q0
- move16();
- elevation[0] = extract_l( L_shr( L_add( hParamIsmDec->elevation_values_fx[0], ( 1 << 21 ) ), 22 ) ); // Q0
- move16();
- FOR( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
+ FOR( obj = 0; obj < MAX_PARAM_ISM_WAVE; obj++ )
{
- FOR( bin_idx = 0; bin_idx < nBins; bin_idx++ )
+ FOR( band_idx = 0; band_idx < hParamIsmDec->hParamIsm->nbands; band_idx++ )
{
- hSpatParamRendCom->azimuth[sf_idx][bin_idx] = azimuth[0];
- move16();
- hSpatParamRendCom->elevation[sf_idx][bin_idx] = elevation[0];
- move16();
- hSpatParamRendCom->energy_ratio1_fx[sf_idx][bin_idx] = ONE_IN_Q30; /* 1.0f in Q30 */
- move32();
- hSpatParamRendCom->spreadCoherence_fx[sf_idx][bin_idx] = 0;
- move16();
- hSpatParamRendCom->surroundingCoherence_fx[sf_idx][bin_idx] = 0;
- move16();
+ brange[0] = hParamIsmDec->hParamIsm->band_grouping[band_idx];
+ brange[1] = hParamIsmDec->hParamIsm->band_grouping[band_idx + 1];
+
+ obj_idx = hParamIsmDec->hParamIsm->obj_indices[band_idx][0][obj];
+ power_ratio_fx[obj] = hParamIsmDec->power_ratios_fx[band_idx][0][obj]; // Q15
+
+ FOR( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
+ {
+ FOR( bin_idx = brange[0]; bin_idx < brange[1]; bin_idx++ )
+ {
+ hMasaIsmData->energy_ratio_ism_fx[obj_idx][sf_idx][bin_idx] = L_shl( power_ratio_fx[obj], 15 ); // Q15 -> Q30
+ }
+ }
}
}
}
+
return;
}
diff --git a/lib_dec/ivas_ism_renderer_fx.c b/lib_dec/ivas_ism_renderer_fx.c
index 36234bf4713f711712cbb3f3b63a4b3a0c6b42b3..64c7f7b087a2d06e39e43acc017b9a7dd7d1d238 100644
--- a/lib_dec/ivas_ism_renderer_fx.c
+++ b/lib_dec/ivas_ism_renderer_fx.c
@@ -72,7 +72,7 @@ ivas_error ivas_ism_renderer_open_fx(
test();
test();
IF( st_ivas->hIntSetup.is_loudspeaker_setup &&
- st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_STEREO &&
+ NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) &&
st_ivas->hIntSetup.ls_azimuth_fx != NULL && st_ivas->hIntSetup.ls_elevation_fx != NULL &&
st_ivas->hEFAPdata == NULL )
{
@@ -128,6 +128,7 @@ ivas_error ivas_ism_renderer_open_fx(
*
* Close struct for object rendering.
*-------------------------------------------------------------------------*/
+
void ivas_ism_renderer_close(
ISM_RENDERER_HANDLE *hIsmRendererData /* i/o: ISM renderer handle */
)
@@ -156,6 +157,7 @@ void ivas_ism_renderer_close(
*
* Object rendering process
*-------------------------------------------------------------------------*/
+
void ivas_ism_render_sf_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const RENDERER_TYPE renderer_type, /* i : active renderer type */
@@ -237,10 +239,9 @@ void ivas_ism_render_sf_fx(
set32_fx( output_fx[i], 0, n_samples_to_render );
}
-
FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
{
- int16_t n_samples_in_subframe;
+ Word16 n_samples_in_subframe;
n_samples_in_subframe = st_ivas->hTcBuffer->n_samples_granularity * st_ivas->hTcBuffer->subframe_nbslots[subframe_idx];
test();
@@ -259,28 +260,22 @@ void ivas_ism_render_sf_fx(
{
if ( GE_16( subframe_idx, ism_md_subframe_update_jbm ) )
{
-#ifdef OBJ_EDITING_API
rotateAziEle_fx( extract_l( L_shr( st_ivas->hIsmMetaData[i]->edited_azimuth_fx, 22 ) ), extract_l( L_shr( st_ivas->hIsmMetaData[i]->edited_elevation_fx, 22 ) ), &azimuth, &elevation, st_ivas->hCombinedOrientationData->Rmat_fx[st_ivas->hCombinedOrientationData->subframe_idx], st_ivas->hIntSetup.is_planar_setup );
-#else
- rotateAziEle_fx( extract_l( L_shr( st_ivas->hIsmMetaData[i]->azimuth_fx, 22 ) ), extract_l( L_shr( st_ivas->hIsmMetaData[i]->elevation_fx, 22 ) ), &azimuth, &elevation, st_ivas->hCombinedOrientationData->Rmat_fx[st_ivas->hCombinedOrientationData->subframe_idx], st_ivas->hIntSetup.is_planar_setup );
-#endif
}
else
{
-#ifdef OBJ_EDITING_API
rotateAziEle_fx( extract_l( L_shr( st_ivas->hIsmMetaData[i]->edited_azimuth_fx, 22 ) ), extract_l( L_shr( st_ivas->hIsmMetaData[i]->edited_elevation_fx, 22 ) ), &azimuth, &elevation, st_ivas->hCombinedOrientationData->Rmat_fx[st_ivas->hCombinedOrientationData->subframe_idx], st_ivas->hIntSetup.is_planar_setup );
-#else
- rotateAziEle_fx( extract_l( L_shr( st_ivas->hIsmMetaData[i]->last_azimuth_fx, 22 ) ), extract_l( L_shr( st_ivas->hIsmMetaData[i]->last_elevation_fx, 22 ) ), &azimuth, &elevation, st_ivas->hCombinedOrientationData->Rmat_fx[st_ivas->hCombinedOrientationData->subframe_idx], st_ivas->hIntSetup.is_planar_setup );
-#endif
}
IF( st_ivas->hEFAPdata != NULL )
{
efap_determine_gains_fx( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains_fx[i], L_shl( azimuth, 22 ), L_shl( elevation, 22 ), EFAP_MODE_EFAP );
-#ifdef OBJ_EDITING_API
- // TODO: Enable gain editing feature
- // v_multc_fixed( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE ); // Q30, Q30 --> Q30
-#endif
+ // TODO: Align Q-values
+ IF( NE_32( st_ivas->hIsmMetaData[i]->edited_gain_fx, ONE_IN_Q29 ) )
+ {
+ v_multc_fx( st_ivas->hIsmRendererData->gains_fx[i], st_ivas->hIsmMetaData[i]->edited_gain_fx, st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE ); // Q30, Q29 --> Q28
+ Scale_sig32( st_ivas->hIsmRendererData->gains_fx[i], nchan_out_woLFE, Q2 ); // Q28 --> Q30
+ }
}
}
@@ -415,6 +410,7 @@ void ivas_ism_get_stereo_gains_fx(
return;
}
+
/*-------------------------------------------------------------------------*
* ivas_omasa_separate_object_renderer_open()
*
@@ -622,17 +618,38 @@ void ivas_omasa_separate_object_render_jbm_fx(
IF( single_separated )
{
- azimuth = st_ivas->hMasaIsmData->azimuth_separated_ism[md_idx];
- move16();
- elevation = st_ivas->hMasaIsmData->elevation_separated_ism[md_idx];
- move16();
+ test();
+ IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) && st_ivas->hMasaIsmData->ism_dir_is_edited[st_ivas->hMasaIsmData->idx_separated_ism] )
+ {
+ azimuth = st_ivas->hMasaIsmData->azimuth_ism_edited_fx[st_ivas->hMasaIsmData->idx_separated_ism];
+ move16();
+ elevation = st_ivas->hMasaIsmData->elevation_ism_edited_fx[st_ivas->hMasaIsmData->idx_separated_ism];
+ move16();
+ }
+ ELSE
+ {
+ azimuth = st_ivas->hMasaIsmData->azimuth_separated_ism_fx[md_idx];
+ move16();
+ elevation = st_ivas->hMasaIsmData->elevation_separated_ism_fx[md_idx];
+ move16();
+ }
}
ELSE
{
- azimuth = st_ivas->hMasaIsmData->azimuth_ism[obj][md_idx];
- move16();
- elevation = st_ivas->hMasaIsmData->elevation_ism[obj][md_idx];
- move16();
+ IF( st_ivas->hMasaIsmData->ism_dir_is_edited[obj] )
+ {
+ azimuth = st_ivas->hMasaIsmData->azimuth_ism_edited_fx[obj];
+ move16();
+ elevation = st_ivas->hMasaIsmData->elevation_ism_edited_fx[obj];
+ move16();
+ }
+ ELSE
+ {
+ azimuth = st_ivas->hMasaIsmData->azimuth_ism_fx[obj][md_idx];
+ move16();
+ elevation = st_ivas->hMasaIsmData->elevation_ism_fx[obj][md_idx];
+ move16();
+ }
}
if ( st_ivas->hOutSetup.is_planar_setup )
diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c
index 48580801d892e11c1159ed259a801d403fdf77ab..9ce180ec573c88b5c9f29b6d10784ae22b6ffb64 100644
--- a/lib_dec/ivas_jbm_dec_fx.c
+++ b/lib_dec/ivas_jbm_dec_fx.c
@@ -51,23 +51,26 @@
* Local function prototypes
*-----------------------------------------------------------------------*/
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
static void ivas_jbm_dec_copy_tc( Decoder_Struct *st_ivas, const Word16 nSamplesForRendering, Word16 *nSamplesResidual, Word32 *data, Word32 *tc_digest_f[], Word16 data_q );
-
+#endif
static void ivas_jbm_dec_tc_buffer_playout_fx( Decoder_Struct *st_ivas, const UWord16 nSamplesAsked, UWord16 *nSamplesRendered, Word32 *output_fx[] );
static void ivas_jbm_dec_copy_masa_meta_to_buffer( Decoder_Struct *st_ivas );
static void ivas_jbm_masa_sf_to_slot_map( Decoder_Struct *st_ivas, const Word16 nCldfbTs );
-
-static Word16 ceil_fx16( Word16 inp, Word16 Q );
-static Word16 ceil_fx16( Word16 inp, Word16 Q )
+static Word16 ceil_fx16(
+ const Word16 inp,
+ const Word16 Q )
{
Word16 ret = shr( inp, Q );
+
IF( ( s_and( inp, sub( shl( 1, Q ), 1 ) ) ) > 0 )
{
ret = add( ret, 1 );
}
+
return ret;
}
@@ -78,8 +81,11 @@ static Word16 ceil_fx16( Word16 inp, Word16 Q )
*--------------------------------------------------------------------------*/
ivas_error ivas_jbm_dec_tc_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Word32 *data_fx /*Q11*/
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+#ifndef LIB_DEC_REVISION
+ ,
+ Word32 *data_fx /*Q11*/
+#endif
)
{
Word16 ch, n, output_frame, nchan_out, i, ii;
@@ -112,6 +118,7 @@ ivas_error ivas_jbm_dec_tc_fx(
output_frame = extract_l( Mult_32_16( output_Fs, INV_FRAME_PER_SEC_Q15 ) ) /* output_Fs / FRAMES_PER_SEC */;
+ /* set pointers to transport channels audio */
FOR( n = 0; n < MAX_TRANSPORT_CHANNELS; n++ )
{
p_output_fx[n] = st_ivas->p_output_fx[n];
@@ -159,11 +166,7 @@ ivas_error ivas_jbm_dec_tc_fx(
/* HP filtering */
FOR( n = 0; n < s_min( nchan_out, st_ivas->nchan_transport ); n++ )
{
-#ifdef HP20_FIX32_RECODING
hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#else
- hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#endif
}
}
ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )
@@ -197,10 +200,10 @@ ivas_error ivas_jbm_dec_tc_fx(
move16();
}
}
+
ivas_ism_dtx_limit_noise_energy_for_near_silence_fx( st_ivas->hSCE, st_ivas->hISMDTX.sce_id_dtx, st_ivas->nchan_transport, Q_cngNoiseLevel );
-#ifdef OBJ_EDITING_API
+
ivas_param_ism_dec_dequant_md_fx( st_ivas );
-#endif
}
ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) )
{
@@ -208,9 +211,8 @@ ivas_error ivas_jbm_dec_tc_fx(
{
return error;
}
-#ifdef OBJ_EDITING_API
+
ivas_param_ism_dec_dequant_md_fx( st_ivas );
-#endif
}
ELSE /* ISM_MODE_DISC */
{
@@ -236,11 +238,7 @@ ivas_error ivas_jbm_dec_tc_fx(
}
/* HP filtering */
-#ifdef HP20_FIX32_RECODING
hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#else
- hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#endif
}
test();
@@ -287,12 +285,13 @@ ivas_error ivas_jbm_dec_tc_fx(
{
return error;
}
-
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
test();
IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && st_ivas->hDecoderConfig->Opt_tsm )
{
ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );
}
+#endif
}
ELSE IF( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) )
{
@@ -591,11 +590,7 @@ ivas_error ivas_jbm_dec_tc_fx(
/* HP filtering */
FOR( n = 0; n < nchan_remapped; n++ )
{
-#ifdef HP20_FIX32_RECODING
hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#else
- hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#endif
}
IF( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) )
@@ -669,7 +664,7 @@ ivas_error ivas_jbm_dec_tc_fx(
test();
/* external output */
- IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && EQ_32( st_ivas->hMasa->config.input_ivas_format, MASA_ISM_FORMAT ) )
+ IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && EQ_32( st_ivas->hMasa->config.input_ivas_format, MASA_ISM_FORMAT ) )
{
FOR( n = 0; n < st_ivas->nchan_ism; n++ )
{
@@ -788,11 +783,7 @@ ivas_error ivas_jbm_dec_tc_fx(
FOR( n = 0; n < getNumChanSynthesis( st_ivas ); n++ )
{
-#ifdef HP20_FIX32_RECODING
hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#else
- hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#endif
}
Word16 output_q = 11;
@@ -804,515 +795,555 @@ ivas_error ivas_jbm_dec_tc_fx(
output_q = 8;
move16();
}
- ELSE IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
- {
- IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
- {
+ ELSE IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) ){
+ IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) ){
ivas_omasa_rearrange_channels_fx( p_output_fx, nchan_transport_ism, output_frame );
- }
- ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) )
- {
- /* Convert separate object to MASA, combine with the original MASA, and output combined MASA + empty objects. */
- ivas_omasa_combine_separate_ism_with_masa_fx( st_ivas, p_output_fx, &output_q, st_ivas->nchan_ism, output_frame );
- }
- ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
- {
- /* Extract objects from MASA, output MASA + all objects (i.e., extracted and separated objects) */
- ivas_omasa_render_objects_from_mix_fx( st_ivas, p_output_fx, st_ivas->nchan_ism, output_frame, &output_q );
- }
+ }
+ ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) )
+ {
+ /* Convert separate object to MASA, combine with the original MASA, and output combined MASA + empty objects. */
+ ivas_omasa_combine_separate_ism_with_masa_fx( st_ivas, p_output_fx, &output_q, st_ivas->nchan_ism, output_frame );
+ }
+ ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
+ {
+ /* Extract objects from MASA, output MASA + all objects (i.e., extracted and separated objects) */
+ ivas_omasa_render_objects_from_mix_fx( st_ivas, p_output_fx, st_ivas->nchan_ism, output_frame, &output_q );
+ }
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
+ IF( st_ivas->hDecoderConfig->Opt_tsm )
+ {
+ ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );
+ }
+#endif
+}
+IF( NE_16( output_q, Q11 ) )
+{
+ FOR( n = 0; n < s_max( getNumChanSynthesis( st_ivas ), nchan_transport_ism + st_ivas->nchan_transport ); n++ )
+ {
+ Scale_sig32( p_output_fx[n], output_frame, sub( Q11, output_q ) ); // Q11
+ }
+}
+}
+ELSE IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
+{
+ Word16 nchan_ism, sba_ch_idx;
- IF( st_ivas->hDecoderConfig->Opt_tsm )
- {
- ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );
- }
- }
- IF( NE_16( output_q, Q11 ) )
+ set16_fx( nb_bits_metadata, 0, MAX_SCE + 1 );
+ nchan_ism = st_ivas->nchan_ism;
+ move16();
+ IF( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
+ {
+ /* set ISM parameters and decode ISM metadata in OSBA format */
+ IF( NE_32( ( error = ivas_osba_ism_metadata_dec_fx( st_ivas, ivas_total_brate, &nchan_ism, &nb_bits_metadata[1] ) ), IVAS_ERR_OK ) )
{
- FOR( n = 0; n < s_max( getNumChanSynthesis( st_ivas ), nchan_transport_ism + st_ivas->nchan_transport ); n++ )
- {
- Scale_sig32( p_output_fx[n], output_frame, sub( Q11, output_q ) ); // Q11
- }
+ return error;
}
+ sba_ch_idx = st_ivas->nchan_ism;
+ move16();
}
- ELSE IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
+ ELSE
{
- Word16 nchan_ism, sba_ch_idx;
-
- set16_fx( nb_bits_metadata, 0, MAX_SCE + 1 );
- nchan_ism = st_ivas->nchan_ism;
+ nb_bits_metadata[1] = add( nb_bits_metadata[1], NO_BITS_MASA_ISM_NO_OBJ );
+ sba_ch_idx = 0;
move16();
- IF( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
+ move16();
+ }
+
+ /* SBA metadata decoding */
+ IF( NE_32( ( error = ivas_spar_dec_fx( st_ivas, nb_bits_metadata ) ), IVAS_ERR_OK ) )
+ {
+ return error;
+ }
+
+ test();
+ IF( EQ_16( st_ivas->nchan_transport, CPE_CHANNELS ) && GE_16( st_ivas->nCPE, 1 ) )
+ {
+ st_ivas->hCPE[0]->element_brate = ivas_total_brate;
+ move32();
+ }
+
+ /* core-decoding of transport channels */
+ Word16 q_output = 11;
+ move16();
+
+ IF( EQ_16( st_ivas->nSCE, 1 ) )
+ {
+ set32_fx( p_output_fx[0], 0, L_FRAME48k );
+
+ IF( NE_32( ( error = ivas_sce_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] + nb_bits_metadata[1] ) ), IVAS_ERR_OK ) )
{
- /* set ISM parameters and decode ISM metadata in OSBA format */
- IF( NE_32( ( error = ivas_osba_ism_metadata_dec_fx( st_ivas, ivas_total_brate, &nchan_ism, &nb_bits_metadata[1] ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
- sba_ch_idx = st_ivas->nchan_ism;
- move16();
+ return error;
}
- ELSE
+ }
+ ELSE IF( EQ_16( st_ivas->nCPE, 1 ) )
+ {
+
+ IF( NE_32( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, add( nb_bits_metadata[0], nb_bits_metadata[1] ) ) ), IVAS_ERR_OK ) )
{
- nb_bits_metadata[1] = add( nb_bits_metadata[1], NO_BITS_MASA_ISM_NO_OBJ );
- sba_ch_idx = 0;
- move16();
- move16();
+ return error;
}
- /* SBA metadata decoding */
- IF( NE_32( ( error = ivas_spar_dec_fx( st_ivas, nb_bits_metadata ) ), IVAS_ERR_OK ) )
+ IF( NE_16( q_output, Q11 ) )
+ {
+ Scale_sig32( p_output_fx[0], output_frame, sub( Q11, q_output ) ); // Q11
+ Scale_sig32( p_output_fx[1], output_frame, sub( Q11, q_output ) ); // Q11
+ }
+ }
+ ELSE IF( GT_16( st_ivas->nCPE, 1 ) )
+ {
+ IF( NE_32( ( error = ivas_mct_dec_fx( st_ivas, p_output_fx, output_frame, nb_bits_metadata[0] + nb_bits_metadata[1] ) ), IVAS_ERR_OK ) )
{
return error;
}
+ }
- test();
- IF( EQ_16( st_ivas->nchan_transport, CPE_CHANNELS ) && GE_16( st_ivas->nCPE, 1 ) )
+ IF( st_ivas->sba_dirac_stereo_flag )
+ {
+ FOR( i = 0; i < st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport; i++ )
{
- st_ivas->hCPE[0]->element_brate = ivas_total_brate;
- move32();
+ Scale_sig32( p_output_fx[i + sba_ch_idx], output_frame, Q14 - Q11 ); // Q14
}
-
- /* core-decoding of transport channels */
- Word16 q_output = 11;
+ SPAR_DEC_HANDLE hSpar = st_ivas->hSpar;
+ Word16 nchan_transport;
+ nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport;
move16();
+ nchan_out = nchan_transport;
+ move16();
+ ivas_agc_dec_process_fx( st_ivas->hSpar->hAgcDec, ( p_output_fx + sba_ch_idx ), ( p_output_fx + sba_ch_idx ), st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, output_frame );
- IF( EQ_16( st_ivas->nSCE, 1 ) )
+ IF( st_ivas->hSpar->hPCA != NULL )
{
- set32_fx( p_output_fx[0], 0, L_FRAME48k );
-
- IF( NE_32( ( error = ivas_sce_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] + nb_bits_metadata[1] ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
+ ivas_pca_dec_fx( 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, &p_output_fx[sba_ch_idx] );
}
- ELSE IF( EQ_16( st_ivas->nCPE, 1 ) )
+ ivas_spar_dec_gen_umx_mat_fx( st_ivas->hSpar->hMdDec, st_ivas->nchan_transport, IVAS_MAX_NUM_BANDS, st_ivas->bfi, ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->last_active_ivas_total_brate ) );
{
-
- IF( NE_32( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, add( nb_bits_metadata[0], nb_bits_metadata[1] ) ) ), IVAS_ERR_OK ) )
+ Word16 q;
+ hCPE = st_ivas->hCPE[0];
+ hSCE = st_ivas->hSCE[0];
+ s = 0;
+ move16();
+ FOR( i = 0; i < 2; i++ )
{
- return error;
+ s = s_min( s, L_norm_arr( p_output_fx[sba_ch_idx + i], L_FRAME48k ) - 11 /* Guard bits */ );
}
-
- IF( NE_16( q_output, Q11 ) )
+ FOR( i = 0; i < 2; i++ )
{
- Scale_sig32( p_output_fx[0], output_frame, sub( Q11, q_output ) ); // Q11
- Scale_sig32( p_output_fx[1], output_frame, sub( Q11, q_output ) ); // Q11
+ Scale_sig32( p_output_fx[sba_ch_idx + i], L_FRAME48k, s ); // Q(11+s)
}
- }
- ELSE IF( GT_16( st_ivas->nCPE, 1 ) )
- {
- IF( NE_32( ( error = ivas_mct_dec_fx( st_ivas, p_output_fx, output_frame, nb_bits_metadata[0] + nb_bits_metadata[1] ) ), IVAS_ERR_OK ) )
+ hCPE->hStereoDft->q_dft = add( Q11, s );
+ move16();
+ IF( EQ_16( hCPE->hStereoDft->first_frame, 1 ) )
{
- return error;
+ hCPE->hStereoDft->q_smoothed_nrg = Q6; // hCPE->hStereoDft->q_dft;
+ hCPE->hStereoDft->q_ap_delay_mem_fx = hCPE->hStereoDft->q_dft;
+ move16();
+ move16();
}
- }
- IF( st_ivas->sba_dirac_stereo_flag )
- {
- FOR( i = 0; i < st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport; i++ )
- {
- Scale_sig32( p_output_fx[i + sba_ch_idx], output_frame, Q14 - Q11 ); // Q14
- }
- SPAR_DEC_HANDLE hSpar = st_ivas->hSpar;
- Word16 nchan_transport;
- nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport;
- move16();
- nchan_out = nchan_transport;
+ q = hCPE->hStereoDft->q_dft;
move16();
- ivas_agc_dec_process_fx( st_ivas->hSpar->hAgcDec, ( p_output_fx + sba_ch_idx ), ( p_output_fx + sba_ch_idx ), st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, output_frame );
-
- IF( st_ivas->hSpar->hPCA != NULL )
+ scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );
+ FOR( i = 0; i < CPE_CHANNELS; ++i )
{
- ivas_pca_dec_fx( 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, &p_output_fx[sba_ch_idx] );
+ scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
+ scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
}
- ivas_spar_dec_gen_umx_mat_fx( st_ivas->hSpar->hMdDec, st_ivas->nchan_transport, IVAS_MAX_NUM_BANDS, st_ivas->bfi, ivas_get_spar_dec_md_num_subframes( st_ivas->sba_order, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->last_active_ivas_total_brate ) );
+ IF( hCPE->hCoreCoder[0] != NULL )
{
- Word16 q;
- hCPE = st_ivas->hCPE[0];
- hSCE = st_ivas->hSCE[0];
- s = 0;
+ Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k, sub( q, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ) ); // q
+ Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, L_FRAME48k, sub( q, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda ) ); // q
+ hCPE->hCoreCoder[0]->hHQ_core->Q_old_out_fx32 = q;
move16();
- FOR( i = 0; i < 2; i++ )
- {
- s = s_min( s, L_norm_arr( p_output_fx[sba_ch_idx + i], L_FRAME48k ) - 11 /* Guard bits */ );
- }
- FOR( i = 0; i < 2; i++ )
- {
- Scale_sig32( p_output_fx[sba_ch_idx + i], L_FRAME48k, s ); // Q(11+s)
- }
- hCPE->hStereoDft->q_dft = add( Q11, s );
+ }
+ IF( hCPE->hStereoDft != NULL )
+ {
+ scale_sig32( hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
+ scale_sig32( hCPE->hStereoDft->ap_delay_mem_fx, NS2SA( 16000, DELAY_BWE_TOTAL_NS ), sub( hCPE->hStereoDft->q_dft, hCPE->hStereoDft->q_ap_fade_mem_fx ) ); // q_dft
+ hCPE->hStereoDft->q_ap_fade_mem_fx = hCPE->hStereoDft->q_dft;
move16();
- IF( EQ_16( hCPE->hStereoDft->first_frame, 1 ) )
- {
- hCPE->hStereoDft->q_smoothed_nrg = Q6; // hCPE->hStereoDft->q_dft;
- hCPE->hStereoDft->q_ap_delay_mem_fx = hCPE->hStereoDft->q_dft;
- move16();
- move16();
- }
+ }
- q = hCPE->hStereoDft->q_dft;
+ IF( hSCE != NULL )
+ {
+ Scale_sig32( &hSCE->save_hb_synth_fx[0], extract_l( Mpy_32_32( hCPE->hCoreCoder[0]->output_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), hCPE->hStereoDft->q_dft - hSCE->q_save_hb_synth_fx ); // q_dft
+ hSCE->q_save_hb_synth_fx = hCPE->hStereoDft->q_dft;
+ move16();
+ Scale_sig32( &hSCE->save_synth_fx[0], extract_l( Mpy_32_32( hCPE->hCoreCoder[0]->output_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), hCPE->hStereoDft->q_dft - hSCE->q_save_synth_fx ); // q_dft
+ hSCE->q_save_synth_fx = hCPE->hStereoDft->q_dft;
move16();
- scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );
- FOR( i = 0; i < CPE_CHANNELS; ++i )
- {
- scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
- scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
- }
- IF( hCPE->hCoreCoder[0] != NULL )
- {
- Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k, sub( q, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ) ); // q
- Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, L_FRAME48k, sub( q, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda ) ); // q
- hCPE->hCoreCoder[0]->hHQ_core->Q_old_out_fx32 = q;
- move16();
- }
- IF( hCPE->hStereoDft != NULL )
- {
- scale_sig32( hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
- scale_sig32( hCPE->hStereoDft->ap_delay_mem_fx, NS2SA( 16000, DELAY_BWE_TOTAL_NS ), sub( hCPE->hStereoDft->q_dft, hCPE->hStereoDft->q_ap_fade_mem_fx ) ); // q_dft
- hCPE->hStereoDft->q_ap_fade_mem_fx = hCPE->hStereoDft->q_dft;
- move16();
- }
-
- IF( hSCE != NULL )
- {
- Scale_sig32( &hSCE->save_hb_synth_fx[0], extract_l( Mpy_32_32( hCPE->hCoreCoder[0]->output_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), hCPE->hStereoDft->q_dft - hSCE->q_save_hb_synth_fx ); // q_dft
- hSCE->q_save_hb_synth_fx = hCPE->hStereoDft->q_dft;
- move16();
- Scale_sig32( &hSCE->save_synth_fx[0], extract_l( Mpy_32_32( hCPE->hCoreCoder[0]->output_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), hCPE->hStereoDft->q_dft - hSCE->q_save_synth_fx ); // q_dft
- hSCE->q_save_synth_fx = hCPE->hStereoDft->q_dft;
- move16();
- }
- FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
- {
- scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
- hCPE->q_output_mem_fx[ii] = hCPE->hStereoDft->q_dft;
- move16();
- }
- FOR( i = 0; i < CPE_CHANNELS; i++ )
- Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( hCPE->q_prev_synth_fx, Q11 ) ); // q_prev_synth_fx
- ivas_sba_dirac_stereo_dec_fx( st_ivas, &p_output_fx[sba_ch_idx], output_frame, 0 );
- FOR( i = 0; i < 2; i++ )
- {
- Scale_sig32( p_output_fx[sba_ch_idx + i], L_FRAME48k, negate( s ) );
- }
-
- FOR( i = 0; i < CPE_CHANNELS; i++ )
- Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( 11, hCPE->q_prev_synth_fx ) ); // Q11
-
- scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
- FOR( i = 0; i < CPE_CHANNELS; ++i )
- {
- scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
- scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
- }
-
- IF( hCPE->hCoreCoder[0] != NULL )
- {
- Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB, q ) ); // Q_old_wtda_LB
- Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, L_FRAME48k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda, q ) ); // Q_old_wtda
- }
- IF( hCPE->hStereoDft != NULL )
- {
- scale_sig32( hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
- scale_sig32( hCPE->hStereoDft->ap_delay_mem_fx, NS2SA( 16000, DELAY_BWE_TOTAL_NS ), sub( Q11, hCPE->hStereoDft->q_ap_fade_mem_fx ) ); // Q11
- hCPE->hStereoDft->q_ap_fade_mem_fx = Q11;
- move16();
- }
-
- FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
- {
- scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
- hCPE->q_output_mem_fx[ii] = Q11;
- move16();
- }
}
- }
-
- /* HP filtering */
- FOR( n = 0; n < getNumChanSynthesis( st_ivas ); n++ )
- {
-#ifdef HP20_FIX32_RECODING
- hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#else
- hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#endif
- }
-
- nchan_remapped = ivas_sba_remapTCs_fx( &p_output_fx[sba_ch_idx], st_ivas, output_frame );
-
- test();
- test();
- IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) )
- {
- num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->last_active_ivas_total_brate );
- SPAR_DEC_HANDLE hSpar = st_ivas->hSpar;
- Word16 nchan_transport;
- // num_bands_out = hSpar->hFbMixer->pFb->filterbank_num_bands;
- nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport;
- move16();
- nchan_out = nchan_transport;
- move16();
- Word16 Q_p_output;
- Word16 min_norm = 31;
- move16();
-
- FOR( ch = 0; ch < nchan_transport; ++ch )
+ FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
+ {
+ scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
+ hCPE->q_output_mem_fx[ii] = hCPE->hStereoDft->q_dft;
+ move16();
+ }
+ FOR( i = 0; i < CPE_CHANNELS; i++ )
+ Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( hCPE->q_prev_synth_fx, Q11 ) ); // q_prev_synth_fx
+ ivas_sba_dirac_stereo_dec_fx( st_ivas, &p_output_fx[sba_ch_idx], output_frame, 0 );
+ FOR( i = 0; i < 2; i++ )
{
- Word16 norm = L_norm_arr( p_output_fx[sba_ch_idx + ch], output_frame ); // Normalize per channel
- min_norm = s_min( norm, min_norm );
+ Scale_sig32( p_output_fx[sba_ch_idx + i], L_FRAME48k, negate( s ) );
}
- Q_p_output = s_max( 3, sub( min_norm, 1 ) );
+ FOR( i = 0; i < CPE_CHANNELS; i++ )
+ Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( 11, hCPE->q_prev_synth_fx ) ); // Q11
- Q_p_output = s_min( Q_p_output, 19 ); // to restrict Q-factor of p_ouptut to Q30
- FOR( ch = 0; ch < nchan_transport; ch++ )
+ scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
+ FOR( i = 0; i < CPE_CHANNELS; ++i )
{
- Scale_sig32( p_output_fx[sba_ch_idx + ch], output_frame, Q_p_output ); // Q_p_output + Q11
+ scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
+ scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
}
- Q_p_output = add( Q11, Q_p_output );
- hSpar->hMdDec->Q_mixer_mat = 31;
- move16();
- ivas_sba_mix_matrix_determiner_fx( st_ivas->hSpar, &p_output_fx[sba_ch_idx], st_ivas->bfi, nchan_remapped, output_frame, num_md_sub_frames, sub( Q_p_output, Q11 ) );
- FOR( Word16 c = 0; c < nchan_transport; c++ )
+ IF( hCPE->hCoreCoder[0] != NULL )
{
- Scale_sig32( p_output_fx[sba_ch_idx + c], output_frame, Q11 ); // Q11
+ Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB, q ) ); // Q_old_wtda_LB
+ Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, L_FRAME48k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda, q ) ); // Q_old_wtda
}
- }
- ELSE IF( NE_32( st_ivas->renderer_type, RENDERER_DISABLE ) && st_ivas->sba_dirac_stereo_flag == 0 )
- {
- Word16 size = add( st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, sba_ch_idx );
- if ( EQ_16( size, 3 ) )
+ IF( hCPE->hStereoDft != NULL )
{
- size = add( size, 1 );
+ scale_sig32( hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
+ scale_sig32( hCPE->hStereoDft->ap_delay_mem_fx, NS2SA( 16000, DELAY_BWE_TOTAL_NS ), sub( Q11, hCPE->hStereoDft->q_ap_fade_mem_fx ) ); // Q11
+ hCPE->hStereoDft->q_ap_fade_mem_fx = Q11;
+ move16();
}
- FOR( i = sba_ch_idx; i < size; i++ )
+ FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
{
- Scale_sig32( p_output_fx[i], output_frame, ( Q14 - Q11 ) ); // Q14
+ scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
+ hCPE->q_output_mem_fx[ii] = Q11;
+ move16();
}
-
- ivas_spar_dec_agc_pca_fx( st_ivas, &p_output_fx[sba_ch_idx], output_frame );
}
+ }
- test();
- test();
- IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) )
- {
- /* loudness correction */
- ivas_dirac_dec_binaural_sba_gain_fx( &p_output_fx[sba_ch_idx], nchan_remapped, output_frame ); /*returns Q-1*/
-
- FOR( i = 0; i < nchan_remapped; i++ )
- {
- Scale_sig32( p_output_fx[i], output_frame, 1 ); // Q-1 -> Q
- }
- }
- ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
- {
- ivas_ism_mono_dmx_fx( st_ivas, p_output_fx, output_frame );
+ /* HP filtering */
+ FOR( n = 0; n < getNumChanSynthesis( st_ivas ); n++ )
+ {
+ hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
+ }
- Scale_sig32( p_output_fx[0], L_FRAME48k, Q11 - Q8 ); // Q11
+ nchan_remapped = ivas_sba_remapTCs_fx( &p_output_fx[sba_ch_idx], st_ivas, output_frame );
- /* add W */
- FOR( n = 0; n < nchan_out; n++ )
- {
- v_add_32( p_output_fx[n], p_output_fx[n + s_max( nchan_out, nchan_ism )], p_output_fx[n], output_frame );
- }
+ test();
+ test();
+ IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) )
+ {
+ num_md_sub_frames = ivas_get_spar_dec_md_num_subframes( st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->last_active_ivas_total_brate );
+ SPAR_DEC_HANDLE hSpar = st_ivas->hSpar;
+ Word16 nchan_transport;
+ // num_bands_out = hSpar->hFbMixer->pFb->filterbank_num_bands;
+ nchan_transport = hSpar->hMdDec->spar_md_cfg.nchan_transport;
+ move16();
+ nchan_out = nchan_transport;
+ move16();
+ Word16 Q_p_output;
+ Word16 min_norm = 31;
+ move16();
+
+ FOR( ch = 0; ch < nchan_transport; ++ch )
+ {
+ Word16 norm = L_norm_arr( p_output_fx[sba_ch_idx + ch], output_frame ); // Normalize per channel
+ min_norm = s_min( norm, min_norm );
+ }
+
+ Q_p_output = s_max( 3, sub( min_norm, 1 ) );
+
+ Q_p_output = s_min( Q_p_output, 19 ); // to restrict Q-factor of p_ouptut to Q30
+ FOR( ch = 0; ch < nchan_transport; ch++ )
+ {
+ Scale_sig32( p_output_fx[sba_ch_idx + ch], output_frame, Q_p_output ); // Q_p_output + Q11
+ }
+ Q_p_output = add( Q11, Q_p_output );
+ hSpar->hMdDec->Q_mixer_mat = 31;
+ move16();
+
+ ivas_sba_mix_matrix_determiner_fx( st_ivas->hSpar, &p_output_fx[sba_ch_idx], st_ivas->bfi, nchan_remapped, output_frame, num_md_sub_frames, sub( Q_p_output, Q11 ) );
+ FOR( Word16 c = 0; c < nchan_transport; c++ )
+ {
+ Scale_sig32( p_output_fx[sba_ch_idx + c], output_frame, Q11 ); // Q11
}
}
- ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) )
+ ELSE IF( NE_32( st_ivas->renderer_type, RENDERER_DISABLE ) && st_ivas->sba_dirac_stereo_flag == 0 )
{
+ Word16 size = add( st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, sba_ch_idx );
+ if ( EQ_16( size, 3 ) )
+ {
+ size = add( size, 1 );
+ }
- // st = (st_ivas->nSCE > 0) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0];
- IF( st_ivas->nSCE > 0 )
+ FOR( i = sba_ch_idx; i < size; i++ )
{
- st = st_ivas->hSCE[0]->hCoreCoder[0];
+ Scale_sig32( p_output_fx[i], output_frame, ( Q14 - Q11 ) ); // Q14
}
- ELSE
+
+ ivas_spar_dec_agc_pca_fx( st_ivas, &p_output_fx[sba_ch_idx], output_frame );
+ }
+
+ test();
+ test();
+ IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) )
+ {
+ /* loudness correction */
+ ivas_dirac_dec_binaural_sba_gain_fx( &p_output_fx[sba_ch_idx], nchan_remapped, output_frame ); /*returns Q-1*/
+
+ FOR( i = 0; i < nchan_remapped; i++ )
{
- st = st_ivas->hCPE[0]->hCoreCoder[0];
+ Scale_sig32( p_output_fx[i], output_frame, 1 ); // Q-1 -> Q
}
+ }
+ ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
+ {
+ ivas_ism_mono_dmx_fx( st_ivas, p_output_fx, output_frame );
- IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCT ) )
+ Scale_sig32( p_output_fx[0], L_FRAME48k, Q11 - Q8 ); // Q11
+
+ /* add W */
+ FOR( n = 0; n < nchan_out; n++ )
{
- /* LFE channel decoder */
- ivas_lfe_dec_fx( st_ivas->hLFE, st, output_frame, st_ivas->bfi, p_output_fx[LFE_CHANNEL] );
+ v_add_32( p_output_fx[n], p_output_fx[n + s_max( nchan_out, nchan_ism )], p_output_fx[n], output_frame );
+ }
+ }
+}
+ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) )
+{
- Scale_sig32( p_output_fx[LFE_CHANNEL], L_FRAME48k, Q11 - Q9 ); // Q11
- IF( NE_32( ( error = ivas_mct_dec_fx( st_ivas, p_output_fx, output_frame, 0 ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
- /* HP filtering */
- FOR( n = 0; n < st_ivas->nchan_transport; n++ )
+ // st = (st_ivas->nSCE > 0) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0];
+ IF( st_ivas->nSCE > 0 )
+ {
+ st = st_ivas->hSCE[0]->hCoreCoder[0];
+ }
+ ELSE
+ {
+ st = st_ivas->hCPE[0]->hCoreCoder[0];
+ }
+
+ IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCT ) )
+ {
+ /* LFE channel decoder */
+ ivas_lfe_dec_fx( st_ivas->hLFE, st, output_frame, st_ivas->bfi, p_output_fx[LFE_CHANNEL] );
+
+ Scale_sig32( p_output_fx[LFE_CHANNEL], L_FRAME48k, Q11 - Q9 ); // Q11
+ IF( NE_32( ( error = ivas_mct_dec_fx( st_ivas, p_output_fx, output_frame, 0 ) ), IVAS_ERR_OK ) )
+ {
+ return error;
+ }
+ /* HP filtering */
+ FOR( n = 0; n < st_ivas->nchan_transport; n++ )
+ {
+ IF( NE_16( n, LFE_CHANNEL ) )
{
- IF( NE_16( n, LFE_CHANNEL ) )
- {
-#ifdef HP20_FIX32_RECODING
- hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#else
- hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#endif
- }
+ hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
}
+ }
- test();
- test();
- test();
- IF( NE_32( st_ivas->transport_config, st_ivas->intern_config ) && ( NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_FOA ) || NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA2 ) || NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA3 ) ) )
+ test();
+ test();
+ test();
+ IF( NE_32( st_ivas->transport_config, st_ivas->intern_config ) && ( NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_FOA ) || NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA2 ) || NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA3 ) ) )
+ {
+ IF( GE_16( add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe ), add( st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hIntSetup.num_lfe ) ) )
{
- IF( GE_16( add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe ), add( st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hIntSetup.num_lfe ) ) )
- {
- ivas_mc2sba_fx( st_ivas->hTransSetup, p_output_fx, p_output_fx, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE_FX );
- }
+ ivas_mc2sba_fx( st_ivas->hTransSetup, p_output_fx, p_output_fx, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE_FX );
}
+ }
- test();
- test();
- IF( ( EQ_32( st_ivas->renderer_type, RENDERER_MC ) || EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) ) && GE_16( add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe ), add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe ) ) )
+ test();
+ test();
+ IF( ( EQ_32( st_ivas->renderer_type, RENDERER_MC ) || EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) ) && GE_16( add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe ), add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe ) ) )
+ {
+ IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) )
{
- IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) )
+ s = Q16 - Q11;
+ move16();
+ s = sub( s, find_guarded_bits_fx( st_ivas->nchan_transport ) );
+ FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_transport ); ++i )
{
- s = Q16 - Q11;
- move16();
- s = sub( s, find_guarded_bits_fx( st_ivas->nchan_transport ) );
- FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_transport ); ++i )
- {
- Scale_sig32( p_output_fx[i], output_frame, s ); // Q(11+s)
- }
- ivas_ls_setup_conversion_fx( st_ivas, st_ivas->nchan_transport, output_frame, p_output_fx, p_output_fx );
- FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_transport ); ++i )
- {
- Scale_sig32( p_output_fx[i], output_frame, negate( s ) ); // Q11
- }
+ Scale_sig32( p_output_fx[i], output_frame, s ); // Q(11+s)
}
- ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
+ ivas_ls_setup_conversion_fx( st_ivas, st_ivas->nchan_transport, output_frame, p_output_fx, p_output_fx );
+ FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_transport ); ++i )
{
- ivas_mc2sba_fx( st_ivas->hIntSetup, p_output_fx, p_output_fx, output_frame, st_ivas->hOutSetup.ambisonics_order, 0 );
+ Scale_sig32( p_output_fx[i], output_frame, negate( s ) ); // Q11
}
}
+ ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
+ {
+ ivas_mc2sba_fx( st_ivas->hIntSetup, p_output_fx, p_output_fx, output_frame, st_ivas->hOutSetup.ambisonics_order, 0 );
+ }
}
- ELSE IF( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMUPMIX ) )
- {
- /* LFE channel decoder */
- ivas_lfe_dec_fx( st_ivas->hLFE, st, output_frame, st_ivas->bfi, p_output_fx[LFE_CHANNEL] );
+ }
+ ELSE IF( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMUPMIX ) )
+ {
+ /* LFE channel decoder */
+ ivas_lfe_dec_fx( st_ivas->hLFE, st, output_frame, st_ivas->bfi, p_output_fx[LFE_CHANNEL] );
- Scale_sig32( p_output_fx[LFE_CHANNEL], L_FRAME48k, Q11 - Q9 ); // Q11
+ Scale_sig32( p_output_fx[LFE_CHANNEL], L_FRAME48k, Q11 - Q9 ); // Q11
- ivas_mc_paramupmix_dec_read_BS( st_ivas, st, st_ivas->hMCParamUpmix, &nb_bits_metadata[0] );
+ ivas_mc_paramupmix_dec_read_BS( st_ivas, st, st_ivas->hMCParamUpmix, &nb_bits_metadata[0] );
- IF( NE_32( ( error = ivas_mct_dec_fx( st_ivas, p_output_fx, output_frame, nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
+ IF( NE_32( ( error = ivas_mct_dec_fx( st_ivas, p_output_fx, output_frame, nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
+ {
+ return error;
+ }
+ /* HP filtering */
+ FOR( n = 0; n < st_ivas->nchan_transport; n++ )
+ {
+ IF( NE_16( n, LFE_CHANNEL ) )
{
- return error;
+ hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
}
- /* HP filtering */
- FOR( n = 0; n < st_ivas->nchan_transport; n++ )
+ }
+
+ /* Rendering */
+ test();
+ test();
+ IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) && ( EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) ) )
+ {
+ /* Compensate loudness for not doing full upmix */
+ FOR( n = 4; n < 8; n++ )
{
- IF( NE_16( n, LFE_CHANNEL ) )
- {
-#ifdef HP20_FIX32_RECODING
- hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#else
- hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#endif
- }
+ Scale_sig32( p_output_fx[n], output_frame, 1 );
}
- /* Rendering */
test();
- test();
- IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) && ( EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) ) )
+ IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) )
{
- /* Compensate loudness for not doing full upmix */
- FOR( n = 4; n < 8; n++ )
+ s = Q16 - Q11;
+ move16();
+ Word16 nchan_transport;
+ nchan_transport = audioCfg2channels( IVAS_AUDIO_CONFIG_5_1_2 );
+ s = sub( s, find_guarded_bits_fx( nchan_transport ) );
+ FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, nchan_transport ); ++i )
{
- Scale_sig32( p_output_fx[n], output_frame, 1 );
+ Scale_sig32( p_output_fx[i], output_frame, s );
}
-
- test();
- IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) )
+ ivas_ls_setup_conversion_fx( st_ivas, nchan_transport, output_frame, p_output_fx, p_output_fx );
+ FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, nchan_transport ); ++i )
{
- s = Q16 - Q11;
- move16();
- Word16 nchan_transport;
- nchan_transport = audioCfg2channels( IVAS_AUDIO_CONFIG_5_1_2 );
- s = sub( s, find_guarded_bits_fx( nchan_transport ) );
- FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, nchan_transport ); ++i )
- {
- Scale_sig32( p_output_fx[i], output_frame, s );
- }
- ivas_ls_setup_conversion_fx( st_ivas, nchan_transport, output_frame, p_output_fx, p_output_fx );
- FOR( i = 0; i < s_max( st_ivas->hDecoderConfig->nchan_out, nchan_transport ); ++i )
- {
- Scale_sig32( p_output_fx[i], output_frame, negate( s ) );
- }
+ Scale_sig32( p_output_fx[i], output_frame, negate( s ) );
}
}
}
- ELSE IF( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMMC ) )
+ }
+ ELSE IF( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMMC ) )
+ {
+ /* read Parametric MC parameters from the bitstream */
+ ivas_param_mc_dec_read_BS_fx( ivas_total_brate, st, st_ivas->hParamMC, &nb_bits_metadata[0] );
+
+ IF( EQ_16( st_ivas->nCPE, 1 ) )
{
- /* read Parametric MC parameters from the bitstream */
- ivas_param_mc_dec_read_BS_fx( ivas_total_brate, st, st_ivas->hParamMC, &nb_bits_metadata[0] );
+ Word16 q_output = 11;
+ move16();
- IF( EQ_16( st_ivas->nCPE, 1 ) )
+ IF( NE_32( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
{
- Word16 q_output = 11;
- move16();
-
- IF( NE_32( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
- IF( NE_16( q_output, Q11 ) )
- {
- Scale_sig32( p_output_fx[0], output_frame, sub( Q11, q_output ) ); // Q11
- Scale_sig32( p_output_fx[1], output_frame, sub( Q11, q_output ) ); // Q11
- }
+ return error;
}
- ELSE IF( GT_16( st_ivas->nCPE, 1 ) )
+ IF( NE_16( q_output, Q11 ) )
{
- IF( NE_32( ( error = ivas_mct_dec_fx( st_ivas, p_output_fx, output_frame, nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
+ Scale_sig32( p_output_fx[0], output_frame, sub( Q11, q_output ) ); // Q11
+ Scale_sig32( p_output_fx[1], output_frame, sub( Q11, q_output ) ); // Q11
}
-
- /* HP filtering */
- FOR( n = 0; n < st_ivas->nchan_transport; n++ )
+ }
+ ELSE IF( GT_16( st_ivas->nCPE, 1 ) )
+ {
+ IF( NE_32( ( error = ivas_mct_dec_fx( st_ivas, p_output_fx, output_frame, nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
{
-#ifdef HP20_FIX32_RECODING
- hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#else
- hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#endif
+ return error;
}
+ }
- /* Rendering */
- test();
- IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) )
- {
- ivas_ls_setup_conversion_fx( st_ivas, st_ivas->nchan_transport, output_frame, p_output_fx, p_output_fx );
- }
+ /* HP filtering */
+ FOR( n = 0; n < st_ivas->nchan_transport; n++ )
+ {
+ hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
}
- ELSE IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCMASA ) )
+
+ /* Rendering */
+ test();
+ IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) )
{
- IF( st_ivas->hOutSetup.separateChannelEnabled )
+ ivas_ls_setup_conversion_fx( st_ivas, st_ivas->nchan_transport, output_frame, p_output_fx, p_output_fx );
+ }
+ }
+ ELSE IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCMASA ) )
+ {
+ IF( st_ivas->hOutSetup.separateChannelEnabled )
+ {
+ st = st_ivas->hCPE[0]->hCoreCoder[0]; /* Metadata is always with CPE in the case of separated channel */
+ }
+
+ /* read McMASA parameters from the bitstream */
+
+ IF( NE_32( ( error = ivas_masa_decode_fx( st_ivas, st, &nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
+ {
+ return error;
+ }
+
+ IF( st_ivas->hOutSetup.separateChannelEnabled )
+ {
+ /* Decode the transport audio signals */
+ Word16 q_output = 11;
+ move16();
+
+ IF( NE_32( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
+ {
+ return error;
+ }
+ IF( NE_16( q_output, Q11 ) )
{
- st = st_ivas->hCPE[0]->hCoreCoder[0]; /* Metadata is always with CPE in the case of separated channel */
+ Scale_sig32( p_output_fx[0], output_frame, sub( Q11, q_output ) ); // Q11
+ Scale_sig32( p_output_fx[1], output_frame, sub( Q11, q_output ) ); // Q11
}
- /* read McMASA parameters from the bitstream */
+ /* Identify the index of the separated channel, always LFE_CHANNEL-1 here */
+ n = LFE_CHANNEL - 1;
+ move16();
- IF( NE_32( ( error = ivas_masa_decode_fx( st_ivas, st, &nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
+ /* Decode the separated channel to output[n] to be combined with the synthesized channels */
+
+ set32_fx( p_output_fx[n], 0, L_FRAME48k );
+
+ IF( NE_32( ( error = ivas_sce_dec_fx( st_ivas, 0, &p_output_fx[n], output_frame, 0 ) ), IVAS_ERR_OK ) )
{
return error;
}
+ test();
+ test();
+ test();
+ test();
+ test();
+ test();
+ test();
+ /* Delay the separated channel to sync with CLDFB delay of the DirAC synthesis, and synthesize the LFE signal. */
+ IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_7_1 ) ||
+ EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1_4 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_7_1_4 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1_2 ) || ( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && st_ivas->hOutSetup.num_lfe > 0 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
+ {
+ ivas_lfe_synth_with_filters_fx( st_ivas->hMasa->hMasaLfeSynth, p_output_fx, output_frame, n, LFE_CHANNEL );
+ }
+ ELSE IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && st_ivas->hOutSetup.num_lfe == 0 )
+ {
+ /* Delay the separated channel to sync with the DirAC rendering */
+ delay_signal32_fx( p_output_fx[n], output_frame, st_ivas->hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_fx, st_ivas->hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_size );
+ }
+ }
+ ELSE
+ {
+ Word16 q_output = 11;
+ move16();
+ IF( EQ_16( st_ivas->nSCE, 1 ) )
+ {
+ set32_fx( p_output_fx[0], 0, L_FRAME48k );
- IF( st_ivas->hOutSetup.separateChannelEnabled )
+ IF( NE_32( ( error = ivas_sce_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
+ {
+ return error;
+ }
+ }
+ ELSE IF( EQ_16( st_ivas->nCPE, 1 ) )
{
- /* Decode the transport audio signals */
- Word16 q_output = 11;
- move16();
IF( NE_32( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
{
@@ -1323,259 +1354,338 @@ ivas_error ivas_jbm_dec_tc_fx(
Scale_sig32( p_output_fx[0], output_frame, sub( Q11, q_output ) ); // Q11
Scale_sig32( p_output_fx[1], output_frame, sub( Q11, q_output ) ); // Q11
}
+ }
+ }
- /* Identify the index of the separated channel, always LFE_CHANNEL-1 here */
- n = LFE_CHANNEL - 1;
- move16();
+ IF( st_ivas->sba_dirac_stereo_flag != 0 ) /* use the flag to trigger the DFT upmix */
+ {
+ Word16 q;
+ hCPE = st_ivas->hCPE[0];
+ hSCE = st_ivas->hSCE[0];
+ s = 0;
+ move16();
+ FOR( i = 0; i < 2; i++ )
+ {
+ s = s_min( s, L_norm_arr( p_output_fx[i], L_FRAME48k ) - 11 /* Guard bits */ );
+ }
+ FOR( i = 0; i < 2; i++ )
+ {
+ Scale_sig32( p_output_fx[i], L_FRAME48k, s ); // Q(11+s)
+ }
- /* Decode the separated channel to output[n] to be combined with the synthesized channels */
+ hCPE->hStereoDft->q_dft = add( Q11, s );
+ move16();
+ IF( EQ_16( hCPE->hStereoDft->first_frame, 1 ) )
+ {
+ hCPE->hStereoDft->q_smoothed_nrg = Q6; // hCPE->hStereoDft->q_dft;
+ hCPE->hStereoDft->q_ap_delay_mem_fx = hCPE->hStereoDft->q_dft;
- set32_fx( p_output_fx[n], 0, L_FRAME48k );
+ move16();
+ move16();
+ }
- IF( NE_32( ( error = ivas_sce_dec_fx( st_ivas, 0, &p_output_fx[n], output_frame, 0 ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
- test();
- test();
- test();
- test();
- test();
- test();
- test();
- /* Delay the separated channel to sync with CLDFB delay of the DirAC synthesis, and synthesize the LFE signal. */
- IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_7_1 ) ||
- EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1_4 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_7_1_4 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1_2 ) || ( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && st_ivas->hOutSetup.num_lfe > 0 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
- {
- ivas_lfe_synth_with_filters_fx( st_ivas->hMasa->hMasaLfeSynth, p_output_fx, output_frame, n, LFE_CHANNEL );
- }
- ELSE IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && st_ivas->hOutSetup.num_lfe == 0 )
- {
- /* Delay the separated channel to sync with the DirAC rendering */
- delay_signal32_fx( p_output_fx[n], output_frame, st_ivas->hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_fx, st_ivas->hMasa->hMasaLfeSynth->delayBuffer_syncDirAC_size );
- }
+ q = hCPE->hStereoDft->q_dft;
+ move16();
+
+ scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );
+ FOR( i = 0; i < CPE_CHANNELS; ++i )
+ {
+ scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
+ scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
}
- ELSE
+
+ IF( hCPE->hCoreCoder[0] != NULL )
{
- Word16 q_output = 11;
+ Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ); // q
+ Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, L_FRAME48k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda ); // q
+ hCPE->hCoreCoder[0]->hHQ_core->Q_old_out_fx32 = q;
move16();
- IF( EQ_16( st_ivas->nSCE, 1 ) )
- {
- set32_fx( p_output_fx[0], 0, L_FRAME48k );
-
- IF( NE_32( ( error = ivas_sce_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
- }
- ELSE IF( EQ_16( st_ivas->nCPE, 1 ) )
- {
-
- IF( NE_32( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
- IF( NE_16( q_output, Q11 ) )
- {
- Scale_sig32( p_output_fx[0], output_frame, sub( Q11, q_output ) ); // Q11
- Scale_sig32( p_output_fx[1], output_frame, sub( Q11, q_output ) ); // Q11
- }
- }
}
-
- IF( st_ivas->sba_dirac_stereo_flag != 0 ) /* use the flag to trigger the DFT upmix */
+ IF( hCPE->hStereoDft != NULL )
{
- Word16 q;
- hCPE = st_ivas->hCPE[0];
- hSCE = st_ivas->hSCE[0];
- s = 0;
+ scale_sig32( hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
+ scale_sig32( hCPE->hStereoDft->ap_delay_mem_fx, NS2SA( 16000, DELAY_BWE_TOTAL_NS ), sub( hCPE->hStereoDft->q_dft, hCPE->hStereoDft->q_ap_fade_mem_fx ) ); // q_dft
+ hCPE->hStereoDft->q_ap_fade_mem_fx = hCPE->hStereoDft->q_dft;
move16();
- FOR( i = 0; i < 2; i++ )
- {
- s = s_min( s, L_norm_arr( p_output_fx[i], L_FRAME48k ) - 11 /* Guard bits */ );
- }
- FOR( i = 0; i < 2; i++ )
- {
- Scale_sig32( p_output_fx[i], L_FRAME48k, s ); // Q(11+s)
- }
-
- hCPE->hStereoDft->q_dft = add( Q11, s );
+ }
+ IF( st_ivas->hSpar != NULL )
+ {
+ st_ivas->hSpar->hMdDec->Q_mixer_mat = 30;
move16();
- IF( EQ_16( hCPE->hStereoDft->first_frame, 1 ) )
- {
- hCPE->hStereoDft->q_smoothed_nrg = Q6; // hCPE->hStereoDft->q_dft;
- hCPE->hStereoDft->q_ap_delay_mem_fx = hCPE->hStereoDft->q_dft;
-
- move16();
- move16();
- }
+ }
- q = hCPE->hStereoDft->q_dft;
+ IF( hSCE != NULL )
+ {
+ Scale_sig32( &hSCE->save_hb_synth_fx[0], extract_l( Mpy_32_32( hCPE->hCoreCoder[0]->output_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), hCPE->hStereoDft->q_dft - hSCE->q_save_hb_synth_fx ); // q_dft
+ hSCE->q_save_hb_synth_fx = hCPE->hStereoDft->q_dft;
move16();
+ Scale_sig32( &hSCE->save_synth_fx[0], extract_l( Mpy_32_32( hCPE->hCoreCoder[0]->output_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), hCPE->hStereoDft->q_dft - hSCE->q_save_synth_fx ); // q_dft
+ hSCE->q_save_synth_fx = hCPE->hStereoDft->q_dft;
+ move16();
+ }
+ FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
+ {
+ scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, hCPE->q_output_mem_fx[ii] ) ); // q_dft
+ hCPE->q_output_mem_fx[ii] = hCPE->hStereoDft->q_dft;
+ move16();
+ }
+ FOR( i = 0; i < CPE_CHANNELS; i++ )
+ Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( hCPE->q_prev_synth_fx, Q11 ) ); // q_prev_synth_fx
+ ivas_sba_dirac_stereo_dec_fx( st_ivas, p_output_fx, output_frame, 1 );
+ FOR( i = 0; i < 2; i++ )
+ {
+ Scale_sig32( p_output_fx[i], L_FRAME48k, negate( s ) );
+ }
+ FOR( i = 0; i < CPE_CHANNELS; i++ )
+ Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->q_prev_synth_fx ) ); // Q11
- scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) );
- FOR( i = 0; i < CPE_CHANNELS; ++i )
- {
- scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
- scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
- }
-
- IF( hCPE->hCoreCoder[0] != NULL )
- {
- Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB ); // q
- Copy_Scale_sig_16_32_no_sat( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, L_FRAME48k, q - hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda ); // q
- hCPE->hCoreCoder[0]->hHQ_core->Q_old_out_fx32 = q;
- move16();
- }
- IF( hCPE->hStereoDft != NULL )
- {
- scale_sig32( hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA( 16000, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, Q11 ) ); // q_dft
- scale_sig32( hCPE->hStereoDft->ap_delay_mem_fx, NS2SA( 16000, DELAY_BWE_TOTAL_NS ), sub( hCPE->hStereoDft->q_dft, hCPE->hStereoDft->q_ap_fade_mem_fx ) ); // q_dft
- hCPE->hStereoDft->q_ap_fade_mem_fx = hCPE->hStereoDft->q_dft;
- move16();
- }
- IF( st_ivas->hSpar != NULL )
- {
- st_ivas->hSpar->hMdDec->Q_mixer_mat = 30;
- move16();
- }
+ scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) );
+ FOR( i = 0; i < CPE_CHANNELS; ++i )
+ {
+ scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
+ scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
+ }
- IF( hSCE != NULL )
- {
- Scale_sig32( &hSCE->save_hb_synth_fx[0], extract_l( Mpy_32_32( hCPE->hCoreCoder[0]->output_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), hCPE->hStereoDft->q_dft - hSCE->q_save_hb_synth_fx ); // q_dft
- hSCE->q_save_hb_synth_fx = hCPE->hStereoDft->q_dft;
- move16();
- Scale_sig32( &hSCE->save_synth_fx[0], extract_l( Mpy_32_32( hCPE->hCoreCoder[0]->output_Fs, ONE_BY_FRAMES_PER_SEC_Q31 ) ), hCPE->hStereoDft->q_dft - hSCE->q_save_synth_fx ); // q_dft
- hSCE->q_save_synth_fx = hCPE->hStereoDft->q_dft;
- move16();
- }
+ IF( hCPE->hCoreCoder[0] != NULL )
+ {
+ Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB, q ) ); // Q_old_wtda_LB
+ Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, L_FRAME48k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda, q ) ); // Q_old_wtda
+ }
+ IF( hCPE->hStereoDft != NULL )
+ {
+ scale_sig32( hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA_FX2( 16000, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
+ scale_sig32( hCPE->hStereoDft->ap_delay_mem_fx, NS2SA_FX2( 16000, DELAY_BWE_TOTAL_NS ), sub( Q11, hCPE->hStereoDft->q_ap_fade_mem_fx ) ); // Q11
+ hCPE->hStereoDft->q_ap_fade_mem_fx = Q11;
+ move16();
+ }
+ IF( st_ivas->hSpar != NULL )
+ {
FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
{
- scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( hCPE->hStereoDft->q_dft, hCPE->q_output_mem_fx[ii] ) ); // q_dft
- hCPE->q_output_mem_fx[ii] = hCPE->hStereoDft->q_dft;
- move16();
- }
- FOR( i = 0; i < CPE_CHANNELS; i++ )
- Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( hCPE->q_prev_synth_fx, Q11 ) ); // q_prev_synth_fx
- ivas_sba_dirac_stereo_dec_fx( st_ivas, p_output_fx, output_frame, 1 );
- FOR( i = 0; i < 2; i++ )
- {
- Scale_sig32( p_output_fx[i], L_FRAME48k, negate( s ) );
- }
- FOR( i = 0; i < CPE_CHANNELS; i++ )
- Scale_sig32( hCPE->prev_synth_fx[i], NS2SA_FX2( output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->q_prev_synth_fx ) ); // Q11
-
- scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) );
- FOR( i = 0; i < CPE_CHANNELS; ++i )
- {
- scale_sig32( hCPE->input_mem_LB_fx[i], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
- scale_sig32( hCPE->input_mem_fx[i], NS2SA_FX2( hCPE->hCoreCoder[0]->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
- }
-
- IF( hCPE->hCoreCoder[0] != NULL )
- {
- Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB, q ) ); // Q_old_wtda_LB
- Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, L_FRAME48k, sub( hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda, q ) ); // Q_old_wtda
- }
- IF( hCPE->hStereoDft != NULL )
- {
- scale_sig32( hCPE->hStereoDft->buff_LBTCX_mem_fx, NS2SA_FX2( 16000, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
- scale_sig32( hCPE->hStereoDft->ap_delay_mem_fx, NS2SA_FX2( 16000, DELAY_BWE_TOTAL_NS ), sub( Q11, hCPE->hStereoDft->q_ap_fade_mem_fx ) ); // Q11
- hCPE->hStereoDft->q_ap_fade_mem_fx = Q11;
+ scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
+ hCPE->q_output_mem_fx[ii] = Q11;
move16();
}
- IF( st_ivas->hSpar != NULL )
- {
- FOR( ii = 0; ii < CPE_CHANNELS; ii++ )
- {
- scale_sig32( hCPE->output_mem_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->hStereoDft->q_dft ) ); // Q11
- hCPE->q_output_mem_fx[ii] = Q11;
- move16();
- }
- }
}
+ }
- /* HP filtering */
- FOR( n = 0; n < getNumChanSynthesis( st_ivas ); n++ )
- {
-#ifdef HP20_FIX32_RECODING
- hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#else
- hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
-#endif
- }
+ /* HP filtering */
+ FOR( n = 0; n < getNumChanSynthesis( st_ivas ); n++ )
+ {
+ hp20_fx_32_opt( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
+ }
- IF( EQ_32( st_ivas->renderer_type, RENDERER_MCMASA_MONO_STEREO ) )
- {
- ivas_mono_stereo_downmix_mcmasa_fx( st_ivas, p_output_fx, output_frame );
- }
+ IF( EQ_32( st_ivas->renderer_type, RENDERER_MCMASA_MONO_STEREO ) )
+ {
+ ivas_mono_stereo_downmix_mcmasa_fx( st_ivas, p_output_fx, output_frame );
}
}
+}
- /*----------------------------------------------------------------*
- * Write IVAS transport channels
- *----------------------------------------------------------------*/
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
+/*----------------------------------------------------------------*
+ * Write IVAS transport channels
+ *----------------------------------------------------------------*/
- IF( EQ_16( st_ivas->hDecoderConfig->Opt_tsm, 1 ) )
+#ifdef LIB_DEC_REVISION
+IF( st_ivas->hDecoderConfig->Opt_tsm == 0 )
+#else
+IF( EQ_16( st_ivas->hDecoderConfig->Opt_tsm, 1 ) )
+{
+ ivas_syn_output_f_fx( p_output_fx, output_frame, st_ivas->hTcBuffer->nchan_transport_jbm, data_fx );
+}
+ELSE
+#endif
+{
+ /* directly copy to tc buffers */
+ /*note : the q of cldfb buffers (imag/real) are needed to be Q_p_output - 5 here 6 is taken for that*/
+ ivas_jbm_dec_copy_tc_no_tsm_fx( st_ivas, p_output_fx, output_frame );
+}
+#endif
+/*----------------------------------------------------------------*
+ * Common updates
+ *----------------------------------------------------------------*/
+
+IF( !st_ivas->bfi ) /* do not update if first frame(s) are lost or NO_DATA */
+{
+ st_ivas->hDecoderConfig->last_ivas_total_brate = ivas_total_brate;
+ move32();
+ IF( LE_32( ivas_total_brate, IVAS_SID_5k2 ) )
{
- ivas_syn_output_f_fx( p_output_fx, output_frame, st_ivas->hTcBuffer->nchan_transport_jbm, data_fx );
+ st_ivas->last_active_ivas_total_brate = st_ivas->last_active_ivas_total_brate;
+ move32();
}
ELSE
{
- /* directly copy to tc buffers */
- /*note : the q of cldfb buffers (imag/real) are needed to be Q_p_output - 5 here 6 is taken for that*/
- ivas_jbm_dec_copy_tc_no_tsm_fx( st_ivas, p_output_fx, output_frame );
+ st_ivas->last_active_ivas_total_brate = ivas_total_brate;
+ move32();
}
+}
+
+test();
+test();
+if ( LT_16( st_ivas->ini_frame, MAX_FRAME_COUNTER ) && !( st_ivas->bfi && st_ivas->ini_frame == 0 ) ) /* keep "st_ivas->ini_frame = 0" until first good received frame */
+{
+ st_ivas->ini_frame = add( st_ivas->ini_frame, 1 );
+ move16();
+}
+
+test();
+test();
+if ( LT_16( st_ivas->ini_active_frame, MAX_FRAME_COUNTER ) && !( st_ivas->bfi && st_ivas->ini_frame == 0 ) && GT_32( ivas_total_brate, IVAS_SID_5k2 ) ) /* needed in MASA decoder in case the first active frame is BFI, and there were SID-frames decoded before */
+{
+ st_ivas->ini_active_frame = add( st_ivas->ini_active_frame, 1 );
+ move16();
+}
+
+st_ivas->last_ivas_format = st_ivas->ivas_format;
+move32();
+pop_wmops();
+
+return IVAS_ERR_OK;
+}
- /*----------------------------------------------------------------*
- * Common updates
- *----------------------------------------------------------------*/
- IF( !st_ivas->bfi ) /* do not update if first frame(s) are lost or NO_DATA */
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+
+/*--------------------------------------------------------------------------*
+ * ivas_dec_feed_tc_to_renderer()
+ *
+ * Feed decoded transport channels to the IVAS renderer routine
+ * + digest TC channels in ParamISM and ParamMC
+ *--------------------------------------------------------------------------*/
+
+void ivas_jbm_dec_feed_tc_to_renderer_fx(
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
+ const Word16 nSamplesForRendering, /* i : number of TC samples available for rendering */
+ Word16 *nSamplesResidual, /* o : number of samples not fitting into the renderer grid and buffer for the next call*/
+ Word32 *data /* i : transport channels */
+)
+{
+ Word32 data_fx[MAX_CLDFB_DIGEST_CHANNELS][MAX_JBM_L_FRAME48k]; /* buffer for transport channels that will be directly converted with the CLDFB */
+ Word32 *p_data_fx[MAX_CLDFB_DIGEST_CHANNELS];
+ Word16 n, n_render_timeslots, n_ch_cldfb;
+ Word16 ch;
+ DECODER_TC_BUFFER_HANDLE hTcBuffer;
+
+ hTcBuffer = st_ivas->hTcBuffer;
+ n_ch_cldfb = sub( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full );
+ move16();
+
+ hTcBuffer->q_tc_fx = Q11;
+ move16();
+
+ IF( st_ivas->hDecoderConfig->Opt_tsm )
{
- st_ivas->hDecoderConfig->last_ivas_total_brate = ivas_total_brate;
- move32();
- IF( LE_32( ivas_total_brate, IVAS_SID_5k2 ) )
+ Word16 n_samples_still_available, m;
+ Word16 n_ch_full_copy;
+ Word16 n_ch_res_copy;
+
+ FOR( n = 0; n < n_ch_cldfb; n++ )
{
- st_ivas->last_active_ivas_total_brate = st_ivas->last_active_ivas_total_brate;
- move32();
+ p_data_fx[n] = &data_fx[n][0];
}
- ELSE
+
+ n_samples_still_available = sub( hTcBuffer->n_samples_buffered, hTcBuffer->n_samples_rendered );
+ hTcBuffer->n_samples_buffered = add( add( n_samples_still_available, nSamplesForRendering ), hTcBuffer->n_samples_discard );
+ hTcBuffer->n_samples_available = i_mult( hTcBuffer->n_samples_granularity, idiv1616( hTcBuffer->n_samples_buffered, hTcBuffer->n_samples_granularity ) );
+ *nSamplesResidual = sub( hTcBuffer->n_samples_buffered, hTcBuffer->n_samples_available );
+ move16();
+ move16();
+ move16();
+ n_ch_full_copy = s_min( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full );
+ n_ch_res_copy = sub( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full );
+
+ FOR( ch = 0; ch < n_ch_full_copy; ch++ )
{
- st_ivas->last_active_ivas_total_brate = ivas_total_brate;
- move32();
+ set32_fx( hTcBuffer->tc_fx[ch], 0, hTcBuffer->n_samples_discard );
+ Copy32( hTcBuffer->tc_fx[ch] + hTcBuffer->n_samples_rendered, hTcBuffer->tc_fx[ch] + hTcBuffer->n_samples_discard, n_samples_still_available );
+ FOR( m = 0; m < nSamplesForRendering; m++ )
+ {
+ hTcBuffer->tc_fx[ch][n_samples_still_available + hTcBuffer->n_samples_discard + m] = data[m * hTcBuffer->nchan_transport_jbm + ch];
+ move32();
+ }
}
- }
- test();
- test();
- if ( LT_16( st_ivas->ini_frame, MAX_FRAME_COUNTER ) && !( st_ivas->bfi && st_ivas->ini_frame == 0 ) ) /* keep "st_ivas->ini_frame = 0" until first good received frame */
+ IF( n_ch_res_copy > 0 )
+ {
+ FOR( ; ch < hTcBuffer->nchan_transport_jbm; ch++ )
+ {
+ Copy32( hTcBuffer->tc_fx[ch], p_data_fx[ch], n_samples_still_available );
+
+ FOR( m = 0; m < nSamplesForRendering; m++ )
+ {
+ p_data_fx[ch][n_samples_still_available + m] = data[m * hTcBuffer->nchan_transport_jbm + ch];
+ move32();
+ }
+ Copy32( p_data_fx[ch] + hTcBuffer->n_samples_available, hTcBuffer->tc_fx[ch], *nSamplesResidual );
+ }
+ }
+
+ n_render_timeslots = idiv1616( st_ivas->hTcBuffer->n_samples_available, st_ivas->hTcBuffer->n_samples_granularity );
+ }
+ ELSE
{
- st_ivas->ini_frame = add( st_ivas->ini_frame, 1 );
+ FOR( n = 0; n < n_ch_cldfb; n++ )
+ {
+ p_data_fx[n] = &st_ivas->p_output_fx[n][0];
+ move16();
+ }
+
+#ifdef FIX_NCHAN_BUFFERS
+ ch = ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );
+ FOR( n = 0; n < ch; n++ )
+#else
+ FOR( n = 0; n < ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )
+#endif
+ {
+ hTcBuffer->tc_fx[n] = st_ivas->p_output_fx[n]; /* note: buffers needed in the TD decorellator */
+ move16();
+ }
+
+ hTcBuffer->n_samples_buffered = nSamplesForRendering;
+ hTcBuffer->n_samples_available = hTcBuffer->n_samples_buffered;
+ *nSamplesResidual = 0;
+ move16();
+ move16();
+ move16();
+
+ n_render_timeslots = DEFAULT_JBM_CLDFB_TIMESLOTS;
move16();
}
+ /* CLDFB analysis for ParamMC/ParamISM */
+ test();
+ test();
test();
test();
- if ( LT_16( st_ivas->ini_active_frame, MAX_FRAME_COUNTER ) && !( st_ivas->bfi && st_ivas->ini_frame == 0 ) && GT_32( ivas_total_brate, IVAS_SID_5k2 ) ) /* needed in MASA decoder in case the first active frame is BFI, and there were SID-frames decoded before */
+ test();
+ test();
+ IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) && EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) && ( EQ_32( st_ivas->renderer_type, RENDERER_PARAM_ISM ) || EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) ) )
{
- st_ivas->ini_active_frame = add( st_ivas->ini_active_frame, 1 );
- move16();
+ ivas_param_ism_dec_digest_tc_fx( st_ivas, n_render_timeslots, p_data_fx, Q11 );
+ }
+ ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) && EQ_32( st_ivas->mc_mode, MC_MODE_PARAMMC ) && EQ_32( hTcBuffer->tc_buffer_mode, TC_BUFFER_MODE_RENDERER ) )
+ {
+ ivas_param_mc_dec_digest_tc_fx( st_ivas, (uint8_t) n_render_timeslots, p_data_fx, Q11 );
}
- st_ivas->last_ivas_format = st_ivas->ivas_format;
- move32();
- pop_wmops();
+ hTcBuffer->n_samples_rendered = 0;
+ move16();
+ hTcBuffer->subframes_rendered = 0;
+ move16();
- return IVAS_ERR_OK;
+ return;
}
+#else
/*--------------------------------------------------------------------------*
* ivas_jbm_dec_feed_tc_to_renderer()
*
* Feed decoded transport channels and metadata to the IVAS JBM renderer routine
*--------------------------------------------------------------------------*/
+
void ivas_jbm_dec_feed_tc_to_renderer_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const Word16 nSamplesForRendering, /* i : number of TC samples available for rendering */
@@ -1598,7 +1708,7 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx(
}
Word16 n, n_render_timeslots;
- push_wmops( "ivas_jbm_dec_feed_tc_to_rendererer" );
+ push_wmops( "ivas_jbm_dec_feed_tc_to_renderer" );
FOR( n = 0; n < MAX_CLDFB_DIGEST_CHANNELS; n++ )
{
p_data_f_fx[n] = &data_f_fx[n][0];
@@ -1619,288 +1729,23 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx(
ELSE
{
*nSamplesResidual = 0;
- move16();
- }
- n_render_timeslots = idiv1616( st_ivas->hTcBuffer->n_samples_available, st_ivas->hTcBuffer->n_samples_granularity );
-
-#ifndef OBJ_EDITING_API
- test();
- IF( EQ_16( st_ivas->hTcBuffer->tc_buffer_mode, TC_BUFFER_MODE_BUFFER ) )
- {
- ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );
-
- test();
- test();
- test();
- IF( ( EQ_16( st_ivas->ivas_format, MASA_FORMAT ) || EQ_16( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) && EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && st_ivas->hDecoderConfig->Opt_tsm )
- {
- ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );
- }
- }
- ELSE IF( EQ_16( st_ivas->ivas_format, STEREO_FORMAT ) )
- {
- ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );
- }
- ELSE
-#endif
- IF( EQ_16( st_ivas->ivas_format, ISM_FORMAT ) )
- {
- /* Rendering */
- IF( EQ_16( st_ivas->ism_mode, ISM_MODE_PARAM ) )
- {
- test();
-#ifndef OBJ_EDITING_API
- test();
- test();
- IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) || EQ_16( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) )
- {
- ivas_dirac_dec_set_md_map_fx( st_ivas, n_render_timeslots );
-
- ivas_param_ism_params_to_masa_param_mapping_fx( st_ivas );
- }
- ELSE
-#endif
- IF( EQ_16( st_ivas->renderer_type, RENDERER_PARAM_ISM ) || EQ_16( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
- {
-
- ivas_param_ism_dec_digest_tc_fx( st_ivas, n_render_timeslots, p_data_f_fx, Q11 );
- }
- }
-#ifndef OBJ_EDITING_API
- ELSE /* ISM_MODE_DISC */
- {
- ivas_ism_dec_digest_tc_fx( st_ivas );
- }
-#endif
- }
-#ifndef OBJ_EDITING_API
- ELSE IF( EQ_16( st_ivas->ivas_format, SBA_FORMAT ) || EQ_16( st_ivas->ivas_format, MASA_FORMAT ) )
- {
- IF( st_ivas->hSCE[0] )
- {
- Word16 shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
- IF( LT_16( sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
- {
- shift = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, 4 );
- }
- scale_sig32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, shift ); // Q(31-cngNoiseLevelExp+shift)
- st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift );
- }
- ivas_sba_dec_digest_tc_fx( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
- }
- ELSE IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
- {
-
- IF( EQ_16( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
- {
- ivas_ism_dec_digest_tc_fx( st_ivas );
-
- test();
- test();
- test();
- test();
- /* delay the objects here for all renderers where it is needed */
- IF(
- (
- EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) ||
- EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) ||
- EQ_16( st_ivas->renderer_type, RENDERER_OSBA_AMBI ) ||
- EQ_16( st_ivas->renderer_type, RENDERER_OSBA_LS ) ||
- EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) ) &&
- ( NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) )
- {
- FOR( n = 0; n < st_ivas->nchan_ism; n++ )
- {
- delay_signal32_fx( st_ivas->hTcBuffer->tc_fx[n], st_ivas->hTcBuffer->n_samples_available, st_ivas->hSbaIsmData->delayBuffer_fx[n], st_ivas->hSbaIsmData->delayBuffer_size );
- }
- }
-
- IF( !st_ivas->sba_dirac_stereo_flag )
- {
- IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )
- {
- Word16 temp, temp_e;
- temp = BASOP_Util_Divide1616_Scale( st_ivas->hTcBuffer->n_samples_granularity, st_ivas->hSpatParamRendCom->slot_size, &temp_e );
- n_render_timeslots = extract_l( L_shr( L_mult0( n_render_timeslots, temp ), sub( 15, temp_e ) ) );
- }
-
- IF( st_ivas->hSCE[0] )
- {
- Word16 shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
- if ( LT_16( sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
- {
- shift = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, 4 );
- }
- scale_sig32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, shift ); // Q(31-cngNoiseLevelExp+shift)
- st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift );
- }
- ivas_sba_dec_digest_tc_fx( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
- }
- }
- ELSE
- {
- ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );
-
- IF( st_ivas->hSCE[0] )
- {
- Word16 shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
- if ( LT_16( sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
- {
- shift = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, 4 );
- }
- scale_sig32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, shift ); // Q(31-cngNoiseLevelExp+shift)
- st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift );
- }
- ivas_sba_dec_digest_tc_fx( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
- }
- }
- ELSE IF( EQ_16( st_ivas->ivas_format, MASA_ISM_FORMAT ) )
- {
- test();
- IF( EQ_32( st_ivas->renderer_type, RENDERER_OMASA_MIX_EXT ) || EQ_32( st_ivas->renderer_type, RENDERER_OMASA_OBJECT_EXT ) )
- {
- ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );
- IF( st_ivas->hDecoderConfig->Opt_tsm )
- {
- ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );
- }
- }
- ELSE
- {
- test();
- IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) && EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
- {
- n_render_timeslots = i_mult( n_render_timeslots, idiv1616( st_ivas->hTcBuffer->n_samples_granularity, st_ivas->hSpatParamRendCom->slot_size ) );
- }
-
- IF( st_ivas->hSCE[0] )
- {
- Word16 shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
- if ( LT_16( sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
- {
- shift = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, 4 );
- }
- scale_sig32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, shift ); // Q(31- (st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp - shift)
- st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift );
- move16();
- }
- ivas_sba_dec_digest_tc_fx( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
-
- IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
- {
- ivas_ism_dec_digest_tc_fx( st_ivas );
- }
- }
-
- test();
- IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_16( st_ivas->renderer_type, RENDERER_DIRAC ) )
- {
- Word16 num_objects;
-
- /* Delay the signal to match CLDFB delay. Delay the whole buffer. */
- num_objects = 0;
- move16();
-
- test();
- test();
- IF( ( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) || EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) ) && NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) )
- {
- num_objects = 1;
- move16();
- }
- ELSE IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
- {
- num_objects = st_ivas->nchan_ism;
- move16();
- }
- FOR( n = 0; n < num_objects; n++ )
- {
- test();
- IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) && EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) )
- {
- v_multc_fixed_16( st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], OMASA_TDREND_MATCHING_GAIN_FX, st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available );
- }
- delay_signal32_fx( st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available, st_ivas->hMasaIsmData->delayBuffer_fx[n], st_ivas->hMasaIsmData->delayBuffer_size );
- }
- }
- }
- ELSE IF( EQ_16( st_ivas->ivas_format, MC_FORMAT ) )
- {
- IF( EQ_16( st_ivas->mc_mode, MC_MODE_MCT ) )
- {
- ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );
- }
- ELSE IF( EQ_16( st_ivas->mc_mode, MC_MODE_PARAMUPMIX ) )
- {
- ivas_mc_paramupmix_dec_digest_tc( st_ivas, (UWord8) n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
- }
- ELSE IF( EQ_16( st_ivas->mc_mode, MC_MODE_PARAMMC ) )
- {
-
- Word16 nchan_transport = st_ivas->nchan_transport;
- move16();
- Word16 nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
- Word16 nchan_out_cov;
- test();
- test();
- IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
- {
- nchan_out_cov = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
- }
- ELSE IF( EQ_16( st_ivas->hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_CLDFB ) )
- {
- nchan_out_cov = nchan_out_transport;
- move16();
- }
- ELSE IF( EQ_16( st_ivas->hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_16( st_ivas->hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
- {
- nchan_out_cov = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
- }
- ELSE
- {
- nchan_out_cov = nchan_out_transport;
- move16();
- }
-
- scale_sig32( st_ivas->hParamMC->proto_matrix_int_fx, st_ivas->hParamMC->proto_matrix_int_len, -1 ); // Q(31-1)
- st_ivas->hParamMC->proto_matrix_int_e = 1;
- move16();
-
- ivas_param_mc_dec_digest_tc_fx( st_ivas, (UWord8) n_render_timeslots, (Word32 **) p_data_f_fx, Q11 );
-
- scale_sig32( st_ivas->hParamMC->proto_matrix_int_fx, st_ivas->hParamMC->proto_matrix_int_len, 1 ); // Q(31-1+1)
-
- Word16 shift;
- FOR( Word16 param_band_idx = 0; param_band_idx < st_ivas->hParamMC->num_param_bands_synth; param_band_idx++ )
- {
- shift = getScaleFactor32( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_fx[param_band_idx], s_min( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_len, nchan_transport * nchan_transport ) );
- scale_sig32( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_fx[param_band_idx], s_min( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_len, i_mult( nchan_transport, nchan_transport ) ), shift ); // Q(31-cx_old_e+shift)
- st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx] = sub( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx], shift );
- move16();
-
- shift = getScaleFactor32( st_ivas->hParamMC->h_output_synthesis_cov_state.cy_old_fx[param_band_idx], nchan_out_cov * nchan_out_cov );
- scale_sig32( st_ivas->hParamMC->h_output_synthesis_cov_state.cy_old_fx[param_band_idx], i_mult( nchan_out_cov, nchan_out_cov ), shift ); // Q(31-cy_old_e+shift)
- st_ivas->hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx] = sub( st_ivas->hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx], shift );
- move16();
- }
- }
- ELSE IF( EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) )
+ move16();
+ }
+ n_render_timeslots = idiv1616( st_ivas->hTcBuffer->n_samples_available, st_ivas->hTcBuffer->n_samples_granularity );
+
+ IF( EQ_16( st_ivas->ivas_format, ISM_FORMAT ) )
+ {
+ /* Rendering */
+ IF( EQ_16( st_ivas->ism_mode, ISM_MODE_PARAM ) )
{
- IF( st_ivas->hSCE[0] )
+ test();
+ IF( EQ_16( st_ivas->renderer_type, RENDERER_PARAM_ISM ) || EQ_16( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
{
- Word16 shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
- if ( LT_16( sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
- {
- shift = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, 4 );
- }
- scale_sig32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, shift ); // Q(31-cngNoiseLevelExp+shift)
- st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift );
- move16();
+
+ ivas_param_ism_dec_digest_tc_fx( st_ivas, n_render_timeslots, p_data_f_fx, Q11 );
}
- ivas_sba_dec_digest_tc_fx( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
}
}
-#else
ELSE IF( EQ_16( st_ivas->ivas_format, MC_FORMAT ) )
{
test();
@@ -1909,17 +1754,19 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx(
ivas_param_mc_dec_digest_tc_fx( st_ivas, (UWord8) n_render_timeslots, (Word32 **) p_data_f_fx, Q11 );
}
}
-#endif
pop_wmops();
return;
}
+#endif
+
/*--------------------------------------------------------------------------*
* ivas_dec_render()
*
* Principal IVAS JBM rendering routine
*--------------------------------------------------------------------------*/
+
ivas_error ivas_jbm_dec_render_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const UWord16 nSamplesAsked, /* i : number of samples wanted */
@@ -1940,7 +1787,9 @@ ivas_error ivas_jbm_dec_render_fx(
Word16 subframe_len, gd_bits, exp, nchan_in, i, j, ch;
const Word16 output_q_factor = Q11;
move16();
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
+#endif
Word16 nchan_out_syn_output;
push_wmops( "ivas_dec_render" );
@@ -1948,7 +1797,9 @@ ivas_error ivas_jbm_dec_render_fx(
* Initialization of local vars after struct has been set
*----------------------------------------------------------------*/
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
hSpatParamRendCom = st_ivas->hSpatParamRendCom;
+#endif
output_Fs = st_ivas->hDecoderConfig->output_Fs;
move32();
nchan_out = st_ivas->hDecoderConfig->nchan_out;
@@ -1964,28 +1815,36 @@ ivas_error ivas_jbm_dec_render_fx(
{
p_output_fx[n] = st_ivas->p_output_fx[n];
}
+
IF( !st_ivas->hDecoderConfig->Opt_tsm )
{
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
FOR( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ )
{
p_tc_fx[n] = &p_output_fx[n][st_ivas->hTcBuffer->n_samples_rendered];
}
-
+#endif
FOR( n = 0; n < MAX_TRANSPORT_CHANNELS + MAX_NUM_OBJECTS; n++ )
{
st_ivas->hTcBuffer->tc_fx[n] = st_ivas->p_output_fx[n];
}
}
+
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
ELSE
{
+#endif
FOR( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ )
{
p_tc_fx[n] = &st_ivas->hTcBuffer->tc_fx[n][st_ivas->hTcBuffer->n_samples_rendered];
}
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
}
+#endif
st_ivas->hTcBuffer->no_channels = st_ivas->hTcBuffer->nchan_buffer_full;
move16();
+
/*----------------------------------------------------------------*
* Update combined orientation access index
*----------------------------------------------------------------*/
@@ -2089,7 +1948,11 @@ ivas_error ivas_jbm_dec_render_fx(
}
}
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ ivas_ism2sba_sf_fx( p_tc_fx, p_output_fx, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );
+#else
ivas_ism2sba_sf_fx( st_ivas->hTcBuffer->tc_fx, p_output_fx, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );
+#endif
Word16 sba_num_chans = imult1616( add( st_ivas->hIntSetup.ambisonics_order, 1 ), add( st_ivas->hIntSetup.ambisonics_order, 1 ) );
FOR( j = 0; j < sba_num_chans; j++ )
@@ -2256,44 +2119,7 @@ ivas_error ivas_jbm_dec_render_fx(
ivas_ism_render_sf_fx( st_ivas, st_ivas->renderer_type, p_output_fx, *nSamplesRendered );
/* add already rendered SBA part */
-#ifdef OBJ_EDITING_API
- test();
- IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_16( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
- {
- Word32 gain = st_ivas->hSbaIsmData->gain_bed_fx;
- test();
- // TODO: Enable gain editing feature (NE_32 ( gain, ONE_IN_Q_gain ) )
- IF( NE_32( gain, ONE_IN_Q31 ) && GT_32( gain, 0 ) )
- {
- FOR( n = 0; n < nchan_out; n++ )
- {
- FOR( i = 0; i < *nSamplesRendered; i++ )
- {
- Word32 tmp1 = Mpy_32_32( p_tc_fx[n + st_ivas->nchan_ism][i], gain ); // Q11 + Q30 - 32 = Q9
- tmp1 = L_shl( tmp1, 2 ); // Q9 --> Q11
- p_output_fx[n][i] = L_add_sat( p_output_fx[n][i], tmp1 ); // Q11
- }
- }
- }
- ELSE
- {
- FOR( n = 0; n < nchan_out; n++ )
- {
- FOR( n = 0; n < nchan_out; n++ )
- {
- FOR( i = 0; i < *nSamplesRendered; i++ )
- {
- p_output_fx[n][i] = L_add_sat( p_output_fx[n][i], p_tc_fx[n + st_ivas->nchan_ism][i] ); // Q11
- }
- }
- }
- }
- }
- ELSE
-#endif
- {
- ivas_osba_stereo_add_channels_fx( p_tc_fx, p_output_fx, ONE_IN_Q11, nchan_out, st_ivas->nchan_ism, *nSamplesRendered );
- }
+ ivas_osba_stereo_add_channels_fx( p_tc_fx, p_output_fx, st_ivas->hSbaIsmData->gain_bed_fx, nchan_out, st_ivas->nchan_ism, st_ivas->ism_mode, *nSamplesRendered );
}
ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_OSBA_AMBI ) || EQ_32( st_ivas->renderer_type, RENDERER_OSBA_LS ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
{
@@ -2302,7 +2128,7 @@ ivas_error ivas_jbm_dec_render_fx(
return error;
}
}
- ELSE IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) ) /*EXT output = individual objects + HOA3*/
+ ELSE IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) ) /*EXT output = individual objects + HOA3*/
{
IF( NE_32( ( error = ivas_sba_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, &p_output_fx[st_ivas->nchan_ism] ) ), IVAS_ERR_OK ) )
{
@@ -2311,7 +2137,11 @@ ivas_error ivas_jbm_dec_render_fx(
FOR( n = 0; n < st_ivas->nchan_ism; n++ )
{
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ Copy32( p_tc_fx[n], p_output_fx[n], *nSamplesRendered );
+#else
Copy32( st_ivas->hTcBuffer->tc_fx[n] + st_ivas->hTcBuffer->n_samples_rendered, p_output_fx[n], *nSamplesRendered );
+#endif
}
}
ELSE
@@ -2325,6 +2155,7 @@ ivas_error ivas_jbm_dec_render_fx(
ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) )
{
ivas_dirac_dec_binaural_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, nchan_remapped, p_output_fx );
+
FOR( n = 0; n < st_ivas->hDecoderConfig->nchan_out; n++ )
{
scale_sig32( p_output_fx[n], *nSamplesRendered, 1 );
@@ -2337,7 +2168,7 @@ ivas_error ivas_jbm_dec_render_fx(
return error;
}
- IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
+ IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
{
FOR( n = st_ivas->hIntSetup.nchan_out_woLFE - 1; n >= 0; n-- )
{
@@ -2356,12 +2187,12 @@ ivas_error ivas_jbm_dec_render_fx(
}
ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) )
{
-
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
FOR( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ )
{
p_tc_fx[n] = &st_ivas->hTcBuffer->tc_fx[n][st_ivas->hTcBuffer->n_samples_rendered];
}
-
+#endif
IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCT ) )
{
Word16 crendInPlaceRotation = FALSE;
@@ -2404,10 +2235,20 @@ ivas_error ivas_jbm_dec_render_fx(
*st_ivas->hCrendWrapper->p_io_qfactor = exp;
move16();
- FOR( i = 0; i < nchan_in; i++ )
+ IF( crendInPlaceRotation )
{
- scale_sig32( p_output_fx[i], *nSamplesRendered, negate( sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) ) ); // Q = *st_ivas->hCrendWrapper->p_io_qfactor
- IF( st_ivas->hDecoderConfig->Opt_tsm )
+ FOR( i = 0; i < nchan_in; i++ )
+ {
+ scale_sig32( p_output_fx[i], *nSamplesRendered, negate( sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) ) ); // Q = *st_ivas->hCrendWrapper->p_io_qfactor
+ IF( st_ivas->hDecoderConfig->Opt_tsm )
+ {
+ scale_sig32( p_tc_fx[i], *nSamplesRendered, negate( sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) ) ); // Q = *st_ivas->hCrendWrapper->p_io_qfactor
+ }
+ }
+ }
+ ELSE
+ {
+ FOR( i = 0; i < nchan_in; i++ )
{
scale_sig32( p_tc_fx[i], *nSamplesRendered, negate( sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) ) ); // Q = *st_ivas->hCrendWrapper->p_io_qfactor
}
@@ -2445,13 +2286,30 @@ ivas_error ivas_jbm_dec_render_fx(
ivas_binaural_add_LFE_fx( st_ivas, *nSamplesRendered, p_tc_fx, p_output_fx );
}
- FOR( i = 0; i < nchan_in; i++ )
+ IF( crendInPlaceRotation )
+ {
+ n = nchan_in;
+ }
+ ELSE
+ {
+ n = nchan_out;
+ }
+ move16();
+
+ FOR( i = 0; i < n; i++ )
{
scale_sig32( p_output_fx[i], *nSamplesRendered, sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) ); // Q11
- IF( st_ivas->hDecoderConfig->Opt_tsm )
- {
- scale_sig32( p_tc_fx[i], *nSamplesRendered, sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) ); // Q11
- }
+ }
+
+ IF( st_ivas->hDecoderConfig->Opt_tsm && crendInPlaceRotation )
+ {
+ n = 0;
+ move16();
+ }
+
+ FOR( i = n; i < nchan_in; i++ )
+ {
+ scale_sig32( p_tc_fx[i], *nSamplesRendered, sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) ); // Q11
}
}
ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) )
@@ -2487,7 +2345,7 @@ ivas_error ivas_jbm_dec_render_fx(
}
ELSE IF( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMUPMIX ) )
{
- ivas_mc_paramupmix_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_tc_fx, p_output_fx );
+ ivas_mc_paramupmix_dec_render_fx( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_tc_fx, p_output_fx );
test();
test();
@@ -2616,7 +2474,9 @@ ivas_error ivas_jbm_dec_render_fx(
}
ELSE IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCMASA ) )
{
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
Word16 offset = imult1616( hSpatParamRendCom->slots_rendered, hSpatParamRendCom->slot_size );
+#endif
nchan_remapped = st_ivas->nchan_transport;
move16();
@@ -2639,7 +2499,11 @@ ivas_error ivas_jbm_dec_render_fx(
/* we still need to copy the separate channel if available */
IF( st_ivas->hOutSetup.separateChannelEnabled )
{
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ Copy32( p_tc_fx[LFE_CHANNEL - 1], p_output_fx[st_ivas->hOutSetup.separateChannelIndex], *nSamplesRendered );
+#else
Copy32( st_ivas->hTcBuffer->tc_fx[LFE_CHANNEL - 1] + offset, p_output_fx[st_ivas->hOutSetup.separateChannelIndex], *nSamplesRendered );
+#endif
}
ivas_mc2sba_fx( st_ivas->hIntSetup, p_output_fx, p_output_fx, *nSamplesRendered, st_ivas->hOutSetup.ambisonics_order, 0 );
@@ -2667,13 +2531,22 @@ ivas_error ivas_jbm_dec_render_fx(
EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1_4 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_7_1_4 ) ||
EQ_32( output_config, IVAS_AUDIO_CONFIG_5_1_2 ) || ( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && GT_16( st_ivas->hOutSetup.num_lfe, 0 ) ) )
{
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ Copy32( p_tc_fx[LFE_CHANNEL], p_output_fx[LFE_CHANNEL], *nSamplesRendered );
+ Copy32( p_tc_fx[LFE_CHANNEL - 1], p_output_fx[st_ivas->hOutSetup.separateChannelIndex], *nSamplesRendered );
+#else
Copy32( st_ivas->hTcBuffer->tc_fx[LFE_CHANNEL] + offset, p_output_fx[LFE_CHANNEL], *nSamplesRendered );
Copy32( st_ivas->hTcBuffer->tc_fx[LFE_CHANNEL - 1] + offset, p_output_fx[st_ivas->hOutSetup.separateChannelIndex], *nSamplesRendered );
+#endif
}
ELSE IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) && st_ivas->hOutSetup.num_lfe == 0 )
{
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ Copy32( p_tc_fx[LFE_CHANNEL - 1], p_output_fx[st_ivas->hOutSetup.separateChannelIndex], *nSamplesRendered );
+#else
/* Delay the separated channel to sync with the DirAC rendering */
Copy32( st_ivas->hTcBuffer->tc_fx[LFE_CHANNEL - 1] + offset, p_output_fx[st_ivas->hOutSetup.separateChannelIndex], *nSamplesRendered );
+#endif
}
}
}
@@ -2889,6 +2762,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx(
{
return error;
}
+
IF( NE_32( ( error = getAudioConfigNumChannels( st_ivas->hOutSetup.output_config, &nchan_out ) ), IVAS_ERR_OK ) )
{
return error;
@@ -2911,6 +2785,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx(
{
return error;
}
+
ivas_binaural_add_LFE_fx( st_ivas, *nSamplesRendered, st_ivas->hTcBuffer->tc_fx, p_output_fx );
}
ELSE
@@ -2979,120 +2854,112 @@ ivas_error ivas_jbm_dec_flush_renderer_fx(
#endif
}
}
- ELSE IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) ){
-#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN
- IF( EQ_32( ism_mode_old, ISM_SBA_MODE_DISC ) ){
-#endif
- Word32 * tc_local_fx[MAX_TRANSPORT_CHANNELS];
- Word16 last_spar_md_idx;
- Word16 last_dirac_md_idx;
- UWord16 nSamplesAvailableNext;
-#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN
- ISM_MODE ism_mode_orig;
- RENDERER_TYPE renderer_type_orig;
- Word32 ivas_total_brate;
-
- ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
- renderer_type_orig = st_ivas->renderer_type;
- ism_mode_orig = st_ivas->ism_mode;
-
- /* to render flushed samples, use configuration from the last received frame */
- move32();
- st_ivas->ism_mode = ism_mode_old;
- st_ivas->renderer_type = renderer_type_old;
- st_ivas->hDecoderConfig->ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate;
-#endif
+ ELSE IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
+ {
+ IF( EQ_32( ism_mode_old, ISM_SBA_MODE_DISC ) )
+ {
+ Word32 *tc_local_fx[MAX_TRANSPORT_CHANNELS];
+ Word16 last_spar_md_idx;
+ Word16 last_dirac_md_idx;
+ UWord16 nSamplesAvailableNext;
+ ISM_MODE ism_mode_orig;
+ RENDERER_TYPE renderer_type_orig;
+ Word32 ivas_total_brate;
- last_spar_md_idx = st_ivas->hSpar->render_to_md_map[st_ivas->hSpar->slots_rendered - 1];
- last_dirac_md_idx = st_ivas->hSpatParamRendCom->render_to_md_map[st_ivas->hSpatParamRendCom->slots_rendered - 1];
- move16();
- move16();
+ ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
+ renderer_type_orig = st_ivas->renderer_type;
+ ism_mode_orig = st_ivas->ism_mode;
- /* copy from ISM delay buffer to the correct place in TCs */
- FOR( ch_idx = 0; ch_idx < st_ivas->nchan_ism; ch_idx++ )
- {
-#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN
- tc_local_fx[ch_idx] = &st_ivas->hTcBuffer->tc_fx[ch_idx][hTcBuffer->n_samples_rendered];
-#else
- tc_local_fx[ch_idx] = &st_ivas->hTcBuffer->tc_fx[ch_idx + 2][hTcBuffer->n_samples_rendered];
-#endif
- Copy32( st_ivas->hSbaIsmData->delayBuffer_fx[ch_idx], tc_local_fx[ch_idx], st_ivas->hSbaIsmData->delayBuffer_size );
- }
-
- /* transfer adapted sf info from hTcBuffer to SPAR and DirAC */
- st_ivas->hSpar->nb_subframes = 1;
- st_ivas->hSpar->subframes_rendered = 0;
- st_ivas->hSpar->subframe_nbslots[0] = JBM_CLDFB_SLOTS_IN_SUBFRAME;
- st_ivas->hSpar->slots_rendered = 0;
- st_ivas->hSpar->num_slots = JBM_CLDFB_SLOTS_IN_SUBFRAME;
- st_ivas->hSpatParamRendCom->nb_subframes = 1;
- st_ivas->hSpatParamRendCom->subframes_rendered = 0;
- st_ivas->hSpatParamRendCom->subframe_nbslots[0] = JBM_CLDFB_SLOTS_IN_SUBFRAME;
- st_ivas->hSpatParamRendCom->slots_rendered = 0;
- st_ivas->hSpatParamRendCom->num_slots = JBM_CLDFB_SLOTS_IN_SUBFRAME;
- move16();
- move16();
- move16();
- move16();
- move16();
- move16();
- move16();
- move16();
- move16();
- move16();
+ /* to render flushed samples, use configuration from the last received frame */
+ move32();
+ st_ivas->ism_mode = ism_mode_old;
+ st_ivas->renderer_type = renderer_type_old;
+ st_ivas->hDecoderConfig->ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate;
+
+ last_spar_md_idx = st_ivas->hSpar->render_to_md_map[st_ivas->hSpar->slots_rendered - 1];
+ last_dirac_md_idx = st_ivas->hSpatParamRendCom->render_to_md_map[st_ivas->hSpatParamRendCom->slots_rendered - 1];
+ move16();
+ move16();
+
+ /* copy from ISM delay buffer to the correct place in TCs */
+ FOR( ch_idx = 0; ch_idx < st_ivas->nchan_ism; ch_idx++ )
+ {
+ tc_local_fx[ch_idx] = &st_ivas->hTcBuffer->tc_fx[ch_idx][hTcBuffer->n_samples_rendered];
+ Copy32( st_ivas->hSbaIsmData->delayBuffer_fx[ch_idx], tc_local_fx[ch_idx], st_ivas->hSbaIsmData->delayBuffer_size );
+ }
+
+ /* transfer adapted sf info from hTcBuffer to SPAR and DirAC */
+ st_ivas->hSpar->nb_subframes = 1;
+ st_ivas->hSpar->subframes_rendered = 0;
+ st_ivas->hSpar->subframe_nbslots[0] = JBM_CLDFB_SLOTS_IN_SUBFRAME;
+ st_ivas->hSpar->slots_rendered = 0;
+ st_ivas->hSpar->num_slots = JBM_CLDFB_SLOTS_IN_SUBFRAME;
+ st_ivas->hSpatParamRendCom->nb_subframes = 1;
+ st_ivas->hSpatParamRendCom->subframes_rendered = 0;
+ st_ivas->hSpatParamRendCom->subframe_nbslots[0] = JBM_CLDFB_SLOTS_IN_SUBFRAME;
+ st_ivas->hSpatParamRendCom->slots_rendered = 0;
+ st_ivas->hSpatParamRendCom->num_slots = JBM_CLDFB_SLOTS_IN_SUBFRAME;
+ move16();
+ move16();
+ move16();
+ move16();
+ move16();
+ move16();
+ move16();
+ move16();
+ move16();
+ move16();
+
+ /* also adapt md maps, just use the last index */
+ set16_fx( st_ivas->hSpar->render_to_md_map, last_spar_md_idx, n_slots_still_available );
+ set16_fx( st_ivas->hSpatParamRendCom->render_to_md_map, last_dirac_md_idx, n_slots_still_available );
- /* also adapt md maps, just use the last index */
- set16_fx( st_ivas->hSpar->render_to_md_map, last_spar_md_idx, n_slots_still_available );
- set16_fx( st_ivas->hSpatParamRendCom->render_to_md_map, last_dirac_md_idx, n_slots_still_available );
+ /* render the last subframe */
+ IF( NE_32( ( error = ivas_osba_dirac_td_binaural_jbm_fx( st_ivas, (UWord16) hTcBuffer->n_samples_granularity, nSamplesRendered, &nSamplesAvailableNext, p_output_fx ) ), IVAS_ERR_OK ) )
+ {
+ return error;
+ }
- /* render the last subframe */
- IF( NE_32( ( error = ivas_osba_dirac_td_binaural_jbm_fx( st_ivas, (UWord16) hTcBuffer->n_samples_granularity, nSamplesRendered, &nSamplesAvailableNext, p_output_fx ) ), IVAS_ERR_OK ) )
+ /* restore original configuration */
+ st_ivas->ism_mode = ism_mode_orig;
+ st_ivas->renderer_type = renderer_type_orig;
+ st_ivas->hDecoderConfig->ivas_total_brate = ivas_total_brate;
+ }
+ }
+ ELSE
{
- return error;
+ return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong IVAS format in VoIP renderer flushing!" );
}
-#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN
- /* restore original configuration */
- st_ivas->ism_mode = ism_mode_orig;
- st_ivas->renderer_type = renderer_type_orig;
- st_ivas->hDecoderConfig->ivas_total_brate = ivas_total_brate;
+ hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;
}
-#endif
-}
-ELSE
-{
- return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong IVAS format in VoIP renderer flushing!" );
-}
-
-hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;
-}
-/* update global combined orientation start index */
-ivas_combined_orientation_update_start_index( st_ivas->hCombinedOrientationData, *nSamplesRendered );
+ /* update global combined orientation start index */
+ ivas_combined_orientation_update_start_index( st_ivas->hCombinedOrientationData, *nSamplesRendered );
-*nSamplesRendered = n_samples_to_render;
-move16();
+ *nSamplesRendered = n_samples_to_render;
+ move16();
-/* Only write out the valid data*/
-IF( is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig ) == 0 )
-{
- IF( NE_16( st_ivas->ivas_format, MONO_FORMAT ) )
+ /* Only write out the valid data*/
+ IF( is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig ) == 0 )
{
-#ifndef DISABLE_LIMITER
- Word16 ch_idx, exp = 11;
- move16();
- FOR( ch_idx = 0; ch_idx < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; ch_idx++ )
+ IF( NE_16( st_ivas->ivas_format, MONO_FORMAT ) )
{
- p_output_fx[ch_idx] = st_ivas->p_output_fx[ch_idx];
- }
- ivas_limiter_dec_fx( st_ivas->hLimiter, p_output_fx, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect, exp );
+#ifndef DISABLE_LIMITER
+ Word16 ch_idx, exp = 11;
+ move16();
+ FOR( ch_idx = 0; ch_idx < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; ch_idx++ )
+ {
+ p_output_fx[ch_idx] = st_ivas->p_output_fx[ch_idx];
+ }
+ ivas_limiter_dec_fx( st_ivas->hLimiter, p_output_fx, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect, exp );
#endif
+ }
}
-}
-ivas_syn_output_fx( p_output_fx, Q11, *nSamplesRendered, st_ivas->hDecoderConfig->nchan_out, data );
+ ivas_syn_output_fx( p_output_fx, Q11, *nSamplesRendered, st_ivas->hDecoderConfig->nchan_out, data );
-return IVAS_ERR_OK;
+ return IVAS_ERR_OK;
}
@@ -3102,7 +2969,7 @@ return IVAS_ERR_OK;
* Set number of samples to discard in the first subframe if the renderer granularity changes on a bitrate change
*--------------------------------------------------------------------------*/
-ivas_error ivas_jbm_dec_set_discard_samples(
+ivas_error ivas_jbm_dec_set_discard_samples_fx(
Decoder_Struct *st_ivas /* i/o: main IVAS decoder structre */
)
{
@@ -3544,6 +3411,8 @@ Word16 ivas_jbm_dec_get_num_tc_channels_fx(
return num_tc;
}
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
+
/*--------------------------------------------------------------------------*
* ivas_jbm_dec_copy_tc()
*
@@ -3609,6 +3478,8 @@ static void ivas_jbm_dec_copy_tc(
return;
}
+#endif
+
/*--------------------------------------------------------------------------*
* ivas_jbm_dec_get_render_granularity()
*
@@ -3616,8 +3487,37 @@ static void ivas_jbm_dec_copy_tc(
*--------------------------------------------------------------------------*/
/*! r: render granularity */
+#ifdef NONBE_1303_REND_GRANULARITY
+Word16 ivas_jbm_dec_get_render_granularity_fx(
+ const RENDERER_TYPE renderer_type, /* i : renderer type */
+ const RENDERER_TYPE renderer_type_sec, /* i : secondary renderer type */
+ const int32_t output_Fs /* i : sampling rate */
+)
+{
+ Word16 render_granularity;
+ test();
+ test();
+ test();
+ IF( EQ_32( renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) || /* TD renderer */
+ EQ_32( renderer_type, RENDERER_BINAURAL_MIXER_CONV ) || EQ_32( renderer_type, RENDERER_BINAURAL_MIXER_CONV_ROOM ) || /* Crend */
+ EQ_32( renderer_type_sec, RENDERER_BINAURAL_OBJECTS_TD ) /* TD rend as a secondary renderer -> set the common granularity for both renderers */
+ )
+ {
+ /* 5 ms granularity */
+ render_granularity = NS2SA_FX2( output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );
+ move16();
+ }
+ ELSE
+ {
+ /* 1.25 ms granularity */
+ render_granularity = NS2SA_FX2( output_Fs, CLDFB_SLOT_NS );
+ move16();
+ }
+ return render_granularity;
+}
+#else
Word16 ivas_jbm_dec_get_render_granularity(
const RENDERER_TYPE rendererType, /* i : renderer type */
const IVAS_FORMAT ivas_format, /* i : ivas format */
@@ -3648,6 +3548,7 @@ Word16 ivas_jbm_dec_get_render_granularity(
return render_granularity;
}
+#endif
/*--------------------------------------------------------------------------*
@@ -3973,7 +3874,7 @@ static void ivas_jbm_dec_tc_buffer_playout_fx(
* Close JBM transport channel buffer
*--------------------------------------------------------------------------*/
-void ivas_jbm_dec_tc_buffer_close(
+void ivas_jbm_dec_tc_buffer_close_fx(
DECODER_TC_BUFFER_HANDLE *phTcBuffer /* i/o: TC buffer handle */
)
{
@@ -3999,11 +3900,13 @@ void ivas_jbm_dec_tc_buffer_close(
return;
}
+
/*--------------------------------------------------------------------------*
* ivas_jbm_dec_td_renderers_adapt_subframes()
*
* Close JBM transport channel buffer
*--------------------------------------------------------------------------*/
+
void ivas_jbm_dec_td_renderers_adapt_subframes(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
@@ -4070,17 +3973,20 @@ void ivas_jbm_dec_td_renderers_adapt_subframes(
return;
}
+
+
/*--------------------------------------------------------------------------*
* ivas_jbm_dec_get_tc_buffer_mode()
*
*
*--------------------------------------------------------------------------*/
-TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(
+TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
{
TC_BUFFER_MODE buffer_mode;
+
buffer_mode = TC_BUFFER_MODE_BUFFER;
move16();
@@ -4178,6 +4084,7 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(
return buffer_mode;
}
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
/*--------------------------------------------------------------------------*
* ivas_jbm_dec_copy_tc_no_tsm()
@@ -4269,6 +4176,8 @@ void ivas_jbm_dec_copy_tc_no_tsm_fx(
return;
}
+#endif
+
/*--------------------------------------------------------------------------*
* ivas_jbm_dec_metadata_open()
*
@@ -4279,10 +4188,12 @@ ivas_error ivas_jbm_dec_metadata_open(
Decoder_Struct *st_ivas )
{
JBM_METADATA_HANDLE hJbmMetadata;
+
IF( ( hJbmMetadata = (JBM_METADATA_HANDLE) malloc( sizeof( JBM_METADATA ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for JBM metadata handle\n" ) );
}
+
hJbmMetadata->sf_write_idx = 0;
move16();
hJbmMetadata->sf_md_buffer_length = MASA_JBM_RINGBUFFER_FRAMES * MAX_PARAM_SPATIAL_SUBFRAMES;
@@ -4356,6 +4267,7 @@ static void ivas_jbm_dec_copy_masa_meta_to_buffer(
*
* Map input MASA metadata subframes to slots in JBM processing
*--------------------------------------------------------------------------*/
+
static void ivas_jbm_masa_sf_to_slot_map(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const Word16 nCldfbTs /* i : number of CLDFB time slots */
@@ -4367,6 +4279,10 @@ static void ivas_jbm_masa_sf_to_slot_map(
Word16 slot_idx;
Word16 write_idx, sf_index;
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );
+
+#endif
/* Set values */
hJbmMetadata = st_ivas->hJbmMetadata;
num_slots_in_subfr = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES;
@@ -4477,26 +4393,26 @@ void ivas_jbm_masa_sf_to_sf_map(
return;
}
-#ifdef OBJ_EDITING_API
+
/*--------------------------------------------------------------------------*
- * ivas_jbm_dec_prepare_renderer()
+ * ivas_dec_prepare_renderer()
*
- * prepare IVAS JBM renderer routine
+ * prepare IVAS renderer routine
*--------------------------------------------------------------------------*/
-void ivas_jbm_dec_prepare_renderer(
- Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
+void ivas_dec_prepare_renderer_fx(
+ Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
{
- Word16 n, n_render_timeslots, tmp, exp;
+ Word16 n, n_render_timeslots, tmp, exp, shift;
- push_wmops( "ivas_jbm_dec_feed_tc_to_rendererer" );
+ push_wmops( "ivas_dec_prepare_renderer" );
/* n_render_timeslots = st_ivas->hTcBuffer->n_samples_available / st_ivas->hTcBuffer->n_samples_granularity; */
tmp = BASOP_Util_Divide1616_Scale( st_ivas->hTcBuffer->n_samples_available, st_ivas->hTcBuffer->n_samples_granularity, &exp );
n_render_timeslots = shr( tmp, sub( 15, exp ) ); // Q0
-
+ test();
IF( EQ_16( st_ivas->hTcBuffer->tc_buffer_mode, TC_BUFFER_MODE_BUFFER ) )
{
ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );
@@ -4518,6 +4434,7 @@ void ivas_jbm_dec_prepare_renderer(
/* Rendering */
IF( EQ_16( st_ivas->ism_mode, ISM_MODE_PARAM ) )
{
+ test();
test();
test();
IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) || EQ_16( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) )
@@ -4540,7 +4457,7 @@ void ivas_jbm_dec_prepare_renderer(
{
IF( st_ivas->hSCE[0] )
{
- Word16 shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
+ shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
IF( LT_16( sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
{
shift = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, 4 );
@@ -4548,11 +4465,11 @@ void ivas_jbm_dec_prepare_renderer(
scale_sig32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, shift ); // Q(31-cngNoiseLevelExp+shift)
st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift );
}
+
ivas_sba_dec_digest_tc_fx( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
}
ELSE IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
{
-
IF( EQ_16( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
{
ivas_ism_dec_digest_tc_fx( st_ivas );
@@ -4561,6 +4478,8 @@ void ivas_jbm_dec_prepare_renderer(
test();
test();
test();
+ test();
+ test();
/* delay the objects here for all renderers where it is needed */
IF(
(
@@ -4588,7 +4507,7 @@ void ivas_jbm_dec_prepare_renderer(
IF( st_ivas->hSCE[0] )
{
- Word16 shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
+ shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
if ( LT_16( sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
{
shift = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, 4 );
@@ -4605,7 +4524,7 @@ void ivas_jbm_dec_prepare_renderer(
IF( st_ivas->hSCE[0] )
{
- Word16 shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
+ shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
if ( LT_16( sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
{
shift = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, 4 );
@@ -4613,6 +4532,7 @@ void ivas_jbm_dec_prepare_renderer(
scale_sig32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, shift ); // Q(31-cngNoiseLevelExp+shift)
st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift );
}
+
ivas_sba_dec_digest_tc_fx( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
}
}
@@ -4622,6 +4542,7 @@ void ivas_jbm_dec_prepare_renderer(
IF( EQ_32( st_ivas->renderer_type, RENDERER_OMASA_MIX_EXT ) || EQ_32( st_ivas->renderer_type, RENDERER_OMASA_OBJECT_EXT ) )
{
ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );
+
IF( st_ivas->hDecoderConfig->Opt_tsm )
{
ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );
@@ -4637,7 +4558,7 @@ void ivas_jbm_dec_prepare_renderer(
IF( st_ivas->hSCE[0] )
{
- Word16 shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
+ shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
if ( LT_16( sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
{
shift = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, 4 );
@@ -4646,6 +4567,7 @@ void ivas_jbm_dec_prepare_renderer(
st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift );
move16();
}
+
ivas_sba_dec_digest_tc_fx( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
@@ -4657,32 +4579,53 @@ void ivas_jbm_dec_prepare_renderer(
test();
IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_16( st_ivas->renderer_type, RENDERER_DIRAC ) )
{
- Word16 num_objects;
+ Word16 nchan_transport_ism;
/* Delay the signal to match CLDFB delay. Delay the whole buffer. */
- num_objects = 0;
+ nchan_transport_ism = 0;
move16();
test();
test();
IF( ( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) || EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) ) && NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) )
{
- num_objects = 1;
+ nchan_transport_ism = 1;
move16();
}
ELSE IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
{
- num_objects = st_ivas->nchan_ism;
+ nchan_transport_ism = st_ivas->nchan_ism;
move16();
}
- FOR( n = 0; n < num_objects; n++ )
+
+ FOR( n = 0; n < nchan_transport_ism; n++ )
{
test();
IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) && EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) )
{
- v_multc_fixed_16( st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], OMASA_TDREND_MATCHING_GAIN_FX, st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available );
+ v_multc_fx_16( st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], OMASA_TDREND_MATCHING_GAIN_FX, st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available );
+
+ IF( st_ivas->hMasaIsmData->ism_gain_is_edited[n] )
+ {
+ v_multc_fx_16( st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], st_ivas->hMasaIsmData->gain_ism_edited_fx[n], st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available );
+ Scale_sig32( st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available, Q3 ); // Q8 -> Q11
+ }
}
delay_signal32_fx( st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available, st_ivas->hMasaIsmData->delayBuffer_fx[n], st_ivas->hMasaIsmData->delayBuffer_size );
+ // TODO: check if tis is a bug in main already
+ }
+
+ test();
+ IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) && EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) )
+ {
+ IF( st_ivas->hMasaIsmData->masa_gain_is_edited )
+ {
+ FOR( n = 0; n < BINAURAL_CHANNELS; n++ )
+ {
+ v_multc_fx_16( st_ivas->hTcBuffer->tc_fx[n], st_ivas->hMasaIsmData->gain_masa_edited_fx, st_ivas->hTcBuffer->tc_fx[n], st_ivas->hTcBuffer->n_samples_available ); // Q8
+ Scale_sig32( st_ivas->hTcBuffer->tc_fx[n], st_ivas->hTcBuffer->n_samples_available, Q3 ); // Q8 -> Q11
+ }
+ }
}
}
}
@@ -4694,7 +4637,7 @@ void ivas_jbm_dec_prepare_renderer(
}
ELSE IF( EQ_16( st_ivas->mc_mode, MC_MODE_PARAMUPMIX ) )
{
- ivas_mc_paramupmix_dec_digest_tc( st_ivas, (UWord8) n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
+ ivas_mc_paramupmix_dec_digest_tc_fx( st_ivas, (UWord8) n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
}
ELSE IF( EQ_16( st_ivas->mc_mode, MC_MODE_PARAMMC ) )
{
@@ -4702,6 +4645,7 @@ void ivas_jbm_dec_prepare_renderer(
move16();
Word16 nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
Word16 nchan_out_cov;
+
test();
test();
IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
@@ -4731,7 +4675,6 @@ void ivas_jbm_dec_prepare_renderer(
scale_sig32( st_ivas->hParamMC->proto_matrix_int_fx, st_ivas->hParamMC->proto_matrix_int_len, 1 ); // Q(31-1+1)
- Word16 shift;
FOR( Word16 param_band_idx = 0; param_band_idx < st_ivas->hParamMC->num_param_bands_synth; param_band_idx++ )
{
shift = getScaleFactor32( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_fx[param_band_idx], s_min( st_ivas->hParamMC->h_output_synthesis_cov_state.cx_old_len, nchan_transport * nchan_transport ) );
@@ -4749,7 +4692,7 @@ void ivas_jbm_dec_prepare_renderer(
{
IF( st_ivas->hSCE[0] )
{
- Word16 shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
+ shift = getScaleFactor32( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
if ( LT_16( sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift ), 4 ) )
{
shift = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, 4 );
@@ -4758,6 +4701,7 @@ void ivas_jbm_dec_prepare_renderer(
st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp = sub( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->cngNoiseLevelExp, shift );
move16();
}
+
ivas_sba_dec_digest_tc_fx( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );
}
}
@@ -4765,4 +4709,3 @@ void ivas_jbm_dec_prepare_renderer(
pop_wmops();
return;
}
-#endif
diff --git a/lib_dec/ivas_lfe_dec_fx.c b/lib_dec/ivas_lfe_dec_fx.c
index 29a64da58ad02646b6483d68a94acdc00cb2b2ed..74d8de662ea8aadd99c86363b514d42e8164fe1e 100644
--- a/lib_dec/ivas_lfe_dec_fx.c
+++ b/lib_dec/ivas_lfe_dec_fx.c
@@ -315,6 +315,7 @@ static void ivas_create_lfe_lpf_dec_fx(
return;
}
+
/*-----------------------------------------------------------------------------------------*
* Function ivas_lfe_dec_fx()
*
@@ -401,6 +402,7 @@ void ivas_lfe_dec_fx(
j = add( j, shr( output_frame, 5 ) );
}
q_out = Q9;
+ move16();
}
IF( hLFE->filter_state.order > 0 )
@@ -488,7 +490,7 @@ ivas_error ivas_create_lfe_dec_fx(
low_pass_delay_dec_out = 0; // Q15
move16();
- if ( delay_ns > ivas_lfe_lpf_delay_ns[IVAS_FILTER_ORDER_4 - 3] )
+ IF( GT_32( delay_ns, ivas_lfe_lpf_delay_ns[IVAS_FILTER_ORDER_4 - 3] ) )
{
filt_order = 4;
low_pass_delay_dec_out = ivas_lfe_lpf_delay_Q15[IVAS_FILTER_ORDER_4 - 3];
diff --git a/lib_dec/ivas_masa_dec_fx.c b/lib_dec/ivas_masa_dec_fx.c
index 7dba2b5d4714c44e59743955cc05e2e939fd58da..fe3f7fee990cefd5e99365060e791cecdb153f8d 100644
--- a/lib_dec/ivas_masa_dec_fx.c
+++ b/lib_dec/ivas_masa_dec_fx.c
@@ -184,10 +184,10 @@ ivas_error ivas_masa_decode_fx(
IF( NE_32( ivas_format, MC_FORMAT ) || NE_16( st_ivas->mc_mode, MC_MODE_MCMASA ) )
{
Word16 bits_per_frame = extract_l( Mpy_32_32( ivas_total_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) );
+
IF( EQ_32( ivas_format, MASA_FORMAT ) )
{
/* re-read the number of objects, needed in case of bad frame */
-#ifdef FIX_CREND_SIMPLIFY_CODE
ch = sub( 5, add( st_ivas->bit_stream[sub( bits_per_frame, 3 )], shl( st_ivas->bit_stream[sub( bits_per_frame, 2 )], 1 ) ) );
if ( EQ_16( ch, 5 ) )
@@ -197,17 +197,10 @@ ivas_error ivas_masa_decode_fx(
}
st_ivas->nchan_ism = ch;
move16();
-#else
- st_ivas->nchan_ism = sub( 5, add( st_ivas->bit_stream[bits_per_frame - 3], shl( st_ivas->bit_stream[bits_per_frame - 2], 1 ) ) );
-#endif
}
test();
-#ifdef FIX_CREND_SIMPLIFY_CODE
IF( EQ_32( ivas_format, MASA_FORMAT ) && GT_16( st_ivas->nchan_ism, 0 ) )
-#else
- IF( EQ_32( ivas_format, MASA_FORMAT ) && NE_16( st_ivas->nchan_ism, 5 ) )
-#endif
{
/* there was OMASA in the input */
hMasa->config.input_ivas_format = MASA_ISM_FORMAT;
@@ -229,6 +222,7 @@ ivas_error ivas_masa_decode_fx(
move16();
move16();
*nb_bits_read = add( *nb_bits_read, MASA_HEADER_BITS );
+
/* read number of directions */
byteBuffer = st->bit_stream[( st->next_bit_pos )--];
move16();
@@ -330,6 +324,7 @@ ivas_error ivas_masa_decode_fx(
move16();
st_ivas->hIsmMetaData[0]->ism_md_lowrate_flag = 0;
move16();
+
IF( EQ_16( st_ivas->hIsmMetaData[0]->ism_imp, ISM_NO_META ) )
{
/* read flags */
@@ -365,6 +360,7 @@ ivas_error ivas_masa_decode_fx(
move16();
st_ivas->hIsmMetaData[ch]->ism_md_lowrate_flag = 0;
move16();
+
IF( EQ_16( st_ivas->hIsmMetaData[ch]->ism_imp, ISM_NO_META ) )
{
/* read flags */
@@ -378,8 +374,10 @@ ivas_error ivas_masa_decode_fx(
move16();
}
}
+
st_ivas->flag_omasa_brate = 0;
move16();
+
test();
IF( GE_16( st_ivas->nchan_ism, 3 ) && EQ_32( ivas_total_brate, IVAS_128k ) )
{
@@ -390,7 +388,6 @@ ivas_error ivas_masa_decode_fx(
}
}
}
-
byteBuffer = st->bit_stream[st->next_bit_pos];
move16();
st->next_bit_pos = sub( st->next_bit_pos, 1 );
@@ -504,9 +501,9 @@ ivas_error ivas_masa_decode_fx(
FOR( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )
{
meta_write_index = add( st_ivas->hSpatParamRendCom->dirac_bs_md_write_idx, sf ) % st_ivas->hSpatParamRendCom->dirac_md_buffer_length;
- st_ivas->hMasaIsmData->azimuth_separated_ism[meta_write_index] = st_ivas->hMasaIsmData->azimuth_ism[obj][meta_write_index];
+ st_ivas->hMasaIsmData->azimuth_separated_ism_fx[meta_write_index] = st_ivas->hMasaIsmData->azimuth_ism_fx[obj][meta_write_index];
move16();
- st_ivas->hMasaIsmData->elevation_separated_ism[meta_write_index] = st_ivas->hMasaIsmData->elevation_ism[obj][meta_write_index];
+ st_ivas->hMasaIsmData->elevation_separated_ism_fx[meta_write_index] = st_ivas->hMasaIsmData->elevation_ism_fx[obj][meta_write_index];
move16();
}
}
@@ -837,13 +834,14 @@ ivas_error ivas_masa_dec_open_fx(
move32();
/* ISM metadata */
+
test();
- test();
- IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) && st_ivas->hIsmMetaData[0] != NULL && EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
+ IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) && st_ivas->hIsmMetaData[0] != NULL )
{
/* these are not needed -> clean. EXT metafile writer in OMASA needs only the number of ISMs and writes default null-data */
ivas_ism_metadata_close( st_ivas->hIsmMetaData, 0 );
}
+
test();
test();
test();
@@ -907,6 +905,9 @@ ivas_error ivas_masa_dec_open_fx(
IF( st_ivas->hTcBuffer == NULL && NE_16( st_ivas->renderer_type, RENDERER_DISABLE ) && NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) && NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) && NE_16( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) )
{
Word16 nchan_to_allocate, nchan_transport;
+#ifdef NONBE_1303_REND_GRANULARITY
+ Word16 granularity;
+#endif
TC_BUFFER_MODE buffer_mode;
buffer_mode = TC_BUFFER_MODE_RENDERER;
@@ -951,7 +952,13 @@ ivas_error ivas_masa_dec_open_fx(
nchan_to_allocate = add( nchan_to_allocate, 1 );
}
+#ifdef NONBE_1303_REND_GRANULARITY
+ granularity = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );
+
+ IF( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, buffer_mode, nchan_transport, nchan_to_allocate, nchan_to_allocate, granularity ) ) != IVAS_ERR_OK )
+#else
IF( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, buffer_mode, nchan_transport, nchan_to_allocate, nchan_to_allocate, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )
+#endif
{
return error;
}
@@ -1193,8 +1200,8 @@ void ivas_masa_prerender_fx(
test();
IF( EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) || EQ_32( st_ivas->renderer_type, RENDERER_DISABLE ) )
{
- v_multc_fixed( output_fx[0], SQRT2_FIXED, output_fx[0], output_frame ); /* q + 30 - 31 = q - 1*/ /* Gain transport signal when transmitting mono with cpe in order to match loudness */
- *q_shift = -1; /* Q has decreased by 1. */
+ v_multc_fx( output_fx[0], SQRT2_FX, output_fx[0], output_frame ); /* q + 30 - 31 = q - 1*/ /* Gain transport signal when transmitting mono with cpe in order to match loudness */
+ *q_shift = -1; /* Q has decreased by 1. */
move16();
}
}
@@ -1680,11 +1687,6 @@ static Word16 decode_lfe_to_total_energy_ratio_fx(
ivas_error ivas_masa_dec_reconfigure_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesRendered, /* o : number of samples flushed from the previous frame (JBM) */
- Word16 *data /* o : output synthesis signal */
-#endif
)
{
Word16 n, tmp, num_bits;
@@ -1693,27 +1695,25 @@ ivas_error ivas_masa_dec_reconfigure_fx(
Decoder_State **sts;
UWord32 ivas_total_brate, last_ivas_total_brate;
Word16 numCldfbAnalyses_old, numCldfbSyntheses_old;
+#ifdef FIX_NCHAN_BUFFERS
+ Word16 nchan_out_buff_old, nchan_out_buff;
+#endif
ivas_error error;
Word32 ism_total_brate;
Word16 pos_idx;
-#ifndef FIX_HRTF_LOAD
- error = IVAS_ERR_OK;
- move16();
-#endif
ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
move32();
last_ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate;
move32();
+#ifdef FIX_NCHAN_BUFFERS
+ nchan_out_buff_old = ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 );
+#endif
test();
-#ifdef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
test();
/* Copy state to TC buffer if granularity matches and we are not in OMASA EXT rendering mode */
IF( st_ivas->hSpatParamRendCom != NULL && EQ_16( st_ivas->hSpatParamRendCom->slot_size, st_ivas->hTcBuffer->n_samples_granularity ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
-#else
- IF( st_ivas->hSpatParamRendCom != NULL && EQ_16( st_ivas->hSpatParamRendCom->slot_size, st_ivas->hTcBuffer->n_samples_granularity ) )
-#endif
{
Copy( st_ivas->hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpatParamRendCom->nb_subframes;
@@ -1733,9 +1733,7 @@ ivas_error ivas_masa_dec_reconfigure_fx(
test();
test();
test();
-#ifdef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
test();
-#endif
IF( ( EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) && st_ivas->hDirACRend == NULL ) ||
( ( EQ_32( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) && st_ivas->hDiracDecBin[0] == NULL ) )
{
@@ -1745,7 +1743,6 @@ ivas_error ivas_masa_dec_reconfigure_fx(
return error;
}
}
-#ifdef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_DISABLE ) || EQ_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) || EQ_32( st_ivas->renderer_type, RENDERER_OMASA_MIX_EXT ) )
{
/* close all unnecessary parametric decoding and rendering */
@@ -1754,19 +1751,6 @@ ivas_error ivas_masa_dec_reconfigure_fx(
ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );
ivas_dirac_dec_close_fx( &( st_ivas->hDirAC ) );
}
-#else
- ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_DISABLE ) || EQ_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) )
- {
- IF( st_ivas->hDirAC != NULL )
- {
- /* close all unnecessary parametric decoding and rendering */
- ivas_dirac_dec_close_binaural_data_fx( st_ivas->hDiracDecBin );
- ivas_dirac_rend_close_fx( &( st_ivas->hDirACRend ) );
- ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );
- ivas_dirac_dec_close_fx( &( st_ivas->hDirAC ) );
- }
- }
-#endif
/* possible reconfigure is done later */
/*-----------------------------------------------------------------*
@@ -1856,16 +1840,11 @@ ivas_error ivas_masa_dec_reconfigure_fx(
test();
test();
test();
-#ifdef NONBE_FIX_1143_MASA_BRSW
test();
test();
IF( ( LT_32( ivas_total_brate, MASA_STEREO_MIN_BITRATE ) && GE_32( last_ivas_total_brate, MASA_STEREO_MIN_BITRATE ) ) ||
( LT_32( ivas_total_brate, MASA_STEREO_MIN_BITRATE ) && EQ_32( last_ivas_total_brate, FRAME_NO_DATA ) ) ||
( LT_32( ivas_total_brate, MASA_STEREO_MIN_BITRATE ) && EQ_32( last_ivas_total_brate, IVAS_SID_5k2 ) ) )
-#else
- IF( ( LT_32( ivas_total_brate, MASA_STEREO_MIN_BITRATE ) && GE_32( last_ivas_total_brate, MASA_STEREO_MIN_BITRATE ) ) ||
- ( LT_32( ivas_total_brate, MASA_STEREO_MIN_BITRATE ) && EQ_32( last_ivas_total_brate, FRAME_NO_DATA ) ) )
-#endif
{
st_ivas->hCPE[cpe_id]->nchan_out = 1;
move16();
@@ -1967,29 +1946,19 @@ ivas_error ivas_masa_dec_reconfigure_fx(
ivas_masa_set_elements_fx( ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &tmp, &tmp, &tmp, st_ivas->ivas_format, st_ivas->ism_mode, ism_total_brate );
-#ifndef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH
- IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )
- {
- IF( NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
- {
- move16();
- st_ivas->nchan_ism = 0; /* Initialization if it has not been already read from the end of the bitstream at the same time
- with reading of the format: nchan_ism is needed in MASA format because for the EXT output in
- MASA-only (pre-rendering mode of OMASA) the number of ISMs to output correct number of empty objects is needed */
- }
- st_ivas->ism_mode = ISM_MODE_NONE;
- move16();
- }
-#endif
{
Word16 tc_nchan_to_allocate;
Word16 tc_nchan_transport;
TC_BUFFER_MODE buffer_mode_new;
Word16 n_samples_granularity;
+#ifdef NONBE_1303_REND_GRANULARITY
+ n_samples_granularity = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, ivas_renderer_secondary_select_fx( st_ivas ), st_ivas->hDecoderConfig->output_Fs );
+#else
n_samples_granularity = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );
move16();
- buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas );
+#endif
+ buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode_fx( st_ivas );
tc_nchan_transport = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
tc_nchan_to_allocate = tc_nchan_transport;
@@ -2009,17 +1978,31 @@ ivas_error ivas_masa_dec_reconfigure_fx(
}
ELSE
{
+#ifdef FIX_NCHAN_BUFFERS
+ tc_nchan_to_allocate = BINAURAL_CHANNELS;
+ move16();
+ test();
+ if ( st_ivas->hDiracDecBin[0] != NULL && st_ivas->hDiracDecBin[0]->useTdDecorr )
+ {
+ tc_nchan_to_allocate = 2 * BINAURAL_CHANNELS;
+ move16();
+ }
+#else
tc_nchan_to_allocate = shl( BINAURAL_CHANNELS, 1 );
+#endif
}
+
test();
test();
test();
IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) && EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
{
+#ifndef NONBE_1303_REND_GRANULARITY
n_samples_granularity = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES ); /* Use the same granularity as tdrend */
+#endif
IF( GT_16( n_samples_granularity, st_ivas->hTcBuffer->n_samples_granularity ) )
{
- IF( NE_32( ( error = ivas_jbm_dec_set_discard_samples( st_ivas ) ), IVAS_ERR_OK ) )
+ IF( NE_32( ( error = ivas_jbm_dec_set_discard_samples_fx( st_ivas ) ), IVAS_ERR_OK ) )
{
return error;
}
@@ -2029,14 +2012,7 @@ ivas_error ivas_masa_dec_reconfigure_fx(
{
IF( LT_16( n_samples_granularity, st_ivas->hTcBuffer->n_samples_granularity ) )
{
-#ifdef FIX_HRTF_LOAD
/* flush already done in IVAS_DEC_ReadFormat() */
-#else
- if ( NE_32( ( error = ivas_jbm_dec_flush_renderer_fx( st_ivas, n_samples_granularity, st_ivas->renderer_type, st_ivas->intern_config, &st_ivas->hIntSetup, MC_MODE_NONE, ISM_MASA_MODE_DISC, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
-#endif
}
}
}
@@ -2083,11 +2059,23 @@ ivas_error ivas_masa_dec_reconfigure_fx(
}
}
-#ifdef FIX_HRTF_LOAD
- return IVAS_ERR_OK;
-#else
- return error;
+#ifdef FIX_NCHAN_BUFFERS
+ /*-----------------------------------------------------------------*
+ * output audio buffers
+ *-----------------------------------------------------------------*/
+
+ test();
+ IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) && EQ_32( st_ivas->last_ivas_format, MASA_FORMAT ) ) /* note: switching with OMASA is addressed in ivas_omasa_dec_config() */
+ {
+ nchan_out_buff = ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 );
+ IF( ( error = ivas_output_buff_dec_fx( st_ivas->p_output_fx, nchan_out_buff_old, nchan_out_buff ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+
#endif
+ return IVAS_ERR_OK;
}
@@ -3359,6 +3347,7 @@ static Word16 ivas_decode_masaism_metadata_fx(
FOR( obj = 0; obj < nchan_ism; obj++ )
{
+ hMasaIsmData->bits_ism[obj] = bits_ism[obj];
index = 0;
move16();
IF( LT_16( bits_ism[obj], 8 ) ) /* if low resolution, can look to the past */
@@ -3435,9 +3424,9 @@ static Word16 ivas_decode_masaism_metadata_fx(
Word16 int_azi = rint_fx( L_shr( azimuth, Q22 - 16 ) ); // Q0, extra -16 is added as int_azi is W16 and azimuth is W32
Word16 int_ele = rint_fx( L_shr( elevation, Q22 - 16 ) ); // Q0
- hMasaIsmData->azimuth_ism[obj][meta_write_index] = int_azi; // Q0
+ hMasaIsmData->azimuth_ism_fx[obj][meta_write_index] = int_azi; // Q0
move16();
- hMasaIsmData->elevation_ism[obj][meta_write_index] = int_ele; // Q0
+ hMasaIsmData->elevation_ism_fx[obj][meta_write_index] = int_ele; // Q0
move16();
}
}
diff --git a/lib_dec/ivas_mc_param_dec_fx.c b/lib_dec/ivas_mc_param_dec_fx.c
index 250b37675be3e1d0c4432fa5bc2863ddc064b91b..d95ffe9984499fd8f4a4655de7644f379a88da17 100644
--- a/lib_dec/ivas_mc_param_dec_fx.c
+++ b/lib_dec/ivas_mc_param_dec_fx.c
@@ -73,38 +73,26 @@ typedef struct parameter_band_mapping_struct
static void ivas_param_mc_dec_init_fx( PARAM_MC_DEC_HANDLE hParamMC, const Word16 nchan_in, const Word16 nchan_out );
static void ivas_param_mc_dec_copy_diffuse_proto( PARAM_MC_DEC_HANDLE hParamMC, Word32 Cldfb_buffer_real_fx[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], Word32 Cldfb_buffer_imag_fx[MAX_CICP_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const Word16 nY, const Word16 slot_idx );
+
static Word16 ivas_param_mc_range_decoder_LC_fx( UWord16 *bit_buffer, Word16 *x, Word16 *BER_detect, const Word16 sz_seq, const Word16 sz_alphabet, const UWord16 *cft, const UWord16 *sft, const Word16 tot_shift, const Word16 nbbits );
-
-static void ivas_param_mc_get_mixing_matrices_fx(
- PARAM_MC_DEC_HANDLE hParamMC, /* i : Parametric MC handle */
- IVAS_OUTPUT_SETUP *hSynthesisOutputSetup,
- Word32 Cx_in_fixed[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* i : input covariance for all parameter bands */
- Word16 Cx_in_e,
- const Word16 param_band_idx,
- Word32 *mixing_matrix_fx[],
- Word16 *mixing_matrix_e,
- Word32 *mixing_matrix_res_fx[],
- Word16 *mixing_matrix_res_e,
- const Word16 nY_intern, /* i : number of channels in the transported format */
- const PARAM_MC_SYNTHESIS_CONF synth_config, /* i : Parametric MC synthesis config */
- const Word16 nX, /* i : number of transport channels */
- const Word16 nY_cov /* i : number of covariance synthesis output channels */
-);
+static void ivas_param_mc_get_mixing_matrices_fx( PARAM_MC_DEC_HANDLE hParamMC, IVAS_OUTPUT_SETUP *hSynthesisOutputSetup, Word32 Cx_in_fixed[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], Word16 Cx_in_e, const Word16 param_band_idx, Word32 *mixing_matrix_fx[], Word16 *mixing_matrix_e, Word32 *mixing_matrix_res_fx[], Word16 *mixing_matrix_res_e, const Word16 nY_intern, const PARAM_MC_SYNTHESIS_CONF synth_config, const Word16 nX, const Word16 nY_cov );
static Word16 ivas_param_mc_uniform_decoder_fx( Word16 *seq, const Word16 sz_seq, const Word16 *alphabet, const Word16 N, UWord16 bit_buffer[PARAM_MC_MAX_BITS] );
+
static void ivas_param_mc_dec_compute_interpolator_fx( const UWord16 bAttackPresent, const UWord16 attackPos, const UWord16 interp_length, Word16 *interpolator );
static void param_mc_set_num_synth_bands( const Word32 output_Fs, PARAM_MC_DEC_HANDLE hParamMC );
static void ivas_param_mc_get_param_band_mapping( const Word16 n_target_bands, const Word16 *target_band_grouping, const Word16 n_source_bands, const Word16 *source_band_grouping, PARAM_MC_PARAMETER_BAND_MAPPING *parameter_band_mapping );
-
static void ivas_param_mc_bs_decode_parameter_values_fx( UWord16 bit_buffer[], Word16 *bit_pos, const Word16 max_bits, Word16 *BER_detect, HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC, HANDLE_PARAM_MC_PARAMETER_CODING_INFO hParamCodingInfo, const Word16 map_size_wo_lfe, const Word16 map_size, const Word16 num_lfe_bands, const Word16 band_step, const Word16 num_param_bands, Word16 *value_buffer );
+
static void ivas_param_mc_dequantize_cov_fx( PARAM_MC_DEC_HANDLE hParamMC, Word16 *ild_q_fx, Word16 *icc_q_fx, const Word16 param_band_index, const Word16 nY_cov, const PARAM_MC_SYNTHESIS_CONF synth_conf, const Word16 nY_int, const Word16 nX, Word32 *Cx_state_fx, Word16 Cx_state_e, Word32 *Cproto_fx, Word16 Cproto_e, Word32 *Cy_state_fx, Word16 *Cy_state_e );
+
static ivas_error param_mc_get_diff_proto_info_fx( const Word32 *proto_mtx, const UWord16 nchan_transport, const UWord16 nchan_out_cov, PARAM_MC_DIFF_PROTO_INFO *p_diff_proto_info, Word16 Q_proto_mtx );
-static void param_mc_update_mixing_matrices_fx( PARAM_MC_DEC_HANDLE hParamMC, Word32 *mixing_matrix[], Word16 *mixing_matrix_fx, Word32 *mixing_matrix_res[], Word16 *mixing_matrix_res_exp, const UWord16 nX, const UWord16 nY );
+static void param_mc_update_mixing_matrices_fx( PARAM_MC_DEC_HANDLE hParamMC, Word32 *mixing_matrix[], Word16 *mixing_matrix_fx, Word32 *mixing_matrix_res[], Word16 *mixing_matrix_res_exp, const UWord16 nX, const UWord16 nY );
static void param_mc_protoSignalComputation_fx( Word32 *RealBuffer_fx, Word32 *ImagBuffer_fx, Word32 *proto_frame_f_fx, const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, const Word16 num_freq_bands, const Word16 Cldfb_Real_Imag_exp, Word16 *proto_frame_f_fx_q /* Word16 ImagBuffer_fx_e, Word16 *common_e*/ );
@@ -263,7 +251,6 @@ ivas_error ivas_param_mc_dec_open_fx(
ivas_param_mc_metadata_open_fx( mc_ls_setup, ivas_total_brate, hParamMC->hMetadataPMC );
/* init arrays for quantized parameters */
-
IF( ( hParamMC->icc_q_fx = (Word16 *) malloc( hParamMC->hMetadataPMC->num_parameter_bands * hParamMC->hMetadataPMC->icc_mapping_conf->icc_map_size_lfe * sizeof( Word16 ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
@@ -352,6 +339,7 @@ ivas_error ivas_param_mc_dec_open_fx(
}
}
}
+
IF( ( hParamMC->proto_matrix_int_fx = (Word32 *) malloc( nchan_out_transport * nchan_transport * sizeof( Word32 ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC\n" ) );
@@ -508,6 +496,9 @@ ivas_error ivas_param_mc_dec_open_fx(
IF( NE_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
{
Word16 n_cldfb_slots;
+#ifdef NONBE_1303_REND_GRANULARITY
+ Word16 granularity;
+#endif
n_cldfb_slots = DEFAULT_JBM_CLDFB_TIMESLOTS;
move16();
@@ -525,6 +516,7 @@ ivas_error ivas_param_mc_dec_open_fx(
set32_fx( hParamMC->Cldfb_RealBuffer_tc_fx, 0, cldfb_buf_size );
hParamMC->Cldfb_RealBuffer_tc_e = 25; // Q6 , Initialised with Q6 to match non jbm and jbm cases
move16();
+
IF( ( hParamMC->Cldfb_ImagBuffer_tc_fx = (Word32 *) malloc( cldfb_buf_size * sizeof( Word32 ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Parametric MC JBM\n" ) );
@@ -537,7 +529,13 @@ ivas_error ivas_param_mc_dec_open_fx(
IF( st_ivas->hTcBuffer == NULL )
{
+#ifdef NONBE_1303_REND_GRANULARITY
+ granularity = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );
+
+ IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, 0, granularity ) ), IVAS_ERR_OK ) )
+#else
IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, 0, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
+#endif
{
return error;
}
@@ -555,6 +553,7 @@ ivas_error ivas_param_mc_dec_open_fx(
move16();
st_ivas->hParamMC = hParamMC;
+
return error;
}
@@ -620,6 +619,7 @@ static void ivas_param_mc_get_param_band_mapping(
parameter_band_mapping->n_source_bands[target_band_idx] = source_band_in_target_band_cnt;
move16();
}
+
return;
}
@@ -653,6 +653,7 @@ ivas_error ivas_param_mc_dec_reconfig_fx(
hParamMC = st_ivas->hParamMC;
error = IVAS_ERR_OK;
move32();
+
/* save important config information from the previous state */
nchan_transport_old = st_ivas->nchan_transport;
move32();
@@ -712,6 +713,7 @@ ivas_error ivas_param_mc_dec_reconfig_fx(
/*-----------------------------------------------------------------*
* set input parameters
*-----------------------------------------------------------------*/
+
hParamMC->num_freq_bands = shr( add( (Word16) Mpy_32_32( output_Fs, INV_CLDFB_BANDWIDTH_Q31 << 1 ), 1 ), 1 ); // Q0
move16();
hParamMC->max_band_energy_compensation = hParamMC->num_freq_bands;
@@ -828,7 +830,6 @@ ivas_error ivas_param_mc_dec_reconfig_fx(
*-----------------------------------------------------------------*/
/* prototype signal computation */
-
IF( EQ_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
{
IF( NE_16( nchan_transport_old, nchan_transport ) )
@@ -855,8 +856,8 @@ ivas_error ivas_param_mc_dec_reconfig_fx(
Copy32( st_ivas->hLsSetUpConversion->dmxMtx_fx[k], &hParamMC->ls_conv_dmx_matrix_fx[k * nchan_out_cov], nchan_out_cov );
}
}
- /* convert ParamMC parameter bands to SFB */
+ /* convert ParamMC parameter bands to SFB */
st_ivas->hLsSetUpConversion->sfbCnt = hParamMC->num_param_bands_synth;
move16();
FOR( k = 0; k <= hParamMC->num_param_bands_synth; k++ )
@@ -1046,14 +1047,14 @@ ivas_error ivas_param_mc_dec_reconfig_fx(
FOR( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ )
{
/* Cx */
- v_multc_fixed_16( cov_state_old.cx_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_transport_old, nchan_transport_old ) ); // Q(31 - cov_state_old.cx_old_e)
- v_add_fixed_me( tmp_buf_fx, cov_state_old.cx_old_e[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.cx_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cx_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx], imult1616( nchan_transport_old, nchan_transport_old ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx])
+ v_multc_fx_16( cov_state_old.cx_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_transport_old, nchan_transport_old ) ); // Q(31 - cov_state_old.cx_old_e)
+ v_add_fx_me( tmp_buf_fx, cov_state_old.cx_old_e[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.cx_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cx_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx], imult1616( nchan_transport_old, nchan_transport_old ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.cx_old_e[new_param_band_idx])
/* Cy */
- v_multc_fixed_16( cov_state_old.cy_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_out_cov, nchan_out_cov ) ); // Q(31 - cov_state_old.cy_old_e)
- v_add_fixed_me( tmp_buf_fx, cov_state_old.cy_old_e[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.cy_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cy_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx], imult1616( nchan_out_cov, nchan_out_cov ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx])
+ v_multc_fx_16( cov_state_old.cy_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_out_cov, nchan_out_cov ) ); // Q(31 - cov_state_old.cy_old_e)
+ v_add_fx_me( tmp_buf_fx, cov_state_old.cy_old_e[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.cy_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.cy_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx], imult1616( nchan_out_cov, nchan_out_cov ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.cy_old_e[new_param_band_idx])
/* mixing matrix*/
- v_multc_fixed_16( cov_state_old.mixing_matrix_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_transport_old, nchan_out_cov ) ); // Q(31 - mixing_matrix_old_exp)
- v_add_fixed_me( tmp_buf_fx, cov_state_old.mixing_matrix_old_exp[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx], imult1616( nchan_transport_old, nchan_out_cov ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx])
+ v_multc_fx_16( cov_state_old.mixing_matrix_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_transport_old, nchan_out_cov ) ); // Q(31 - mixing_matrix_old_exp)
+ v_add_fx_me( tmp_buf_fx, cov_state_old.mixing_matrix_old_exp[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx], imult1616( nchan_transport_old, nchan_out_cov ), 0 ); // Q(31 - hParamMC->h_output_synthesis_cov_state.mixing_matrix_old_exp[new_param_band_idx])
}
}
FOR( new_param_band_idx = 0; new_param_band_idx < max_param_band_residual; new_param_band_idx++ )
@@ -1061,11 +1062,12 @@ ivas_error ivas_param_mc_dec_reconfig_fx(
FOR( source_param_idx = 0; source_param_idx < parameter_band_mapping.n_source_bands[new_param_band_idx]; source_param_idx++ )
{
/* residual mixing matrix*/
- v_multc_fixed_16( cov_state_old.mixing_matrix_res_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_out_cov, nchan_out_cov ) ); // Q(31 - mixing_matrix_res_old_exp)
- v_add_fixed_me( tmp_buf_fx, cov_state_old.mixing_matrix_res_old_exp[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx], imult1616( nchan_out_cov, nchan_out_cov ), 0 ); // Q(hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx])
+ v_multc_fx_16( cov_state_old.mixing_matrix_res_old_fx[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], parameter_band_mapping.source_band_factor_fx[new_param_band_idx][source_param_idx], tmp_buf_fx, imult1616( nchan_out_cov, nchan_out_cov ) ); // Q(31 - mixing_matrix_res_old_exp)
+ v_add_fx_me( tmp_buf_fx, cov_state_old.mixing_matrix_res_old_exp[parameter_band_mapping.source_band_idx[new_param_band_idx][source_param_idx]], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_fx[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx], hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_fx[new_param_band_idx], &hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx], imult1616( nchan_out_cov, nchan_out_cov ), 0 ); // Q(hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_old_exp[new_param_band_idx])
}
}
}
+
ivas_dirac_dec_output_synthesis_cov_close_fx( ¶ms_old, &cov_state_old );
}
@@ -1084,7 +1086,6 @@ ivas_error ivas_param_mc_dec_reconfig_fx(
set_zero_fx( hParamMC->proto_frame_f_fx, shl( imult1616( hParamMC->diff_proto_info->num_protos_diff, hParamMC->num_freq_bands ), 1 ) );
}
-
IF( NE_16( nchan_transport_old, nchan_transport ) )
{
IF( NE_16( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
@@ -1135,6 +1136,7 @@ ivas_error ivas_param_mc_dec_reconfig_fx(
}
}
}
+
return error;
}
@@ -1252,6 +1254,7 @@ void ivas_param_mc_dec_close_fx(
free( hParamMC->diff_proto_info );
hParamMC->diff_proto_info = NULL;
}
+
/* States */
/* free prototype signal buffers */
IF( hParamMC->proto_frame_f_fx != NULL )
@@ -1513,350 +1516,93 @@ void ivas_param_mc_dec_read_BS_fx(
*------------------------------------------------------------------------*/
void ivas_param_mc_dec_digest_tc_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord8 nCldfbSlots, /* i : number of CLFBS slots in the transport channels */
- Word32 *transport_channels_f_fx[],
- Word16 transport_f_e )
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord8 nCldfbSlots, /* i : number of CLDFB slots in transport channels */
+ Word32 *p_data_fx[], /* i/o: synthesized core-coder transport channels/DirAC output */
+ const Word16 q_data /* i : Q-factor of input signal for single channel */
+)
{
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ Word16 ch, num_freq_bands, slot_idx, cldfb_ch, n_ch_cldfb;
+ Word32 *cldfb_real_buffer, *cldfb_imag_buffer;
+#else
PARAM_MC_DEC_HANDLE hParamMC;
-#ifdef OBJ_EDITING_API
Word16 ch, slot_idx;
Word16 nchan_transport;
-#else
- Word16 i, ch;
- Word16 is_next_band, skip_next_band;
- Word16 slot_idx, param_band_idx;
- Word16 nchan_transport, nchan_out_transport, nchan_out_cldfb;
- Word16 nchan_out_cov;
-#endif
+
/*CLDFB*/
hParamMC = st_ivas->hParamMC;
assert( hParamMC );
-#ifndef OBJ_EDITING_API
- Word32 *pCx, *pCx_imag;
- Word32 cx_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - cx_e)
- Word32 cx_imag_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - cx_imag_e)
- Word32 cx_next_band_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - cx_next_band_e)
- Word32 cx_imag_next_band_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - cx_imag_next_band_e)
- Word32 real_part_fx, imag_part_fx, L_tmp1, L_tmp2;
-
- Word16 cx_buff_e[2][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
- Word16 cx_e;
- Word16 cx_imag_e, tmp_e;
- Word16 cx_imag_next_band_e, cx_next_band_e;
-
- Word16 max_e;
-
- /* format converter */
- Word16 channel_active[MAX_OUTPUT_CHANNELS];
- IVAS_OUTPUT_SETUP *hSynthesisOutputSetup;
#endif
- Word16 qout = 0;
+ Word16 q_out = 0;
move16();
-
- push_wmops( "param_mc_dec_digest_tc" );
-
-#ifndef OBJ_EDITING_API
- set16_fx( channel_active, 0, MAX_CICP_CHANNELS );
-#endif
- nchan_transport = st_ivas->nchan_transport;
+ /* Initialization */
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ num_freq_bands = st_ivas->hParamMC->num_freq_bands;
move16();
+ n_ch_cldfb = sub( st_ivas->hTcBuffer->nchan_transport_jbm, st_ivas->hTcBuffer->nchan_buffer_full );
-#ifndef OBJ_EDITING_API
- nchan_out_transport = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
-
- test();
- test();
- IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
- {
- nchan_out_cldfb = BINAURAL_CHANNELS;
- move16();
- set16_fx( channel_active, 1, nchan_out_cldfb );
- nchan_out_cov = add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe );
- hSynthesisOutputSetup = &st_ivas->hTransSetup;
- }
- ELSE IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_CLDFB ) )
- {
- nchan_out_cov = nchan_out_transport;
- move16();
- nchan_out_cldfb = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
- hSynthesisOutputSetup = &st_ivas->hTransSetup;
- }
- ELSE IF( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
- {
- nchan_out_cov = add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe );
- nchan_out_cldfb = nchan_out_cov;
- move16();
- set16_fx( channel_active, 1, nchan_out_cov );
- hSynthesisOutputSetup = &st_ivas->hOutSetup;
- }
- ELSE
- {
- nchan_out_cov = nchan_out_transport;
- move16();
- nchan_out_cldfb = nchan_out_transport;
- move16();
- set16_fx( channel_active, 1, nchan_out_cov );
- hSynthesisOutputSetup = &st_ivas->hTransSetup;
- }
-
- /* adapt transient position */
- IF( hParamMC->hMetadataPMC->bAttackPresent )
- {
- hParamMC->hMetadataPMC->attackIndex = s_max( 0, add( hParamMC->hMetadataPMC->attackIndex, shr( sub( nCldfbSlots, DEFAULT_JBM_CLDFB_TIMESLOTS ), 1 ) ) );
- move16();
- }
- /* adapt subframes */
- hParamMC->num_slots = nCldfbSlots;
- move16();
- hParamMC->slots_rendered = 0;
- move16();
- hParamMC->subframes_rendered = 0;
- move16();
- ivas_jbm_dec_get_adapted_subframes( nCldfbSlots, hParamMC->subframe_nbslots, &hParamMC->nb_subframes );
- st_ivas->hTcBuffer->nb_subframes = hParamMC->nb_subframes;
+ cldfb_real_buffer = st_ivas->hParamMC->Cldfb_RealBuffer_tc_fx;
+ cldfb_imag_buffer = st_ivas->hParamMC->Cldfb_ImagBuffer_tc_fx;
+#else
+ nchan_transport = st_ivas->nchan_transport;
move16();
- Copy( hParamMC->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, hParamMC->nb_subframes );
-
- ivas_param_mc_dec_compute_interpolator_fx( hParamMC->hMetadataPMC->bAttackPresent, hParamMC->hMetadataPMC->attackIndex, nCldfbSlots, hParamMC->h_output_synthesis_params.interpolator_fx );
-
- /* loop over two bands at a time */
- FOR( param_band_idx = 0; param_band_idx < hParamMC->num_param_bands_synth; param_band_idx += 2 )
- {
- /* don't process next band if it exceeds the limit */
- skip_next_band = ( ( param_band_idx + 1 ) == hParamMC->num_param_bands_synth ) ? 1 : 0;
-
- set_zero_fx( cx_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
- set_zero_fx( cx_imag_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
- set_zero_fx( cx_next_band_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
- set_zero_fx( cx_imag_next_band_fx, PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );
-
- cx_e = 0;
- move16();
- cx_imag_e = 0;
- move16();
- cx_next_band_e = 0;
- move16();
- cx_imag_next_band_e = 0;
- move16();
#endif
- /* slot loop for gathering the input data */
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ /* CLDFB Analysis */
+ FOR( ( ch = 0, cldfb_ch = 0 ); cldfb_ch < n_ch_cldfb; ( cldfb_ch++, ch++ ) )
+ {
FOR( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )
{
- IF( st_ivas->hDecoderConfig->Opt_tsm )
- {
-#ifndef OBJ_EDITING_API
- IF( param_band_idx == 0 ) /* only run cldfbAna once */
- {
-#endif
- Word32 RealBuffer_fx[CLDFB_NO_CHANNELS_MAX];
- Word32 ImagBuffer_fx[CLDFB_NO_CHANNELS_MAX];
-
- /* CLDFB Analysis*/
- FOR( ch = 0; ch < nchan_transport; ch++ )
- {
- qout = transport_f_e;
- move16();
- cldfbAnalysis_ts_fx_fixed_q( &( transport_channels_f_fx[ch][hParamMC->num_freq_bands * slot_idx] ), RealBuffer_fx, ImagBuffer_fx, hParamMC->num_freq_bands, st_ivas->cldfbAnaDec[ch], &qout );
-
- Copy32( RealBuffer_fx, &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );
- Copy32( ImagBuffer_fx, &hParamMC->Cldfb_ImagBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );
- }
-
- hParamMC->Cldfb_ImagBuffer_tc_e = qout;
- move16();
-#ifndef OBJ_EDITING_API
- }
-#endif
- }
-
-#ifndef OBJ_EDITING_API
- IF( GE_16( slot_idx, shl( hParamMC->hMetadataPMC->attackIndex, 1 ) ) )
- {
- FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
- {
- test();
- IF( is_next_band && skip_next_band )
- {
- CONTINUE;
- }
- IF( is_next_band )
- {
- ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx( &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
- /*hParamMC->Cldfb_RealBuffer_tc_e*/ Q31 - Q6,
- &hParamMC->Cldfb_ImagBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
- /*hParamMC->Cldfb_ImagBuffer_tc_e*/ Q31 - Q6,
- cx_next_band_fx,
- &cx_next_band_e,
- cx_imag_next_band_fx,
- &cx_imag_next_band_e,
- hParamMC,
- add( param_band_idx, is_next_band ),
- nchan_transport );
- }
- ELSE
- {
- ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx( &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
- /*hParamMC->Cldfb_RealBuffer_tc_e*/ Q31 - Q6,
- &hParamMC->Cldfb_ImagBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
- /*hParamMC->Cldfb_ImagBuffer_tc_e*/ Q31 - Q6,
- cx_fx,
- &cx_e,
- cx_imag_fx,
- &cx_imag_e,
- hParamMC,
- add( param_band_idx, is_next_band ),
- nchan_transport );
- }
- }
- }
-#endif
- }
-
-#ifndef OBJ_EDITING_API
- Word16 tmp_cx_e, tmp_cx_imag_e;
- /* map from complex input covariance to real values */
- FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
- {
- test();
- IF( is_next_band && skip_next_band )
- {
- CONTINUE;
- }
- /* Cx for transport channels */
- IF( is_next_band )
- {
- pCx = &cx_next_band_fx[0];
- pCx_imag = &cx_imag_next_band_fx[0];
- tmp_cx_e = cx_next_band_e;
- tmp_cx_imag_e = cx_imag_next_band_e;
- }
- ELSE
- {
- pCx = &cx_fx[0];
- pCx_imag = &cx_imag_fx[0];
- tmp_cx_e = cx_e;
- tmp_cx_imag_e = cx_imag_e;
- }
+ q_out = q_data;
+ move16();
- FOR( i = 0; i < nchan_transport * nchan_transport; i++ )
- {
- real_part_fx = pCx[i]; // Q(31 - cx_buff_e)
- imag_part_fx = pCx_imag[i];
- move32();
- move32();
- cx_buff_e[is_next_band][i] = tmp_cx_e;
- move16();
- /* (a-ib)(c+id) = ac + bd + i(ad-bc) */
- IF( LT_16( param_band_idx, hParamMC->max_param_band_abs_cov ) )
- {
- L_tmp1 = Mpy_32_32( real_part_fx, real_part_fx );
- L_tmp2 = Mpy_32_32( imag_part_fx, imag_part_fx );
- L_tmp1 = BASOP_Util_Add_Mant32Exp( L_tmp1, add( tmp_cx_e, tmp_cx_e ), L_tmp2, add( tmp_cx_imag_e, tmp_cx_imag_e ), &tmp_e );
- pCx[i] = Sqrt32( L_tmp1, &tmp_e );
- move32();
- cx_buff_e[is_next_band][i] = tmp_e;
- move16();
- }
- ELSE
- {
- pCx[i] = real_part_fx;
- move32();
- cx_buff_e[is_next_band][i] = tmp_cx_e;
- move16();
- }
- }
+ cldfbAnalysis_ts_fx_fixed_q( &( p_data_fx[ch][num_freq_bands * slot_idx] ),
+ &cldfb_real_buffer[slot_idx * num_freq_bands * n_ch_cldfb + cldfb_ch * num_freq_bands],
+ &cldfb_imag_buffer[slot_idx * num_freq_bands * n_ch_cldfb + cldfb_ch * num_freq_bands],
+ num_freq_bands, st_ivas->cldfbAnaDec[cldfb_ch], &q_out );
}
- max_e = cx_buff_e[0][0];
- move16();
-
- /* Cx for transport channels */
- FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
+ IF( st_ivas->hDecoderConfig->Opt_tsm )
{
- FOR( i = 0; i < imult1616( nchan_transport, nchan_transport ); i++ )
- {
-
- IF( LT_16( max_e, cx_buff_e[is_next_band][i] ) )
- {
- max_e = cx_buff_e[is_next_band][i];
- }
- }
+ st_ivas->hParamMC->Cldfb_ImagBuffer_tc_e = q_out;
+ move16();
}
- /* Cx for transport channels */
- FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
+ }
+#else
+ /* slot loop for gathering the input data */
+ FOR( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )
+ {
+ IF( st_ivas->hDecoderConfig->Opt_tsm )
{
- FOR( i = 0; i < imult1616( nchan_transport, nchan_transport ); i++ )
- {
- if ( is_next_band == 0 )
- {
- cx_fx[i] = L_shr( cx_fx[i], sub( max_e, cx_buff_e[is_next_band][i] ) );
- }
- else
- {
- cx_next_band_fx[i] = L_shr( cx_next_band_fx[i], sub( max_e, cx_buff_e[is_next_band][i] ) );
- }
- move32();
- }
- }
- cx_e = max_e;
- move16();
-
-
- /* we have to do it similar to the encoder in case of attacks (i.e. accumulate two bands) to ensure correct DMX of the target covariance*/
+ Word32 RealBuffer_fx[CLDFB_NO_CHANNELS_MAX];
+ Word32 ImagBuffer_fx[CLDFB_NO_CHANNELS_MAX];
- test();
- test();
- IF( hParamMC->hMetadataPMC->bAttackPresent && ( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) ) )
- {
- Word16 len = imult1616( nchan_transport, nchan_transport );
- Word16 sc = s_min( getScaleFactor32( cx_fx, len ), getScaleFactor32( cx_next_band_fx, len ) );
- IF( EQ_16( sc, 0 ) )
+ /* CLDFB Analysis*/
+ FOR( ch = 0; ch < nchan_transport; ch++ )
{
- Scale_sig32( cx_fx, len, -Q1 ); // add one bit head room
- Scale_sig32( cx_next_band_fx, len, -Q1 ); // add one bit head room
- cx_e = add( cx_e, Q1 );
- cx_next_band_e = add( cx_e, Q1 );
- }
- v_add_fx( cx_fx, cx_next_band_fx, cx_fx, len );
- Copy32( cx_fx, cx_next_band_fx, len );
- }
+ q_out = q_data;
+ move16();
+ cldfbAnalysis_ts_fx_fixed_q( &( p_data_fx[ch][hParamMC->num_freq_bands * slot_idx] ), RealBuffer_fx, ImagBuffer_fx, hParamMC->num_freq_bands, st_ivas->cldfbAnaDec[ch], &q_out );
- FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
- {
- test();
- IF( is_next_band && skip_next_band )
- {
- CONTINUE;
+ Copy32( RealBuffer_fx, &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );
+ Copy32( ImagBuffer_fx, &hParamMC->Cldfb_ImagBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport + ch * hParamMC->num_freq_bands], hParamMC->num_freq_bands );
}
- IF( NE_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) )
- {
- IF( is_next_band )
- {
-
- ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_next_band_fx, cx_e, add( param_band_idx, is_next_band ), hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov );
- }
- ELSE
- {
-
- ivas_param_mc_get_mixing_matrices_fx( hParamMC, hSynthesisOutputSetup, cx_fx, cx_e, add( param_band_idx, is_next_band ), hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_out_transport, hParamMC->synthesis_conf, nchan_transport, nchan_out_cov );
- }
- }
+ hParamMC->Cldfb_ImagBuffer_tc_e = q_out;
+ move16();
}
}
#endif
- pop_wmops();
return;
}
-#ifdef OBJ_EDITING_API
/*-------------------------------------------------------------------------
* ivas_param_mc_dec_prepare_renderer()
*
@@ -1864,8 +1610,8 @@ void ivas_param_mc_dec_digest_tc_fx(
*------------------------------------------------------------------------*/
void ivas_param_mc_dec_prepare_renderer(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord8 nCldfbSlots /* i : number of CLFBS slots in the transport channels */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord8 nCldfbSlots /* i : number of CLDFB slots in transport channels */
)
{
Word16 i;
@@ -1874,21 +1620,18 @@ void ivas_param_mc_dec_prepare_renderer(
Word16 nchan_transport, nchan_out_transport, nchan_out_cldfb;
Word16 nchan_out_cov;
PARAM_MC_DEC_HANDLE hParamMC;
-
+ /*CLDFB*/
Word32 *pCx, *pCx_imag;
Word32 cx_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - cx_e)
Word32 cx_imag_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - cx_imag_e)
Word32 cx_next_band_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - cx_next_band_e)
Word32 cx_imag_next_band_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS]; // Q(31 - cx_imag_next_band_e)
Word32 real_part_fx, imag_part_fx, L_tmp1, L_tmp2;
-
Word16 cx_buff_e[2][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
Word16 cx_e;
Word16 cx_imag_e, tmp_e;
Word16 cx_imag_next_band_e, cx_next_band_e;
-
Word16 max_e;
-
/* format converter */
Word16 channel_active[MAX_OUTPUT_CHANNELS];
IVAS_OUTPUT_SETUP *hSynthesisOutputSetup;
@@ -1944,6 +1687,7 @@ void ivas_param_mc_dec_prepare_renderer(
hParamMC->hMetadataPMC->attackIndex = s_max( 0, add( hParamMC->hMetadataPMC->attackIndex, shr( sub( nCldfbSlots, DEFAULT_JBM_CLDFB_TIMESLOTS ), 1 ) ) );
move16();
}
+
/* adapt subframes */
hParamMC->num_slots = nCldfbSlots;
move16();
@@ -1990,6 +1734,7 @@ void ivas_param_mc_dec_prepare_renderer(
{
CONTINUE;
}
+
IF( is_next_band )
{
ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot_fx( &hParamMC->Cldfb_RealBuffer_tc_fx[slot_idx * hParamMC->num_freq_bands * nchan_transport],
@@ -2021,6 +1766,7 @@ void ivas_param_mc_dec_prepare_renderer(
}
}
}
+
Word16 tmp_cx_e, tmp_cx_imag_e;
/* map from complex input covariance to real values */
FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
@@ -2090,6 +1836,7 @@ void ivas_param_mc_dec_prepare_renderer(
}
}
}
+
/* Cx for transport channels */
FOR( is_next_band = 0; is_next_band < 2; is_next_band++ )
{
@@ -2109,9 +1856,7 @@ void ivas_param_mc_dec_prepare_renderer(
cx_e = max_e;
move16();
-
/* we have to do it similar to the encoder in case of attacks (i.e. accumulate two bands) to ensure correct DMX of the target covariance*/
-
test();
test();
IF( hParamMC->hMetadataPMC->bAttackPresent && ( EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_LS_CONV_COV ) || EQ_32( hParamMC->synthesis_conf, PARAM_MC_SYNTH_MONO_STEREO ) ) )
@@ -2152,13 +1897,15 @@ void ivas_param_mc_dec_prepare_renderer(
}
}
}
+
+ return;
}
-#endif
+
/*-------------------------------------------------------------------------
- * ivas_param_mc_dec()
+ * ivas_param_mc_dec_render()
*
- * Parametric MC decoding process
+ * Parametric MC rendering process
*------------------------------------------------------------------------*/
void ivas_param_mc_dec_render_fx(
@@ -2166,7 +1913,7 @@ void ivas_param_mc_dec_render_fx(
const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
UWord16 *nSamplesAvailableNext, /* o : number of CLDFB slots still to render */
- Word32 *output_f_fx[], /* o : rendered time signal Q11*/
+ Word32 *output_fx[], /* o : rendered time signal Q11*/
Word16 channel_active_fx[MAX_OUTPUT_CHANNELS] )
{
PARAM_MC_DEC_HANDLE hParamMC;
@@ -2175,20 +1922,18 @@ void ivas_param_mc_dec_render_fx(
Word16 slot_idx, slot_idx_start, slot_idx_start_cldfb_synth, first_sf, last_sf, slots_to_render;
Word16 nchan_transport, nchan_out_transport, nchan_out_cldfb;
Word16 nchan_out_cov;
-
/*CLDFB*/
Word32 Cldfb_RealBuffer_fx[MAX_INTERN_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
Word32 Cldfb_ImagBuffer_fx[MAX_INTERN_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
Word32 Cldfb_RealBuffer_Binaural_fx[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
Word32 Cldfb_ImagBuffer_Binaural_fx[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][PARAM_MC_MAX_NSLOTS_IN_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
- Word32 *p_output_f_fx[MAX_OUTPUT_CHANNELS];
+ Word32 *p_output_fx[MAX_OUTPUT_CHANNELS];
FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
{
- p_output_f_fx[i] = output_f_fx[i]; // Q11
+ p_output_fx[i] = output_fx[i]; // Q11
}
/*Decorrelator*/
Word32 onset_filter_fx[MAX_CICP_CHANNELS * CLDFB_NO_CHANNELS_MAX]; // Q31
-
/* format converter */
Word16 channel_active[MAX_OUTPUT_CHANNELS];
UWord16 nband_synth;
@@ -2310,6 +2055,7 @@ void ivas_param_mc_dec_render_fx(
/*-----------------------------------------------------------------*
* protoype signal computation
*-----------------------------------------------------------------*/
+
param_mc_protoSignalComputation_fx( &hParamMC->Cldfb_RealBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands],
&hParamMC->Cldfb_ImagBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands],
hParamMC->proto_frame_f_fx, hParamMC->diff_proto_info,
@@ -2317,8 +2063,8 @@ void ivas_param_mc_dec_render_fx(
/*-----------------------------------------------------------------*
* frequency domain decorrelation
*-----------------------------------------------------------------*/
- /* decorrelate prototype frame */
+ /* decorrelate prototype frame */
ivas_dirac_dec_decorr_process_fx( hParamMC->num_freq_bands,
hParamMC->num_outputs_diff,
hParamMC->diff_proto_info->num_protos_diff,
@@ -2353,6 +2099,7 @@ void ivas_param_mc_dec_render_fx(
/*-----------------------------------------------------------------*
* output synthesis
*-----------------------------------------------------------------*/
+
ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot_fx(
&hParamMC->Cldfb_RealBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands],
&hParamMC->Cldfb_ImagBuffer_tc_fx[hParamMC->slots_rendered * nchan_transport * hParamMC->num_freq_bands], Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, slot_idx, add( slot_idx, slot_idx_start ),
@@ -2405,8 +2152,8 @@ void ivas_param_mc_dec_render_fx(
FOR( idx_lfe = 0; idx_lfe < hLsSetup.num_lfe; idx_lfe++ )
{
/* Copy just the first band of LFE*/
- v_multc_fixed_16( Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], tmp, Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1 );
- v_multc_fixed_16( Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], tmp, Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1 );
+ v_multc_fx_16( Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], tmp, Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1 );
+ v_multc_fx_16( Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], tmp, Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1 );
Scale_sig32( Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1, tmp_exp );
Scale_sig32( Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], 1, tmp_exp );
@@ -2414,8 +2161,8 @@ void ivas_param_mc_dec_render_fx(
{
IF( hLsSetup.index_lfe[idx_lfe] != ch )
{
- v_add_fixed_no_hdrm( Cldfb_RealBuffer_fx[ch][slot_idx], Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_RealBuffer_fx[ch][slot_idx], 1 );
- v_add_fixed_no_hdrm( Cldfb_ImagBuffer_fx[ch][slot_idx], Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_ImagBuffer_fx[ch][slot_idx], 1 );
+ v_add_fx_no_hdrm( Cldfb_RealBuffer_fx[ch][slot_idx], Cldfb_RealBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_RealBuffer_fx[ch][slot_idx], 1 );
+ v_add_fx_no_hdrm( Cldfb_ImagBuffer_fx[ch][slot_idx], Cldfb_ImagBuffer_fx[hLsSetup.index_lfe[idx_lfe]][slot_idx], Cldfb_ImagBuffer_fx[ch][slot_idx], 1 );
}
}
}
@@ -2520,7 +2267,6 @@ void ivas_param_mc_dec_render_fx(
ivas_lssetupconversion_process_param_mc_fx( st_ivas, hParamMC->subframe_nbslots[subframe_idx], Cldfb_RealBuffer_fx, Cldfb_ImagBuffer_fx, channel_active );
}
-
/* CLDFB synthesis */
FOR( ch = 0; ch < nchan_out_cldfb; ch++ )
{
@@ -2545,27 +2291,27 @@ void ivas_param_mc_dec_render_fx(
}
Word16 len = add( imult1616( slot_idx_start_cldfb_synth, hParamMC->num_freq_bands ), imult1616( hParamMC->num_freq_bands, hParamMC->subframe_nbslots[subframe_idx] ) );
- scale_sig32( output_f_fx[ch], len, 5 - 11 );
- cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_f_fx[ch][slot_idx_start_cldfb_synth * hParamMC->num_freq_bands] ),
+ scale_sig32( output_fx[ch], len, 5 - 11 );
+ cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch][slot_idx_start_cldfb_synth * hParamMC->num_freq_bands] ),
imult1616( hParamMC->num_freq_bands, hParamMC->subframe_nbslots[subframe_idx] ), 0, 0, st_ivas->cldfbSynDec[ch] );
- scale_sig32( output_f_fx[ch], len, 11 - 5 ); // Q11
+ scale_sig32( output_fx[ch], len, 11 - 5 ); // Q11
}
ELSE
{
- set32_fx( &( output_f_fx[ch][slot_idx_start_cldfb_synth * hParamMC->num_freq_bands] ), 0, imult1616( hParamMC->num_freq_bands, hParamMC->subframe_nbslots[subframe_idx] ) );
+ set32_fx( &( output_fx[ch][slot_idx_start_cldfb_synth * hParamMC->num_freq_bands] ), 0, imult1616( hParamMC->num_freq_bands, hParamMC->subframe_nbslots[subframe_idx] ) );
}
}
slot_idx_start = add( slot_idx_start, hParamMC->subframe_nbslots[subframe_idx] );
slot_idx_start_cldfb_synth = add( slot_idx_start_cldfb_synth, hParamMC->subframe_nbslots[subframe_idx] );
}
+
IF( EQ_16( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )
{
- ivas_mc2sba_fx( st_ivas->hIntSetup, p_output_f_fx, p_output_f_fx, *nSamplesRendered, st_ivas->hOutSetup.ambisonics_order, 0 );
+ ivas_mc2sba_fx( st_ivas->hIntSetup, p_output_fx, p_output_fx, *nSamplesRendered, st_ivas->hOutSetup.ambisonics_order, 0 );
}
/* update */
-
IF( EQ_16( hParamMC->slots_rendered, hParamMC->num_slots ) )
{
hParamMC->hMetadataPMC->last_coded_bwidth = hParamMC->hMetadataPMC->coded_bwidth;
@@ -2573,7 +2319,6 @@ void ivas_param_mc_dec_render_fx(
param_mc_update_mixing_matrices_fx( hParamMC, hParamMC->h_output_synthesis_cov_state.mixing_matrix_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_exp, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_fx, hParamMC->h_output_synthesis_cov_state.mixing_matrix_res_exp, nchan_transport, nchan_out_cov );
}
-
hParamMC->subframes_rendered = last_sf;
move16();
*nSamplesAvailableNext = imult1616( sub( hParamMC->num_slots, hParamMC->slots_rendered ), NS2SA_FX2( output_Fs, CLDFB_SLOT_NS ) );
@@ -2679,7 +2424,6 @@ static void param_mc_protoSignalComputation_fx(
set32_fx( proto_frame_f_fx, 0, shl( imult1616( num_freq_bands, diff_proto_info->num_protos_diff ), 1 ) );
-
FOR( proto_ch_idx = 0; proto_ch_idx < diff_proto_info->num_protos_diff; proto_ch_idx++ )
{
Word16 num_source_ch = diff_proto_info->num_source_chan_diff[proto_ch_idx];
@@ -2700,7 +2444,6 @@ static void param_mc_protoSignalComputation_fx(
FOR( band = 0; band < num_freq_bands; band++ )
{
-
Word32 tmp_x = L_shl( Mpy_32_32( fac_fx, ( *( p_real_buffer_fx++ ) ) ), 4 ); // Q(26 + 4 + 6 - 31) :: Q5
*( p_proto_frame_fx ) = L_add( *( p_proto_frame_fx ), tmp_x );
@@ -2739,6 +2482,7 @@ static void ivas_param_mc_dec_copy_diffuse_proto(
Word16 k, l;
Word16 num_freq_bands, num_freq_bands_diff;
Word32 *p_proto_diff_fx;
+
num_freq_bands = hParamMC->num_freq_bands;
move16();
num_freq_bands_diff = hParamMC->h_output_synthesis_params.max_band_decorr;
@@ -2785,11 +2529,13 @@ static Word16 ivas_param_mc_bin2dec_fx(
return out;
}
+
/*-------------------------------------------------------------------------
* ivas_param_mc_uniform_decoder()
*
* decode a uniformily coded sequence of float values
*------------------------------------------------------------------------*/
+
static Word16 ivas_param_mc_uniform_decoder_fx(
Word16 *seq, /* o : decoded sequence of float values hParamCodingInfo -> Q-quant*/
const Word16 sz_seq, /* i : number of values to decode */
@@ -2824,6 +2570,7 @@ static Word16 ivas_param_mc_uniform_decoder_fx(
*
* decode a sequency of inidices coded with a range coder
*------------------------------------------------------------------------*/
+
static Word16 ivas_param_mc_range_decoder_LC_fx(
UWord16 *bit_buffer, /* i : bit buffer to read from */
Word16 *x, /* o : decoded indices */
@@ -2880,6 +2627,7 @@ static Word16 ivas_param_mc_range_decoder_LC_fx(
return cur_bit_pos;
}
+
/*-------------------------------------------------------------------------
* param_mc_compute_interpolator()
*
@@ -2992,12 +2740,9 @@ static void ivas_param_mc_get_mixing_matrices_fx(
Word16 ch_idx1, ch_idx2, lfe_idx1, lfe_idx2;
Word16 remove_lfe;
Word16 lfe_indices[PARAM_MC_LOCAL_SZ_LFE_MAP];
-
Word32 Cx_fx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS];
Word32 Cy_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
-
Word32 Cy_full_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
-
Word32 Cr_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - Cr_e)
Word16 Cr_e;
Word32 Cy_diag_fx[MAX_OUTPUT_CHANNELS]; // Q(31 - Cy_diag_buff_e)
@@ -3017,19 +2762,14 @@ static void ivas_param_mc_get_mixing_matrices_fx(
Word16 mixing_matrix_res_local_e;
Word32 L_tmp;
Word16 tmp_e, tmp;
-
Word16 proto_matrix_e = hParamMC->h_output_synthesis_params.proto_matrix_e;
move16();
Word32 proto_matrix_noLFE_fx[PARAM_MC_MAX_TRANSPORT_CHANS * MAX_CICP_CHANNELS]; // Q(31 - proto_matrix_noLFE_e)
-
- Word32 mat_mult_buffer1_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - mat_mult_buffer1_e)
-
- Word32 Cproto_diag_fx[MAX_CICP_CHANNELS]; // Q(31 - Cproto_diag_e)
+ Word32 mat_mult_buffer1_fx[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS]; // Q(31 - mat_mult_buffer1_e)
+ Word32 Cproto_diag_fx[MAX_CICP_CHANNELS]; // Q(31 - Cproto_diag_e)
Word16 mat_mult_buffer1_e, proto_matrix_ptr_e, Cproto_diag_e;
-
Word32 *ptrMM_fx;
Word32 *ptrMM_out_fx;
-
Word16 Cy_e, Cx_e;
Word16 Cy_full_e;
Word16 new_e = 0;
@@ -3095,6 +2835,7 @@ static void ivas_param_mc_get_mixing_matrices_fx(
num_lfe_bands = PARAM_MC_MAX_BAND_LFE;
move16();
}
+
IF( hSynthesisOutputSetup->num_lfe > 0 && param_band_idx >= num_lfe_bands )
{
remove_lfe = 1;
@@ -3120,10 +2861,8 @@ static void ivas_param_mc_get_mixing_matrices_fx(
Cx_old_state_fx = hParamMC->h_output_synthesis_cov_state.cx_old_fx[param_band_idx];
Cy_old_state_fx = hParamMC->h_output_synthesis_cov_state.cy_old_fx[param_band_idx];
-
/* Getting mixing mtx */
/* estimate target cov from input cov and proto_matrix */
-
Cx_state_e = Cx_in_e;
move16();
matrix_product_fx( hParamMC->proto_matrix_int_fx, nY_intern, nX, 0, Cx_state_fx, nX, nX, 0, mat_mult_buffer1_fx );
@@ -3153,8 +2892,6 @@ static void ivas_param_mc_get_mixing_matrices_fx(
nY_intern,
nX, Cx_state_fx, Cx_state_e, Cproto_fx, Cproto_e, Cy_state_fx, &Cy_state_e );
- // dbgwrite2_txt(Cy_state_fx,nY_intern*nY_intern,"../cy_state_fx.txt");
-
/* Smoothing: Sum over two buffers */
IF( hParamMC->hMetadataPMC->bAttackPresent )
{
@@ -3169,10 +2906,8 @@ static void ivas_param_mc_get_mixing_matrices_fx(
ELSE
{
/* smoothing gains are now identical to one, simply add up */
- // v_add( Cy_state, Cy_old_state, Cy_full, nY_cov * nY_cov );
-
- v_add_fixed_me( Cx_state_fx, Cx_state_e, Cx_old_state_fx, hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx], Cx_fx, &Cx_e, imult1616( nX, nX ), 1 );
- v_add_fixed_me( Cy_state_fx, Cy_state_e, Cy_old_state_fx, hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx], Cy_full_fx, &Cy_full_e, imult1616( nY_cov, nY_cov ), 1 );
+ v_add_fx_me( Cx_state_fx, Cx_state_e, Cx_old_state_fx, hParamMC->h_output_synthesis_cov_state.cx_old_e[param_band_idx], Cx_fx, &Cx_e, imult1616( nX, nX ), 1 );
+ v_add_fx_me( Cy_state_fx, Cy_state_e, Cy_old_state_fx, hParamMC->h_output_synthesis_cov_state.cy_old_e[param_band_idx], Cy_full_fx, &Cy_full_e, imult1616( nY_cov, nY_cov ), 1 );
}
Copy32( Cx_state_fx, Cx_old_state_fx, imult1616( nX, nX ) );
@@ -3216,7 +2951,6 @@ static void ivas_param_mc_get_mixing_matrices_fx(
/* remove LFE IF necessary */
IF( remove_lfe )
{
-
Cy_e = Cy_full_e;
remove_lfe_from_cy_fx( nY_cov, lfe_indices, hSynthesisOutputSetup->num_lfe, Cy_full_fx, Cy_fx );
}
@@ -3233,7 +2967,6 @@ static void ivas_param_mc_get_mixing_matrices_fx(
matrix_product_diag_fx( mat_mult_buffer1_fx, mat_mult_buffer1_e, nY_band, nX, 0, proto_matrix_ptr_fx, proto_matrix_ptr_e, nY_band, nX, 1, Cproto_diag_fx, &Cproto_diag_e );
/* make sure we have no negative entries in Cproto_diag due to rounding errors */
-
FOR( ch_idx1 = 0; ch_idx1 < nY_band; ch_idx1++ )
{
if ( Cproto_diag_fx[ch_idx1] < 0 )
@@ -3243,13 +2976,13 @@ static void ivas_param_mc_get_mixing_matrices_fx(
}
}
-
/* Computing the mixing matrices */
/* bands with decorr */
IF( LT_16( brange[0], hParamMC->h_output_synthesis_params.max_band_decorr ) )
{
computeMixingMatrices_fx( nX, nY_band, Cx_fx, Cx_e, Cy_fx, Cy_e, proto_matrix_ptr_fx, proto_matrix_ptr_e, 0, PARAM_MC_REG_SX_FX, 0, PARAM_MC_REG_GHAT_FX, 0, mixing_matrix_local_fx, &mixing_matrix_local_e, Cr_fx, &Cr_e );
+
/* Compute mixing matrix FOR residual */
computeMixingMatricesResidual_fx( nY_band, Cproto_diag_fx, Cproto_diag_e, Cr_fx, Cr_e, PARAM_MC_REG_SX_FX, 0, PARAM_MC_REG_GHAT_FX, 0, mixing_matrix_res_local_fx, &mixing_matrix_res_local_e );
@@ -3424,13 +3157,6 @@ static void param_mc_update_mixing_matrices_fx(
* generate the target covariance matrix
*------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------
- * ivas_param_mc_dequantize_cov_fx()
- *
- * generate the target covariance matrix
- *------------------------------------------------------------------------*/
-
static void ivas_param_mc_dequantize_cov_fx(
PARAM_MC_DEC_HANDLE hParamMC, /* i : Parametric MC handle */
Word16 *ild_q_fx, /* i : sequence of dequantized ILD values Q8 */
@@ -3504,7 +3230,6 @@ static void ivas_param_mc_dequantize_cov_fx(
}
/* estimate ICCs from estimated Cproto */
-
FOR( k = 0; k < nY_int; k++ )
{
// a_fx[k] = 1.f / ( sqrtf( Cproto_fx[k + nY_int * k] ) + EPSILON );
@@ -3639,7 +3364,6 @@ static void ivas_param_mc_dequantize_cov_fx(
Word32 target_ch_ener_fx[MAX_CICP_CHANNELS]; // Q(31 - target_ch_ener_e)
Word16 target_ch_ener_e[MAX_CICP_CHANNELS];
Word32 dmx_ch_ener_fx[MAX_CICP_CHANNELS];
-
Word16 ls_conv_dmx_matrix_e[MAX_CICP_CHANNELS * MAX_CICP_CHANNELS];
set32_fx( target_ch_ener_fx, 0, MAX_CICP_CHANNELS );
@@ -3748,6 +3472,7 @@ static void ivas_param_mc_dequantize_cov_fx(
return;
}
+
/*-------------------------------------------------------------------------*
* param_mc_set_num_synth_bands()
*
@@ -3806,7 +3531,6 @@ static void param_mc_set_num_synth_bands(
* calculated the diffuse prototype information
*-------------------------------------------------------------------------*/
-
static ivas_error param_mc_get_diff_proto_info_fx(
const Word32 *proto_mtx, /* i : protoype matrix for the synthesis */
const UWord16 nchan_transport, /* i : number of transport channels */
@@ -3841,7 +3565,7 @@ static ivas_error param_mc_get_diff_proto_info_fx(
p_diff_proto_info->num_protos_diff = 1;
move16();
- mvr2r_inc_fixed( proto_mtx, nchan_out_cov, proto_fac_fx, nchan_out_cov, nchan_transport );
+ mvr2r_inc_fx( proto_mtx, nchan_out_cov, proto_fac_fx, nchan_out_cov, nchan_transport );
p_diff_proto_info->proto_index_diff[0] = 0;
move16();
@@ -3892,7 +3616,7 @@ static ivas_error param_mc_get_diff_proto_info_fx(
proto_mtx_ptr += nchan_out_cov;
}
- mvr2r_inc_fixed( proto_mtx + cur_out_ch, nchan_out_cov, proto_fac_fx + p_diff_proto_info->num_protos_diff, nchan_out_cov, nchan_transport );
+ mvr2r_inc_fx( proto_mtx + cur_out_ch, nchan_out_cov, proto_fac_fx + p_diff_proto_info->num_protos_diff, nchan_out_cov, nchan_transport );
p_diff_proto_info->proto_index_diff[cur_out_ch] = p_diff_proto_info->num_protos_diff;
move16();
@@ -3941,6 +3665,7 @@ static ivas_error param_mc_get_diff_proto_info_fx(
proto_fac_ptr += nchan_out_cov;
}
}
+
return IVAS_ERR_OK;
}
diff --git a/lib_dec/ivas_mc_paramupmix_dec_fx.c b/lib_dec/ivas_mc_paramupmix_dec_fx.c
index fa36c4f34adb85aa4c40ac21d3ca6ea4caaf176c..d28ba83282e91f8c9fb55b99d97a0a0ba82f0ca0 100644
--- a/lib_dec/ivas_mc_paramupmix_dec_fx.c
+++ b/lib_dec/ivas_mc_paramupmix_dec_fx.c
@@ -206,10 +206,10 @@ void ivas_mc_paramupmix_dec_read_BS(
*
*------------------------------------------------------------------------*/
-void ivas_mc_paramupmix_dec_digest_tc(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
- const UWord8 nCldfbSlots, /* i : number of CLFBS slots in the transport channels*/
- const Word16 nSamplesForRendering /* i : number of samples provided */
+void ivas_mc_paramupmix_dec_digest_tc_fx(
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
+ const UWord8 nCldfbSlots, /* i : number of CLDFB slots in transport channels */
+ const Word16 nSamplesForRendering /* i : number of samples provided */
)
{
MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix;
@@ -235,7 +235,7 @@ void ivas_mc_paramupmix_dec_digest_tc(
*
*------------------------------------------------------------------------*/
-void ivas_mc_paramupmix_dec_render(
+void ivas_mc_paramupmix_dec_render_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder handle */
const UWord16 nSamplesAsked, /* i : number of CLDFB slots requested */
UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
@@ -252,7 +252,7 @@ void ivas_mc_paramupmix_dec_render(
hMCParamUpmix = st_ivas->hMCParamUpmix;
assert( hMCParamUpmix );
- push_wmops( "ivas_mc_paramupmix_dec_render" );
+ push_wmops( "ivas_mc_paramupmix_dec_render_fx" );
FOR( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ )
{
@@ -408,6 +408,9 @@ ivas_error ivas_mc_paramupmix_dec_open(
{
Word16 nchan_to_allocate;
Word16 nchan_tc;
+#ifdef NONBE_1303_REND_GRANULARITY
+ Word16 granularity;
+#endif
TC_BUFFER_MODE buffer_mode;
buffer_mode = TC_BUFFER_MODE_RENDERER;
@@ -434,7 +437,13 @@ ivas_error ivas_mc_paramupmix_dec_open(
move16();
}
+#ifdef NONBE_1303_REND_GRANULARITY
+ granularity = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );
+
+ IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, granularity ) ), IVAS_ERR_OK ) )
+#else
IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )
+#endif
{
return error;
}
@@ -737,7 +746,7 @@ static void ivas_mc_paramupmix_dec_sf(
Word32 Cldfb_RealBuffer_Binaural_fx[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
Word32 Cldfb_ImagBuffer_Binaural_fx[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];
- int16_t slot_index_start;
+ Word16 slot_index_start;
hMCParamUpmix = st_ivas->hMCParamUpmix;
assert( hMCParamUpmix );
diff --git a/lib_dec/ivas_mct_core_dec_fx.c b/lib_dec/ivas_mct_core_dec_fx.c
index 3a2cd3118ae5b7ababf7726087d91f5e0f2626dd..f96a20126250b065cfcc5d50b404ae4c780ba283 100644
--- a/lib_dec/ivas_mct_core_dec_fx.c
+++ b/lib_dec/ivas_mct_core_dec_fx.c
@@ -75,16 +75,12 @@ void ivas_mct_side_bits_fx(
{
FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
{
-#ifdef ADJUST_MCT_CHANNELS_MAX
IF( LT_16( i, MCT_MAX_CHANNELS ) )
{
-#endif
sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
i = add( i, 1 );
move16();
-#ifdef ADJUST_MCT_CHANNELS_MAX
}
-#endif
}
}
@@ -225,30 +221,13 @@ void ivas_mct_core_dec(
{
FOR( ch = 0; ch < CPE_CHANNELS; ( ch++, i++ ) )
{
-#ifdef ADJUST_MCT_CHANNELS_MAX
IF( LT_16( i, MCT_MAX_CHANNELS ) )
{
-#endif
sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
-#ifdef ADJUST_MCT_CHANNELS_MAX
}
-#endif
}
}
-#ifndef ADJUST_MCT_CHANNELS_MAX
- /*seems like obsolete code*/
- i = 0;
- move16();
- FOR( ch = 0; ch < nChannels; ch++ )
- {
- IF( EQ_32( sts[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
- {
- CONTINUE;
- }
- i = add( i, 1 );
- }
-#endif
bfi = sts[0]->bfi;
move16();
diff --git a/lib_dec/ivas_mct_dec_fx.c b/lib_dec/ivas_mct_dec_fx.c
index cb533bb5a0328bcdaf20013c484d0184613e08ce..aaffbee9ae66d0bffb33a2ccde5dec69dbf5ccd0 100644
--- a/lib_dec/ivas_mct_dec_fx.c
+++ b/lib_dec/ivas_mct_dec_fx.c
@@ -48,11 +48,7 @@
* Local function prototypes
*-----------------------------------------------------------------------*/
-#ifdef FIX_HRTF_LOAD
static ivas_error ivas_mc_dec_reconfig_fx( Decoder_Struct *st_ivas );
-#else
-static ivas_error ivas_mc_dec_reconfig_fx( Decoder_Struct *st_ivas, UWord16 *nSamplesRendered, Word16 *data );
-#endif
/*--------------------------------------------------------------------------*
@@ -203,12 +199,9 @@ ivas_error ivas_mct_dec_fx(
move16();
}
-
/* MCT core decoder */
Word16 q_x[MAX_TRANSPORT_CHANNELS];
ivas_mct_core_dec( hMCT, st_ivas->hCPE, nCPE, output_fx, q_x );
- // Scaling output buffer back to Q11
-
/* for sba to stereo output disable any further processing for TCs > 2 as it is not needed*/
test();
@@ -242,7 +235,6 @@ ivas_error ivas_mct_dec_fx(
ivas_mdct_core_tns_ns_fx( hCPE, fUseTns[cpe_id], tnsData[cpe_id], x_fx, Aq_fx_32[cpe_id], 1, 20 );
}
-
test();
test();
IF( EQ_16( st_ivas->renderer_type, RENDERER_MC ) )
@@ -334,7 +326,6 @@ ivas_error ivas_mct_dec_fx(
}
}
-
/*----------------------------------------------------------------*
* CoreCoder Post-processing and updates
*----------------------------------------------------------------*/
@@ -380,6 +371,7 @@ ivas_error ivas_mct_dec_fx(
return error;
}
Copy_Scale_sig_16_32_no_sat( synth_fx[n], output_fx[( cpe_id * CPE_CHANNELS ) + n], output_frame, sub( Q11, Q_synth ) ); // Q11
+
/* Save synthesis for HQ FEC */
Word32 output_fx_[L_FRAME48k];
Copy32( output_fx[( cpe_id * CPE_CHANNELS ) + n], output_fx_, L_FRAME48k ); // Q11
@@ -442,6 +434,7 @@ ivas_error ivas_mct_dec_fx(
*
* Create, allocate and initialize IVAS decoder MCT handle
*-------------------------------------------------------------------------*/
+
ivas_error create_mct_dec_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
@@ -534,6 +527,7 @@ ivas_error create_mct_dec_fx(
hMCT->hBlockData[n]->ch2 = 0;
move16();
move16();
+
/*-----------------------------------------------------------------*
* MDCT stereo initialization
*-----------------------------------------------------------------*/
@@ -575,6 +569,7 @@ ivas_error create_mct_dec_fx(
return IVAS_ERR_OK;
}
+
/*-------------------------------------------------------------------------
* mct_dec_reconfigure()
*
@@ -822,11 +817,6 @@ void ivas_mct_dec_close(
ivas_error ivas_mc_dec_config_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
const Word16 idx /* i : LS config. index */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesRendered, /* o : samples flushed from last frame (JBM) */
- Word16 *data /* o : output synthesis signal */
-#endif
)
{
AUDIO_CONFIG signaled_config;
@@ -867,11 +857,7 @@ ivas_error ivas_mc_dec_config_fx(
}
}
-#ifdef FIX_HRTF_LOAD
IF( NE_32( ( error = ivas_mc_dec_reconfig_fx( st_ivas ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_mc_dec_reconfig_fx( st_ivas, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -903,11 +889,6 @@ ivas_error ivas_mc_dec_config_fx(
static ivas_error ivas_mc_dec_reconfig_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesRendered, /* o : number of samples flushed from the last frame (JBM) */
- Word16 *data /* o : output synthesis signal */
-#endif
)
{
Word16 nchan_transport_old, nSCE_old, nCPE_old, sba_dirac_stereo_flag_old, nchan_hp20_old;
@@ -921,17 +902,8 @@ static ivas_error ivas_mc_dec_reconfig_fx(
Word16 tc_nchan_tc_new;
Word16 tc_nchan_allocate_new;
Word16 tc_granularity_new;
-#ifndef FIX_HRTF_LOAD
- AUDIO_CONFIG intern_config_old;
- IVAS_OUTPUT_SETUP hIntSetupOld;
-#endif
Word16 nchan_out_buff_old, nchan_out_buff;
-
-#ifndef FIX_HRTF_LOAD
- error = IVAS_ERR_OK;
- move32();
-#endif
ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;
move32();
nchan_transport_old = st_ivas->nchan_transport;
@@ -970,14 +942,6 @@ static ivas_error ivas_mc_dec_reconfig_fx(
st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );
move16();
-#ifndef FIX_HRTF_LOAD
- /* save old IntSetup, might be needed for JBM flushing...*/
- intern_config_old = st_ivas->intern_config;
- move32();
- hIntSetupOld = st_ivas->hIntSetup;
- tc_granularity_new = 1;
- move16();
-#endif
/* renderer might have changed, reselect */
renderer_type_old = st_ivas->renderer_type;
move32();
@@ -987,8 +951,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->intern_config );
/* transfer subframe info from DirAC or ParamMC to central tc buffer */
-
- if ( st_ivas->hTcBuffer->tc_buffer_mode != TC_BUFFER_MODE_BUFFER )
+ IF( NE_32( st_ivas->hTcBuffer->tc_buffer_mode, TC_BUFFER_MODE_BUFFER ) )
{
test();
IF( EQ_16( last_mc_mode, MC_MODE_PARAMMC ) )
@@ -1019,26 +982,25 @@ static ivas_error ivas_mc_dec_reconfig_fx(
/* JBM: when granularity goes down (e.g. MCT with CREND -> ParamMC with binaural fastconv
render what still fits in the new granularity */
+#ifdef NONBE_1303_REND_GRANULARITY
+ tc_granularity_new = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );
+#else
tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );
move16();
- IF( LT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) ){
-#ifdef FIX_HRTF_LOAD
- /* flush already done in IVAS_DEC_ReadFormat() */
-#else
- IF( NE_32( ( error = ivas_jbm_dec_flush_renderer_fx( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &hIntSetupOld, last_mc_mode, ISM_MODE_NONE, nSamplesRendered, data ) ), IVAS_ERR_OK ) ){
- return error;
-}
#endif
+ IF( LT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
+ {
+ /* flush already done in IVAS_DEC_ReadFormat() */
}
/* JBM: when granularity goes up set samples to discard at the beginning of the frame */
- ELSE
- IF( GT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
+ ELSE IF( GT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
{
- IF( NE_32( ( error = ivas_jbm_dec_set_discard_samples( st_ivas ) ), IVAS_ERR_OK ) )
+ IF( NE_32( ( error = ivas_jbm_dec_set_discard_samples_fx( st_ivas ) ), IVAS_ERR_OK ) )
{
return error;
}
}
+
IF( EQ_16( st_ivas->mc_mode, MC_MODE_MCT ) )
{
st_ivas->nchan_transport = ivas_mc_ls_setup_get_num_channels_fx( ivas_mc_map_output_config_to_mc_ls_setup_fx( st_ivas->transport_config ) );
@@ -1069,17 +1031,10 @@ static ivas_error ivas_mc_dec_reconfig_fx(
ivas_masa_dec_close_fx( &( st_ivas->hMasa ) );
ivas_qmetadata_close_fx( &st_ivas->hQMetaData );
-#ifndef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
- IF( st_ivas->hDirAC != NULL )
- {
-#endif
- ivas_dirac_rend_close_fx( &( st_ivas->hDirACRend ) );
- ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );
- ivas_dirac_dec_close_fx( &( st_ivas->hDirAC ) );
- vbap_free_data_fx( &( st_ivas->hVBAPdata ) );
-#ifndef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
- }
-#endif
+ ivas_dirac_rend_close_fx( &( st_ivas->hDirACRend ) );
+ ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );
+ ivas_dirac_dec_close_fx( &( st_ivas->hDirAC ) );
+ vbap_free_data_fx( &( st_ivas->hVBAPdata ) );
/* init LS conversion if the renderer type asks for it */
test();
@@ -1159,17 +1114,10 @@ static ivas_error ivas_mc_dec_reconfig_fx(
ivas_masa_dec_close_fx( &( st_ivas->hMasa ) );
ivas_qmetadata_close_fx( &st_ivas->hQMetaData );
-#ifndef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
- IF( st_ivas->hDirAC != NULL )
- {
-#endif
- ivas_dirac_rend_close_fx( &( st_ivas->hDirACRend ) );
- ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );
- ivas_dirac_dec_close_fx( &( st_ivas->hDirAC ) );
- vbap_free_data_fx( &( st_ivas->hVBAPdata ) );
-#ifndef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
- }
-#endif
+ ivas_dirac_rend_close_fx( &( st_ivas->hDirACRend ) );
+ ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );
+ ivas_dirac_dec_close_fx( &( st_ivas->hDirAC ) );
+ vbap_free_data_fx( &( st_ivas->hVBAPdata ) );
IF( EQ_16( last_mc_mode, MC_MODE_MCT ) )
{
@@ -1298,6 +1246,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( ivas_total_brate, st->igf, st->element_mode );
move16();
}
+
IF( EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) )
{
UWord8 separateChannelEnabled;
@@ -1339,6 +1288,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
{
return error;
}
+
IF( EQ_16( last_mc_mode, MC_MODE_MCT ) && EQ_16( st_ivas->mc_mode, MC_MODE_PARAMMC ) && GT_16( st_ivas->nchan_transport, CPE_CHANNELS ) )
{
st = st_ivas->hCPE[1]->hCoreCoder[1];
@@ -1357,12 +1307,12 @@ static ivas_error ivas_mc_dec_reconfig_fx(
/*-----------------------------------------------------------------*
* re-configure HP20 memories
*-----------------------------------------------------------------*/
+
IF( NE_32( ( error = ivas_hp20_dec_reconfig_fx( st_ivas, nchan_hp20_old ) ), IVAS_ERR_OK ) )
{
return error;
}
-
/*-----------------------------------------------------------------*
* Reconfigure renderers
*-----------------------------------------------------------------*/
@@ -1370,9 +1320,6 @@ static ivas_error ivas_mc_dec_reconfig_fx(
IF( EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) )
{
test();
-#ifndef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
- test();
-#endif
IF( ( NE_16( st_ivas->renderer_type, RENDERER_DISABLE ) ) && ( NE_16( st_ivas->renderer_type, RENDERER_MCMASA_MONO_STEREO ) ) )
{
IF( st_ivas->hDirAC != NULL )
@@ -1392,11 +1339,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
}
}
}
-#ifdef NONBE_FIX_1220_OMASA_JBM_EXT_USAN
ELSE IF( EQ_16( st_ivas->renderer_type, RENDERER_DISABLE ) )
-#else
- ELSE IF( EQ_16( st_ivas->renderer_type, RENDERER_DISABLE ) && st_ivas->hDirAC != NULL )
-#endif
{
ivas_dirac_rend_close_fx( &( st_ivas->hDirACRend ) );
ivas_spat_hSpatParamRendCom_close_fx( &( st_ivas->hSpatParamRendCom ) );
@@ -1429,6 +1372,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
IF( st_ivas->hBinRenderer != NULL && ( NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) ) )
{
ivas_binRenderer_close_fx( &st_ivas->hBinRenderer );
+
test();
IF( ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )
{
@@ -1443,11 +1387,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
test();
IF( ( st_ivas->hCrendWrapper != NULL ) && ( st_ivas->hCrendWrapper->hCrend[0] != NULL ) && ( NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV ) && NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV_ROOM ) && ( NE_16( st_ivas->renderer_type, RENDERER_BINAURAL_OBJECTS_TD ) || NE_16( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) ) )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
ivas_rend_closeCrend_fx( &( st_ivas->hCrendWrapper ) );
-#else
- ivas_rend_closeCrend_fx( &( st_ivas->hCrendWrapper ), ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses );
-#endif
}
test();
@@ -1512,11 +1452,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
}
ELSE IF( st_ivas->hCrendWrapper == NULL && ( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_MIXER_CONV_ROOM ) ) )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
IF( ( error = ivas_rend_openCrend_fx( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0, ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )
-#else
- IF( ( error = ivas_rend_openCrend_fx( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hDecoderConfig->output_config, st_ivas->hRenderConfig, st_ivas->hSetOfHRTF, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )
-#endif
{
return error;
}
@@ -1525,6 +1461,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
}
}
}
+
/*-----------------------------------------------------------------*
* CLDFB instances
*-----------------------------------------------------------------*/
@@ -1537,6 +1474,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
/*-----------------------------------------------------------------*
* Allocate the LFE handle that is coded separately after the allocation of the core coders
*-----------------------------------------------------------------*/
+
test();
IF( ( EQ_16( st_ivas->mc_mode, MC_MODE_MCT ) || EQ_16( st_ivas->mc_mode, MC_MODE_PARAMUPMIX ) ) )
{
@@ -1600,7 +1538,7 @@ static ivas_error ivas_mc_dec_reconfig_fx(
DECODER_TC_BUFFER_HANDLE hTcBuffer;
hTcBuffer = st_ivas->hTcBuffer;
- tc_buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas );
+ tc_buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode_fx( st_ivas );
tc_nchan_tc_new = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
tc_nchan_allocate_new = tc_nchan_tc_new;
move16();
@@ -1611,8 +1549,23 @@ static ivas_error ivas_mc_dec_reconfig_fx(
test();
IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) || EQ_16( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) )
{
+#ifdef FIX_NCHAN_BUFFERS
+ tc_nchan_allocate_new = BINAURAL_CHANNELS;
+ move16();
+ test();
+ IF( st_ivas->hDiracDecBin[0] != NULL && st_ivas->hDiracDecBin[0]->useTdDecorr )
+ {
+ tc_nchan_allocate_new = 2 * BINAURAL_CHANNELS;
+ move16();
+ }
+ ELSE IF( st_ivas->hOutSetup.separateChannelEnabled )
+ {
+ tc_nchan_allocate_new = add( tc_nchan_allocate_new, 1 );
+ }
+#else
tc_nchan_allocate_new = BINAURAL_CHANNELS * 2;
move16();
+#endif
tc_nchan_full_new = tc_nchan_allocate_new;
move16();
}
@@ -1685,9 +1638,8 @@ static ivas_error ivas_mc_dec_reconfig_fx(
}
}
-
/*-----------------------------------------------------------------*
- * floating-point output audio buffers
+ * output audio buffers
*-----------------------------------------------------------------*/
nchan_out_buff = ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 );
@@ -1697,9 +1649,5 @@ static ivas_error ivas_mc_dec_reconfig_fx(
return error;
}
-#ifdef FIX_HRTF_LOAD
return IVAS_ERR_OK;
-#else
-return error;
-#endif
}
diff --git a/lib_dec/ivas_mct_dec_mct_fx_fx.c b/lib_dec/ivas_mct_dec_mct_fx_fx.c
index 299a09a9346a8942db067338b024ab90a2bd2e6e..c5e884f4694db0c4903c45293998e6be42b6fd61 100644
--- a/lib_dec/ivas_mct_dec_mct_fx_fx.c
+++ b/lib_dec/ivas_mct_dec_mct_fx_fx.c
@@ -205,7 +205,7 @@ static void applyGlobalILD_fx(
qratio = L_shl( qratio, q_qratio );
FOR( k = 0; k < nSubframes; k++ )
{
- v_multc_fixed( x[ch][k], qratio, x[ch][k], L_subframeTCX ); // Qx - 5 + q_qratio
+ v_multc_fx( x[ch][k], qratio, x[ch][k], L_subframeTCX ); // Qx - 5 + q_qratio
scale_sig32( x[ch][k], L_subframeTCX, sub( 5, q_qratio ) );
}
}
diff --git a/lib_dec/ivas_mdct_core_dec_fx.c b/lib_dec/ivas_mdct_core_dec_fx.c
index bfe81d4bb02aa31be6b9c853da71c5da1c944693..b951258852201ff1da3b8077675d4bf8cfc2e630 100644
--- a/lib_dec/ivas_mdct_core_dec_fx.c
+++ b/lib_dec/ivas_mdct_core_dec_fx.c
@@ -1187,10 +1187,8 @@ void ivas_mdct_core_reconstruct_fx(
set16_fx( synthFB_fx, 0, L_FRAME_PLUS + M );
IF( st->core != ACELP_CORE )
{
-#ifdef FIX_2003_CON_TCX_OVERFLOW
st->Q_syn_factor = 0;
move16();
-#endif
Word16 q_win0 = Q15;
move16();
Word16 q_winFB0 = Q15;
@@ -1429,11 +1427,7 @@ void ivas_mdct_core_reconstruct_fx(
{
#endif
Copy( synthFB_fx, signal_outFB_fx[ch], st->hTcxDec->L_frameTCX );
-#ifdef FIX_2003_CON_TCX_OVERFLOW
e_sig[ch] = sub( 15, q_syn + st->Q_syn_factor );
-#else
- e_sig[ch] = sub( 15, q_syn );
-#endif
move16();
#ifndef FIX_938_COMPILER_WARNING
}
@@ -1618,7 +1612,7 @@ void ivas_mdct_core_tns_ns_fx(
scf_e[ind] = sub( 15, q_shift );
move16();
}
- TonalMDCTConceal_SaveFreqSignal_ivas_fx( st->hTonalMDCTConc, x_fx[ch][k], x_e, L_frameTCX[ch], L_frame[ch], &scf_fx[0], scf_e, 0, get_igf_startline( st, L_frame[ch], L_frameTCX[ch] ) );
+ TonalMDCTConceal_SaveFreqSignal_ivas_fx( st->hTonalMDCTConc, x_fx[ch][k], x_e, L_frameTCX[ch], L_frame[ch], &scf_fx[0], scf_e, 0, get_igf_startline_fx( st, L_frame[ch], L_frameTCX[ch] ) );
}
}
ELSE
@@ -1714,9 +1708,9 @@ void ivas_mdct_core_tns_ns_fx(
however, this frame is nevertheless acting as an transition frame as also visible in L_frameTCX; thus, the safer approach to prevent high frequency artifacts is to apply the SNS up to L_frameTCX;
in case this is not necessary, x[] is filled with zeros, and the multiplication is not causing any additional harm
*/
- v_multc_fixed( x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sns_int_scf_fx[FDNS_NPTS - 1], x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sub( s_max( L_spec[ch], L_frameTCX[ch] ), st->hTcxCfg->psychParamsCurrent->nBins ) );
+ v_multc_fx( x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sns_int_scf_fx[FDNS_NPTS - 1], x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sub( s_max( L_spec[ch], L_frameTCX[ch] ), st->hTcxCfg->psychParamsCurrent->nBins ) );
#else
- v_multc_fixed( x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sns_int_scf_fx[FDNS_NPTS - 1], x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sub( L_spec[ch], st->hTcxCfg->psychParamsCurrent->nBins ) );
+ v_multc_fx( x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sns_int_scf_fx[FDNS_NPTS - 1], x_fx[ch][k] + st->hTcxCfg->psychParamsCurrent->nBins, sub( L_spec[ch], st->hTcxCfg->psychParamsCurrent->nBins ) );
#endif
q_2 = sub( add( q_x, q_sns_int_scf ), 31 );
diff --git a/lib_dec/ivas_mono_dmx_renderer_fx.c b/lib_dec/ivas_mono_dmx_renderer_fx.c
index 848f457eb468cbf5486ec65b99905265ff1f82a0..6c64eee816fc5cfbb4db6c676a09e080e004d4bc 100644
--- a/lib_dec/ivas_mono_dmx_renderer_fx.c
+++ b/lib_dec/ivas_mono_dmx_renderer_fx.c
@@ -106,9 +106,10 @@ void ivas_mono_dmx_renderer_close(
*
* Downmix process
*------------------------------------------------------------------------*/
+
void ivas_ism_mono_dmx_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Word32 *output_f_fx[], /* i/o: synthesized core-coder transport channels/mono output Qin = 11/ Qout = 8*/
+ Word32 *output_fx[], /* i/o: synthesized core-coder transport channels/mono output Qin = 11/ Qout = 8*/
const Word16 output_frame /* i : output frame length */
)
{
@@ -149,7 +150,7 @@ void ivas_ism_mono_dmx_fx(
move16();
FOR( Word16 lp = 0; lp < numInputChannels; lp++ )
{
- Word16 norm = L_norm_arr( output_f_fx[lp], output_frame );
+ Word16 norm = L_norm_arr( output_fx[lp], output_frame );
Output_norm = s_min( Output_norm, norm );
}
Q_shift = sub( Output_norm, find_guarded_bits_fx( numInputChannels ) );
@@ -157,11 +158,10 @@ void ivas_ism_mono_dmx_fx(
/* Compute the Proto Signal */
FOR( i = 0; i < numInputChannels; i++ )
{
- v_shr_32( output_f_fx[i], output_shr, output_frame, -Q_shift );
+ v_shr_32( output_fx[i], output_shr, output_frame, -Q_shift );
v_add_32( output_shr, proto_signal_fx, proto_signal_fx, output_frame );
}
-
proto_norm = L_norm_arr( proto_signal_fx, output_frame );
proto_shift = sub( proto_norm, shr( ( add( find_guarded_bits_fx( output_frame ), 1 ) ), 1 ) );
@@ -176,7 +176,7 @@ void ivas_ism_mono_dmx_fx(
protoEner_pre = L_add( protoEner_pre, Mpy_32_32( proto_sh, proto_sh ) );
FOR( j = 0; j < numInputChannels; j++ )
{
- Word32 output_f_shift = L_shl( output_f_fx[j][i], input_shift );
+ Word32 output_f_shift = L_shl( output_fx[j][i], input_shift );
inputEner_pre = L_add( inputEner_pre, Mpy_32_32( output_f_shift, output_f_shift ) );
}
}
@@ -256,10 +256,9 @@ void ivas_ism_mono_dmx_fx(
move16();
}
-
/* equalize the downmix */
- v_multc_fixed_16( proto_signal_fx, eq_fx, output_f_fx[0], output_frame );
- v_shr_32( output_f_fx[0], output_f_fx[0], output_frame, Q_shift );
+ v_multc_fx_16( proto_signal_fx, eq_fx, output_fx[0], output_frame );
+ v_shr_32( output_fx[0], output_fx[0], output_frame, Q_shift );
return;
}
@@ -272,7 +271,7 @@ void ivas_ism_mono_dmx_fx(
void ivas_mono_stereo_downmix_mcmasa_fx(
Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
- Word32 *output_f_fx[], /* i/o: synthesized core-coder transport channels/mono or stereo output Q11*/
+ Word32 *output_fx[], /* i/o: synthesized core-coder transport channels/mono or stereo output Q11*/
Word16 output_frame /* i : output frame length per channel */
)
{
@@ -286,8 +285,8 @@ void ivas_mono_stereo_downmix_mcmasa_fx(
test();
IF( EQ_16( st_ivas->hDecoderConfig->nchan_out, 2 ) && st_ivas->hOutSetup.separateChannelEnabled )
{
- v_multc_acc_32_16( output_f_fx[st_ivas->hOutSetup.separateChannelIndex], INV_SQRT2_FX_Q15, output_f_fx[0], output_frame ); // Q11
- v_multc_acc_32_16( output_f_fx[st_ivas->hOutSetup.separateChannelIndex], INV_SQRT2_FX_Q15, output_f_fx[1], output_frame ); // Q11
+ v_multc_acc_32_16( output_fx[st_ivas->hOutSetup.separateChannelIndex], INV_SQRT2_FX_Q15, output_fx[0], output_frame ); // Q11
+ v_multc_acc_32_16( output_fx[st_ivas->hOutSetup.separateChannelIndex], INV_SQRT2_FX_Q15, output_fx[1], output_frame ); // Q11
}
/* Mono downmix */
ELSE IF( EQ_16( st_ivas->hDecoderConfig->nchan_out, 1 ) )
@@ -295,16 +294,16 @@ void ivas_mono_stereo_downmix_mcmasa_fx(
/* Downmix L and R to dmx_tmp */
FOR( i = 0; i < st_ivas->nchan_transport; i++ )
{
- v_multc_acc_32_16( output_f_fx[i], INV_SQRT2_FX_Q15, dmx_tmp_fx, output_frame ); // Q11
+ v_multc_acc_32_16( output_fx[i], INV_SQRT2_FX_Q15, dmx_tmp_fx, output_frame ); // Q11
}
/* Add center channel */
IF( st_ivas->hOutSetup.separateChannelEnabled )
{
- v_add_32( output_f_fx[st_ivas->hOutSetup.separateChannelIndex], dmx_tmp_fx, dmx_tmp_fx, output_frame );
+ v_add_32( output_fx[st_ivas->hOutSetup.separateChannelIndex], dmx_tmp_fx, dmx_tmp_fx, output_frame );
}
/* Move to output */
- Copy32( dmx_tmp_fx, output_f_fx[0], output_frame ); // Q11
+ Copy32( dmx_tmp_fx, output_fx[0], output_frame ); // Q11
}
return;
@@ -319,7 +318,7 @@ void ivas_mono_stereo_downmix_mcmasa_fx(
void ivas_apply_non_diegetic_panning_fx(
Word32 *input_f_fx, /* i : non-diegetic object */
- Word32 *output_f_fx[], /* o: core-coder transport mono channel/stereo output */
+ Word32 *output_fx[], /* o: core-coder transport mono channel/stereo output */
const Word16 non_diegetic_pan_gain_fx, /* i : non-diegetic panning gain Q15*/
const Word16 output_frame /* i : output frame length per channel Q11*/
)
@@ -329,8 +328,8 @@ void ivas_apply_non_diegetic_panning_fx(
pan_left_fx = add( mult( non_diegetic_pan_gain_fx, 16384 ), 16384 ); // 0.5.Q15 = 16384
pan_right_fx = sub( 32767, pan_left_fx );
- v_multc_fixed( input_f_fx, L_shl( L_deposit_l( pan_right_fx ), 16 ), output_f_fx[1], output_frame );
- v_multc_fixed( input_f_fx, L_shl( L_deposit_l( pan_left_fx ), 16 ), output_f_fx[0], output_frame );
+ v_multc_fx( input_f_fx, L_shl( L_deposit_l( pan_right_fx ), 16 ), output_fx[1], output_frame );
+ v_multc_fx( input_f_fx, L_shl( L_deposit_l( pan_left_fx ), 16 ), output_fx[0], output_frame );
return;
}
diff --git a/lib_dec/ivas_objectRenderer_internal_fx.c b/lib_dec/ivas_objectRenderer_internal_fx.c
index a97567c198c8f2f9348370572adeb9081d996c4e..98a57c4cd360c69ba106abf465e2a244ed1d017e 100644
--- a/lib_dec/ivas_objectRenderer_internal_fx.c
+++ b/lib_dec/ivas_objectRenderer_internal_fx.c
@@ -56,21 +56,24 @@ ivas_error ivas_td_binaural_open_fx(
move16();
test();
- if ( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) || EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
+ IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) || EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
{
*num_src = st_ivas->nchan_ism;
move16();
}
-#ifdef FIX_HRTF_LOAD
+#ifdef NONBE_1303_REND_GRANULARITY
+ test();
+ IF( st_ivas->hHrtfTD == NULL && st_ivas->hDecoderConfig->Opt_HRTF_binary )
+#else
if ( st_ivas->hHrtfTD == NULL && st_ivas->hDecoderConfig->Opt_HRTF_binary &&
( st_ivas->ivas_format != SBA_ISM_FORMAT ) // ToDo: temporary hack to avoid ASAN errors -> see issue #1202
)
+#endif
{
return IVAS_ERROR( IVAS_ERR_INTERNAL, "HRTF binary file present but not used in TD renderer" );
}
-#endif
return ivas_td_binaural_open_unwrap_fx( &st_ivas->hHrtfTD, st_ivas->hDecoderConfig->output_Fs, *num_src, st_ivas->ivas_format, st_ivas->transport_config, st_ivas->hRenderConfig->directivity_fx, st_ivas->hRenderConfig->distAtt_fx, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns, SrcInd );
}
@@ -210,7 +213,6 @@ ivas_error ivas_td_binaural_renderer_sf_fx(
IF( EQ_16( subframe_idx, ism_md_subframe_update_jbm ) )
{
-#ifdef OBJ_EDITING_API
test();
IF( EQ_16( st_ivas->ivas_format, ISM_FORMAT ) || EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
{
@@ -240,8 +242,7 @@ ivas_error ivas_td_binaural_renderer_sf_fx(
return error;
}
}
- else
-#endif
+ ELSE
{
IF( NE_16( error = TDREND_Update_object_positions_fx( st_ivas->hBinRendererTd, nchan_ism, st_ivas->ivas_format, st_ivas->hIsmMetaData ), IVAS_ERR_OK ) )
{
@@ -376,6 +377,7 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural(
{
continue;
}
+
IF( ( error = ivas_td_binaural_open_unwrap_fx( &st_ivas->hHrtfTD,
st_ivas->hDecoderConfig->output_Fs,
st_ivas->nchan_transport,
diff --git a/lib_dec/ivas_omasa_dec_fx.c b/lib_dec/ivas_omasa_dec_fx.c
index 7278b9968fa35439ad267c76af69b8f34beef655..811935a6037f5ecc7c5b6c359084e4b308b80c04 100644
--- a/lib_dec/ivas_omasa_dec_fx.c
+++ b/lib_dec/ivas_omasa_dec_fx.c
@@ -315,7 +315,7 @@ ivas_error ivas_omasa_data_open_fx(
)
{
MASA_ISM_DATA_HANDLE hMasaIsmData;
- Word16 ch, bin;
+ Word16 ch, band_idx;
Word16 sf, obj_idx;
IF( ( hMasaIsmData = (MASA_ISM_DATA_HANDLE) malloc( sizeof( MASA_ISM_DATA ) ) ) == NULL )
@@ -323,50 +323,65 @@ ivas_error ivas_omasa_data_open_fx(
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( band_idx = 0; band_idx < MASA_FREQUENCY_BANDS; band_idx++ )
{
FOR( ch = 0; ch < 2; ch++ )
{
- hMasaIsmData->ismPreprocMatrix_fx[ch][ch][bin] = 32767; /* 1.0f in Q15 */
- move16();
- hMasaIsmData->ismPreprocMatrix_fx[1 - ch][ch][bin] = 0; // Q15
- move16();
- hMasaIsmData->eneMoveIIR_fx[ch][bin] = 0; // Q22
+
+ hMasaIsmData->ismPreprocMatrix_fx[ch][ch][band_idx] = ONE_IN_Q28;
move32();
- hMasaIsmData->enePreserveIIR_fx[ch][bin] = 0; // Q22
+ hMasaIsmData->ismPreprocMatrix_fx[sub( 1, ch )][ch][band_idx] = 0;
move32();
+ hMasaIsmData->eneMoveIIR_fx[ch][band_idx] = 0;
+ move32();
+ hMasaIsmData->eneMoveIIR_e[ch][band_idx] = 0;
+ move16();
+ hMasaIsmData->enePreserveIIR_fx[ch][band_idx] = 0;
+ move32();
+ hMasaIsmData->enePreserveIIR_e[ch][band_idx] = 0;
+ move16();
}
- hMasaIsmData->preprocEneTarget_fx[bin] = 0; // Q19
+
+ hMasaIsmData->eneOrigIIR_fx[band_idx] = 0;
+ move32();
+ hMasaIsmData->eneOrigIIR_e[band_idx] = 0;
+ move16();
+ hMasaIsmData->preprocEneTarget_fx[band_idx] = 0;
move32();
- hMasaIsmData->preprocEneRealized_fx[bin] = 0; // Q19
+ hMasaIsmData->preprocEneRealized_fx[band_idx] = 0;
move32();
}
- hMasaIsmData->objectsMoved = 0;
- move16();
+ hMasaIsmData->objectsEdited = 0;
+ move32();
hMasaIsmData->delayBuffer_fx = NULL;
+ move16();
FOR( ch = 0; ch < MAX_NUM_OBJECTS; ch++ )
{
- hMasaIsmData->ism_is_edited[ch] = 0;
- move16();
+ hMasaIsmData->ism_dir_is_edited[ch] = 0;
+ hMasaIsmData->ism_gain_is_edited[ch] = 0;
hMasaIsmData->q_elevation_old_fx[ch] = 0; // Q22
move32();
hMasaIsmData->q_azimuth_old_fx[ch] = 0; // Q22
move32();
}
+ hMasaIsmData->masa_gain_is_edited = 0;
+ hMasaIsmData->idx_separated_ism = -1;
+ move16();
+
FOR( obj_idx = 0; obj_idx < MAX_NUM_OBJECTS; obj_idx++ )
{
- set16_fx( hMasaIsmData->azimuth_ism[obj_idx], 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );
- set16_fx( hMasaIsmData->elevation_ism[obj_idx], 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );
+ set16_fx( hMasaIsmData->azimuth_ism_fx[obj_idx], 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );
+ set16_fx( hMasaIsmData->elevation_ism_fx[obj_idx], 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );
FOR( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR; sf++ )
{
set32_fx( hMasaIsmData->energy_ratio_ism_fx[obj_idx][sf], 0, CLDFB_NO_CHANNELS_MAX );
}
}
- set16_fx( hMasaIsmData->azimuth_separated_ism, 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );
- set16_fx( hMasaIsmData->elevation_separated_ism, 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );
+ set16_fx( hMasaIsmData->azimuth_separated_ism_fx, 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );
+ set16_fx( hMasaIsmData->elevation_separated_ism_fx, 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );
hMasaIsmData->hExtData = NULL;
move32();
@@ -467,19 +482,11 @@ void ivas_omasa_data_close_fx(
*--------------------------------------------------------------------------*/
ivas_error ivas_omasa_dec_config_fx(
- Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
-#ifdef FIX_HRTF_LOAD
- Word16 *num_src,
- Word16 SrcInd[MAX_NUM_TDREND_CHANNELS]
-#else
- UWord16 *nSamplesRendered, /* o : number of samples flushed from the previous frame (JBM) */
+ Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure */
Word16 *num_src,
- Word16 SrcInd[MAX_NUM_TDREND_CHANNELS],
- Word16 *data /* o : output synthesis signal Qx*/
-#endif
-)
+ Word16 SrcInd[MAX_NUM_TDREND_CHANNELS] )
{
- Word16 k, sce_id, nSCE_old, nchan_hp20_old, numCldfbAnalyses_old, numCldfbSyntheses_old, n_MD;
+ Word16 k, sce_id, nSCE_old, nchan_hp20_old, numCldfbAnalyses_old, numCldfbSyntheses_old;
Word32 ivas_total_brate, ism_total_brate, cpe_brate;
Word32 brate_SCE, brate_CPE;
ISM_MODE ism_mode_old;
@@ -540,11 +547,7 @@ ivas_error ivas_omasa_dec_config_fx(
}
ELSE
{
-#ifdef FIX_HRTF_LOAD
IF( NE_32( ( error = ivas_masa_dec_reconfigure_fx( st_ivas ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_masa_dec_reconfigure_fx( st_ivas, nSamplesRendered, data ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -609,63 +612,19 @@ ivas_error ivas_omasa_dec_config_fx(
IF( NE_16( ism_mode_old, st_ivas->ism_mode ) )
{
/* ISM MD reconfig. */
- n_MD = 0;
- move16();
-
- IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
+ IF( st_ivas->hIsmMetaData[0] == NULL )
{
- /* the full number of hIsmMetaData are needed for EXT output */
- IF( st_ivas->hIsmMetaData[0] == NULL )
- {
- IF( ( error = ivas_ism_metadata_dec_create_fx( st_ivas, st_ivas->nchan_ism, NULL ) ) != IVAS_ERR_OK )
- {
- return error;
- }
- }
- ELSE
+ IF( ( error = ivas_ism_metadata_dec_create_fx( st_ivas, st_ivas->nchan_ism, NULL ) ) != IVAS_ERR_OK )
{
- FOR( k = 0; k < st_ivas->nchan_ism; k++ )
- {
- ivas_ism_reset_metadata_handle_dec_fx( st_ivas->hIsmMetaData[k] );
- }
+ return error;
}
}
ELSE
{
- test();
- IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) || EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
- {
- n_MD = 1;
- move16();
-
- IF( st_ivas->hIsmMetaData[0] == NULL )
- {
- error = ivas_ism_metadata_dec_create_fx( st_ivas, 1, NULL );
- move32();
- IF( NE_32( error, IVAS_ERR_OK ) )
- {
- return error;
- }
- }
- ELSE
- {
- ivas_ism_reset_metadata_handle_dec_fx( st_ivas->hIsmMetaData[0] );
- }
- }
- ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
+ FOR( k = 0; k < st_ivas->nchan_ism; k++ )
{
- n_MD = st_ivas->nchan_ism;
- move16();
-
- error = ivas_ism_metadata_dec_create_fx( st_ivas, st_ivas->nchan_ism, NULL );
- move32();
- IF( NE_32( error, IVAS_ERR_OK ) )
- {
- return error;
- }
+ ivas_ism_reset_metadata_handle_dec_fx( st_ivas->hIsmMetaData[k] );
}
-
- ivas_ism_metadata_close( st_ivas->hIsmMetaData, n_MD );
}
st_ivas->hCPE[0]->element_brate = L_sub( ivas_total_brate, ism_total_brate );
@@ -830,7 +789,7 @@ ivas_error ivas_omasa_dec_config_fx(
}
/*-----------------------------------------------------------------*
- * floating-point output audio buffers
+ * output audio buffers
*-----------------------------------------------------------------*/
nchan_out_buff = ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 );
@@ -1031,9 +990,9 @@ ivas_error ivas_omasa_ism_metadata_dec_fx(
{
meta_write_index = ( add( dirac_bs_md_write_idx, block ) ) % st_ivas->hSpatParamRendCom->dirac_md_buffer_length;
move16();
- st_ivas->hMasaIsmData->azimuth_ism[n][meta_write_index] = azimuth_ism;
+ st_ivas->hMasaIsmData->azimuth_ism_fx[n][meta_write_index] = azimuth_ism;
move16();
- st_ivas->hMasaIsmData->elevation_ism[n][meta_write_index] = elevation_ism;
+ st_ivas->hMasaIsmData->elevation_ism_fx[n][meta_write_index] = elevation_ism;
move16();
}
}
@@ -1055,9 +1014,9 @@ ivas_error ivas_omasa_ism_metadata_dec_fx(
{
meta_write_index = ( add( dirac_bs_md_write_idx, block ) ) % st_ivas->hSpatParamRendCom->dirac_md_buffer_length;
move16();
- st_ivas->hMasaIsmData->azimuth_separated_ism[meta_write_index] = azimuth_ism;
+ st_ivas->hMasaIsmData->azimuth_separated_ism_fx[meta_write_index] = azimuth_ism;
move16();
- st_ivas->hMasaIsmData->elevation_separated_ism[meta_write_index] = elevation_ism;
+ st_ivas->hMasaIsmData->elevation_separated_ism_fx[meta_write_index] = elevation_ism;
move16();
}
}
@@ -1077,15 +1036,15 @@ ivas_error ivas_omasa_ism_metadata_dec_fx(
FOR( block = 0; block < 2; block++ )
{
- st_ivas->hMasaIsmData->azimuth_separated_ism[block] = st_ivas->hMasaIsmData->azimuth_separated_ism[add( block, 2 )];
- st_ivas->hMasaIsmData->elevation_separated_ism[block] = st_ivas->hMasaIsmData->elevation_separated_ism[add( block, 2 )];
+ st_ivas->hMasaIsmData->azimuth_separated_ism_fx[block] = st_ivas->hMasaIsmData->azimuth_separated_ism_fx[add( block, 2 )];
+ st_ivas->hMasaIsmData->elevation_separated_ism_fx[block] = st_ivas->hMasaIsmData->elevation_separated_ism_fx[add( block, 2 )];
move16();
move16();
}
FOR( block = 2; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ )
{
- st_ivas->hMasaIsmData->azimuth_separated_ism[block] = azimuth_ism;
- st_ivas->hMasaIsmData->elevation_separated_ism[block] = elevation_ism;
+ st_ivas->hMasaIsmData->azimuth_separated_ism_fx[block] = azimuth_ism;
+ st_ivas->hMasaIsmData->elevation_separated_ism_fx[block] = elevation_ism;
move16();
move16();
}
@@ -1107,7 +1066,7 @@ void ivas_omasa_dirac_rend_jbm_fx(
UWord16 *nSamplesRendered, /* o : number of samples rendered */
UWord16 *nSamplesAvailable, /* o : number of samples still to render */
const Word16 nchan_transport, /* i : number of transport channels */
- Word32 *output_f[] /* o : rendered time signal Q11*/
+ Word32 *output_fx[] /* o : rendered time signal Q11*/
)
{
Word16 subframes_rendered;
@@ -1120,17 +1079,46 @@ void ivas_omasa_dirac_rend_jbm_fx(
{
*nSamplesRendered = min( nSamplesAsked, st_ivas->hTcBuffer->n_samples_available );
-
test();
IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) || EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
{
- Copy32( &output_f[CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[0], *nSamplesRendered );
+ Copy32( &output_fx[CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[0], *nSamplesRendered );
+ IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
+ {
+ /* Gain separated object, if edited */
+ FOR( n = 0; n < st_ivas->nchan_ism; n++ )
+ {
+ test();
+ IF( st_ivas->hMasaIsmData->ism_gain_is_edited[n] && EQ_16( st_ivas->hMasaIsmData->idx_separated_ism, n ) )
+ {
+ v_multc_fx_16( data_separated_objects[0], st_ivas->hMasaIsmData->gain_ism_edited_fx[n], data_separated_objects[0], *nSamplesRendered ); // Q = 8
+ Scale_sig32( data_separated_objects[0], *nSamplesRendered, Q3 ); // Q = 11
+ }
+ }
+ }
}
ELSE
{
FOR( n = 0; n < st_ivas->nchan_ism; n++ )
{
- Copy32( &output_f[n + CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[n], *nSamplesRendered );
+ Copy32( &output_fx[n + CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[n], *nSamplesRendered );
+
+ /* Gain discrete objects, if edited */
+ IF( st_ivas->hMasaIsmData->ism_gain_is_edited[n] )
+ {
+ v_multc_fx_16( data_separated_objects[n], st_ivas->hMasaIsmData->gain_ism_edited_fx[n], data_separated_objects[n], *nSamplesRendered ); // Q = 8
+ Scale_sig32( data_separated_objects[n], *nSamplesRendered, Q3 ); // Q = 11
+ }
+ }
+
+ /* Gain MASA part, if edited */
+ IF( st_ivas->hMasaIsmData->masa_gain_is_edited )
+ {
+ FOR( n = 0; n < 2; n++ )
+ {
+ v_multc_fx_16( output_fx[n], st_ivas->hMasaIsmData->gain_masa_edited_fx, output_fx[n], *nSamplesRendered ); // Q = 8
+ Scale_sig32( output_fx[n], *nSamplesRendered, Q3 ); // Q = 11
+ }
}
}
}
@@ -1140,14 +1128,14 @@ void ivas_omasa_dirac_rend_jbm_fx(
slots_rendered = st_ivas->hSpatParamRendCom->slots_rendered;
move16();
- ivas_dirac_dec_render_fx( st_ivas, nchan_transport, nSamplesAsked, nSamplesRendered, nSamplesAvailable, output_f );
+ ivas_dirac_dec_render_fx( st_ivas, nchan_transport, nSamplesAsked, nSamplesRendered, nSamplesAvailable, output_fx );
FOR( Word16 ind1 = 0; ind1 < MAX_NUM_OBJECTS; ind1++ )
{
scale_sig32( st_ivas->hIsmRendererData->prev_gains_fx[ind1], MAX_OUTPUT_CHANNELS, -1 ); // Q30 -> Q29
}
- ivas_omasa_separate_object_render_jbm_fx( st_ivas, *nSamplesRendered, data_separated_objects, output_f, subframes_rendered, slots_rendered );
+ ivas_omasa_separate_object_render_jbm_fx( st_ivas, *nSamplesRendered, data_separated_objects, output_fx, subframes_rendered, slots_rendered );
FOR( Word16 ind1 = 0; ind1 < MAX_NUM_OBJECTS; ind1++ )
{
@@ -1505,8 +1493,8 @@ void ivas_omasa_combine_separate_ism_with_masa_fx(
{
Word32 ele, azi;
- ele = st_ivas->hMasaIsmData->elevation_separated_ism[sf];
- azi = st_ivas->hMasaIsmData->azimuth_separated_ism[sf];
+ ele = st_ivas->hMasaIsmData->elevation_separated_ism_fx[sf];
+ azi = st_ivas->hMasaIsmData->azimuth_separated_ism_fx[sf];
directionIndex = index_theta_phi_16_fx( &ele, &azi, st_ivas->hMasa->data.sph_grid16 );
@@ -1532,10 +1520,10 @@ void ivas_omasa_combine_separate_ism_with_masa_fx(
eneIsm_frac, eneIsm_exp );
/* Mix the separated object audio signal to the MASA audio signals */
- ivas_get_stereo_panning_gains_fx( st_ivas->hMasaIsmData->azimuth_separated_ism[0],
- st_ivas->hMasaIsmData->elevation_separated_ism[0], old_panning_gains_q15_fx );
- ivas_get_stereo_panning_gains_fx( st_ivas->hMasaIsmData->azimuth_separated_ism[2],
- st_ivas->hMasaIsmData->elevation_separated_ism[2], new_panning_gains_q15_fx );
+ ivas_get_stereo_panning_gains_fx( st_ivas->hMasaIsmData->azimuth_separated_ism_fx[0],
+ st_ivas->hMasaIsmData->elevation_separated_ism_fx[0], old_panning_gains_q15_fx );
+ ivas_get_stereo_panning_gains_fx( st_ivas->hMasaIsmData->azimuth_separated_ism_fx[2],
+ st_ivas->hMasaIsmData->elevation_separated_ism_fx[2], new_panning_gains_q15_fx );
/* Subsequent processing in Q31 format */
FOR( n = 0; n < MASA_MAX_TRANSPORT_CHANNELS; n++ )
@@ -1754,8 +1742,8 @@ void ivas_omasa_render_objects_from_mix_fx(
FOR( n = 0; n < nchan_ism; n++ )
{
// Q0 -> Q22
- Word32 azi = L_shl( st_ivas->hMasaIsmData->azimuth_ism[n][st_ivas->hSpatParamRendCom->dirac_read_idx], Q22 );
- Word32 ele = L_shl( st_ivas->hMasaIsmData->elevation_ism[n][st_ivas->hSpatParamRendCom->dirac_read_idx], Q22 );
+ Word32 azi = L_shl( st_ivas->hMasaIsmData->azimuth_ism_fx[n][st_ivas->hSpatParamRendCom->dirac_read_idx], Q22 );
+ Word32 ele = L_shl( st_ivas->hMasaIsmData->elevation_ism_fx[n][st_ivas->hSpatParamRendCom->dirac_read_idx], Q22 );
st_ivas->hIsmMetaData[n]->azimuth_fx = azi;
st_ivas->hIsmMetaData[n]->elevation_fx = ele;
@@ -2123,12 +2111,19 @@ void ivas_omasa_render_objects_from_mix_fx(
outSlotImPr = &( outIm[n][slot][0] );
move32();
move32();
+#ifdef FIX_2092_ASSERT_IN_OMASA_RENDER
+ mantissa_exp_to_qvalue( &outRe_exp[n][slot][0], &outRe[n][slot][0], Q20 + Q2, nBins ); // + Q2: add two bits headroom to prevent overflow in cldfbSynthesis_ivas_fx().
+ mantissa_exp_to_qvalue( &outIm_exp[n][slot][0], &outIm[n][slot][0], Q20 + Q2, nBins );
+ cldfbSynthesis_ivas_fx( &outSlotRePr, &outSlotImPr, &rendered_objects[n][index],
+ nBins, 0, 1 + Q2, st_ivas->cldfbSynDec[index2] );
+#else
mantissa_exp_to_qvalue( &outRe_exp[n][slot][0], &outRe[n][slot][0], Q20, nBins );
mantissa_exp_to_qvalue( &outIm_exp[n][slot][0], &outIm[n][slot][0], Q20, nBins );
cldfbSynthesis_ivas_fx( &outSlotRePr, &outSlotImPr, &rendered_objects[n][index],
nBins, 0, 1, st_ivas->cldfbSynDec[index2] );
+#endif
}
}
diff --git a/lib_dec/ivas_osba_dec_fx.c b/lib_dec/ivas_osba_dec_fx.c
index 3aae0517988ad88923af7e492d1a886e835662e3..67908e99647bce09865d9790b89ad4eee6e18508 100644
--- a/lib_dec/ivas_osba_dec_fx.c
+++ b/lib_dec/ivas_osba_dec_fx.c
@@ -134,7 +134,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm_fx(
{
Word16 n;
ivas_error error;
- Word32 output_separated_objects_fx[BINAURAL_CHANNELS][L_FRAME48k]; // VE2SB: TBV
+ Word32 output_separated_objects_fx[BINAURAL_CHANNELS][L_FRAME48k];
Word32 *p_sepobj_fx[BINAURAL_CHANNELS];
Word16 channel_offset;
Word16 slot_idx_start;
@@ -228,6 +228,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm_fx(
}
}
}
+
return IVAS_ERR_OK;
}
@@ -292,7 +293,7 @@ ivas_error ivas_osba_render_sf_fx(
if ( !st_ivas->hDecoderConfig->Opt_tsm )
{
- int16_t tc_offset;
+ Word16 tc_offset;
tc_offset = st_ivas->hTcBuffer->n_samples_rendered;
for ( n = 0; n < st_ivas->nchan_ism; n++ )
{
@@ -314,7 +315,7 @@ ivas_error ivas_osba_render_sf_fx(
{
IF( NE_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
{
- v_add_fixed_no_hdrm( p_output[n], p_output_ism[n], p_output[n], *nSamplesRendered );
+ v_add_fx_no_hdrm( p_output[n], p_output_ism[n], p_output[n], *nSamplesRendered );
}
}
@@ -331,39 +332,55 @@ ivas_error ivas_osba_render_sf_fx(
void ivas_osba_stereo_add_channels_fx(
Word32 *tc_fx[], /* i : transport channels */
Word32 *output_fx[], /* i/o: output channels */
- const Word16 gain, /* i : gain bed value Q11 */
+ const Word32 gain_bed_fx, /* i : gain bed value */
const Word16 nchan_out, /* i : number of output channels */
const Word16 nchan_ism, /* i : number of ISM channels */
+ const Word16 ism_mode, /* i : ISM mode */
const UWord16 n_samples_to_render /* i : output frame length per channel */
)
{
- Word16 n;
+ Word16 n, i;
-#if 0
- IF ( ism_mode == ISM_SBA_MODE_DISC )
- {
-#endif
- IF( NE_16( gain, ONE_IN_Q11 ) )
- {
- assert( 0 && "Object editing is not implemented in the BASOP code!" );
- }
- ELSE
+ IF( EQ_16( ism_mode, ISM_SBA_MODE_DISC ) )
{
- FOR( n = 0; n < nchan_out; n++ )
+ Word32 gain = gain_bed_fx;
+ test();
+
+ // TODO: Enable gain editing feature (NE_32 ( gain, ONE_IN_Q_gain ) )
+ test();
+ IF( NE_32( gain, ONE_IN_Q29 ) && GT_32( gain, 0 ) )
{
- v_add_fixed_no_hdrm( output_fx[n], tc_fx[n + nchan_ism], output_fx[n], n_samples_to_render );
+ FOR( n = 0; n < nchan_out; n++ )
+ {
+ FOR( i = 0; i < n_samples_to_render; i++ )
+ {
+ Word32 tmp1 = Mpy_32_32( tc_fx[n + nchan_ism][i], gain ); // Q11 + Q29 - 31 = Q9
+ tmp1 = L_shl( tmp1, 2 ); // Q9 --> Q11
+ output_fx[n][i] = L_add_sat( output_fx[n][i], tmp1 ); // Q11
+ }
+ }
+ }
+ ELSE
+ {
+ FOR( n = 0; n < nchan_out; n++ )
+ {
+ FOR( i = 0; i < n_samples_to_render; i++ )
+ {
+ output_fx[n][i] = L_add_sat( output_fx[n][i], tc_fx[n + nchan_ism][i] ); // Q11
+ }
+ }
}
- }
-#if 0
}
ELSE
{
FOR( n = 0; n < nchan_out; n++ )
{
- v_add_fixed_no_hdrm( output_fx[n], tc_fx[n + nchan_ism], output_fx[n], n_samples_to_render );
+ FOR( i = 0; i < n_samples_to_render; i++ )
+ {
+ output_fx[n][i] = L_add_sat( output_fx[n][i], tc_fx[n + nchan_ism][i] ); // Q11
+ }
}
}
-#endif
return;
}
diff --git a/lib_dec/ivas_out_setup_conversion_fx.c b/lib_dec/ivas_out_setup_conversion_fx.c
index 3842b0f6b608ec976a1187437f1c27b8e0603bcb..a3801bc0678ad1d523a33ff8bb7c0345daad5bba 100644
--- a/lib_dec/ivas_out_setup_conversion_fx.c
+++ b/lib_dec/ivas_out_setup_conversion_fx.c
@@ -662,13 +662,8 @@ void ivas_ls_setup_conversion_process_mdct_fx(
Word16 inChannels, outChannels, num_CPE;
Word16 transform_type[MAX_CICP_CHANNELS][2];
Word16 frameSize;
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
Word64 targetEnergy64[MAX_SFB + 2], dmxEnergy64[MAX_SFB + 2];
Word16 scf1, scf2;
-#else
- Word32 targetEnergy[MAX_SFB + 2], dmxEnergy[MAX_SFB + 2];
- Word16 dmxEnergy_exp[MAX_SFB + 2], dmxEnergy_exp_temp;
-#endif
Word32 dmxCoeff;
Word32 dmxSignalReal[L_FRAME48k], dmxSignalImag[L_FRAME48k];
Word32 eqGain;
@@ -753,20 +748,12 @@ void ivas_ls_setup_conversion_process_mdct_fx(
/* set overall frequency resolution of (sub)frame to maximum of (sub)frame, requires conversion if both channels are not the same */
frameSize = hLsSetUpConversion->sfbOffset[hLsSetUpConversion->sfbCnt];
move16();
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
set64_fx( targetEnergy64, 0, MAX_SFB + 2 );
set64_fx( dmxEnergy64, 0, MAX_SFB + 2 );
scf1 = 63;
scf2 = 63;
move16();
move16();
-#else
- set32_fx( targetEnergy, 0, MAX_SFB + 2 );
- set32_fx( dmxEnergy, 0, MAX_SFB + 2 );
- set16_fx( dmxEnergy_exp, 0, MAX_SFB + 2 );
- dmxEnergy_exp_temp = 0;
- move16();
-#endif
FOR( chOutIdx = 0; chOutIdx < outChannels; chOutIdx++ )
{
@@ -785,12 +772,9 @@ void ivas_ls_setup_conversion_process_mdct_fx(
/* Step 1: Compute the target energy and DMX signal (possible since we have all signals in TCX20 resolution) */
IF( dmxCoeff )
{
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
Word64 targetEne64;
Word32 tmpDMXSig;
-#else
- Word32 tmpDMXSig, targetEne;
-#endif
+
/* Convert the signal resolution to TCX20 */
/* initially, set pointers to input; if conversion occurs in (sub)frame, set to convertRes */
pTmp[0] = x[chInIdx][0]; // Q(q_output)
@@ -833,13 +817,8 @@ void ivas_ls_setup_conversion_process_mdct_fx(
stop = hLsSetUpConversion->sfbOffset[bandIdx + 1];
move16();
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
targetEne64 = 0;
move64();
-#else
- targetEne = 0;
- move32();
-#endif
/* Loop over all the bins in the band */
FOR( binIdx = start; binIdx < stop; binIdx++ )
@@ -847,30 +826,18 @@ void ivas_ls_setup_conversion_process_mdct_fx(
tmpDMXSig = Mpy_32_32( L_shl_sat( dmxCoeff, 1 ), sig[0][binIdx] );
dmxSignalReal[binIdx] = L_add( dmxSignalReal[binIdx], tmpDMXSig );
move32();
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
targetEne64 = W_mac_32_32( targetEne64, tmpDMXSig, tmpDMXSig );
-#else
- targetEne = L_add( targetEne, Mpy_32_32( tmpDMXSig, tmpDMXSig ) );
-#endif
tmpDMXSig = Mpy_32_32( L_shl_sat( dmxCoeff, 1 ), mdst[binIdx] );
dmxSignalImag[binIdx] = L_add( dmxSignalImag[binIdx], tmpDMXSig );
move32();
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
targetEne64 = W_mac_32_32( targetEne64, tmpDMXSig, tmpDMXSig );
-#else
- targetEne = L_add( targetEne, Mpy_32_32( tmpDMXSig, tmpDMXSig ) );
-#endif
}
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
+
targetEnergy64[bandIdx] = W_add( targetEnergy64[bandIdx], W_shr( targetEne64, 1 ) );
if ( NE_64( targetEnergy64[bandIdx], 0 ) )
{
scf1 = s_min( scf1, W_norm( targetEnergy64[bandIdx] ) );
}
-#else
- targetEnergy[bandIdx] = L_add( targetEnergy[bandIdx], targetEne );
- move32();
-#endif
} /* end of band loop */
}
}
@@ -878,28 +845,17 @@ void ivas_ls_setup_conversion_process_mdct_fx(
FOR( bandIdx = 0; bandIdx < hLsSetUpConversion->sfbCnt; bandIdx++ )
{
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
Word32 tmpReal, tmpImag;
Word64 DMXEne64;
-#else
- Word32 tmpReal, tmpImag, DMXEne;
- Word16 DMXEne_exp;
-#endif
+
start = hLsSetUpConversion->sfbOffset[bandIdx];
move16();
stop = hLsSetUpConversion->sfbOffset[bandIdx + 1];
move16();
/* Loop over all the bins in the band */
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
DMXEne64 = 0;
move64();
-#else
- DMXEne = 0;
- move32();
- DMXEne_exp = 0;
- move16();
-#endif
FOR( binIdx = start; binIdx < stop; binIdx++ )
{
@@ -907,39 +863,22 @@ void ivas_ls_setup_conversion_process_mdct_fx(
move32();
tmpImag = dmxSignalImag[binIdx];
move32();
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
DMXEne64 = W_mac_32_32( DMXEne64, tmpReal, tmpReal );
DMXEne64 = W_mac_32_32( DMXEne64, tmpImag, tmpImag );
-#else
- DMXEne = BASOP_Util_Add_Mant32Exp( DMXEne, DMXEne_exp, L_add( Mpy_32_32( tmpReal, tmpReal ), Mpy_32_32( tmpImag, tmpImag ) ), sub( 40, shl( q_output, 1 ) ), &DMXEne_exp );
-#endif
}
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
+
dmxEnergy64[bandIdx] = W_add( dmxEnergy64[bandIdx], W_shr( DMXEne64, 1 ) );
if ( NE_64( dmxEnergy64[bandIdx], 0 ) )
{
scf2 = s_min( scf2, W_norm( dmxEnergy64[bandIdx] ) );
}
-#else
- dmxEnergy[bandIdx] = BASOP_Util_Add_Mant32Exp( dmxEnergy[bandIdx], dmxEnergy_exp[bandIdx], DMXEne, DMXEne_exp, &dmxEnergy_exp[bandIdx] );
- move32();
- dmxEnergy_exp_temp = s_max( dmxEnergy_exp_temp, dmxEnergy_exp[bandIdx] );
-#endif
}
} /* end of out channel loop */
-#ifndef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
- /* Scaling to common exponent */
- FOR( bandIdx = 0; bandIdx < MAX_SFB + 2; bandIdx++ )
- {
- dmxEnergy[bandIdx] = L_shl( dmxEnergy[bandIdx], sub( dmxEnergy_exp[bandIdx], dmxEnergy_exp_temp ) );
- move32();
- }
-#endif
+
/* Step 3: Peform energy smoothing */
Word16 te_scale = getScaleFactor32( hLsSetUpConversion->targetEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt );
scale_sig32( hLsSetUpConversion->targetEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt, te_scale );
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
Word16 dmx_scale = getScaleFactor32( hLsSetUpConversion->dmxEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt );
scale_sig32( hLsSetUpConversion->dmxEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt, dmx_scale );
@@ -948,17 +887,9 @@ void ivas_ls_setup_conversion_process_mdct_fx(
Word16 dmxEnergy_e = sub( add( sub( 40, shl( q_output, 1 ) ), 1 ), scf2 );
Word16 dmx_max_e = s_max( dmxEnergy_e, sub( hLsSetUpConversion->dmx_prev_exp[0], dmx_scale ) );
-#else
- Word16 dmx_sacle = getScaleFactor32( hLsSetUpConversion->dmxEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt );
- scale_sig32( hLsSetUpConversion->dmxEnergyPrev_fx[0], hLsSetUpConversion->sfbCnt, dmx_sacle );
-
- Word16 te_max_e = s_max( sub( 40, shl( q_output, 1 ) ), sub( hLsSetUpConversion->te_prev_exp[0], te_scale ) );
- Word16 dmx_max_e = s_max( dmxEnergy_exp_temp, sub( hLsSetUpConversion->dmx_prev_exp[0], dmx_sacle ) );
-#endif
FOR( bandIdx = 0; bandIdx < hLsSetUpConversion->sfbCnt; bandIdx++ )
{
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
Word32 targetEnergy, dmxEnergy;
targetEnergy = W_extract_h( W_shl( targetEnergy64[bandIdx], scf1 ) );
@@ -972,16 +903,6 @@ void ivas_ls_setup_conversion_process_mdct_fx(
move32();
hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx] = dmxEnergy;
move32();
-#else
- targetEnergy[bandIdx] = L_add( Mpy_32_32( LS_OUT_CONV_SMOOTHING_FACTOR_Q31, L_shr( targetEnergy[bandIdx], sub( te_max_e, sub( 40, shl( q_output, 1 ) ) ) ) ), Mpy_32_32( ( ONE_IN_Q31 - LS_OUT_CONV_SMOOTHING_FACTOR_Q31 ), L_shr( hLsSetUpConversion->targetEnergyPrev_fx[0][bandIdx], sub( te_max_e, sub( hLsSetUpConversion->te_prev_exp[0], te_scale ) ) ) ) );
- move32();
- dmxEnergy[bandIdx] = L_add( Mpy_32_32( LS_OUT_CONV_SMOOTHING_FACTOR_Q31, L_shr( dmxEnergy[bandIdx], sub( dmx_max_e, dmxEnergy_exp_temp ) ) ), Mpy_32_32( ( ONE_IN_Q31 - LS_OUT_CONV_SMOOTHING_FACTOR_Q31 ), L_shr( hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx], sub( dmx_max_e, sub( hLsSetUpConversion->dmx_prev_exp[0], dmx_sacle ) ) ) ) );
- move32();
- hLsSetUpConversion->targetEnergyPrev_fx[0][bandIdx] = targetEnergy[bandIdx]; /* te_prev_exp = 40 - 2*q_output */
- move32();
- hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx] = dmxEnergy[bandIdx]; /* dmx_prev_exp = 40 - 2*q_output */
- move32();
-#endif
}
hLsSetUpConversion->te_prev_exp[0] = te_max_e; /* te_prev_exp = 40 - 2*q_output */
@@ -1015,13 +936,10 @@ void ivas_ls_setup_conversion_process_mdct_fx(
move16();
/* Compute Eq gains */
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
ivas_lssetupconversion_computeEQFactor_fx( &hLsSetUpConversion->targetEnergyPrev_fx[0][bandIdx], hLsSetUpConversion->te_prev_exp[0],
&hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx], hLsSetUpConversion->dmx_prev_exp[0],
&eqGain ); // Q(eqGain) = 30
-#else
- ivas_lssetupconversion_computeEQFactor_fx( &targetEnergy[bandIdx], hLsSetUpConversion->te_prev_exp[0], &dmxEnergy[bandIdx], hLsSetUpConversion->dmx_prev_exp[0], &eqGain ); // Q(eqGain) = 30
-#endif
+
FOR( binIdx = start; binIdx < stop; binIdx++ )
{
x[chInIdx][0][binIdx] = Mpy_32_32( L_shl( x[chInIdx][0][binIdx], 1 ), eqGain ); // Q - 1
@@ -1041,13 +959,10 @@ void ivas_ls_setup_conversion_process_mdct_fx(
move16();
/* Compute Eq gains */
-#ifdef FIX_1962_FORMAT_CONV_SPECTRAL_DIFF
ivas_lssetupconversion_computeEQFactor_fx( &hLsSetUpConversion->targetEnergyPrev_fx[0][bandIdx], hLsSetUpConversion->te_prev_exp[0],
&hLsSetUpConversion->dmxEnergyPrev_fx[0][bandIdx], hLsSetUpConversion->dmx_prev_exp[0],
&eqGain );
-#else
- ivas_lssetupconversion_computeEQFactor_fx( &targetEnergy[bandIdx], hLsSetUpConversion->te_prev_exp[0], &dmxEnergy[bandIdx], hLsSetUpConversion->dmx_prev_exp[0], &eqGain );
-#endif
+
FOR( subFrameIdx = 0; subFrameIdx < NB_DIV; subFrameIdx++ )
{
IF( EQ_16( transform_type[chInIdx][subFrameIdx], TCX_10 ) )
diff --git a/lib_dec/ivas_output_config_fx.c b/lib_dec/ivas_output_config_fx.c
index 9832cd8a6f68df32c09d970955ba5ef7bc8e9451..284bd08599ad2602396237350570c549f14f2ed8 100644
--- a/lib_dec/ivas_output_config_fx.c
+++ b/lib_dec/ivas_output_config_fx.c
@@ -603,7 +603,7 @@ void ivas_renderer_select(
return;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
+
/*-------------------------------------------------------------------------*
* ivas_renderer_secondary_select()
*
@@ -611,7 +611,7 @@ void ivas_renderer_select(
*-------------------------------------------------------------------------*/
/*! r: secondary binaural renderer type */
-RENDERER_TYPE ivas_renderer_secondary_select(
+RENDERER_TYPE ivas_renderer_secondary_select_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
)
{
@@ -639,4 +639,3 @@ RENDERER_TYPE ivas_renderer_secondary_select(
return renderer_type;
}
-#endif
diff --git a/lib_dec/ivas_qmetadata_dec_fx.c b/lib_dec/ivas_qmetadata_dec_fx.c
index f71a40e1cd353b67a81860dd8d88457a6a77b458..cc98c6ec494fba2b1fd1895bfb3e35de277421ce 100644
--- a/lib_dec/ivas_qmetadata_dec_fx.c
+++ b/lib_dec/ivas_qmetadata_dec_fx.c
@@ -1190,7 +1190,7 @@ Word16 ivas_qmetadata_dec_sid_decode(
IF( EQ_16( ivas_format, SBA_FORMAT ) )
{
sba_spar_bitlen = ivas_sba_spar_sid_bitlen_fx( nchan_transport );
- metadata_sid_bits = (int16_t) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS - SBA_ORDER_BITS - SBA_PLANAR_BITS - 1; /* -1 for inactive mode header bit*/
+ metadata_sid_bits = (Word16) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS - SBA_ORDER_BITS - SBA_PLANAR_BITS - 1; /* -1 for inactive mode header bit*/
metadata_sid_bits = sub( metadata_sid_bits, sba_spar_bitlen );
}
ELSE
diff --git a/lib_dec/ivas_rom_dec_fx.c b/lib_dec/ivas_rom_dec_fx.c
index 8b2a2d27e30190397fede143c25f4d1ac07b923c..ae0ccf31ce837c7488dc9683bad2da8e4fd0a18e 100644
--- a/lib_dec/ivas_rom_dec_fx.c
+++ b/lib_dec/ivas_rom_dec_fx.c
@@ -357,8 +357,6 @@ const UWord16 * const sym_freq_ECSQ_tab_abs_lsbs[1 + 4] =
* DirAC ROM tables
*----------------------------------------------------------------------------------*/
-
-
/*Q10*/
const Word16 dirac_dithering_azi_scale_fx[DIRAC_DIFFUSE_LEVELS] =
{
@@ -369,10 +367,6 @@ const Word16 dirac_dithering_ele_scale_fx[DIRAC_DIFFUSE_LEVELS] =
{
1375 ,2072 ,3680 ,5743 ,9468 ,15979 ,21410 ,28252
};
-/*----------------------------------------------------------------------------------*
- * FASTCONV and PARAMETRIC binaural renderer ROM tables
- *----------------------------------------------------------------------------------*/
-
/*----------------------------------------------------------------------*
diff --git a/lib_dec/ivas_sba_dec_fx.c b/lib_dec/ivas_sba_dec_fx.c
index 6a77c5c0ec6068c60b854d6489f8d0117521e487..ea7e100a15db37363db57d012c49652c784fc0f9 100644
--- a/lib_dec/ivas_sba_dec_fx.c
+++ b/lib_dec/ivas_sba_dec_fx.c
@@ -108,11 +108,6 @@ void ivas_sba_set_cna_cng_flag(
ivas_error ivas_sba_dec_reconfigure_fx(
Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord16 *nSamplesFlushed, /* o : number of samples flushed Q0*/
- Word16 *data /* o : output synthesis signal Q0*/
-#endif
)
{
Word16 nchan_transport_old, nSCE_old, nCPE_old, nchan_hp20_old;
@@ -179,10 +174,6 @@ ivas_error ivas_sba_dec_reconfigure_fx(
st_ivas->sba_analysis_order = ivas_sba_get_analysis_order_fx( ivas_total_brate, st_ivas->sba_order );
-#ifndef FIX_HRTF_LOAD
- *nSamplesFlushed = 0;
- move16();
-#endif
granularity_new = st_ivas->hTcBuffer->n_samples_granularity; /*Q0*/
move16();
@@ -192,6 +183,7 @@ ivas_error ivas_sba_dec_reconfigure_fx(
test();
IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) && ( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) )
{
+#ifndef NONBE_1303_REND_GRANULARITY
RENDERER_TYPE renderer_type_new;
Word16 sba_order_internal;
@@ -215,7 +207,9 @@ ivas_error ivas_sba_dec_reconfigure_fx(
ELSE
{
test();
- IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
+ test();
+ test();
+ IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
{
renderer_type_new = RENDERER_BINAURAL_FASTCONV;
move16();
@@ -226,8 +220,11 @@ ivas_error ivas_sba_dec_reconfigure_fx(
move16();
}
}
-
+#endif
/* determine new granularity */
+#ifdef NONBE_1303_REND_GRANULARITY
+ granularity_new = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, ivas_renderer_secondary_select_fx( st_ivas ), st_ivas->hDecoderConfig->output_Fs );
+#else
granularity_new = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); /*Q0*/
move16();
@@ -237,34 +234,16 @@ ivas_error ivas_sba_dec_reconfigure_fx(
{
granularity_new = i_mult( granularity_new, JBM_CLDFB_SLOTS_IN_SUBFRAME ); /*Q0*/
}
+#endif
/* flush renderer on granularity change form 5ms to 1.25ms, again only possible for binaural rendering */
IF( LT_16( granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
{
-#ifdef FIX_HRTF_LOAD
/* flush already done in IVAS_DEC_ReadFormat() */
-#else
- /* write back info for correct rendering of the flushable samples */
- st_ivas->sba_analysis_order = sba_analysis_order_old_flush; /*Q0*/
- move16();
- st_ivas->hDecoderConfig->ivas_total_brate = last_ivas_total_brate; /*Q0*/
- move32();
-
- if ( NE_32( ( error = ivas_jbm_dec_flush_renderer_fx( st_ivas, granularity_new, st_ivas->renderer_type, st_ivas->intern_config, &st_ivas->hIntSetup, st_ivas->mc_mode, ism_mode_old, nSamplesFlushed, data ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
-
- /* restore correct values for the current frame*/
- st_ivas->sba_analysis_order = ivas_sba_get_analysis_order_fx( ivas_total_brate, st_ivas->sba_order );
- move16();
- st_ivas->hDecoderConfig->ivas_total_brate = ivas_total_brate; /*Q0*/
- move32();
-#endif
}
ELSE IF( GT_16( granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
{
- if ( NE_32( ( error = ivas_jbm_dec_set_discard_samples( st_ivas ) ), IVAS_ERR_OK ) )
+ if ( NE_32( ( error = ivas_jbm_dec_set_discard_samples_fx( st_ivas ) ), IVAS_ERR_OK ) )
{
return error;
}
@@ -592,6 +571,7 @@ ivas_error ivas_sba_dec_reconfigure_fx(
{
return error;
}
+
nchan_transport = add( nchan_transport, st_ivas->nchan_ism );
st_ivas->nCPE = shr_r( nchan_transport, 1 );
move16();
@@ -608,6 +588,7 @@ ivas_error ivas_sba_dec_reconfigure_fx(
{
ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );
}
+
nchan_transport = st_ivas->nchan_transport;
move16();
nchan_transport_old = add( nchan_transport_old, st_ivas->nchan_ism ); /*Q0*/
@@ -764,21 +745,17 @@ ivas_error ivas_sba_dec_reconfigure_fx(
}
/*-----------------------------------------------------------------*
- * floating-point output audio buffers
+ * output audio buffers
*-----------------------------------------------------------------*/
nchan_out_buff = ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); /*Q0*/
- if ( NE_32( ( error = ivas_output_buff_dec_fx( st_ivas->p_output_fx, nchan_out_buff_old, nchan_out_buff ) ), IVAS_ERR_OK ) )
+ IF( NE_32( ( error = ivas_output_buff_dec_fx( st_ivas->p_output_fx, nchan_out_buff_old, nchan_out_buff ) ), IVAS_ERR_OK ) )
{
return error;
}
-#ifdef FIX_HRTF_LOAD
return IVAS_ERR_OK;
-#else
- return error;
-#endif
}
@@ -899,22 +876,41 @@ ivas_error ivas_sba_dec_render_fx(
Word32 *output_fx[] /* o : rendered time signal Q11*/
)
{
- Word16 slots_to_render, first_sf, last_sf, subframe_idx;
+ Word16 slots_to_render, first_sf, last_sf, subframe_idx, n_samples_sf;
UWord16 slot_size, ch;
UWord16 nchan_internal, nchan_out;
SPAR_DEC_HANDLE hSpar;
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
- Word32 *output_f_local_fx[MAX_OUTPUT_CHANNELS];
+ Word32 *output_fx_local[MAX_OUTPUT_CHANNELS];
ivas_error error;
hSpar = st_ivas->hSpar;
hSpatParamRendCom = st_ivas->hSpatParamRendCom;
nchan_internal = ivas_sba_get_nchan_metadata_fx( st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );
nchan_out = add( st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hIntSetup.num_lfe ); /*Q0*/
+#ifdef FIX_NCHAN_BUFFERS
+ IF( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
+ {
+ nchan_out = s_max( nchan_internal, st_ivas->hDecoderConfig->nchan_out );
+
+ IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
+ {
+ nchan_out = s_max( nchan_internal, sub( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_ism ) );
+ }
+#ifdef FIX_1372_OSBA_OBJECT_EDITING
+ ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
+ {
+ nchan_out = BINAURAL_CHANNELS;
+ move16();
+ }
+#endif
+ }
+ nchan_out = s_min( nchan_out, ivas_get_nchan_buffers_dec_fx( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ) );
+#endif
FOR( ch = 0; ch < nchan_out; ch++ )
{
- output_f_local_fx[ch] = output_fx[ch]; /*Q11*/
+ output_fx_local[ch] = output_fx[ch]; /*Q11*/
}
slot_size = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ); /*Q0*/
@@ -936,12 +932,13 @@ ivas_error ivas_sba_dec_render_fx(
FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
{
- Word16 n_samples_sf = imult1616( slot_size, hSpar->subframe_nbslots[subframe_idx] ); /*Q0*/
+ n_samples_sf = imult1616( slot_size, hSpar->subframe_nbslots[subframe_idx] ); /*Q0*/
+
+ ivas_spar_dec_upmixer_sf_fx( st_ivas, output_fx_local, nchan_internal );
- ivas_spar_dec_upmixer_sf_fx( st_ivas, output_f_local_fx, nchan_internal );
FOR( ch = 0; ch < nchan_out; ch++ )
{
- output_f_local_fx[ch] = output_f_local_fx[ch] + n_samples_sf; /*Q11*/
+ output_fx_local[ch] = output_fx_local[ch] + n_samples_sf; /*Q11*/
}
/* update combined orientation access index */
ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );
diff --git a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c
index cf22a4048ff6a45d7ca201e8b362a9de48d1181c..42a2524f1f6676a2f216159767685da2dbb0d4ae 100644
--- a/lib_dec/ivas_sba_dirac_stereo_dec_fx.c
+++ b/lib_dec/ivas_sba_dirac_stereo_dec_fx.c
@@ -622,6 +622,7 @@ static void map_params_dirac_to_stereo(
move32();
}
}
+
/* Clamp values here. [-1, 1] is the allowed range, but due to precision issues they can be slightly off which can cause problems later. */
/* In Q31, this clamping happens implicitly */
q_sqrt = 0;
@@ -642,6 +643,7 @@ static void map_params_dirac_to_stereo(
q_sqrt = 0;
move16();
}
+
/* for residual prediction gain, allowed range is [0, 1]*/
res_pred_gain[b] = L_max( Mpy_32_16_1( diffuseness[b], sub( MAX_16, surrCoh[b] ) ), 0 ); /*Q31*/
move32();
diff --git a/lib_dec/ivas_sba_rendering_internal_fx.c b/lib_dec/ivas_sba_rendering_internal_fx.c
index 7a96185b9c7a8838e8cfd40e4502a9ad1a610b60..bf64b92d83928ff6d148c270d846f37b3c4409c9 100644
--- a/lib_dec/ivas_sba_rendering_internal_fx.c
+++ b/lib_dec/ivas_sba_rendering_internal_fx.c
@@ -49,7 +49,7 @@
* SBA signals transformed into MC in CLDFB domain
*-------------------------------------------------------------------------*/
-void ivas_sba2mc_cldfb_fixed(
+void ivas_sba2mc_cldfb_fx(
IVAS_OUTPUT_SETUP hInSetup, /* i : Format of input layout */
Word32 RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb real part (Q_real) */
Word32 ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: cldfb imag part (Q_imag) */
@@ -65,10 +65,10 @@ void ivas_sba2mc_cldfb_fixed(
Word32 *p_real_fx, *p_imag_fx, *p_realOut_fx, *p_imagOut_fx;
Word16 nb_channels_in;
- push_wmops( "ivas_sba2mc_cldfb_fixed" );
+ push_wmops( "ivas_sba2mc_cldfb_fx" );
nb_channels_in = hInSetup.nchan_out_woLFE; /*Q0*/
move16();
- assert( EQ_16( nb_channels_in, 16 ) && EQ_16( nb_channels_out, 11 ) && "ivas_sba2mc_cldfb_fixed; only HOA3 to CICP19 is for now supported!" );
+ assert( EQ_16( nb_channels_in, 16 ) && EQ_16( nb_channels_out, 11 ) && "ivas_sba2mc_cldfb_fx; only HOA3 to CICP19 is for now supported!" );
FOR( n = 0; n < nb_channels_out; n++ )
{
@@ -121,6 +121,7 @@ void ivas_sba2mc_cldfb_fixed(
return;
}
+
/*-------------------------------------------------------------------------*
* ivas_mc2sba()
*
@@ -129,12 +130,11 @@ void ivas_sba2mc_cldfb_fixed(
void ivas_mc2sba_fx(
IVAS_OUTPUT_SETUP hIntSetup, /* i : Format of decoder output */
- Word32 *in_buffer_td_fx[],
- /* i : MC signals (on input) and the HOA3 (on output) */ /*Q*/
- Word32 *buffer_td_fx[], /* i/o: MC signals (on input) and the HOA3 (on output) Q*/
- const Word16 output_frame, /* i : output frame length per channel Q0*/
- const Word16 sba_order, /* i : Ambisonic (SBA) order Q0*/
- const Word16 gain_lfe_fx /* i : gain for LFE, 0 = ignore LFE Q14*/
+ Word32 *in_buffer_td_fx[], /* i : MC signals (on input) and the HOA3 (on output) Q*/
+ Word32 *buffer_td_fx[], /* i/o: MC signals (on input) and the HOA3 (on output) Q*/
+ const Word16 output_frame, /* i : output frame length per channel Q0*/
+ const Word16 sba_order, /* i : Ambisonic (SBA) order Q0*/
+ const Word16 gain_lfe_fx /* i : gain for LFE, 0 = ignore LFE Q14*/
)
{
Word16 i, j, k;
@@ -218,6 +218,7 @@ void ivas_mc2sba_fx(
* MC signals transformed into SBA in CLDFB domain
* used for binaural rendering with head rotation
*-------------------------------------------------------------------------*/
+
void ivas_param_mc_mc2sba_cldfb_fx(
IVAS_OUTPUT_SETUP hTransSetup, /* i : transported MC Format */
Word32 *hoa_encoder_fx, /* i : HOA3 encoder for the transported MC format Q31*/
@@ -342,23 +343,25 @@ Word16 ivas_sba_remapTCs_fx(
}
}
}
+
return ( nchan_remapped );
}
+
/*-------------------------------------------------------------------------*
* ivas_ism2sba_sf()
*
* ISM transformed into SBA in TD domain.
*-------------------------------------------------------------------------*/
+
void ivas_ism2sba_sf_fx(
- Word32 *buffer_in_fx[],
- /* i : TC buffer */ /*Q_buffer_in*/
- Word32 *buffer_out_fx[], /* o : TD signal buffers Q_buffer_in + 29 - 31*/
- ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */
- const Word16 num_objects, /* i : number of objects Q0*/
- const Word16 n_samples_to_render, /* i : output frame length per channel Q0*/
- const Word16 offset, /* i : offset for the interpolatr Q0*/
- const Word16 sba_order /* i : Ambisonic (SBA) order Q0*/
+ Word32 *buffer_in_fx[], /* i : TC buffer Q_buffer_in*/
+ Word32 *buffer_out_fx[], /* o : TD signal buffers Q_buffer_in + 29 - 31*/
+ ISM_RENDERER_HANDLE hIsmRendererData, /* i/o: renderer data */
+ const Word16 num_objects, /* i : number of objects Q0*/
+ const Word16 n_samples_to_render, /* i : output frame length per channel Q0*/
+ const Word16 offset, /* i : offset for the interpolatr Q0*/
+ const Word16 sba_order /* i : Ambisonic (SBA) order Q0*/
)
{
Word16 i, j, k;
@@ -380,9 +383,13 @@ void ivas_ism2sba_sf_fx(
FOR( j = 0; j < sba_num_chans; j++ )
{
g2_fx = hIsmRendererData->interpolator_fx + offset; /*Pointer addition*/ /*Q15*/
- tc_fx = buffer_in_fx[i] + offset; /*Pointer addition*/ /*Q_buffer_in*/
- out_fx = buffer_tmp_fx[j]; /*Q_buffer_in + 29 - 31*/
- gain_fx = hIsmRendererData->gains_fx[i][j]; /*Q29*/
+#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS
+ tc_fx = buffer_in_fx[i]; /*Q_buffer_in*/
+#else
+ tc_fx = buffer_in_fx[i] + offset; /*Pointer addition*/ /*Q_buffer_in*/
+#endif
+ out_fx = buffer_tmp_fx[j]; /*Q_buffer_in + 29 - 31*/
+ gain_fx = hIsmRendererData->gains_fx[i][j]; /*Q29*/
move32();
prev_gain_fx = hIsmRendererData->prev_gains_fx[i][j]; /*Q29*/
move32();
@@ -397,24 +404,24 @@ void ivas_ism2sba_sf_fx(
}
}
}
+
FOR( j = 0; j < sba_num_chans; j++ )
{
Copy32( buffer_tmp_fx[j], buffer_out_fx[j], n_samples_to_render ); /*Q_buffer_in + 29 - 31*/
}
+
return;
}
+
/*-------------------------------------------------------------------*
* ivas_sba_linear_renderer()
*
* Linear rendering for SBA format
*-------------------------------------------------------------------*/
-/*TODO: To be tested*/
-/************************
-Float to fixed conversion required for:output_f
-*************************/
+
ivas_error ivas_sba_linear_renderer_fx(
- Word32 *output_f[], /* i/o: synthesized core-coder transport channels/DirAC output Q11*/
+ Word32 *output_fx[], /* i/o: synthesized core-coder transport channels/DirAC output Q11*/
const Word16 output_frame, /* i : output frame length per channel Q0*/
const Word16 nchan_in, /* i : number of input ambisonics channels Q0*/
const Word16 nchan_ism, /* i : number of objects Q0*/
@@ -451,17 +458,17 @@ ivas_error ivas_sba_linear_renderer_fx(
case IVAS_AUDIO_CONFIG_HOA3: /* Ambisonics output, order: 3 */
FOR( i = nchan_hoa; i < output_setup.nchan_out_woLFE; i++ )
{
- set_zero_fx( output_f[i], output_frame );
+ set_zero_fx( output_fx[i], output_frame );
}
BREAK;
case IVAS_AUDIO_CONFIG_EXTERNAL:
FOR( i = output_setup.nchan_out_woLFE - 1; i >= nchan_ism; i-- )
{
- Copy32( output_f[i - nchan_ism], output_f[i], output_frame ); /*Q11*/
+ Copy32( output_fx[i - nchan_ism], output_fx[i], output_frame ); /*Q11*/
}
FOR( ; i >= 0; i-- )
{
- set_zero_fx( output_f[i], output_frame );
+ set_zero_fx( output_fx[i], output_frame );
}
BREAK;
default:
@@ -477,6 +484,7 @@ ivas_error ivas_sba_linear_renderer_fx(
*
* Determine SBA mixing matrices
*-------------------------------------------------------------------*/
+
void ivas_sba_mix_matrix_determiner_fx(
SPAR_DEC_HANDLE hSpar, /* i/o: SPAR decoder handle */
Word32 *output_fx[], /* i/o: transport/output audio channels Q_output*/
@@ -491,6 +499,7 @@ void ivas_sba_mix_matrix_determiner_fx(
Word16 num_bands_out, nchan_transport, nchan_out;
Word16 Q_p_output = add( 11, Q_output );
Word32 temp_fx;
+
/* Convert numeric range */
FOR( ch = 0; ch < nchan_remapped; ch++ )
{
@@ -520,6 +529,7 @@ void ivas_sba_mix_matrix_determiner_fx(
move16();
nchan_out = nchan_transport; /*Q0*/
move16();
+
ivas_agc_dec_process_fx( hSpar->hAgcDec, ( output_fx ), ( output_fx ), nchan_transport, output_frame );
Q_p_output = sub( Q_p_output, 3 );
#ifdef DEBUGGING
@@ -538,6 +548,8 @@ void ivas_sba_mix_matrix_determiner_fx(
/* Mixing matrix determiner */
num_bands_out = hSpar->hFbMixer->pFb->filterbank_num_bands; /*Q0*/
move16();
+
ivas_spar_dec_gen_umx_mat_fx( hSpar->hMdDec, nchan_transport, num_bands_out, bfi, num_md_sub_frames );
+
return;
}
diff --git a/lib_dec/ivas_spar_decoder_fx.c b/lib_dec/ivas_spar_decoder_fx.c
index d0c22e7b6c8f1e07df8a62282775d6e621f6a833..12a916fbe490ea505582b7248fac025cec7742d9 100644
--- a/lib_dec/ivas_spar_decoder_fx.c
+++ b/lib_dec/ivas_spar_decoder_fx.c
@@ -292,6 +292,11 @@ ivas_error ivas_spar_dec_open_fx(
move16();
}
+#ifdef NONBE_1303_REND_GRANULARITY
+ granularity = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, ivas_renderer_secondary_select_fx( st_ivas ), output_Fs );
+
+ IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, granularity ) ), IVAS_ERR_OK ) )
+#else
test();
test();
@@ -303,6 +308,7 @@ ivas_error ivas_spar_dec_open_fx(
}
IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, granularity ) ), IVAS_ERR_OK ) )
+#endif
{
return error;
}
@@ -702,7 +708,7 @@ void ivas_spar_get_cldfb_gains_fx(
cf_end = add( sub( hSpar->hFbMixer->cross_fade_end_offset, encfb_delay ), decfb_delay ); /*Q0*/
cf_len = sub( cf_end, cf_start );
weights_fx = hSpar->hFbMixer->cldfb_cross_fade_fx; /*hSpar->hFbMixer->cldfb_cross_fade_q*/
- cf_cldfb_start = shr( extract_l( ceil_fixed( sub( divide1616( sub( cf_start, shr( decfb_delay, 1 ) ), shl( stride, 9 ) ), 32 ), 6 ) ), 6 ); /*Q0*/
+ cf_cldfb_start = shr( extract_l( ceil_fx( sub( divide1616( sub( cf_start, shr( decfb_delay, 1 ) ), shl( stride, 9 ) ), 32 ), 6 ) ), 6 ); /*Q0*/
cf_cldfb_end = shr( divide1616( add( sub( cf_start, shr( decfb_delay, 1 ) ), cf_len ), shl( stride, 9 ) ), 6 ); /*q-factor of stride is 9(as max value is 60)*/ /*Q0*/
num_cf_slots = add( sub( cf_cldfb_end, cf_cldfb_start ), 1 ); /*Q0*/
num_samples = add( imult1616( num_cf_slots, stride ), sub( pt_len, stride ) ); /*Q0*/
@@ -1753,9 +1759,13 @@ void ivas_spar_dec_upmixer_sf_fx(
p_tc_fx[i] = st_ivas->hTcBuffer->tc_fx[( i + nchan_ism )] + prod; /*Q11*/
}
+#ifdef FIX_1372_OSBA_OBJECT_EDITING
+ IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
+#else
test();
test();
IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
+#endif
{
FOR( i = 0; i < nchan_ism; i++ )
{
diff --git a/lib_dec/ivas_stat_dec.h b/lib_dec/ivas_stat_dec.h
index edf9729cedb15a3b209b976647ac2e468033fb1f..289b91b775581bc1cc10616ad2cffb519a31b3f1 100644
--- a/lib_dec/ivas_stat_dec.h
+++ b/lib_dec/ivas_stat_dec.h
@@ -463,10 +463,8 @@ typedef struct ivas_param_ism_dec_data_structure
Word32 elevation_values_fx[MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS]; /* Q22 */
Word16 power_ratios_fx[MAX_PARAM_ISM_NBANDS][MAX_PARAM_ISM_NBLOCKS][MAX_PARAM_ISM_WAVE]; /* Q15 */
-#ifdef OBJ_EDITING_API
- Word32 edited_azimuth_values_fx[MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS];
- Word32 edited_elevation_values_fx[MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS];
-#endif
+ Word32 edited_azimuth_values_fx[MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS]; // Q22
+ Word32 edited_elevation_values_fx[MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS]; // Q22
/*sub-modules*/
PARAM_ISM_CONFIG_HANDLE hParamIsm; /* Parametric ISM common handle */
@@ -720,9 +718,7 @@ typedef struct ivas_osba_data
Word16 delayBuffer_size;
Word16 delayBuffer_nchan;
-#ifdef OBJ_EDITING_API
- Word32 gain_bed_fx;
-#endif
+ Word32 gain_bed_fx; // Q29
} SBA_ISM_DATA, *SBA_ISM_DATA_HANDLE;
@@ -955,32 +951,44 @@ typedef struct ivas_masa_ism_ext_data_structure
/* Data structure for MASA_ISM rendering */
typedef struct ivas_masa_ism_data_structure
{
- Word16 azimuth_ism[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
- Word16 elevation_ism[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
+ Word16 azimuth_ism_fx[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR]; // Q0
+ Word16 elevation_ism_fx[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR]; // Q0
Word32 energy_ratio_ism_fx[MAX_NUM_OBJECTS][MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR][CLDFB_NO_CHANNELS_MAX]; /* Q30 */
Word32 masa_to_total_energy_ratio_fx[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; /* Q30 */
- Word16 azimuth_ism_edited[MAX_NUM_OBJECTS];
- Word16 elevation_ism_edited[MAX_NUM_OBJECTS];
- UWord8 ism_is_edited[MAX_NUM_OBJECTS];
-#ifdef OBJ_EDITING_API
- Word32 gain_ism[MAX_NUM_OBJECTS];
- Word32 gain_masa;
-#endif
+ Word16 azimuth_ism_edited_fx[MAX_NUM_OBJECTS]; // Q0
+ Word16 elevation_ism_edited_fx[MAX_NUM_OBJECTS]; // Q0
+
+ UWord8 ism_dir_is_edited[MAX_NUM_OBJECTS];
+ Word16 gain_ism_fx[MAX_NUM_OBJECTS];
+ Word16 gain_masa_fx;
+
+ Word16 gain_ism_edited_fx[MAX_NUM_OBJECTS]; // Q12
+ UWord8 ism_gain_is_edited[MAX_NUM_OBJECTS];
+ Word16 gain_masa_edited_fx; // Q12
+ UWord8 masa_gain_is_edited;
Word16 idx_separated_ism;
- Word16 azimuth_separated_ism[MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
- Word16 elevation_separated_ism[MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
+ Word16 azimuth_separated_ism_fx[MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
+ Word16 elevation_separated_ism_fx[MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR];
Word32 q_azimuth_old_fx[MAX_NUM_OBJECTS]; /* Q22 */
Word32 q_elevation_old_fx[MAX_NUM_OBJECTS]; /* Q22 */
- Word16 ismPreprocMatrix_fx[2][2][CLDFB_NO_CHANNELS_MAX]; /* Q15 */
- UWord8 objectsMoved;
- Word32 eneMoveIIR_fx[2][CLDFB_NO_CHANNELS_MAX]; /*Q-22*/
- Word32 enePreserveIIR_fx[2][CLDFB_NO_CHANNELS_MAX]; /*Q-22*/
- Word32 preprocEneTarget_fx[CLDFB_NO_CHANNELS_MAX]; /*Q-19*/
- Word32 preprocEneRealized_fx[CLDFB_NO_CHANNELS_MAX]; /*Q-19*/
+ UWord8 objectsEdited;
+ Word32 preprocEneTarget_fx[MASA_FREQUENCY_BANDS];
+ Word16 preprocEneTarget_e[MASA_FREQUENCY_BANDS];
+ Word32 preprocEneRealized_fx[MASA_FREQUENCY_BANDS];
+ Word16 preprocEneRealized_e[MASA_FREQUENCY_BANDS];
+ Word32 ismPreprocMatrix_fx[2][2][MASA_FREQUENCY_BANDS]; // Q28?
+ // Word16 ismPreprocMatrix_e[2][2][MASA_FREQUENCY_BANDS]; // Not needed?
+ Word32 eneMoveIIR_fx[2][MASA_FREQUENCY_BANDS];
+ Word16 eneMoveIIR_e[2][MASA_FREQUENCY_BANDS];
+ Word32 enePreserveIIR_fx[2][MASA_FREQUENCY_BANDS];
+ Word16 enePreserveIIR_e[2][MASA_FREQUENCY_BANDS];
+ Word32 eneOrigIIR_fx[MASA_FREQUENCY_BANDS];
+ Word16 eneOrigIIR_e[MASA_FREQUENCY_BANDS];
+ Word16 bits_ism[MAX_NUM_OBJECTS];
Word32 **delayBuffer_fx; /* Q11 */
Word16 delayBuffer_size;
@@ -997,9 +1005,9 @@ typedef struct ivas_masa_ism_data_structure
typedef struct decoder_tc_buffer_structure
{
- Word32 *tc_buffer_fx; /* the buffer itself */ /*stores memory length of tc buffer*/
- Word32 *tc_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS]; /* pointers into the buffer to the beginning of each tc Q11 for ivas */ // VE2SB: TBV
- Word16 no_channels; /*Stores no of channels in tc_fx with values*/
+ Word32 *tc_buffer_fx; /* the buffer itself */ /*stores memory length of tc buffer*/
+ Word32 *tc_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS]; /* pointers into the buffer to the beginning of each tc Q11 for ivas */
+ Word16 no_channels; /*Stores no of channels in tc_fx with values*/
Word16 q_tc_fx;
TC_BUFFER_MODE tc_buffer_mode; /* mode of the buffer (no buffering, render buffering, out buffering) */
Word16 nchan_transport_jbm; /* number of TCs after TC decoding */
@@ -1062,6 +1070,7 @@ typedef struct decoder_config_structure
Word16 Opt_ExternalOrientation; /* indicates whether external orientations are used */
Word16 Opt_dpid_on; /* indicates whether Directivity pattern option is used */
Word16 Opt_aeid_on; /* indicates whether Acoustic environment option is used */
+ Word16 Opt_ObjEdit_on; /* indicates whether object editing option is used */
Word16 Opt_tsm; /* indicates whether time scaling modification is activated */
IVAS_RENDER_FRAMESIZE render_framesize;
Word16 Opt_delay_comp; /* flag indicating delay compensation active */
@@ -1151,11 +1160,7 @@ typedef struct Decoder_Struct
MONO_DOWNMIX_RENDERER_HANDLE hMonoDmxRenderer; /* Mono downmix structure */
CREND_WRAPPER_HANDLE hCrendWrapper; /* Crend handle */
REVERB_HANDLE hReverb; /* Reverb handle */
-#ifdef FIX_CREND_SIMPLIFY_CODE
HRTFS_CREND_HANDLE hHrtfCrend; /* HRTF tables for CRend binaural renderer */
-#else
- HRTFS_CREND_HANDLE hSetOfHRTF; /* Set of HRTFs handle (CRend) */
-#endif
HRTFS_FASTCONV_HANDLE hHrtfFastConv; /* FASTCONV HRTF tables for binaural rendering */
HRTFS_PARAMBIN_HANDLE hHrtfParambin; /* HRTF tables for parametric binauralizer */
HRTFS_STATISTICS_HANDLE hHrtfStatistics; /* HRTF statistics handle */
diff --git a/lib_dec/ivas_stereo_cng_dec_fx.c b/lib_dec/ivas_stereo_cng_dec_fx.c
index b8336c928b752dbbae8c6745e4a550fd62825ba8..1f0cff11077368b5c1310c38e19172fc40cb71ae 100644
--- a/lib_dec/ivas_stereo_cng_dec_fx.c
+++ b/lib_dec/ivas_stereo_cng_dec_fx.c
@@ -59,8 +59,8 @@
#define CM_INIT 50
#define CORR_INIT 8
#define SID_INIT 6
-#define STEREO_CNA_LR_CORR_LT_FILT_FX 2040109440 /* long-term averaging factor for L/R correlation estimation in stereo CNA */
-#define STEREO_CNA_ILD_LT_FILT_FX 1932735283 /* long-term averaging factor for ILD estimation in stereo CNA */
+#define STEREO_CNA_LR_CORR_LT_FILT_FX 2040109440 /* long-term averaging factor for L/R correlation estimation in stereo CNA, == 0.95f */
+#define STEREO_CNA_ILD_LT_FILT_FX 1932735283 /* long-term averaging factor for ILD estimation in stereo CNA, == 0.9f */
/*-------------------------------------------------------------------
* stereo_dft_dec_sid_coh()
diff --git a/lib_dec/ivas_stereo_dft_dec_fx.c b/lib_dec/ivas_stereo_dft_dec_fx.c
index 789305f4884a24f2afdf2036a03d123077dfc2d9..aa8d428c7af303c3412fca48b142e3ab22c09220 100644
--- a/lib_dec/ivas_stereo_dft_dec_fx.c
+++ b/lib_dec/ivas_stereo_dft_dec_fx.c
@@ -3161,21 +3161,16 @@ void stereo_dft_generate_res_pred_fx(
move32();
DFT_PRED_RES[2 * i + 1] = L_add( L_shl( Mpy_32_16_1( hStereoDft->DFT_past_DMX_fx[d_short_ind][2 * i + 1], g_short ), q_shift0 ), L_shl( Mpy_32_16_1( hStereoDft->DFT_past_DMX_fx[d_long_ind][2 * i + 1], g_long ), q_shift1 ) ); /* q_dft */
move32();
-#ifndef FIX_1946_CRASH_JBM_PROCESSING
- past_dmx_nrg = Madd_32_32( Madd_32_32( past_dmx_nrg, DFT_PRED_RES[2 * i], DFT_PRED_RES[2 * i] ), DFT_PRED_RES[2 * i + 1], DFT_PRED_RES[2 * i + 1] ); /* q_dft */
-#endif
}
test();
IF( !bfi || GE_16( b, hStereoDft->res_cod_band_max ) )
{
Word16 q_div;
Word16 op;
-#ifdef FIX_1946_CRASH_JBM_PROCESSING
FOR( i = hStereoDft->band_limits[b]; i < len; i++ )
{
past_dmx_nrg = Madd_32_32( Madd_32_32( past_dmx_nrg, DFT_PRED_RES[2 * i], DFT_PRED_RES[2 * i] ), DFT_PRED_RES[2 * i + 1], DFT_PRED_RES[2 * i + 1] ); /* q_dft */
}
-#endif
op = BASOP_Util_Divide3232_Scale( L_add( 1, dmx_nrg ), L_add( 1, past_dmx_nrg ), &q_div ); /* q_sqrt */
q_sqrt = q_div;
move16();
@@ -4356,11 +4351,10 @@ void stereo_dft_dec_read_BS_fx(
ecsq_inst.config_index = sub( shl( hStereoDft->res_cod_mode[k_offset], 1 ), 1 ); /* Q0 */
move16();
- ECSQ_decode( &ecsq_inst, hStereoDft->res_cod_line_max, dec );
+ ECSQ_decode_fx( &ecsq_inst, hStereoDft->res_cod_line_max, dec );
n_bits = rc_uni_dec_virtual_finish_fx( &range_uni_dec_state ); /* Q0 */
-
set_zero_fx( res_buf_fx, STEREO_DFT_N_8k );
FOR( Word16 c = 0; c < hStereoDft->res_cod_line_max; c++ )
{
diff --git a/lib_dec/ivas_stereo_dft_plc_fx.c b/lib_dec/ivas_stereo_dft_plc_fx.c
index c29e1e4b54805a2b8dcfb596281740043c7d59b9..4b47d0a1d840d2564975bc4e57e5b3039fb4169c 100644
--- a/lib_dec/ivas_stereo_dft_plc_fx.c
+++ b/lib_dec/ivas_stereo_dft_plc_fx.c
@@ -124,7 +124,7 @@ void stereo_dft_res_ecu_fx(
rfft_fx( res_buf, trigo_dec, L_FRAME8k, +1 );
- v_multc_fixed_16( res_buf, fac, res_buf, L_FRAME8k ); /* hStereoDft->q_dft */
+ v_multc_fx_16( res_buf, fac, res_buf, L_FRAME8k ); /* hStereoDft->q_dft */
Copy32( res_buf + ( OFFSET8k - ZP8k ), &hStereoDft->res_cod_mem_fx[0], STEREO_DFT_OVL_8k ); /* hStereoDft->q_dft */
hStereoDft->q_res_cod_mem_fx = hStereoDft->q_dft;
move16();
@@ -145,7 +145,7 @@ void stereo_dft_res_ecu_fx(
v_shr_32( res_buf, res_buf, L_FRAME8k, negate( q_shift ) ); /* hStereoDft->q_dft */
- v_multc_fixed( res_buf, fac, res_buf, L_FRAME8k ); /* hStereoDft->q_dft */
+ v_multc_fx( res_buf, fac, res_buf, L_FRAME8k ); /* hStereoDft->q_dft */
/* Cross-fade memory */
fac = 0;
@@ -756,7 +756,7 @@ void stereo_dft_res_ecu_burst_att_fx(
fac = L_sub( MAX_32, L_deposit_h( BASOP_Util_Divide3232_Scale( L_sub( hStereoDft->time_offs, L_ana ), L_add( hStereoDft->time_offs, L_ana ), &q_fac ) ) ); /* Q0 */
}
- v_multc_fixed( pDFT_RES, fac, pDFT_RES, shl( L_res, 1 ) );
+ v_multc_fx( pDFT_RES, fac, pDFT_RES, shl( L_res, 1 ) );
return;
}
diff --git a/lib_dec/ivas_stereo_eclvq_dec_fx.c b/lib_dec/ivas_stereo_eclvq_dec_fx.c
index dfa411145fc3ce2930203029047d821a1d37e45d..df7158c85caa580a15df7c9797e95d5edbe6b3a0 100644
--- a/lib_dec/ivas_stereo_eclvq_dec_fx.c
+++ b/lib_dec/ivas_stereo_eclvq_dec_fx.c
@@ -119,7 +119,7 @@ static Word16 arith_decode_prob_escape(
* the dequantized vector is obtained using the ECSQ_dequantize_vector method
* ---------------------------------------------------------------*/
-void ECSQ_decode(
+void ECSQ_decode_fx(
ECSQ_instance *ecsq_inst,
const Word16 N, /* Q0 */
Word16 *output /* Q0 */
diff --git a/lib_dec/ivas_stereo_icbwe_dec_fx.c b/lib_dec/ivas_stereo_icbwe_dec_fx.c
index 8ef404ede324f9b8dab878f5eb378d42e56fd88f..d5b289acfa39f8888e9dee25efef36f0a41ee389 100644
--- a/lib_dec/ivas_stereo_icbwe_dec_fx.c
+++ b/lib_dec/ivas_stereo_icbwe_dec_fx.c
@@ -121,9 +121,8 @@ void stereo_icBWE_dec_fx(
const Word16 *fb_synth_ref_fx, /* i : ref. high-band synthesis 16-20 kHz Q_white_exc*/
const Word16 *voice_factors_fx, /* i : voicing factors Q15 */
const Word16 output_frame, /* i : frame length Q0 */
- Word16 *Q_syn /* i : Q of synth and synthRef buffers */
- ,
- const Word16 Q_white_exc /* i : Q of fb_synth_ref_fx */
+ Word16 *Q_syn, /* i : Q of synth and synthRef buffers */
+ const Word16 Q_white_exc /* i : Q of fb_synth_ref_fx */
)
{
Word16 i, j, k, nbSubFr;
@@ -427,7 +426,7 @@ void stereo_icBWE_dec_fx(
test();
IF( LT_32( hCPE->hStereoDftDmx->targetGain_fx, 268435456 /* 0.5 in Q29 */ ) || GT_32( hCPE->hStereoDftDmx->targetGain_fx, 1073741824 /* 2.0 in Q29 */ ) )
{
- v_multc_fixed_16_16( voice_factors_fx, 16384 /* 0.5 in Q15 */, nlMixFac_fx, NB_SUBFR16k );
+ v_multc_fx_16_16( voice_factors_fx, 16384 /* 0.5 in Q15 */, nlMixFac_fx, NB_SUBFR16k );
}
}
ELSE
@@ -435,7 +434,7 @@ void stereo_icBWE_dec_fx(
test();
IF( LT_32( hCPE->hStereoTCA->targetGain_fx, 268435456 /* 0.5 in Q29 */ ) || GT_32( hCPE->hStereoTCA->targetGain_fx, 1073741824 /* 2.0 in Q29 */ ) )
{
- v_multc_fixed_16_16( voice_factors_fx, 16384 /* 0.5 in Q15 */, nlMixFac_fx, NB_SUBFR16k );
+ v_multc_fx_16_16( voice_factors_fx, 16384 /* 0.5 in Q15 */, nlMixFac_fx, NB_SUBFR16k );
}
}
@@ -636,7 +635,7 @@ void stereo_icBWE_dec_fx(
IF( EQ_16( st->extl, FB_TBE ) )
{
- v_multc_fixed_16_16( fb_synth_ref_fx, gsMapping_fx, fb_synth_nonref_fx, L_FRAME48k );
+ v_multc_fx_16_16( fb_synth_ref_fx, gsMapping_fx, fb_synth_nonref_fx, L_FRAME48k );
}
/* generate 32kHz SHB synthesis from 12.8(16)kHz signal */
diff --git a/lib_dec/ivas_stereo_mdct_core_dec_fx.c b/lib_dec/ivas_stereo_mdct_core_dec_fx.c
index b2a894a34286b4c3a56972f9b2849ebc849c4d48..eebfa267cf08cec433419553c956cd95fda23383 100644
--- a/lib_dec/ivas_stereo_mdct_core_dec_fx.c
+++ b/lib_dec/ivas_stereo_mdct_core_dec_fx.c
@@ -411,7 +411,7 @@ void stereo_mdct_core_dec_fx(
}
Word16 s = getScaleFactor32( x_fx[ch][k], L_frameTCX[ch] );
Scale_sig32( x_fx[ch][k], L_frameTCX[ch], s ); /* exp(x_e + 31 - s) */
- TonalMDCTConceal_SaveFreqSignal_ivas_fx( st->hTonalMDCTConc, x_fx[ch][k], sub( x_e[ch][k], s ), L_frameTCX[ch], L_frame[ch], &scf_fx[0], scf_e, 0, get_igf_startline( st, L_frame[ch], L_frameTCX[ch] ) );
+ TonalMDCTConceal_SaveFreqSignal_ivas_fx( st->hTonalMDCTConc, x_fx[ch][k], sub( x_e[ch][k], s ), L_frameTCX[ch], L_frame[ch], &scf_fx[0], scf_e, 0, get_igf_startline_fx( st, L_frame[ch], L_frameTCX[ch] ) );
Scale_sig32( x_fx[ch][k], L_frameTCX[ch], negate( s ) ); /* exp(x_e) */
}
}
diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec_fx.c b/lib_dec/ivas_stereo_mdct_stereo_dec_fx.c
index c34fd8624480edd51282215f38a2c11303811c05..43dc48edfad2aa4e00376d17c73518e183879561 100644
--- a/lib_dec/ivas_stereo_mdct_stereo_dec_fx.c
+++ b/lib_dec/ivas_stereo_mdct_stereo_dec_fx.c
@@ -48,12 +48,16 @@
static void inverseBwMS_fx( const Word16 startLine, const Word16 stopLine, Word32 x0[], Word32 x1[], const Word32 norm_fac );
-#define NF_RED_FAC_FIXED 1610612736 // Q31
-#define SQRT2_OVER_2_FIXED 1518500250 // Q31
-#define POINT_8_FIXED 1717986918 // Q31
-#define POINT_2_FIXED 429496730 // Q31
-#define ONE_POINT_3_FIXED 87241523 // Q26
-#define POINT_9_FIXED 60397978 // Q26
+/*-------------------------------------------------------------------*
+ * Local constants
+ *-------------------------------------------------------------------*/
+
+#define NF_RED_FAC_FX 1610612736 // Q31
+#define POINT_8_FX 1717986918 // Q31
+#define POINT_2_FX 429496730 // Q31
+#define ONE_POINT_3_FX 87241523 // Q26
+#define POINT_9_FX 60397978 // Q26
+
/*-------------------------------------------------------------------*
* parse_stereo_from_bitstream
@@ -250,6 +254,7 @@ void parse_stereo_from_bitstream(
*
* Band-wise M/S stereo processing
*-------------------------------------------------------------------*/
+
static void inverseBwMS_fx(
const Word16 startLine, /* i : start line of sfb Q0*/
const Word16 stopLine, /* i : stop line of sfb Q0*/
@@ -280,6 +285,7 @@ static void inverseBwMS_fx(
*
* M/S stereo processing
*-------------------------------------------------------------------*/
+
void inverseMS_fx(
const Word16 L_frame, /* i : frame length Q0*/
Word32 x0[], /* i/o: mid/left channel coefficients Qx*/
@@ -298,8 +304,9 @@ void inverseMS_fx(
*
* apply stereo processing (inverse MS and global ILD)
*-------------------------------------------------------------------*/
+
void stereo_decoder_tcx_fx(
- STEREO_MDCT_DEC_DATA *hStereoMdct, /* i/o: MDCT stereo decoder structure */
+ STEREO_MDCT_DEC_DATA *hStereoMdct, /* i/o: MDCT stereo decoder structure */
Word16 ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask Q0*/
Word32 *spec_r_0[NB_DIV], /* i/o: spectrum right channel Qx*/
Word32 *spec_l[], /* i/o: spectrum left channel [NB_DIV][N] Qx*/
@@ -355,11 +362,11 @@ void stereo_decoder_tcx_fx(
{
IF( EQ_32( spec_r_0[k][i], 0 ) )
{
- spec_r[k][i] = Mpy_32_32( spec_r[k][i], NF_RED_FAC_FIXED ); /* Qx */
+ spec_r[k][i] = Mpy_32_32( spec_r[k][i], NF_RED_FAC_FX ); /* Qx */
move32();
}
}
- inverseMS_fx( sfbConf->sfbOffset[sfbConf->nBandsStereoCore], spec_l[k], spec_r[k], SQRT2_OVER_2_FIXED );
+ inverseMS_fx( sfbConf->sfbOffset[sfbConf->nBandsStereoCore], spec_l[k], spec_r[k], SQRT2_OVER_2_FX );
}
ELSE IF( EQ_16( mdct_stereo_mode[k], SMDCT_BW_MS ) )
{
@@ -371,11 +378,11 @@ void stereo_decoder_tcx_fx(
{
IF( EQ_32( spec_r_0[k][i], 0 ) )
{
- spec_r[k][i] = Mpy_32_32( spec_r[k][i], NF_RED_FAC_FIXED ); /* Qx */
+ spec_r[k][i] = Mpy_32_32( spec_r[k][i], NF_RED_FAC_FX ); /* Qx */
move32();
}
}
- inverseBwMS_fx( sfbConf->sfbOffset[sfb], sfbConf->sfbOffset[sfb + 1], spec_l[k], spec_r[k], SQRT2_OVER_2_FIXED );
+ inverseBwMS_fx( sfbConf->sfbOffset[sfb], sfbConf->sfbOffset[sfb + 1], spec_l[k], spec_r[k], SQRT2_OVER_2_FX );
}
}
}
@@ -388,11 +395,11 @@ void stereo_decoder_tcx_fx(
{
IF( EQ_32( spec_r_0[k][i], 0 ) )
{
- spec_r[k][i] = Mpy_32_32( spec_r[k][i], NF_RED_FAC_FIXED ); /* Qx */
+ spec_r[k][i] = Mpy_32_32( spec_r[k][i], NF_RED_FAC_FX ); /* Qx */
move32();
}
}
- inverseMS_fx( sub( sfbConf->sfbOffset[sfbConf->sfbCnt], sfbConf->sfbOffset[sfbConf->nBandsStereoCore] ), &spec_l[k][sfbConf->sfbOffset[sfbConf->nBandsStereoCore]], &spec_r[k][sfbConf->sfbOffset[sfbConf->nBandsStereoCore]], SQRT2_OVER_2_FIXED );
+ inverseMS_fx( sub( sfbConf->sfbOffset[sfbConf->sfbCnt], sfbConf->sfbOffset[sfbConf->nBandsStereoCore] ), &spec_l[k][sfbConf->sfbOffset[sfbConf->nBandsStereoCore]], &spec_r[k][sfbConf->sfbOffset[sfbConf->nBandsStereoCore]], SQRT2_OVER_2_FX );
}
ELSE IF( EQ_16( hStereoMdct->IGFStereoMode[k], SMDCT_BW_MS ) )
{
@@ -404,11 +411,11 @@ void stereo_decoder_tcx_fx(
{
IF( EQ_32( spec_r_0[k][i], 0 ) )
{
- spec_r[k][i] = Mpy_32_32( spec_r[k][i], NF_RED_FAC_FIXED ); /* Qx */
+ spec_r[k][i] = Mpy_32_32( spec_r[k][i], NF_RED_FAC_FX ); /* Qx */
move32();
}
}
- inverseBwMS_fx( sfbConf->sfbOffset[sfb], sfbConf->sfbOffset[sfb + 1], spec_l[k], spec_r[k], SQRT2_OVER_2_FIXED );
+ inverseBwMS_fx( sfbConf->sfbOffset[sfb], sfbConf->sfbOffset[sfb + 1], spec_l[k], spec_r[k], SQRT2_OVER_2_FX );
}
}
}
@@ -420,15 +427,15 @@ void stereo_decoder_tcx_fx(
tmp_32 = L_shr( tmp_32, sub( 5, tmp_e ) ); /* nrgRatio = nrg[1]/nrg[0] */ // Q26
nrgRatio = L_sub( tmp_32, ONE_IN_Q26 ); // Q26
- hStereoMdct->smooth_ratio_fx = W_extract_h( W_mac_32_32( W_mult_32_32( POINT_8_FIXED, hStereoMdct->smooth_ratio_fx ), POINT_2_FIXED, nrgRatio ) ); // Q26
+ hStereoMdct->smooth_ratio_fx = W_extract_h( W_mac_32_32( W_mult_32_32( POINT_8_FX, hStereoMdct->smooth_ratio_fx ), POINT_2_FX, nrgRatio ) ); // Q26
move32();
/* set flag to reverse dmx computation in case of right-side panning, only relevant for mono output */
- IF( GT_32( hStereoMdct->smooth_ratio_fx, ONE_POINT_3_FIXED ) )
+ IF( GT_32( hStereoMdct->smooth_ratio_fx, ONE_POINT_3_FX ) )
{
hStereoMdct->reverse_dmx = 1; /* Q0 */
move16();
}
- ELSE IF( LT_32( hStereoMdct->smooth_ratio_fx, POINT_9_FIXED ) )
+ ELSE IF( LT_32( hStereoMdct->smooth_ratio_fx, POINT_9_FX ) )
{
hStereoMdct->reverse_dmx = 0; /* Q0 */
move16();
@@ -463,16 +470,16 @@ void stereo_decoder_tcx_fx(
IF( ( GT_32( nrgRatio, ONE_IN_Q26 ) ) && ( LT_16( k, tmp1 ) ) )
{
shift = norm_l( nrgRatio );
- nrgRatio = L_shl( nrgRatio, shift ); /* Q26 + shift */
- v_multc_fixed( spec_r[k], nrgRatio, spec_r[k], L_frameTCX_r ); /* spec_r will be in Qx + shift - Q5 */
- Scale_sig32( spec_r[k], L_frameTCX_r, sub( 5, shift ) ); /* Qx */
+ nrgRatio = L_shl( nrgRatio, shift ); /* Q26 + shift */
+ v_multc_fx( spec_r[k], nrgRatio, spec_r[k], L_frameTCX_r ); /* spec_r will be in Qx + shift - Q5 */
+ Scale_sig32( spec_r[k], L_frameTCX_r, sub( 5, shift ) ); /* Qx */
}
ELSE IF( ( LT_32( nrgRatio, ONE_IN_Q26 ) ) && ( LT_16( k, tmp2 ) ) )
{
inv_nrgRatio = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q26, nrgRatio, &tmp_e );
shift = sub( 5, tmp_e );
- v_multc_fixed( spec_l[k], inv_nrgRatio, spec_l[k], L_frameTCX_l ); /* spec_r will be in Qx - tmp_e */
- Scale_sig32( spec_l[k], L_frameTCX_l, sub( 5, shift ) ); /* Qx */
+ v_multc_fx( spec_l[k], inv_nrgRatio, spec_l[k], L_frameTCX_l ); /* spec_r will be in Qx - tmp_e */
+ Scale_sig32( spec_l[k], L_frameTCX_l, sub( 5, shift ) ); /* Qx */
}
}
} /* for k */
@@ -659,15 +666,12 @@ void synchonize_channels_mdct_sid_fx(
* between active/inactive coding in MDCT-Stereo DTX
*-------------------------------------------------------------------*/
-// helper function
-static void update_exp( Word16 *a_exp, Word16 *b_exp, Word16 *buff_a, Word16 *buff_b, Word16 legth );
-
static void update_exp(
Word16 *a_exp,
Word16 *b_exp,
- Word16 *buff_a, /* exp(a_exp) */
- Word16 *buff_b, /* exp(b_exp) */
- Word16 legth /* Q0 */
+ Word16 *buff_a, /* exp(a_exp) */
+ Word16 *buff_b, /* exp(b_exp) */
+ const Word16 legth /* Q0 */
)
{
Word16 diff = 0;
diff --git a/lib_dec/ivas_stereo_switching_dec_fx.c b/lib_dec/ivas_stereo_switching_dec_fx.c
index 2cd075478f6dc237099144841f8496d8ad00b639..da6adcf338b516d34c97671912252022e0075d3e 100644
--- a/lib_dec/ivas_stereo_switching_dec_fx.c
+++ b/lib_dec/ivas_stereo_switching_dec_fx.c
@@ -425,10 +425,10 @@ ivas_error stereo_memory_dec_fx(
{
assert( hCPE->hCoreCoder[0]->hHQ_core->Q_old_out_fx32 == hCPE->hCoreCoder[1]->hHQ_core->Q_old_out_fx32 );
v_add_32( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[1]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, extract_l( Mpy_32_16_1( output_Fs, INV_FRAME_PER_SEC_Q15 ) ) ); /* exp(exp_old_out) */
- v_multc_fixed_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, 16384 /* 0.5 in Q15 */, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, extract_l( Mpy_32_16_1( output_Fs, INV_FRAME_PER_SEC_Q15 ) ) ); /* exp(exp_old_out) */
+ v_multc_fx_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, 16384 /* 0.5 in Q15 */, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, extract_l( Mpy_32_16_1( output_Fs, INV_FRAME_PER_SEC_Q15 ) ) ); /* exp(exp_old_out) */
v_add_32( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[1]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k ); /* q_old_outLB_fx */
- v_multc_fixed_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, 16384 /* 0.5 in Q15 */, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k ); /* exp(exp_old_out) */
+ v_multc_fx_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, 16384 /* 0.5 in Q15 */, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, L_FRAME32k ); /* exp(exp_old_out) */
}
/*--------------------------------------------------------------*
@@ -2140,12 +2140,10 @@ void stereo_td2dft_update_fx(
}
ELSE IF( EQ_16( hCPE->element_mode, IVAS_CPE_MDCT ) && hCPE->input_mem_fx[0] != NULL )
{
-
/* update DFT stereo OLA memories */
/*set_zero( hCPE->input_mem_LB[n], STEREO_DFT32MS_OVL_16k );*/
L_lerp_fx_q11( output_fx + sub( sts[n]->L_frame, ovl ), hCPE->input_mem_LB_fx[n], STEREO_DFT32MS_OVL_16k, ovl );
-
/* TCX synthesis (it was already delayed in TD stereo in core_switching_post_dec()) */
IF( sts[n]->hTcxDec != NULL )
{
diff --git a/lib_dec/ivas_tcx_core_dec_fx.c b/lib_dec/ivas_tcx_core_dec_fx.c
index afe1b71db8c37411bbb890c45b45399d118b6185..b36aad0c187920f8cfcb38dd974b11b18415b28a 100644
--- a/lib_dec/ivas_tcx_core_dec_fx.c
+++ b/lib_dec/ivas_tcx_core_dec_fx.c
@@ -458,7 +458,7 @@ void stereo_tcx_core_dec_fx(
Copy( &lsfnew_uw_fx[k * M], &lsf_fx[( k + 1 ) * M], M ); /* Q2.56 */
Copy( &lsfnew_uw_fx[k * M], &lsf_tmp_fx[( k + 1 ) * M], M ); /* Q2.56 */
- v_multc_fixed_16_16( &lsf_tmp_fx[( k + 1 ) * M], sr_core_ratio, &lsf_tmp_fx[( k + 1 ) * M], M );
+ v_multc_fx_16_16( &lsf_tmp_fx[( k + 1 ) * M], sr_core_ratio, &lsf_tmp_fx[( k + 1 ) * M], M );
Scale_sig( &lsf_tmp_fx[( k + 1 ) * M], M, tmp );
test();
IF( !st->lpcQuantization && EQ_32( st->sr_core, INT_FS_16k_FX ) )
@@ -918,9 +918,6 @@ void stereo_tcx_core_dec_fx(
Word32 signal_out_32_fx[L_FRAME48k];
Word16 exp;
Copy_Scale_sig_16_32_no_sat( signal_out_fx, signal_out_32_fx, st->hFdCngDec->hFdCngCom->frameSize, Q6 );
-#ifndef FIX_1996_MASKING_NOISE
- Copy_Scale_sig_16_32_no_sat( st->hFdCngDec->hFdCngCom->olapBufferSynth2, st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, shl( st->hFdCngDec->hFdCngCom->frameSize, 1 ), Q15 );
-#endif
generate_masking_noise_ivas_fx( signal_out_32_fx, &exp, st->hFdCngDec->hFdCngCom, st->hFdCngDec->hFdCngCom->frameSize, 0, 0, 0, st->element_mode, hStereoCng, nchan_out );
Copy_Scale_sig_32_16( signal_out_32_fx, signal_out_fx, st->hFdCngDec->hFdCngCom->frameSize, negate( exp ) ); // Q0
Copy_Scale_sig_32_16( st->hFdCngDec->hFdCngCom->olapBufferSynth2_fx, st->hFdCngDec->hFdCngCom->olapBufferSynth2, shl( st->hFdCngDec->hFdCngCom->frameSize, 1 ), -Q15 ); // Q0
diff --git a/lib_dec/ivas_td_low_rate_dec_fx.c b/lib_dec/ivas_td_low_rate_dec_fx.c
index 385096ba6d6d860d73dc06b7895167afe855b42e..59543f4da0928f1846ae0ef222f1c2158a030fbc 100644
--- a/lib_dec/ivas_td_low_rate_dec_fx.c
+++ b/lib_dec/ivas_td_low_rate_dec_fx.c
@@ -326,11 +326,8 @@ void decod_gen_2sbfr_fx(
* Prepare TBE excitation
*-----------------------------------------------------------------*/
-#ifdef FIX_2010_PREP_TBE_EXC
prep_tbe_exc_fx( L_frame, 2 * L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR /*i_subfr / L_SUBFR*/], bwe_exc, 0, NULL, Q10, st->Q_exc, T0, T0_frac, GENERIC, st->core_brate, st->element_mode, st->idchan, st->hBWE_TD != NULL, st->tdm_LRTD_flag );
-#else
- prep_tbe_exc_fx( L_frame, 2 * L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR /*i_subfr / L_SUBFR*/], bwe_exc, 0, NULL, st->Q_exc, T0, T0_frac, GENERIC, st->core_brate, st->element_mode, st->idchan, st->hBWE_TD != NULL, st->tdm_LRTD_flag );
-#endif
+
voice_factors[i_subfr / L_SUBFR + 1] = voice_factors[i_subfr / L_SUBFR /*i_subfr / L_SUBFR*/]; /* Q15 */
move16();
diff --git a/lib_dec/jbm_jb4sb_fx.c b/lib_dec/jbm_jb4sb_fx.c
index 6357c3a1bc70165220d678a281b327c663a0e179..eccd8cb030efc927998ef6e1cb2d373e5833c901 100644
--- a/lib_dec/jbm_jb4sb_fx.c
+++ b/lib_dec/jbm_jb4sb_fx.c
@@ -774,7 +774,6 @@ static void JB4_targetPlayoutDelay(
move32();
move32();
-#ifdef NONBE_1122_JBM_FIX_PLAYOUT_DELAY_IN_DTX
#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED
IF( !h->evsMode )
{
@@ -786,13 +785,6 @@ static void JB4_targetPlayoutDelay(
#endif
*targetStartUp = JB4_MAX( *targetStartUp, (UWord32) h->safetyMargin );
move32();
-#else
- if ( LT_64( *targetStartUp, 60 ) )
- {
- *targetStartUp = 60;
- move32();
- }
-#endif
return;
}
@@ -1330,7 +1322,7 @@ static void JB4_estimateShortTermJitter(
}
IF( temp != 0 )
{
- temp = L_shr( ceil_fixed( temp, sub( 15, exp ) ), sub( 15, exp ) ); // Q31
+ temp = L_shr( ceil_fx( temp, sub( 15, exp ) ), sub( 15, exp ) ); // Q31
}
h->stJitter = (UWord32) W_mult0_32_32( temp, h->frameDuration );
move32();
diff --git a/lib_dec/jbm_pcmdsp_apa.h b/lib_dec/jbm_pcmdsp_apa.h
index 8daf3fc11c2f27e8c638ff4c68c721458c0338b5..70e31eb75e64612743ea50e72108d69c5cf92309 100644
--- a/lib_dec/jbm_pcmdsp_apa.h
+++ b/lib_dec/jbm_pcmdsp_apa.h
@@ -39,9 +39,9 @@
#ifndef JBM_PCMDSP_APA_H
#define JBM_PCMDSP_APA_H JBM_PCMDSP_APA_H
+#include "common_api_types.h"
#include
-#include
-#include "options.h"
+
/*
********************************************************************************
@@ -50,17 +50,17 @@
*/
/* size of IO buffers (a_in[], a_out[]) for apa_exec() */
-#define APA_BUF_PER_CHANNEL ( 960 * 3 )
+#define APA_BUF_PER_CHANNEL ( IVAS_MAX_FRAME_SIZE * 3 )
#define APA_MAX_NUM_CHANNELS 16
#define APA_BUF ( APA_BUF_PER_CHANNEL * APA_MAX_NUM_CHANNELS )
/* min/max sampling rate [Hz] */
#define APA_MIN_RATE 1000
-#define APA_MAX_RATE 48000
+#define APA_MAX_RATE IVAS_MAX_SAMPLING_RATE
/* min/max scaling [%] */
-#define APA_MIN_SCALE 50
-#define APA_MAX_SCALE 150
+#define APA_MIN_SCALE IVAS_TIME_SCALE_MIN
+#define APA_MAX_SCALE IVAS_TIME_SCALE_MAX
#define APA_SM_SURROUND 1
#define APA_SM_LOGARITHMIC 2
diff --git a/lib_dec/jbm_pcmdsp_apa_fx.c b/lib_dec/jbm_pcmdsp_apa_fx.c
index 94b4cb6bd2dfd1c680ce42e927414bd24934c6d3..7b64250b182955ac529e723fe562ed616f256421 100644
--- a/lib_dec/jbm_pcmdsp_apa_fx.c
+++ b/lib_dec/jbm_pcmdsp_apa_fx.c
@@ -76,10 +76,8 @@ struct apa_state_t
bool evs_compat_mode;
Word16 *buf_out_fx;
- Word16 Q_buf_out; /* stores the scaling of buf_out_fx */
-#ifdef FIX1998_APA_EXEC_SCALING
+ Word16 Q_buf_out; /* stores the scaling of buf_out_fx */
Word16 Q_a_out_init_old; /* stores initially determined max. scaling of data in buf_out_fx, before beeing adjusted to previous frame scaling */
-#endif
UWord16 buf_out_capacity;
UWord16 l_buf_out;
@@ -193,10 +191,8 @@ ivas_error apa_init(
}
memset( ps->buf_out_fx, 0, ( sizeof( Word16 ) * ps->buf_out_capacity ) );
ps->Q_buf_out = Q15;
-#ifdef FIX1998_APA_EXEC_SCALING
ps->Q_a_out_init_old = Q15;
move16();
-#endif
move16();
ps->evs_compat_mode = false;
@@ -279,10 +275,8 @@ UWord8 apa_reconfigure(
ps->buf_out_fx = (Word16 *) malloc( sizeof( Word16 ) * ps->buf_out_capacity );
memset( ps->buf_out_fx, 0, ( sizeof( Word16 ) * ps->buf_out_capacity ) );
ps->Q_buf_out = Q15;
-#ifdef FIX1998_APA_EXEC_SCALING
ps->Q_a_out_init_old = Q15;
move16();
-#endif
move16();
IF( !ps->buf_out_fx )
{
@@ -908,15 +902,11 @@ UWord8 apa_exec_ivas_fx(
Word32 expScaling, actScaling;
UWord32 statsResetThreshold, statsResetShift;
Word16 Q_a_out;
-#ifdef FIX1998_APA_EXEC_SCALING
Word16 Q_a_out_init_old;
-#endif
Q_a_out = add( getScaleFactor32_copy( a_in, L_mult0( ps->num_channels, APA_BUF_PER_CHANNEL ) ), Q11 - Q16 - Q1 );
-#ifdef FIX1998_APA_EXEC_SCALING
Q_a_out_init_old = Q_a_out; /* store the possible scaling of a_in, to be re-used in the next frame */
move16();
-#endif
statsResetThreshold = 1637;
move32();
statsResetShift = 2;
@@ -983,15 +973,11 @@ UWord8 apa_exec_ivas_fx(
Word16 a_tmp[APA_BUF];
Word16 *buf_out_ptr = &( ps->buf_out_fx[ps->l_buf_out - ps->l_frm] );
-#ifdef FIX1998_APA_EXEC_SCALING
/*
don't compare against actual scaling in ps->Q_buf_out, but possible scaling in ps->Q_a_out_init_old; otherwise we are constantly reducing the scaling over time, leading to precision issues
alternative approach: determine scaling of ps->buf_out_fx, but this is costly due to the sheer amount of samples stored there...
*/
Q_a_out = s_min( Q_a_out, ps->Q_a_out_init_old );
-#else
- Q_a_out = s_min( Q_a_out, ps->Q_buf_out );
-#endif
Scale_sig( ps->buf_out_fx, ps->buf_out_capacity, sub( Q_a_out, ps->Q_buf_out ) ); // Q_buf_out -> Q_a_out
IF( EQ_32( ps->scale, 100 ) )
{
@@ -1105,10 +1091,8 @@ UWord8 apa_exec_ivas_fx(
}
ps->l_buf_out = (UWord16) L_add( ps->l_buf_out, l_frm_out );
move16();
-#ifdef FIX1998_APA_EXEC_SCALING
ps->Q_a_out_init_old = Q_a_out_init_old;
move16();
-#endif
*l_out = l_frm_out;
move16();
diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h
index dc95fe00e9aac3e958d53d16508693f2c79debe5..51c359227790d08c4430ee54e7cab5f41469be9d 100644
--- a/lib_dec/lib_dec.h
+++ b/lib_dec/lib_dec.h
@@ -64,14 +64,12 @@ typedef enum _IVAS_DEC_COMPLEXITY_LEVEL
IVAS_DEC_COMPLEXITY_LEVEL_THREE = 3
} IVAS_DEC_COMPLEXITY_LEVEL;
-#ifdef FIX_CREND_SIMPLIFY_CODE
typedef enum _IVAS_DEC_PCM_TYPE
{
IVAS_DEC_PCM_INT16,
IVAS_DEC_PCM_FLOAT,
IVAS_DEC_PCM_INVALID
} IVAS_DEC_PCM_TYPE;
-#endif
/* bitstream formats that can be consumed */
typedef enum _IVAS_DEC_BS_FORMAT
@@ -113,7 +111,9 @@ ivas_error IVAS_DEC_Configure(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
const UWord32 sampleRate, /* i : output sampling frequency */
const IVAS_AUDIO_CONFIG outputConfig, /* i : output configuration */
+#ifndef LIB_DEC_REVISION
const bool tsmEnabled, /* i : enable time scale modification */
+ #endif
const IVAS_RENDER_FRAMESIZE renderFramesize, /* i : rendering frame size */
const bool customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */
const bool hrtfReaderEnabled, /* i : enable HRTF binary file input */
@@ -125,6 +125,7 @@ ivas_error IVAS_DEC_Configure(
const Word16 non_diegetic_pan_gain_fx, /* i : non diegetic panning gain */
const bool dpidEnabled, /* i : enable directivity pattern option */
const UWord16 acousticEnvironmentId, /* i : Acoustic environment ID */
+ const bool objEditEnabled, /* i : enable object editing */
const bool delayCompensationEnabled /* i : enable delay compensation */
);
@@ -143,7 +144,6 @@ ivas_error IVAS_DEC_FeedFrame_Serial(
Word16 bfi /* i : bad frame indicator flag */
);
-#ifdef FIX_CREND_SIMPLIFY_CODE
ivas_error IVAS_DEC_ReadFormat(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
IVAS_BIN_RENDERER_TYPE *binaural_renderer, /* o : binaural renderer type */
@@ -151,17 +151,18 @@ ivas_error IVAS_DEC_ReadFormat(
IVAS_AUDIO_CONFIG *hrtf_set_audio_cfg /* o : HRTF set audio config. */
);
-#ifdef FIX_HRTF_LOAD_API
ivas_error IVAS_DEC_GetSamplesDecoder(
- IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
- const int16_t isSplitRend, /* i : split rendering enabled flag */
- ISAR_SPLIT_REND_BITS_DATA *splitRendBits /* o : output split rendering bits */
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ const Word16 isSplitRend, /* i : split rendering enabled flag */
+ ISAR_SPLIT_REND_BITS_DATA *splitRendBits /* o : output split rendering bits */
);
-#endif
-#endif
/*! r: decoder error code */
+#ifdef LIB_DEC_REVISION
+ivas_error IVAS_DEC_GetSamplesRenderer(
+#else
ivas_error IVAS_DEC_GetSamples(
+#endif
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
const Word16 nSamplesAsked, /* i : number of samples wanted by the caller */
Word16 *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 Q0 */
@@ -169,21 +170,19 @@ ivas_error IVAS_DEC_GetSamples(
bool *needNewFrame /* o : indication that the decoder needs a new frame */
);
-#ifdef OBJ_EDITING_API
ivas_error IVAS_DEC_GetEditableParameters(
- IVAS_DEC_HANDLE hIvasDec,
- IVAS_EDITABLE_PARAMETERS *hIvasEditableParameters
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ IVAS_EDITABLE_PARAMETERS *hIvasEditableParameters /* o : object editing parameters handle */
);
ivas_error IVAS_DEC_SetEditableParameters(
- IVAS_DEC_HANDLE hIvasDec,
- IVAS_EDITABLE_PARAMETERS hIvasEditableParameters
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ IVAS_EDITABLE_PARAMETERS hIvasEditableParameters /* i : object editing parameters handle */
);
ivas_error IVAS_DEC_PrepareRenderer(
- IVAS_DEC_HANDLE hIvasDec
+ IVAS_DEC_HANDLE hIvasDec /* i/o: IVAS decoder handle */
);
-#endif
ivas_error IVAS_DEC_GetSplitBinauralBitstream(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
@@ -212,14 +211,14 @@ ivas_error IVAS_DEC_GetCldfbSamples(
Word16 *nOutSamples /* o : number of samples per channel written to output buffer */
);
-int16_t IVAS_DEC_is_split_rendering_enabled(
+Word16 IVAS_DEC_is_split_rendering_enabled(
IVAS_DEC_HANDLE hIvasDec, /* i : IVAS decoder handle */
- int16_t *isSplitRend /* o : flag to indicate if split rendering is enabled */
+ Word16 *isSplitRend /* o : flag to indicate if split rendering is enabled */
);
-int16_t IVAS_DEC_is_split_rendering_coded_out(
+Word16 IVAS_DEC_is_split_rendering_coded_out(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
- int16_t *isSplitCoded /* o : flag to indicate if split rendering is enabled */
+ Word16 *isSplitCoded /* o : flag to indicate if split rendering is enabled */
);
/*! r: error code */
@@ -232,9 +231,9 @@ ivas_error IVAS_DEC_GetObjectMetadata(
/*! r: error code */
ivas_error IVAS_DEC_GetMasaMetadata(
- IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
- IVAS_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 */
- const UWord8 getFromJbmBuffer /* i : get metadata from a JBM buffer */
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ IVAS_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 */
+ const UWord8 getFromJbmBuffer /* i : get metadata from a JBM buffer */
);
/*! r: error code */
@@ -287,34 +286,32 @@ ivas_error IVAS_DEC_VoIP_SetScale(
const Word16 scale /* i : TSM scale to set */
);
+#ifdef VARIABLE_SPEED_DECODING
+#ifdef LIB_DEC_REVISION
+ivas_error IVAS_DEC_EnableTsm(
+ IVAS_DEC_HANDLE hIvasDec /* i/o: IVAS decoder handle */
+);
+#endif
+
ivas_error IVAS_DEC_TSM_SetQuality(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
const Word16 quality /* i : target TSM quality Q14 */
);
+#endif
/*! r: error code */
ivas_error IVAS_DEC_VoIP_GetSamples(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
UWord16 nSamplesPerChannel, /* i : number of samples per channel requested to be written to output buffer */
Word16 *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 Q0 */
- const UWord32 systemTimestamp_ms, /* i : current system timestamp */
-#ifdef FIX_CREND_SIMPLIFY_CODE
#ifdef SUPPORT_JBM_TRACEFILE
JbmTraceFileWriterFn jbmWriterFn,
void* jbmWriter,
#endif
- bool *bitstreamReadDone, /* o : flag indicating that bitstream was read */
- UWord16 *nSamplesRendered /* o : number of samples rendered */
-#else
- #ifdef SUPPORT_JBM_TRACEFILE
- JbmTraceFileWriterFn jbmWriterFn,
- void* jbmWriter
-#endif
-#endif
-#ifdef OBJ_EDITING_API
- ,
- bool *parametersAvailableForEditing
-#endif
+ bool *bitstreamReadDone, /* o : flag indicating that bitstream was read */
+ UWord16 *nSamplesRendered, /* o : number of samples rendered */
+ bool *parametersAvailableForEditing, /* o : indicates whether objects editing is available */
+ const UWord32 systemTimestamp_ms /* i : current system timestamp */
);
ivas_error IVAS_DEC_Flush(
@@ -402,11 +399,7 @@ ivas_error IVAS_DEC_FeedCustomLsData(
);
/*! r: error code */
-#ifdef FIX_CREND_SIMPLIFY_CODE
ivas_error IVAS_DEC_GetHrtfTDrendHandle(
-#else
-ivas_error IVAS_DEC_GetHrtfHandle(
-#endif
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
IVAS_DEC_HRTF_TD_HANDLE **hHrtfTD /* o : TD rend. HRTF handle */
);
@@ -432,7 +425,6 @@ ivas_error IVAS_DEC_GetHrtfStatisticsHandle(
IVAS_DEC_HRTF_STATISTICS_HANDLE **hHrtfStatistics /* o : HRTF statistics handle */
);
-#ifdef FIX_CREND_SIMPLIFY_CODE
ivas_error IVAS_DEC_HRTF_binary_open(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
const IVAS_BIN_RENDERER_TYPE binaural_renderer /* i : binaural renderer type */
@@ -442,7 +434,6 @@ ivas_error IVAS_DEC_HRTF_binary_close(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
const IVAS_BIN_RENDERER_TYPE binaural_renderer_old /* i : previous binaural renderer type */
);
-#endif
/*! r: error code*/
ivas_error IVAS_DEC_GetRenderConfig(
@@ -474,12 +465,13 @@ ivas_error IVAS_DEC_HasDecodedFirstGoodFrame(
bool *hasDecodedFirstGoodFrame /* o : flag indicating if the decoder has decoded a good frame since it was configured */
);
+#ifndef LIB_DEC_REVISION
/*! r: error code */
ivas_error IVAS_DEC_GetPcmFrameSize(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
Word32 *pcmFrameSize /* o : total size of the PCM output frame. This takes into account the number of output channels Q0 */
);
-
+#endif
/*! r: true if decoder has no data in VoIP jitter buffer */
bool IVAS_DEC_VoIP_IsEmpty(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c
index dc58c5662c718a3451076bb26ff76264946e824d..b32a49e17802b37f45c8083e57b3153cb175832e 100644
--- a/lib_dec/lib_dec_fx.c
+++ b/lib_dec/lib_dec_fx.c
@@ -1,4 +1,4 @@
-/******************************************************************************************************
+/******************************************************************************************************
(C) 2022-2025 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.,
@@ -38,6 +38,7 @@
#include "ivas_prot_rend_fx.h"
#include "prot_fx.h"
#include "isar_prot.h"
+#include "ivas_rom_com.h"
#include "lib_isar_pre_rend.h"
#include "ivas_prot_fx.h"
#include "jbm_jb4sb.h"
@@ -47,7 +48,6 @@
#include
#include "wmc_auto.h"
-#define INV_1000_Q31 2147484 /*1/1000 IN Q31*/
/*---------------------------------------------------------------------*
* Local structs
@@ -55,7 +55,9 @@
struct IVAS_DEC_VOIP
{
+#ifndef LIB_DEC_REVISION
UWord16 nSamplesFrame; /* Total number of samples in a frame (includes number of channels) */
+#endif
JB4_HANDLE hJBM;
UWord16 lastDecodedWasActive;
JB4_DATAUNIT_HANDLE hCurrentDataUnit; /* Points to the currently processed data unit */
@@ -79,8 +81,10 @@ struct IVAS_DEC
bool isInitialized;
Word16 bitstreamformat; /* Bitstream format flag (G.192/MIME/VOIP_G192_RTP/VOIP_RTPDUMP) */
- bool Opt_VOIP; /* flag indicating VOIP mode with JBM */
- Word16 tsm_scale; /* scale for TSM operation */
+#ifdef DEBUGGING
+ bool Opt_VOIP; /* flag indicating VOIP mode with JBM */
+#endif
+ Word16 tsm_scale; /* scale for TSM operation */
Word16 tsm_max_scaling;
Word16 timeScalingDone; /* have we done already one TSM in a 20ms frame? */
Word16 tsm_quality; /*Q14*/
@@ -90,49 +94,51 @@ struct IVAS_DEC
bool hasBeenFedFrame;
bool updateOrientation;
UWord16 nSamplesAvailableNext;
+#ifndef LIB_DEC_REVISION
Word16 nSamplesRendered;
+#endif
Word16 nTransportChannelsOld;
Word16 amrwb_rfc4867_flag; /* MIME from rfc4867 is used */
Word16 sdp_hf_only; /* RTP payload format parameter: only Header-Full format without zero padding for size collision avoidance */
Word16 prev_ft_speech; /* RXDTX handler: previous frametype flag for G.192 format AMRWB SID_FIRST detection */
Word16 CNG; /* RXDTX handler: CNG=1, nonCNG=0 */
-#ifdef FIX_HRTF_LOAD
UWord16 nSamplesFlushed;
-#ifdef FIX_HRTF_LOAD_API
Word16 *flushbuffer;
-#else
- Word16 flushbuffer[20 * 960 / 4]; // temp. hack
-#endif
-#ifdef OBJ_EDITING_API
- bool hasEditableParameters;
- bool enableParameterEditing;
-#endif
bool hasBeenPreparedRendering;
-#endif
};
+
/*---------------------------------------------------------------------*
* Local function declarations
*---------------------------------------------------------------------*/
+#ifdef LIB_DEC_REVISION
+static void ivas_destroy_handle_VoIP_fx( IVAS_DEC_VOIP *hVoIP );
+#else
static void IVAS_DEC_Close_VoIP( IVAS_DEC_VOIP *hVoIP );
+#endif
#ifdef SUPPORT_JBM_TRACEFILE
static void store_JbmData( IVAS_DEC_VOIP *hVoIP, JB4_DATAUNIT_HANDLE dataUnit, const UWord32 systemTimestamp_ms, const UWord16 extBufferedSamples, const Word32 output_Fs );
#endif
+#ifdef LIB_DEC_REVISION
+static ivas_error evs_dec_main_fx( Decoder_Struct *st_ivas );
+#else
static ivas_error evs_dec_main_fx( Decoder_Struct *st_ivas, const Word16 nOutSamples, Word32 *floatBuf, Word16 *pcmBuf );
+#endif
static ivas_error input_format_API_to_internal( IVAS_DEC_INPUT_FORMAT input_format, Word16 *bitstream_format_internal, Word16 *sdp_hf_only, const bool is_voip_enabled );
static void init_decoder_config( DECODER_CONFIG_HANDLE hDecoderConfig );
+#ifdef LIB_DEC_REVISION
+static ivas_error ivas_dec_setup_all( IVAS_DEC_HANDLE hIvasDec, UWord8 *nTransportChannels, const Word16 isSplitRend, ISAR_SPLIT_REND_BITS_DATA *splitRendBits );
+static ivas_error apa_setup( IVAS_DEC_HANDLE hIvasDec, const bool isInitialized_voip, const UWord16 nTransportChannels );
+#else
static ivas_error IVAS_DEC_VoIP_reconfigure( IVAS_DEC_HANDLE hIvasDec, const UWord16 nTransportChannels, const UWord16 l_ts );
-#ifdef FIX_HRTF_LOAD
static ivas_error IVAS_DEC_Setup( IVAS_DEC_HANDLE hIvasDec, UWord16 *nTcBufferGranularity, UWord8 *nTransportChannels );
-#else
-static ivas_error IVAS_DEC_Setup( IVAS_DEC_HANDLE hIvasDec, UWord16 *nTcBufferGranularity, UWord8 *nTransportChannels, UWord8 *nOutChannels, UWord16 *nSamplesRendered, Word16 *data );
-#endif
static ivas_error IVAS_DEC_GetTcSamples( IVAS_DEC_HANDLE hIvasDec, Word32 *pcmBuf_fx, Word16 *nOutSamples );
static ivas_error IVAS_DEC_RendererFeedTcSamples( IVAS_DEC_HANDLE hIvasDec, const Word16 nSamplesForRendering, Word16 *nSamplesResidual, Word32 *pcmBuf );
static ivas_error IVAS_DEC_GetRenderedSamples( IVAS_DEC_HANDLE hIvasDec, const UWord16 nSamplesForRendering, UWord16 *nSamplesRendered, UWord16 *nSamplesAvailableNext, Word16 *pcmBuf );
static ivas_error IVAS_DEC_GetBufferedNumberOfSamples( IVAS_DEC_HANDLE hIvasDec, Word16 *nSamplesBuffered );
+#endif
static Word16 get_render_frame_size_ms( IVAS_RENDER_FRAMESIZE render_framesize );
static void update_voip_rendered20ms( IVAS_DEC_HANDLE hIvasDec, const Word16 nSamplesRendered );
static ivas_error isar_set_split_rend_setup( ISAR_DEC_SPLIT_REND_WRAPPER *hSplitBinRend, const ISAR_SPLIT_REND_CONFIG_DATA *hSplitBinConfig, const COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, ISAR_SPLIT_REND_BITS_DATA *splitRendBits );
@@ -182,7 +188,9 @@ ivas_error IVAS_DEC_Open(
hIvasDec->needNewFrame = false;
hIvasDec->nTransportChannelsOld = 0;
hIvasDec->nSamplesAvailableNext = 0;
+#ifndef LIB_DEC_REVISION
hIvasDec->nSamplesRendered = 0;
+#endif
hIvasDec->nSamplesFrame = 0;
hIvasDec->hasBeenFedFrame = false;
hIvasDec->hasBeenFedFirstGoodFrame = false;
@@ -202,33 +210,27 @@ ivas_error IVAS_DEC_Open(
move16();
move16();
move16();
-#ifdef FIX_HRTF_LOAD
-#ifdef OBJ_EDITING_API
hIvasDec->flushbuffer = NULL;
-#else
- // hIvasDec->flushbuffer = NULL;
-#endif
hIvasDec->nSamplesFlushed = 0;
-#ifdef OBJ_EDITING_API
- hIvasDec->hasEditableParameters = false;
- hIvasDec->enableParameterEditing = false;
-#endif
+ move16();
hIvasDec->hasBeenPreparedRendering = false;
-#endif
+ move16();
hIvasDec->mode = mode;
move16();
hIvasDec->bitstreamformat = G192;
+ move16();
+#ifdef DEBUGGING
hIvasDec->Opt_VOIP = 0;
+ move16();
+#endif
hIvasDec->amrwb_rfc4867_flag = -1;
hIvasDec->prev_ft_speech = 1; /* RXDTX handler previous frametype flag for G.192 format AMRWB SID_FIRST detection */
hIvasDec->CNG = 0; /* RXDTX handler CNG = 1, no CNG = 0*/
move16();
move16();
move16();
- move16();
- move16();
/*-----------------------------------------------------------------*
* Initialize IVAS-codec decoder state
@@ -338,7 +340,7 @@ static ivas_error isar_set_split_rend_setup(
splitRendBits->lc3plus_highres = 0;
#ifndef TMP_FIX_SPLIT_REND
- if ( ( hSplitBinRend->hMultiBinCldfbData = (ISAR_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA_HANDLE) malloc( sizeof( ISAR_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA ) ) ) == NULL )
+ IF( ( hSplitBinRend->hMultiBinCldfbData = (ISAR_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA_HANDLE) malloc( sizeof( ISAR_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for split rendering structure" );
}
@@ -346,7 +348,7 @@ static ivas_error isar_set_split_rend_setup(
ISAR_PRE_REND_GetMultiBinPoseData( hSplitBinConfig, &hSplitBinRend->splitrend.multiBinPoseData, ( hCombinedOrientationData != NULL ) ? hCombinedOrientationData->sr_pose_pred_axis : DEFAULT_AXIS );
- if ( hCombinedOrientationData != NULL )
+ IF( hCombinedOrientationData != NULL )
{
isar_set_split_rend_ht_setup_fx( &hSplitBinRend->splitrend, hCombinedOrientationData->Quaternions, hCombinedOrientationData->Rmat_fx );
}
@@ -379,6 +381,8 @@ static void init_decoder_config(
hDecoderConfig->Opt_ExternalOrientation = 0;
hDecoderConfig->Opt_dpid_on = 0;
hDecoderConfig->Opt_aeid_on = 0;
+ hDecoderConfig->Opt_ObjEdit_on = 0;
+ move16();
move16();
move16();
move16();
@@ -402,7 +406,7 @@ static void init_decoder_config(
/*---------------------------------------------------------------------*
* IVAS_DEC_Close( )
*
- *
+ * Deallocate IVAS decoder memory handles
*---------------------------------------------------------------------*/
void IVAS_DEC_Close(
@@ -418,7 +422,11 @@ void IVAS_DEC_Close(
IF( ( *phIvasDec )->hVoIP )
{
+#ifdef LIB_DEC_REVISION
+ ivas_destroy_handle_VoIP_fx( ( *phIvasDec )->hVoIP );
+#else
IVAS_DEC_Close_VoIP( ( *phIvasDec )->hVoIP );
+#endif
( *phIvasDec )->hVoIP = NULL;
}
@@ -437,12 +445,12 @@ void IVAS_DEC_Close(
{
free( ( *phIvasDec )->apaExecBuffer_fx );
}
-#ifdef OBJ_EDITING_API
+
IF( ( *phIvasDec )->flushbuffer != NULL )
{
free( ( *phIvasDec )->flushbuffer );
}
-#endif
+
free( *phIvasDec );
*phIvasDec = NULL;
phIvasDec = NULL;
@@ -485,19 +493,45 @@ static IVAS_DEC_BS_FORMAT mapIvasFormat(
return IVAS_DEC_BS_UNKOWN;
}
+#ifdef LIB_DEC_REVISION
+
+/*---------------------------------------------------------------------*
+ * create_flush_buffer()
+ *
+ * Create flush buffer - needed for binaural outputs with TSM or in VoIP mode
+ *---------------------------------------------------------------------*/
+
+static ivas_error create_flush_buffer_fx(
+ IVAS_DEC_HANDLE hIvasDec /* i/o: IVAS decoder handle */
+)
+{
+ hIvasDec->flushbuffer = (Word16 *) malloc( CPE_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( Word16 ) );
+ if ( hIvasDec->flushbuffer == NULL )
+ {
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate JBM flush buffer" );
+ }
+
+ set16_fx( hIvasDec->flushbuffer, 0, CPE_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES );
+
+ return IVAS_ERR_OK;
+}
+
+#endif
/*---------------------------------------------------------------------*
* IVAS_DEC_Configure( )
*
* Decoder configuration
- * legacy code behavior: if no output format set, then it's EVS mono
+ * legacy behavior: if no output format set, then it's EVS mono
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_Configure(
- IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
- const UWord32 sampleRate, /* i : output sampling frequency */
- const IVAS_AUDIO_CONFIG outputConfig, /* i : output configuration */
- const bool tsmEnabled, /* i : enable time scale modification */
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ const UWord32 sampleRate, /* i : output sampling frequency */
+ const IVAS_AUDIO_CONFIG outputConfig, /* i : output configuration */
+#ifndef LIB_DEC_REVISION
+ const bool tsmEnabled, /* i : enable time scale modification */
+#endif
const IVAS_RENDER_FRAMESIZE renderFramesize, /* i : rendering frame size */
const bool customLsOutputEnabled, /* i : enable custom loudspeaker setup handle */
const bool hrtfReaderEnabled, /* i : enable HRTF binary file input */
@@ -509,6 +543,7 @@ ivas_error IVAS_DEC_Configure(
const Word16 non_diegetic_pan_gain_fx, /* i : non diegetic panning gain */
const bool dpidEnabled, /* i : enable directivity pattern option */
const UWord16 acousticEnvironmentId, /* i : Acoustic environment ID */
+ const bool objEditEnabled, /* i : enable object editing */
const bool delayCompensationEnabled /* i : enable delay compensation */
)
{
@@ -567,7 +602,9 @@ ivas_error IVAS_DEC_Configure(
move16();
}
+#ifndef LIB_DEC_REVISION
hDecoderConfig->Opt_tsm = (Word16) tsmEnabled;
+#endif
hDecoderConfig->Opt_LsCustom = (Word16) customLsOutputEnabled;
hDecoderConfig->Opt_Headrotation = (Word16) enableHeadRotation;
hDecoderConfig->orientation_tracking = orientation_tracking;
@@ -586,6 +623,8 @@ ivas_error IVAS_DEC_Configure(
{
hDecoderConfig->Opt_aeid_on = FALSE;
}
+ hDecoderConfig->Opt_ObjEdit_on = (Word16) objEditEnabled;
+ move16();
move16();
move16();
move16();
@@ -635,6 +674,7 @@ ivas_error IVAS_DEC_Configure(
}
hIvasDec->nSamplesFrame = (UWord16) Mpy_32_16_1( hDecoderConfig->output_Fs, INV_FRAME_PER_SEC_Q15 );
+#ifndef LIB_DEC_REVISION
hIvasDec->nSamplesAvailableNext = 0;
hIvasDec->nSamplesRendered = 0;
hIvasDec->tsm_scale = 100;
@@ -646,7 +686,6 @@ ivas_error IVAS_DEC_Configure(
move16();
move16();
-#ifdef OBJ_EDITING_API
/* init flush buffer if necessary (only needed for binaural)*/
test();
test();
@@ -667,7 +706,7 @@ ivas_error IVAS_DEC_Configure(
/*---------------------------------------------------------------------*
* IVAS_DEC_EnableSplitRendering( )
*
- * Intitialize Split rendering
+ * Update IVAS decoder config. if Split rendering is enabled
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_EnableSplitRendering(
@@ -697,7 +736,7 @@ ivas_error IVAS_DEC_EnableSplitRendering(
/*---------------------------------------------------------------------*
* get_render_framesize_ms( )
*
- * Get the 5ms flag
+ * Get render framesize in ms
*---------------------------------------------------------------------*/
static Word16 get_render_frame_size_ms(
@@ -723,7 +762,7 @@ static Word16 get_render_frame_size_ms(
/*---------------------------------------------------------------------*
* IVAS_DEC_SetRenderFramesize( )
*
- * Get the 5ms flag
+ * Set render framesize
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_SetRenderFramesize(
@@ -753,10 +792,11 @@ ivas_error IVAS_DEC_SetRenderFramesize(
return IVAS_ERR_OK;
}
+
/*---------------------------------------------------------------------*
* IVAS_DEC_GetGetRenderFramesize( )
*
- * Get the 5ms flag
+ * Get render framesize
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_GetRenderFramesize(
@@ -885,7 +925,7 @@ ivas_error IVAS_DEC_GetReferencesUpdateFrequency(
/*---------------------------------------------------------------------*
* IVAS_DEC_GetGetNumOrientationSubframes( )
*
- * Get the number of subframes for head/ecernal orientation per render frame
+ * Get the number of subframes for head/external orientation per render frame
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_GetNumOrientationSubframes(
@@ -932,10 +972,13 @@ ivas_error IVAS_DEC_EnableVoIP(
hDecoderConfig = hIvasDec->st_ivas->hDecoderConfig;
+#ifdef DEBUGGING
hIvasDec->Opt_VOIP = 1;
+#endif
hDecoderConfig->Opt_tsm = 1;
move16();
move16();
+
IF( NE_16( (Word16) hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
{
hDecoderConfig->nchan_out = audioCfg2channels( hDecoderConfig->output_config );
@@ -955,8 +998,10 @@ ivas_error IVAS_DEC_EnableVoIP(
hIvasDec->hVoIP->lastDecodedWasActive = 0;
move16();
hIvasDec->hVoIP->hCurrentDataUnit = NULL;
+#ifndef LIB_DEC_REVISION
hIvasDec->hVoIP->nSamplesFrame = (UWord16) Mpy_32_16_1( hDecoderConfig->output_Fs, INV_FRAME_PER_SEC_Q15 );
move16();
+#endif
hIvasDec->hVoIP->nSamplesRendered20ms = 0;
move16();
@@ -988,7 +1033,14 @@ ivas_error IVAS_DEC_EnableVoIP(
}
#endif
-#ifdef OBJ_EDITING_API
+#ifdef LIB_DEC_REVISION
+ /* init flush buffer (needed for binaural outputs) */
+ IF( ( error = create_flush_buffer_fx( hIvasDec ) ) != IVAS_ERR_OK )
+ {
+ fprintf( stderr, "\nError in create_flush_buffer , code: %d\n", error );
+ return error;
+ }
+#else
IF( hIvasDec->flushbuffer == NULL && ( EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) || EQ_32( hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) )
{
hIvasDec->flushbuffer = (void *) malloc( CPE_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( Word16 ) );
@@ -1015,12 +1067,25 @@ ivas_error IVAS_DEC_FeedFrame_Serial(
{
ivas_error error;
+#ifdef FIX_1388_MSAN_ivas_init_decoder
+ test();
+ IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+#endif
+
IF( !hIvasDec->isInitialized )
{
/* Once first frame is fed, finish initialization in EVS Mono.
* In IVAS mode, initialization is done in ivas_dec(). */
IF( EQ_16( hIvasDec->mode, IVAS_DEC_MODE_EVS ) )
{
+#ifdef FIX_1388_MSAN_ivas_init_decoder
+ hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = ACELP_8k00;
+ move32();
+
+#endif
IF( NE_32( ( error = ivas_init_decoder_fx( hIvasDec->st_ivas ) ), IVAS_ERR_OK ) )
{
return error;
@@ -1046,11 +1111,13 @@ ivas_error IVAS_DEC_FeedFrame_Serial(
hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = imult3216( hIvasDec->hVoIP->hCurrentDataUnit->dataSize, FRAMES_PER_SEC );
move32();
}
+#ifndef FIX_1388_MSAN_ivas_init_decoder
ELSE
{
hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = ACELP_8k00;
move32();
}
+#endif
hIvasDec->isInitialized = true;
move16();
}
@@ -1112,9 +1179,13 @@ ivas_error IVAS_DEC_FeedFrame_Serial(
hIvasDec->needNewFrame = false;
hIvasDec->hasBeenFedFrame = true;
+#ifndef LIB_DEC_REVISION
hIvasDec->nSamplesRendered = 0;
+#endif
hIvasDec->nSamplesAvailableNext = hIvasDec->nSamplesFrame;
+#ifndef LIB_DEC_REVISION
move16();
+#endif
move16();
move16();
move16();
@@ -1124,13 +1195,16 @@ ivas_error IVAS_DEC_FeedFrame_Serial(
/*---------------------------------------------------------------------*
- * IVAS_DEC_GetSamples( )
+ * IVAS_DEC_GetSamplesRenderer( )
*
- * Main function to decode to PCM data
+ * Main function to render the decoded data to output data
*---------------------------------------------------------------------*/
-
+#ifdef LIB_DEC_REVISION
+ivas_error IVAS_DEC_GetSamplesRenderer(
+#else
ivas_error IVAS_DEC_GetSamples(
+#endif
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
const Word16 nSamplesAsked, /* i : number of samples wanted by the caller */
Word16 *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 Q0 */
@@ -1139,26 +1213,16 @@ ivas_error IVAS_DEC_GetSamples(
)
{
ivas_error error;
-#ifdef OBJ_EDITING_API
+#ifndef LIB_DEC_REVISION
Word16 nSamplesToRender;
+#endif
UWord16 nSamplesRendered, nSamplesRendered_loop;
UWord16 nOutChannels;
-#else
- Word16 nOutSamplesElse, nSamplesToRender;
- UWord16 nSamplesRendered, nSamplesRendered_loop, l_ts, nTimeScalerOutSamples;
- UWord8 nTransportChannels, nOutChannels;
-#endif
+ Decoder_Struct *st_ivas;
nSamplesRendered = 0;
nOutChannels = 0;
nSamplesRendered_loop = 0;
-#ifndef OBJ_EDITING_API
- l_ts = 0;
- nTransportChannels = 0;
- move16();
- move16();
-#endif
-
move16();
move16();
move16();
@@ -1168,13 +1232,14 @@ ivas_error IVAS_DEC_GetSamples(
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
}
-#ifdef OBJ_EDITING_API
+
/* the rendering needs to be prepared at this point */
- if ( hIvasDec->hasBeenPreparedRendering == false )
+ IF( hIvasDec->hasBeenPreparedRendering == false )
{
return IVAS_ERR_UNKNOWN;
}
-#endif
+
+ st_ivas = hIvasDec->st_ivas;
IF( hIvasDec->updateOrientation )
{
@@ -1182,7 +1247,7 @@ ivas_error IVAS_DEC_GetSamples(
* Combine orientations
*----------------------------------------------------------------*/
- IF( NE_32( ( error = combine_external_and_head_orientations_dec( hIvasDec->st_ivas->hHeadTrackData, hIvasDec->st_ivas->hExtOrientationData, hIvasDec->st_ivas->hCombinedOrientationData ) ), IVAS_ERR_OK ) )
+ IF( NE_32( ( error = combine_external_and_head_orientations_dec( st_ivas->hHeadTrackData, st_ivas->hExtOrientationData, st_ivas->hCombinedOrientationData ) ), IVAS_ERR_OK ) )
{
return error;
}
@@ -1191,11 +1256,11 @@ ivas_error IVAS_DEC_GetSamples(
* Binaural split rendering setup
*----------------------------------------------------------------*/
- IF( EQ_32( hIvasDec->st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( hIvasDec->st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
+ IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
{
- IF( hIvasDec->st_ivas->hCombinedOrientationData != NULL )
+ IF( st_ivas->hCombinedOrientationData != NULL )
{
- isar_set_split_rend_ht_setup_fx( &hIvasDec->st_ivas->hSplitBinRend->splitrend, hIvasDec->st_ivas->hCombinedOrientationData->Quaternions, hIvasDec->st_ivas->hCombinedOrientationData->Rmat_fx );
+ isar_set_split_rend_ht_setup_fx( &st_ivas->hSplitBinRend->splitrend, st_ivas->hCombinedOrientationData->Quaternions, st_ivas->hCombinedOrientationData->Rmat_fx );
}
}
@@ -1218,11 +1283,11 @@ ivas_error IVAS_DEC_GetSamples(
test();
/* check if we are still at the beginning with bad frames, put out zeroes, keep track of subframes */
- IF( !hIvasDec->isInitialized && hIvasDec->st_ivas->bfi )
+ IF( !hIvasDec->isInitialized && st_ivas->bfi )
{
hIvasDec->hasBeenFedFrame = false;
move16();
- set16_fx( pcmBuf, 0, imult1616( hIvasDec->st_ivas->hDecoderConfig->nchan_out, nSamplesAsked ) );
+ set16_fx( pcmBuf, 0, imult1616( st_ivas->hDecoderConfig->nchan_out, nSamplesAsked ) );
#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
nSamplesRendered = nSamplesAsked;
move16();
@@ -1246,132 +1311,35 @@ ivas_error IVAS_DEC_GetSamples(
}
ELSE
{
-#ifndef OBJ_EDITING_API
- /* check if we need to run the setup function */
- test();
- IF( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame )
- {
- /* setup */
-#ifdef FIX_HRTF_LOAD
- IF( NE_32( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &nSamplesRendered_loop, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ), IVAS_ERR_OK ) )
-#endif
- {
- return error;
- }
- }
-#endif
+#ifndef LIB_DEC_REVISION
{
-#ifndef OBJ_EDITING_API
- /* check if we need to run the setup function, tc decoding and feeding the renderer */
- test();
- IF( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame )
- {
- Word16 nResidualSamples, nSamplesTcsScaled;
- nSamplesRendered = add( nSamplesRendered, nSamplesRendered_loop );
-
- test();
- IF( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm && NE_16( (Word16) nTransportChannels, hIvasDec->nTransportChannelsOld ) )
- {
- IF( NE_32( ( error = IVAS_DEC_VoIP_reconfigure( hIvasDec, nTransportChannels, l_ts ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
- }
-
- /* IVAS decoder */
- IF( NE_32( ( error = IVAS_DEC_GetTcSamples( hIvasDec, hIvasDec->apaExecBuffer_fx, &nOutSamplesElse ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
-
- /* JBM */
- IF( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )
- {
- IF( apa_set_scale_fx( hIvasDec->hTimeScaler, hIvasDec->tsm_scale ) != 0 )
- {
- return IVAS_ERR_UNKNOWN;
- }
-
- // tmp apaExecBuffer
- IF( EQ_16( (Word16) hIvasDec->mode, IVAS_DEC_MODE_EVS ) )
- {
- Word16 tmp_apaExecBuffer[APA_BUF];
- FOR( Word32 i = 0; i < APA_BUF_PER_CHANNEL * nTransportChannels; ++i )
- {
- tmp_apaExecBuffer[i] = extract_l( L_shr( hIvasDec->apaExecBuffer_fx[i], Q11 ) ); // Q0
- }
- IF( apa_exec_fx( hIvasDec->hTimeScaler, tmp_apaExecBuffer, (UWord16) imult3216( hIvasDec->nSamplesFrame, nTransportChannels ), (UWord16) hIvasDec->tsm_max_scaling, tmp_apaExecBuffer, &nTimeScalerOutSamples ) != 0 )
- {
- return IVAS_ERR_UNKNOWN;
- }
- FOR( Word32 i = 0; i < APA_BUF_PER_CHANNEL * nTransportChannels; ++i )
- {
- hIvasDec->apaExecBuffer_fx[i] = L_shl( tmp_apaExecBuffer[i], Q11 ); // Q11
- }
- }
- ELSE
- {
- IF( apa_exec_ivas_fx( hIvasDec->hTimeScaler, hIvasDec->apaExecBuffer_fx, (UWord16) imult3216( hIvasDec->nSamplesFrame, nTransportChannels ), (UWord16) hIvasDec->tsm_max_scaling, hIvasDec->apaExecBuffer_fx, &nTimeScalerOutSamples ) != 0 )
- {
- return IVAS_ERR_UNKNOWN;
- }
- }
- assert( LE_32( (Word32) nTimeScalerOutSamples, APA_BUF ) );
- nSamplesTcsScaled = idiv1616U( extract_l( nTimeScalerOutSamples ), nTransportChannels );
- hIvasDec->timeScalingDone = 1;
- move16();
- }
- ELSE
- {
- nSamplesTcsScaled = hIvasDec->nSamplesFrame;
- move16();
- }
-#ifdef DEBUG_MODE_JBM
- dbgwrite( &nTimeScalerOutSamples, sizeof( uint16_t ), 1, 1, "./res/JBM_nTimeScaleOutSamples.dat" );
-#endif
-
- /* Feed decoded transport channels samples to the renderer */
- IF( NE_32( ( error = IVAS_DEC_RendererFeedTcSamples( hIvasDec, nSamplesTcsScaled, &nResidualSamples, hIvasDec->apaExecBuffer_fx ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
-#ifdef DEBUG_MODE_JBM
- dbgwrite( &nResidualSamples, sizeof( int16_t ), 1, 1, "./res/JBM_nResidualSamples.dat" );
#endif
-
-
- IF( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )
- {
- /* feed residual samples to TSM for the next call */
- IF( apa_set_renderer_residual_samples( hIvasDec->hTimeScaler, (UWord16) nResidualSamples ) != 0 )
- {
- return IVAS_ERR_UNKNOWN;
- }
- }
- hIvasDec->hasBeenFedFrame = false;
- move16();
- }
-#else
- nOutChannels = (UWord8) hIvasDec->st_ivas->hDecoderConfig->nchan_out;
+ nOutChannels = (UWord8) st_ivas->hDecoderConfig->nchan_out;
hIvasDec->hasBeenFedFrame = false;
+
/* check for possible flushed samples from a rate switch */
IF( GE_16( hIvasDec->nSamplesFlushed, 0 ) )
{
/* note: offset (rendered samples) is always 0 */
Copy( hIvasDec->flushbuffer, pcmBuf, imult1616( hIvasDec->nSamplesFlushed, nOutChannels ) );
- nSamplesRendered = add( nSamplesRendered, hIvasDec->nSamplesFlushed );
+#ifdef LIB_DEC_REVISION
+ nSamplesRendered = hIvasDec->nSamplesFlushed;
+#else
+ nSamplesRendered = add( nSamplesRendered, hIvasDec->nSamplesFlushed );
+#endif
hIvasDec->nSamplesFlushed = 0;
move16();
move16();
}
-#endif
/* render IVAS frames directly to the output buffer */
- nSamplesToRender = sub( nSamplesAsked, nSamplesRendered );
- IF( NE_32( ( error = IVAS_DEC_GetRenderedSamples( hIvasDec, nSamplesToRender, &nSamplesRendered_loop, &hIvasDec->nSamplesAvailableNext, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ), IVAS_ERR_OK ) )
+#ifdef LIB_DEC_REVISION
+ IF( ( error = ivas_jbm_dec_render_fx( st_ivas, sub( nSamplesAsked, nSamplesRendered ), &nSamplesRendered_loop, &hIvasDec->nSamplesAvailableNext, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ) != IVAS_ERR_OK )
+#else
+ nSamplesToRender = sub( nSamplesAsked, nSamplesRendered );
+ IF( NE_32( ( error = IVAS_DEC_GetRenderedSamples( hIvasDec, nSamplesToRender, &nSamplesRendered_loop, &hIvasDec->nSamplesAvailableNext, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ), IVAS_ERR_OK ) )
+#endif
{
return error;
}
@@ -1392,7 +1360,9 @@ ivas_error IVAS_DEC_GetSamples(
move16();
}
#endif
+#ifndef LIB_DEC_REVISION
}
+#endif
}
#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
@@ -1420,7 +1390,7 @@ ivas_error IVAS_DEC_GetSamples(
/*---------------------------------------------------------------------*
* IVAS_DEC_GetSplitBinauralBitstream( )
*
- *
+ * Get split-rendering bitstream
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_GetSplitBinauralBitstream(
@@ -1463,13 +1433,6 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
*needNewFrame = false;
hSplitBinRend = st_ivas->hSplitBinRend;
-#ifndef OBJ_EDITING_API
- IF( ( error = isar_set_split_rend_setup( hSplitBinRend, &st_ivas->hRenderConfig->split_rend_config, st_ivas->hCombinedOrientationData, splitRendBits ) ) != IVAS_ERR_OK )
- {
- return error;
- }
-#endif
-
FOR( i = 0; i < MAX_HEAD_ROT_POSES * BINAURAL_CHANNELS; i++ )
{
FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )
@@ -1496,18 +1459,16 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
numPoses = hSplitBinRend->splitrend.multiBinPoseData.num_poses;
move16();
-#ifdef OBJ_EDITING_API
/* init flush buffer for rate switch if not already initizalized */
IF( hIvasDec->flushbuffer == NULL )
{
hIvasDec->flushbuffer = (void *) malloc( numPoses * BINAURAL_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES * sizeof( float ) );
set16_fx( (Word16 *) hIvasDec->flushbuffer, 0, numPoses * BINAURAL_CHANNELS * hIvasDec->nSamplesFrame / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES );
}
-#endif
IF( NE_32( st_ivas->hDecoderConfig->render_framesize, IVAS_RENDER_FRAMESIZE_20MS ) &&
- ( EQ_32( hIvasDec->st_ivas->hRenderConfig->split_rend_config.poseCorrectionMode, ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE ) ||
- EQ_16( hIvasDec->st_ivas->hRenderConfig->split_rend_config.dof, 0 ) ) )
+ ( EQ_32( st_ivas->hRenderConfig->split_rend_config.poseCorrectionMode, ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE ) ||
+ EQ_16( st_ivas->hRenderConfig->split_rend_config.dof, 0 ) ) )
{
numSamplesPerChannelToDecode = (Word16) ( output_Fs / FRAMES_PER_SEC ); // TODO remove division
numSamplesPerChannelToDecode = (Word16) ( numSamplesPerChannelToDecode / MAX_PARAM_SPATIAL_SUBFRAMES ); // TODO remove division
@@ -1541,7 +1502,11 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
}
/* Decode and render */
+#ifdef LIB_DEC_REVISION
+ IF( ( error = IVAS_DEC_GetSamplesRenderer( hIvasDec, numSamplesPerChannelToDecode, pcmBuf_out, nOutSamples, needNewFrame ) ) != IVAS_ERR_OK )
+#else
IF( ( error = IVAS_DEC_GetSamples( hIvasDec, numSamplesPerChannelToDecode, pcmBuf_out, nOutSamples, needNewFrame ) ) != IVAS_ERR_OK )
+#endif
{
return error;
}
@@ -1618,18 +1583,18 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
Q_out[0] = 31;
Word16 num_poses = hSplitBinRend->splitrend.multiBinPoseData.num_poses;
- for ( i = 0; i < i_mult( BINAURAL_CHANNELS, numPoses ); i++ )
+ FOR( i = 0; i < i_mult( BINAURAL_CHANNELS, numPoses ); i++ )
{
- for ( j = 0; j < CLDFB_NO_COL_MAX; j++ )
+ FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )
{
q1 = s_min( q1, L_norm_arr( Cldfb_RealBuffer_Binaural[i][j], CLDFB_NO_CHANNELS_MAX ) );
q2 = s_min( q2, L_norm_arr( Cldfb_ImagBuffer_Binaural[i][j], CLDFB_NO_CHANNELS_MAX ) );
}
}
Q_buff = s_min( q1, q2 );
- for ( i = 0; i < i_mult( BINAURAL_CHANNELS, numPoses ); i++ )
+ FOR( i = 0; i < i_mult( BINAURAL_CHANNELS, numPoses ); i++ )
{
- for ( j = 0; j < CLDFB_NO_COL_MAX; j++ )
+ FOR( j = 0; j < CLDFB_NO_COL_MAX; j++ )
{
scale_sig32( Cldfb_RealBuffer_Binaural[i][j], CLDFB_NO_CHANNELS_MAX, Q_buff );
scale_sig32( Cldfb_ImagBuffer_Binaural[i][j], CLDFB_NO_CHANNELS_MAX, Q_buff );
@@ -1689,7 +1654,7 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
ivas_limiter_dec_fx( st_ivas->hLimiter, pOutput, st_ivas->hDecoderConfig->nchan_out, numSamplesPerChannelToDecode, st_ivas->BER_detect, Q11 );
}
- ivas_syn_output_fx( pOutput, Q11, numSamplesPerChannelToDecode, st_ivas->hDecoderConfig->nchan_out, (int16_t *) pcmBuf_out );
+ ivas_syn_output_fx( pOutput, Q11, numSamplesPerChannelToDecode, st_ivas->hDecoderConfig->nchan_out, (Word16 *) pcmBuf_out );
}
#ifndef TMP_FIX_SPLIT_REND
@@ -1700,6 +1665,20 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream(
}
+#ifdef LIB_DEC_REVISION
+/*---------------------------------------------------------------------*
+ * ivas_dec_setup_all()
+ *
+ * Set-up all decoder parts: IVAS decoder, ISAR
+ *---------------------------------------------------------------------*/
+
+static ivas_error ivas_dec_setup_all(
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ UWord8 *nTransportChannels, /* o : number of decoded transport PCM channels */
+ const Word16 isSplitRend, /* i : split rendering enabled flag */
+ ISAR_SPLIT_REND_BITS_DATA *splitRendBits /* o : output split rendering bits */
+)
+#else
/*---------------------------------------------------------------------*
* IVAS_DEC_Setup( )
*
@@ -1710,39 +1689,21 @@ static ivas_error IVAS_DEC_Setup(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
UWord16 *nTcBufferGranularity, /* o : granularity of the TC Buffer */
UWord8 *nTransportChannels /* o : number of decoded transport PCM channels */
-#ifndef FIX_HRTF_LOAD
- ,
- UWord8 *nOutChannels, /* o : number of decoded out channels (PCM or CLDFB) */
- UWord16 *nSamplesRendered, /* o : number of samples flushed from the last frame */
- Word16 *data /* o : output synthesis signal Q0 */
-#endif
)
+#endif
{
ivas_error error;
-#ifndef FIX_HRTF_LOAD
- *nSamplesRendered = 0;
- move16();
-#endif
IF( EQ_16( (Word16) hIvasDec->mode, IVAS_DEC_MODE_EVS ) )
{
IF( EQ_16( (Word16) hIvasDec->st_ivas->renderer_type, RENDERER_NON_DIEGETIC_DOWNMIX ) )
{
*nTransportChannels = MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN;
-#ifndef FIX_HRTF_LOAD
- *nOutChannels = MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN;
-#endif
}
ELSE
{
*nTransportChannels = 1;
-#ifndef FIX_HRTF_LOAD
- *nOutChannels = 1;
-#endif
}
-#ifndef FIX_HRTF_LOAD
- move16();
-#endif
move16();
}
ELSE
@@ -1751,6 +1712,17 @@ static ivas_error IVAS_DEC_Setup(
st_ivas = hIvasDec->st_ivas;
+#ifdef LIB_DEC_REVISION
+ /* Setup IVAS split rendering */
+ IF( isSplitRend )
+ {
+ IF( ( error = isar_set_split_rend_setup( st_ivas->hSplitBinRend, &st_ivas->hRenderConfig->split_rend_config, st_ivas->hCombinedOrientationData, splitRendBits ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+
+#endif
/*----------------------------------------------------------------*
* IVAS decoder setup
* - read IVAS format signaling
@@ -1759,29 +1731,21 @@ static ivas_error IVAS_DEC_Setup(
* - reconfigure the decoder when the number of TC or IVAS total bitrate change
*----------------------------------------------------------------*/
- IF( st_ivas->bfi == 0 )
+ IF( EQ_16( st_ivas->bfi, 0 ) )
{
-#ifdef FIX_HRTF_LOAD
+ error = IVAS_ERR_OK; // this is just to help the clang-formatting keep alignments
IF( ( error = ivas_dec_setup( st_ivas ) ) != IVAS_ERR_OK )
-#else
- IF( ( error = ivas_dec_setup( st_ivas, nSamplesRendered, data ) ) != IVAS_ERR_OK )
-#endif
{
return error;
}
-#ifdef DEBUGGING
- int16_t a = 0; // this is just to help the clang-formatting keep alignments correct
-#endif
}
*nTransportChannels = (UWord8) st_ivas->hTcBuffer->nchan_transport_jbm;
+#ifndef LIB_DEC_REVISION
*nTcBufferGranularity = (UWord16) st_ivas->hTcBuffer->n_samples_granularity;
-#ifndef FIX_HRTF_LOAD
- *nOutChannels = (UWord8) st_ivas->hDecoderConfig->nchan_out;
move16();
#endif
move16();
- move16();
/*-----------------------------------------------------------------*
* ISAR:
@@ -1790,7 +1754,11 @@ static ivas_error IVAS_DEC_Setup(
*-----------------------------------------------------------------*/
test();
+#ifdef LIB_DEC_REVISION
+ IF( st_ivas->ini_frame == 0 && isSplitRend )
+#else
IF( st_ivas->ini_frame == 0 && ( is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig ) ) )
+#endif
{
IF( ( error = ivas_dec_init_split_rend( st_ivas ) ) != IVAS_ERR_OK )
{
@@ -1811,7 +1779,7 @@ static ivas_error IVAS_DEC_Setup(
return IVAS_ERR_OK;
}
-
+#ifndef LIB_DEC_REVISION
/*---------------------------------------------------------------------*
* IVAS_DEC_GetTcSamples( )
*
@@ -1840,7 +1808,12 @@ static ivas_error IVAS_DEC_GetTcSamples(
IF( EQ_16( (Word16) hIvasDec->mode, IVAS_DEC_MODE_EVS ) )
{
+#ifdef LIB_DEC_REVISION
+ pcmBuf_fx[0] = 0; // TODO !!!
+ IF( NE_32( ( error = evs_dec_main_fx( st_ivas ) ), IVAS_ERR_OK ) )
+#else
IF( NE_32( ( error = evs_dec_main_fx( st_ivas, *nOutSamples, pcmBuf_fx, NULL ) ), IVAS_ERR_OK ) )
+#endif
{
return error;
}
@@ -1893,7 +1866,11 @@ static ivas_error IVAS_DEC_GetTcSamples(
}
/* Function call: ivas_jbm_dec_tc function */
+#ifdef LIB_DEC_REVISION
+ IF( NE_32( ( error = ivas_jbm_dec_tc_fx( st_ivas ) ), IVAS_ERR_OK ) )
+#else
IF( NE_32( ( error = ivas_jbm_dec_tc_fx( st_ivas, pcmBuf_fx ) ), IVAS_ERR_OK ) )
+#endif
{
return error;
}
@@ -1934,6 +1911,7 @@ static ivas_error IVAS_DEC_GetTcSamples(
}
}
}
+
if ( hIvasDec->hasBeenFedFirstGoodFrame )
{
hIvasDec->hasDecodedFirstGoodFrame = true;
@@ -1999,7 +1977,6 @@ static ivas_error IVAS_DEC_GetRenderedSamples(
st_ivas = hIvasDec->st_ivas;
-#ifdef FIX_HRTF_LOAD
// temp code to make HRTF changes working in the old API structure
UWord16 nSamplesRendered_loop = 0;
Word16 nOutChannels = st_ivas->hDecoderConfig->nchan_out;
@@ -2022,15 +1999,10 @@ static ivas_error IVAS_DEC_GetRenderedSamples(
error = ivas_jbm_dec_render_fx( st_ivas, nSamplesForRendering - *nSamplesRendered, &nSamplesRendered_loop, nSamplesAvailableNext, pcmBuf + ( *nSamplesRendered * nOutChannels ) );
*nSamplesRendered = add( *nSamplesRendered, nSamplesRendered_loop );
-#else
- /* run the main IVAS decoding routine */
- error = ivas_jbm_dec_render_fx( st_ivas, nSamplesForRendering, nSamplesRendered, nSamplesAvailableNext, pcmBuf );
-#endif
return error;
}
-
/*---------------------------------------------------------------------*
* IVAS_DEC_GetBufferedNumberOfSamples( )
*
@@ -2061,7 +2033,7 @@ static ivas_error IVAS_DEC_GetBufferedNumberOfSamples(
return IVAS_ERR_OK;
}
-
+#endif
/*---------------------------------------------------------------------*
* IVAS_DEC_GetNumObjects( )
@@ -2154,9 +2126,9 @@ ivas_error IVAS_DEC_GetFormat(
/*---------------------------------------------------------------------*
- * getInputBufferSize()
- *
+ * getOutputBufferSize()
*
+ * Get size of output buffer in samples
*---------------------------------------------------------------------*/
static Word16 getOutputBufferSize(
@@ -2191,7 +2163,7 @@ static Word16 getOutputBufferSize(
/*---------------------------------------------------------------------*
* IVAS_DEC_GetOutputBufferSize()
*
- *
+ * Returns size of output buffer in samples
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_GetOutputBufferSize(
@@ -2256,6 +2228,7 @@ ivas_error IVAS_DEC_GetNumOutputChannels(
*
* Get metadata of one object decoded in the most recent frame
*---------------------------------------------------------------------*/
+
ivas_error IVAS_DEC_GetObjectMetadata(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
IVAS_ISM_METADATA *metadata, /* o : struct where metadata decoded in most recently decoded frame will be written */
@@ -2278,7 +2251,7 @@ ivas_error IVAS_DEC_GetObjectMetadata(
st_ivas = hIvasDec->st_ivas;
- IF( hIvasDec->st_ivas->hMasa != NULL )
+ IF( st_ivas->hMasa != NULL )
{
IF( EQ_32( hIvasDec->st_ivas->hMasa->config.input_ivas_format, MASA_ISM_FORMAT ) )
{
@@ -2290,10 +2263,10 @@ ivas_error IVAS_DEC_GetObjectMetadata(
test();
test();
test();
- if ( NE_32( st_ivas->ivas_format, ISM_FORMAT ) &&
- NE_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) &&
- NE_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) &&
- EQ_16( is_masa_ism, 0 ) )
+ IF( NE_32( st_ivas->ivas_format, ISM_FORMAT ) &&
+ NE_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) &&
+ NE_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) &&
+ EQ_16( is_masa_ism, 0 ) )
{
return IVAS_ERR_WRONG_MODE;
}
@@ -2318,22 +2291,19 @@ ivas_error IVAS_DEC_GetObjectMetadata(
metadata->yaw_fx = 0; // Q22
metadata->pitch_fx = 0; // Q22
metadata->spread_fx = 0; // Q22
- metadata->gainFactor_fx = ONE_IN_Q31; // Q31
+ metadata->gainFactor_fx = ONE_IN_Q29; // Q31
metadata->non_diegetic_flag = 0;
}
ELSE
{
-#ifdef OBJ_EDITING_API
IF( EQ_32( st_ivas->ism_mode, ISM_MODE_DISC ) )
{
metadata->azimuth_fx = hIsmMeta->edited_azimuth_fx;
metadata->elevation_fx = hIsmMeta->edited_elevation_fx;
metadata->radius_fx = hIsmMeta->edited_radius_fx;
-
metadata->yaw_fx = hIsmMeta->edited_yaw_fx;
metadata->pitch_fx = hIsmMeta->edited_pitch_fx;
metadata->spread_fx = 0;
-
metadata->gainFactor_fx = hIsmMeta->edited_gain_fx;
metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;
}
@@ -2345,7 +2315,7 @@ ivas_error IVAS_DEC_GetObjectMetadata(
metadata->yaw_fx = hIsmMeta->yaw_fx;
metadata->pitch_fx = hIsmMeta->pitch_fx;
metadata->spread_fx = 0;
- metadata->gainFactor_fx = ONE_IN_Q31;
+ metadata->gainFactor_fx = ONE_IN_Q29;
metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;
}
ELSE IF( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) || EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
@@ -2360,7 +2330,6 @@ ivas_error IVAS_DEC_GetObjectMetadata(
metadata->non_diegetic_flag = st_ivas->hIsmMetaData[objectIdx]->non_diegetic_flag;
}
ELSE
-#endif
{
metadata->azimuth_fx = hIsmMeta->azimuth_fx; // Q22
metadata->elevation_fx = hIsmMeta->elevation_fx; // Q22
@@ -2368,7 +2337,7 @@ ivas_error IVAS_DEC_GetObjectMetadata(
metadata->yaw_fx = hIsmMeta->yaw_fx; // Q22
metadata->pitch_fx = hIsmMeta->pitch_fx; // Q22
metadata->spread_fx = 0; // Q22
- metadata->gainFactor_fx = ONE_IN_Q31;
+ metadata->gainFactor_fx = ONE_IN_Q29;
metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;
}
}
@@ -2381,9 +2350,11 @@ ivas_error IVAS_DEC_GetObjectMetadata(
move32();
move16();
move16();
+
return IVAS_ERR_OK;
}
+
/*---------------------------------------------------------------------*
* IVAS_DEC_GetMasaMetadata( )
*
@@ -2507,7 +2478,7 @@ ivas_error IVAS_DEC_FeedHeadTrackData(
/*---------------------------------------------------------------------*
* IVAS_DEC_FeedRefRotData( )
*
- * Feed the decoder with the reference rotation
+ * Feed the decoder with the reference rotation data
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_FeedRefRotData(
@@ -2574,10 +2545,10 @@ ivas_error IVAS_DEC_FeedRefVectorData(
hIvasDec->updateOrientation = true;
move16();
- ivas_error error_fx = ivas_orient_trk_SetReferenceVector_fx( pOtr, listenerPos, refPos );
- return error_fx;
+ return ivas_orient_trk_SetReferenceVector_fx( pOtr, listenerPos, refPos );
}
+
/*---------------------------------------------------------------------*
* IVAS_DEC_FeedExternalOrientationData( )
*
@@ -2691,7 +2662,7 @@ ivas_error IVAS_DEC_FeedCustomLsData(
return IVAS_ERR_OK;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
+
/*---------------------------------------------------------------------*
* IVAS_DEC_GetHrtfTDrendHandle( )
*
@@ -2699,16 +2670,6 @@ ivas_error IVAS_DEC_FeedCustomLsData(
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_GetHrtfTDrendHandle(
-#else
-
-/*---------------------------------------------------------------------*
- * IVAS_DEC_GetHrtfHandle( )
- *
- *
- *---------------------------------------------------------------------*/
-
-ivas_error IVAS_DEC_GetHrtfHandle(
-#endif
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
IVAS_DEC_HRTF_TD_HANDLE **hHrtfTD /* o : TD rend. HRTF handle */
)
@@ -2733,31 +2694,18 @@ ivas_error IVAS_DEC_GetHrtfHandle(
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_GetHrtfCRendHandle(
- IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
-#ifdef FIX_CREND_SIMPLIFY_CODE
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
IVAS_DEC_HRTF_CREND_HANDLE **hHrtfCrend /* o : Crend HRTF handle */
-#else
- IVAS_DEC_HRTF_CREND_HANDLE **hSetOfHRTF /* o : Set of HRTF handle */
-#endif
)
{
test();
test();
-#ifdef FIX_CREND_SIMPLIFY_CODE
IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHrtfCrend == NULL )
{
return IVAS_ERR_WRONG_PARAMS;
}
*hHrtfCrend = &hIvasDec->st_ivas->hHrtfCrend;
-#else
- IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hSetOfHRTF == NULL )
- {
- return IVAS_ERR_WRONG_PARAMS;
- }
-
- *hSetOfHRTF = &hIvasDec->st_ivas->hSetOfHRTF;
-#endif
return IVAS_ERR_OK;
}
@@ -2822,7 +2770,9 @@ ivas_error IVAS_DEC_GetHrtfStatisticsHandle(
IVAS_DEC_HRTF_STATISTICS_HANDLE **hHrtfStatistics /* o : HRTF statistics handle */
)
{
- if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHrtfStatistics == NULL )
+ test();
+ test();
+ IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->st_ivas->hHrtfStatistics == NULL )
{
return IVAS_ERR_WRONG_PARAMS;
}
@@ -2833,7 +2783,6 @@ ivas_error IVAS_DEC_GetHrtfStatisticsHandle(
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
/*---------------------------------------------------------------------*
* IVAS_DEC_HRTF_binary_open( )
*
@@ -2943,20 +2892,20 @@ ivas_error IVAS_DEC_HRTF_binary_close(
IF( st_ivas->hDecoderConfig->Opt_HRTF_binary && st_ivas->ini_frame > 0 )
{
test();
- IF( !( binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_TDREND || binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_DEFAULT ) )
+ IF( !( EQ_32( binaural_renderer_old, IVAS_BIN_RENDERER_TYPE_TDREND ) || EQ_32( binaural_renderer_old, IVAS_BIN_RENDERER_TYPE_DEFAULT ) ) )
{
ivas_HRTF_binary_close_fx( &st_ivas->hHrtfTD );
}
test();
- IF( !( binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_CREND || binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_DEFAULT ) )
+ IF( !( EQ_32( binaural_renderer_old, IVAS_BIN_RENDERER_TYPE_CREND ) || EQ_32( binaural_renderer_old, IVAS_BIN_RENDERER_TYPE_DEFAULT ) ) )
{
/* CRend binaural renderer handle */
ivas_HRTF_CRend_binary_close_fx( &st_ivas->hHrtfCrend );
}
test();
- IF( !( binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_DEFAULT ) )
+ IF( !( EQ_32( binaural_renderer_old, IVAS_BIN_RENDERER_TYPE_FASTCONV ) || EQ_32( binaural_renderer_old, IVAS_BIN_RENDERER_TYPE_DEFAULT ) ) )
{
/* Fastconv HRTF memories */
ivas_binaural_hrtf_close_fx( &st_ivas->hHrtfFastConv );
@@ -2966,9 +2915,8 @@ ivas_error IVAS_DEC_HRTF_binary_close(
}
test();
- IF( !( binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_PARAMBIN || binaural_renderer_old == IVAS_BIN_RENDERER_TYPE_DEFAULT ) )
+ IF( !( EQ_32( binaural_renderer_old, IVAS_BIN_RENDERER_TYPE_PARAMBIN ) || EQ_32( binaural_renderer_old, IVAS_BIN_RENDERER_TYPE_DEFAULT ) ) )
{
-
/* Parametric binauralizer HRTF filters */
ivas_HRTF_parambin_binary_close_fx( &st_ivas->hHrtfParambin );
}
@@ -2976,7 +2924,6 @@ ivas_error IVAS_DEC_HRTF_binary_close(
return IVAS_ERR_OK;
}
-#endif
/*---------------------------------------------------------------------*
@@ -3023,7 +2970,7 @@ static ivas_error copyRendererConfigStruct(
/*---------------------------------------------------------------------*
* IVAS_DEC_GetRenderConfig( )
*
- *
+ * Return renderer configuration parameters handle
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_GetRenderConfig(
@@ -3043,6 +2990,12 @@ ivas_error IVAS_DEC_GetRenderConfig(
}
+/*---------------------------------------------------------------------*
+ * IVAS_DEC_GetDefaultRenderConfig( )
+ *
+ * Return default renderer configuration parameters
+ *---------------------------------------------------------------------*/
+
/*! r: error code*/
ivas_error IVAS_DEC_GetDefaultRenderConfig(
IVAS_RENDER_CONFIG_HANDLE hRCout /* o : Render config handle */
@@ -3064,7 +3017,7 @@ ivas_error IVAS_DEC_GetDefaultRenderConfig(
/*---------------------------------------------------------------------*
* IVAS_DEC_FeedRenderConfig( )
*
- *
+ * Set renderer configuration (acoustic environment) parameters
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_FeedRenderConfig(
@@ -3073,6 +3026,7 @@ ivas_error IVAS_DEC_FeedRenderConfig(
)
{
RENDER_CONFIG_HANDLE hRenderConfig;
+ Decoder_Struct *st_ivas;
ivas_error error;
test();
@@ -3083,6 +3037,8 @@ ivas_error IVAS_DEC_FeedRenderConfig(
}
hRenderConfig = hIvasDec->st_ivas->hRenderConfig;
+ st_ivas = hIvasDec->st_ivas;
+
hRenderConfig->roomAcoustics.nBands = renderConfig.roomAcoustics.nBands;
hRenderConfig->roomAcoustics.acousticPreDelay_fx = renderConfig.roomAcoustics.acousticPreDelay_fx;
hRenderConfig->roomAcoustics.inputPreDelay_fx = renderConfig.roomAcoustics.inputPreDelay_fx;
@@ -3112,9 +3068,9 @@ ivas_error IVAS_DEC_FeedRenderConfig(
/* Re-initialize reverb instance if already available */
/* TD renderer Jot reverberator */
- IF( hIvasDec->st_ivas->hReverb != NULL )
+ IF( st_ivas->hReverb != NULL )
{
- IF( ( error = ivas_reverb_open_fx( &hIvasDec->st_ivas->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
+ IF( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hHrtfStatistics, hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -3123,19 +3079,20 @@ ivas_error IVAS_DEC_FeedRenderConfig(
/* CREND Jot reverberator */
test();
test();
- IF( hIvasDec->st_ivas->hCrendWrapper != NULL && hIvasDec->st_ivas->hCrendWrapper->hCrend[0] != NULL && hIvasDec->st_ivas->hCrendWrapper->hCrend[0]->hReverb != NULL )
+ IF( st_ivas->hCrendWrapper != NULL && st_ivas->hCrendWrapper->hCrend[0] != NULL && st_ivas->hCrendWrapper->hCrend[0]->hReverb != NULL )
{
- IF( ( error = ivas_reverb_open_fx( &hIvasDec->st_ivas->hCrendWrapper->hCrend[0]->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
+ IF( ( error = ivas_reverb_open_fx( &st_ivas->hCrendWrapper->hCrend[0]->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
{
return error;
}
}
- test();
/* FB reverberator */
- IF( hIvasDec->st_ivas->hDiracDecBin[0] != NULL && hIvasDec->st_ivas->hDiracDecBin[0]->hReverb != NULL )
+ test();
+ IF( st_ivas->hDiracDecBin[0] != NULL && st_ivas->hDiracDecBin[0]->hReverb != NULL )
{
- ivas_binaural_reverb_close_fx( &( hIvasDec->st_ivas->hDiracDecBin[0]->hReverb ) );
+ ivas_binaural_reverb_close_fx( &( st_ivas->hDiracDecBin[0]->hReverb ) );
+
IF( ( error = ivas_binaural_reverb_init_fx( &( hIvasDec->st_ivas->hDiracDecBin[0]->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hSpatParamRendCom->num_freq_bands, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL, NULL ) ) != IVAS_ERR_OK )
{
return error;
@@ -3144,9 +3101,10 @@ ivas_error IVAS_DEC_FeedRenderConfig(
test();
/* Fastconv CLDFB reverberator */
- IF( hIvasDec->st_ivas->hBinRenderer != NULL && hIvasDec->st_ivas->hBinRenderer->hReverb != NULL )
+ IF( st_ivas->hBinRenderer != NULL && st_ivas->hBinRenderer->hReverb != NULL )
{
- ivas_binaural_reverb_close_fx( &( hIvasDec->st_ivas->hBinRenderer->hReverb ) );
+ ivas_binaural_reverb_close_fx( &( st_ivas->hBinRenderer->hReverb ) );
+
IF( ( error = ivas_binaural_reverb_init_fx( &( hIvasDec->st_ivas->hBinRenderer->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hBinRenderer->conv_band, hIvasDec->st_ivas->hBinRenderer->timeSlots, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL, NULL ) ) != IVAS_ERR_OK )
{
return error;
@@ -3164,7 +3122,7 @@ ivas_error IVAS_DEC_FeedRenderConfig(
hRenderConfig->split_rend_config.poseCorrectionMode = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;
}
- IF( is_split_rendering_enabled( hIvasDec->st_ivas->hDecoderConfig, hRenderConfig ) )
+ IF( is_split_rendering_enabled( st_ivas->hDecoderConfig, hRenderConfig ) )
{
IF( ( error = isar_split_rend_validate_config( &hRenderConfig->split_rend_config, ( hIvasDec->st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ) ) != IVAS_ERR_OK )
{
@@ -3251,7 +3209,7 @@ ivas_error IVAS_DEC_GetDelay(
/*---------------------------------------------------------------------*
* IVAS_DEC_HasDecodedFirstGoodFrame( )
*
- *
+ * Return flag indicating if the decoder has decoded a good frame
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_HasDecodedFirstGoodFrame(
@@ -3272,6 +3230,7 @@ ivas_error IVAS_DEC_HasDecodedFirstGoodFrame(
return IVAS_ERR_OK;
}
+#ifndef LIB_DEC_REVISION
/*---------------------------------------------------------------------*
* IVAS_DEC_GetPcmFrameSize( )
@@ -3304,6 +3263,8 @@ ivas_error IVAS_DEC_GetPcmFrameSize(
return IVAS_ERR_OK;
}
+#endif
+
/*---------------------------------------------------------------------*
* isSidFrame( )
@@ -3330,8 +3291,15 @@ static bool isSidFrame(
return false;
}
-static void bsCompactToSerial(
- const UWord8 *compact,
+
+/*---------------------------------------------------------------------*
+ * bsCompactToSerial( )
+ *
+ * Bitstream conversion to Byte format
+ *---------------------------------------------------------------------*/
+
+static void bsCompactToSerial(
+ const UWord8 *compact,
UWord16 *serial,
const UWord16 num_bits )
{
@@ -3517,6 +3485,51 @@ ivas_error IVAS_DEC_VoIP_SetScale(
return IVAS_ERR_OK;
}
+#ifdef VARIABLE_SPEED_DECODING
+#ifdef LIB_DEC_REVISION
+
+/*---------------------------------------------------------------------*
+ * IVAS_DEC_EnableTsm( )
+ *
+ * Enable Time-Scale Modification (TSM)
+ *---------------------------------------------------------------------*/
+
+ivas_error IVAS_DEC_EnableTsm(
+ IVAS_DEC_HANDLE hIvasDec /* i/o: IVAS decoder handle */
+)
+{
+ AUDIO_CONFIG output_config;
+ ivas_error error;
+
+ test();
+ IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ hIvasDec->st_ivas->hDecoderConfig->Opt_tsm = 1;
+ move16();
+
+ /* Init flush buffer if necessary (only needed for binaural) */
+ output_config = hIvasDec->st_ivas->hDecoderConfig->output_config;
+
+ test();
+ test();
+ test();
+ test();
+ test();
+ IF( hIvasDec->flushbuffer == NULL && ( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) || EQ_32( output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_32( output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) )
+ {
+ IF( ( error = create_flush_buffer( hIvasDec ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+
+ return IVAS_ERR_OK;
+}
+
+#endif
/*---------------------------------------------------------------------*
* IVAS_DEC_TSM_SetQuality( )
@@ -3557,8 +3570,7 @@ ivas_error IVAS_DEC_TSM_SetQuality(
return IVAS_ERR_OK;
}
-
-#ifdef FIX_CREND_SIMPLIFY_CODE
+#endif
/*---------------------------------------------------------------------*
* renderer_type_to_mode()
@@ -3625,7 +3637,11 @@ ivas_error IVAS_DEC_ReadFormat(
MC_MODE mc_mode_old;
Word16 nchan_transport_old;
AUDIO_CONFIG intern_config_old, transport_config_old, output_config;
+#ifdef NONBE_1303_REND_GRANULARITY
+ RENDERER_TYPE renderer_type_old, renderer_type_sec_new, renderer_type_sec_old;
+#else
RENDERER_TYPE renderer_type_old, renderer_type_sec_new;
+#endif
test();
IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL )
@@ -3641,6 +3657,9 @@ ivas_error IVAS_DEC_ReadFormat(
intern_config_old = st_ivas->intern_config;
transport_config_old = st_ivas->transport_config;
renderer_type_old = st_ivas->renderer_type;
+#ifdef NONBE_1303_REND_GRANULARITY
+ renderer_type_sec_old = ivas_renderer_secondary_select_fx( st_ivas );
+#endif
move32();
move32();
move32();
@@ -3648,6 +3667,9 @@ ivas_error IVAS_DEC_ReadFormat(
move32();
move32();
move32();
+#ifdef NONBE_1303_REND_GRANULARITY
+ move32();
+#endif
output_config = st_ivas->hDecoderConfig->output_config;
move32();
@@ -3677,7 +3699,7 @@ ivas_error IVAS_DEC_ReadFormat(
*binaural_renderer = renderer_type_to_mode( st_ivas->renderer_type );
/* Select secondary binaural renderer (used in combined formats) */
- renderer_type_sec_new = ivas_renderer_secondary_select( st_ivas );
+ renderer_type_sec_new = ivas_renderer_secondary_select_fx( st_ivas );
*binaural_renderer_sec = renderer_type_to_mode( renderer_type_sec_new );
/* select HRTF audio configuration to load the right HRTF set for the external binary file */
@@ -3739,7 +3761,36 @@ ivas_error IVAS_DEC_ReadFormat(
}
}
-#ifdef FIX_HRTF_LOAD
+#ifdef NONBE_1303_REND_GRANULARITY
+ test();
+ test();
+ test();
+ test();
+ /* JBM: compensate when binaural renderer granularity changes (happens in bitrate switching) */
+ IF( st_ivas->ini_active_frame > 0 && st_ivas->hDecoderConfig->Opt_tsm &&
+ ( NE_32( renderer_type_old, st_ivas->renderer_type ) ||
+ NE_32( renderer_type_sec_old, renderer_type_sec_new ) ) )
+ {
+ Word16 tc_granularity_new = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, renderer_type_sec_new, st_ivas->hDecoderConfig->output_Fs );
+
+ st_ivas->nchan_transport = nchan_transport_old;
+ move16();
+
+ IF( st_ivas->hTcBuffer == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+ /* when granularity goes down, render what still fits in the new granularity */
+ IF( LT_32( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
+ {
+ IF( NE_32( ( error = ivas_jbm_dec_flush_renderer_fx( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &st_ivas->hIntSetup, mc_mode_old, ism_mode_old, &hIvasDec->nSamplesFlushed, hIvasDec->flushbuffer ) ), IVAS_ERR_OK ) )
+ {
+ return error;
+ }
+ }
+ }
+#else
test();
test();
test();
@@ -3747,25 +3798,17 @@ ivas_error IVAS_DEC_ReadFormat(
test();
test();
IF( ( NE_32( renderer_type_old, st_ivas->renderer_type ) && NE_32( renderer_type_old, RENDERER_DISABLE ) ) ||
- ( st_ivas->ini_active_frame > 0 && ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) && NE_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) ) )
+ ( st_ivas->ini_active_frame > 0 &&
+ ( ( ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) && NE_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) ) ||
+ ( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) && NE_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) ) ) ) )
{
/* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv
render what still fits in the new granularity */
Word16 tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );
-#ifdef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH
st_ivas->nchan_transport = nchan_transport_old;
move16();
-#else
-// st_ivas->nchan_transport = nchan_transport_old; // ToDo: temporarily deactivated to keep FIX_HRTF_LOAD bit-exact but this is likely a bug in the main -> see issue #1200
-#endif
-#ifndef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH
- if ( st_ivas->ivas_format == MASA_FORMAT )
- {
- st_ivas->nchan_ism = 0; // ToDo: temporary hack to keep FIX_HRTF_LOAD bit-exact but this is likely a bug in the main -> see issue #1199
- }
-#endif
IF( LT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )
{
IF( ( error = ivas_jbm_dec_flush_renderer_fx( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &st_ivas->hIntSetup, mc_mode_old, ism_mode_old, &hIvasDec->nSamplesFlushed, hIvasDec->flushbuffer ) ) != IVAS_ERR_OK )
@@ -3792,9 +3835,7 @@ ivas_error IVAS_DEC_ReadFormat(
return IVAS_ERR_OK;
}
-#endif
-#ifdef FIX_HRTF_LOAD_API
/*---------------------------------------------------------------------*
* IVAS_DEC_GetSamplesDecoder( )
@@ -3804,11 +3845,18 @@ ivas_error IVAS_DEC_ReadFormat(
ivas_error IVAS_DEC_GetSamplesDecoder(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
- const int16_t isSplitRend, /* i : split rendering enabled flag */
+ const Word16 isSplitRend, /* i : split rendering enabled flag */
ISAR_SPLIT_REND_BITS_DATA *splitRendBits /* o : output split rendering bits */
)
{
ivas_error error;
+ Decoder_Struct *st_ivas;
+#ifdef LIB_DEC_REVISION
+ UWord16 nTimeScalerOutSamples;
+ UWord8 nTransportChannels;
+ Word16 nResidualSamples, nSamplesTcsScaled;
+ bool isInitialized_voip;
+#endif
IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL )
{
@@ -3823,24 +3871,30 @@ ivas_error IVAS_DEC_GetSamplesDecoder(
}
#endif
- /* If TSM is generally enabled, we have to wait for the first good frame.
- Otherwise, we directly decode the first frame in any case. */
-#ifdef FIX_HRTF_LOAD
- if ( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame )
-#else
- if ( ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm && hIvasDec->hasBeenFedFirstGoodFrame ) || !hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )
+ st_ivas = hIvasDec->st_ivas;
+
+#ifdef LIB_DEC_REVISION
+ isInitialized_voip = hIvasDec->apaExecBuffer_fx != NULL;
#endif
+
+ test();
+ IF( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame ) /* wait for the first good frame */
{
+#ifdef LIB_DEC_REVISION
+ /*-----------------------------------------------------------------*
+ * Setup all decoder parts (IVAS decoder, ISAR)
+ *-----------------------------------------------------------------*/
+ IF( ( error = ivas_dec_setup_all( hIvasDec, &nTransportChannels, isSplitRend, splitRendBits ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+#else
UWord16 l_ts, nTimeScalerOutSamples;
-#ifdef FIX_HRTF_LOAD
UWord8 nTransportChannels;
-#else
- UWord8 nTransportChannels, nOutChannels;
-#endif
Word16 nResidualSamples, nSamplesTcsScaled, nOutSamplesElse;
- if ( isSplitRend )
+ IF( isSplitRend )
{
IF( ( error = isar_set_split_rend_setup( hIvasDec->st_ivas->hSplitBinRend, &hIvasDec->st_ivas->hRenderConfig->split_rend_config, hIvasDec->st_ivas->hCombinedOrientationData, splitRendBits ) ) != IVAS_ERR_OK )
{
@@ -3848,37 +3902,82 @@ ivas_error IVAS_DEC_GetSamplesDecoder(
}
}
-#ifdef FIX_HRTF_LOAD
- if ( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels ) ) != IVAS_ERR_OK )
-#else
- if ( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &hIvasDec->nSamplesFlushed, hIvasDec->pcmType, hIvasDec->flushbuffer ) ) != IVAS_ERR_OK )
-#endif
+ IF( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels ) ) != IVAS_ERR_OK )
{
return error;
}
- if ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm && nTransportChannels != hIvasDec->nTransportChannelsOld )
+ IF( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm && NE_16( nTransportChannels, hIvasDec->nTransportChannelsOld ) )
+ {
+ IF( ( error = IVAS_DEC_VoIP_reconfigure( hIvasDec, nTransportChannels, l_ts ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+#endif
+
+#ifdef LIB_DEC_REVISION
+ /*-----------------------------------------------------------------*
+ * IVAS decoder: decode transport channels and metadata
+ *-----------------------------------------------------------------*/
+
+ IF( EQ_32( hIvasDec->mode, IVAS_DEC_MODE_EVS ) )
{
- if ( ( error = IVAS_DEC_VoIP_reconfigure( hIvasDec, nTransportChannels, l_ts ) ) != IVAS_ERR_OK )
+ IF( ( error = evs_dec_main_fx( st_ivas ) ) != IVAS_ERR_OK )
{
return error;
}
}
+ ELSE IF( EQ_32( hIvasDec->mode, IVAS_DEC_MODE_IVAS ) )
+ {
+ IF( ( error = ivas_jbm_dec_tc_fx( st_ivas ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ hIvasDec->isInitialized = true; /* Initialization done in ivas_dec() */
+ move16();
+ }
+
+ if ( hIvasDec->hasBeenFedFirstGoodFrame )
+ {
+ hIvasDec->hasDecodedFirstGoodFrame = true;
+ move16();
+ }
+#else
/* IVAS TC decoder */
- if ( ( error = IVAS_DEC_GetTcSamples( hIvasDec, hIvasDec->apaExecBuffer_fx, &nOutSamplesElse ) ) != IVAS_ERR_OK )
+ IF( ( error = IVAS_DEC_GetTcSamples( hIvasDec, hIvasDec->apaExecBuffer_fx, &nOutSamplesElse ) ) != IVAS_ERR_OK )
{
return error;
}
+#endif
- /* JBM */
- if ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )
+ /*-----------------------------------------------------------------*
+ * JBM
+ *-----------------------------------------------------------------*/
+
+ IF( st_ivas->hDecoderConfig->Opt_tsm )
{
+#ifdef LIB_DEC_REVISION
+ IF( NE_16( nTransportChannels, hIvasDec->nTransportChannelsOld ) )
+ {
+ IF( ( error = apa_setup( hIvasDec, isInitialized_voip, nTransportChannels ) ) != IVAS_ERR_OK )
+ {
+ return error;
+ }
+ }
+
+#endif
IF( apa_set_scale_fx( hIvasDec->hTimeScaler, hIvasDec->tsm_scale ) != 0 )
{
return IVAS_ERR_UNKNOWN;
}
+#ifdef LIB_DEC_REVISION
+ ivas_syn_output_f_fx( st_ivas->p_output_fx, hIvasDec->nSamplesFrame, nTransportChannels, hIvasDec->apaExecBuffer_fx );
+
+#endif
+
// tmp apaExecBuffer
IF( EQ_16( (Word16) hIvasDec->mode, IVAS_DEC_MODE_EVS ) )
{
@@ -3887,10 +3986,12 @@ ivas_error IVAS_DEC_GetSamplesDecoder(
{
tmp_apaExecBuffer[i] = extract_l( L_shr( hIvasDec->apaExecBuffer_fx[i], Q11 ) ); // Q0
}
+
IF( apa_exec_fx( hIvasDec->hTimeScaler, tmp_apaExecBuffer, (UWord16) imult3216( hIvasDec->nSamplesFrame, nTransportChannels ), (UWord16) hIvasDec->tsm_max_scaling, tmp_apaExecBuffer, &nTimeScalerOutSamples ) != 0 )
{
return IVAS_ERR_UNKNOWN;
}
+
FOR( Word32 i = 0; i < APA_BUF_PER_CHANNEL * nTransportChannels; ++i )
{
hIvasDec->apaExecBuffer_fx[i] = L_shl( tmp_apaExecBuffer[i], Q11 ); // Q11
@@ -3903,6 +4004,7 @@ ivas_error IVAS_DEC_GetSamplesDecoder(
return IVAS_ERR_UNKNOWN;
}
}
+
assert( LE_32( (Word32) nTimeScalerOutSamples, APA_BUF ) );
nSamplesTcsScaled = idiv1616U( extract_l( nTimeScalerOutSamples ), nTransportChannels );
hIvasDec->timeScalingDone = 1;
@@ -3913,69 +4015,94 @@ ivas_error IVAS_DEC_GetSamplesDecoder(
nSamplesTcsScaled = hIvasDec->nSamplesFrame;
}
- /* Feed decoded transport channels samples to the renderer */
- if ( ( error = IVAS_DEC_RendererFeedTcSamples( hIvasDec, nSamplesTcsScaled, &nResidualSamples, hIvasDec->apaExecBuffer_fx ) ) != IVAS_ERR_OK )
+ /*-----------------------------------------------------------------*
+ * Feed decoded transport channels samples to the renderer
+ *-----------------------------------------------------------------*/
+
+#ifdef LIB_DEC_REVISION
+ ivas_jbm_dec_feed_tc_to_renderer_fx( st_ivas, nSamplesTcsScaled, &nResidualSamples, hIvasDec->apaExecBuffer_fx );
+#else
+ IF( ( error = IVAS_DEC_RendererFeedTcSamples( hIvasDec, nSamplesTcsScaled, &nResidualSamples, hIvasDec->apaExecBuffer_fx ) ) != IVAS_ERR_OK )
{
return error;
}
+#endif
- if ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )
+ IF( st_ivas->hDecoderConfig->Opt_tsm )
{
/* feed residual samples to TSM for the next call */
- if ( apa_set_renderer_residual_samples( hIvasDec->hTimeScaler, (uint16_t) nResidualSamples ) != 0 )
+ IF( apa_set_renderer_residual_samples( hIvasDec->hTimeScaler, (uint16_t) nResidualSamples ) != 0 )
{
return IVAS_ERR_UNKNOWN;
}
}
hIvasDec->hasBeenFedFrame = false;
+ move16();
}
+
hIvasDec->hasBeenPreparedRendering = false;
+ move16();
- IF( hIvasDec->st_ivas->hIsmMetaData[0] )
+ /*-----------------------------------------------------------------*
+ * Set editable metadata
+ *-----------------------------------------------------------------*/
+
+ IF( st_ivas->hIsmMetaData[0] )
{
- IF( hIvasDec->st_ivas->ivas_format == ISM_FORMAT || hIvasDec->st_ivas->ivas_format == MASA_ISM_FORMAT || hIvasDec->st_ivas->ivas_format == SBA_ISM_FORMAT )
+ test();
+ test();
+ IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
{
- IF( hIvasDec->st_ivas->ism_mode == ISM_MODE_DISC || hIvasDec->st_ivas->ism_mode == ISM_MASA_MODE_DISC || hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC )
+ test();
+ test();
+ test();
+ IF( EQ_32( st_ivas->ism_mode, ISM_MODE_DISC ) || EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) || EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) || EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
{
Word16 obj;
- ISM_METADATA_HANDLE *hIsmMetaData = hIvasDec->st_ivas->hIsmMetaData;
- FOR( obj = 0; obj < hIvasDec->st_ivas->nchan_ism; obj++ )
+ ISM_METADATA_HANDLE *hIsmMetaData = st_ivas->hIsmMetaData;
+ FOR( obj = 0; obj < st_ivas->nchan_ism; obj++ )
{
hIsmMetaData[obj]->edited_azimuth_fx = hIsmMetaData[obj]->azimuth_fx;
+ move32();
hIsmMetaData[obj]->edited_elevation_fx = hIsmMetaData[obj]->elevation_fx;
+ move32();
hIsmMetaData[obj]->edited_yaw_fx = hIsmMetaData[obj]->yaw_fx;
+ move32();
hIsmMetaData[obj]->edited_pitch_fx = hIsmMetaData[obj]->pitch_fx;
+ move32();
hIsmMetaData[obj]->edited_radius_fx = hIsmMetaData[obj]->radius_fx;
- hIsmMetaData[obj]->edited_gain_fx = ONE_IN_Q31;
+ move32();
}
- IF( hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC )
+ if ( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
{
- hIvasDec->st_ivas->hSbaIsmData->gain_bed_fx = ONE_IN_Q31;
+ st_ivas->hSbaIsmData->gain_bed_fx = ONE_IN_Q29; // TODO: Check Q value
+ move32();
}
}
}
}
- IF( hIvasDec->st_ivas->hParamIsmDec != NULL )
+ IF( st_ivas->hParamIsmDec != NULL )
{
- IF( hIvasDec->st_ivas->ism_mode == ISM_MODE_PARAM )
+ IF( EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) )
{
Word16 obj = 0;
- PARAM_ISM_DEC_HANDLE hParamIsmDec = hIvasDec->st_ivas->hParamIsmDec;
- for ( obj = 0; obj < hIvasDec->st_ivas->nchan_ism; obj++ )
+ PARAM_ISM_DEC_HANDLE hParamIsmDec = st_ivas->hParamIsmDec;
+ FOR( obj = 0; obj < st_ivas->nchan_ism; obj++ )
{
hParamIsmDec->edited_azimuth_values_fx[obj] = hParamIsmDec->azimuth_values_fx[obj];
hParamIsmDec->edited_elevation_values_fx[obj] = hParamIsmDec->elevation_values_fx[obj];
+ move32();
+ move32();
}
}
}
return IVAS_ERR_OK;
}
-#endif
-#ifdef OBJ_EDITING_API
+
/*---------------------------------------------------------------------*
* IVAS_DEC_GetEditableParameters( )
*
@@ -3986,21 +4113,226 @@ ivas_error IVAS_DEC_GetEditableParameters(
IVAS_DEC_HANDLE hIvasDec,
IVAS_EDITABLE_PARAMETERS *hIvasEditableParameters )
{
+ Word16 obj, dirac_read_idx;
+ Decoder_Struct *st_ivas;
+ ISM_MODE ism_mode;
+
test();
+ test();
+ IF( hIvasEditableParameters == NULL || hIvasDec == NULL || hIvasDec->st_ivas == NULL )
+ {
+ return IVAS_ERR_UNEXPECTED_NULL_POINTER;
+ }
+
+#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
+ IF( !hIvasDec->hasBeenFedFirstGoodFrame )
+ {
+ hIvasEditableParameters->num_obj = 0;
+ move16();
+
+ return IVAS_ERR_OK;
+ }
+#endif
+
+ st_ivas = hIvasDec->st_ivas;
+ ism_mode = st_ivas->ism_mode;
+
test();
test();
test();
test();
- IF( !( hIvasDec->st_ivas->ivas_format == ISM_FORMAT ||
- ( hIvasDec->st_ivas->ivas_format == SBA_ISM_FORMAT && hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC ) ||
- ( hIvasDec->st_ivas->ivas_format == MASA_ISM_FORMAT && ( hIvasDec->st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || hIvasDec->st_ivas->ism_mode == ISM_MASA_MODE_DISC ) ) ) )
+#ifdef NONBE_1217_INIT_OBJ_EDIT
+ IF( !( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) ||
+ EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ||
+ EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ||
+ ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) && GT_16( st_ivas->nchan_ism, 0 ) ) ) )
+#else
+ IF( !( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) ||
+ ( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( ism_mode, ISM_SBA_MODE_DISC ) ) ||
+ ( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && ( EQ_32( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) || EQ_32( ism_mode, ISM_MASA_MODE_DISC ) ) ) ) )
{
return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Object editing no supported in this operation mode." );
}
+#endif
+ hIvasEditableParameters->gain_bed_fx = ONE_IN_Q29;
+ move32();
+ hIvasEditableParameters->num_obj = st_ivas->nchan_ism;
+ move16();
+
+ test();
+ test();
test();
+ IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
+ {
+ test();
+ IF( EQ_32( ism_mode, ISM_MODE_DISC ) || EQ_32( ism_mode, ISM_SBA_MODE_DISC ) )
+ {
+ FOR( obj = 0; obj < hIvasEditableParameters->num_obj; obj++ )
+ {
+ hIvasEditableParameters->ism_metadata[obj].azimuth_fx = st_ivas->hIsmMetaData[obj]->azimuth_fx;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].elevation_fx = st_ivas->hIsmMetaData[obj]->elevation_fx;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].yaw_fx = st_ivas->hIsmMetaData[obj]->yaw_fx;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].pitch_fx = st_ivas->hIsmMetaData[obj]->pitch_fx;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].radius_fx = st_ivas->hIsmMetaData[obj]->radius_fx;
+ move16();
+ hIvasEditableParameters->ism_metadata[obj].gain_fx = st_ivas->hIsmMetaData[obj]->edited_gain_fx;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].non_diegetic_flag = st_ivas->hIsmMetaData[obj]->non_diegetic_flag;
+ move16();
+ }
+
+ IF( EQ_32( ism_mode, ISM_SBA_MODE_DISC ) )
+ {
+ hIvasEditableParameters->gain_bed_fx = ONE_IN_Q29;
+ move32();
+ }
+ }
+ ELSE IF( EQ_32( ism_mode, ISM_MODE_PARAM ) )
+ {
+ FOR( obj = 0; obj < hIvasEditableParameters->num_obj; obj++ )
+ {
+ hIvasEditableParameters->ism_metadata[obj].azimuth_fx = st_ivas->hParamIsmDec->azimuth_values_fx[obj];
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].elevation_fx = st_ivas->hParamIsmDec->elevation_values_fx[obj];
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].yaw_fx = 0;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].pitch_fx = 0;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].radius_fx = 0;
+ move16();
+ hIvasEditableParameters->ism_metadata[obj].gain_fx = ONE_IN_Q29; // TODO check Q-value
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].non_diegetic_flag = 0;
+ move16();
+ }
+ }
+ ELSE IF( EQ_32( ism_mode, ISM_MODE_NONE ) )
+ {
+ hIvasEditableParameters->num_obj = 0;
+ move16();
+ }
+#ifdef DEBUGGING
+ ELSE
+ {
+ assert( 0 && "This should never happen!" );
+ }
+#endif
+ }
+#ifdef NONBE_1217_INIT_OBJ_EDIT
+ ELSE IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) || ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) && GT_16( st_ivas->nchan_ism, 0 ) ) )
+#else
+ ELSE IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && ( EQ_32( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) || EQ_32( ism_mode, ISM_MASA_MODE_DISC ) ) )
+#endif
+ {
+ /* object editing possible only in two highest OMASA modes */
+#ifdef NONBE_1217_INIT_OBJ_EDIT
+ test();
+#endif
+ IF( EQ_32( ism_mode, ISM_MASA_MODE_DISC ) )
+ {
+ FOR( obj = 0; obj < hIvasEditableParameters->num_obj; obj++ )
+ {
+ hIvasEditableParameters->ism_metadata[obj].azimuth_fx = st_ivas->hIsmMetaData[obj]->azimuth_fx;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].elevation_fx = st_ivas->hIsmMetaData[obj]->elevation_fx;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].yaw_fx = st_ivas->hIsmMetaData[obj]->yaw_fx;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].pitch_fx = st_ivas->hIsmMetaData[obj]->pitch_fx;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].radius_fx = st_ivas->hIsmMetaData[obj]->radius_fx;
+ move32();
+
+ /* reset the otherwise unused "gain" field for the object */
+ st_ivas->hIsmMetaData[obj]->edited_gain_fx = ONE_IN_Q29;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].gain_fx = st_ivas->hIsmMetaData[obj]->edited_gain_fx;
+ move32();
+ hIvasEditableParameters->ism_metadata[obj].non_diegetic_flag = st_ivas->hIsmMetaData[obj]->non_diegetic_flag;
+ move16();
+ }
+ }
+#ifdef NONBE_1217_INIT_OBJ_EDIT
+ ELSE IF( EQ_32( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
+#else
+ ELSE
+#endif
+ {
+ /* Handle MONO output */
+ IF( NE_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) )
+ {
+ dirac_read_idx = st_ivas->hSpatParamRendCom->render_to_md_map[st_ivas->hSpatParamRendCom->subframes_rendered];
+ }
+ ELSE
+ {
+ dirac_read_idx = 0;
+ }
+ move16();
+
+ FOR( obj = 0; obj < hIvasEditableParameters->num_obj; obj++ )
+ {
+ hIvasEditableParameters->ism_metadata[obj].azimuth_fx = L_shl( L_deposit_l( st_ivas->hMasaIsmData->azimuth_ism_fx[obj][dirac_read_idx] ), Q22 );
+ hIvasEditableParameters->ism_metadata[obj].elevation_fx = L_shl( L_deposit_l( st_ivas->hMasaIsmData->elevation_ism_fx[obj][dirac_read_idx] ), Q22 );
+ move32();
+ move32();
+
+ hIvasEditableParameters->ism_metadata[obj].yaw_fx = st_ivas->hIsmMetaData[obj]->yaw_fx;
+ hIvasEditableParameters->ism_metadata[obj].pitch_fx = st_ivas->hIsmMetaData[obj]->pitch_fx;
+ hIvasEditableParameters->ism_metadata[obj].radius_fx = st_ivas->hIsmMetaData[obj]->radius_fx;
+ move32();
+ move32();
+ move32();
+
+ /* reset the otherwise unused "gain" field for the object */
+ st_ivas->hIsmMetaData[obj]->edited_gain_fx = ONE_IN_Q29;
+ hIvasEditableParameters->ism_metadata[obj].gain_fx = st_ivas->hIsmMetaData[obj]->edited_gain_fx;
+ hIvasEditableParameters->ism_metadata[obj].non_diegetic_flag = st_ivas->hIsmMetaData[obj]->non_diegetic_flag;
+ move32();
+ move32();
+ move16();
+ }
+ }
+#ifdef NONBE_1217_INIT_OBJ_EDIT
+ ELSE IF( EQ_32( ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) || EQ_32( ism_mode, ISM_MODE_NONE ) )
+ {
+ hIvasEditableParameters->num_obj = 0;
+ move16();
+ }
+#ifdef DEBUGGING
+ ELSE
+ {
+ assert( 0 && "This should never happen!" );
+ }
+#endif
+#endif
+ }
+
+ return IVAS_ERR_OK;
+}
+
+
+/*---------------------------------------------------------------------*
+ * IVAS_DEC_SetEditableParameters( )
+ *
+ * Main function to decode to PCM data
+ *---------------------------------------------------------------------*/
+
+ivas_error IVAS_DEC_SetEditableParameters(
+ IVAS_DEC_HANDLE hIvasDec,
+ IVAS_EDITABLE_PARAMETERS hIvasEditableParameters )
+{
+ Word16 dirac_read_idx, obj;
+ Decoder_Struct *st_ivas;
+ ISM_MODE ism_mode;
+
test();
- if ( hIvasEditableParameters == NULL || hIvasDec == NULL || hIvasDec->st_ivas == NULL )
+ IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
}
@@ -4008,146 +4340,273 @@ ivas_error IVAS_DEC_GetEditableParameters(
#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
IF( !hIvasDec->hasBeenFedFirstGoodFrame )
{
- hIvasEditableParameters->num_obj = 0;
- move16();
-
return IVAS_ERR_OK;
}
#endif
- hIvasEditableParameters->gain_bed_fx = ONE_IN_Q30;
- move32();
- hIvasEditableParameters->num_obj = hIvasDec->st_ivas->nchan_ism;
- move16();
+ st_ivas = hIvasDec->st_ivas;
+ ism_mode = st_ivas->ism_mode;
+
+ test();
+ test();
+ test();
+ test();
+#ifdef NONBE_1217_INIT_OBJ_EDIT
+ IF( !( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) ||
+ EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ||
+ EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ||
+ ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) && GT_16( st_ivas->nchan_ism, 0 ) ) ) )
+#else
test();
test();
- if ( hIvasDec->st_ivas->ivas_format == ISM_FORMAT || hIvasDec->st_ivas->ivas_format == SBA_ISM_FORMAT )
+ IF( !( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) ||
+ ( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( ism_mode, ISM_SBA_MODE_DISC ) ) ||
+ ( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && ( EQ_32( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) || EQ_32( ism_mode, ISM_MASA_MODE_DISC ) ) ) ) ||
+ EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
+#endif
{
- if ( hIvasDec->st_ivas->ism_mode == ISM_MODE_DISC || hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC )
+ return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Object editing no supported in this operation mode." );
+ }
+
+ test();
+ test();
+ test();
+ IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
+ {
+ test();
+ IF( EQ_32( ism_mode, ISM_MODE_DISC ) || EQ_32( ism_mode, ISM_SBA_MODE_DISC ) )
{
- Word16 obj;
- for ( obj = 0; obj < hIvasEditableParameters->num_obj; obj++ )
+#ifdef DEBUGGING
+ assert( hIvasEditableParameters.num_obj == st_ivas->nchan_ism );
+#endif
+ FOR( obj = 0; obj < hIvasEditableParameters.num_obj; obj++ )
{
- hIvasEditableParameters->ism_metadata[obj].azimuth_fx = hIvasDec->st_ivas->hIsmMetaData[obj]->azimuth_fx;
+ st_ivas->hIsmMetaData[obj]->edited_azimuth_fx = hIvasEditableParameters.ism_metadata[obj].azimuth_fx;
move32();
- hIvasEditableParameters->ism_metadata[obj].elevation_fx = hIvasDec->st_ivas->hIsmMetaData[obj]->elevation_fx;
+ st_ivas->hIsmMetaData[obj]->edited_elevation_fx = hIvasEditableParameters.ism_metadata[obj].elevation_fx;
move32();
- hIvasEditableParameters->ism_metadata[obj].yaw_fx = hIvasDec->st_ivas->hIsmMetaData[obj]->yaw_fx;
+ st_ivas->hIsmMetaData[obj]->edited_radius_fx = hIvasEditableParameters.ism_metadata[obj].radius_fx;
move32();
- hIvasEditableParameters->ism_metadata[obj].pitch_fx = hIvasDec->st_ivas->hIsmMetaData[obj]->pitch_fx;
+ st_ivas->hIsmMetaData[obj]->edited_gain_fx = hIvasEditableParameters.ism_metadata[obj].gain_fx;
move32();
- hIvasEditableParameters->ism_metadata[obj].radius_fx = hIvasDec->st_ivas->hIsmMetaData[obj]->radius_fx;
- move16();
- hIvasEditableParameters->ism_metadata[obj].gain_fx = hIvasDec->st_ivas->hIsmMetaData[obj]->edited_gain_fx;
+ st_ivas->hIsmMetaData[obj]->edited_yaw_fx = hIvasEditableParameters.ism_metadata[obj].yaw_fx;
+ move32();
+ st_ivas->hIsmMetaData[obj]->edited_pitch_fx = hIvasEditableParameters.ism_metadata[obj].pitch_fx;
move32();
- hIvasEditableParameters->ism_metadata[obj].non_diegetic_flag = hIvasDec->st_ivas->hIsmMetaData[obj]->non_diegetic_flag;
+ st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
move16();
}
- if ( hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC )
+
+ IF( EQ_32( ism_mode, ISM_SBA_MODE_DISC ) )
+ {
+ st_ivas->hSbaIsmData->gain_bed_fx = hIvasEditableParameters.gain_bed_fx;
+ move32();
+ }
+ }
+ ELSE IF( EQ_32( ism_mode, ISM_MODE_PARAM ) )
+ {
+#ifdef DEBUGGING
+ assert( hIvasEditableParameters.num_obj == st_ivas->nchan_ism );
+#endif
+ FOR( obj = 0; obj < hIvasEditableParameters.num_obj; obj++ )
+ {
+ st_ivas->hParamIsmDec->edited_azimuth_values_fx[obj] = hIvasEditableParameters.ism_metadata[obj].azimuth_fx;
+ move32();
+ st_ivas->hParamIsmDec->edited_elevation_values_fx[obj] = hIvasEditableParameters.ism_metadata[obj].elevation_fx;
+ move32();
+#ifdef NONBE_1217_OBJ_EDIT_FOA
+ IF( st_ivas->hMasaIsmData != NULL )
+ {
+#endif
+ st_ivas->hMasaIsmData->gain_ism_edited_fx[obj] = shr( extract_h( hIvasEditableParameters.ism_metadata[obj].gain_fx ), Q1 ); // Q29 -> Q12
+ move32();
+
+ /* Detect direction editing in Param-ISM mode */
+ IF( GT_32( L_abs( L_sub( st_ivas->hParamIsmDec->azimuth_values_fx[obj], hIvasEditableParameters.ism_metadata[obj].azimuth_fx ) ), OMASA_AZI_EDIT_THR_FX ) ||
+ GT_32( L_abs( L_sub( st_ivas->hParamIsmDec->elevation_values_fx[obj], hIvasEditableParameters.ism_metadata[obj].elevation_fx ) ), OMASA_ELE_EDIT_THR_FX ) )
+ {
+ st_ivas->hMasaIsmData->ism_dir_is_edited[obj] = 1;
+ }
+ ELSE
+ {
+ st_ivas->hMasaIsmData->ism_dir_is_edited[obj] = 0;
+ }
+ move16();
+
+ /* Detect gain editing in Param-ISM mode */
+ IF( GT_16( abs_s( sub( ONE_IN_Q12, shr( extract_h( hIvasEditableParameters.ism_metadata[obj].gain_fx ), Q1 ) ) ), OMASA_GAIN_EDIT_THR_FX ) ) // TODO: check Q values
+ {
+ st_ivas->hMasaIsmData->ism_gain_is_edited[obj] = 1;
+ }
+ ELSE
+ {
+ st_ivas->hMasaIsmData->ism_gain_is_edited[obj] = 0;
+ }
+ move16();
+#ifdef NONBE_1217_OBJ_EDIT_FOA
+ }
+#endif
+ }
+
+#ifdef NONBE_1217_OBJ_EDIT_FOA
+ IF( st_ivas->hMasaIsmData != NULL )
{
- hIvasEditableParameters->gain_bed_fx = ONE_IN_Q30;
- move32();
+#endif
+ /* MASA is not present with the ISM format */
+ st_ivas->hMasaIsmData->masa_gain_is_edited = 0;
+ move16();
+#ifdef NONBE_1217_OBJ_EDIT_FOA
}
+#endif
}
- else if ( hIvasDec->st_ivas->ism_mode == ISM_MODE_PARAM )
+ ELSE IF( EQ_32( ism_mode, ISM_MODE_NONE ) )
{
- Word16 obj;
- for ( obj = 0; obj < hIvasEditableParameters->num_obj; obj++ )
+ IF( NE_16( hIvasEditableParameters.num_obj, 0 ) )
{
- hIvasEditableParameters->ism_metadata[obj].azimuth_fx = hIvasDec->st_ivas->hParamIsmDec->azimuth_values_fx[obj];
- move32();
- hIvasEditableParameters->ism_metadata[obj].elevation_fx = hIvasDec->st_ivas->hParamIsmDec->elevation_values_fx[obj];
- move32();
- hIvasEditableParameters->ism_metadata[obj].yaw_fx = 0;
- move32();
- hIvasEditableParameters->ism_metadata[obj].pitch_fx = 0;
- move32();
- hIvasEditableParameters->ism_metadata[obj].radius_fx = 0;
- move16();
- hIvasEditableParameters->ism_metadata[obj].gain_fx = ONE_IN_Q31;
- move32();
- hIvasEditableParameters->ism_metadata[obj].non_diegetic_flag = 0;
- move16();
+ return IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED;
}
}
- else
+#ifdef DEBUGGING
+ ELSE
{
assert( 0 && "This should never happen!" );
}
+#endif
}
-
- return IVAS_ERR_OK;
-}
-
-
-/*---------------------------------------------------------------------*
- * IVAS_DEC_SetEditableParameters( )
- *
- * Main function to decode to PCM data
- *---------------------------------------------------------------------*/
-
-ivas_error IVAS_DEC_SetEditableParameters(
- IVAS_DEC_HANDLE hIvasDec,
- IVAS_EDITABLE_PARAMETERS hIvasEditableParameters )
-{
- if ( !( hIvasDec->st_ivas->ivas_format == ISM_FORMAT ||
- ( hIvasDec->st_ivas->ivas_format == SBA_ISM_FORMAT && hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC ) ||
- ( hIvasDec->st_ivas->ivas_format == MASA_ISM_FORMAT && ( hIvasDec->st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || hIvasDec->st_ivas->ism_mode == ISM_MASA_MODE_DISC ) ) ) ||
- hIvasDec->st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
- {
- return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Object editing no supported in this operation mode." );
- }
-
- if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )
+ ELSE IF( EQ_16( st_ivas->ivas_format, MASA_ISM_FORMAT ) && ( EQ_16( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) || EQ_16( ism_mode, ISM_MASA_MODE_DISC ) ) )
{
- return IVAS_ERR_UNEXPECTED_NULL_POINTER;
- }
+ Word32 id_th;
+ Word32 threshold_azi, threshold_ele;
-#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
- IF( !hIvasDec->hasBeenFedFirstGoodFrame )
- {
- return IVAS_ERR_OK;
- }
-#endif
#ifdef DEBUGGING
- assert( hIvasEditableParameters.num_obj == hIvasDec->st_ivas->nchan_ism );
+ assert( hIvasEditableParameters.num_obj == st_ivas->nchan_ism );
#endif
-
- if ( hIvasDec->st_ivas->ivas_format == ISM_FORMAT || hIvasDec->st_ivas->ivas_format == SBA_ISM_FORMAT )
- {
- if ( hIvasDec->st_ivas->ism_mode == ISM_MODE_DISC || hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC )
+ FOR( obj = 0; obj < hIvasEditableParameters.num_obj; obj++ )
{
- int16_t obj;
- for ( obj = 0; obj < hIvasEditableParameters.num_obj; obj++ )
+ IF( st_ivas->hMasaIsmData != NULL )
{
- hIvasDec->st_ivas->hIsmMetaData[obj]->edited_azimuth_fx = hIvasEditableParameters.ism_metadata[obj].azimuth_fx;
- hIvasDec->st_ivas->hIsmMetaData[obj]->edited_elevation_fx = hIvasEditableParameters.ism_metadata[obj].elevation_fx;
- hIvasDec->st_ivas->hIsmMetaData[obj]->edited_radius_fx = hIvasEditableParameters.ism_metadata[obj].radius_fx;
+ /* copy relevant fields also to OMASA structs, but only if the value has been changed. original values are in st_ivas->hIsmMetaData */
+ /* first, need to convert float values to ints used internally */
+ Word16 new_azi, new_ele;
+
+ new_azi = extract_l( L_shr( L_add( L_abs( hIvasEditableParameters.ism_metadata[obj].azimuth_fx ), 2097152 ), Q22 ) ); // Q22->Q0
+ IF( LT_32( hIvasEditableParameters.ism_metadata[obj].azimuth_fx, 0 ) )
+ {
+ new_azi = negate( new_azi );
+ }
+
+ new_ele = extract_l( L_shr( L_add( L_abs( hIvasEditableParameters.ism_metadata[obj].elevation_fx ), 2097152 ), Q22 ) ); // Q22->Q0
+ IF( LT_32( hIvasEditableParameters.ism_metadata[obj].elevation_fx, 0 ) )
+ {
+ new_ele = negate( new_ele );
+ }
+
+ IF( EQ_16( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
+ {
+ /* Handle MONO output */
+ IF( NE_16( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) )
+ {
+ dirac_read_idx = st_ivas->hSpatParamRendCom->render_to_md_map[st_ivas->hSpatParamRendCom->subframes_rendered];
+ }
+ ELSE
+ {
+ dirac_read_idx = 0;
+ }
+ move16();
+
+ /* determine thresholds for detecting object metadata edit for direction based on quantization resolution of the spatial direction parameters.
+ * these depend from the number of bits used to transmit the directions,
+ * which in turn depends from the object priority and importance:
+ * importance -> priority -> number of bits -> elevation resolution -> elevation ring index -> azimuth resolution.
+ * leading to elevation_resolution -> elevation threshold and azimuth resolution -> azimuth threshold */
+ id_th = extract_l( L_shr( L_add( Mpy_32_16_1( delta_theta_masa_inv_fx[st_ivas->hMasaIsmData->bits_ism[obj] - 3], abs_s( st_ivas->hMasaIsmData->elevation_ism_fx[obj][dirac_read_idx] ) ), 32768 ), 16 ) ); // + 0.5f in Q16
+ threshold_azi = Mpy_32_32( 1509949440, no_phi_masa_inv_fx[st_ivas->hMasaIsmData->bits_ism[obj] - 1][id_th] ); // Q = 22;
+ threshold_ele = delta_theta_masa_fx[st_ivas->hMasaIsmData->bits_ism[obj] - 3];
+
+ test();
+ IF( ( GT_32( L_shl( abs_s( sub( new_azi, st_ivas->hMasaIsmData->azimuth_ism_fx[obj][dirac_read_idx] ) ), 22 ), threshold_azi ) ) ||
+ ( GT_32( L_shl( abs_s( sub( new_ele, st_ivas->hMasaIsmData->elevation_ism_fx[obj][dirac_read_idx] ) ), 22 ), threshold_ele ) ) )
+ {
+ /* at least one of the threshold is exceeded, so use new direction value and set editing detection flag */
+ st_ivas->hMasaIsmData->azimuth_ism_edited_fx[obj] = new_azi;
+ move32();
+ st_ivas->hMasaIsmData->elevation_ism_edited_fx[obj] = new_ele;
+ move32();
- hIvasDec->st_ivas->hIsmMetaData[obj]->edited_gain_fx = hIvasEditableParameters.ism_metadata[obj].gain_fx;
+ st_ivas->hMasaIsmData->ism_dir_is_edited[obj] = 1;
+ }
+ ELSE
+ {
+ st_ivas->hMasaIsmData->ism_dir_is_edited[obj] = 0;
+ }
+ move16();
+ }
+ ELSE
+ {
+ /* detect editing in ISM_MASA_MODE_DISC. optionally, add quantization-resolution -based thresholds */
+ test();
+ IF( L_abs( L_sub( st_ivas->hIsmMetaData[obj]->azimuth_fx, hIvasEditableParameters.ism_metadata[obj].azimuth_fx ) ) > OMASA_AZI_EDIT_THR_FX ||
+ L_abs( L_sub( st_ivas->hIsmMetaData[obj]->elevation_fx, hIvasEditableParameters.ism_metadata[obj].elevation_fx ) ) > OMASA_ELE_EDIT_THR_FX )
+ {
+ st_ivas->hMasaIsmData->azimuth_ism_edited_fx[obj] = new_azi;
+ move32();
+ st_ivas->hMasaIsmData->elevation_ism_edited_fx[obj] = new_ele;
+ move32();
- hIvasDec->st_ivas->hIsmMetaData[obj]->edited_yaw_fx = hIvasEditableParameters.ism_metadata[obj].yaw_fx;
- hIvasDec->st_ivas->hIsmMetaData[obj]->edited_pitch_fx = hIvasEditableParameters.ism_metadata[obj].pitch_fx;
+ st_ivas->hMasaIsmData->ism_dir_is_edited[obj] = 1;
+ }
+ ELSE
+ {
+ st_ivas->hMasaIsmData->ism_dir_is_edited[obj] = 0;
+ }
+ move16();
+ }
- hIvasDec->st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
+ /* compare pre-edit gain and the edited one to detect editing */
+ IF( GT_16( abs_s( sub( shr( extract_h( st_ivas->hIsmMetaData[obj]->edited_gain_fx ), Q1 ), shr( extract_h( hIvasEditableParameters.ism_metadata[obj].gain_fx ), Q1 ) ) ), OMASA_GAIN_EDIT_THR_FX ) ) // TODO: check incoming Q value
+ {
+ st_ivas->hMasaIsmData->ism_gain_is_edited[obj] = 1;
+ st_ivas->hMasaIsmData->gain_ism_edited_fx[obj] = shr( extract_h( hIvasEditableParameters.ism_metadata[obj].gain_fx ), Q1 ); // Q29 --> Q12
+ move16();
+ }
+ ELSE
+ {
+ st_ivas->hMasaIsmData->ism_gain_is_edited[obj] = 0u;
+ }
+ move32();
}
- if ( hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC )
+ /* Copy edited values to hIsmMetaData struct */
+ IF( st_ivas->hIsmMetaData[obj] != NULL )
{
- hIvasDec->st_ivas->hSbaIsmData->gain_bed_fx = hIvasEditableParameters.gain_bed_fx;
+ st_ivas->hIsmMetaData[obj]->azimuth_fx = hIvasEditableParameters.ism_metadata[obj].azimuth_fx;
+ move32();
+ st_ivas->hIsmMetaData[obj]->elevation_fx = hIvasEditableParameters.ism_metadata[obj].elevation_fx;
+ move32();
+ st_ivas->hIsmMetaData[obj]->yaw_fx = hIvasEditableParameters.ism_metadata[obj].yaw_fx;
+ move32();
+ st_ivas->hIsmMetaData[obj]->pitch_fx = hIvasEditableParameters.ism_metadata[obj].pitch_fx;
+ move32();
+ st_ivas->hIsmMetaData[obj]->radius_fx = hIvasEditableParameters.ism_metadata[obj].radius_fx;
+ move32();
+ st_ivas->hIsmMetaData[obj]->edited_gain_fx = hIvasEditableParameters.ism_metadata[obj].gain_fx; // TODO: check incoming Q value
+ move32();
+ st_ivas->hIsmMetaData[obj]->non_diegetic_flag = hIvasEditableParameters.ism_metadata[obj].non_diegetic_flag;
+ move16();
}
}
- else if ( hIvasDec->st_ivas->ism_mode == ISM_MODE_PARAM )
+
+ IF( GT_16( abs_s( sub( shr( extract_h( hIvasEditableParameters.gain_bed_fx ), Q1 ), ONE_IN_Q12 ) ), OMASA_GAIN_EDIT_THR_FX ) ) // TODO: check Q value
{
- int16_t obj;
- for ( obj = 0; obj < hIvasEditableParameters.num_obj; obj++ )
- {
- }
+ st_ivas->hMasaIsmData->gain_masa_edited_fx = shr( extract_h( hIvasEditableParameters.gain_bed_fx ), Q1 ); // TODO: check type
+ move32();
+ st_ivas->hMasaIsmData->masa_gain_is_edited = 1;
}
- else
+ ELSE
{
- assert( 0 && "This should never happen!" );
+ st_ivas->hMasaIsmData->masa_gain_is_edited = 0;
}
+ move16();
}
return IVAS_ERR_OK;
@@ -4157,13 +4616,15 @@ ivas_error IVAS_DEC_SetEditableParameters(
/*---------------------------------------------------------------------*
* IVAS_DEC_PrepareRenderer( )
*
- * Main function to decode to PCM data
+ * prepare IVAS renderer
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_PrepareRenderer(
- IVAS_DEC_HANDLE hIvasDec )
+ IVAS_DEC_HANDLE hIvasDec /* i/o: IVAS decoder handle */
+)
{
- if ( hIvasDec == NULL )
+ test();
+ IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL )
{
return IVAS_ERR_UNEXPECTED_NULL_POINTER;
}
@@ -4173,14 +4634,15 @@ ivas_error IVAS_DEC_PrepareRenderer(
IF( hIvasDec->hasBeenFedFirstGoodFrame || hIvasDec->isInitialized ) /* note: 'isInitialized' is related to EVS decoder */
#endif
{
- ivas_jbm_dec_prepare_renderer( hIvasDec->st_ivas );
+ ivas_dec_prepare_renderer_fx( hIvasDec->st_ivas );
}
hIvasDec->hasBeenPreparedRendering = true;
+ move16();
return IVAS_ERR_OK;
}
-#endif
+
/*---------------------------------------------------------------------*
* IVAS_DEC_VoIP_GetSamples( )
@@ -4189,27 +4651,17 @@ ivas_error IVAS_DEC_PrepareRenderer(
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_VoIP_GetSamples(
- IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
- UWord16 nSamplesPerChannel, /* i : number of samples per channel requested to be written to output buffer */
- Word16 *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 Q0 */
- const UWord32 systemTimestamp_ms, /* i : current system timestamp */
-#ifdef FIX_CREND_SIMPLIFY_CODE
+ IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
+ UWord16 nSamplesPerChannel, /* i : number of samples per channel requested to be written to output buffer */
+ Word16 *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 Q0 */
#ifdef SUPPORT_JBM_TRACEFILE
JbmTraceFileWriterFn jbmWriterFn,
void *jbmWriter,
#endif
- bool *bitstreamReadDone, /* o : that bitstream was read */
- UWord16 *nSamplesRendered /* o : number of samples rendered */
-#else
-#ifdef SUPPORT_JBM_TRACEFILE
- JbmTraceFileWriterFn jbmWriterFn,
- void *jbmWriter
-#endif
-#endif
-#ifdef OBJ_EDITING_API
- ,
- bool *parametersAvailableForEditing
-#endif
+ bool *bitstreamReadDone, /* o : flag indicating that bitstream was read */
+ UWord16 *nSamplesRendered, /* o : number of samples rendered */
+ bool *parametersAvailableForEditing, /* o : indicates whether objects editing is available */
+ const UWord32 systemTimestamp_ms /* i : current system timestamp */
)
{
Decoder_Struct *st_ivas;
@@ -4220,15 +4672,11 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
UWord16 extBufferedSamples;
Word16 result;
ivas_error error;
-#ifndef FIX_CREND_SIMPLIFY_CODE
- Word16 nSamplesRendered;
-#endif
-#ifdef OBJ_EDITING_API
- *parametersAvailableForEditing = false;
-#endif
-
UWord8 nOutChannels;
+ *parametersAvailableForEditing = false;
+ move16();
+
test();
test();
IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL || hIvasDec->hVoIP == NULL )
@@ -4240,11 +4688,6 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
hDecoderConfig = st_ivas->hDecoderConfig;
hVoIP = hIvasDec->hVoIP;
nOutChannels = (UWord8) st_ivas->hDecoderConfig->nchan_out;
-#ifndef FIX_CREND_SIMPLIFY_CODE
- nSamplesRendered = 0;
- move16();
- move16();
-#endif
move16();
IF( nSamplesPerChannel == 0 )
@@ -4261,18 +4704,27 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
}
#endif
-/* make sure that the FIFO after decoder/scaler contains at least one sound card frame (i.e. 20ms) */
-#ifdef FIX_CREND_SIMPLIFY_CODE
+ /* make sure that the FIFO after decoder/scaler contains at least one sound card frame (i.e. 20ms) */
WHILE( LT_16( *nSamplesRendered, nSamplesPerChannel ) )
-#else
- WHILE( LT_16( nSamplesRendered, nSamplesPerChannel ) )
-#endif
{
IF( hIvasDec->nSamplesAvailableNext == 0 )
{
Word16 nSamplesBuffered;
nSamplesBuffered = 0;
move16();
+
+#ifdef LIB_DEC_REVISION
+ IF( hIvasDec->hasBeenFedFirstGoodFrame )
+ {
+ /* check if the TC buffer already exists, otherweise nothing is buffered anyway */
+
+ IF( st_ivas->hTcBuffer != NULL )
+ {
+ nSamplesBuffered = sub( st_ivas->hTcBuffer->n_samples_buffered, st_ivas->hTcBuffer->n_samples_rendered );
+ nSamplesBuffered = add( nSamplesBuffered, hVoIP->nSamplesRendered20ms );
+ }
+ }
+#else
IF( hIvasDec->hasBeenFedFirstGoodFrame )
{
IF( NE_32( ( error = IVAS_DEC_GetBufferedNumberOfSamples( hIvasDec, &nSamplesBuffered ) ), IVAS_ERR_OK ) )
@@ -4280,6 +4732,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
return error;
}
}
+#endif
extBufferedSamples = nSamplesBuffered;
move16();
@@ -4352,9 +4805,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
return error;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
*bitstreamReadDone = true;
-#endif
}
ELSE IF( hIvasDec->hasDecodedFirstGoodFrame )
{
@@ -4395,7 +4846,6 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
JB4_FreeDataUnit( hVoIP->hJBM, dataUnit );
}
-#ifdef FIX_HRTF_LOAD
test();
IF( hIvasDec->hasBeenFedFirstGoodFrame && *bitstreamReadDone == true )
{
@@ -4403,20 +4853,21 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
return IVAS_ERR_OK;
}
-#endif
IF( !hIvasDec->hasBeenFedFirstGoodFrame )
{
hIvasDec->nSamplesAvailableNext = hIvasDec->nSamplesFrame;
+#ifndef LIB_DEC_REVISION
hIvasDec->nSamplesRendered = 0;
move16();
+#endif
move16();
}
-
-#ifdef OBJ_EDITING_API
- /* :TODO: only return here if we really have editing initialized */
- if ( hIvasDec->hasBeenFedFirstGoodFrame && hIvasDec->hasEditableParameters == true && hIvasDec->enableParameterEditing == true )
+#ifndef NONBE_FIX_1255_OBJ_EDIT_JBM
+ IF( hIvasDec->hasBeenFedFirstGoodFrame )
{
*parametersAvailableForEditing = true;
+ move16();
+
return IVAS_ERR_OK;
}
#endif
@@ -4428,14 +4879,11 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
/* codec mode to use not known yet - simply output silence */
/* directly set output zero */
Word16 nSamplesToZero = s_min( nSamplesPerChannel, hIvasDec->nSamplesAvailableNext );
-#ifdef FIX_CREND_SIMPLIFY_CODE
set16_fx( pcmBuf + imult1616( *nSamplesRendered, nOutChannels ), 0, imult1616( nSamplesToZero, nOutChannels ) );
*nSamplesRendered = add( *nSamplesRendered, nSamplesToZero );
-#else
- set16_fx( pcmBuf + imult1616( nSamplesRendered, nOutChannels ), 0, imult1616( nSamplesToZero, nOutChannels ) );
- nSamplesRendered = add( nSamplesRendered, nSamplesToZero );
-#endif
+#ifndef LIB_DEC_REVISION
hIvasDec->nSamplesRendered = add( hIvasDec->nSamplesRendered, nSamplesToZero );
+#endif
hIvasDec->nSamplesAvailableNext = sub( hIvasDec->nSamplesAvailableNext, nSamplesToZero );
move16();
move16();
@@ -4446,64 +4894,57 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
Word16 nSamplesToRender, nSamplesRendered_loop;
bool tmp;
-#ifdef FIX_HRTF_LOAD_API
- if ( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame )
+ /* decode TCs, do TSM and prepare the renderer */
+ test();
+ IF( !hIvasDec->isInitialized || hIvasDec->hasBeenFedFrame )
{
- if ( hIvasDec->nSamplesAvailableNext == 0 || hIvasDec->nSamplesAvailableNext == hIvasDec->nSamplesFrame )
+ test();
+ IF( hIvasDec->nSamplesAvailableNext == 0 || EQ_16( hIvasDec->nSamplesAvailableNext, hIvasDec->nSamplesFrame ) )
{
+#ifndef LIB_DEC_REVISION
uint16_t nSamplesFlushed_ref = hIvasDec->nSamplesFlushed;
-
- if ( ( error = IVAS_DEC_GetSamplesDecoder( hIvasDec, 0, 0 ) ) != IVAS_ERR_OK )
+#endif
+ IF( ( error = IVAS_DEC_GetSamplesDecoder( hIvasDec, 0, 0 ) ) != IVAS_ERR_OK )
{
return error;
}
+#ifndef LIB_DEC_REVISION
hIvasDec->nSamplesFlushed = nSamplesFlushed_ref;
-
+ move16();
+#endif
*bitstreamReadDone = false;
+ move16();
+#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
+ *parametersAvailableForEditing = true;
+ move16();
+ return IVAS_ERR_OK;
+#endif
}
}
-#endif
-#ifdef FIX_CREND_SIMPLIFY_CODE
nSamplesToRender = sub( nSamplesPerChannel, *nSamplesRendered );
-#else
- nSamplesToRender = sub( nSamplesPerChannel, nSamplesRendered );
-#endif
-#ifdef OBJ_EDITING_API
/* check if we still need to prepare the renderer */
IF( hIvasDec->hasBeenPreparedRendering == false )
{
-
IF( NE_32( ( error = IVAS_DEC_PrepareRenderer( hIvasDec ) ), IVAS_ERR_OK ) )
{
return error;
}
}
-#endif
/* render IVAS frames directly to the output buffer */
-#ifdef FIX_CREND_SIMPLIFY_CODE
- IF( NE_32( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, pcmBuf + imult1616( *nSamplesRendered, nOutChannels ), &nSamplesRendered_loop, &tmp ) ), IVAS_ERR_OK ) )
+#ifdef LIB_DEC_REVISION
+ IF( NE_32( ( error = IVAS_DEC_GetSamplesRenderer( hIvasDec, nSamplesToRender, pcmBuf + imult1616( *nSamplesRendered, nOutChannels ), &nSamplesRendered_loop, &tmp ) ), IVAS_ERR_OK ) )
#else
- IF( NE_32( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, pcmBuf + imult1616( nSamplesRendered, nOutChannels ), &nSamplesRendered_loop, &tmp ) ), IVAS_ERR_OK ) )
+ IF( NE_32( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, pcmBuf + imult1616( *nSamplesRendered, nOutChannels ), &nSamplesRendered_loop, &tmp ) ), IVAS_ERR_OK ) )
#endif
{
return error;
}
-#ifndef FIX_HRTF_LOAD_API
-#ifdef FIX_HRTF_LOAD
- *bitstreamReadDone = false; // temp hack until JBM API is reworked
-#endif
-#endif
-
-#ifdef FIX_CREND_SIMPLIFY_CODE
*nSamplesRendered = add( *nSamplesRendered, nSamplesRendered_loop );
-#else
- nSamplesRendered = add( nSamplesRendered, nSamplesRendered_loop );
-#endif
update_voip_rendered20ms( hIvasDec, nSamplesRendered_loop );
}
}
@@ -4515,7 +4956,7 @@ ivas_error IVAS_DEC_VoIP_GetSamples(
/*---------------------------------------------------------------------*
* update_voip_rendered20ms( )
*
- * Function to flush remaining audio in VoIP
+ * pdate the number of samples that have been rendered since the last 20ms render border
*---------------------------------------------------------------------*/
static void update_voip_rendered20ms(
@@ -4527,7 +4968,11 @@ static void update_voip_rendered20ms(
nSamplesRenderedTotal = add( hIvasDec->hVoIP->nSamplesRendered20ms, nSamplesRendered );
/* we have crossed a 20ms border, reset the time scaling done flag */
+#ifdef LIB_DEC_REVISION
+ IF( GE_16( nSamplesRenderedTotal, hIvasDec->nSamplesFrame ) )
+#else
IF( GE_16( nSamplesRenderedTotal, hIvasDec->hVoIP->nSamplesFrame ) )
+#endif
{
hIvasDec->timeScalingDone = 0;
move16();
@@ -4536,9 +4981,17 @@ static void update_voip_rendered20ms(
/* float code was: hIvasDec->hVoIP->nSamplesRendered20ms = nSamplesRenderedTotal % hIvasDec->hVoIP->nSamplesFrame; */
hIvasDec->hVoIP->nSamplesRendered20ms = nSamplesRenderedTotal;
move16();
+#ifdef LIB_DEC_REVISION
+ WHILE( GE_16( hIvasDec->hVoIP->nSamplesRendered20ms, hIvasDec->nSamplesFrame ) )
+#else
WHILE( GE_16( hIvasDec->hVoIP->nSamplesRendered20ms, hIvasDec->hVoIP->nSamplesFrame ) )
+#endif
{
+#ifdef LIB_DEC_REVISION
+ hIvasDec->hVoIP->nSamplesRendered20ms = sub( hIvasDec->hVoIP->nSamplesRendered20ms, hIvasDec->nSamplesFrame );
+#else
hIvasDec->hVoIP->nSamplesRendered20ms = sub( hIvasDec->hVoIP->nSamplesRendered20ms, hIvasDec->hVoIP->nSamplesFrame );
+#endif
}
return;
@@ -4548,7 +5001,7 @@ static void update_voip_rendered20ms(
/*---------------------------------------------------------------------*
* IVAS_DEC_VoIP_Flush( )
*
- * Function to flush remaining audio in VoIP
+ * Function to flush remaining audio samples in VoIP
*---------------------------------------------------------------------*/
ivas_error IVAS_DEC_Flush(
@@ -4561,9 +5014,7 @@ ivas_error IVAS_DEC_Flush(
ivas_error error;
UWord16 nSamplesToRender;
UWord16 nSamplesFlushedLocal;
-#ifdef FIX_HRTF_LOAD
nSamplesFlushedLocal = 0; // temp. hack
-#endif
test();
IF( hIvasDec == NULL || hIvasDec->st_ivas == NULL )
@@ -4584,7 +5035,11 @@ ivas_error IVAS_DEC_Flush(
test();
IF( GT_16( nSamplesToRender, 0 ) && NE_16( (Word16) hIvasDec->st_ivas->ivas_format, (Word16) MONO_FORMAT ) )
{
+#ifdef LIB_DEC_REVISION
+ error = ivas_jbm_dec_render_fx( hIvasDec->st_ivas, nSamplesToRender, &nSamplesFlushedLocal, &hIvasDec->nSamplesAvailableNext, pcmBuf );
+#else
error = IVAS_DEC_GetRenderedSamples( hIvasDec, nSamplesToRender, &nSamplesFlushedLocal, &hIvasDec->nSamplesAvailableNext, pcmBuf );
+#endif
}
ELSE
{
@@ -4645,12 +5100,16 @@ ivas_error IVAS_DEC_VoIP_Get_CA_offset(
/*---------------------------------------------------------------------*
- * IVAS_DEC_Close_VoIP( )
- *
+ * ivas_destroy_handle_VoIP( )
*
+ * Deallocate VoIP handle
*---------------------------------------------------------------------*/
+#ifdef LIB_DEC_REVISION
+static void ivas_destroy_handle_VoIP_fx(
+#else
static void IVAS_DEC_Close_VoIP(
+#endif
IVAS_DEC_VOIP *hVoIP /* i/o: IVAS decoder handle */
)
{
@@ -4944,6 +5403,11 @@ static ivas_error printConfigInfo_dec(
{
fprintf( stdout, "Acoustic environment ID:ON\n" );
}
+
+ IF( st_ivas->hDecoderConfig->Opt_ObjEdit_on )
+ {
+ fprintf( stdout, "Objects editing : ON\n" );
+ }
}
/*-----------------------------------------------------------------*
@@ -5003,16 +5467,23 @@ void IVAS_DEC_PrintDisclaimer( void )
*---------------------------------------------------------------------*/
static ivas_error evs_dec_main_fx(
- Decoder_Struct *st_ivas,
+ Decoder_Struct *st_ivas
+#ifndef LIB_DEC_REVISION
+ ,
const Word16 nOutSamples,
Word32 *Buf_fx, // Q11
Word16 *pcmBuf // Q0
+#endif
)
{
DEC_CORE_HANDLE *hCoreCoder;
Word16 mixer_left_fx, mixer_right_fx;
Word32 *p_output_fx[MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN];
+#ifdef LIB_DEC_REVISION
+ Word16 ch, i, nOutSamples;
+#else
Word16 ch, n, i;
+#endif
Word16 output_16[L_FRAME48k];
ivas_error error;
@@ -5021,6 +5492,10 @@ static ivas_error evs_dec_main_fx(
move32();
hCoreCoder[0]->output_frame_fx = extract_l( Mult_32_16( hCoreCoder[0]->output_Fs, INV_FRAME_PER_SEC_Q15 ) ); // Q0
move16();
+#ifdef LIB_DEC_REVISION
+ nOutSamples = hCoreCoder[0]->output_frame_fx;
+ move16();
+#endif
mdct_switching_dec_fx( hCoreCoder[0] );
@@ -5084,10 +5559,30 @@ static ivas_error evs_dec_main_fx(
mixer_left_fx = add( shr( st_ivas->hDecoderConfig->non_diegetic_pan_gain_fx, Q1 ), ONE_IN_Q14 ); // Q14
mixer_right_fx = sub( MAX16B, mixer_left_fx );
- v_multc_fixed_16( p_output_fx[0], mixer_right_fx, p_output_fx[1], nOutSamples ); /* Q11 */
- v_multc_fixed_16( p_output_fx[0], mixer_left_fx, p_output_fx[0], nOutSamples ); /* Q11 */
+ v_multc_fx_16( p_output_fx[0], mixer_right_fx, p_output_fx[1], nOutSamples ); /* Q11 */
+ v_multc_fx_16( p_output_fx[0], mixer_left_fx, p_output_fx[0], nOutSamples ); /* Q11 */
}
+#ifdef LIB_DEC_REVISION
+ IF( st_ivas->hDecoderConfig->Opt_tsm )
+ {
+ /* BE workaround: in order to keep EVS bit-exact wrt. TS 26.443, convert 'float' output data to 'short' before the TSM */
+ Word32 pcm_buf_local[L_FRAME48k];
+
+ FOR( ch = 0; ch < st_ivas->hDecoderConfig->nchan_out; ch++ )
+ {
+ ivas_syn_output_f_fx( &p_output_fx[ch], nOutSamples, 1, pcm_buf_local );
+
+ Copy32( pcm_buf_local, p_output_fx[ch], nOutSamples );
+ }
+ }
+#ifndef UNIFIED_DECODING_PATHS_LEFTOVERS
+ ELSE // ToDo: the 'else' branch can be removed once UNIFIED_DECODING_PATHS_LEFTOVERS is merged
+ {
+ ivas_jbm_dec_copy_tc_no_tsm_fx( st_ivas, p_output_fx, nOutSamples );
+ }
+#endif
+#else
IF( !st_ivas->hDecoderConfig->Opt_tsm )
{
ivas_jbm_dec_copy_tc_no_tsm_fx( st_ivas, p_output_fx, nOutSamples );
@@ -5115,6 +5610,7 @@ static ivas_error evs_dec_main_fx(
}
}
}
+#endif
return IVAS_ERR_OK;
}
@@ -5169,6 +5665,18 @@ static ivas_error input_format_API_to_internal(
}
+#ifdef LIB_DEC_REVISION
+/*---------------------------------------------------------------------*
+ * apa_setup()
+ *
+ * Setup APA decoder
+ *---------------------------------------------------------------------*/
+
+static ivas_error apa_setup(
+ IVAS_DEC_HANDLE hIvasDec,
+ const bool isInitialized_voip,
+ const UWord16 nTransportChannels )
+#else
/*---------------------------------------------------------------------*
* IVAS_DEC_VoIP_reconfigure()
*
@@ -5179,18 +5687,29 @@ static ivas_error IVAS_DEC_VoIP_reconfigure(
IVAS_DEC_HANDLE hIvasDec,
const UWord16 nTransportChannels,
const UWord16 l_ts )
+#endif
{
Word16 apa_buffer_size;
+#ifdef LIB_DEC_REVISION
+ UWord16 l_ts;
+
+ l_ts = (UWord16) hIvasDec->st_ivas->hTcBuffer->n_samples_granularity;
+ move16();
+ IF( !isInitialized_voip )
+#else
apa_buffer_size = hIvasDec->nSamplesFrame;
move16();
IF( hIvasDec->apaExecBuffer_fx == NULL )
+#endif
{
DECODER_CONFIG_HANDLE hDecoderConfig;
+#ifndef LIB_DEC_REVISION
IF( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )
{
+#endif
UWord16 wss, css;
Word32 startQuality;
@@ -5255,32 +5774,35 @@ static ivas_error IVAS_DEC_VoIP_reconfigure(
}
set_zero2_fx( hIvasDec->apaExecBuffer_fx, L_mult0( apa_buffer_size, (Word16) nTransportChannels ) );
+#ifndef LIB_DEC_REVISION
}
+#endif
}
- ELSE
- {
- IF( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )
- {
- IF( apa_reconfigure( hIvasDec->hTimeScaler, nTransportChannels, l_ts ) != 0 )
- {
+ ELSE{
+#ifndef LIB_DEC_REVISION
+ IF( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm ){
+#endif
+ IF( apa_reconfigure( hIvasDec->hTimeScaler, nTransportChannels, l_ts ) != 0 ){
return IVAS_ERR_INIT_ERROR;
- }
- apa_buffer_size = APA_BUF_PER_CHANNEL;
- move16();
- free( hIvasDec->apaExecBuffer_fx );
- IF( ( hIvasDec->apaExecBuffer_fx = malloc( sizeof( Word32 ) * L_mult0( apa_buffer_size, (Word16) nTransportChannels ) ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate VoIP handle" );
- }
- set_zero2_fx( hIvasDec->apaExecBuffer_fx, L_mult0( apa_buffer_size, (Word16) nTransportChannels ) );
- }
- /* realloc apa_exe_buffer */
- }
+}
+apa_buffer_size = APA_BUF_PER_CHANNEL;
+move16();
+free( hIvasDec->apaExecBuffer_fx );
+IF( ( hIvasDec->apaExecBuffer_fx = malloc( sizeof( Word32 ) * L_mult0( apa_buffer_size, (Word16) nTransportChannels ) ) ) == NULL )
+{
+ return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate VoIP handle" );
+}
+set_zero2_fx( hIvasDec->apaExecBuffer_fx, L_mult0( apa_buffer_size, (Word16) nTransportChannels ) );
+#ifndef LIB_DEC_REVISION
+}
+/* realloc apa_exe_buffer */
+#endif
+}
- hIvasDec->nTransportChannelsOld = nTransportChannels;
- move16();
+hIvasDec->nTransportChannelsOld = nTransportChannels;
+move16();
- return IVAS_ERR_OK;
+return IVAS_ERR_OK;
}
@@ -5347,7 +5869,7 @@ ivas_error IVAS_DEC_GetCldfbSamples(
IF( hSplitBinRend->hCldfbDataOut->config != IVAS_AUDIO_CONFIG_INVALID )
{
num_chs = audioCfg2channels( hSplitBinRend->hCldfbDataOut->config );
- maxBand = (int16_t) ( ( CLDFB_NO_CHANNELS_MAX * hIvasDec->st_ivas->hDecoderConfig->output_Fs ) / 48000 );
+ maxBand = (Word16) ( ( CLDFB_NO_CHANNELS_MAX * hIvasDec->st_ivas->hDecoderConfig->output_Fs ) / 48000 );
FOR( slot_idx = 0; slot_idx < CLDFB_NO_COL_MAX; slot_idx++ )
{
@@ -5377,7 +5899,7 @@ ivas_error IVAS_DEC_GetCldfbSamples(
/*-------------------------------------------------------------------*
* ivas_create_handle_isar()
*
- * Initialize IVAS decoder split rend handle
+ * Initialize IVAS decoder split-rendering handle
*-------------------------------------------------------------------*/
static ivas_error ivas_create_handle_isar(
@@ -5386,7 +5908,7 @@ static ivas_error ivas_create_handle_isar(
{
ISAR_DEC_SPLIT_REND_WRAPPER_HANDLE hSplitBinRend;
- if ( ( hSplitBinRend = (ISAR_DEC_SPLIT_REND_WRAPPER_HANDLE) malloc( sizeof( ISAR_DEC_SPLIT_REND_WRAPPER ) ) ) == NULL )
+ IF( ( hSplitBinRend = (ISAR_DEC_SPLIT_REND_WRAPPER_HANDLE) malloc( sizeof( ISAR_DEC_SPLIT_REND_WRAPPER ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for IVAS decoder handle" );
}
@@ -5442,7 +5964,7 @@ static void ivas_destroy_handle_isar(
*
*---------------------------------------------------------------------*/
-int16_t IVAS_DEC_is_split_rendering_enabled(
+Word16 IVAS_DEC_is_split_rendering_enabled(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
Word16 *isSplitRend /* o : flag to indicate if split rendering is enabled */
)
@@ -5558,7 +6080,7 @@ static ivas_error ivas_dec_reconfig_split_rend(
FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
{
- if ( ( error = openCldfb_ivas_fx( &( hSplitRendWrapper->hCldfbHandles->cldfbSyn[ch] ), CLDFB_SYNTHESIS, st_ivas->hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ) != IVAS_ERR_OK )
+ IF( ( error = openCldfb_ivas_fx( &( hSplitRendWrapper->hCldfbHandles->cldfbSyn[ch] ), CLDFB_SYNTHESIS, st_ivas->hDecoderConfig->output_Fs, CLDFB_PROTOTYPE_5_00MS, DEC ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -5632,7 +6154,7 @@ static ivas_error ivas_dec_init_split_rend(
#ifdef TMP_FIX_SPLIT_REND
/* note: this is intra-frame heap memory */
- if ( ( st_ivas->hSplitBinRend->hMultiBinCldfbData = (ISAR_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA_HANDLE) malloc( sizeof( ISAR_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA ) ) ) == NULL )
+ IF( ( st_ivas->hSplitBinRend->hMultiBinCldfbData = (ISAR_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA_HANDLE) malloc( sizeof( ISAR_DEC_SPLIT_REND_MULTI_BIN_CLDFB_DATA ) ) ) == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for split rendering structure" );
}
@@ -5676,12 +6198,12 @@ static ivas_error ivas_dec_init_split_rend(
/*---------------------------------------------------------------------*
* IVAS_DEC_is_split_rendering_coded_out()
*
- *
+ * Return flag to indicate if split rendering is enabled
*---------------------------------------------------------------------*/
Word16 IVAS_DEC_is_split_rendering_coded_out(
IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
- int16_t *isSplitCoded /* o : flag to indicate if split rendering is enabled */
+ Word16 *isSplitCoded /* o : flag to indicate if split rendering is enabled */
)
{
Decoder_Struct *st_ivas;
diff --git a/lib_dec/lsf_dec_fx.c b/lib_dec/lsf_dec_fx.c
index 913543db8c6b90d0f51beb13a097845f34b0b746..ec45dbae965bd56524cd22c57877730bb79a7afe 100644
--- a/lib_dec/lsf_dec_fx.c
+++ b/lib_dec/lsf_dec_fx.c
@@ -370,9 +370,8 @@ void lsf_end_dec_fx(
Word16 *qlsf, /* o : quantized LSFs in the cosine domain Qx2.56*/
Word16 *lpc_param, /* i : LPC parameters Q0*/
Word16 *LSF_Q_prediction, /* o : LSF prediction mode Q0*/
- Word16 *nb_indices /* o : number of indices Q0*/
- ,
- const Word16 tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel Qx*/
+ Word16 *nb_indices, /* o : number of indices Q0*/
+ const Word16 tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel Qx*/
)
{
Word16 pred0[M]; /* Prediction for the safety-net quantizer (usually mean)*/
diff --git a/lib_dec/pit_dec_fx.c b/lib_dec/pit_dec_fx.c
index 38ec41cb209c196f3333a972a2195ff8f4c0aa46..d490dce4a4e6152ec857f8cefa7f8e08344f8444 100644
--- a/lib_dec/pit_dec_fx.c
+++ b/lib_dec/pit_dec_fx.c
@@ -591,9 +591,8 @@ void pit_Q_dec_fx(
Word16 *T0, /* o : integer pitch lag */
Word16 *T0_frac, /* o : pitch fraction */
Word16 *T0_min, /* i/o: delta search min */
- Word16 *T0_max /* i/o: delta search max */
- ,
- Word16 *BER_detect /* o : BER detect flag */
+ Word16 *T0_max, /* i/o: delta search max */
+ Word16 *BER_detect /* o : BER detect flag */
)
{
IF( EQ_16( nBits, 10 ) ) /* absolute decoding with 10 bits */
@@ -702,9 +701,8 @@ void pit16k_Q_dec_fx(
Word16 *T0, /* o : integer pitch lag */
Word16 *T0_frac, /* o : pitch fraction */
Word16 *T0_min, /* i/o: delta search min */
- Word16 *T0_max /* i/o: delta search max */
- ,
- Word16 *BER_detect /* o : BER detect flag */
+ Word16 *T0_max, /* i/o: delta search max */
+ Word16 *BER_detect /* o : BER detect flag */
)
{
Word16 index;
diff --git a/lib_dec/pitch_extr_fx.c b/lib_dec/pitch_extr_fx.c
index 5cabc98b1009ce6c096943078c72b295235bceaf..5d6e397b0c6de34d9660a5c93915a26884056c3b 100644
--- a/lib_dec/pitch_extr_fx.c
+++ b/lib_dec/pitch_extr_fx.c
@@ -220,8 +220,7 @@ void pitch_pred_linear_fit(
a2 = mac_r( L_mac( L_mult( mult_r( 2 * 2048, pg[1] ) /*Q8*/, pg[2] ) /*Q5+16*/, mult_r( 2 * 2048, pg[1] ) /*Q8*/, pg[3] ) /*Q5+16*/, mult_r( -4 * 2048, pg[0] ) /*Q8*/, pg[1] /*Q12*/ ) /*Q5*/;
a1 = mac_r( L_mac( L_mult( mult_r( 3 * 2048, pg[0] ) /*Q8*/, pg[1] ) /*Q5+16*/, mult_r( 4 * 2048, pg[0] ) /*Q8*/, pg[2] /*Q12*/ ) /*Q5+16*/, mult_r( 3 * 2048, pg[0] ) /*Q8*/, pg[3] /*Q12*/ ) /*Q5*/;
- a = L_mac( L_mac( L_mac( L_mac( L_mult( a1, round_fx( L_shl( ml[0], 4 ) ) ) /*Q4*/
- ,
+ a = L_mac( L_mac( L_mac( L_mac( L_mult( a1, round_fx( L_shl( ml[0], 4 ) ) ) /*Q4*/,
round_fx( L_shl( ml[1], 4 ) ) /*Q4*/, a2 ),
round_fx( L_shl( ml[2], 4 ) ) /*Q4*/, a3 ),
round_fx( L_shl( ml[3], 4 ) ) /*Q4*/, a4 ),
@@ -258,8 +257,7 @@ void pitch_pred_linear_fit(
b4 = mac_r( L_mac( L_mac( L_mult( mult_r( -3 * 8192, pg[0] ), pg[3] ), mult_r( -2 * 8192, pg[1] ), pg[3] ), mult_r( -32768 / 2, pg[3] ), mult_r( 32768 / 2, pg[2] ) ), mult_r( 32768 / 2, pg[4] ), mult_r( 32768 / 2, pg[3] ) ); /*Q7*/
b5 = mac_r( L_mac( L_mac( L_mult( mult_r( -32768 /*(-4*8192)*/, pg[0] ), pg[4] ), mult_r( -3 * 8192, pg[1] ), pg[4] ), mult_r( -2 * 8192, pg[2] ), pg[4] ), mult_r( -32768 / 2, pg[4] ), mult_r( 32768 / 2, pg[3] ) ) /*Q7*/;
- b = L_mac( L_mac( L_mac( L_mac( L_mult( b1, round_fx( L_shl( ml[0], 4 ) ) ) /*Q4*/
- ,
+ b = L_mac( L_mac( L_mac( L_mac( L_mult( b1, round_fx( L_shl( ml[0], 4 ) ) ) /*Q4*/,
round_fx( L_shl( ml[1], 4 ) ) /*Q4*/, b2 ),
round_fx( L_shl( ml[2], 4 ) ) /*Q4*/, b3 ),
round_fx( L_shl( ml[3], 4 ) ) /*Q4*/, b4 ),
diff --git a/lib_dec/rom_dec_fx.c b/lib_dec/rom_dec_fx.c
index f5c0e4794845db03e52d35730b72c993e476a740..0493e48ebf551cf23c70a032a36725ad572877e1 100644
--- a/lib_dec/rom_dec_fx.c
+++ b/lib_dec/rom_dec_fx.c
@@ -51,6 +51,7 @@ const Word16 h_low_fx[5] = /* Q15 */
{
-410, 3572, 25602, 3572, -410
};
+
const Word16 inv_sqi[15] = /* Q15 */
{
8192, /* 1/4 */
@@ -69,9 +70,11 @@ const Word16 inv_sqi[15] = /* Q15 */
146, /* 1/225 */
128 /* 1/256 */
};
+
/*-------------------------------------------------------------------*
* index square used in fec_adapt_codebook
*-------------------------------------------------------------------*/
+
const Word16 sqi[15] = /* Q0 */
{
4, /* 2 */
@@ -90,8 +93,10 @@ const Word16 sqi[15] = /* Q0 */
225, /* 15 */
256 /* 16 */
};
+
/* RE8 related tables */
const Word16 mult_avq_tab[7] = {1,1,1,342,1,1,171};
+
const Word16 shift_avq_tab[7] = {0,0,1, 10,2,0, 10};
const Word16 hntable[55]=
@@ -123,7 +128,7 @@ const Word16 hestable[15]=
const Word16 lsf_tab_fx[LPC_SHB_ORDER] = /* Q15 */
{
2315, 3920, 5546, 6759, 7978,
- 10254, 11336, 12476, 13437, 14590
+ 10254, 11336, 12476, 13437, 14590
};
const Word16 POW_ATT_TABLE0[OFF_FRAMES_LIMIT + 1] = /* Q15 */
@@ -132,15 +137,18 @@ const Word16 POW_ATT_TABLE0[OFF_FRAMES_LIMIT + 1] = /* Q15 */
20675, 19745, 18856, 18007, 17197, 16423, 8211, 4106, 2053, 1026,
513, 257, 128, 64, 32, 16, 8, 4, 2, 1, 0
};
+
const Word16 POW_ATT_TABLE1[OFF_FRAMES_LIMIT + 1] = /* Q15 */
{
32767, 31656, 30581, 29543, 28540, 27571, 26635, 25731, 24857, 24013,
23198, 22410, 21650, 20915, 20205, 19519, 9759, 4880, 2440, 1220,
610, 305, 152, 76, 38, 19, 10, 5, 2, 1, 0
};
+
/* frequency group start bins for transient analysis */
/* 125 375 750 1250 2000 4000 8000 16000 24000 */
const Word16 gw[LGW_MAX] = { 1, 3, 6, 10, 16, 32, 64, 128, 192 };
+
const Word16 gw_fx[LGW_MAX] = { 1, 3, 6, 10, 16, 32, 64, 128, 192 }; /* Q0 frequency group start bins for transient analysis */
const Word16 gw_len_inv_fx[LGW_MAX - 1] = /* Q15 */
@@ -148,14 +156,15 @@ const Word16 gw_len_inv_fx[LGW_MAX - 1] = /* Q15 */
16384, 10923, 8192, 5461,
2048, 1024, 512, 512,
};
+
const Word16 GR_POW_HEADROOM[LGW_MAX] = /* in Q0-- Number of bits down-shifting to prevent from saturation in group power accumulation.*/
{
0, 0, 1, 2, 2, 3, 4, 4, 4
};
+
/* 31.25 343.75 718.75 1218.75 1968.75 4000 8000 16000 24000 */
const Word16 ivas_gwlpr[LGW_MAX] = { 1, 3*QUOT_LPR_LTR-1, 6*QUOT_LPR_LTR-1, 10*QUOT_LPR_LTR-1, 16*QUOT_LPR_LTR-1, 32*QUOT_LPR_LTR, 64*QUOT_LPR_LTR, 128*QUOT_LPR_LTR, 192*QUOT_LPR_LTR };
-
const Word16 w_hamm48k_2_fx[L_TRANA48k / 2] = /* Q15 */
{
2621, 2623, 2630, 2640, 2654, 2672, 2694, 2721,
@@ -215,6 +224,7 @@ const Word16 w_hamm16k_2_fx[L_TRANA16k / 2] = /* Q15 */
28549, 29053, 29529, 29976, 30393, 30780, 31134, 31455,
31742, 31995, 32213, 32396, 32543, 32653, 32727, 32763
};
+
const Word16 w_hamm_sana48k_2_fx[288] = /* Q15 */
{
2621, 2622, 2625, 2630, 2636, 2644, 2654, 2666,
@@ -254,6 +264,7 @@ const Word16 w_hamm_sana48k_2_fx[288] = /* Q15 */
32552, 32579, 32604, 32628, 32649, 32669, 32687, 32703,
32717, 32730, 32741, 32750, 32757, 32762, 32766, 32767
};
+
const Word16 w_hamm_sana32k_2_fx[L_PROT_HAMM_LEN2_32k] = /* Q15 */
{
2621, 2623, 2630, 2640, 2654, 2672, 2694, 2721,
@@ -281,6 +292,7 @@ const Word16 w_hamm_sana32k_2_fx[L_PROT_HAMM_LEN2_32k] = /* Q15 */
32283, 32344, 32400, 32452, 32501, 32545, 32585, 32622,
32654, 32682, 32707, 32727, 32743, 32755, 32763, 32767
};
+
const Word16 w_hamm_sana16k_2_fx[L_PROT_HAMM_LEN2_16k] = /* Q15 */
{
2621, 2630, 2654, 2695, 2752, 2825, 2914, 3019,
@@ -305,30 +317,30 @@ const Word16 swb_hr_inv_frm_len[4] = /* in Q19 */
4369 /* 1/(960/8) */
};
-const Word16 inv_tbl_2n_minus1[] = { -1, -1, /* Bits = 0 and 1 are not used */
- 21845/*Q16*/,
- 18725/*Q17*/,
- 17476/*Q18*/,
- 16913/*Q19*/,
- 16644/*Q20*/,
- 16513/*Q21*/
+const Word16 inv_tbl_2n_minus1[] = {
+ -1, -1, /* Bits = 0 and 1 are not used */
+ 21845/*Q16*/,
+ 18725/*Q17*/,
+ 17476/*Q18*/,
+ 16913/*Q19*/,
+ 16644/*Q20*/,
+ 16513/*Q21*/
}; /* in Qx */
-
/* er_dec_tcx.c */
const Word16 h_high3_32[L_FIR_FER2] = { -1694/*-0.0517f Q15*/, -1923/*-0.0587f Q15*/, -2687/*-0.0820f Q15*/, -3355/*-0.1024f Q15*/, -3814/*-0.1164f Q15*/, 28790/*0.8786f Q15*/, -3814/*-0.1164f Q15*/, -3355/*-0.1024f Q15*/, -2687/*-0.0820f Q15*/, -1923/*-0.0587f Q15*/, -1694/*-0.0517f Q15*/ };
+
const Word16 h_high3_16[L_FIR_FER2] = { 0/* 0.f Q15*/, -672/*-0.0205f Q15*/, -2133/*-0.0651f Q15*/, -4116/*-0.1256f Q15*/, -5872/*-0.1792f Q15*/, 26306/*0.8028f Q15*/, -5872/*-0.1792f Q15*/, -4116/*-0.1256f Q15*/, -2133/*-0.0651f Q15*/, -672/*-0.0205f Q15*/, 0/* 0.f Q15*/ };
-const Word16 T_256DIV_L_Frame[] =
+
+const Word16 T_256DIV_L_Frame[6] =
{
- 6554 /*L_Frame 640*/
- ,8192 /*L_Frame 512*/
- ,8738 /*L_Frame 480*/
- ,13107/*L_Frame 320*/
- ,16384 /*L_Frame 256*/
- ,26214 /*L_Frame 160*/
+ 6554, /*L_Frame 640*/
+ 8192, /*L_Frame 512*/
+ 8738, /*L_Frame 480*/
+ 13107, /*L_Frame 320*/
+ 16384, /*L_Frame 256*/
+ 26214 /*L_Frame 160*/
};
-/* clang-format on */
-
/* Word16 (Q15) Hann window ranging from 0 to 32767/32768 (~0.999969) */
const Word16 pcmdsp_window_hann_960[960] = {
@@ -444,3 +456,4 @@ const Word16 pcmdsp_window_hann_640[640] = {
490, 452, 415, 380, 346, 314, 283, 254, 227, 201, 176, 154, 132, 113, 94,
78, 63, 50, 38, 27, 19, 12, 6, 2, 0
};
+/* clang-format on */
diff --git a/lib_dec/stat_dec.h b/lib_dec/stat_dec.h
index a1e9af4289e4a1ffd656cb8e22540421ec65da85..81951104e50e56c21b9ff1dd41da427e29760e3a 100644
--- a/lib_dec/stat_dec.h
+++ b/lib_dec/stat_dec.h
@@ -1310,9 +1310,7 @@ typedef struct Decoder_State
Word16 Q_syn;
Word16 Q_syn2;
Word16 Q_syn_cng;
-#ifdef FIX_2003_CON_TCX_OVERFLOW
Word16 Q_syn_factor; // This q_factor is used to avoid using fixed Q0 for synth[] at the output of con_tcx_ivas_fx(). It is then used for two consecutive TCX concealment processes. It cannot be greater than 0.
-#endif
Word16 prev_Q_syn;
Word16 prev_Q_bwe_exc;
diff --git a/lib_dec/swb_tbe_dec_fx.c b/lib_dec/swb_tbe_dec_fx.c
index c3291bde24f95ec52e5fe52d111b5e27d64af6b0..f1bea2e23ae5d4881ba271800091405b8fb3529a 100644
--- a/lib_dec/swb_tbe_dec_fx.c
+++ b/lib_dec/swb_tbe_dec_fx.c
@@ -2705,12 +2705,8 @@ void swb_tbe_dec_fx(
FOR( i = 0; i < L_SHB_LAHEAD; i++ )
{
- L_tmp = Mult_32_16( Lscale, shaped_shb_excitation[i] ); /* Q_bwe_exc + (31-exp) - 15 */
-#ifdef FIX_2602_NONBE_SAT_IN_SWB_TBE_SCALE
+ L_tmp = Mult_32_16( Lscale, shaped_shb_excitation[i] ); /* Q_bwe_exc + (31-exp) - 15 */
shaped_shb_excitation[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
-#else
- shaped_shb_excitation[i] = round_fx( L_shl( L_tmp, exp ) ); /* Q_bwe_exc */
-#endif
move16();
}
IF( exp < 0 )
@@ -2731,12 +2727,8 @@ void swb_tbe_dec_fx(
L_tmp1 = Mult_32_16( L_shl_sat( 1, sub( 31, exp ) ), temp ); /* Q31-exp */
temp = sub( 32767 /*1.0f Q15*/, temp );
Lscale = L_add( Mult_32_16( Lscale, temp ), L_tmp1 );
- L_tmp = Mult_32_16( Lscale, shaped_shb_excitation[i] ); /* Q_bwe_exc + (31-exp) - 15 */
-#ifdef FIX_2602_NONBE_SAT_IN_SWB_TBE_SCALE
+ L_tmp = Mult_32_16( Lscale, shaped_shb_excitation[i] ); /* Q_bwe_exc + (31-exp) - 15 */
shaped_shb_excitation[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
-#else
- shaped_shb_excitation[i] = round_fx( L_shl( L_tmp, exp ) ); /* Q_bwe_exc */
-#endif
move16();
}
}
@@ -2748,12 +2740,8 @@ void swb_tbe_dec_fx(
L_tmp1 = Mult_32_16( L_shl_sat( 1, sub( 31, exp ) ), temp ); /* Q31-exp */
temp = sub( 32767 /*1.0f Q15*/, temp );
Lscale = L_add( Mult_32_16( Lscale, temp ), L_tmp1 );
- L_tmp = Mult_32_16( Lscale, shaped_shb_excitation[i] ); /* Q_bwe_exc + (31-exp) - 15 */
-#ifdef FIX_2602_NONBE_SAT_IN_SWB_TBE_SCALE
+ L_tmp = Mult_32_16( Lscale, shaped_shb_excitation[i] ); /* Q_bwe_exc + (31-exp) - 15 */
shaped_shb_excitation[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
-#else
- shaped_shb_excitation[i] = round_fx( L_shl( L_tmp, exp ) ); /* Q_bwe_exc */
-#endif
move16();
}
}
diff --git a/lib_dec/tonalMDCTconcealment_fx.c b/lib_dec/tonalMDCTconcealment_fx.c
index 82f741e5626ba2869dd18354962b597ff0c9842d..d098eaa15e4e9700ed11759342775554694c8c15 100644
--- a/lib_dec/tonalMDCTconcealment_fx.c
+++ b/lib_dec/tonalMDCTconcealment_fx.c
@@ -1306,11 +1306,7 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
{
Word16 i, l, ld, fac;
Word16 rnd;
-#ifdef FIX_1944_CRASH_FOR_STEREO
Word16 tmp, g, tilt, exp_last, exp_noise, tiltFactor, crossfadeGain, e_crossfadeGain, scaleFactor;
-#else
- Word16 tmp, g, tilt, exp_last, exp_noise, tiltFactor, crossfadeGain, e_crossfadeGain;
-#endif
Word32 L_tmp, L_tmp1, L_tmp2, nrgNoiseInLastFrame, nrgWhiteNoise;
Word16 inv_exp, inv_samples, exp;
Word32 last_block_nrg_correct;
@@ -1488,10 +1484,6 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
}
mdctSpectrum[i] = L_shl( L_tmp2, exp ); // Q15 - e_crossfadeGain + Q15 - spectralData_exp + exp
move32();
-#ifndef FIX_1944_CRASH_FOR_STEREO
- hTonalMDCTConc->faded_signal_nrg = L_add( hTonalMDCTConc->faded_signal_nrg, Mpy_32_32( mdctSpectrum[i], mdctSpectrum[i] ) ); // Q31- faded_signal_nrg_exp
- move32();
-#endif
}
FOR( i = crossOverFreq; i < hTonalMDCTConc->lastBlockData.nSamples; i++ )
{
@@ -1500,7 +1492,6 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
}
*mdctSpectrum_exp = sub( add( e_crossfadeGain, hTonalMDCTConc->lastBlockData.spectralData_exp ), exp );
move16();
-#ifdef FIX_1944_CRASH_FOR_STEREO
scaleFactor = getScaleFactor32( mdctSpectrum, crossOverFreq );
IF( scaleFactor > 8 )
{
@@ -1519,9 +1510,6 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
}
move32();
hTonalMDCTConc->faded_signal_nrg_exp = shl( sub( *mdctSpectrum_exp, scaleFactor ), 1 );
-#else
- hTonalMDCTConc->faded_signal_nrg_exp = shl( *mdctSpectrum_exp, 1 );
-#endif
move16();
}
}
@@ -1685,10 +1673,6 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
}
mdctSpectrum[l] = L_shl( L_tmp2, exp ); // Q15 - e_crossfadeGain + Q15 - spectralData_exp + exp
move32();
-#ifndef FIX_1944_CRASH_FOR_STEREO
- hTonalMDCTConc->faded_signal_nrg = L_add( hTonalMDCTConc->faded_signal_nrg, Mpy_32_32( mdctSpectrum[l], mdctSpectrum[l] ) ); // Q31 - 2*mdctSpectrum_exp
- move32();
-#endif
}
FOR( i = 1; i < hTonalMDCTConc->pTCI->numIndexes; i++ )
@@ -1708,9 +1692,6 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
}
mdctSpectrum[l] = L_shl( L_tmp2, exp ); // Q15 - e_crossfadeGain + Q15 - spectralData_exp + exp
move32();
-#ifndef FIX_1944_CRASH_FOR_STEREO
- hTonalMDCTConc->faded_signal_nrg = L_add( hTonalMDCTConc->faded_signal_nrg, Mpy_32_32( mdctSpectrum[l], mdctSpectrum[l] ) ); // Q31- 2*mdctSpectrum_exp
-#endif
}
}
@@ -1729,10 +1710,6 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
}
mdctSpectrum[l] = L_shl( L_tmp2, exp ); // Q15 - e_crossfadeGain + Q15 - spectralData_exp + exp
move32();
-#ifndef FIX_1944_CRASH_FOR_STEREO
- hTonalMDCTConc->faded_signal_nrg = L_add( hTonalMDCTConc->faded_signal_nrg, Mpy_32_32( mdctSpectrum[l], mdctSpectrum[l] ) ); // Q31- 2*mdctSpectrum_exp
- move32();
-#endif
}
FOR( l = crossOverFreq; l < hTonalMDCTConc->lastBlockData.nSamples; l++ )
@@ -1740,7 +1717,6 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
mdctSpectrum[l] = L_deposit_h( 0 );
move32();
}
-#ifdef FIX_1944_CRASH_FOR_STEREO
scaleFactor = getScaleFactor32( mdctSpectrum, crossOverFreq );
IF( scaleFactor > 8 )
{
@@ -1759,9 +1735,6 @@ void TonalMDCTConceal_InsertNoise_ivas_fx(
}
move32();
hTonalMDCTConc->faded_signal_nrg_exp = shl( sub( *mdctSpectrum_exp, scaleFactor ), 1 );
-#else
- hTonalMDCTConc->faded_signal_nrg_exp = shl( *mdctSpectrum_exp, 1 );
-#endif
move16();
}
}
diff --git a/lib_enc/acelp_core_enc_fx.c b/lib_enc/acelp_core_enc_fx.c
index 75df71db44e1a1b2517708c65c1a57f0e92bc2ea..cdb0d4d34dcbb29a22b41875c877ba088134d278 100644
--- a/lib_enc/acelp_core_enc_fx.c
+++ b/lib_enc/acelp_core_enc_fx.c
@@ -1284,7 +1284,7 @@ ivas_error acelp_core_enc_ivas_fx(
IF( NE_16( att_fx, 32767 /* ONE_IN_Q15 */ ) )
{
- v_multc_fixed_16_16( res_fx, att_fx, res_fx, st->L_frame );
+ v_multc_fx_16_16( res_fx, att_fx, res_fx, st->L_frame );
}
/*-----------------------------------------------------------------*
diff --git a/lib_enc/acelp_core_switch_enc_fx.c b/lib_enc/acelp_core_switch_enc_fx.c
index 12af87d7cddb4d031d8dfd03ab169728ba815f6e..d790b1866163c7d591cee2c33517f51ac04c834b 100644
--- a/lib_enc/acelp_core_switch_enc_fx.c
+++ b/lib_enc/acelp_core_switch_enc_fx.c
@@ -611,6 +611,7 @@ static void encod_gen_voic_core_switch_ivas_fx(
set16_fx( dummyF, -1, NB_SUBFR16k ); /* hack to signal ACELP->HQ switching frame */
pitch = pit_encode_fx( hBstr, st_fx->acelp_cfg.pitch_bits, core_bitrate, 0, L_frame, GENERIC, &pitch_limit_flag, 0, exc, L_SUBFR, T_op, &T0_min, &T0_max, &T0, &T0_frac, h1, xn, 0 /*hStereoTD->tdm_Pitch_reuse_flag*/, dummyF /*hStereoTD->tdm_Pri_pitch_buf*/, st_fx->element_mode, Q_new ); /* Q6 */
+
/*-----------------------------------------------------------------*
* Find adaptive exitation
*-----------------------------------------------------------------*/
@@ -726,12 +727,7 @@ static void bwe_switch_enc_fx(
Word16 synth_subfr_bwe_fx[SWITCH_MAX_GAP]; /* synthesized bwe for core switching */
Word16 n, L;
BSTR_ENC_HANDLE hBstr;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
hBstr = st_fx->hBstr;
L = NS2SA_FX2( st_fx->input_Fs, FRAME_SIZE_NS );
@@ -847,17 +843,14 @@ static void bwe_switch_enc_fx(
L_tmp1 = L_mult( tmp, E2_fx ); /*30-q_tmp1+q_tmp2 */
q_tmp2 = sub( q_tmp1, q_tmp2 ); /*30-q_tmp2 */
L_tmp1 = L_shl( L_tmp1, sub( q_tmp2, 24 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
- gain_fx = round_fx_sat( Isqrt( L_tmp1 ) ); /*Q12 */
-#else
- gain_fx = round_fx_o( Isqrt( L_tmp1 ), &Overflow ); /*Q12 */
-#endif
+ gain_fx = round_fx_sat( Isqrt( L_tmp1 ) ); /*Q12 */
ind1_fx = usquant_fx( gain_fx, &gain_fx, shr( MINVALUEOFFIRSTGAIN_FX, 1 ), shr( DELTAOFFIRSTGAIN_FX, 4 ), ( 1 << NOOFGAINBITS1 ) ); /* Q0 */
push_indice( hBstr, IND_CORE_SWITCHING_AUDIO_GAIN, ind1_fx, NOOFGAINBITS1 );
return;
}
+
static void bwe_switch_enc_ivas_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
const Word16 *new_speech_fx /* i : original input signal Q0 */
@@ -878,12 +871,7 @@ static void bwe_switch_enc_ivas_fx(
Word16 synth_subfr_bwe_fx[SWITCH_MAX_GAP]; /* synthesized bwe for core switching */
Word16 n, L;
BSTR_ENC_HANDLE hBstr;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
hBstr = st_fx->hBstr;
L = NS2SA_FX2( st_fx->input_Fs, FRAME_SIZE_NS );
@@ -996,11 +984,7 @@ static void bwe_switch_enc_ivas_fx(
L_tmp1 = L_mult( tmp, E2_fx ); /*30-q_tmp1+q_tmp2 */
q_tmp2 = sub( q_tmp1, q_tmp2 ); /*30-q_tmp2 */
L_tmp1 = L_shl( L_tmp1, sub( q_tmp2, 24 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
gain_fx = round_fx_sat( Isqrt( L_tmp1 ) ); /*Q12 */
-#else
- gain_fx = round_fx_o( Isqrt( L_tmp1 ), &Overflow ); /*Q12 */
-#endif
ind1_fx = usquant_fx( gain_fx, &gain_fx, shr( MINVALUEOFFIRSTGAIN_FX, 1 ), shr( DELTAOFFIRSTGAIN_FX, 4 ), ( 1 << NOOFGAINBITS1 ) );
push_indice( hBstr, IND_CORE_SWITCHING_AUDIO_GAIN, ind1_fx, NOOFGAINBITS1 );
diff --git a/lib_enc/acelp_enc_util_fx.c b/lib_enc/acelp_enc_util_fx.c
index 8787c46c87c3762f0f95217f11af3bdd63017130..a9e567fa73a0c502f58bf0cf88caa2a90577f5b3 100644
--- a/lib_enc/acelp_enc_util_fx.c
+++ b/lib_enc/acelp_enc_util_fx.c
@@ -160,11 +160,7 @@ void E_ACELP_conv(
{
Word16 i, k;
Word32 L_tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
+
FOR( k = 0; k < L_SUBFR; k++ )
{
/*cn2[k] = xn2[k]; */
@@ -175,12 +171,8 @@ void E_ACELP_conv(
/*cn2[k]-=cn2[i]*h2[k-i];*/
L_tmp_64 = W_msu0_16_16( L_tmp_64, cn2[i], h2[k - i] ); /*h2 4Q11*/
}
- L_tmp = W_sat_l( L_tmp_64 ); /* 4Q11 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = W_sat_l( L_tmp_64 ); /* 4Q11 */
cn2[k] = round_fx_sat( L_shl_sat( L_tmp, 5 ) ); /* Q0 */
-#else
- cn2[k] = round_fx_o( L_shl_o( L_tmp, 5, &Overflow ), &Overflow ); /* Q0 */
-#endif
}
}
@@ -192,11 +184,7 @@ void E_ACELP_conv_ivas_fx(
{
Word16 i, k;
Word32 L_tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
+
FOR( k = 0; k < L_SUBFR; k++ )
{
/*cn2[k] = xn2[k]; */
@@ -207,12 +195,8 @@ void E_ACELP_conv_ivas_fx(
/*cn2[k]-=cn2[i]*h2[k-i];*/
L_tmp_64 = W_msu0_16_16( L_tmp_64, cn2[i], h2[k - i] ); /*Qnew + 11*/
}
- L_tmp = W_sat_l( L_tmp_64 ); /* Qnew + 11 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = W_sat_l( L_tmp_64 ); /* Qnew + 11 */
cn2[k] = round_fx_sat( L_shl_sat( L_tmp, 5 ) ); /* Qnew*/
-#else
- cn2[k] = round_fx_o( L_shl_o( L_tmp, 5, &Overflow ), &Overflow ); /* Qnew*/
-#endif
move16();
}
}
diff --git a/lib_enc/analy_sp_fx.c b/lib_enc/analy_sp_fx.c
index 666d7865c8c7326d1a5c076690f59354cb12da24..7a1f60e4507f891bef28851339c64eef0eaee578 100644
--- a/lib_enc/analy_sp_fx.c
+++ b/lib_enc/analy_sp_fx.c
@@ -898,13 +898,6 @@ static void find_enr(
Word32 etot;
Word16 exp_etot;
Word32 *tmpptr;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
ptR = &data[1]; /* first real */
ptI = &data[L_FFT - 1]; /* first imaginary */
@@ -950,13 +943,9 @@ static void find_enr(
/* *ptE *= 4.0 / (L_FFT*L_FFT) */
/* normalization - corresponds to FFT normalization by 2/L_FFT */
- BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */
*ptE = L_shl_sat( Ltmp, diff_scaleM2 ); /* Q_new + QSCALE - 2 */
-#else
- *ptE = L_shl_o( Ltmp, diff_scaleM2, &Overflow ); /* Q_new + QSCALE - 2 */
-#endif
- move32(); /* scaled by Q_new + QSCALE - 2 */
+ move32(); /* scaled by Q_new + QSCALE - 2 */
BASOP_SATURATE_WARNING_ON_EVS;
/*band[i] += *ptE++;*/
*Bin_E = *ptE;
@@ -980,13 +969,9 @@ static void find_enr(
exp_band = sub( exp_band, shift_to_norm );
exp_band = sub( diff_scaleP1, exp_band );
- BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */
band[i] = L_shl_sat( Ltmp1, exp_band ); /* Q15 + exp_band */
-#else
- band[i] = L_shl_o( Ltmp1, exp_band, &Overflow ); /* Q15 + exp_band */
-#endif
- move32(); /* band scaled by Q_new + QSCALE */
+ move32(); /* band scaled by Q_new + QSCALE */
BASOP_SATURATE_WARNING_ON_EVS;
test();
@@ -1035,13 +1020,9 @@ static void find_enr(
/* *ptE *= 4.0 / (L_FFT*L_FFT) */
/* normalization - corresponds to FFT normalization by 2/L_FFT */
- BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */
*Bin_E = L_shl_sat( Ltmp, diff_scaleM2 ); /* Q_new + QSCALE */
-#else
- *Bin_E = L_shl_o( Ltmp, diff_scaleM2, &Overflow ); /* Q_new + QSCALE */
-#endif
- move32(); /* scaled by Q_new + QSCALE - 2 */
+ move32(); /* scaled by Q_new + QSCALE - 2 */
BASOP_SATURATE_WARNING_ON_EVS;
Bin_E++;
Ltmp1 = L_add( Ltmp1, Ltmp );
@@ -1062,11 +1043,7 @@ static void find_enr(
exp_band = sub( exp_band, shift_to_norm );
exp_band = sub( diff_scaleP1, exp_band );
BASOP_SATURATE_WARNING_OFF_EVS; /* saturation seems to have no effect (tested by simulation) */
-#ifdef ISSUE_1867_replace_overflow_libenc
band[i] = L_shl_sat( Ltmp1, exp_band );
-#else
- band[i] = L_shl_o( Ltmp1, exp_band, &Overflow );
-#endif
move32(); /* band scaled by Q_new + QSCALE */
BASOP_SATURATE_WARNING_ON_EVS;
diff --git a/lib_enc/ari_hm_enc_fx.c b/lib_enc/ari_hm_enc_fx.c
index 4beac647d5a1d3c2d184b8467e4c45eecb265e2f..1917216ef6f3817970040cc0de0cc93c67ea43ce 100644
--- a/lib_enc/ari_hm_enc_fx.c
+++ b/lib_enc/ari_hm_enc_fx.c
@@ -241,12 +241,6 @@ Word16 SearchPeriodicityIndex_fx(
Word32 Lag;
Word16 s, tmp, tmp2, tmp3;
Word32 tmp32;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* Debug init (not instrumented) */
C = -3000;
@@ -459,11 +453,7 @@ Word16 SearchPeriodicityIndex_fx(
tmp32 = L_mult0( Score, NumToConsider ); /* -> 16Q15 */
tmp = sub( norm_l( tmp32 ), 1 );
tmp2 = norm_l( AbsTotal );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp3 = div_s( round_fx_sat( L_shl( tmp32, tmp ) ), round_fx_sat( L_shl( AbsTotal, tmp2 ) ) );
-#else
- tmp3 = div_s( round_fx_o( L_shl_o( tmp32, tmp, &Overflow ), &Overflow ), round_fx_o( L_shl_o( AbsTotal, tmp2, &Overflow ), &Overflow ) );
-#endif
*RelativeScore = shr_sat( tmp3, add( sub( tmp, tmp2 ), 2 ) ); /* -> 2Q13 */
move16();
}
diff --git a/lib_enc/arith_coder_enc_fx.c b/lib_enc/arith_coder_enc_fx.c
index 58125b81cafde7044d7fb0c02b05883a1d082edd..12f3368dce228f49a0bd2c80cf6e180c41caed50 100644
--- a/lib_enc/arith_coder_enc_fx.c
+++ b/lib_enc/arith_coder_enc_fx.c
@@ -48,13 +48,6 @@ static Word16 tcx_arith_estimate_scale(
{
Word16 scale, tmp, k, s, s1;
Word32 L_tmp, accu;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
/* compute normalised standard deviation and determine approximate scale */
accu = L_deposit_l( 0 );
@@ -74,11 +67,7 @@ static Word16 tcx_arith_estimate_scale(
s1 = norm_l( abs_spectrum[k] );
}
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = mult_r( round_fx_sat( L_shl( abs_spectrum[k], s1 ) ), envelope[k] );
-#else
- tmp = mult_r( round_fx_o( L_shl( abs_spectrum[k], s1 ), &Overflow ), envelope[k] );
-#endif
L_tmp = L_mult0( tmp, tmp );
tmp = sub( shl( s1, 1 ), 1 );
@@ -373,13 +362,6 @@ static Word16 tcx_arith_rateloop(
Word32 L_tmp;
Word16 tmp, tmp3;
Word32 tmp2;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
scale = tcx_arith_estimate_scale( abs_spectrum, abs_spectrum_e, L_frame, envelope, envelope_e, &tmp );
scale = mult_r( scale, *target_bits_fac );
@@ -688,22 +670,10 @@ void tcx_arith_encode_envelope_fx(
const Word8 *deadzone_flags;
Word16 gamma_w, gamma_uw;
Word16 hm_bits;
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Word32 L_tmp, L_tmp2;
-#else
Word32 L_tmp;
Word64 W_tmp2;
-#endif
Word16 tmp;
TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Flag Overflow = 0;
- Flag Carry = 0;
- move32();
- move32();
-#endif
-#endif
assert( L_spec <= N_MAX_ARI );
@@ -787,18 +757,10 @@ void tcx_arith_encode_envelope_fx(
move16();
/* Multiply back the signs */
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_tmp2 = L_deposit_l( 0 );
-#else
W_tmp2 = 0;
-#endif
FOR( k = 0; k <= kMax; k++ )
{
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_tmp2 = L_macNs_co( L_tmp2, q_spectrum[k], k, &Carry, &Overflow );
-#else
W_tmp2 = W_mac_16_16( W_tmp2, q_spectrum[k], k );
-#endif
if ( signs[k] != 0 )
L_tmp = L_mult( q_spectrum[k], -( 1 << ( 30 - SPEC_EXP_DEC ) ) );
@@ -812,11 +774,7 @@ void tcx_arith_encode_envelope_fx(
set32_fx( spectrum + k, 0, sub( s_max( L_frame, L_spec ), k ) );
/* noise filling seed */
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- *nf_seed = extract_l( L_tmp2 );
-#else
*nf_seed = extract_l( W_extract_l( W_tmp2 ) );
-#endif
move16();
}
diff --git a/lib_enc/avq_cod_fx.c b/lib_enc/avq_cod_fx.c
index 8433e77abe610eb2841607b917fe2a1a47e3728d..982b30d323939a75f3478a442cdae07433583ed9 100644
--- a/lib_enc/avq_cod_fx.c
+++ b/lib_enc/avq_cod_fx.c
@@ -1,6 +1,7 @@
/*====================================================================================
EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0
====================================================================================*/
+
#include
#include
#include "options.h" /* Compilation switches */
@@ -13,19 +14,22 @@
/*-------------------------------------------------------------------*
* Local prototypes
*-------------------------------------------------------------------*/
+
static void wrte_cv( BSTR_ENC_HANDLE hBstr, const Word16 nq, const Word16 i_ind, const Word16 kv_ind, UWord16 I, Word16 kv[], Word16 *bits );
+
/*-------------------------------------------------------------------*
* Function AVQ_cod() *
* *
* Split algevraic vector quantizer (AVQ) base on RE8 latice *
*-------------------------------------------------------------------*/
-void AVQ_cod_fx( /* o: comfort noise gain factor */
- const Word16 xri[], /* i: vector to quantize Qx*/
- Word16 xriq[], /* o: quantized normalized vector (assuming the bit budget is enough) */
- const Word16 NB_BITS, /* i: number of allocated bits */
- const Word16 Nsv, /* i: number of subvectors (lg=Nsv*8) */
- const Word16 Q_in_ref /* i: Scaling input */
+/* o: comfort noise gain factor */
+void AVQ_cod_fx(
+ const Word16 xri[], /* i : vector to quantize Qx*/
+ Word16 xriq[], /* o : quantized normalized vector (assuming the bit budget is enough) */
+ const Word16 NB_BITS, /* i : number of allocated bits */
+ const Word16 Nsv, /* i : number of subvectors (lg=Nsv*8) */
+ const Word16 Q_in_ref /* i : Scaling input */
)
{
Word16 i, l, iter, c[8];
@@ -33,11 +37,7 @@ void AVQ_cod_fx( /* o: comfort noise gain factor
Word16 ebits[NSV_MAX], e_ebits, f_ebits, e_tmp, f_tmp, tmp16, l_8;
Word32 Lener, Ltmp, Lgain, x1[8];
Word16 tot_est_bits, Q_in;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
+
Q_in = sub( Q_in_ref, 1 );
move16();
@@ -53,11 +53,7 @@ void AVQ_cod_fx( /* o: comfort noise gain factor
Lener = L_shl( 4, shl( Q_in, 1 ) ); /* to set ebits >= 0 */
FOR( i = 0; i < 8; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Lener = L_mac_sat( Lener, xri[l * 8 + i], xri[l * 8 + i] );
-#else
- Lener = L_mac_o( Lener, xri[l * 8 + i], xri[l * 8 + i], &Overflow );
-#endif
}
/* estimated bit consumption when gain=1 */
/* ebits[l] = 5.0 * FAC_LOG2 * (Word16)log10(ener * 0.5) */
@@ -165,13 +161,13 @@ void AVQ_cod_fx( /* o: comfort noise gain factor
*
* Encode subvectors and write indexes into the bitstream
*-----------------------------------------------------------------*/
+
void AVQ_encmux_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
+ BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
const Word16 extl, /* i : extension layer */
- Word16 xriq[], /* i/o: rounded subvectors [0..8*Nsv-1] followed
- by rounded bit allocations [8*Nsv..8*Nsv+Nsv-1] */
+ Word16 xriq[], /* i/o: rounded subvectors [0..8*Nsv-1] followed by rounded bit allocations [8*Nsv..8*Nsv+Nsv-1] */
Word16 *nb_bits, /* i/o: number of allocated bits */
- const Word16 Nsv, /* i: number of subvectors */
+ const Word16 Nsv, /* i : number of subvectors */
Word16 nq_out[], /* o : AVQ nq index */
Word16 avq_bit_sFlag, /* i : flag for AVQ bit saving solution */
Word16 trgtSvPos /* i : target SV for AVQ bit savings */
@@ -187,6 +183,7 @@ void AVQ_encmux_fx(
Word16 unusedbitsFlag;
Word16 svOrder[NSV_MAX], k, nullVec, dummy_bits;
Word16 tmp;
+
test();
IF( EQ_16( extl, SWB_BWE_HIGHRATE ) || EQ_16( extl, FB_BWE_HIGHRATE ) )
{
@@ -589,8 +586,10 @@ void AVQ_encmux_fx(
return;
}
+
+
/*-------------------------------------------------------------------*
- * Function AVQ_cod_lpc_fx() *
+ * Function AVQ_cod_lpc_fx() *
* *
* Split algebraic vector quantizer (AVQ) for LPC quantization *
*-------------------------------------------------------------------*/
diff --git a/lib_enc/bass_psfilter_enc_fx.c b/lib_enc/bass_psfilter_enc_fx.c
index 7a056dd132fe774997eb43f6b6bc1b4284b162f3..c4aeab22d55bbd5cec8b5331bf03525b41462552 100644
--- a/lib_enc/bass_psfilter_enc_fx.c
+++ b/lib_enc/bass_psfilter_enc_fx.c
@@ -36,13 +36,6 @@ Word16 bass_pf_enc_fx(
Word32 cross_n_d, nrg_n;
const Word16 *pFilt;
Word32 ener2;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
IF( NE_16( l_frame, L_FRAME16k ) )
{
@@ -155,7 +148,6 @@ Word16 bass_pf_enc_fx(
FOR( i = 0; i < lg; i++ )
{
tmp32 = L_msu0( 0, gain, syn[i + i_subfr - T] );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp32 = L_msu0_sat( tmp32, gain, syn[i + i_subfr + T] );
tmp16 = mac_r_sat( tmp32, gain, syn[i + i_subfr] ); /* Q0 */
@@ -164,16 +156,6 @@ Word16 bass_pf_enc_fx(
tmp16 = round_fx_sat( L_shl_sat( lp_error, s1 ) ); /* Q0+s1-3 */
ener2 = L_mac0_sat( ener2, tmp16, tmp16 ); /* Q0+(s1-3)*2 */
-#else
- tmp32 = L_msu0_o( tmp32, gain, syn[i + i_subfr + T], &Overflow );
- tmp16 = mac_ro( tmp32, gain, syn[i + i_subfr], &Overflow ); /* Q0 */
-
- lp_error = Mpy_32_16_1( lp_error, 29491 /*0.9f Q15*/ );
- lp_error = L_mac_o( lp_error, tmp16, 0x1000, &Overflow ); /* Q13 */
-
- tmp16 = round_fx_o( L_shl_o( lp_error, s1, &Overflow ), &Overflow ); /* Q0+s1-3 */
- ener2 = L_mac0_o( ener2, tmp16, tmp16, &Overflow ); /* Q0+(s1-3)*2 */
-#endif
}
}
@@ -182,7 +164,6 @@ Word16 bass_pf_enc_fx(
FOR( i = lg; i < l_subfr; i++ )
{
tmp32 = L_mult0( gain, syn[i + i_subfr] );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp32 = L_msu0_sat( tmp32, gain, syn[i + i_subfr - T] ); /* Q0 */
tmp16 = round_fx_sat( tmp32 );
lp_error = Mpy_32_16_1( lp_error, 29491 /*0.9f Q15*/ );
@@ -190,15 +171,6 @@ Word16 bass_pf_enc_fx(
tmp16 = round_fx_sat( L_shl_sat( lp_error, s1 ) ); /* Q0+s1-3 */
ener2 = L_mac0_sat( ener2, tmp16, tmp16 ); /* Q0+(s1-3)*2 */
-#else
- tmp32 = L_msu0_o( tmp32, gain, syn[i + i_subfr - T], &Overflow ); /* Q0 */
- tmp16 = round_fx_o( tmp32, &Overflow );
- lp_error = Mpy_32_16_1( lp_error, 29491 /*0.9f Q15*/ );
- lp_error = L_mac_o( lp_error, tmp16, 0x1000, &Overflow ); /* Q13 */
-
- tmp16 = round_fx_o( L_shl_o( lp_error, s1, &Overflow ), &Overflow ); /* Q0+s1-3 */
- ener2 = L_mac0_o( ener2, tmp16, tmp16, &Overflow ); /* Q0+(s1-3)*2 */
-#endif
}
}
@@ -259,11 +231,7 @@ Word16 bass_pf_enc_fx(
tmp32 = L_mac( tmp32, tmp16, syn[i + i_subfr] );
noise_in[i] = round_fx( L_shl( tmp32, s2 ) ); /* Q0+s2 */
-#ifdef ISSUE_1867_replace_overflow_libenc
error_in[i] = sub_sat( orig[i + i_subfr], syn[i + i_subfr] ); /*Q0*/
-#else
- error_in[i] = sub_o( orig[i + i_subfr], syn[i + i_subfr], &Overflow ); /*Q0*/
-#endif
move16();
}
}
@@ -277,11 +245,7 @@ Word16 bass_pf_enc_fx(
noise_in[i] = round_fx( L_shl( tmp32, s2 ) ); /* Q0+s2 */
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
error_in[i] = sub_sat( orig[i + i_subfr], syn[i + i_subfr] ); /*Q0*/
-#else
- error_in[i] = sub_o( orig[i + i_subfr], syn[i + i_subfr], &Overflow ); /*Q0*/
-#endif
move16();
}
}
diff --git a/lib_enc/bw_detect_fx.c b/lib_enc/bw_detect_fx.c
index 6ec7c626b3b1ef007d81f0983a26c60368d2e6db..49391f60f7d0fc3485c737453dc621b215c9d0c3 100644
--- a/lib_enc/bw_detect_fx.c
+++ b/lib_enc/bw_detect_fx.c
@@ -67,12 +67,6 @@ void bw_detect_fx(
const Word32 *pt32;
Word32 max_NB32, max_WB32, max_SWB32, max_FB32, mean_NB32, mean_WB32, mean_SWB32, mean_FB32; /* Q11*/ /* we need Word32 for the new cldfb energy vectors */
Word16 bwd_count_wider_bw;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
Word16 lp_noise_fx;
bwd_count_wider_bw = BWD_COUNT_WIDER_BW;
@@ -123,17 +117,24 @@ void bw_detect_fx(
move32(); /* Q31 */
cldfb_bin_Exp[0] = add( cldfb_bin_Exp[0], CLDFBscalingFactor_EXP );
move16();
-
+#ifdef FIX_2141_ASSERT_IN_OMASA_BITRATE_SWITSCHING
+ if ( cldfb_bin[0] == 0 )
+ {
+ cldfb_bin[0] = L_deposit_l( 1 );
+ move32();
+ }
+#else
if ( cldfb_bin[i] == 0 )
{
cldfb_bin[i] = L_deposit_l( 1 );
move32();
}
+#endif
L_tmp = BASOP_Util_Log2( cldfb_bin[0] ); /*(log2(660423549*2^(-31))/64)*2^31*/
-#ifdef ISSUE_1867_replace_overflow_libenc
- L_tmp = L_add_sat( L_tmp, L_shl( L_deposit_l( cldfb_bin_Exp[0] ), 31 - LD_DATA_SCALE ) ); /* Q25 */
+#ifdef FIX_2141_ASSERT_IN_OMASA_BITRATE_SWITSCHING
+ L_tmp = L_add_sat( L_tmp, L_shl_sat( L_deposit_l( cldfb_bin_Exp[0] ), 31 - LD_DATA_SCALE ) ); /* Q25 */
#else
- L_tmp = L_add_o( L_tmp, L_shl( L_deposit_l( cldfb_bin_Exp[0] ), 31 - LD_DATA_SCALE ), &Overflow ); /* Q25 */
+ L_tmp = L_add_sat( L_tmp, L_shl( L_deposit_l( cldfb_bin_Exp[0] ), 31 - LD_DATA_SCALE ) ); /* Q25 */
#endif
cldfb_bin[0] = Mpy_32_16_1( L_tmp, 9864 /*1.0f/3.3219280948873623478703194294894f Q15*/ );
move32(); /* 1/log2(10) */ /* Q25 */
@@ -163,8 +164,12 @@ void bw_detect_fx(
cldfb_bin[i] = L_deposit_l( 1 );
move32();
}
- L_tmp = BASOP_Util_Log2( cldfb_bin[i] ); /*(log2(660423549*2^(-31))/64)*2^31*/
+ L_tmp = BASOP_Util_Log2( cldfb_bin[i] ); /*(log2(660423549*2^(-31))/64)*2^31*/
+#ifdef FIX_2141_ASSERT_IN_OMASA_BITRATE_SWITSCHING
+ L_tmp = L_add( L_tmp, L_shl_sat( L_deposit_l( cldfb_bin_Exp[i] ), 31 - LD_DATA_SCALE ) ); /* Q25 */
+#else
L_tmp = L_add( L_tmp, L_shl( L_deposit_l( cldfb_bin_Exp[i] ), 31 - LD_DATA_SCALE ) ); /* Q25 */
+#endif
cldfb_bin[i] = Mpy_32_16_1( L_tmp, 9864 /*1.0f/3.3219280948873623478703194294894f Q15*/ );
move32(); /* 1/log2(10) */ /* Q25 */
}
@@ -202,8 +207,12 @@ void bw_detect_fx(
cldfb_bin[i] = L_deposit_l( 1 );
move32();
}
- L_tmp = BASOP_Util_Log2( cldfb_bin[i] ); /*(log2(660423549*2^(-31))/64)*2^31*/
+ L_tmp = BASOP_Util_Log2( cldfb_bin[i] ); /*(log2(660423549*2^(-31))/64)*2^31*/
+#ifdef FIX_2141_ASSERT_IN_OMASA_BITRATE_SWITSCHING
+ L_tmp = L_add( L_tmp, L_shl_sat( L_deposit_l( cldfb_bin_Exp[i] ), 31 - LD_DATA_SCALE ) ); /* Q25 */
+#else
L_tmp = L_add( L_tmp, L_shl( L_deposit_l( cldfb_bin_Exp[i] ), 31 - LD_DATA_SCALE ) ); /* Q25 */
+#endif
cldfb_bin[i] = Mpy_32_16_1( L_tmp, 9864 /*1.0f/3.3219280948873623478703194294894f Q15*/ );
move32(); /* 1/log2(10) */ /* Q25 */
}
@@ -235,8 +244,12 @@ void bw_detect_fx(
cldfb_bin[i] = L_deposit_l( 1 );
move32();
}
- L_tmp = BASOP_Util_Log2( cldfb_bin[i] ); /*(log2(660423549*2^(-31))/64)*2^31*/
+ L_tmp = BASOP_Util_Log2( cldfb_bin[i] ); /*(log2(660423549*2^(-31))/64)*2^31*/
+#ifdef FIX_2141_ASSERT_IN_OMASA_BITRATE_SWITSCHING
+ L_tmp = L_add( L_tmp, L_shl_sat( L_deposit_l( cldfb_bin_Exp[i] ), 31 - LD_DATA_SCALE ) ); /* Q25 */
+#else
L_tmp = L_add( L_tmp, L_shl( L_deposit_l( cldfb_bin_Exp[i] ), 31 - LD_DATA_SCALE ) ); /* Q25 */
+#endif
cldfb_bin[i] = Mpy_32_16_1( L_tmp, 9864 /*1.0f/3.3219280948873623478703194294894f Q15*/ );
move32(); /* 1/log2(10) */ /* Q25 */
}
@@ -303,11 +316,7 @@ void bw_detect_fx(
FOR( i = 0; i < BWD_TOTAL_WIDTH; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
spect[i] = round_fx_sat( L_shr_sat( spect32[i], Q_dct ) );
-#else
- spect[i] = round_fx_o( L_shr_o( spect32[i], Q_dct, &Overflow ), &Overflow );
-#endif
move16();
}
Q_dct = -2;
@@ -345,11 +354,7 @@ void bw_detect_fx(
pt1 = &spect[i_mult2( i, bin_width )];
FOR( j = 0; j < bin_width; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sum32 = L_mac0_sat( sum32, *pt1, *pt1 );
-#else
- sum32 = L_mac0_o( sum32, *pt1, *pt1, &Overflow );
-#endif
pt1++;
}
tmp_1 = BASOP_Util_Cmp_Mant32Exp( sum32, E_spect_bin, MAX_32, Q31 - 41 ); /* Any sum32 in Q_dct if it is less than MAX_32 in Q41 will be less than 0.001 */
diff --git a/lib_enc/cng_enc_fx.c b/lib_enc/cng_enc_fx.c
index 37770ce9e66b8f920bbf12773b63745be9e8f409..34be60d8a7c5b6d33502ba91b95184cbf4c4456d 100644
--- a/lib_enc/cng_enc_fx.c
+++ b/lib_enc/cng_enc_fx.c
@@ -108,13 +108,6 @@ void CNG_enc_fx(
st_lp_sp_enr = hTdCngEnc->lp_sp_enr_fx;
move16();
Word16 lp_ener_thr_scale;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
- /* Temp variables for floating point functions */
lp_ener_thr_scale = 8; /* 4.0f*/ /*IVAS_CODE Q2 */
move16();
@@ -637,11 +630,7 @@ void CNG_enc_fx(
FOR( i = 0; i < M; i++ )
{
dev = abs_s( sub( lsp_tmp[i], lsp_new[i] ) ); /*Q15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- dist = add_sat( dist, dev ); /*Q15 */
-#else
- dist = add_o( dist, dev, &Overflow ); /*Q15 */
-#endif
+ dist = add_sat( dist, dev ); /*Q15 */
if ( GT_16( dev, max_dev ) )
{
max_dev = dev;
@@ -771,16 +760,10 @@ void CNG_enc_fx(
FOR( i = 0; i < NUM_ENV_CNG; i++ )
{
/* env[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mult_sat( *ptR, *ptR ); /* 2*Q_new+1 */
L_tmp = L_add_sat( L_tmp, L_mult_sat( *ptI, *ptI ) ); /* 2*Q_new+1 */
L_tmp = L_add_sat( L_tmp, L_tmp ); /* 2*Q_new+1 */
-#else
- L_tmp = L_mult_o( *ptR, *ptR, &Overflow ); /* 2*Q_new+1 */
- L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_new+1 */
- L_tmp = L_add_o( L_tmp, L_tmp, &Overflow ); /* 2*Q_new+1 */
-#endif
- L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_new+1 */
+ L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_new+1 */
tmp1 = add( add( Q_new, Q_new ), 1 );
env[i] = L_shr( L_tmp, sub( tmp1, 6 ) );
move32(); /* Q6 */
@@ -1056,13 +1039,9 @@ void CNG_enc_fx(
/* d += (env[j] - CNG_details_codebook_fx[i][j]) * (env[j] - CNG_details_codebook_fx[i][j]);*/
L_tmp = L_sub( env[j], L_deposit_l( CNG_details_codebook_fx[i][j] ) ); /* Q6 */
exp = norm_l( L_tmp );
- L_tmp = L_shl( L_tmp, exp ); /*Q(exp+6)*/
- tmp1 = extract_h( L_tmp ); /*Q(exp+6-16)=exp-10*/
-#ifdef ISSUE_1867_replace_overflow_libenc
- L_tmp = L_mult_sat( tmp1, tmp1 ); /*Q(2*exp - 19)*/
-#else
- L_tmp = L_mult_o( tmp1, tmp1, &Overflow ); /*Q(2*exp - 19)*/
-#endif
+ L_tmp = L_shl( L_tmp, exp ); /*Q(exp+6)*/
+ tmp1 = extract_h( L_tmp ); /*Q(exp+6-16)=exp-10*/
+ L_tmp = L_mult_sat( tmp1, tmp1 ); /*Q(2*exp - 19)*/
L_tmp = L_shr( L_tmp, sub( add( exp, exp ), 36 ) ); /* Q17 */
d = L_add( d, L_tmp );
}
@@ -1249,12 +1228,7 @@ void CNG_enc_ivas_fx(
Word64 w_temp;
Word32 inv_frame_len;
Word32 L_ener;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
step_inv = 0;
move16();
maxl = 0;
@@ -1911,7 +1885,7 @@ void CNG_enc_ivas_fx(
L_tmp1 = L_mult0( hTdCngEnc->CNG_att_fx, 26214 /* 1/20.0f in Q19 */ ); // Q26 (7 + 19)
L_tmp1 = BASOP_Util_fPow( 1342177280 /*10 in Q27 */, 4, L_tmp1, 5, &exp );
att = extract_h( L_shl( L_sub( L_tmp1, EPSILON_FX ), exp ) ); // Q15 // Subtracting by EPSILON_FX to avoid assertion when L_tmp1 value is 1073741824 and exp =1
- v_multc_fixed_16_16( res1, att, res1, st_fx->L_frame ); /* Q_new */
+ v_multc_fx_16_16( res1, att, res1, st_fx->L_frame ); /* Q_new */
}
ELSE IF( st_fx->bwidth != NB )
{
@@ -1957,16 +1931,10 @@ void CNG_enc_ivas_fx(
FOR( i = 0; i < NUM_ENV_CNG; i++ )
{
/* env[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mult_sat( *ptR, *ptR ); /* 2*Q_new+1 */
L_tmp = L_add_sat( L_tmp, L_mult_sat( *ptI, *ptI ) ); /* 2*Q_new+1 */
L_tmp = L_add_sat( L_tmp, L_tmp ); /* 2*Q_new+1 */
-#else
- L_tmp = L_mult_o( *ptR, *ptR, &Overflow ); /* 2*Q_new+1 */
- L_tmp = L_add_o( L_tmp, L_mult_o( *ptI, *ptI, &Overflow ), &Overflow ); /* 2*Q_new+1 */
- L_tmp = L_add_o( L_tmp, L_tmp, &Overflow ); /* 2*Q_new+1 */
-#endif
- L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_new+1 */
+ L_tmp = Mult_32_16( L_tmp, 128 ); /* 2*Q_new+1 */
tmp1 = add( add( Q_new, Q_new ), 1 );
env[i] = L_shr( L_tmp, sub( tmp1, 6 ) );
move32(); /* Q6 */
@@ -2266,13 +2234,9 @@ void CNG_enc_ivas_fx(
/* d += (env[j] - CNG_details_codebook_fx[i][j]) * (env[j] - CNG_details_codebook_fx[i][j]);*/
L_tmp = L_sub( env[j], L_deposit_l( CNG_details_codebook_fx[i][j] ) ); /* Q6 */
exp = norm_l( L_tmp );
- L_tmp = L_shl( L_tmp, exp ); /*Q(exp+6)*/
- tmp1 = extract_h( L_tmp ); /*Q(exp+6-16)=exp-10*/
-#ifdef ISSUE_1867_replace_overflow_libenc
- L_tmp = L_mult_sat( tmp1, tmp1 ); /*Q(2*exp - 19)*/
-#else
- L_tmp = L_mult_o( tmp1, tmp1, &Overflow ); /*Q(2*exp - 19)*/
-#endif
+ L_tmp = L_shl( L_tmp, exp ); /*Q(exp+6)*/
+ tmp1 = extract_h( L_tmp ); /*Q(exp+6-16)=exp-10*/
+ L_tmp = L_mult_sat( tmp1, tmp1 ); /*Q(2*exp - 19)*/
L_tmp = L_shr( L_tmp, sub( add( exp, exp ), 36 ) ); /* Q17 */
d = L_add( d, L_tmp ); /* Q17 */
}
@@ -2539,12 +2503,7 @@ static Word16 shb_DTX_fx(
DTX_ENC_HANDLE hDtxEnc = st_fx->hDtxEnc;
TD_CNG_ENC_HANDLE hTdCngEnc = st_fx->hTdCngEnc;
TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
shb_new_speech_fx = shb_old_speech_fx + ( ACELP_LOOK_12k8 + L_SUBFR ) * 5 / 4;
Copy( hBWE_TD->old_speech_shb_fx, shb_old_speech_fx, ( ACELP_LOOK_12k8 + L_SUBFR ) * 5 / 4 );
Copy( shb_speech_fx, shb_new_speech_fx, L_FRAME16k );
@@ -2561,11 +2520,7 @@ static Word16 shb_DTX_fx(
wb_ener_fx = L_deposit_l( 0 );
FOR( i = 0; i < st_fx->L_frame; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
wb_ener_fx = L_mac_sat( wb_ener_fx, syn_12k8_16k[i], syn_12k8_16k[i] );
-#else
- wb_ener_fx = L_mac_o( wb_ener_fx, syn_12k8_16k[i], syn_12k8_16k[i], &Overflow );
-#endif
}
wb_ener_fx = L_add( Mpy_32_16_1( wb_ener_fx, 128 ), 1 ); /* 128 in Q15, wb_ener_fx in Q1 */
@@ -2574,11 +2529,7 @@ static Word16 shb_DTX_fx(
fra = Log2_norm_lc( L_shl( wb_ener_fx, exp ) );
exp = sub( 30 - 1, exp );
wb_ener_fx = Mpy_32_16( exp, fra, LG10 );
-#ifdef ISSUE_1867_replace_overflow_libenc
log_wb_ener_fx = round_fx_sat( L_shl_sat( wb_ener_fx, 10 ) ); /* log_wb_ener_fx in Q8 */
-#else
- log_wb_ener_fx = round_fx_o( L_shl_o( wb_ener_fx, 10, &Overflow ), &Overflow ); /* log_wb_ener_fx in Q8 */
-#endif
exp = norm_l( shb_ener_fx );
fra = Log2_norm_lc( L_shl( shb_ener_fx, exp ) );
exp = sub( 30 - 1, exp );
@@ -2597,11 +2548,7 @@ static Word16 shb_DTX_fx(
move16();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
log_shb_ener_fx = sub_sat( round_fx_sat( L_shl_sat( shb_ener_fx, 10 ) ), att ); /* log_shb_ener_fx in Q8 */
-#else
- log_shb_ener_fx = sub_o( round_fx_o( L_shl_o( shb_ener_fx, 10, &Overflow ), &Overflow ), att, &Overflow ); /* log_shb_ener_fx in Q8 */
-#endif
IF( hDtxEnc->first_CNG == 0 )
{
hTdCngEnc->mov_wb_cng_ener_fx = log_wb_ener_fx;
@@ -3010,13 +2957,6 @@ static Word16 shb_DTX_ivas_fx(
TD_CNG_ENC_HANDLE hTdCngEnc = st->hTdCngEnc;
TD_BWE_ENC_HANDLE hBWE_TD = st->hBWE_TD;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
-
shb_new_speech_fx = shb_old_speech_fx + ( ACELP_LOOK_12k8 + L_SUBFR ) * 5 / 4;
Copy( hBWE_TD->old_speech_shb_fx, shb_old_speech_fx, ( ACELP_LOOK_12k8 + L_SUBFR ) * 5 / 4 ); // old_speech_shb_fx -> Q0
Copy( shb_speech_fx, shb_new_speech_fx, L_FRAME16k ); // Q0
@@ -3033,11 +2973,7 @@ static Word16 shb_DTX_ivas_fx(
wb_ener_fx = L_deposit_l( 0 );
FOR( i = 0; i < st->L_frame; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
wb_ener_fx = L_mac_sat( wb_ener_fx, syn_12k8_16k_fx[i], syn_12k8_16k_fx[i] ); // ( Q0 + Q0 + Q1 ) --> Q1 due to left shift in L_mac
-#else
- wb_ener_fx = L_mac_o( wb_ener_fx, syn_12k8_16k_fx[i], syn_12k8_16k_fx[i], &Overflow ); // ( Q0 + Q0 + Q1 ) --> Q1 due to left shift in L_mac
-#endif
}
wb_ener_fx = L_add( Mpy_32_16_1( wb_ener_fx, 128 ), 1 ); /* 128 in Q15, wb_ener_fx in Q1 */
@@ -3047,11 +2983,7 @@ static Word16 shb_DTX_ivas_fx(
exp = sub( 30 - 1, exp );
wb_ener_fx = Mpy_32_16( exp, fra, LG10 );
-#ifdef ISSUE_1867_replace_overflow_libenc
log_wb_ener_fx = round_fx_sat( L_shl_sat( wb_ener_fx, 10 ) ); /* log_wb_ener_fx in Q8 */
-#else
- log_wb_ener_fx = round_fx_o( L_shl_o( wb_ener_fx, 10, &Overflow ), &Overflow ); /* log_wb_ener_fx in Q8 */
-#endif
exp = norm_l( shb_ener_fx );
fra = Log2_norm_lc( L_shl( shb_ener_fx, exp ) );
exp = sub( 30 - 1, exp );
@@ -3075,11 +3007,7 @@ static Word16 shb_DTX_ivas_fx(
move16();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
log_shb_ener_fx = sub_sat( round_fx_sat( L_shl_sat( shb_ener_fx, 10 ) ), att_fx ); /* log_shb_ener_fx in Q8 */
-#else
- log_shb_ener_fx = sub_o( round_fx_o( L_shl_o( shb_ener_fx, 10, &Overflow ), &Overflow ), att_fx, &Overflow ); /* log_shb_ener_fx in Q8 */
-#endif
IF( st->hDtxEnc->first_CNG == 0 )
{
diff --git a/lib_enc/cod2t32_fx.c b/lib_enc/cod2t32_fx.c
index 156b38ce491a042e737d03d6ee5a89d8bd9b3f04..f4dbad642052e26ed32a07cd761cfe209d218211 100644
--- a/lib_enc/cod2t32_fx.c
+++ b/lib_enc/cod2t32_fx.c
@@ -47,12 +47,7 @@ void acelp_2t32_fx(
Word32 L_tmp;
Word16 rrixix[NB_TRACK_FCB_2T][NB_POS_FCB_2T];
Word16 rrixiy[MSIZE];
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
/*----------------------------------------------------------------*
* Compute rrixix[][] needed for the codebook search.
*----------------------------------------------------------------*/
@@ -65,19 +60,11 @@ void acelp_2t32_fx(
L_cor = L_deposit_h( 1 );
FOR( i = 0; i < NB_POS_FCB_2T; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_cor = L_mac_sat( L_cor, *ptr_h1, *ptr_h1 );
-#else
- L_cor = L_mac_o( L_cor, *ptr_h1, *ptr_h1, &Overflow );
-#endif
ptr_h1++;
*p1-- = extract_h( L_cor );
move16(); /*Q9 Q7*/
-#ifdef ISSUE_1867_replace_overflow_libenc
L_cor = L_mac_sat( L_cor, *ptr_h1, *ptr_h1 );
-#else
- L_cor = L_mac_o( L_cor, *ptr_h1, *ptr_h1, &Overflow );
-#endif
ptr_h1++;
*p0-- = extract_h( L_cor );
move16(); /*Q9 Q7*/
@@ -118,28 +105,17 @@ void acelp_2t32_fx(
L_cor = L_mult( *ptr_h1++, *ptr_h2++ ); // Q(12+12+1)
FOR( i = k; i < NB_POS_FCB_2T - 1; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
*p1 = round_fx_sat( L_cor ); // Q(25-16)
L_cor = L_mac_sat( L_cor, *ptr_h1++, *ptr_h2++ );
*p0 = round_fx_sat( L_cor ); // Q(9)
L_cor = L_mac_sat( L_cor, *ptr_h1++, *ptr_h2++ );
-#else
- *p1 = round_fx_o( L_cor, &Overflow ); // Q(25-16)
- L_cor = L_mac_o( L_cor, *ptr_h1++, *ptr_h2++, &Overflow );
- *p0 = round_fx_o( L_cor, &Overflow ); // Q(9)
- L_cor = L_mac_o( L_cor, *ptr_h1++, *ptr_h2++, &Overflow );
-#endif
move16();
move16();
p1 -= ( NB_POS_FCB_2T + 1 );
p0 -= ( NB_POS_FCB_2T + 1 );
}
-#ifdef ISSUE_1867_replace_overflow_libenc
*p1 = round_fx_sat( L_cor ); // Q9
-#else
- *p1 = round_fx_o( L_cor, &Overflow ); // Q9
-#endif
pos -= NB_POS_FCB_2T;
move16();
pos2--;
@@ -242,15 +218,9 @@ void acelp_2t32_fx(
FOR( i1 = 1; i1 < L_SUBFR; i1 += STEP )
{
ps2 = add( ps1, dn_p[i1] );
-#ifdef ISSUE_1867_replace_overflow_libenc
alp2 = add_sat( alp1, add_sat( *p1++, *p2++ ) );
sq = mult( ps2, ps2 );
s = L_msu_sat( L_mult( alpk, sq ), psk, alp2 );
-#else
- alp2 = add_o( alp1, add_o( *p1++, *p2++, &Overflow ), &Overflow );
- sq = mult( ps2, ps2 );
- s = L_msu_o( L_mult( alpk, sq ), psk, alp2, &Overflow );
-#endif
IF( s > 0 )
{
psk = sq;
@@ -323,6 +293,8 @@ void acelp_2t32_fx(
}
return;
}
+
+
/*----------------------------------------------------------------------------------
* Function acelp_1t64()
*
@@ -333,19 +305,21 @@ void acelp_2t32_fx(
*----------------------------------------------------------------------------------*/
void acelp_1t64_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- const Word16 dn[], /* i : corr. between target and h[]. Qx*/
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ const Word16 dn[], /* i : corr. between target and h[]. Qx*/
const Word16 h[], /* i : impulse response of weighted synthesis filter Q12 */
- Word16 code[], /* o : algebraic (fixed) codebook excitation Q9 */
- Word16 y[], /* o : filtered fixed codebook excitation Q9 */
- const Word16 L_subfr /* i : subframe length */
+ Word16 code[], /* o : algebraic (fixed) codebook excitation Q9 */
+ Word16 y[], /* o : filtered fixed codebook excitation Q9 */
+ const Word16 L_subfr /* i : subframe length */
)
{
Word16 i, pos, sgn, index;
Word32 L_tmp;
+
/*-------------------------------------------------------------------*
* Find position and sign of maximum impulse.
*-------------------------------------------------------------------*/
+
pos = emaximum_fx( 0, dn, L_subfr, &L_tmp );
IF( dn[pos] < 0 )
diff --git a/lib_enc/cod4t64_fx.c b/lib_enc/cod4t64_fx.c
index d0bb15cc7a8d07740b8bec88d1ab73d30bfe15be..4d342eeb4c72303265286e6401984aeb64037f19 100644
--- a/lib_enc/cod4t64_fx.c
+++ b/lib_enc/cod4t64_fx.c
@@ -66,11 +66,9 @@ Word16 acelp_4t64_fx(
Word16 y[], /* o : filtered fixed codebook excitation Q9*/
Word16 nbbits, /* i : number of bits per codebook */
const Word16 cmpl_flag, /* i : complexity reduction flag */
- const Word16 Opt_AMR_WB /* i : flag indicating AMR-WB IO mode */
- ,
+ const Word16 Opt_AMR_WB, /* i : flag indicating AMR-WB IO mode */
const Word16 element_mode )
{
-
Word16 i, k, index, track;
Word32 L_index;
Word16 ind[NPMAXPT * NB_TRACK_FCB_4T + 32]; /* VE3: why +32 ???*/
@@ -468,14 +466,16 @@ Word16 acelp_4t64_fx(
return saved_bits;
}
+
/*---------------------------------------------------------------------*
*encode class for 3p 4p 5p 6p/track *
*---------------------------------------------------------------------*/
-static Word32 fcb_encode_cl_fx( /* o: class index of the pulse on a track */
- const Word32 buffer[], /* i: pulses on a track */
- const Word32 pulse_num, /* i: pulses number on a track */
- const Word32 pos_num /* i: number of the position which have pulse */
+/* o: comfort noise gain factor */
+static Word32 fcb_encode_cl_fx(
+ const Word32 buffer[], /* i : pulses on a track */
+ const Word32 pulse_num, /* i : pulses number on a track */
+ const Word32 pos_num /* i : number of the position which have pulse */
)
{
Word32 i, k;
@@ -500,9 +500,11 @@ static Word32 fcb_encode_cl_fx( /* o: class index of t
/*---------------------------------------------------------------------*
*encode fcb pulse index *
*---------------------------------------------------------------------*/
-static Word32 fcb_encode_PI_fx( /* o: return index of the pulse on a track */
- const Word16 v[], /* i: pulse on a track Q9 */
- const Word32 pulse_num /* i: number of the pulse on a track */
+
+/* o: return index of the pulse on a track */
+static Word32 fcb_encode_PI_fx(
+ const Word16 v[], /* i : pulse on a track Q9 */
+ const Word32 pulse_num /* i : number of the pulse on a track */
)
{
Word16 sector_p[7];
@@ -528,10 +530,12 @@ static Word32 fcb_encode_PI_fx( /* o: return index of t
/*---------------------------------------------------------------------*
*encode the class and compute class offset *
*---------------------------------------------------------------------*/
-static Word32 fcb_encode_class_fx( /* o: class offset */
- const Word32 sector_6p_num[], /* i: position which have pulse on a track */
- const Word32 pulse_num, /* i: pulse number on a track */
- const Word32 pulse_pos_num /* i: number of position which have pulse on a track */
+
+/* o: class offset */
+static Word32 fcb_encode_class_fx(
+ const Word32 sector_6p_num[], /* i : position which have pulse on a track */
+ const Word32 pulse_num, /* i : pulse number on a track */
+ const Word32 pulse_pos_num /* i : number of position which have pulse on a track */
)
{
Word32 i, j, k;
@@ -561,14 +565,18 @@ static Word32 fcb_encode_class_fx( /* o: class o
}
return mn9_offet;
}
+
+
/*---------------------------------------------------------------------*
*encode the position *
*---------------------------------------------------------------------*/
-static Word32 fcb_encode_position_fx( /* o: return index of the positions which have pulse*/
- const Word16 pos_vector[], /* i: position of the pulse on a track */
- Word32 n,
- const Word32 pos_num, /* i: the number of position which have pulse */
- const Word32 flag )
+
+/* o: return index of the positions which have pulse*/
+static Word32 fcb_encode_position_fx(
+ const Word16 pos_vector[], /* i: position of the pulse on a track */
+ Word32 n,
+ const Word32 pos_num, /* i: the number of position which have pulse */
+ const Word32 flag )
{
Word32 i;
Word32 mmm1;
@@ -600,20 +608,17 @@ static Word32 fcb_encode_position_fx( /* o: return
return mmm1;
}
-/*-------------------------------------------------------------------*
- * search_ixiy
- *
- * Find the best positions of 2 pulses in a subframe
- *-------------------------------------------------------------------*/
/*------------------------------------------------------------*
* quant_1p_N1
*
* Quantization of 1 pulse with N+1 bits:
*-------------------------------------------------------------*/
-static Word16 quant_1p_N1_fx( /* o : return N+1 bits */
- const Word16 pos, /* i : position of the pulse */
- const Word16 N /* i : number of bits FOR position */
+
+/* o : return N+1 bits */
+static Word16 quant_1p_N1_fx(
+ const Word16 pos, /* i : position of the pulse */
+ const Word16 N /* i : number of bits FOR position */
)
{
Word16 mask;
@@ -627,6 +632,7 @@ static Word16 quant_1p_N1_fx( /* o : return N+1 bits
{
index = add( index, shl( 1, N ) ); /* index += 1 << N */
}
+
return index;
}
@@ -635,11 +641,15 @@ static Word16 quant_1p_N1_fx( /* o : return N+1 bits
* quant_2p_2N1_fx
*
* Quantization of 2 pulses with 2*N+1 bits:
+
+
*-------------------------------------------------------------*/
-Word16 quant_2p_2N1_fx( /* o: return (2*N)+1 bits */
- const Word16 pos1, /* i: position of the pulse 1 */
- const Word16 pos2, /* i: position of the pulse 2 */
- const Word16 N /* i: number of bits FOR position */
+
+/* o: return (2*N)+1 bits */
+Word16 quant_2p_2N1_fx(
+ const Word16 pos1, /* i : position of the pulse 1 */
+ const Word16 pos2, /* i : position of the pulse 2 */
+ const Word16 N /* i : number of bits FOR position */
)
{
Word16 mask, tmp;
@@ -701,23 +711,29 @@ Word16 quant_2p_2N1_fx( /* o: return (2*N)+1 bits */
return index;
}
+
+
/*---------------------------------------------------------------------*
* Quantization of 3 pulses with 3*N+1 bits: *
*---------------------------------------------------------------------*/
-static Word16 quant_3p_3N1_fx( /* o : return (3*N)+1 bits */
- const Word16 pos1, /* i : position of the pulse 1 */
- const Word16 pos2, /* i : position of the pulse 2 */
- const Word16 pos3, /* i : position of the pulse 3 */
- const Word16 N /* i : number of bits for position */
+
+/* o : return (3*N)+1 bits */
+static Word16 quant_3p_3N1_fx(
+ const Word16 pos1, /* i : position of the pulse 1 */
+ const Word16 pos2, /* i : position of the pulse 2 */
+ const Word16 pos3, /* i : position of the pulse 3 */
+ const Word16 N /* i : number of bits for position */
)
{
Word16 nb_pos;
Word16 index;
nb_pos = shl( 1, sub( N, 1 ) ); /* nb_pos = (1<<(N-1)); */
+
/*-------------------------------------------------------*
* Quantization of 3 pulses with 3*N+1 bits: *
*-------------------------------------------------------*/
+
logic16();
logic16();
logic16();
@@ -752,24 +768,30 @@ static Word16 quant_3p_3N1_fx( /* o : return (3*N)+1 bits
}
return ( index );
}
+
+
/*---------------------------------------------------------------------*
* Quantization of 4 pulses with 4*N+1 bits: *
*---------------------------------------------------------------------*/
-static Word32 quant_4p_4N1_fx( /* o : return (4*N)+1 bits */
- const Word16 pos1, /* i : position of the pulse 1 */
- const Word16 pos2, /* i : position of the pulse 2 */
- const Word16 pos3, /* i : position of the pulse 3 */
- const Word16 pos4, /* i : position of the pulse 4 */
- const Word16 N /* i : number of bits for position */
+
+/* o : return (4*N)+1 bits */
+static Word32 quant_4p_4N1_fx(
+ const Word16 pos1, /* i : position of the pulse 1 */
+ const Word16 pos2, /* i : position of the pulse 2 */
+ const Word16 pos3, /* i : position of the pulse 3 */
+ const Word16 pos4, /* i : position of the pulse 4 */
+ const Word16 N /* i : number of bits for position */
)
{
Word16 nb_pos;
Word32 index;
nb_pos = shl( 1, sub( N, 1 ) ); /* nb_pos = (1<<(N-1)); */
+
/*-------------------------------------------------------*
* Quantization of 4 pulses with 4*N+1 bits: *
*-------------------------------------------------------*/
+
logic16();
logic16();
logic16();
@@ -801,15 +823,19 @@ static Word32 quant_4p_4N1_fx( /* o : return (4*N)+1 bits
/* index += quant_2p_2N1_fx(pos1, pos4, N) << (2*N); */
index = L_add( index, L_shl( quant_2p_2N1_fx( pos1, pos4, N ), shl( N, 1 ) ) );
}
+
return ( index );
}
+
+
/*---------------------------------------------------------------------*
* Quantization of 4 pulses with 4*N bits: *
*---------------------------------------------------------------------*/
-static Word32 quant_4p_4N_fx( /* o : return 4*N bits */
- const Word16 pos[], /* i : position of the pulse 1..4 */
- const Word16 N /* i : number of bits for position */
+/* o : return 4*N bits */
+static Word32 quant_4p_4N_fx(
+ const Word16 pos[], /* i : position of the pulse 1..4 */
+ const Word16 N /* i : number of bits for position */
)
{
Word16 i, j, k, nb_pos, n_1, tmp;
@@ -881,9 +907,10 @@ static Word32 quant_4p_4N_fx( /* o : return 4*N bits
}
-static Word32 quant_5p_5N_fx( /* o : return 5*N bits */
- const Word16 pos[], /* i : position of the pulse 1..5 */
- const Word16 N ) /* i : number of bits for position */
+/* o : return 5*N bits */
+static Word32 quant_5p_5N_fx(
+ const Word16 pos[], /* i : position of the pulse 1..5 */
+ const Word16 N ) /* i : number of bits for position */
{
Word16 i, j, k, nb_pos, n_1, tmp;
Word16 posA[5], posB[5];
@@ -961,9 +988,11 @@ static Word32 quant_5p_5N_fx( /* o : return 5*N bits
return ( index );
}
-static Word32 quant_6p_6N_2_fx( /* o : return (6*N)-2 bits */
- const Word16 pos[], /* i : position of the pulse 1..6 */
- const Word16 N ) /* i : number of bits for position */
+
+/* o : return (6*N)-2 bits */
+static Word32 quant_6p_6N_2_fx(
+ const Word16 pos[], /* i : position of the pulse 1..6 */
+ const Word16 N ) /* i : number of bits for position */
{
Word16 i, j, k, nb_pos, n_1;
Word16 posA[6], posB[6];
@@ -1047,11 +1076,13 @@ static Word32 quant_6p_6N_2_fx( /* o : return (6*N)-2 bits
/*---------------------------------------------------------------------*
*order the pulse position *
*---------------------------------------------------------------------*/
-static Word32 pre_process_fx( /* o: return sign value of pulse on a track */
- const Word16 v[], /* i: the pulse vector Q9 */
- Word16 pos_vector[], /* o: position of the pulse on a track */
- Word32 pos_vector_num[], /* o: the pulse number on the position which have pulse Q0 */
- Word32 *pulse_pos_num /* i: the number of position which have pulse */
+
+/* o: return sign value of pulse on a track */
+static Word32 pre_process_fx(
+ const Word16 v[], /* i : the pulse vector Q9 */
+ Word16 pos_vector[], /* o : position of the pulse on a track */
+ Word32 pos_vector_num[], /* o : the pulse number on the position which have pulse Q0 */
+ Word32 *pulse_pos_num /* i : the number of position which have pulse */
)
{
Word16 j, k;
diff --git a/lib_enc/cod_ace_fx.c b/lib_enc/cod_ace_fx.c
index dc139873ad53da9cfcfcfdc1cb8851228ee454bc..5a6e094a23441de7546cf27d688c247dae0b5137 100644
--- a/lib_enc/cod_ace_fx.c
+++ b/lib_enc/cod_ace_fx.c
@@ -75,12 +75,6 @@ Word16 coder_acelp_fx( /* o : SEGSNR for CL decision *
Word16 dummy = 0;
move16();
ACELP_config *acelp_cfg;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
acelp_cfg = &( st->acelp_cfg );
LPD_state_HANDLE hLPDmem = st->hLPDmem;
@@ -353,39 +347,25 @@ Word16 coder_acelp_fx( /* o : SEGSNR for CL decision *
Ltmp = Mpy_32_16_1( gain_code2, code2[i] );
Ltmp = L_shl( Ltmp, Q_new_p5 );
Ltmp = L_mac( Ltmp, gain_pit, exc[i + i_subfr] );
-#ifdef ISSUE_1867_replace_overflow_libenc
exc2[i] = round_fx_sat( L_shl_sat( Ltmp, 1 ) );
-#else
- exc2[i] = round_fx_sat( L_shl_o( Ltmp, 1, &Overflow ) );
-#endif
move16();
Ltmp2 = Mpy_32_16_1( gain_code, code[i] );
Ltmp2 = L_shl_sat( Ltmp2, Q_new_p5 );
Ltmp = L_add_sat( Ltmp, Ltmp2 );
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp = L_shl_sat( Ltmp, 1 ); /* saturation can occur here */
exc[i + i_subfr] = round_fx_sat( Ltmp );
-#else
- Ltmp = L_shl_o( Ltmp, 1, &Overflow ); /* saturation can occur here */
- exc[i + i_subfr] = round_fx_o( Ltmp, &Overflow );
-#endif
move16();
}
+
/*-----------------------------------------------------------------*
* Prepare TBE excitation
*-----------------------------------------------------------------*/
IF( st->igf != 0 )
{
-#ifdef FIX_2010_PREP_TBE_EXC
prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
bwe_exc, gain_preQ, code_preQ, Q10, Q_new, T0, T0_frac, st->coder_type, st->core_brate,
st->element_mode, st->idchan, st->hBWE_TD != NULL, st->tdm_LRTD_flag );
-#else
- prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
- bwe_exc, gain_preQ, code_preQ, Q_new, T0, T0_frac, st->coder_type, st->core_brate,
- st->element_mode, st->idchan, st->hBWE_TD != NULL, st->tdm_LRTD_flag );
-#endif
}
/*---------------------------------------------------------*
diff --git a/lib_enc/cod_tcx_fx.c b/lib_enc/cod_tcx_fx.c
index a08a81c4afe7c10466b3556d59874ffbe3e96237..1e01d8c3c621eb7cbfe443bcb8f2f9bc82512a75 100644
--- a/lib_enc/cod_tcx_fx.c
+++ b/lib_enc/cod_tcx_fx.c
@@ -1272,12 +1272,6 @@ void QuantizeSpectrum_fx(
Word16 nz; /* non-zero length in ALDO window*/
CONTEXT_HM_CONFIG *phm_cfg;
TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Flag Overflow = 0;
- Flag Carry = 0;
-#endif
-#endif
/* Stack memory is split between encoder and internal decoder to reduce max
stack memory usage. */
@@ -1841,29 +1835,19 @@ void QuantizeSpectrum_fx(
/* Save quantized Values */
tmp32 = L_deposit_l( 0 );
move16();
-#ifdef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
Word64 seed = 0;
move64();
-#endif
FOR( i = 0; i < L_spec; i++ )
{
spectrum[i] = L_mult( sqQ[i], 1 << ( 30 - SPEC_EXP_DEC ) );
move32();
/* noise filling seed */
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- tmp32 = L_macNs_co( tmp32, abs_s( sqQ[i] ), i, &Carry, &Overflow );
-#else
seed = W_mac_16_16( seed, abs_s( sqQ[i] ), i );
-#endif
}
*spectrum_e = SPEC_EXP_DEC;
move16();
-#ifdef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
nf_seed = extract_l( W_extract_l( seed ) ); // Q0
-#else
- nf_seed = extract_l( tmp32 );
-#endif
}
ELSE /* low rates: new arithmetic coder */
{
@@ -2913,14 +2897,7 @@ void QuantizeTCXSpectrum_fx(
CONTEXT_HM_CONFIG *phm_cfg;
Word16 att_fx = 0;
move16();
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Flag Overflow = 0;
- move16();
- Flag Carry = 0;
- move16();
-#endif
-#endif
+
/*-----------------------------------------------------------*
* Init *
*-----------------------------------------------------------*/
@@ -3537,31 +3514,19 @@ void QuantizeTCXSpectrum_fx(
move16();
}
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- tmp32 = L_deposit_l( 0 );
-#else
Word64 tmp64 = 0;
-#endif
FOR( i = 0; i < L_spec; i++ )
{
spectrum_fx[i] = L_mult( sqQ[i], 1 << ( 30 - SPEC_EXP_DEC ) );
move32();
/* noise filling seed */
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- tmp32 = L_macNs_co( tmp32, abs_s( sqQ[i] ), i, &Carry, &Overflow );
-#else
tmp64 = W_mac_16_16( tmp64, abs_s( sqQ[i] ), i );
-#endif
}
*spectrum_e = SPEC_EXP_DEC;
move16();
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- *nf_seed = extract_l( tmp32 );
-#else
assert( W_extract_h( tmp64 ) == 0 );
*nf_seed = extract_l( W_extract_l( tmp64 ) );
-#endif
}
ELSE
{
diff --git a/lib_enc/core_enc_ol_fx.c b/lib_enc/core_enc_ol_fx.c
index 2483fe95d7dfd61525827fcbe15d94cdb8d96aa9..c26905199f00fb3652f400721a64767fe3d2fb77 100644
--- a/lib_enc/core_enc_ol_fx.c
+++ b/lib_enc/core_enc_ol_fx.c
@@ -80,13 +80,6 @@ void core_encode_openloop_fx(
Word16 lsp_old_q_rf[M + 1], lsf_old_q_rf[M + 1];
(void) vad_hover_flag;
(void) vad_flag_dtx;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
RF_ENC_HANDLE hRF = st->hRF;
@@ -553,11 +546,7 @@ void core_encode_openloop_fx(
/*v_sub(lsf_uq_rf, lsf_q_1st_rf, lsf_q_d_rf, M);*/
FOR( i = 0; i < M; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
lsf_q_d_rf[i] = shl_sat( mult_r( sub_sat( lsf_uq_rf[i], lsf_q_1st_rf[i] ), 25600 ), 5 );
-#else
- lsf_q_d_rf[i] = shl_sat( mult_r( sub_o( lsf_uq_rf[i], lsf_q_1st_rf[i], &Overflow ), 25600 ), 5 );
-#endif
move16();
/*input value is in Qx2.56, convert to Q6 to match table, quantizer table kept at Q6 to avoid losing precision */
/*Assume this difference data max range can be represented by Q6*/
@@ -758,12 +747,6 @@ static void closest_centroid_rf(
Word16 tmp, tmpL;
Word64 werr_64;
Word32 L_tmp, best_werr, werr;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
ind_vec[0] = 0;
move16();
@@ -778,13 +761,8 @@ static void closest_centroid_rf(
tmpL = i_mult2( i, length );
FOR( j = 0; j < length; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = sub_sat( data[j], quantizer[tmpL + j] );
L_tmp = L_mult_sat( tmp, tmp );
-#else
- tmp = sub_o( data[j], quantizer[tmpL + j], &Overflow );
- L_tmp = L_mult_o( tmp, tmp, &Overflow );
-#endif
werr_64 = W_mac_32_16( werr_64, L_tmp, weights[j] );
}
werr = W_sat_m( werr_64 );
@@ -836,12 +814,6 @@ void core_acelp_tcx20_switching_fx(
Word16 snr_tcx, snr_acelp, dsnr;
TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
SP_MUS_CLAS_HANDLE hSpMusClas = st->hSpMusClas;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* Check minimum pitch for quantization */
FOR( i = 0; i < 3; i++ )
@@ -1117,11 +1089,7 @@ void core_acelp_tcx20_switching_fx(
FOR( j = 0; j < L_SUBFR; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp32 = L_mac0_sat( tmp32, st->wspeech_enc[i + j], st->wspeech_enc[i + j] );
-#else
- tmp32 = L_mac0_o( tmp32, st->wspeech_enc[i + j], st->wspeech_enc[i + j], &Overflow );
-#endif
}
tmp32 = L_shr( BASOP_Util_Log2( tmp32 ), 9 ); /* 15Q16 */
tmp32 = L_add( tmp32, L_sub( 0x1F0000, L_shl( L_deposit_h( add( Q_new, sub( shift, 1 ) ) ), 1 ) ) ); /* wspeech_enc scaling */
@@ -1139,11 +1107,7 @@ void core_acelp_tcx20_switching_fx(
tcx_snr = L_shl( Mpy_32_16_1( tcx_snr, 0x6054 ), 2 ); /* 0x6054 -> 10/log2(10) (2Q13) */
BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef ISSUE_1867_replace_overflow_libenc
snr_tcx = round_fx_sat( L_shl_sat( tcx_snr, 8 ) ); /* 7Q8 */
-#else
- snr_tcx = round_fx_o( L_shl_o( tcx_snr, 8, &Overflow ), &Overflow ); /* 7Q8 */
-#endif
BASOP_SATURATE_WARNING_ON_EVS
/*--------------------------------------------------------------*
@@ -1177,19 +1141,11 @@ void core_acelp_tcx20_switching_fx(
FOR( j = 0; j < L_SUBFR; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
signal = L_mac0_sat( signal, st->wspeech_enc[i + j], st->wspeech_enc[i + j] );
tmp16 = round_fx_sat( L_shl_sat( Mpy_32_16_r( gain, st->wspeech_enc[i + j - T0] ), 15 ) );
tmp16 = sub_sat( st->wspeech_enc[i + j], tmp16 );
noise = L_mac0_sat( noise, tmp16, tmp16 );
-#else
- signal = L_mac0_o( signal, st->wspeech_enc[i + j], st->wspeech_enc[i + j], &Overflow );
-
- tmp16 = round_fx_o( L_shl_o( Mpy_32_16_r( gain, st->wspeech_enc[i + j - T0] ), 15, &Overflow ), &Overflow );
- tmp16 = sub_o( st->wspeech_enc[i + j], tmp16, &Overflow );
- noise = L_mac0_o( noise, tmp16, tmp16, &Overflow );
-#endif
}
/* Assume always 4 sub frames. */
/*assert( (st->L_frame / L_SUBFR) == 4);*/
@@ -1242,11 +1198,7 @@ void core_acelp_tcx20_switching_fx(
test();
if ( ( GT_16( snr_acelp, snr_tcx ) ) &&
( LT_16( snr_acelp, add( snr_tcx, 512 /*2.0f Q8*/ ) ) ) &&
-#ifdef ISSUE_1867_replace_overflow_libenc
( LT_16( add_sat( st->prevTempFlatness_fx, currFlatness ), 416 /*3.25f Q7*/ ) || EQ_16( stab_fac, 0x7fff /*1 Q15*/ ) ||
-#else
- ( LT_16( add_o( st->prevTempFlatness_fx, currFlatness, &Overflow ), 416 /*3.25f Q7*/ ) || EQ_16( stab_fac, 0x7fff /*1 Q15*/ ) ||
-#endif
( EQ_32( st->sr_core, INT_FS_12k8 ) && EQ_16( st->sp_aud_decision0, 1 ) && LT_16( add_sat( st->prevTempFlatness_fx, currFlatness ), 2560 /*20.f Q7*/ ) ) ) &&
( LE_16( st->acelpFramesCount, 6 ) ) )
{
diff --git a/lib_enc/corr_xh_fx.c b/lib_enc/corr_xh_fx.c
index 135d560d16fd5005c0ee426840836d377042b6b3..21af7bc0a75da31e16fc522af9f3d4562a33cd13 100644
--- a/lib_enc/corr_xh_fx.c
+++ b/lib_enc/corr_xh_fx.c
@@ -31,12 +31,6 @@ void corr_xh_fx(
{
Word16 i, j, k;
Word32 L_tmp, y32[L_SUBFR], L_maxloc, L_tot;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
/* first keep the result on 32 bits and find absolute maximum */
L_tot = L_deposit_l( 1 );
@@ -49,11 +43,7 @@ void corr_xh_fx(
L_tmp = L_mac( 1L, x[i], h[0] ); /* 1 -> to avoid null dn[] Qx+15*/
FOR( j = i; j < L_SUBFR - 1; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac_sat( L_tmp, x[j + 1], h[j + 1 - i] ); /*Qx+15*/
-#else
- L_tmp = L_mac_o( L_tmp, x[j + 1], h[j + 1 - i], &Overflow ); /*Qx+15*/
-#endif
}
y32[i] = L_tmp; /*Qx+15*/
@@ -63,13 +53,8 @@ void corr_xh_fx(
}
/* tot += 3*max / 8 */
L_maxloc = L_shr( L_maxloc, 2 );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tot = L_add_sat( L_tot, L_maxloc ); /* +max/4 */
L_tot = L_add_sat( L_tot, L_shr( L_maxloc, 1 ) ); /* +max/8 */
-#else
- L_tot = L_add_o( L_tot, L_maxloc, &Overflow ); /* +max/4 */
- L_tot = L_add_o( L_tot, L_shr( L_maxloc, 1 ), &Overflow ); /* +max/8 */
-#endif
}
/* Find the number of right shifts to do on y32[] so that */
@@ -93,12 +78,6 @@ void corr_hh_ivas_fx(
{
Word16 i, j, k;
Word32 L_tmp, y32[L_SUBFR * 2], L_maxloc, L_tot;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
/* first keep the result on 32 bits and find absolute maximum */
L_tot = L_deposit_l( 1 );
@@ -111,11 +90,7 @@ void corr_hh_ivas_fx(
L_tmp = L_mac( 1L, shr( h[i], 3 ), shr( h[0], 3 ) ); /* 1 -> to avoid null dn[] */ // 2*(15 - norm_s(h[0]) -3) - 1
FOR( j = i; j < L_subfr - 1; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac_sat( L_tmp, shr( h[j + 1], 3 ), shr( h[j + 1 - i], 3 ) ); // 2*(15 - norm_s(h[0]) -3) - 1 //?sat
-#else
- L_tmp = L_mac_o( L_tmp, shr( h[j + 1], 3 ), shr( h[j + 1 - i], 3 ), &Overflow ); // 2*(15 - norm_s(h[0]) -3) - 1
-#endif
}
y32[i] = L_tmp; // 2*(15 - norm_s(h[0]) -3) - 1
@@ -125,13 +100,8 @@ void corr_hh_ivas_fx(
}
/* tot += 3*max / 8 */
L_maxloc = L_shr( L_maxloc, 2 );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tot = L_add_sat( L_tot, L_maxloc ); /* +max/4 */
L_tot = L_add_sat( L_tot, L_shr( L_maxloc, 1 ) ); /* +max/8 */
-#else
- L_tot = L_add_o( L_tot, L_maxloc, &Overflow ); /* +max/4 */
- L_tot = L_add_o( L_tot, L_shr( L_maxloc, 1 ), &Overflow ); /* +max/8 */
-#endif
}
/* Find the number of right shifts to do on y32[] so that */
@@ -161,12 +131,6 @@ void corr_xh_ivas_fx(
{
Word16 i, j, k;
Word32 L_tmp, y32[L_SUBFR * 2], L_maxloc, L_tot;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
/* first keep the result on 32 bits and find absolute maximum */
L_tot = L_deposit_l( 0 );
@@ -179,11 +143,7 @@ void corr_xh_ivas_fx(
L_tmp = L_mac( 0, x[i], h[0] ); // Qx+(14 - norm_s(h[0])) + 1
FOR( j = i; j < L_subfr - 1; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac_sat( L_tmp, x[j + 1], h[j + 1 - i] ); // Qx+(14 - norm_s(h[0])) + 1
-#else
- L_tmp = L_mac_o( L_tmp, x[j + 1], h[j + 1 - i], &Overflow ); // Qx+(14 - norm_s(h[0])) + 1
-#endif
}
y32[i] = L_tmp; // Qx+(14 - norm_s(h[0])) + 1
@@ -193,13 +153,8 @@ void corr_xh_ivas_fx(
}
/* tot += 3*max / 8 */
L_maxloc = L_shr( L_maxloc, 2 );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tot = L_add_sat( L_tot, L_maxloc ); /* +max/4 */
L_tot = L_add_sat( L_tot, L_shr( L_maxloc, 1 ) ); /* +max/8 */
-#else
- L_tot = L_add_o( L_tot, L_maxloc, &Overflow ); /* +max/4 */
- L_tot = L_add_o( L_tot, L_shr( L_maxloc, 1 ), &Overflow ); /* +max/8 */
-#endif
}
/* Find the number of right shifts to do on y32[] so that */
diff --git a/lib_enc/detect_transient_fx.c b/lib_enc/detect_transient_fx.c
index 8a95627042e909e9ff6cc187e94c10e814fb1b62..14a6d6c80b06ee3b070e2e2507b13f6bbf412914 100644
--- a/lib_enc/detect_transient_fx.c
+++ b/lib_enc/detect_transient_fx.c
@@ -62,41 +62,28 @@ static void hp_filter_fx(
{
Word16 i;
Word32 L_tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
/*y[0] = 0.4931f * *oldy + 0.7466f*(x[0] - *oldx); */
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mult( sub_sat( x[0], *oldx ), 24465 /*0.7466f in Q15*/ ); /*Q_new+16 */
-#else
- L_tmp = L_mult( sub_o( x[0], *oldx, &Overflow ), 24465 /*0.7466f in Q15*/ ); /*Q_new+16 */
-#endif
- L_tmp = L_mac_sat( L_tmp, *oldy, 16158 /*0.4931f in Q15*/ ); /*Q_new+16 */
- y[0] = round_fx_sat( L_tmp ); /*Q_new */
+ L_tmp = L_mac_sat( L_tmp, *oldy, 16158 /*0.4931f in Q15*/ ); /*Q_new+16 */
+ y[0] = round_fx_sat( L_tmp ); /*Q_new */
FOR( i = 1; i < L; i++ )
{
/*y[i] = 0.4931f*y[i-1] + 0.7466f*(x[i] - x[i-1]); */
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mult( sub_sat( x[i], x[i - 1] ), 24465 /*0.7466f in Q15*/ ); /*Q_new+16 */
L_tmp = L_mac_sat( L_tmp, y[i - 1], 16158 /*0.4931f in Q15*/ ); /*Q_new+16 */
y[i] = round_fx_sat( L_tmp ); /*Q_new */
-#else
- L_tmp = L_mult( sub_o( x[i], x[i - 1], &Overflow ), 24465 /*0.7466f in Q15*/ ); /*Q_new+16 */
- L_tmp = L_mac_o( L_tmp, y[i - 1], 16158 /*0.4931f in Q15*/, &Overflow ); /*Q_new+16 */
- y[i] = round_fx_o( L_tmp, &Overflow ); /*Q_new */
-#endif
}
*oldx = x[L - 1];
move16(); /*Q_new */
*oldy = y[L - 1];
move16(); /*Q_new */
+
+ return;
}
+
+
/*--------------------------------------------------------------------------*/
/* Function detect_transient */
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -129,11 +116,9 @@ Word16 detect_transient_fx(
Word32 E_low_fx, E_high_fx;
Word16 temp16, Thres_fx = 0;
Word16 exp;
-#ifdef ISSUE_1867_replace_overflow_libenc
#ifdef BASOP_NOGLOB_DECLARE_LOCAL
Flag Overflow = 0;
move32();
-#endif
#endif
shift = 0;
@@ -165,11 +150,7 @@ Word16 detect_transient_fx(
FOR( i = 0; i < L / 4; i++ )
{
/*EnergyLT += out_filt[i] * out_filt[i]; */
-#ifdef ISSUE_1867_replace_overflow_libenc
EnergyLT = L_mac0_sat( EnergyLT, out_filt_fx[i], out_filt_fx[i] ); /*2Q_new */
-#else
- EnergyLT = L_mac0_o( EnergyLT, out_filt_fx[i], out_filt_fx[i], &Overflow ); /*2Q_new */
-#endif
}
}
ELSE
@@ -188,27 +169,14 @@ Word16 detect_transient_fx(
FOR( i = 0; i < L / 4; i++ )
{
temp16 = extract_l( L_shr( out_filt_fx[i + blk * ( L / 4 )], 12 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
Energy_fx = L_add_sat( Energy_fx, L_mult0( temp16, temp16 ) );
-#else
- Energy_fx = L_add_o( Energy_fx, L_mult0( temp16, temp16 ), &Overflow );
-#endif
- temp16 = shr( in_fx[i + blk * ( L / 4 )], Q_new ); /*Q0*/
-#ifdef ISSUE_1867_replace_overflow_libenc
+ temp16 = shr( in_fx[i + blk * ( L / 4 )], Q_new ); /*Q0*/
Energy_in_fx[blk + 1] = L_add_sat( Energy_in_fx[blk + 1], L_mult0( temp16, temp16 ) ); /*Q0*/
-#else
- Energy_in_fx[blk + 1] = L_add_o( Energy_in_fx[blk + 1], L_mult0( temp16, temp16 ), &Overflow ); /*Q0*/
-#endif
move32();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
E_in_fx = L_add_sat( E_in_fx, Energy_in_fx[blk + 1] ); /*Q0*/
E_out_fx = L_add_sat( E_out_fx, Energy_fx ); /*Q0*/
-#else
- E_in_fx = L_add_o( E_in_fx, Energy_in_fx[blk + 1], &Overflow ); /*Q0*/
- E_out_fx = L_add_o( E_out_fx, Energy_fx, &Overflow ); /*Q0*/
-#endif
Thres_fx = 2185; /*1 /15 Q15*/
move16();
@@ -232,21 +200,13 @@ Word16 detect_transient_fx(
FOR( i = 0; i < L / 8; i++ )
{
/*Energy += out_filt_fx[i + blk*(L/4)] * out_filt_fx[i + blk*(L/4)]; */
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac0_sat( L_tmp, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )] ); /*2Q_new */
-#else
- L_tmp = L_mac0_o( L_tmp, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )], &Overflow ); /*2Q_new */
-#endif
}
L_tmp2 = L_deposit_l( 0 );
FOR( ; i < L / 4; i++ )
{
/*Energy += out_filt_fx[i + blk*(L/4)] * out_filt_fx[i + blk*(L/4)]; */
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp2 = L_mac0_sat( L_tmp2, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )] ); /*2Q_new */
-#else
- L_tmp2 = L_mac0_o( L_tmp2, out_filt_fx[i + blk * ( L / 4 )], out_filt_fx[i + blk * ( L / 4 )], &Overflow ); /*2Q_new */
-#endif
}
Overflow = 0;
move16();
@@ -257,14 +217,7 @@ Word16 detect_transient_fx(
shift = 1;
move16();
}
-#ifndef ISSUE_1867_replace_overflow_libenc
- Overflow = 0;
- move16();
-
- Energy = L_add_o( L_shr( L_tmp, shift ), L_shr( L_tmp2, shift ), &Overflow ); /*2Q_new - shift*/
-#else
- Energy = L_add_sat( L_shr( L_tmp, shift ), L_shr( L_tmp2, shift ) ); /*2Q_new - shift*/
-#endif
+ Energy = L_add_sat( L_shr( L_tmp, shift ), L_shr( L_tmp2, shift ) ); /*2Q_new - shift*/
test();
IF( EQ_16( st_fx->extl, SWB_BWE ) || EQ_16( st_fx->extl, FB_BWE ) )
{
@@ -305,11 +258,7 @@ Word16 detect_transient_fx(
}
/*EnergyLT = 0.75f*EnergyLT + 0.25f*Energy; */
/*0.75f*EnergyLT in Q0 //0.25f*Energy in Q0 */
-#ifdef ISSUE_1867_replace_overflow_libenc
EnergyLT = L_add_sat( Mult_32_16( EnergyLT, 24576 /*0.75f in Q15*/ ), Mult_32_16( Energy, shl( 8192 /*0.25 in Q15*/, shift ) ) ); /*2Q_new */
-#else
- EnergyLT = L_add_o( Mult_32_16( EnergyLT, 24576 /*0.75f in Q15*/ ), Mult_32_16( Energy, shl( 8192 /*0.25 in Q15*/, shift ) ), &Overflow ); /*2Q_new */
-#endif
}
}
st_fx->EnergyLT_fx = EnergyLT;
diff --git a/lib_enc/dtx_fx.c b/lib_enc/dtx_fx.c
index 10ec0dd8bcb86f9468d70e8b96a4ef1744a22ed8..fa9da7f420e75fd0fa49db50cfddc897fa044bcf 100644
--- a/lib_enc/dtx_fx.c
+++ b/lib_enc/dtx_fx.c
@@ -78,12 +78,6 @@ void dtx_ivas_fx(
TD_CNG_ENC_HANDLE hTdCngEnc = st_fx->hTdCngEnc;
Word16 last_br_cng_flag, last_br_flag, br_dtx_flag;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
Word32 total_brate_ref;
total_brate_ref = st_fx->total_brate;
@@ -467,11 +461,7 @@ void dtx_ivas_fx(
speech++;
FOR( i = 1; i < L_FRAME / 16; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac0_sat( L_tmp, *speech, *speech ); /*2*Q_speech*/
-#else
- L_tmp = L_mac0_o( L_tmp, *speech, *speech, &Overflow ); /*2*Q_speech*/
-#endif
speech++;
}
hDtxEnc->frame_ener_fx = L_add( hDtxEnc->frame_ener_fx, L_shr( L_tmp, Q_speech2 ) ); /* Q(-7) */
@@ -641,12 +631,6 @@ void dtx_fx(
TD_CNG_ENC_HANDLE hTdCngEnc = st_fx->hTdCngEnc;
Word16 last_br_cng_flag, last_br_flag, br_dtx_flag;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
IF( st_fx->dtx_sce_sba != 0 )
{
@@ -943,11 +927,7 @@ void dtx_fx(
speech++;
FOR( i = 1; i < L_FRAME / 16; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac0_sat( L_tmp, *speech, *speech ); /*2*Q_speech*/
-#else
- L_tmp = L_mac0_o( L_tmp, *speech, *speech, &Overflow ); /*2*Q_speech*/
-#endif
speech++;
}
hDtxEnc->frame_ener_fx = L_add( hDtxEnc->frame_ener_fx, L_shr( L_tmp, Q_speech2 ) ); /*Q(-7) */
@@ -1252,11 +1232,6 @@ void dtx_hangover_control_fx(
VAD_HANDLE hVAD = st_fx->hVAD;
DTX_ENC_HANDLE hDtxEnc = st_fx->hDtxEnc;
TD_CNG_ENC_HANDLE hTdCngEnc = st_fx->hTdCngEnc;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/* get current frame exc energy in log2 */
exp = norm_l( hTdCngEnc->ho_ener_circ_fx[hTdCngEnc->ho_circ_ptr] );
@@ -1425,11 +1400,7 @@ void dtx_hangover_control_fx(
move16();
FOR( j = 0; j < m; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
lsp_est[i] = add_sat( lsp_est[i], tmp[j * M + i] ); /*Q15 */
-#else
- lsp_est[i] = add_o( lsp_est[i], tmp[j * M + i], &Overflow ); /*Q15 */
-#endif
}
lsp_est[i] = sub( lsp_est[i], tmp[max_idx[0] * M + i] ); /*Q15 */
@@ -1445,20 +1416,12 @@ void dtx_hangover_control_fx(
move16();
FOR( j = 0; j < m; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
lsp_est[i] = add_sat( lsp_est[i], tmp[j * M + i] ); /*Q15 */
-#else
- lsp_est[i] = add_o( lsp_est[i], tmp[j * M + i], &Overflow ); /*Q15 */
-#endif
}
-#ifdef ISSUE_1867_replace_overflow_libenc
lsp_est[i] = sub_sat( lsp_est[i], add_sat( tmp[max_idx[0] * M + i], tmp[max_idx[1] * M + i] ) ); /*Q15 */
-#else
- lsp_est[i] = sub_o( lsp_est[i], add_o( tmp[max_idx[0] * M + i], tmp[max_idx[1] * M + i], &Overflow ), &Overflow ); /*Q15 */
-#endif
- S_tmp = div_s( 1, sub( m, 2 ) ); /*Q15 */
- lsp_est[i] = mult_r( lsp_est[i], S_tmp ); /*Q15 */
+ S_tmp = div_s( 1, sub( m, 2 ) ); /*Q15 */
+ lsp_est[i] = mult_r( lsp_est[i], S_tmp ); /*Q15 */
}
}
@@ -1466,11 +1429,7 @@ void dtx_hangover_control_fx(
move16();
FOR( i = 0; i < M; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
- Dlsp_n2e = add_sat( Dlsp_n2e, abs_s( sub( lsp_new_fx[i], lsp_est[i] ) ) ); /*Q15 */
-#else
- Dlsp_n2e = add_o( Dlsp_n2e, abs_s( sub( lsp_new_fx[i], lsp_est[i] ) ), &Overflow ); /*Q15 */
-#endif
+ Dlsp_n2e = add_sat( Dlsp_n2e, abs_s( sub( lsp_new_fx[i], lsp_est[i] ) ) ); /*Q15 */
lsp_est[i] = add( mult_r( 26214, lsp_est[i] ), mult_r( 6554, lsp_new_fx[i] ) ); /*Q15 */
}
@@ -1483,11 +1442,7 @@ void dtx_hangover_control_fx(
FOR( i = 0; i < M; i++ )
{
S_tmp = abs_s( sub( hDtxEnc->lspCNG_fx[i], lsp_est[i] ) ); /*Q15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- Dlsp = add_sat( Dlsp, S_tmp ); /*Q15 */
-#else
- Dlsp = add_o( Dlsp, S_tmp, &Overflow ); /*Q15 */
-#endif
+ Dlsp = add_sat( Dlsp, S_tmp ); /*Q15 */
IF( GT_16( S_tmp, S_max ) )
{
S_max = S_tmp; /*Q15 */
diff --git a/lib_enc/enc_acelp_fx.c b/lib_enc/enc_acelp_fx.c
index 16d4bd260abb1cbc99d22605221e3f9859f2e134..ca4c399b0ec345672e3fd2bf5cafd04d0c73bda3 100644
--- a/lib_enc/enc_acelp_fx.c
+++ b/lib_enc/enc_acelp_fx.c
@@ -65,12 +65,6 @@ void E_ACELP_h_vec_corr1_fx(
Word16 *dn2;
Word16 *p0, *p1, *p2;
Word32 L_sum;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
dn2 = &dn2_pos[( track * 8 )]; /*Q0*/
p0 = rrixix[track]; /*Q9*/
@@ -84,41 +78,26 @@ void E_ACELP_h_vec_corr1_fx(
p2 = &vec[dn]; /*Qx*/
FOR( j = dn; j < L_SUBFR - 1; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_sum = L_mac_sat( L_sum, *p1++, *p2++ ); /*2*Qx+1*/
-#else
- L_sum = L_mac_o( L_sum, *p1++, *p2++, &Overflow ); /*2*Qx+1*/
-#endif
}
-#ifdef ISSUE_1867_replace_overflow_libenc
corr = mac_r_sat( L_sum, *p1++, *p2++ ); /*Q9*/
-#else
- corr = mac_ro( L_sum, *p1++, *p2++, &Overflow ); /*Q9*/
-#endif
/*cor[dn >> 2] = sign[dn] * s + p0[dn >> 2];*/
j = shr( dn, 2 );
if ( sign[dn] > 0 )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
corr = add_sat( p0[j], corr ); /*Q9*/
-#else
- corr = add_o( p0[j], corr, &Overflow ); /*Q9*/
-#endif
}
if ( sign[dn] < 0 )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
corr = sub_sat( p0[j], corr ); /*Q9*/
-#else
- corr = sub_o( p0[j], corr, &Overflow ); /*Q9*/
-#endif
}
cor[j] = corr; /*Q9*/
move16();
}
+
return;
}
@@ -134,12 +113,6 @@ void E_ACELP_h_vec_corr2_fx(
Word16 i, j, pos, corr;
Word16 *p0, *p1, *p2;
Word32 L_sum;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
p0 = rrixix[track]; /*Q9*/
@@ -152,21 +125,12 @@ void E_ACELP_h_vec_corr2_fx(
p2 = &vec[pos]; /*Qx*/
FOR( j = pos; j < L_SUBFR - 1; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_sum = L_mac_sat( L_sum, *p1++, *p2++ ); /* 2*Qx+1 */
-#else
- L_sum = L_mac_o( L_sum, *p1++, *p2++, &Overflow ); /* 2*Qx+1 */
-#endif
}
-#ifdef ISSUE_1867_replace_overflow_libenc
corr = mac_r_sat( L_sum, *p1++, *p2++ ); /*Q9*/
-#else
- corr = mac_ro( L_sum, *p1++, *p2++, &Overflow ); /*Q9*/
-#endif
/*cor[i] = s * sign[track] + p0[i];*/
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( sign[pos] > 0 )
{
corr = add_sat( *p0++, corr ); /*Q9*/
@@ -175,21 +139,12 @@ void E_ACELP_h_vec_corr2_fx(
{
corr = sub_sat( *p0++, corr ); /*Q9*/
}
-#else
- if ( sign[pos] > 0 )
- {
- corr = add_o( *p0++, corr, &Overflow ); /*Q9*/
- }
- if ( sign[pos] < 0 )
- {
- corr = sub_o( *p0++, corr, &Overflow ); /*Q9*/
- }
-#endif
cor[i] = corr; /*Q9*/
move16();
pos = add( pos, 4 );
}
+
return;
}
@@ -239,14 +194,6 @@ static void E_ACELP_2pulse_search(
Word32 xy_save;
Word16 check = 0; /* debug code not instrumented */
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
-
/* eight dn2 max positions per track */
/*pos_x = &dn2[track_x << 3]; SHIFT(1); PTR_INIT(1);*/
pos_x = &dn2[( track_x * 8 )]; /*Qdn*/
@@ -262,11 +209,7 @@ static void E_ACELP_2pulse_search(
sqk[0] = -1;
move16();
x2 = shr( pos_x[0], 2 ); /*Qdn*/
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( mac_r_sat( L_mac_sat( L_mac_sat( alp0, cor_x[x2], _1_ ), cor_y[0], _1_ ), rrixiy[track_x][( x2 * 16 )], _1_ ) < 0 )
-#else
- if ( mac_ro( L_mac_o( L_mac_o( alp0, cor_x[x2], _1_, &Overflow ), cor_y[0], _1_, &Overflow ), rrixiy[track_x][( x2 * 16 )], _1_, &Overflow ) < 0 )
-#endif
{
sqk[0] = 1;
move16();
@@ -286,11 +229,7 @@ static void E_ACELP_2pulse_search(
ps1 = add( ps0, dn[x] ); /*Qdn*/
/*alp1 = alp0 + cor_x[x2];*/
-#ifdef ISSUE_1867_replace_overflow_libenc
alp1 = L_mac_sat( alp0, cor_x[x2], _1_ ); /*Q22*/
-#else
- alp1 = L_mac_o( alp0, cor_x[x2], _1_, &Overflow ); /*Q22*/
-#endif
p1 = cor_y; /*Qx*/
p2 = &rrixiy[track_x][( x2 * 16 )]; /*Q9*/
@@ -302,14 +241,9 @@ static void E_ACELP_2pulse_search(
move16();
/*alp2 = alp1 + (*p1++) + (*p2++);*/
-#ifdef ISSUE_1867_replace_overflow_libenc
alp2 = L_mac_sat( alp1, *p1++, _1_ ); /*Qx+12+1*/
alp2_16 = mac_r_sat( alp2, *p2++, _1_ ); /*Q6*/
-#else
- alp2 = L_mac_o( alp1, *p1++, _1_, &Overflow ); /*Qx+12+1*/
- alp2_16 = mac_ro( alp2, *p2++, _1_, &Overflow ); /*Q6*/
-#endif
- alpk[1 - ik] = alp2_16; /*Q6*/
+ alpk[1 - ik] = alp2_16; /*Q6*/
move16();
/*sq = ps2 * ps2;*/
@@ -348,6 +282,7 @@ static void E_ACELP_2pulse_search(
*alp = alpk[ik]; /*Q6*/
move16();
+
return;
}
@@ -458,6 +393,7 @@ static void E_ACELP_1pulse_search(
move16();
*ix = x_save; /*Q0*/
move16();
+
return;
}
@@ -618,29 +554,16 @@ Word16 E_ACELP_xy1_corr_fx(
Word16 i, Q_xn;
Word16 xy, yy, exp_xy, exp_yy, gain;
Word32 L_off;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
L_off = L_shr( 10737418l /*0.01f/2.0f Q31*/, s_min( add( exp_xn, exp_xn ), 31 ) );
L_off = L_max( 1, L_off ); /* ensure at least a '1' */
/* Compute scalar product t1: */
-#ifdef ISSUE_1867_replace_overflow_libenc
yy = round_fx_sat( Dot_product15_offs( y1, y1, L_subfr, &exp_yy, L_off ) ); /*Q15 - exp_yy*/
-#else
- yy = round_fx_o( Dot_product15_offs( y1, y1, L_subfr, &exp_yy, L_off ), &Overflow ); /*Q15 - exp_yy*/
-#endif
/* Compute scalar product t0: */
-#ifdef ISSUE_1867_replace_overflow_libenc
xy = round_fx_sat( Dot_product12_offs( xn, y1, L_subfr, &exp_xy, L_off ) ); /*Q15 - exp_xy*/
-#else
- xy = round_fx_o( Dot_product12_offs( xn, y1, L_subfr, &exp_xy, L_off ), &Overflow ); /*Q15 - exp_xy*/
-#endif
+
/* Compute doubled format out of the exponent */
Q_xn = shl( sub( 15, exp_xn ), 1 );
g_corr->y1y1 = yy;
@@ -682,11 +605,7 @@ Word16 E_ACELP_xy1_corr_fx(
Word16 tmp, exp_tmp, exp_div;
/* Compute scalar product */
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = round_fx_sat( Dot_product12_offs( xn, xn, L_subfr, &exp_tmp, 1 ) ); /*Q15 - exp_tmp*/
-#else
- tmp = round_fx_o( Dot_product12_offs( xn, xn, L_subfr, &exp_tmp, 1 ), &Overflow ); /*Q15 - exp_tmp*/
-#endif
/* gain_p_snr = sqrt(/) */
tmp = BASOP_Util_Divide1616_Scale( tmp, yy, &exp_div );
exp_tmp = add( sub( exp_tmp, exp_yy ), exp_div );
@@ -696,11 +615,7 @@ Word16 E_ACELP_xy1_corr_fx(
/* Note: shl works as shl or shr. */
exp_tmp = sub( exp_tmp, 1 );
BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = round_fx_sat( L_shl_sat( Mpy_32_16_1( 1717986944l /*ACELP_GAINS_CONST Q31*/, tmp ), exp_tmp ) ); /*Q14*/
-#else
- tmp = round_fx_o( L_shl_o( Mpy_32_16_1( 1717986944l /*ACELP_GAINS_CONST Q31*/, tmp ), exp_tmp, &Overflow ), &Overflow ); /*Q14*/
-#endif
BASOP_SATURATE_WARNING_ON_EVS
gain = s_min( gain, tmp ); /*Q14*/
@@ -708,7 +623,6 @@ Word16 E_ACELP_xy1_corr_fx(
bail:
-
return ( gain );
}
@@ -808,12 +722,6 @@ void E_ACELP_codebook_target_update_fx(
{
Word16 i, Q15_flag;
Word32 L_tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
assert( gain >= 0 );
Q15_flag = 0;
@@ -830,19 +738,13 @@ void E_ACELP_codebook_target_update_fx(
L_tmp = L_deposit_h( x[i] ); /*Q_xn+16*/
if ( Q15_flag == 0 )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_msu_sat( L_tmp, y[i], gain ); /*Q_xn+15*/
-#else
- L_tmp = L_msu_o( L_tmp, y[i], gain, &Overflow ); /*Q_xn+15*/
-#endif
}
-#ifdef ISSUE_1867_replace_overflow_libenc
x2[i] = msu_r_sat( L_tmp, y[i], gain ); /*Q_xn*/
-#else
- x2[i] = msu_ro( L_tmp, y[i], gain, &Overflow ); /*Q_xn*/
-#endif
move16();
}
+
+ return;
}
@@ -882,13 +784,6 @@ void E_ACELP_pulsesign(
Word16 signs[3];
Word16 *ptr16;
Word16 val, index;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
/* calculate energy for normalization of cn[] and dn[] */
Lval = L_mac0( 1, cn[0], cn[0] ); /*2*Q_xn*/
@@ -896,12 +791,8 @@ void E_ACELP_pulsesign(
FOR( i = 1; i < L_subfr; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Lval = L_mac0_sat( Lval, cn[i], cn[i] ); /*2*Q_xn*/
-#else
- Lval = L_mac0_o( Lval, cn[i], cn[i], &Overflow ); /*2*Q_xn*/
-#endif
- Lcor = L_mac0( Lcor, dn[i], dn[i] ); /*2*Qdn*/
+ Lcor = L_mac0( Lcor, dn[i], dn[i] ); /*2*Qdn*/
}
e_dn = 31;
@@ -917,13 +808,8 @@ void E_ACELP_pulsesign(
if ( i > 0 )
Lcor = L_shr( Lcor, i );
-#ifdef ISSUE_1867_replace_overflow_libenc
k_dn = round_fx_sat( Lval ); /*Q15 - e_dn*/
k_cn = round_fx_sat( Lcor ); /*Q15 - e_cn*/
-#else
- k_dn = round_fx_o( Lval, &Overflow ); /*Q15 - e_dn*/
- k_cn = round_fx_o( Lcor, &Overflow ); /*Q15 - e_cn*/
-#endif
k_cn = mult_r( 0x2000, k_cn ); /* 1 in Q13 */
k_dn = mult_r( alp, k_dn ); /* alp in Q13 */
@@ -941,13 +827,9 @@ void E_ACELP_pulsesign(
FOR( i = 0; i < L_subfr; i++ )
{
/*cor = (s * cn[i]) + (alp * dn[i]); MULT(1);MAC(1);*/
- Lcor = L_mult( cn[i], k_cn ); /*Q_xn + Q15 - e_cn + 1*/
- Lcor = L_mac( Lcor, dn[i], k_dn ); /*Qdn + Q15 - e_dn + 1*/
-#ifdef ISSUE_1867_replace_overflow_libenc
+ Lcor = L_mult( cn[i], k_cn ); /*Q_xn + Q15 - e_cn + 1*/
+ Lcor = L_mac( Lcor, dn[i], k_dn ); /*Qdn + Q15 - e_dn + 1*/
val = round_fx_sat( L_shl_sat( Lcor, 4 ) ); /*shifting by 4 may overflow but improves accuracy Qdn + 4 - e_dn*/
-#else
- val = round_fx_o( L_shl_o( Lcor, 4, &Overflow ), &Overflow ); /*shifting by 4 may overflow but improves accuracy Qdn + 4 - e_dn*/
-#endif
index = shr( val, 15 );
sign[i] = ptr16[index]; /*Q15*/
@@ -1268,12 +1150,6 @@ void E_ACELP_4tsearch_fx(
Word32 s, L_tmp;
Word16 nb_pulse, nb_pulse_m2;
Word16 check = 0; /* debug code not instrumented */
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
alp = config->alp; /* Q13 */ /* initial value for energy of all fixed pulses */
move16();
@@ -1311,11 +1187,7 @@ void E_ACELP_4tsearch_fx(
BASOP_SATURATE_WARNING_OFF_EVS
FOR( i = 0; i < L_SUBFR; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac_sat( L_tmp, H[i], H[i] ); /*Q25*/
-#else
- L_tmp = L_mac_o( L_tmp, H[i], H[i], &Overflow ); /*Q25*/
-#endif
}
val = extract_h( L_tmp ); /*Q9*/
BASOP_SATURATE_WARNING_ON_EVS
@@ -1463,13 +1335,8 @@ void E_ACELP_4tsearch_fx(
L_tmp = L_mult( vec[0], vec[0] ); /*Q25+2*scale*/
FOR( i = 1; i < L_SUBFR; i++ )
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac_sat( L_tmp, vec[i], vec[i] ); /*Q25+2*scale*/
-#else
- L_tmp = L_mac_o( L_tmp, vec[i], vec[i], &Overflow ); /*Q25+2*scale*/
-#endif
-
- alp = round_fx( L_shr( L_tmp, 3 ) ); /*Q6+2*scale*/
+ alp = round_fx( L_shr( L_tmp, 3 ) ); /*Q6+2*scale*/
/*alp *= 0.5F; */
}
@@ -1524,11 +1391,7 @@ void E_ACELP_4tsearch_fx(
FOR( i = 0; i < L_SUBFR; i++ )
{
tmp = add( *p0++, *p1++ );
-#ifdef ISSUE_1867_replace_overflow_libenc
vec[i] = add_sat( vec[i], tmp ); /* can saturate here. */
-#else
- vec[i] = add_o( vec[i], tmp, &Overflow ); /* can saturate here. */
-#endif
move16();
}
}
@@ -1559,7 +1422,6 @@ void E_ACELP_4tsearch_fx(
}
assert( check ); /* debug code not instrumented */
-
/*
* Build the codeword, the filtered codeword and index of codevector, as well as store weighted correlations.
*/
@@ -1578,16 +1440,14 @@ void E_ACELP_4tsearch_fx(
}
FOR( i = 0; i < L_SUBFR; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
y[i] = add_sat( y[i], *p0++ ); /*Q12+scale*/
-#else
- y[i] = add_o( y[i], *p0++, &Overflow ); /*Q12+scale*/
-#endif
move16();
}
}
return;
}
+
+
/*
* E_ACELP_4t_fx
*
@@ -1622,6 +1482,7 @@ void E_ACELP_4tsearch_fx(
* Returns:
* void
*/
+
void E_ACELP_4t_fx(
Word16 dn[], /*Qdn*/
Word16 cn[] /* Q_xn */,
@@ -1635,9 +1496,8 @@ void E_ACELP_4t_fx(
const Word16 last_L_frame, /*Q0*/
const Word32 total_brate, /*Q0*/
const Word16 i_subfr, /*Q0*/
- const Word16 cmpl_flag /*Q0*/
- ,
- const Word16 element_mode /*Q0*/
+ const Word16 cmpl_flag, /*Q0*/
+ const Word16 element_mode /*Q0*/
)
{
PulseConfig config;
@@ -1710,9 +1570,11 @@ static void E_ACELP_indexing_shift(
}
dst[i] = s_or( lshl( src[i], shift_bits ), lsb_bits ); /*Q(shift_bits)*/
move16();
+
return;
}
+
#define MAX_IDX_LEN 9
Word16 E_ACELP_indexing_fx(
@@ -1861,13 +1723,10 @@ void E_ACELP_adaptive_codebook(
ACELP_CbkCorr *g_corr, /* o : ACELP correlation values */
Word16 **pt_indice, /* i/o: quantization indices pointer */
Word16 *pitch_gain, /* o : adaptive codebook gain 1Q14 */
- Word16 exp_xn /* i : exponent of xn (Q_xn-15) */
- ,
+ Word16 exp_xn, /* i : exponent of xn (Q_xn-15) */
Word16 rf_mode,
Word16 rf_coder_type,
- Word16 *lp_select
-
-)
+ Word16 *lp_select )
{
Word16 y2[L_SUBFR], xn2[L_SUBFR], code[L_SUBFR];
ACELP_CbkCorr g_corr2;
@@ -1950,6 +1809,7 @@ void E_ACELP_adaptive_codebook(
* - find filtered pitch exc. y2[]=exc[] convolved with h1[]) *
* - compute pitch gain2 *
*-----------------------------------------------------------------*/
+
test();
IF( EQ_16( mode, NORMAL_OPERATION ) || EQ_16( mode, LOW_PASS ) )
{
@@ -1989,6 +1849,7 @@ void E_ACELP_adaptive_codebook(
/*-----------------------------------------------------------------*
* use the best prediction (minimise quadratic error). *
*-----------------------------------------------------------------*/
+
test();
IF( EQ_16( mode, LOW_PASS ) || LT_32( L_tmp, L_ener ) )
{
@@ -2149,19 +2010,7 @@ static void E_ACELP_codearithp_fx(
{
Word16 k, nb_pulse, i, t, pos[NPMAXPT], posno;
Word16 sign, m;
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- UWord32 s;
-#else
UWord64 W_s;
-#endif
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Flag Overflow = 0;
- Flag Carry = 0;
-#endif
- move32();
- move32();
-#endif
/* Collect different pulse positions to pos[], number of them to posno */
posno = 0;
@@ -2184,11 +2033,7 @@ static void E_ACELP_codearithp_fx(
}
/* Iterate over the different pulse positions */
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- s = L_deposit_l( 0 );
-#else
W_s = 0;
-#endif
t = 0;
move16();
nb_pulse = 0;
@@ -2201,15 +2046,7 @@ static void E_ACELP_codearithp_fx(
/* Code m-1 pulses */
FOR( i = 1; i < m; ++i )
{
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Carry = 0;
-#endif
- move32();
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- s = L_add_co( s, pulsestostates[pos[k]][t], &Carry, &Overflow );
-#else
W_s = W_add( W_s, pulsestostates[pos[k]][t] );
-#endif
t = add( t, 1 );
if ( sub( t, NPMAXPT ) > 0 )
{
@@ -2220,42 +2057,18 @@ static void E_ACELP_codearithp_fx(
/* Code sign */
/* We use L_add_c since we want to work with unsigned UWord32 */
/* Therefore, we have to clear carry */
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Carry = 0;
-#endif
- move32();
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- s = L_lshl( s, 1 );
-#else
W_s = W_lshl( W_s, 1 );
-#endif
if ( sign < 0 )
{
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- s = L_add_co( s, 1, &Carry, &Overflow );
-#else
W_s = W_add( W_s, 1 );
-#endif
}
/* Code last pulse */
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Carry = 0;
-#endif
- move32();
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- s = L_add_co( s, pulsestostates[pos[k]][t], &Carry, &Overflow );
-#else
W_s = W_add( W_s, pulsestostates[pos[k]][t] );
-#endif
t = add( t, 1 );
}
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- *ps = s; /*Q0*/
-#else
*ps = (UWord32) W_s; /*Q0*/
-#endif
move32();
*n = L_deposit_l( 0 );
if ( nb_pulse )
diff --git a/lib_enc/enc_acelpx_fx.c b/lib_enc/enc_acelpx_fx.c
index cd06a4d1570f0aa926351f869f2085a521de6167..00a23895508012d62b6ad339087538802e92e716 100644
--- a/lib_enc/enc_acelpx_fx.c
+++ b/lib_enc/enc_acelpx_fx.c
@@ -4,21 +4,24 @@
#include
#include "options.h"
-//#include "prot_fx.h"
#include "basop_util.h"
#include "options.h"
#include "rom_enc.h"
#include "prot_fx.h" /* Function prototypes */
#include "prot_fx_enc.h" /* Function prototypes */
+
/*--------------------------------------------------------------------------------------*
* Local constant
*--------------------------------------------------------------------------------------*/
#define _1_Q11 ( 2048 /*1.0f Q11*/ ) /* 1.0f in 4Q11 */
+
+
/*--------------------------------------------------------------------------------------*
* E_ACELP_update_cor
*--------------------------------------------------------------------------------------*/
+
static void E_ACELP_update_cor_fx(
const Word16 pos[], /* i Q0*/
Word16 nb_pulse, /* i Q0*/
@@ -111,11 +114,16 @@ static void E_ACELP_update_cor_fx(
{
assert( !"Number of pulses not supported" );
}
+
+ return;
}
+
+
/*--------------------------------------------------------------------------------------*
* E_ACELP_2pulse_searchx
* Iterations: nb_pos_ix*16
*--------------------------------------------------------------------------------------*/
+
static void E_ACELP_2pulse_searchx_fx(
const Word16 nb_pos_ix, /*Q0*/
const Word16 track_x, /*Q0*/
@@ -139,12 +147,6 @@ static void E_ACELP_2pulse_searchx_fx(
Word32 alp0, alp1, alp2, s;
Word16 *pR, sgnx;
Word16 sqk[2], alpk[2], ik;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* eight dn2 max positions per track */
pos_x = &dn2[( track_x * 8 )]; /*Qdn*/
@@ -169,11 +171,7 @@ static void E_ACELP_2pulse_searchx_fx(
{
sgnx = negate( sgnx );
}
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( mac_r_sat( L_mac_sat( L_mac_sat( alp0, cor[x], sign[x] ), cor[track_y], sign[track_y] ), R[track_y - x], sgnx ) < 0 )
-#else
- if ( mac_ro( L_mac_o( L_mac_o( alp0, cor[x], sign[x], &Overflow ), cor[track_y], sign[track_y], &Overflow ), R[track_y - x], sgnx, &Overflow ) < 0 )
-#endif
{
sqk[0] = 1;
move16();
@@ -192,14 +190,10 @@ static void E_ACELP_2pulse_searchx_fx(
move16();
/* dn[x] has only nb_pos_ix positions saved */
/*ps1 = ps0 + dn[x]; INDIRECT(1);ADD(1);*/
- ps1 = add_sat( ps0, dn[x] ); /*Qdn*/
- /*alp1 = alp0 + 2*sgnx*cor[x]; INDIRECT(1);MULT(1); MAC(1);*/
-#ifdef ISSUE_1867_replace_overflow_libenc
+ ps1 = add_sat( ps0, dn[x] ); /*Qdn*/
+ /*alp1 = alp0 + 2*sgnx*cor[x]; INDIRECT(1);MULT(1); MAC(1);*/
alp1 = L_mac_sat( alp0, cor[x], sgnx ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#else
- alp1 = L_mac_o( alp0, cor[x], sgnx, &Overflow ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#endif
- pR = R - x; /*Q9+scale*/
+ pR = R - x; /*Q9+scale*/
FOR( y = track_y; y < L_SUBFR; y += 4 )
{
@@ -213,26 +207,14 @@ static void E_ACELP_2pulse_searchx_fx(
assert( sgnx != 0 );
alp2_16 = 0;
-#ifdef ISSUE_1867_replace_overflow_libenc
alp2 = L_mac_sat( alp1, cor[y], sign[y] ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#else
- alp2 = L_mac_o( alp1, cor[y], sign[y], &Overflow ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#endif
if ( sgnx > 0 )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
alp2_16 = mac_r_sat( alp2, pR[y], sign[y] ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#else
- alp2_16 = mac_ro( alp2, pR[y], sign[y], &Overflow ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#endif
}
if ( sgnx < 0 )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
alp2_16 = msu_r_sat( alp2, pR[y], sign[y] ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#else
- alp2_16 = msu_ro( alp2, pR[y], sign[y], &Overflow ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#endif
}
alpk[1 - ik] = alp2_16; /* Qalp */
move16();
@@ -242,13 +224,8 @@ static void E_ACELP_2pulse_searchx_fx(
sqk[1 - ik] = sq; /* Q9 */
move16();
-
/*s = (alpk * sq) - (sqk * alp2); MULT(1);MAC(1);*/
-#ifdef ISSUE_1867_replace_overflow_libenc
s = L_msu_sat( L_mult( alpk[ik], sq ), sqk[ik], alp2_16 ); /* Q_sq = Q_sqk, Q_alpk = Q_alp */
-#else
- s = L_msu_o( L_mult( alpk[ik], sq ), sqk[ik], alp2_16, &Overflow ); /* Q_sq = Q_sqk, Q_alpk = Q_alp */
-#endif
if ( s > 0 )
{
ik = sub( 1, ik );
@@ -281,11 +258,15 @@ static void E_ACELP_2pulse_searchx_fx(
move16();
assert( ( ( pos[0] & 3 ) == track_x ) && ( ( pos[1] & 3 ) == track_y ) ); /* sanity check */
+
+ return;
}
+
/*--------------------------------------------------------------------------------------*
* E_ACELP_1pulse_searchx
*--------------------------------------------------------------------------------------*/
+
static void E_ACELP_1pulse_searchx_fx(
UWord8 tracks[2], /*Q0*/
Word16 *R, /*Q9+scale*/
@@ -306,12 +287,7 @@ static void E_ACELP_1pulse_searchx_fx(
Word16 ntracks, t;
Word16 sqk[2], alpk[2], ik;
move16();
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
/* save these to limit memory searches */
/*alp0 = *alp + R[0]; INDIRECT(1);*/
ps0 = *ps; /* Qdn */
@@ -326,11 +302,7 @@ static void E_ACELP_1pulse_searchx_fx(
sqk[0] = -1;
ik = 0;
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( mac_r_sat( alp0, cor[tracks[0]], sign[tracks[0]] ) < 0 )
-#else
- if ( mac_ro( alp0, cor[tracks[0]], sign[tracks[0]], &Overflow ) < 0 )
-#endif
{
sqk[0] = 1;
move16();
@@ -354,26 +326,17 @@ static void E_ACELP_1pulse_searchx_fx(
ps1 = add( ps0, dn[x] );
/* alp1 = alp0 + 2*sign[x]*cor[x]; MAC(1); MULT(1);*/
assert( sign[x] == sign_val_1 << 1 || sign[x] == -( sign_val_1 << 1 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
alp1 = mac_r_sat( alp0, cor[x], sign[x] ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#else
- alp1 = mac_ro( alp0, cor[x], sign[x], &Overflow ); /* Qalp = (Q_R=Q_cor)*Q_signval */
-#endif
- alpk[1 - ik] = alp1; /* Qalp */
+ alpk[1 - ik] = alp1; /* Qalp */
move16();
-
/*sq = ps1 * ps1; MULT(1);*/
sq = mult_r( ps1, ps1 ); /* 6Q9 */
sqk[1 - ik] = sq; /* Q9 */
move16();
/*s = (alpk[ik] * sq) - (sqk[ik] * alp1); MULT(1);MAC(1);*/
-#ifdef ISSUE_1867_replace_overflow_libenc
s = L_msu_sat( L_mult_sat( alpk[ik], sq ), sqk[ik], alp1 ); /* Q9+Qalp+1 */
-#else
- s = L_msu_o( L_mult_o( alpk[ik], sq, &Overflow ), sqk[ik], alp1, &Overflow ); /* Q9+Qalp+1 */
-#endif
if ( s > 0 )
{
ik = sub( 1, ik );
@@ -393,21 +356,24 @@ static void E_ACELP_1pulse_searchx_fx(
move16();
*ix = x_save; /* Q0 */
move16();
+
+ return;
}
+
/*--------------------------------------------------------------------------------------*
* E_ACELP_4tsearchx_fx
* Autocorrelation method for searching pulse positions effectively
* Algorithm is identical to traditional covariance method
*--------------------------------------------------------------------------------------*/
+
void E_ACELP_4tsearchx_fx(
Word16 dn[], /*Qdn*/
const Word16 cn[], /*Q_new*/
Word16 Rw[], /*Q9*/
Word16 code[], /*Q9*/
const PulseConfig *config,
- Word16 ind[] /*Q0*/
- ,
+ Word16 ind[], /*Q0*/
const Word16 element_mode )
{
Word16 sign[L_SUBFR], vec[L_SUBFR];
@@ -433,7 +399,6 @@ void E_ACELP_4tsearchx_fx(
ps = 0; /* to avoid compilation warnings */
move16();
-
alp = config->alp; /* Q13 */
move16();
nb_pulse = config->nb_pulse;
@@ -637,7 +602,6 @@ void E_ACELP_4tsearchx_fx(
}
}
-
/*
* Store weighted energy of code, build the codeword and index of codevector.
*/
@@ -685,4 +649,6 @@ void E_ACELP_4tsearchx_fx(
move16();
}
}
+
+ return;
}
diff --git a/lib_enc/enc_amr_wb_fx.c b/lib_enc/enc_amr_wb_fx.c
index 530eb4a40de114c5bfcba23654a64783cf280eb3..2bbb7d1544749ff9a11c8173f0324efdee712a2c 100644
--- a/lib_enc/enc_amr_wb_fx.c
+++ b/lib_enc/enc_amr_wb_fx.c
@@ -65,12 +65,6 @@ void encod_amr_wb_fx(
AMRWB_IO_ENC_HANDLE hAmrwb_IO = st->hAmrwb_IO;
BSTR_ENC_HANDLE hBstr = st->hBstr;
LPD_state_HANDLE hLPDmem = st->hLPDmem;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*------------------------------------------------------------------*
* Initializations
@@ -193,23 +187,14 @@ void encod_amr_wb_fx(
&gain_inov, &norm_gain_code, g_corr, clip_gain, hAmrwb_IO->past_qua_en_fx );
gp_clip_test_gain_pit_fx( st->element_mode, st->core_brate, gain_pit, st->clip_var_fx );
-#ifdef ISSUE_1867_replace_overflow_libenc
Lgcode = L_shl_sat( gain_code, Q_new ); /* scaled gain_code with Qnew -> Q16*/
gcode16 = round_fx_sat( Lgcode ); /*Q0*/
-#else
- Lgcode = L_shl_o( gain_code, Q_new, &Overflow ); /* scaled gain_code with Qnew -> Q16*/
- gcode16 = round_fx_o( Lgcode, &Overflow ); /*Q0*/
-#endif
hLPDmem->tilt_code = Est_tilt2( exc + i_subfr, gain_pit, code, Lgcode, &voice_fac, shift ); /*Q15*/
FOR( i = 0; i < L_SUBFR; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
exc2[i + i_subfr] = round_fx_sat( L_shl_sat( L_mult( gain_pit, exc[i + i_subfr] ), 1 ) ); /*Q_new*/
-#else
- exc2[i + i_subfr] = round_fx_o( L_shl_o( L_mult( gain_pit, exc[i + i_subfr] ), 1, &Overflow ), &Overflow ); /*Q_new*/
-#endif
move16();
}
@@ -236,13 +221,8 @@ void encod_amr_wb_fx(
L_tmp = L_mult( gcode16, code[i] ); /*Q10*/
L_tmp = L_shl_sat( L_tmp, 5 ); /*Q15*/
L_tmp = L_mac_sat( L_tmp, exc[i + i_subfr], gain_pit ); /* Q_new+15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- L_tmp = L_shl_sat( L_tmp, 1 ); /* saturation can occur here Q_new+15*/
- exc[i + i_subfr] = round_fx_sat( L_tmp ); /*Q_new*/
-#else
- L_tmp = L_shl_o( L_tmp, 1, &Overflow ); /* saturation can occur here Q_new+15*/
- exc[i + i_subfr] = round_fx_o( L_tmp, &Overflow ); /*Q_new*/
-#endif
+ L_tmp = L_shl_sat( L_tmp, 1 ); /* saturation can occur here Q_new+15*/
+ exc[i + i_subfr] = round_fx_sat( L_tmp ); /*Q_new*/
move16();
}
diff --git a/lib_enc/enc_gen_voic_fx.c b/lib_enc/enc_gen_voic_fx.c
index 01f80cacb3dca21f6bb6cd59e9e1df0eb3bb0df9..f4e56fdd3a3df11aa797d147cd8b66279e64f1b5 100644
--- a/lib_enc/enc_gen_voic_fx.c
+++ b/lib_enc/enc_gen_voic_fx.c
@@ -144,12 +144,6 @@ void encod_gen_voic_fx(
Word16 shift_wsp;
Word16 harm_flag_acelp;
Word16 lp_select, lp_flag, L_frame;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
SP_MUS_CLAS_HANDLE hSpMusClas = st_fx->hSpMusClas;
@@ -249,6 +243,7 @@ void encod_gen_voic_fx(
*pt_pitch_fx = pit_encode_fx( hBstr, st_fx->acelp_cfg.pitch_bits, st_fx->core_brate, 0, L_frame, st_fx->coder_type, &pitch_limit_flag, i_subfr_fx, exc_fx,
L_SUBFR, st_fx->pitch, &T0_min_fx, &T0_max_fx, &T0_fx, &T0_frac_fx, h1_fx, xn_fx, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf, st_fx->element_mode, Q_new ); /* Q6 */
+
tbe_celp_exc( L_frame, i_subfr_fx, T0_fx, T0_frac_fx, &error_fx, bwe_exc_fx );
/*-----------------------------------------------------------------*
@@ -283,11 +278,7 @@ void encod_gen_voic_fx(
}
/*st_fx->lowrate_pitchGain = 0.9f * st_fx->lowrate_pitchGain + 0.1f * gain_pit_fx;*/
-#ifdef ISSUE_1867_replace_overflow_libenc
hSpMusClas->lowrate_pitchGain = round_fx_sat( L_mac_sat( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit_fx ) ); /*Q14*Q16(0.1) + Q15 -> Q15*/
-#else
- hSpMusClas->lowrate_pitchGain = round_fx_o( L_mac_o( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit_fx, &Overflow ), &Overflow ); /*Q14*Q16(0.1) + Q15 -> Q15*/
-#endif
/*-----------------------------------------------------------------*
* Transform domain contribution encoding - active frames
@@ -339,14 +330,8 @@ void encod_gen_voic_fx(
}
gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit_fx, st_fx->clip_var_fx );
-#ifdef ISSUE_1867_replace_overflow_libenc
- Lgcode = L_shl_sat( gain_code_fx, Q_new ); /* scaled gain_code with Qnew -> Q16*/
- gcode16 = round_fx_sat( Lgcode ); /*Q0*/
-#else
- Lgcode = L_shl_o( gain_code_fx, Q_new, &Overflow ); /* scaled gain_code with Qnew -> Q16*/
- gcode16 = round_fx_o( Lgcode, &Overflow ); /*Q0*/
-#endif
-
+ Lgcode = L_shl_sat( gain_code_fx, Q_new ); /* scaled gain_code with Qnew -> Q16*/
+ gcode16 = round_fx_sat( Lgcode ); /*Q0*/
hLPDmem->tilt_code = Est_tilt2( &exc_fx[i_subfr_fx], gain_pit_fx, code_fx, Lgcode, &voice_fac_fx, shift ); /* Q15 */
move16();
@@ -381,35 +366,20 @@ void encod_gen_voic_fx(
FOR( i = 0; i < L_SUBFR; i++ )
{
/* Contribution from AVQ layer */
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp1 = L_mult_sat( gain_preQ_fx, code_preQ_fx[i] ); /* Q2 + Q6 -> Q9*/
Ltmp1 = L_shl_sat( Ltmp1, tmp1_fx ); /* Q16 + Q_exc */
-#else
- Ltmp1 = L_mult_o( gain_preQ_fx, code_preQ_fx[i], &Overflow ); /* Q2 + Q6 -> Q9*/
- Ltmp1 = L_shl_o( Ltmp1, tmp1_fx, &Overflow ); /* Q16 + Q_exc */
-#endif
/* Compute exc2 */
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp = L_shl_sat( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1 ); /* Q16 */
exc2_fx[i + i_subfr_fx] = round_fx_sat( L_add_sat( Ltmp, Ltmp1 ) ); /* Q0 */
-#else
- Ltmp = L_shl_o( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1, &Overflow ); /* Q16 */
- exc2_fx[i + i_subfr_fx] = round_fx_o( L_add_o( Ltmp, Ltmp1, &Overflow ), &Overflow ); /* Q0 */
-#endif
move16();
/* code in Q9, gain_pit in Q14 */
- Ltmp = L_mult( gcode16, code_fx[i] ); /* Q10 */
- Ltmp = L_shl( Ltmp, 5 ); /* Q15 */
- Ltmp = L_mac( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx ); /* Q15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ Ltmp = L_mult( gcode16, code_fx[i] ); /* Q10 */
+ Ltmp = L_shl( Ltmp, 5 ); /* Q15 */
+ Ltmp = L_mac( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx ); /* Q15 */
Ltmp = L_shl_sat( Ltmp, 1 ); /* saturation can occur here Q16*/
exc_fx[i + i_subfr_fx] = round_fx_sat( L_add_sat( Ltmp, Ltmp1 ) ); /* Q0 */
-#else
- Ltmp = L_shl_o( Ltmp, 1, &Overflow ); /* saturation can occur here Q16*/
- exc_fx[i + i_subfr_fx] = round_fx_o( L_add_o( Ltmp, Ltmp1, &Overflow ), &Overflow ); /* Q0 */
-#endif
}
}
ELSE
@@ -422,18 +392,11 @@ void encod_gen_voic_fx(
FOR( i = 0; i < L_SUBFR; i++ )
{
/* code in Q9, gain_pit in Q14 */
- Ltmp = L_mult( gcode16, code_fx[i] ); /* Q10 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ Ltmp = L_mult( gcode16, code_fx[i] ); /* Q10 */
Ltmp = L_shl_sat( Ltmp, 5 ); /* Q15 */
Ltmp = L_mac_sat( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx ); /* Q15 */
Ltmp = L_shl_sat( Ltmp, 1 ); /* saturation can occur here Q16*/
exc_fx[i + i_subfr_fx] = round_fx_sat( Ltmp ); /* Q0 */
-#else
- Ltmp = L_shl_o( Ltmp, 5, &Overflow ); /* Q15 */
- Ltmp = L_mac_o( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx, &Overflow ); /* Q15 */
- Ltmp = L_shl_o( Ltmp, 1, &Overflow ); /* saturation can occur here Q16*/
- exc_fx[i + i_subfr_fx] = round_fx_o( Ltmp, &Overflow ); /* Q0 */
-#endif
}
}
@@ -441,22 +404,10 @@ void encod_gen_voic_fx(
* Prepare TBE excitation
*-----------------------------------------------------------------*/
-#ifdef FIX_2010_PREP_TBE_EXC
- /* multrus 2025-09-15
- TODO:
- - check with vaillancourt, whether Q10 is the correct scaling - it contradicts comments above, where it's rather indicated as Q6
- - comparing againt float, Q10 seems to be correct
- */
prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
&voice_factors_fx[i_subfr_fx / L_SUBFR], bwe_exc_fx, gain_preQ_fx, code_preQ_fx, Q10, Q_new,
T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,
st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#else
- prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
- &voice_factors_fx[i_subfr_fx / L_SUBFR], bwe_exc_fx, gain_preQ_fx, code_preQ_fx, Q_new,
- T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,
- st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#endif
/*-----------------------------------------------------------------*
* Synthesize speech to update mem_syn[].
@@ -554,12 +505,6 @@ void encod_gen_voic_ivas_fx(
Word16 harm_flag_acelp;
Word16 lp_select, lp_flag, L_frame;
Word16 q_h1;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
LPD_state_HANDLE hLPDmem = st_fx->hLPDmem;
@@ -753,13 +698,8 @@ void encod_gen_voic_ivas_fx(
}
gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit_fx, st_fx->clip_var_fx );
-#ifdef ISSUE_1867_replace_overflow_libenc
Lgcode = L_shl_sat( gain_code_fx, Q_new ); /* scaled gain_code with Qnew -> Q16*/
gcode16 = round_fx_sat( Lgcode );
-#else
- Lgcode = L_shl_o( gain_code_fx, Q_new, &Overflow ); /* scaled gain_code with Qnew -> Q16*/
- gcode16 = round_fx_o( Lgcode, &Overflow );
-#endif
hLPDmem->tilt_code = est_tilt_ivas_fx( &exc_fx[i_subfr_fx], gain_pit_fx, code_fx, gain_code_fx, &voice_fac_fx, Q_new, L_SUBFR, 0 ); /* Q15 */
move16();
@@ -810,35 +750,20 @@ void encod_gen_voic_ivas_fx(
FOR( i = 0; i < L_SUBFR; i++ )
{
/* Contribution from AVQ layer */
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp1 = L_mult_sat( gain_preQ_fx, code_preQ_fx[i] );
Ltmp1 = L_shl_sat( Ltmp1, tmp1_fx );
-#else
- Ltmp1 = L_mult_o( gain_preQ_fx, code_preQ_fx[i], &Overflow );
- Ltmp1 = L_shl_o( Ltmp1, tmp1_fx, &Overflow );
-#endif
/* Compute exc2 */
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp = L_shl_sat( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1 );
exc2_fx[i + i_subfr_fx] = round_fx_sat( L_add_sat( Ltmp, Ltmp1 ) );
-#else
- Ltmp = L_shl_o( L_mult( gain_pit_fx, exc_fx[i + i_subfr_fx] ), 1, &Overflow );
- exc2_fx[i + i_subfr_fx] = round_fx_o( L_add_o( Ltmp, Ltmp1, &Overflow ), &Overflow );
-#endif
move16();
/* code in Q9, gain_pit in Q14 */
Ltmp = L_mult( gcode16, code_fx[i] ); /*Qnew + 9 + 1 */
Ltmp = L_shl( Ltmp, 5 ); /*Qnew + 9+ 1+5 */
Ltmp = L_mac( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx ); /*Qnew + 14 + 1*/
-#ifdef ISSUE_1867_replace_overflow_libenc
- Ltmp = L_shl_sat( Ltmp, 1 ); /*Qnew + 14 + 1 +1 */ /* saturation can occur here Q16*/
+ Ltmp = L_shl_sat( Ltmp, 1 ); /*Qnew + 14 + 1 +1 */ /* saturation can occur here Q16*/
exc_fx[i + i_subfr_fx] = round_fx_sat( L_add_sat( Ltmp, Ltmp1 ) );
-#else
- Ltmp = L_shl_o( Ltmp, 1, &Overflow ); /*Qnew + 14 + 1 +1 */ /* saturation can occur here Q16*/
- exc_fx[i + i_subfr_fx] = round_fx_o( L_add_o( Ltmp, Ltmp1, &Overflow ), &Overflow );
-#endif
move16();
}
}
@@ -853,35 +778,22 @@ void encod_gen_voic_ivas_fx(
{
/* code in Q9, gain_pit in Q14 */
/*gcode16 in Qnew*/
- Ltmp = L_mult( gcode16, code_fx[i] ); /*Qnew + 9 + 1 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ Ltmp = L_mult( gcode16, code_fx[i] ); /*Qnew + 9 + 1 */
Ltmp = L_shl_sat( Ltmp, 5 ); /*Qnew + 9+ 1+5 */
Ltmp = L_mac_sat( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx ); /*Qnew + 14 + 1*/
Ltmp = L_shl_sat( Ltmp, 1 ); /*Qnew + 14 + 1 +1 */
exc_fx[i + i_subfr_fx] = round_fx_sat( Ltmp );
-#else
- Ltmp = L_shl_o( Ltmp, 5, &Overflow ); /*Qnew + 9+ 1+5 */
- Ltmp = L_mac_o( Ltmp, exc_fx[i + i_subfr_fx], gain_pit_fx, &Overflow ); /*Qnew + 14 + 1*/
- Ltmp = L_shl_o( Ltmp, 1, &Overflow ); /*Qnew + 14 + 1 +1 */
- exc_fx[i + i_subfr_fx] = round_fx_o( Ltmp, &Overflow );
-#endif
}
}
+
/*-----------------------------------------------------------------*
* Prepare TBE excitation
*-----------------------------------------------------------------*/
-#ifdef FIX_2010_PREP_TBE_EXC
prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
&voice_factors_fx[i_subfr_fx / L_SUBFR], bwe_exc_fx, gain_preQ_fx, code_preQ_fx, Q_AVQ_OUT_DEC, Q_new,
T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,
st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#else
- prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr_fx, gain_pit_fx, gain_code_fx, code_fx, voice_fac_fx,
- &voice_factors_fx[i_subfr_fx / L_SUBFR], bwe_exc_fx, gain_preQ_fx, code_preQ_fx, Q_new,
- T0_fx, T0_frac_fx, st_fx->coder_type, st_fx->core_brate,
- st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#endif
/*-----------------------------------------------------------------*
* Synthesize speech to update mem_syn[].
diff --git a/lib_enc/enc_gen_voic_rf_fx.c b/lib_enc/enc_gen_voic_rf_fx.c
index 26a45bad9bc15b1f23dad9d5184e7fe71f40beb3..a8ce8de56e07796f11da21da5cdebca2da611ff2 100644
--- a/lib_enc/enc_gen_voic_rf_fx.c
+++ b/lib_enc/enc_gen_voic_rf_fx.c
@@ -164,13 +164,6 @@ void coder_acelp_rf_fx(
Word16 prev_gain_pit;
Word16 rf_coder_type;
Word16 lp_select;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
RF_ENC_HANDLE hRF = st->hRF;
/* to avoid compilation warnings */
@@ -433,16 +426,16 @@ void coder_acelp_rf_fx(
/*----------------------------------------------------------*
* - voice factor (for pitch enhancement) *
*----------------------------------------------------------*/
+
E_UTIL_voice_factor( exc_rf, i_subfr, code, gain_pit, gain_code,
&voice_fac, &( hRF->rf_tilt_code ), L_SUBFR, acelp_cfg->voice_tilt, Q_new, shift );
-
/*-----------------------------------------------------------------*
* Update memory of the weighting filter
*-----------------------------------------------------------------*/
+
/* st_fx->_rf_mem_w0 = xn[L_SUBFR-1] - (gain_pit*y1[L_SUBFR-1]) - (gain_code*y2[L_SUBFR-1]); */
- Ltmp = Mpy_32_16_1( gain_code, y2[L_SUBFR - 1] ); /* Q10 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ Ltmp = Mpy_32_16_1( gain_code, y2[L_SUBFR - 1] ); /* Q10 */
Ltmp = L_shl_sat( Ltmp, add( 5, Q_xn ) ); /* Q15 + Q_xn */
Ltmp = L_mac_sat( Ltmp, y1[L_SUBFR - 1], gain_pit ); /* Q15 + Q_xn */
/* Add Gaussian contribution*/
@@ -450,19 +443,9 @@ void coder_acelp_rf_fx(
Ltmp2 = L_shl_sat( Ltmp2, add( 5, Q_xn ) ); /* Q15 + Q_xn */
Ltmp = L_add_sat( Ltmp, Ltmp2 ); /* Q15 + Q_xn */
hRF->rf_mem_w0 = sub_sat( xn[L_SUBFR - 1], round_fx_sat( L_shl_sat( Ltmp, 1 ) ) ); /* Q_xn */
-#else
- Ltmp = L_shl_o( Ltmp, add( 5, Q_xn ), &Overflow ); /* Q15 + Q_xn */
- Ltmp = L_mac_o( Ltmp, y1[L_SUBFR - 1], gain_pit, &Overflow ); /* Q15 + Q_xn */
- /* Add Gaussian contribution*/
- Ltmp2 = Mpy_32_16_1( gain_code2, y22[L_SUBFR - 1] ); /* Q10 */
- Ltmp2 = L_shl_o( Ltmp2, add( 5, Q_xn ), &Overflow ); /* Q15 + Q_xn */
- Ltmp = L_add_o( Ltmp, Ltmp2, &Overflow ); /* Q15 + Q_xn */
- hRF->rf_mem_w0 = sub_o( xn[L_SUBFR - 1], round_fx_o( L_shl_o( Ltmp, 1, &Overflow ), &Overflow ), &Overflow ); /* Q_xn */
-#endif
move16();
hRF->rf_mem_w0 = shr_sat( hRF->rf_mem_w0, shift ); /*Qnew-1*/
-
/*-------------------------------------------------------*
* - Find the total excitation. *
*-------------------------------------------------------*/
@@ -473,8 +456,7 @@ void coder_acelp_rf_fx(
FOR( i = sub( tmp2, shr( L_SUBFR, 1 ) ); i < tmp2; i++ )
{
/* code in Q9, gain_pit in Q14; exc Q_new */
- Ltmp = Mpy_32_16_1( gain_code2, code2[i] ); /* Q10 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ Ltmp = Mpy_32_16_1( gain_code2, code2[i] ); /* Q10 */
Ltmp = L_shl_sat( Ltmp, Q_new_p5 ); /* Q15 + Q_new */
Ltmp = L_mac_sat( Ltmp, gain_pit, exc_rf[i + i_subfr] ); /* Q15 + Q_new */
exc2[i] = round_fx_sat( L_shl_sat( Ltmp, 1 ) ); /* Q_new */
@@ -484,27 +466,16 @@ void coder_acelp_rf_fx(
Ltmp = L_add_sat( Ltmp, Ltmp2 ); /* Q15 + Q_new */
Ltmp = L_shl_sat( Ltmp, 1 ); /* saturation can occur here Q16 + Q_new*/
exc_rf[i + i_subfr] = round_fx_sat( Ltmp ); /* Q_new */
-#else
- Ltmp = L_shl_o( Ltmp, Q_new_p5, &Overflow ); /* Q15 + Q_new */
- Ltmp = L_mac_o( Ltmp, gain_pit, exc_rf[i + i_subfr], &Overflow ); /* Q15 + Q_new */
- exc2[i] = round_fx_o( L_shl_o( Ltmp, 1, &Overflow ), &Overflow ); /* Q_new */
- move16();
- Ltmp2 = Mpy_32_16_1( gain_code_vect[j], code[i] ); /* Q10 */
- Ltmp2 = L_shl_o( Ltmp2, Q_new_p5, &Overflow ); /* Q15 + Q_new */
- Ltmp = L_add_o( Ltmp, Ltmp2, &Overflow ); /* Q15 + Q_new */
- Ltmp = L_shl_o( Ltmp, 1, &Overflow ); /* saturation can occur here Q16 + Q_new*/
- exc_rf[i + i_subfr] = round_fx_o( Ltmp, &Overflow ); /* Q_new */
-#endif
move16();
}
tmp2 = L_SUBFR;
move16();
}
-
/*---------------------------------------------------------*
* Enhance the excitation *
*---------------------------------------------------------*/
+
E_UTIL_enhancer( voice_fac, stab_fac, past_gcode, gain_inov,
&hRF->rf_gc_threshold, code, exc2, gain_pit, &hRF->rf_dm_fx.prev_gain_code,
hRF->rf_dm_fx.prev_gain_pit, &hRF->rf_dm_fx.prev_state, coder_type,
diff --git a/lib_enc/enc_higher_acelp_fx.c b/lib_enc/enc_higher_acelp_fx.c
index dcbe87a8d2b3d1b8798fc205719165709765a6e5..014ce4603a0a5a1aced83ec0f5f9c174d2232bcd 100644
--- a/lib_enc/enc_higher_acelp_fx.c
+++ b/lib_enc/enc_higher_acelp_fx.c
@@ -87,13 +87,10 @@ void transf_cdbk_enc_fx(
* For inactive frame, find target in residual domain
* Deemphasis
*--------------------------------------------------------------*/
+
IF( EQ_16( st_fx->coder_type, INACTIVE ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
gcode16 = round_fx_sat( L_shl_sat( gain_code, Q_new ) );
-#else
- gcode16 = round_fx_o( L_shl_o( gain_code, Q_new, &Overflow ), &Overflow );
-#endif
FOR( i = 0; i < L_SUBFR; i++ )
{
/*x_tran[i] = xn[i] - *gain_pit * y1[i] - gain_code * y2[i];*/
@@ -140,12 +137,14 @@ void transf_cdbk_enc_fx(
/*--------------------------------------------------------------*
* Split algebraic vector quantizer based on RE8 lattice
*--------------------------------------------------------------*/
+
AVQ_cod_fx( x_tran, x_norm, nBits, Nsv, 0 );
/*--------------------------------------------------------------*
* Find prequantizer excitation gain
* Quantize the gain
*--------------------------------------------------------------*/
+
L_corr = L_deposit_l( 0 );
L_ener = L_deposit_l( 0 );
FOR( i = 0; i < Nsv * 8; i++ )
@@ -188,11 +187,7 @@ void transf_cdbk_enc_fx(
m_corr = div_s( 16384, m_den );
e_corr = sub( 14 + 4, e_den );
Ltmp = L_shr( Mult_32_16( Ltmp, m_corr ), e_corr ); /*Q12*/
-#ifdef ISSUE_1867_replace_overflow_libenc
- stmp = round_fx_sat( L_shl_sat( Ltmp, 16 ) ); /* Q12 */
-#else
- stmp = round_fx_o( L_shl_o( Ltmp, 16, &Overflow ), &Overflow ); /* Q12 */
-#endif
+ stmp = round_fx_sat( L_shl_sat( Ltmp, 16 ) ); /* Q12 */
}
ELSE
{
@@ -259,6 +254,7 @@ void transf_cdbk_enc_fx(
/*--------------------------------------------------------------*
* Encode and multiplex subvectors into bit-stream
*--------------------------------------------------------------*/
+
trgtSvPos = Nsv - 1;
move16();
test();
@@ -324,6 +320,7 @@ void transf_cdbk_enc_fx(
/*--------------------------------------------------------------*
* Preemphasise
*--------------------------------------------------------------*/
+
/* in extreme cases at subframe boundaries, lower the preemphasis memory to avoid a saturation */
test();
if ( ( nq[7] != 0 ) && ( GT_16( sub( st_fx->last_nq_preQ, nq[0] ), 7 ) ) )
@@ -380,6 +377,8 @@ void transf_cdbk_enc_fx(
return;
}
+
+
void transf_cdbk_enc_ivas_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
const Word16 harm_flag_acelp, /* i : harmonic flag for higher rates ACELP Q0*/
@@ -445,13 +444,10 @@ void transf_cdbk_enc_ivas_fx(
* For inactive frame, find target in residual domain
* Deemphasis
*--------------------------------------------------------------*/
+
IF( EQ_16( st_fx->coder_type, INACTIVE ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
gcode16 = round_fx_sat( L_shl_sat( gain_code, Q_new ) );
-#else
- gcode16 = round_fx_o( L_shl_o( gain_code, Q_new, &Overflow ), &Overflow );
-#endif
FOR( i = 0; i < L_SUBFR; i++ )
{
/*x_tran[i] = xn[i] - *gain_pit * y1[i] - gain_code * y2[i];*/
@@ -497,12 +493,14 @@ void transf_cdbk_enc_ivas_fx(
/*--------------------------------------------------------------*
* Split algebraic vector quantizer based on RE8 lattice
*--------------------------------------------------------------*/
+
AVQ_cod_fx( x_tran, x_norm, nBits, Nsv, 0 );
/*--------------------------------------------------------------*
* Find prequantizer excitation gain
* Quantize the gain
*--------------------------------------------------------------*/
+
L_corr = L_deposit_l( 0 );
L_ener = L_deposit_l( 0 );
FOR( i = 0; i < Nsv * 8; i++ )
@@ -545,11 +543,7 @@ void transf_cdbk_enc_ivas_fx(
m_corr = div_s( 16384, m_den );
e_corr = sub( 14 + 4, e_den );
Ltmp = L_shr( Mult_32_16( Ltmp, m_corr ), e_corr ); /*Q12*/
-#ifdef ISSUE_1867_replace_overflow_libenc
- stmp = round_fx_sat( L_shl_sat( Ltmp, 16 ) ); /* Q12 */
-#else
- stmp = round_fx_o( L_shl_o( Ltmp, 16, &Overflow ), &Overflow ); /* Q12 */
-#endif
+ stmp = round_fx_sat( L_shl_sat( Ltmp, 16 ) ); /* Q12 */
}
ELSE
{
@@ -618,6 +612,7 @@ void transf_cdbk_enc_ivas_fx(
/*--------------------------------------------------------------*
* Encode and multiplex subvectors into bit-stream
*--------------------------------------------------------------*/
+
trgtSvPos = sub( Nsv, 1 );
move16();
test();
@@ -632,7 +627,9 @@ void transf_cdbk_enc_ivas_fx(
move16();
move16();
}
+
AVQ_encmux_fx( st_fx->hBstr, -1, x_norm, &nBits, Nsv, nq, avq_bit_sFlag, trgtSvPos );
+
/* save # of AVQ unused bits for next subframe */
*unbits = nBits;
move16();
@@ -682,6 +679,7 @@ void transf_cdbk_enc_ivas_fx(
/*--------------------------------------------------------------*
* Preemphasise
*--------------------------------------------------------------*/
+
/* in extreme cases at subframe boundaries, lower the preemphasis memory to avoid a saturation */
test();
if ( ( nq[7] != 0 ) && ( GT_16( sub( st_fx->last_nq_preQ, nq[0] ), 7 ) ) )
@@ -762,6 +760,8 @@ void transf_cdbk_enc_ivas_fx(
return;
}
+
+
/*-------------------------------------------------------------------*
* Find target in residual domain - cn[]
*-------------------------------------------------------------------*/
@@ -790,13 +790,15 @@ static void find_cn_fx(
/*-----------------------------------------------------------------*
* Transform domain contribution encoding
*-----------------------------------------------------------------*/
-Word16 gain_quant_fx( /* o: quantization index Q0*/
- Word32 *gain, /* i: quantized gain Q16*/
- Word16 *gain16, /* o: quantized gain expg*/
- const Word16 c_min, /* i: log10 of lower limit in Q14*/
- const Word16 c_max, /* i: log10 of upper limit in Q13*/
- const Word16 bits, /* i: number of bits to quantize Q0*/
- Word16 *expg /* o: output exponent of gain16 */
+
+/* o: quantization index Q0*/
+Word16 gain_quant_fx(
+ Word32 *gain, /* i : quantized gain Q16*/
+ Word16 *gain16, /* o : quantized gain expg*/
+ const Word16 c_min, /* i : log10 of lower limit in Q14*/
+ const Word16 c_max, /* i : log10 of upper limit in Q13*/
+ const Word16 bits, /* i : number of bits to quantize Q0*/
+ Word16 *expg /* o : output exponent of gain16 */
)
{
Word16 index, levels;
diff --git a/lib_enc/enc_pit_exc_fx.c b/lib_enc/enc_pit_exc_fx.c
index 532c0389801740b2a330b9440a743b4e14fe7a8e..b1ad74b0da240b2627468b5cccd015e687eb9722 100644
--- a/lib_enc/enc_pit_exc_fx.c
+++ b/lib_enc/enc_pit_exc_fx.c
@@ -104,12 +104,6 @@ void enc_pit_exc_fx(
BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
GSC_ENC_HANDLE hGSCEnc = st_fx->hGSCEnc;
LPD_state_HANDLE hLPDmem = st_fx->hLPDmem;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*------------------------------------------------------------------*
* Initialization
@@ -272,11 +266,13 @@ void enc_pit_exc_fx(
*pt_pitch = pit_encode_fx( hBstr, st_fx->acelp_cfg.pitch_bits, Pitch_BR, 0, st_fx->L_frame, Pitch_CT, &pitch_limit_flag, i_subfr, exc,
L_subfr, st_fx->pitch, &T0_min, &T0_max, T0, T0_frac, h1, xn, tdm_Pitch_reuse_flag, tdm_Pri_pitch_buf, st_fx->element_mode, Q_new ); /* Q6 */
+
/*-----------------------------------------------------------------*
* Find adaptive exitation
*-----------------------------------------------------------------*/
pred_lt4( &exc[i_subfr], &exc[i_subfr], *T0, *T0_frac, L_subfr + 1, pitch_inter4_2, L_INTERPOL2, PIT_UP_SAMP );
+
/*-----------------------------------------------------------------*
* Gain clipping test to avoid unstable synthesis on frame erasure
* or in case of floating point encoder & fixed p. decoder
@@ -297,11 +293,7 @@ void enc_pit_exc_fx(
}
/*st_fx->lowrate_pitchGain = 0.9f * st_fx->lowrate_pitchGain + 0.1f * gain_pit;*/
-#ifdef ISSUE_1867_replace_overflow_libenc
hSpMusClas->lowrate_pitchGain = round_fx_sat( L_mac_sat( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit ) ); /*Q14*Q16(0.1) + Q15 -> Q15*/
-#else
- hSpMusClas->lowrate_pitchGain = round_fx_o( L_mac_o( L_mult( 29491, hSpMusClas->lowrate_pitchGain ), 6554, gain_pit, &Overflow ), &Overflow ); /*Q14*Q16(0.1) + Q15 -> Q15*/
-#endif
gpit_tmp = gain_pit;
move16(); /*Q14*/
@@ -358,6 +350,7 @@ void enc_pit_exc_fx(
gain_enc_mless_fx( hBstr, st_fx->acelp_cfg.gains_mode, st_fx->element_mode, L_FRAME, i_subfr, -1, xn, y1, shift_wsp, y2, code, Es_pred,
&gain_pit, &gain_code, &gain_inov, &norm_gain_code, g_corr, clip_gain );
}
+
gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit, st_fx->clip_var_fx );
Lgcode = L_shl_sat( gain_code, Q_new ); /* scaled gain_code with Qnew -> Q16*/
@@ -380,21 +373,12 @@ void enc_pit_exc_fx(
IF( use_fcb != 0 )
{
Ltmp = L_mult( gcode16, y2[L_subfr - 1] ); /* Q10 + Q_new */
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp = L_shl_sat( Ltmp, add( 5, shift ) ); /* Q15 + Q_new + shift */
Ltmp = L_negate( Ltmp );
Ltmp = L_mac_sat( Ltmp, xn[L_subfr - 1], 16384 ); /* Q_new + Q15 + shift */
Ltmp = L_msu_sat( Ltmp, y1[L_subfr - 1], gain_pit ); /* Q_new + Q15 + shift */
Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) ); /* Q_new + 15 */
hLPDmem->mem_w0 = round_fx_sat( Ltmp ); /*Q_new-1 */
-#else
- Ltmp = L_shl_o( Ltmp, add( 5, shift ), &Overflow ); /* Q15 + Q_new + shift */
- Ltmp = L_negate( Ltmp );
- Ltmp = L_mac_o( Ltmp, xn[L_subfr - 1], 16384, &Overflow ); /* Q_new + Q15 + shift */
- Ltmp = L_msu_o( Ltmp, y1[L_subfr - 1], gain_pit, &Overflow ); /* Q_new + Q15 + shift */
- Ltmp = L_shl_o( Ltmp, sub( 1, shift ), &Overflow ); /* Q_new + 15 */
- hLPDmem->mem_w0 = round_fx_o( Ltmp, &Overflow ); /*Q_new-1 */
-#endif
move16();
}
ELSE
@@ -416,18 +400,11 @@ void enc_pit_exc_fx(
FOR( i = 0; i < L_subfr; i++ )
{
/* code in Q9, gain_pit in Q14 */
- Ltmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ Ltmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new */
Ltmp = L_shl_sat( Ltmp, 5 ); /* Q15 + Q_new */
Ltmp = L_mac_sat( Ltmp, exc[i + i_subfr], gain_pit ); /* Q15 + Q_new */
Ltmp = L_shl_sat( Ltmp, 1 ); /* saturation can occur here Q_new + Q16*/
exc[i + i_subfr] = round_fx_sat( Ltmp ); /* Q_new */
-#else
- Ltmp = L_shl_o( Ltmp, 5, &Overflow ); /* Q15 + Q_new */
- Ltmp = L_mac_o( Ltmp, exc[i + i_subfr], gain_pit, &Overflow ); /* Q15 + Q_new */
- Ltmp = L_shl_o( Ltmp, 1, &Overflow ); /* saturation can occur here Q_new + Q16*/
- exc[i + i_subfr] = round_fx_o( Ltmp, &Overflow ); /* Q_new */
-#endif
move16();
}
}
@@ -613,12 +590,6 @@ void enc_pit_exc_ivas_fx(
BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
GSC_ENC_HANDLE hGSCEnc = st_fx->hGSCEnc;
LPD_state_HANDLE hLPDmem = st_fx->hLPDmem;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*------------------------------------------------------------------*
* Initialization
@@ -670,7 +641,6 @@ void enc_pit_exc_ivas_fx(
}
ELSE
{
-
Local_BR = ACELP_7k20;
move32();
Pitch_BR = st_fx->core_brate;
@@ -757,6 +727,7 @@ void enc_pit_exc_ivas_fx(
* target in residual domain "cn"
* Compute impulse response, h1[], of weighted synthesis filter
*----------------------------------------------------------------*/
+
Copy( &res[i_subfr], &exc[i_subfr], L_subfr ); /* Q_new */
/* condition on target (compared to float) has been put outside the loop */
@@ -799,6 +770,7 @@ void enc_pit_exc_ivas_fx(
lp_select = lp_filt_exc_enc_fx( MODE1, AUDIO, i_subfr, exc, h1, xn, y1, xn2, L_subfr, st_fx->L_frame, g_corr, clip_gain, &gain_pit, &lp_flag ); /* Q0 */
+
IF( EQ_16( lp_flag, NORMAL_OPERATION ) )
{
push_indice( hBstr, IND_LP_FILT_SELECT, lp_select, 1 );
@@ -884,21 +856,12 @@ void enc_pit_exc_ivas_fx(
IF( use_fcb != 0 )
{
Ltmp = L_mult0( gcode16, y2[L_subfr - 1] );
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp = L_shl_sat( Ltmp, add( 5, shift ) ); // Q_new+14+shift
Ltmp = L_negate( Ltmp );
Ltmp = L_mac_sat( Ltmp, xn[L_subfr - 1], 16384 ); // Q_new-1+15+shift
Ltmp = L_msu_sat( Ltmp, y1[L_subfr - 1], gain_pit ); // Q_new-1+15+shift
Ltmp = L_shl_sat( Ltmp, sub( 1, shift ) ); // Q_new+15
hGSCEnc->mem_w0_tmp_fx = round_fx_sat( Ltmp ); /*Q_new-1 */
-#else
- Ltmp = L_shl_o( Ltmp, add( 5, shift ), &Overflow ); // Q_new+14+shift
- Ltmp = L_negate( Ltmp );
- Ltmp = L_mac_o( Ltmp, xn[L_subfr - 1], 16384, &Overflow ); // Q_new-1+15+shift
- Ltmp = L_msu_o( Ltmp, y1[L_subfr - 1], gain_pit, &Overflow ); // Q_new-1+15+shift
- Ltmp = L_shl_o( Ltmp, sub( 1, shift ), &Overflow ); // Q_new+15
- hGSCEnc->mem_w0_tmp_fx = round_fx_o( Ltmp, &Overflow ); /*Q_new-1 */
-#endif
}
ELSE
{
@@ -918,18 +881,11 @@ void enc_pit_exc_ivas_fx(
FOR( i = 0; i < L_subfr; i++ )
{
/* code in Q9, gain_pit in Q14 */
- Ltmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ Ltmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new */
Ltmp = L_shl_sat( Ltmp, 5 ); /* Q15 + Q_new */
Ltmp = L_mac_sat( Ltmp, exc[i + i_subfr], gain_pit ); /* Q15 + Q_new */
Ltmp = L_shl_sat( Ltmp, 1 ); /* saturation can occur here Q16 + Q_new */
exc[i + i_subfr] = round_fx_sat( Ltmp ); /* Q_new */
-#else
- Ltmp = L_shl_o( Ltmp, 5, &Overflow ); /* Q15 + Q_new */
- Ltmp = L_mac_o( Ltmp, exc[i + i_subfr], gain_pit, &Overflow ); /* Q15 + Q_new */
- Ltmp = L_shl_o( Ltmp, 1, &Overflow ); /* saturation can occur here Q16 + Q_new */
- exc[i + i_subfr] = round_fx_o( Ltmp, &Overflow ); /* Q_new */
-#endif
move16();
}
}
diff --git a/lib_enc/enc_tran_fx.c b/lib_enc/enc_tran_fx.c
index c95f07e418b13f014775e377afae11da17daea63..fd97c8bf44a0642823a3aa3a5cde82a5c6e16f83 100644
--- a/lib_enc/enc_tran_fx.c
+++ b/lib_enc/enc_tran_fx.c
@@ -93,21 +93,17 @@ Word16 encod_tran_fx(
Word16 L_frame_fx;
Word16 shift_wsp;
Word32 L_tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
LPD_state_HANDLE hLPDmem = st_fx->hLPDmem;
L_frame_fx = st_fx->L_frame;
move16();
+
/*------------------------------------------------------------------*
* Initializations
*------------------------------------------------------------------*/
+
gain_pit = 0;
move16();
gain_code = L_deposit_l( 0 );
@@ -202,11 +198,13 @@ Word16 encod_tran_fx(
Jopt_flag = 1;
move16();
}
+
/*-----------------------------------------------------------------*
* Quantize the gains
* Test quantized gain of pitch for pitch clipping algorithm
* Update tilt of code: 0.0 (unvoiced) to 0.5 (voiced)
*-----------------------------------------------------------------*/
+
IF( Jopt_flag == 0 )
{
/* SQ gain_code */
@@ -230,14 +228,10 @@ Word16 encod_tran_fx(
}
gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit, st_fx->clip_var_fx );
-#ifdef ISSUE_1867_replace_overflow_libenc
Lgcode = L_shl_sat( gain_code, Q_new ); /* scaled gain_code with Qnew -> Q16*/
gcode16 = round_fx_sat( Lgcode );
-#else
- Lgcode = L_shl_o( gain_code, Q_new, &Overflow ); /* scaled gain_code with Qnew -> Q16*/
- gcode16 = round_fx_o( Lgcode, &Overflow );
-#endif
hLPDmem->tilt_code = Est_tilt2( &exc_fx[i_subfr], gain_pit, code, Lgcode, &voice_fac, shift ); /* Q15 */
+
/*-----------------------------------------------------------------*
* Update memory of the weighting filter
*-----------------------------------------------------------------*/
@@ -250,6 +244,7 @@ Word16 encod_tran_fx(
L_tmp = L_msu( L_tmp, y1[L_SUBFR - 1], gain_pit );
L_tmp = L_shl_sat( L_tmp, sub( 1, shift ) ); /* Q_new + 15 */
hLPDmem->mem_w0 = round_fx_sat( L_tmp ); /*Q_new-1*/
+
/*-----------------------------------------------------------------*
* Construct adaptive part of the excitation
* Save the non-enhanced excitation for FEC_exc
@@ -284,18 +279,11 @@ Word16 encod_tran_fx(
FOR( i = 0; i < L_SUBFR; i++ )
{
/* code in Q9, gain_pit in Q14 */
- L_tmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new */
L_tmp = L_shl_sat( L_tmp, 5 ); /* Q15 + Q_new */
L_tmp = L_mac_sat( L_tmp, exc_fx[i + i_subfr], gain_pit ); /* Q15 + Q_new */
L_tmp = L_shl_sat( L_tmp, 1 ); /* saturation can occur here Q16 + Q_new */
exc_fx[i + i_subfr] = round_fx_sat( L_tmp ); /* Q_new */
-#else
- L_tmp = L_shl_o( L_tmp, 5, &Overflow ); /* Q15 + Q_new */
- L_tmp = L_mac_o( L_tmp, exc_fx[i + i_subfr], gain_pit, &Overflow ); /* Q15 + Q_new */
- L_tmp = L_shl_o( L_tmp, 1, &Overflow ); /* saturation can occur here Q16 + Q_new */
- exc_fx[i + i_subfr] = round_fx_o( L_tmp, &Overflow ); /* Q_new */
-#endif
}
/*-----------------------------------------------------------------*
@@ -308,21 +296,12 @@ Word16 encod_tran_fx(
FOR( i = 0; i < L_SUBFR; i++ )
{
L_tmp = L_mult( gain_preQ, code_preQ[i] ); /* Q2 + Q10 -> Q13*/
-#ifdef ISSUE_1867_replace_overflow_libenc
- L_tmp = L_shl_sat( L_tmp, tmp1_fx ); /* Q16 + Q_exc */
+ L_tmp = L_shl_sat( L_tmp, tmp1_fx ); /* Q16 + Q_exc */
tmp_fx = round_fx_sat( L_tmp );
exc2_fx[i + i_subfr] = add_sat( exc2_fx[i + i_subfr], tmp_fx ); /* Q_exc */
move16();
exc_fx[i + i_subfr] = add_sat( exc_fx[i + i_subfr], tmp_fx ); /* Q_exc */
move16();
-#else
- L_tmp = L_shl_o( L_tmp, tmp1_fx, &Overflow ); /* Q16 + Q_exc */
- tmp_fx = round_fx_o( L_tmp, &Overflow );
- exc2_fx[i + i_subfr] = add_o( exc2_fx[i + i_subfr], tmp_fx, &Overflow ); /* Q_exc */
- move16();
- exc_fx[i + i_subfr] = add_o( exc_fx[i + i_subfr], tmp_fx, &Overflow ); /* Q_exc */
- move16();
-#endif
}
}
@@ -330,13 +309,8 @@ Word16 encod_tran_fx(
* Prepare TBE excitation
*-----------------------------------------------------------------*/
-#ifdef FIX_2010_PREP_TBE_EXC
prep_tbe_exc_fx( L_frame_fx, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
bwe_exc_fx, gain_preQ, code_preQ, Q10, Q_new, T0, T0_frac, st_fx->coder_type, st_fx->core_brate, st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#else
- prep_tbe_exc_fx( L_frame_fx, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
- bwe_exc_fx, gain_preQ, code_preQ, Q_new, T0, T0_frac, st_fx->coder_type, st_fx->core_brate, st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#endif
/*-----------------------------------------------------------------*
* Synthesize speech to update mem_syn[].
@@ -444,6 +418,7 @@ Word16 encod_tran_fx(
return tc_subfr;
}
+
Word16 encod_tran_ivas_fx(
Encoder_State *st_fx, /* i/o: state structure */
const Word16 speech_fx[], /* i : input speech Q0*/
@@ -460,7 +435,7 @@ Word16 encod_tran_ivas_fx(
Word16 tc_subfr, /* i/o: TC subframe classification Q0*/
Word16 position, /* i : maximum of residual signal index Q0*/
Word16 *unbits, /* i/o: number of unused bits Q0*/
- const Word16 shift, /* i : Scaling to get 12 bits */
+ const Word16 shift_r, /* i : Scaling to get 12 bits */
const Word16 Q_new /* i : Input scaling */
)
{
@@ -494,16 +469,14 @@ Word16 encod_tran_ivas_fx(
Word16 shift_wsp;
Word32 L_tmp;
Word16 q_h1;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+ Word16 shift, tmp;
BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
LPD_state_HANDLE hLPDmem = st_fx->hLPDmem;
+ shift = shift_r; /* for IVAS, shift_r is always 0 */
+ /* will be reusing the EVS shift strategy later on to allow of H1 overshoot */
+ move16();
L_frame_fx = st_fx->L_frame;
move16();
@@ -512,6 +485,7 @@ Word16 encod_tran_ivas_fx(
/*------------------------------------------------------------------*
* Initializations
*------------------------------------------------------------------*/
+
gain_pit = 0;
move16();
gain_code = L_deposit_l( 0 );
@@ -553,6 +527,7 @@ Word16 encod_tran_ivas_fx(
{
shift_wsp = sub( shift_wsp, 1 );
}
+
/*----------------------------------------------------------------*
* ACELP subframe loop
*----------------------------------------------------------------*/
@@ -572,9 +547,15 @@ Word16 encod_tran_ivas_fx(
res_fx, L_SUBFR, p_Aw, st_fx->preemph_fac, xn, cn, h1 );
q_h1 = sub( 14, norm_s( h1[0] ) );
+ tmp = sub( 14, norm_arr( h1, L_SUBFR ) );
+ shift = sub( q_h1, tmp ); /* shift is initialized to shift_r ( to 0) at the beginning of the scope, re-compute shift_wsp in case it has changed */
+ shift_wsp = add( Q_new, shift );
+ if ( LT_32( st_fx->core_brate, MIN_BRATE_AVQ_EXC ) )
+ {
+ shift_wsp = sub( shift_wsp, 1 );
+ }
Copy_Scale_sig( h1, h2_fx, L_SUBFR, sub( 11, q_h1 ) ); /*Q11*/
- Scale_sig( h1, L_SUBFR, sub( 14, q_h1 ) );
-
+ Scale_sig( h1, L_SUBFR, add( sub( 14, q_h1 ), shift ) );
/* scaling of xn[] to limit dynamic at 12 bits */
Scale_sig( xn, L_SUBFR, shift );
@@ -611,11 +592,13 @@ Word16 encod_tran_ivas_fx(
Jopt_flag = 1;
move16();
}
+
/*-----------------------------------------------------------------*
* Quantize the gains
* Test quantized gain of pitch for pitch clipping algorithm
* Update tilt of code: 0.0 (unvoiced) to 0.5 (voiced)
*-----------------------------------------------------------------*/
+
IF( Jopt_flag == 0 )
{
/* SQ gain_code */
@@ -639,14 +622,10 @@ Word16 encod_tran_ivas_fx(
}
gp_clip_test_gain_pit_fx( st_fx->element_mode, st_fx->core_brate, gain_pit, st_fx->clip_var_fx );
-#ifdef ISSUE_1867_replace_overflow_libenc
Lgcode = L_shl_sat( gain_code, Q_new ); /* scaled gain_code with Qnew -> Q16*/
gcode16 = round_fx_sat( Lgcode );
-#else
- Lgcode = L_shl_o( gain_code, Q_new, &Overflow ); /* scaled gain_code with Qnew -> Q16*/
- gcode16 = round_fx_o( Lgcode, &Overflow );
-#endif
hLPDmem->tilt_code = est_tilt_ivas_fx( &exc_fx[i_subfr], gain_pit, code, gain_code, &voice_fac, Q_new, L_SUBFR, 0 ); // Q15
+
/*-----------------------------------------------------------------*
* Update memory of the weighting filter
*-----------------------------------------------------------------*/
@@ -659,6 +638,7 @@ Word16 encod_tran_ivas_fx(
L_tmp = L_msu( L_tmp, y1[L_SUBFR - 1], gain_pit ); // Q_new-1+15+shift
L_tmp = L_shl_sat( L_tmp, sub( 1, shift ) ); // Q_new+15
hLPDmem->mem_w0 = round_fx_sat( L_tmp ); /*Q_new-1*/
+
/*-----------------------------------------------------------------*
* Construct adaptive part of the excitation
* Save the non-enhanced excitation for FEC_exc
@@ -690,21 +670,15 @@ Word16 encod_tran_ivas_fx(
* Construct adaptive part of the excitation
* Save the non-enhanced excitation for FEC_exc
*-----------------------------------------------------------------*/
+
FOR( i = 0; i < L_SUBFR; i++ )
{
/* code in Q9, gain_pit in Q14 */
- L_tmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = L_mult( gcode16, code[i] ); /* Q10 + Q_new */
L_tmp = L_shl_sat( L_tmp, 5 ); /* Q15 + Q_new */
L_tmp = L_mac_sat( L_tmp, exc_fx[i + i_subfr], gain_pit ); /* Q15 + Q_new */
L_tmp = L_shl_sat( L_tmp, 1 ); /* saturation can occur here Q16 + Q_new */
exc_fx[i + i_subfr] = round_fx_sat( L_tmp ); /* Q_new */
-#else
- L_tmp = L_shl_o( L_tmp, 5, &Overflow ); /* Q15 + Q_new */
- L_tmp = L_mac_o( L_tmp, exc_fx[i + i_subfr], gain_pit, &Overflow ); /* Q15 + Q_new */
- L_tmp = L_shl_o( L_tmp, 1, &Overflow ); /* saturation can occur here Q16 + Q_new */
- exc_fx[i + i_subfr] = round_fx_o( L_tmp, &Overflow ); /* Q_new */
-#endif
}
/*-----------------------------------------------------------------*
@@ -717,21 +691,12 @@ Word16 encod_tran_ivas_fx(
FOR( i = 0; i < L_SUBFR; i++ )
{
L_tmp = L_mult( gain_preQ, code_preQ[i] ); /* Q2 + Q10 -> Q13*/
-#ifdef ISSUE_1867_replace_overflow_libenc
- L_tmp = L_shl_sat( L_tmp, tmp1_fx ); /* Q16 + Q_exc */
+ L_tmp = L_shl_sat( L_tmp, tmp1_fx ); /* Q16 + Q_exc */
tmp_fx = round_fx_sat( L_tmp );
exc2_fx[i + i_subfr] = add_sat( exc2_fx[i + i_subfr], tmp_fx ); /* Q_exc */
move16();
exc_fx[i + i_subfr] = add_sat( exc_fx[i + i_subfr], tmp_fx ); /* Q_exc */
-#else
- L_tmp = L_shl_o( L_tmp, tmp1_fx, &Overflow ); /* Q16 + Q_exc */
- tmp_fx = round_fx_o( L_tmp, &Overflow );
-
- exc2_fx[i + i_subfr] = add_o( exc2_fx[i + i_subfr], tmp_fx, &Overflow ); /* Q_exc */
- move16();
- exc_fx[i + i_subfr] = add_o( exc_fx[i + i_subfr], tmp_fx, &Overflow ); /* Q_exc */
-#endif
move16();
}
}
@@ -740,15 +705,9 @@ Word16 encod_tran_ivas_fx(
* Prepare TBE excitation
*-----------------------------------------------------------------*/
-#ifdef FIX_2010_PREP_TBE_EXC
prep_tbe_exc_fx( L_frame_fx, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
bwe_exc_fx, gain_preQ, code_preQ, Q10, Q_new, T0, T0_frac, st_fx->coder_type, st_fx->core_brate,
st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#else
- prep_tbe_exc_fx( L_frame_fx, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR],
- bwe_exc_fx, gain_preQ, code_preQ, Q_new, T0, T0_frac, st_fx->coder_type, st_fx->core_brate,
- st_fx->element_mode, st_fx->idchan, st_fx->hBWE_TD != NULL, st_fx->tdm_LRTD_flag );
-#endif
/*-----------------------------------------------------------------*
* Synthesize speech to update mem_syn[].
diff --git a/lib_enc/enc_uv_fx.c b/lib_enc/enc_uv_fx.c
index 28c79a9685515706fc1314278f47efd228229791..1a531b8bed7810dd5a1bd8abea53ff47792b24e4 100644
--- a/lib_enc/enc_uv_fx.c
+++ b/lib_enc/enc_uv_fx.c
@@ -1,6 +1,7 @@
/*====================================================================================
EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0
====================================================================================*/
+
#include
#include
#include "options.h" /* Compilation switches */
@@ -9,12 +10,13 @@
#include "rom_com.h"
#include "prot_fx_enc.h" /* Function prototypes */
+
/*-------------------------------------------------------------------*
* encod_unvoiced()
*
* Encode unvoiced (UC) frames
*-------------------------------------------------------------------*/
-/*fixed point implementation of unvoiced_encoder*/
+
void encod_unvoiced_fx(
Encoder_State *st_fx, /* i/o: state structure */
const Word16 *speech_fx, /* i : Input speech Q_new*/
@@ -81,7 +83,6 @@ void encod_unvoiced_fx(
Q_xn = add( sub( Q_new, 1 ), shift );
Q_new_p5 = add( Q_new, 5 );
-
FOR( i_subfr = 0; i_subfr < L_FRAME; i_subfr += L_SUBFR )
{
/*----------------------------------------------------------------*
@@ -89,6 +90,7 @@ void encod_unvoiced_fx(
* Find the excitation search target "xn" and innovation target in residual domain "cn"
* Compute impulse response, h1[], of weighted synthesis filter
*----------------------------------------------------------------*/
+
i_subfr_idx = shr( i_subfr, 6 );
Copy( &res_fx[i_subfr], &exc_fx[i_subfr], L_SUBFR ); /* Q_new */
@@ -100,9 +102,11 @@ void encod_unvoiced_fx(
/* scaling of xn[] to limit dynamic at 12 bits */
Scale_sig( xn_fx, L_SUBFR, shift );
+
/*----------------------------------------------------------------*
* Unvoiced subframe processing
*----------------------------------------------------------------*/
+
IF( !uc_two_stage_flag )
{
*pt_pitch_fx = gaus_encode_fx( st_fx, i_subfr, h1_fx, xn_fx, exc_fx, &hLPDmem->mem_w0, st_fx->clip_var_fx,
@@ -123,9 +127,11 @@ void encod_unvoiced_fx(
* Gain clipping test to avoid unstable synthesis on frame erasure
* or in case of floating point encoder & fixed p. decoder
*-----------------------------------------------------------------*/
+
Mode2_gp_clip_fx( st_fx->voicing_fx, i_subfr, st_fx->coder_type, xn_fx, st_fx->clip_var_fx, L_SUBFR, Q_xn );
*pt_pitch_fx = L_SUBFR;
move16();
+
/*----------------------------------------------------------------------*
* Encode the algebraic innovation *
*----------------------------------------------------------------------*/
@@ -165,15 +171,18 @@ void encod_unvoiced_fx(
/*----------------------------------------------------------*
* - voice factor (for pitch enhancement) *
*----------------------------------------------------------*/
+
E_UTIL_voice_factor( exc_fx, i_subfr, code_fx, gain_pit_fx, L_gain_code_fx, &voice_fac_fx, &( hLPDmem->tilt_code ), L_SUBFR, acelp_cfg->voice_tilt, Q_new, shift );
IF( st_fx->Opt_RF_ON )
{
st_fx->hRF->rf_tilt_buf[i_subfr_idx] = hLPDmem->tilt_code;
}
+
/*-----------------------------------------------------------------*
* Update memory of the weighting filter
*-----------------------------------------------------------------*/
+
/* st_fx->mem_w0 = xn[L_SUBFR-1] - (gain_pit*y1[L_SUBFR-1]) - (gain_code*y2[L_SUBFR-1]); */
Ltmp = Mpy_32_16_1( L_gain_code_fx, y2_fx[L_SUBFR - 1] ); /* Q10 */
Ltmp = L_shl( Ltmp, add( 5, Q_xn ) ); /* Q15 + Q_xn */
@@ -222,6 +231,7 @@ void encod_unvoiced_fx(
* Synthesize speech to update mem_syn[].
* Update A(z) filters
*-----------------------------------------------------------------*/
+
Syn_filt_s( 1, p_Aq_fx, M, &exc_fx[i_subfr], &syn_fx[i_subfr], L_SUBFR, hLPDmem->mem_syn, 1 );
p_Aw_fx += ( M + 1 );
@@ -238,6 +248,7 @@ void encod_unvoiced_fx(
return;
}
+
void encod_unvoiced_ivas_fx(
Encoder_State *st_fx, /* i/o: state structure */
const Word16 *speech_fx, /* i : Input speech Q_new*/
@@ -287,6 +298,7 @@ void encod_unvoiced_ivas_fx(
/*------------------------------------------------------------------*
* Initializations
*------------------------------------------------------------------*/
+
gain_pit_fx = 0;
move16();
@@ -306,7 +318,6 @@ void encod_unvoiced_ivas_fx(
Q_xn = add( sub( Q_new, 1 ), shift );
Q_new_p5 = add( Q_new, 5 );
-
FOR( i_subfr = 0; i_subfr < L_FRAME; i_subfr += L_SUBFR )
{
/*----------------------------------------------------------------*
@@ -314,6 +325,7 @@ void encod_unvoiced_ivas_fx(
* Find the excitation search target "xn" and innovation target in residual domain "cn"
* Compute impulse response, h1[], of weighted synthesis filter
*----------------------------------------------------------------*/
+
i_subfr_idx = shr( i_subfr, 6 );
Copy( &res_fx[i_subfr], &exc_fx[i_subfr], L_SUBFR ); /* Q_new */
@@ -326,9 +338,11 @@ void encod_unvoiced_ivas_fx(
/* scaling of xn[] to limit dynamic at 12 bits */
Scale_sig( xn_fx, L_SUBFR, shift ); // Q_new - 1 + shift
+
/*----------------------------------------------------------------*
* Unvoiced subframe processing
*----------------------------------------------------------------*/
+
IF( !uc_two_stage_flag )
{
*pt_pitch_fx = gaus_encode_fx( st_fx, i_subfr, h1_fx, xn_fx, exc_fx, &hLPDmem->mem_w0, st_fx->clip_var_fx,
@@ -341,22 +355,25 @@ void encod_unvoiced_ivas_fx(
/*----------------------------------------------------------------*
* Unvoiced subframe processing in two stages
*----------------------------------------------------------------*/
+
// PMT("The code below needs validation, never been tested")
/* No adaptive codebook (UC) */
set16_fx( y1, 0, L_SUBFR );
set16_fx( exc_fx + i_subfr, 0, L_SUBFR );
+
/*-----------------------------------------------------------------*
* Gain clipping test to avoid unstable synthesis on frame erasure
* or in case of floating point encoder & fixed p. decoder
*-----------------------------------------------------------------*/
+
Mode2_gp_clip_fx( st_fx->voicing_fx, i_subfr, st_fx->coder_type, xn_fx, st_fx->clip_var_fx, L_SUBFR, Q_xn );
*pt_pitch_fx = L_SUBFR << 6;
move16();
+
/*----------------------------------------------------------------------*
* Encode the algebraic innovation *
*----------------------------------------------------------------------*/
- // E_ACELP_innovative_codebook_fx( exc_fx, *pt_pitch_fx, 0, 1, gain_pit_fx, hLPDmem->tilt_code, acelp_cfg, i_subfr, p_Aq_fx, h1_fx, xn_fx, cn_fx, y1, y2_fx, (Word8) st_fx->acelp_autocorr, &prm, code_fx, shift, st_fx->L_frame, st_fx->last_L_frame, st_fx->total_brate, st_fx->element_mode );
inov_encode_ivas_fx( st_fx, st_fx->core_brate, 0, L_FRAME, st_fx->last_L_frame,
UNVOICED, st_fx->bwidth, 1, i_subfr, -1, p_Aq_fx,
gain_pit_fx, cn_fx, exc_fx, h2_fx, hLPDmem->tilt_code, *pt_pitch_fx, xn_fx, code_fx, y2_fx, &unbits_PI, L_SUBFR, shift, Q_new );
@@ -398,6 +415,7 @@ void encod_unvoiced_ivas_fx(
/*----------------------------------------------------------*
* - voice factor (for pitch enhancement) *
*----------------------------------------------------------*/
+
E_UTIL_voice_factor( exc_fx, i_subfr, code_fx, gain_pit_fx, L_gain_code_fx, &voice_fac_fx, &( hLPDmem->tilt_code ), L_SUBFR, acelp_cfg->voice_tilt, Q_new, shift );
if ( st_fx->Opt_RF_ON )
@@ -408,6 +426,7 @@ void encod_unvoiced_ivas_fx(
/*-----------------------------------------------------------------*
* Update memory of the weighting filter
*-----------------------------------------------------------------*/
+
/* st_fx->mem_w0 = xn[L_SUBFR-1] - (gain_pit*y1[L_SUBFR-1]) - (gain_code*y2[L_SUBFR-1]); */
Ltmp = Mpy_32_16_1( L_gain_code_fx, y2_fx[L_SUBFR - 1] ); /* Q10 */
Ltmp = L_shl( Ltmp, add( 5, Q_xn ) ); // Qxn+15
@@ -462,6 +481,7 @@ void encod_unvoiced_ivas_fx(
* Synthesize speech to update mem_syn[].
* Update A(z) filters
*-----------------------------------------------------------------*/
+
Syn_filt_s( 1, p_Aq_fx, M, &exc_fx[i_subfr], &syn_fx[i_subfr], L_SUBFR, hLPDmem->mem_syn, 1 );
p_Aw_fx += ( M + 1 );
diff --git a/lib_enc/ext_sig_ana_fx.c b/lib_enc/ext_sig_ana_fx.c
index 42f6dc487b52d5df5c56c46676513741ff3d6f8e..20d18c7796b4dd86b8f12380900ba14952119694 100644
--- a/lib_enc/ext_sig_ana_fx.c
+++ b/lib_enc/ext_sig_ana_fx.c
@@ -914,10 +914,10 @@ void core_signal_analysis_high_bitrate_ivas_fx(
tmp = BASOP_Util_Divide1616_Scale( st->bwidth_sw_cnt, BWS_TRAN_PERIOD, &exp_diff );
factor = L_shl( L_deposit_h( tmp ), exp_diff ); // Q31
- v_multc_fixed( hTcxEnc->spectrum_fx[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ),
- factor,
- hTcxEnc->spectrum_fx[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ),
- L_subframe - L_FRAME16k / ( 2 * nSubframes ) );
+ v_multc_fx( hTcxEnc->spectrum_fx[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ),
+ factor,
+ hTcxEnc->spectrum_fx[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ),
+ L_subframe - L_FRAME16k / ( 2 * nSubframes ) );
}
}
hTcxEnc->spectrum_e[frameno] = s_max( exp[0], exp[1] );
@@ -954,7 +954,7 @@ void core_signal_analysis_high_bitrate_ivas_fx(
tmp = Sqrt16( tmp, &exp_diff );
factor = L_shl( L_deposit_h( tmp ), exp_diff ); // Q31
- v_multc_fixed( hTcxEnc->spectrum_fx[frameno], factor, hTcxEnc->spectrum_fx[frameno], L_subframe );
+ v_multc_fx( hTcxEnc->spectrum_fx[frameno], factor, hTcxEnc->spectrum_fx[frameno], L_subframe );
}
ELSE
{
@@ -996,10 +996,10 @@ void core_signal_analysis_high_bitrate_ivas_fx(
tmp = BASOP_Util_Divide1616_Scale( st->bwidth_sw_cnt, BWS_TRAN_PERIOD, &exp_diff );
factor = L_shl( L_deposit_h( tmp ), exp_diff ); // Q31
- v_multc_fixed( hTcxEnc->spectrum_fx[frameno] + L_FRAME16k / nSubframes,
- factor,
- hTcxEnc->spectrum_fx[frameno] + L_FRAME16k / nSubframes,
- L_subframe - L_FRAME16k / nSubframes );
+ v_multc_fx( hTcxEnc->spectrum_fx[frameno] + L_FRAME16k / nSubframes,
+ factor,
+ hTcxEnc->spectrum_fx[frameno] + L_FRAME16k / nSubframes,
+ L_subframe - L_FRAME16k / nSubframes );
}
IF( NE_16( st->element_mode, IVAS_CPE_MDCT ) )
@@ -1121,10 +1121,10 @@ void core_signal_analysis_high_bitrate_ivas_fx(
tmp = BASOP_Util_Divide1616_Scale( st->bwidth_sw_cnt, BWS_TRAN_PERIOD, &exp_diff );
factor = L_shl( L_deposit_h( tmp ), exp_diff ); // Q31
- v_multc_fixed( spectrum[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ),
- factor,
- spectrum[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ),
- L_subframe - L_FRAME16k / ( 2 * nSubframes ) );
+ v_multc_fx( spectrum[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ),
+ factor,
+ spectrum[frameno] + i * tcx5SizeFB + L_FRAME16k / ( 2 * nSubframes ),
+ L_subframe - L_FRAME16k / ( 2 * nSubframes ) );
}
}
}
@@ -1149,7 +1149,7 @@ void core_signal_analysis_high_bitrate_ivas_fx(
tmp = Sqrt16( tmp, &exp_diff );
factor = L_shl( L_deposit_h( tmp ), exp_diff ); // Q31
- v_multc_fixed( spectrum[frameno], factor, spectrum[frameno], L_subframe );
+ v_multc_fx( spectrum[frameno], factor, spectrum[frameno], L_subframe );
}
ELSE
{
@@ -1191,7 +1191,7 @@ void core_signal_analysis_high_bitrate_ivas_fx(
tmp = BASOP_Util_Divide1616_Scale( st->bwidth_sw_cnt, BWS_TRAN_PERIOD, &exp_diff );
factor = L_shl( L_deposit_h( tmp ), exp_diff ); // Q31
- v_multc_fixed( spectrum[frameno] + L_FRAME16k / nSubframes, factor, spectrum[frameno] + L_FRAME16k / nSubframes, L_subframe - L_FRAME16k / nSubframes );
+ v_multc_fx( spectrum[frameno] + L_FRAME16k / nSubframes, factor, spectrum[frameno] + L_FRAME16k / nSubframes, L_subframe - L_FRAME16k / nSubframes );
}
}
}
diff --git a/lib_enc/fd_cng_enc_fx.c b/lib_enc/fd_cng_enc_fx.c
index 8b41b4e7847b75e49f8d0bcee0f72a6eaa051f0d..6834958d1b0937c9e8590b4c2a97a335fe0474db 100644
--- a/lib_enc/fd_cng_enc_fx.c
+++ b/lib_enc/fd_cng_enc_fx.c
@@ -2467,11 +2467,7 @@ void FdCng_encodeSID_ivas_fx(
v_fx[i] = Mpy_32_32( 671088640 /*10 in Q26*/, BASOP_Util_Log10( E_fx[i], hFdCngEnc->msNoiseEst_fx_exp ) ); // Q20 = 26+25-31
move32();
}
-#ifdef FIX_1980_CRASH_FDCNG_ENCODESID
e_fx = L_add( e_fx, L_shr( v_fx[i], 1 ) ); // Q19, add one bit headroom
-#else
- e_fx = L_add( e_fx, v_fx[i] ); // Q20
-#endif
}
/* Normalize MSVQ input */
@@ -2540,11 +2536,7 @@ void FdCng_encodeSID_ivas_fx(
{
gain_fx = L_add( gain_fx, v_fx[i] ); // Q = 31 - v_e
}
-#ifdef FIX_1980_CRASH_FDCNG_ENCODESID
- e_fx = L_shl( e_fx, sub( 12, v_e ) ); // Q = 31 - v_e
-#else
- e_fx = L_shl( e_fx, sub( 11, v_e ) ); // Q = 31 - v_e
-#endif
+ e_fx = L_shl( e_fx, sub( 12, v_e ) ); // Q = 31 - v_e
gain_fx = Mpy_32_16_1( L_sub( e_fx, gain_fx ), div_s( 1, N ) ); // Q = 31 - v_e
gain_fx = L_shl( gain_fx, sub( v_e, 8 ) ); // Q23
diff --git a/lib_enc/find_tar_fx.c b/lib_enc/find_tar_fx.c
index 0fec2c42479ea010499ffdacc4d400cc165f30bc..ca3f50f115a0fb59f9479896ecf11b78c3434f99 100644
--- a/lib_enc/find_tar_fx.c
+++ b/lib_enc/find_tar_fx.c
@@ -134,11 +134,7 @@ void find_targets_fx(
{
Ltmp = L_msu( Ltmp, Aqs[j], h1[i - j] ); /* Q27 */
}
-#ifdef ISSUE_1867_replace_overflow_libenc
h1[i] = round_fx( L_shl_sat( Ltmp, s ) ); /* Q11 + s */
-#else
- h1[i] = round_fx( L_shl_o( Ltmp, s, &Overflow ) ); /* Q11 + s */
-#endif
}
Ltmp = L_mult( Ap[i], s2 ); /* Q27 */
FOR( j = 1; j <= M; j++ )
@@ -185,12 +181,7 @@ void find_targets_ivas_fx(
Word32 h1_32[6 * L_SUBFR];
Word16 sf;
Word64 Ltmp64;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
+
/*------------------------------------------------------------------------*
* Find the target vector for excitation search:
*
@@ -256,20 +247,12 @@ void find_targets_ivas_fx(
}
set32_fx( h1_32, 0, L_subfr );
-#ifndef ISSUE_1867_replace_overflow_libenc
- Overflow = 0;
- move16();
-#endif
FOR( i = 0; i < M; i++ )
{
Ltmp64 = W_mult_16_16( Ap[i], s2 ); /* Q27 */
FOR( j = 1; j <= i; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp64 = W_msu_16_16( Ltmp64, Aqs[j], extract_h( L_shl_sat( h1_32[i - j], s ) ) ); /* Q27 */
-#else
- Ltmp64 = W_msu_16_16( Ltmp64, Aqs[j], extract_h( L_shl_o( h1_32[i - j], s, &Overflow ) ) ); /* Q27 */
-#endif
}
h1_32[i] = W_extract_l( Ltmp64 ); /* Q27 */
move32();
@@ -278,29 +261,17 @@ void find_targets_ivas_fx(
Ltmp64 = W_mult_16_16( Ap[i], s2 ); /* Q27 */
FOR( j = 1; j <= M; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp64 = W_msu_16_16( Ltmp64, Aqs[j], extract_h( L_shl_sat( h1_32[i - j], s ) ) ); /* Q27 */
-#else
- Ltmp64 = W_msu_16_16( Ltmp64, Aqs[j], extract_h( L_shl_o( h1_32[i - j], s, &Overflow ) ) ); /* Q27 */
-#endif
}
h1_32[M] = W_extract_l( Ltmp64 ); /* Q27 */
move32();
FOR( i = M + 1; i < L_subfr; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp64 = W_msu_16_16( 0, Aqs[1], extract_h( L_shl_sat( h1_32[i - 1], s ) ) ); /* Q27 */
-#else
- Ltmp64 = W_msu_16_16( 0, Aqs[1], extract_h( L_shl_o( h1_32[i - 1], s, &Overflow ) ) ); /* Q27 */
-#endif
FOR( j = 2; j <= M; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp64 = W_msu_16_16( Ltmp64, Aqs[j], extract_h( L_shl_sat( h1_32[i - j], s ) ) ); /* Q27 */
-#else
- Ltmp64 = W_msu_16_16( Ltmp64, Aqs[j], extract_h( L_shl_o( h1_32[i - j], s, &Overflow ) ) ); /* Q27 */
-#endif
}
h1_32[i] = W_extract_l( Ltmp64 ); /* Q27 */
move32();
diff --git a/lib_enc/find_tilt_fx.c b/lib_enc/find_tilt_fx.c
index 56078ec1eaf8b25faf54ec72f4a98b254dd219ef..e267040991aa03cd00a47d929400681729e60a86 100644
--- a/lib_enc/find_tilt_fx.c
+++ b/lib_enc/find_tilt_fx.c
@@ -28,9 +28,8 @@ void find_tilt_fx(
Word32 hp_E[], /* o : energy in HF Q_new + Q_SCALE*/
const Word16 codec_mode, /* i : MODE1 or MODE2 Q0*/
const Word16 Q_new, /* i : scaling factor */
- Word32 *bckr_tilt_lt /* i/o: lf/hf E ratio of background noise Q16*/
- ,
- Word16 Opt_vbr_mode /* Q0 */
+ Word32 *bckr_tilt_lt, /* i/o: lf/hf E ratio of background noise Q16*/
+ Word16 Opt_vbr_mode /* Q0 */
)
{
Word32 lp_bckr = 0, hp_bckr = 0, lp_E, Ltmp;
@@ -44,12 +43,7 @@ void find_tilt_fx(
Word16 scaling;
move32();
move32();
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
/*-----------------------------------------------------------------*
* Initializations
*-----------------------------------------------------------------*/
@@ -110,13 +104,8 @@ void find_tilt_fx(
/*mean_voi = 0.5f * (voicing[1] + voicing[2]) + corr_shift;*/
Ltmp = L_mult( voicing[1], 16384 /* 0.5 in Q15 */ ); /* Q31 */
Ltmp = L_mac( Ltmp, voicing[2], 16384 /* 0.5 in Q15 */ ); /* Q31 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- Ltmp = L_mac_sat( Ltmp, corr_shift, 32767 ); /* Q31 */
- mean_voi = round_fx_sat( Ltmp ); /* Q15 */
-#else
- Ltmp = L_mac_o( Ltmp, corr_shift, 32767, &Overflow ); /* Q31 */
- mean_voi = round_fx_o( Ltmp, &Overflow ); /* Q15 */
-#endif
+ Ltmp = L_mac_sat( Ltmp, corr_shift, 32767 ); /* Q31 */
+ mean_voi = round_fx_sat( Ltmp ); /* Q15 */
/*f0 = INT_FS_FX / pitch[2];*/
e_tmp = norm_s( pitch[2] );
@@ -162,23 +151,15 @@ void find_tilt_fx(
tmp = sub( freq, f2 );
IF( L_mac0( -(Word32) TH_D_FX * TH_D_FX, tmp, tmp ) < 0 )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
lp_E = L_add_sat( *pt_E, lp_E ); /* Q_new + QSCALE - 2 */
-#else
- lp_E = L_add_o( *pt_E, lp_E, &Overflow ); /* Q_new + QSCALE - 2 */
-#endif
- m_cnt = add( m_cnt, 1 ); /* Q0 */
+ m_cnt = add( m_cnt, 1 ); /* Q0 */
}
pt_E++;
}
-#ifdef ISSUE_1867_replace_overflow_libenc
f1 = add_sat( f1, f0 );
f2 = add_sat( f2, f0 );
-#else
- f1 = add_o( f1, f0, &Overflow );
- f2 = add_o( f2, f0, &Overflow );
-#endif
}
+
/*lp_E = lp_E / (float)cnt - lp_bckr;*/
e_tmp = sub( norm_l( lp_E ), 1 );
m_tmp = extract_h( L_shl( lp_E, e_tmp ) );
@@ -191,11 +172,7 @@ void find_tilt_fx(
m_tmp = div_s( m_tmp, m_cnt ); /* exp(e_tmp + e_cnt) */
e_tmp = sub( e_tmp, e_cnt );
-#ifdef ISSUE_1867_replace_overflow_libenc
lp_E = L_sub_sat( L_shr_sat( m_tmp, sub( e_tmp, 1 ) ), lp_bckr ); /* Q_new + QSCALE */
-#else
- lp_E = L_sub_o( L_shr_sat( m_tmp, sub( e_tmp, 1 ) ), lp_bckr, &Overflow ); /* Q_new + QSCALE */
-#endif
pt_E = tmp_E + VOIC_BINS; /* Update for next half-frame */
}
@@ -236,11 +213,7 @@ void find_tilt_fx(
IF( EQ_16( bwidth, NB ) ) /* For NB input, compensate for the missing bands */
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp = L_shl_sat( ee[i], 3 );
-#else
- Ltmp = L_shl_o( ee[i], 3, &Overflow );
-#endif
IF( EQ_32( Ltmp, MAX_32 ) ) /* if Overflow: Compute with less precision */
{
Ltmp = Mult_32_16( ee[i], 24576 /* 0.75 in Q15 */ ); /* 6/8 Q6*/
@@ -295,14 +268,9 @@ void find_tilt_ivas_fx(
Word64 sum;
Word16 inv_bands, q_lp_E;
Word32 Le_min_scaled, Ltmp2;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
move32();
move32();
+
/*-----------------------------------------------------------------*
* Initializations
*-----------------------------------------------------------------*/
@@ -370,15 +338,10 @@ void find_tilt_ivas_fx(
hp_bckr = L_add_sat( L_shl_sat( hp_bckr, 1 ), hp_bckr ); /* Q_new */
}
/*mean_voi = 0.5f * (voicing[1] + voicing[2]) + corr_shift;*/
- Ltmp = L_mult( voicing[1], 16384 /* 0.5 in Q15 */ ); // Q31
- Ltmp = L_mac( Ltmp, voicing[2], 16384 /* 0.5 in Q15 */ ); // Q31
-#ifdef ISSUE_1867_replace_overflow_libenc
+ Ltmp = L_mult( voicing[1], 16384 /* 0.5 in Q15 */ ); // Q31
+ Ltmp = L_mac( Ltmp, voicing[2], 16384 /* 0.5 in Q15 */ ); // Q31
Ltmp = L_mac_sat( Ltmp, corr_shift, 32767 /* 1.0f in Q15 */ ); // Q31
mean_voi = round_fx_sat( Ltmp ); // Q15
-#else
- Ltmp = L_mac_o( Ltmp, corr_shift, 32767 /* 1.0f in Q15 */, &Overflow ); // Q31
- mean_voi = round_fx_o( Ltmp, &Overflow ); // Q15
-#endif
/*f0 = INT_FS_FX / pitch[2];*/
e_tmp = norm_s( pitch[2] );
@@ -430,14 +393,10 @@ void find_tilt_ivas_fx(
}
pt_E++;
}
-#ifdef ISSUE_1867_replace_overflow_libenc
f1 = add_sat( f1, f0 );
f2 = add_sat( f2, f0 );
-#else
- f1 = add_o( f1, f0, &Overflow );
- f2 = add_o( f2, f0, &Overflow );
-#endif
}
+
/*lp_E = lp_E / (float)cnt - lp_bckr;*/
e_tmp = sub( W_norm( sum ), 1 );
m_tmp = extract_h( W_extract_h( W_shl( sum, e_tmp ) ) ); // q_lf_E+1+e_tmp-32-16
@@ -504,12 +463,8 @@ void find_tilt_ivas_fx(
IF( bwidth == NB ) /* For NB input, compensate for the missing bands */
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp = L_shl_sat( ee[i], 3 ); /* Q6 */
-#else
- Ltmp = L_shl_o( ee[i], 3, &Overflow ); /* Q6 */
-#endif
- IF( EQ_32( Ltmp, MAX_32 ) ) /* if Overflow: Compute with less precision */
+ IF( EQ_32( Ltmp, MAX_32 ) ) /* if Overflow: Compute with less precision */
{
Ltmp = Mult_32_16( ee[i], 24576 /* 0.75 in Q15 */ ); /* 6/8 Q6*/
ee[i] = L_shl_sat( Ltmp, 3 ); /* Q6 */
diff --git a/lib_enc/find_uv_fx.c b/lib_enc/find_uv_fx.c
index 401b64cb55346e5cd824b8d5c9d1e2c2d1034478..8554b03dd54fadbfadfc9a78ac3b463ef3beb587 100644
--- a/lib_enc/find_uv_fx.c
+++ b/lib_enc/find_uv_fx.c
@@ -115,13 +115,6 @@ Word16 find_uv_fx( /* o : coding type */
Word16 ee0_th, ee1_th, voi_th, nb_cond, flag_low_relE;
NOISE_EST_HANDLE hNoiseEst = st_fx->hNoiseEst;
SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
Word16 Last_Resort;
Word16 vadnoise;
@@ -199,13 +192,9 @@ Word16 find_uv_fx( /* o : coding type */
* Average voicing (normalized correlation)
*-----------------------------------------------------------------*/
- /*mean_ee = 1.0f/3.0f * (st->ee_old + ee[0] + ee[1]); */ /* coefficients take into account the position of the window */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ /*mean_ee = 1.0f/3.0f * (st->ee_old + ee[0] + ee[1]); */ /* coefficients take into account the position of the window */
mean_ee = L_add_sat( L_add_sat( st_fx->ee_old_fx, ee[0] ), ee[1] ); /* Q6 */
-#else
- mean_ee = L_add_o( L_add_o( st_fx->ee_old_fx, ee[0], &Overflow ), ee[1], &Overflow ); /* Q6 */
-#endif
- mean_ee = Mult_32_16( mean_ee, 10923 /* 1/3 in Q15 */ ); /*Q6*/
+ mean_ee = Mult_32_16( mean_ee, 10923 /* 1/3 in Q15 */ ); /*Q6*/
/* mean_voi3 = 1.0f/3.0f * (voicing[0] + voicing[1] + voicing[2]);*/
Ltmp0 = L_mult( st_fx->voicing_fx[0], 10923 /* 1/3 in Q15 */ ); /* Q31 */
@@ -230,11 +219,7 @@ Word16 find_uv_fx( /* o : coding type */
{
dE2_th = 21 << 10;
move32();
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( GE_16( add_sat( mean_voi3, corr_shift ), 22282 /* 0.68 in Q15 */ ) ) /*( mean_voi3 + corr_shift ) >= 0.68f*/
-#else
- if ( GE_16( add_o( mean_voi3, corr_shift, &Overflow ), 22282 /* 0.68 in Q15 */ ) ) /*( mean_voi3 + corr_shift ) >= 0.68f*/
-#endif
{
nb_cond = 0;
move16();
@@ -313,11 +298,7 @@ Word16 find_uv_fx( /* o : coding type */
test();
if ( ( EQ_16( st_fx->last_coder_type_raw, UNVOICED ) ) || /* previous frame was unvoiced */
( ( LT_32( ee[0], ee0_th ) ) && ( GT_32( hp_E[0], L_shl( E_MIN_FX, Q_new ) ) ) && /* energy is concentrated in high frequencies provided that some energy is present in HF */
-#ifdef ISSUE_1867_replace_overflow_libenc
- ( LT_16( add_sat( st_fx->voicing_fx[0], corr_shift ), voi_th ) ) ) ) /* normalized correlation is low */
-#else
- ( LT_16( add_o( st_fx->voicing_fx[0], corr_shift, &Overflow ), voi_th ) ) ) ) /* normalized correlation is low */
-#endif
+ ( LT_16( add_sat( st_fx->voicing_fx[0], corr_shift ), voi_th ) ) ) ) /* normalized correlation is low */
{
tmp_offset_flag = 0;
move16();
@@ -393,21 +374,16 @@ Word16 find_uv_fx( /* o : coding type */
test();
test();
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( ( ( LT_16( add_sat( mean_voi3, corr_shift ), add( 22282 /* 0.68 in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low */
( LT_16( add_sat( st_fx->voicing_fx[2], corr_shift ), 25887 /* 0.79 in Q15 */ ) ) && /* normalized correlation low on look-ahead - onset detection */
-#else
- if ( ( ( LT_16( add_o( mean_voi3, corr_shift, &Overflow ), add( 22282 /* 0.68 in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low */
- ( LT_16( add_o( st_fx->voicing_fx[2], corr_shift, &Overflow ), 25887 /* 0.79 in Q15 */ ) ) && /* normalized correlation low on look-ahead - onset detection */
-#endif
- ( LT_32( ee[0], 640 /* 10.0f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) && /* energy concentrated in high frequencies provided that some energy is present in HF... */
- ( LT_32( ee[1], ee1_th ) ) && ( GT_32( hp_E[1], E_min_th ) ) && /* ... biased towards look-ahead to detect onsets */
- ( tmp_offset_flag == 0 ) && /* Take care of voiced offsets */
- /*( st_fx->music_hysteresis_fx == 0 ) &&*/ /* ... and in segment after AUDIO frames */
- ( LE_32( dE1, 237568 /* 29.0f in Q13 */ ) ) && /* Avoid on sharp energy spikes */
- ( LE_32( st_fx->old_dE1_fx, 237568 /* 29.0f in Q13 */ ) ) && /* + one frame hysteresis */
- ( st_fx->spike_hyst < 0 ) ) || /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
- flag_low_relE ) /* low relative frame energy (only for SC-VBR) */
+ ( LT_32( ee[0], 640 /* 10.0f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) && /* energy concentrated in high frequencies provided that some energy is present in HF... */
+ ( LT_32( ee[1], ee1_th ) ) && ( GT_32( hp_E[1], E_min_th ) ) && /* ... biased towards look-ahead to detect onsets */
+ ( tmp_offset_flag == 0 ) && /* Take care of voiced offsets */
+ /*( st_fx->music_hysteresis_fx == 0 ) &&*/ /* ... and in segment after AUDIO frames */
+ ( LE_32( dE1, 237568 /* 29.0f in Q13 */ ) ) && /* Avoid on sharp energy spikes */
+ ( LE_32( st_fx->old_dE1_fx, 237568 /* 29.0f in Q13 */ ) ) && /* + one frame hysteresis */
+ ( st_fx->spike_hyst < 0 ) ) || /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
+ flag_low_relE ) /* low relative frame energy (only for SC-VBR) */
{
coder_type = UNVOICED;
move16();
@@ -427,20 +403,16 @@ Word16 find_uv_fx( /* o : coding type */
test();
test();
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( ( ( LT_16( add_sat( mean_voi3, corr_shift ), add( 22774 /* 0.695f in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low */
-#else
- if ( ( ( LT_16( add_o( mean_voi3, corr_shift, &Overflow ), add( 22774 /* 0.695f in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low */
-#endif
- ( LT_16( add_sat( st_fx->voicing_fx[2], corr_shift ), 25887 /* 0.8 in Q15 */ ) ) && /* normalized correlation low on look-ahead - onset detection */
- ( LT_32( ee[0], 397 /* 6.2f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) && /* energy concentrated in high frequencies provided that some energy is present in HF... */
- ( LT_32( ee[1], 397 /* 6.2f in Q6 */ ) ) && ( GT_32( hp_E[1], E_min_th ) ) && /* ... biased towards look-ahead to detect onsets */
- ( tmp_offset_flag == 0 ) && /* Take care of voiced offsets */
- /*( st_fx->music_hysteresis_fx == 0 ) && */ /* ... and in segment after AUDIO frames */
- ( LE_32( dE1, 245760 /* 30.0f in Q13 */ ) ) && /* Avoid on sharp energy spikes */
- ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) && /* + one frame hysteresis */
- ( st_fx->spike_hyst < 0 ) ) /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
- || ( flag_low_relE && ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) ) ) /* low relative frame energy (only for SC-VBR) */
+ ( LT_16( add_sat( st_fx->voicing_fx[2], corr_shift ), 25887 /* 0.8 in Q15 */ ) ) && /* normalized correlation low on look-ahead - onset detection */
+ ( LT_32( ee[0], 397 /* 6.2f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) && /* energy concentrated in high frequencies provided that some energy is present in HF... */
+ ( LT_32( ee[1], 397 /* 6.2f in Q6 */ ) ) && ( GT_32( hp_E[1], E_min_th ) ) && /* ... biased towards look-ahead to detect onsets */
+ ( tmp_offset_flag == 0 ) && /* Take care of voiced offsets */
+ /*( st_fx->music_hysteresis_fx == 0 ) && */ /* ... and in segment after AUDIO frames */
+ ( LE_32( dE1, 245760 /* 30.0f in Q13 */ ) ) && /* Avoid on sharp energy spikes */
+ ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) && /* + one frame hysteresis */
+ ( st_fx->spike_hyst < 0 ) ) /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
+ || ( flag_low_relE && ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) ) ) /* low relative frame energy (only for SC-VBR) */
{
coder_type = UNVOICED;
move16();
@@ -633,12 +605,6 @@ Word16 find_uv_ivas_fx( /* o : coding typ
Word16 ee0_th, ee1_th, voi_th, nb_cond, flag_low_relE;
NOISE_EST_HANDLE hNoiseEst = st_fx->hNoiseEst;
SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
Word16 Last_Resort;
Word16 vadnoise;
@@ -738,13 +704,9 @@ Word16 find_uv_ivas_fx( /* o : coding typ
* Average voicing (normalized correlation)
*-----------------------------------------------------------------*/
- /*mean_ee = 1.0f/3.0f * (st->ee_old + ee[0] + ee[1]); */ /* coefficients take into account the position of the window */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ /*mean_ee = 1.0f/3.0f * (st->ee_old + ee[0] + ee[1]); */ /* coefficients take into account the position of the window */
mean_ee = L_add_sat( L_add_sat( st_fx->ee_old_fx, ee[0] ), ee[1] ); /* Q6 */
-#else
- mean_ee = L_add_o( L_add_o( st_fx->ee_old_fx, ee[0], &Overflow ), ee[1], &Overflow ); /* Q6 */
-#endif
- mean_ee = Mult_32_16( mean_ee, 10923 ); /*Q6*/
+ mean_ee = Mult_32_16( mean_ee, 10923 ); /*Q6*/
/* mean_voi3 = 1.0f/3.0f * (voicing[0] + voicing[1] + voicing[2]);*/
Ltmp0 = L_mult( st_fx->voicing_fx[0], 10923 /* 1/3 in Q15 */ ); /* Q31 */
@@ -769,11 +731,7 @@ Word16 find_uv_ivas_fx( /* o : coding typ
{
dE2_th = 21 << 10;
move32();
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( GE_16( add_sat( mean_voi3, corr_shift ), 22282 ) ) /*( mean_voi3 + corr_shift ) >= 0.68f*/
-#else
- if ( GE_16( add_o( mean_voi3, corr_shift, &Overflow ), 22282 ) ) /*( mean_voi3 + corr_shift ) >= 0.68f*/
-#endif
{
nb_cond = 0;
move16();
@@ -852,16 +810,10 @@ Word16 find_uv_ivas_fx( /* o : coding typ
test();
test();
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
IF( ( EQ_16( st_fx->last_coder_type_raw, UNVOICED ) ) || /* previous frame was unvoiced */
( ( LT_32( ee[0], ee0_th ) ) && ( GT_32( hp_E[0], E_min_th ) ) && /* energy is concentrated in high frequencies provided that some energy is present in HF */
( LT_16( add_sat( st_fx->voicing_fx[0], corr_shift ), voi_th ) ) ) )
/* normalized correlation is low */
-#else
- IF( ( EQ_16( st_fx->last_coder_type_raw, UNVOICED ) ) || /* previous frame was unvoiced */
- ( ( LT_32( ee[0], ee0_th ) ) && ( GT_32( hp_E[0], E_min_th ) ) && /* energy is concentrated in high frequencies provided that some energy is present in HF */
- ( LT_16( add_o( st_fx->voicing_fx[0], corr_shift, &Overflow ), voi_th ) ) ) ) /* normalized correlation is low */
-#endif
{
tmp_offset_flag = 0;
move16();
@@ -937,7 +889,6 @@ Word16 find_uv_ivas_fx( /* o : coding typ
test();
test();
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
IF( ( ( LT_16( add_sat( mean_voi3, corr_shift ), add( 22282 /* 0.68 in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low */
( LT_16( add_sat( st_fx->voicing_fx[2], corr_shift ), 25887 /* 0.79 in Q15 */ ) ) && /* normalized correlation low on look-ahead - onset detection */
( LT_32( ee[0], 640 /* 10.0f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) && /* energy concentrated in high frequencies provided that some energy is present in HF... */
@@ -948,18 +899,6 @@ Word16 find_uv_ivas_fx( /* o : coding typ
( LE_32( st_fx->old_dE1_fx, 237568 /* 29.0f in Q13 */ ) ) && /* + one frame hysteresis */
( st_fx->spike_hyst < 0 ) ) || /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
flag_low_relE )
-#else
- IF( ( ( LT_16( add_o( mean_voi3, corr_shift, &Overflow ), add( 22282 /* 0.68 in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low */
- ( LT_16( add_o( st_fx->voicing_fx[2], corr_shift, &Overflow ), 25887 /* 0.79 in Q15 */ ) ) && /* normalized correlation low on look-ahead - onset detection */
- ( LT_32( ee[0], 640 /* 10.0f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) && /* energy concentrated in high frequencies provided that some energy is present in HF... */
- ( LT_32( ee[1], ee1_th ) ) && ( GT_32( hp_E[1], E_min_th ) ) && /* ... biased towards look-ahead to detect onsets */
- ( tmp_offset_flag == 0 ) && /* Take care of voiced offsets */
- /*( st_fx->music_hysteresis_fx == 0 ) &&*/ /* ... and in segment after AUDIO frames */
- ( LE_32( dE1, 237568 /* 29.0f in Q13 */ ) ) && /* Avoid on sharp energy spikes */
- ( LE_32( st_fx->old_dE1_fx, 237568 /* 29.0f in Q13 */ ) ) && /* + one frame hysteresis */
- ( st_fx->spike_hyst < 0 ) ) || /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
- flag_low_relE )
-#endif
/* low relative frame energy (only for SC-VBR) */
{
coder_type = UNVOICED;
@@ -977,20 +916,16 @@ Word16 find_uv_ivas_fx( /* o : coding typ
test();
test();
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( ( ( LT_16( add_sat( mean_voi3, corr_shift ), add( 22774 /* 0.695f in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low */
-#else
- if ( ( ( LT_16( add_o( mean_voi3, corr_shift, &Overflow ), add( 22774 /* 0.695f in Q15 */, mean_voi3_offset ) ) ) && /* normalized correlation low */
-#endif
- /*( LT_16( add_o( st_fx->voicing_fx[2], corr_shift, &Overflow ), 25887 ) ) && */ /* normalized correlation low on look-ahead - onset detection */
- ( LT_32( ee[0], 397 /* 6.2f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) && /* energy concentrated in high frequencies provided that some energy is present in HF... */
- ( LT_32( ee[1], 397 /* 6.2f in Q16 */ ) ) && ( GT_32( hp_E[1], E_min_th ) ) && /* ... biased towards look-ahead to detect onsets */
- ( tmp_offset_flag == 0 ) && /* Take care of voiced offsets */
- /*( st_fx->music_hysteresis_fx == 0 ) && */ /* ... and in segment after AUDIO frames */
- ( LE_32( dE1, 245760 /* 30.0f in Q13 */ ) ) && /* Avoid on sharp energy spikes */
- ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) && /* + one frame hysteresis */
- ( st_fx->spike_hyst < 0 ) ) /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
- || ( flag_low_relE && ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) ) ) /* low relative frame energy (only for SC-VBR) */
+ /*( LT_16( add_o( st_fx->voicing_fx[2], corr_shift, &Overflow ), 25887 ) ) && */ /* normalized correlation low on look-ahead - onset detection */
+ ( LT_32( ee[0], 397 /* 6.2f in Q6 */ ) ) && ( GT_32( hp_E[0], E_min_th ) ) && /* energy concentrated in high frequencies provided that some energy is present in HF... */
+ ( LT_32( ee[1], 397 /* 6.2f in Q16 */ ) ) && ( GT_32( hp_E[1], E_min_th ) ) && /* ... biased towards look-ahead to detect onsets */
+ ( tmp_offset_flag == 0 ) && /* Take care of voiced offsets */
+ /*( st_fx->music_hysteresis_fx == 0 ) && */ /* ... and in segment after AUDIO frames */
+ ( LE_32( dE1, 245760 /* 30.0f in Q13 */ ) ) && /* Avoid on sharp energy spikes */
+ ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) && /* + one frame hysteresis */
+ ( st_fx->spike_hyst < 0 ) ) /* Avoid after sharp energy spikes followed by decay (e.g. castanets) */
+ || ( flag_low_relE && ( LE_32( st_fx->old_dE1_fx, 245760 /* 30.0f in Q13 */ ) ) ) ) /* low relative frame energy (only for SC-VBR) */
{
coder_type = UNVOICED;
move16();
diff --git a/lib_enc/frame_spec_dif_cor_rate_fx.c b/lib_enc/frame_spec_dif_cor_rate_fx.c
index 3e2eb40155f5e006eda820818db061688d9d2299..9678acdbfee4fb3d927c352c00273b9f5914e39c 100644
--- a/lib_enc/frame_spec_dif_cor_rate_fx.c
+++ b/lib_enc/frame_spec_dif_cor_rate_fx.c
@@ -35,7 +35,7 @@ void frame_spec_dif_cor_rate_fx(
Word16 scalefactor, spec_dif_cor_rate;
Word32 m, dx, dy;
Word16 *pre_spec_low_dif = hVAD_CLDFB->pre_spec_low_dif;
- const Word32 FIX_cost1 = 2147484 /* 0.001f Q31 */;
+ const Word32 FIX_cost1 = INV_1000_Q31;
move16();
move32();
diff --git a/lib_enc/gain_enc_fx.c b/lib_enc/gain_enc_fx.c
index 1d3cecfc58addd80dfa0b746ed2f5bbe96bc542f..e84d09e3cc963572063bfb0d36b435c9a57e6c29 100644
--- a/lib_enc/gain_enc_fx.c
+++ b/lib_enc/gain_enc_fx.c
@@ -66,12 +66,6 @@ void Es_pred_enc_fx(
Word16 s0, s1, ener_dB, mean_ener_code16;
const Word16 *qua_table;
Word32 ener_fx, Lmean_ener_code, Ltmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
Lmean_ener_code = L_deposit_l( 0 );
Q_res = sub( shl( Q_new, 1 ), 3 );
@@ -99,11 +93,7 @@ void Es_pred_enc_fx(
FOR( i = 1; i < L_SUBFR; i++ )
{
tmp16 = mult_r( res[i_subfr + i], 8192 /* 1 in Q13 */ ); /* remove 2bits Q_new - 2*/
-#ifdef ISSUE_1867_replace_overflow_libenc
ener_fx = L_mac_sat( ener_fx, tmp16, tmp16 );
-#else
- ener_fx = L_mac_o( ener_fx, tmp16, tmp16, &Overflow );
-#endif
}
/* ener = 10 * (float)log10(ener / (float)L_SUBFR) */
@@ -185,11 +175,7 @@ void Es_pred_enc_fx(
FOR( i = 1; i < size; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp16_2 = abs_s( sub_sat( mean_ener_code16, qua_table[i] ) );
-#else
- tmp16_2 = abs_s( sub_o( mean_ener_code16, qua_table[i], &Overflow ) );
-#endif
IF( LT_16( tmp16_2, tmp16 ) )
{
tmp16 = tmp16_2;
@@ -245,12 +231,6 @@ void gain_enc_mless_fx(
Word16 exp1, exp2;
Word16 exp_num, exp_den, exp_div, frac_den;
Word32 L_frac_num, L_frac_den, L_div;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*-----------------------------------------------------------------*
* calculate the rest of the correlation coefficients
@@ -413,11 +393,7 @@ void gain_enc_mless_fx(
L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
exp_div = sub( exp_num, exp_den );
-#ifdef ISSUE_1867_replace_overflow_libenc
*gain_pit = round_fx_sat( L_shl_sat( L_div, add( exp, exp_div ) ) ); /*Q14*/
-#else
- *gain_pit = round_fx_o( L_shl_o( L_div, add( exp, exp_div ), &Overflow ), &Overflow ); /*Q14*/
-#endif
L_tmp1 = L_shr( L_mult( coeff[1], coeff[4] ), 2 ); /*Q31*/
exp1 = add( exp_coeff[1], exp_coeff[4] );
@@ -442,11 +418,7 @@ void gain_enc_mless_fx(
L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
exp_div = sub( exp_num, exp_den );
-#ifdef ISSUE_1867_replace_overflow_libenc
*gain_code = L_shl_sat( L_div, sub( add( exp, exp_div ), 14 ) );
-#else
- *gain_code = L_shl_o( L_div, sub( add( exp, exp_div ), 14 ), &Overflow );
-#endif
move32(); /*Q16*/
*gain_pit = s_max( G_PITCH_MIN_TC192_Q14, s_min( *gain_pit, G_PITCH_MAX_TC192_Q14 ) );
@@ -475,12 +447,8 @@ void gain_enc_mless_fx(
index = gain_quant_fx( gain_code, &gain_code16, LG10_G_CODE_MIN_TC192_Q14, LG10_G_CODE_MAX_TC192_Q13, nBits2, &expg );
push_indice( hBstr, IND_GAIN_CODE, index, nBits2 );
- L_tmp = L_mult( gain_code16, gcode0 ); /*Q0*Q0 -> Q1*/
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = L_mult( gain_code16, gcode0 ); /*Q0*Q0 -> Q1*/
*gain_code = L_shl_sat( L_tmp, add( add( expg, exp_gcode0 ), 15 ) ); /*Q16*/
-#else
- *gain_code = L_shl_o( L_tmp, add( add( expg, exp_gcode0 ), 15 ), &Overflow ); /*Q16*/
-#endif
}
ELSE
{
@@ -559,6 +527,8 @@ void gain_enc_mless_fx(
return;
}
+
+
/*---------------------------------------------------------------------*
* gain_enc_SQ()
*
@@ -598,12 +568,6 @@ void gain_enc_SQ_fx(
Word16 exp1, exp2;
Word16 exp_num, exp_den, exp_div, frac_den;
Word32 L_frac_num, L_frac_den, L_div;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*-----------------------------------------------------------------*
* calculate the rest of the correlation coefficients
@@ -707,11 +671,7 @@ void gain_enc_SQ_fx(
L_tmp1 = L_mult( coeff[0], coeff[2] ); /*Q31*/
exp1 = add( exp_coeff[0], exp_coeff[2] );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp2 = L_mult_sat( coeff[4], coeff[4] ); /*Q31*/
-#else
- L_tmp2 = L_mult_o( coeff[4], coeff[4], &Overflow ); /*Q31*/
-#endif
exp2 = add( exp_coeff[4], exp_coeff[4] );
IF( GT_16( exp1, exp2 ) )
@@ -753,33 +713,17 @@ void gain_enc_SQ_fx(
exp_num = exp2;
move16();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
L_frac_num = L_sub_sat( L_tmp2, L_tmp1 ); /*Q31*/
-#else
- L_frac_num = L_sub_o( L_tmp2, L_tmp1, &Overflow ); /*Q31*/
-#endif
L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
exp_div = sub( exp_num, exp_den );
-#ifdef ISSUE_1867_replace_overflow_libenc
*gain_pit = round_fx_sat( L_shl_sat( L_div, add( exp, exp_div ) ) ); /*Q14*/
-#else
- *gain_pit = round_fx_o( L_shl_o( L_div, add( exp, exp_div ), &Overflow ), &Overflow ); /*Q14*/
-#endif
-#ifdef FIX_1978_SAT_MISSING_IN_GAIN_ENC
L_tmp1 = L_mult_sat( coeff[1], coeff[4] ); /*Q31*/
-#else
- L_tmp1 = L_mult( coeff[1], coeff[4] ); /*Q31*/
-#endif
exp1 = add( exp_coeff[1], exp_coeff[4] );
-#ifdef FIX_1978_SAT_MISSING_IN_GAIN_ENC
L_tmp2 = L_mult_sat( coeff[0], coeff[3] ); /*Q31*/
-#else
- L_tmp2 = L_mult( coeff[0], coeff[3] ); /*Q31*/
-#endif
exp2 = add( exp_coeff[0], exp_coeff[3] );
IF( GT_16( exp1, exp2 ) )
@@ -794,11 +738,7 @@ void gain_enc_SQ_fx(
exp_num = exp2;
move16();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
L_frac_num = L_sub_sat( L_tmp2, L_tmp1 ); /*Q31*/
-#else
- L_frac_num = L_sub_o( L_tmp2, L_tmp1, &Overflow ); /*Q31*/
-#endif
L_div = Mult_32_16( L_frac_num, tmp ); /*Q(30-exp)*/
exp_div = sub( exp_num, exp_den );
@@ -869,28 +809,27 @@ void gain_enc_SQ_fx(
return;
}
+
+
/*-------------------------------------------------------------------*
* gain_enc_gaus()
*
* Quantization of gain for Gaussian codebook
*-------------------------------------------------------------------*/
-Word16 gain_enc_gaus_fx( /* o : Return index of quantization */
- Word32 *gain, /* i/o: Code gain to quantize Q16*/
- const Word16 bits, /* i : number of bits to quantize Q0*/
- const Word16 lowBound, /* i : lower bound of quantizer (dB) Q8*/
- const Word16 stepSize, /* i : Step size choice Q14*/
- const Word16 inv_stepSize /* i : Step size choice Q15*/
+
+/* o : Return index of quantization */
+Word16 gain_enc_gaus_fx(
+ Word32 *gain, /* i/o: Code gain to quantize Q16*/
+ const Word16 bits, /* i : number of bits to quantize Q0*/
+ const Word16 lowBound, /* i : lower bound of quantizer (dB) Q8*/
+ const Word16 stepSize, /* i : Step size choice Q14*/
+ const Word16 inv_stepSize /* i : Step size choice Q15*/
)
{
Word16 index, exp_gain, frac_gain, wtmp;
Word16 enr_q, wenr;
Word32 Ltmp, enr;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
/*enr = 20.0 * log10(*gain + 0.001) codebook gain in dB */
exp_gain = norm_l( *gain );
frac_gain = Log2_norm_lc( L_shl( *gain, exp_gain ) );
@@ -921,15 +860,13 @@ Word16 gain_enc_gaus_fx( /* o : Return index of quant
Ltmp = Pow2( 14, frac_gain ); /* Put 14 as exponent */
exp_gain = sub( exp_gain, 14 ); /* Retreive exponent of wtmp */
-#ifdef ISSUE_1867_replace_overflow_libenc
*gain = L_shl_sat( Ltmp, add( 16, exp_gain ) );
-#else
- *gain = L_shl_o( Ltmp, add( 16, exp_gain ), &Overflow );
-#endif
move32(); /*Q16*/
return index;
}
+
+
/*-----------------------------------------------------------------*
* gain_enc_tc()
*
@@ -939,6 +876,7 @@ Word16 gain_enc_gaus_fx( /* o : Return index of quant
* - gain_pit = 0
* - gain_code - scalar quantization (no prediciton history used)
*-----------------------------------------------------------------*/
+
void gain_enc_tc_fx(
BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
const Word16 gains_mode[], /* i : gain bits Q0*/
@@ -967,6 +905,7 @@ void gain_enc_tc_fx(
/*----------------------------------------------------------------*
* get number of bits for gain quantization
*----------------------------------------------------------------*/
+
nBits = gains_mode[shr( i_subfr, 6 )];
/*----------------------------------------------------------------*
@@ -992,6 +931,7 @@ void gain_enc_tc_fx(
/*----------------------------------------------------------------*
* compute gain = xy/yy
*----------------------------------------------------------------*/
+
g_code_fx = div_s( num, den );
i = sub( exp_num, exp_den ); /* Gain_trans in Q7 */
@@ -1081,9 +1021,11 @@ void gain_enc_tc_fx(
BREAK;
}
}
+
/*----------------------------------------------------------------*
* 3-bit -> 2-bit encoding
*----------------------------------------------------------------*/
+
IF( EQ_16( nBits, 2 ) )
{
/* 2-bit -> 3-bit decoding */
@@ -1111,6 +1053,7 @@ void gain_enc_tc_fx(
/*-----------------------------------------------------------------*
* decode normalized codebook gain
*-----------------------------------------------------------------*/
+
/**norm_gain_code = *gain_code / *gain_inov;*/
expg = sub( norm_s( *gain_inov_fx ), 1 );
expg = s_max( expg, 0 );
@@ -1118,13 +1061,17 @@ void gain_enc_tc_fx(
tmp_fx = div_s( shr( 8192, expg ), *gain_inov_fx );
*norm_gain_code_fx = L_shr( Mult_32_16( *gain_code_fx, tmp_fx ), sub( 1, expg ) ); // Q16
move32();
+
return;
}
+
+
/*-----------------------------------------------------------------*
* Find_Opt_gainQ_fx()
*
* Find the best quantizer
*-----------------------------------------------------------------*/
+
static Word16 Find_Opt_gainQ_fx(
Word16 *coeff, /* exp(exp_coeff) */
Word16 *exp_coeff,
@@ -1144,13 +1091,6 @@ static Word16 Find_Opt_gainQ_fx(
Word16 exp_max[5];
Word16 exp_code, e_max;
Word32 L_tmp, L_tmp1;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
/*----------------------------------------------------------------*
* Find the best quantizer
@@ -1244,11 +1184,7 @@ static Word16 Find_Opt_gainQ_fx(
L_tmp = L_mac( L_tmp, coeff[3], g_code ); /* 15 - coeff_exp + 13 - 1 */
L_tmp = L_mac( L_tmp, coeff[4], g_pit_cod ); /* 15 - coeff_exp + 13 - 1 */
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp1 = L_sub_sat( L_tmp, dist_min );
-#else
- L_tmp1 = L_sub_o( L_tmp, dist_min, &Overflow );
-#endif
if ( L_tmp1 < 0 )
{
index = i;
@@ -1269,8 +1205,11 @@ static Word16 Find_Opt_gainQ_fx(
L_tmp = L_shl_sat( L_tmp, add( exp_gcode0, 6 ) ); /* Q10 -> Q16 */
*gain_code = L_tmp; /* gain of code in Q16 */
move16();
+
return index;
}
+
+
/*---------------------------------------------------------------------*
* gain_enc_lbr()
*
@@ -1302,12 +1241,10 @@ void gain_enc_lbr_fx(
Word32 gc_mem[], /* i/o: gain_code from previous subframes Q16*/
Word16 gp_mem[], /* i/o: gain_pitch from previous subframes Q14*/
const Word16 clip_gain, /* i : gain pitch clipping flag (1 = clipping) Q0*/
- const Word16 L_subfr /* i : subframe length Q0*/
- ,
- const Word16 element_mode /* i : mode element Q0*/
+ const Word16 L_subfr, /* i : subframe length Q0*/
+ const Word16 element_mode /* i : mode element Q0*/
)
{
-
Word16 index = 0, size, nBits, n_pred, ctype;
const Word16 *b, *cdbk = 0;
Word16 gcode0, aux[10];
@@ -1324,6 +1261,7 @@ void gain_enc_lbr_fx(
L_subfr_sf = 7;
move16();
}
+
/*-----------------------------------------------------------------*
* calculate the rest of the correlation coefficients
* c2 = , c3 = -2, c4 = 2, c5* =
@@ -1373,7 +1311,6 @@ void gain_enc_lbr_fx(
*gain_inov = extract_h( L_shl_sat( L_inov, sub( exp_inov, 3 ) ) ); /* gain_inov in Q12 */
move16();
-
/*-----------------------------------------------------------------*
* select the codebook, size and number of bits
* set the gains searching range
@@ -1389,6 +1326,7 @@ void gain_enc_lbr_fx(
* calculate prediction of gcode
* search for the best codeword
*-----------------------------------------------------------------*/
+
test();
IF( i_subfr == 0 )
{
@@ -1698,7 +1636,6 @@ void gain_enc_lbr_fx(
aux[3] = round_fx( L_shl( L_tmp1, 12 ) ); /* Q12 */
move16();
-
/*aux[4] = (float)log10(gc_mem[2]);
= log2(gc_mem[2])*log10(2);*/
exp = norm_l( gc_mem[2] );
@@ -1741,9 +1678,11 @@ void gain_enc_lbr_fx(
{
push_indice( hBstr, IND_GAIN, index, nBits );
}
+
return;
}
+
/*-------------------------------------------------------------------*
* gain_enc_amr_wb()
*
@@ -1755,7 +1694,6 @@ void gain_enc_lbr_fx(
* mean-squared weighted error criterion is used in the quantizer search.
*-------------------------------------------------------------------*/
-
void gain_enc_amr_wb_fx(
BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
const Word16 *xn, /* i : target vector Q_xn*/
@@ -1781,17 +1719,12 @@ void gain_enc_amr_wb_fx(
Word16 exp_max[5], tmp, nBits;
Word32 L_tmp, dist_min, L_inov, L_tmp1;
const Word16 *t_qua_gain, *p;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*----------------------------------------------------------------*
* Find the initial quantization pitch index
* Set gains search range
*----------------------------------------------------------------*/
+
IF( GE_32( core_brate, ACELP_12k65 ) )
{
t_qua_gain = t_qua_gain7b_fx; // Q14
@@ -1837,6 +1770,7 @@ void gain_enc_amr_wb_fx(
}
nBits = 6;
}
+
/*----------------------------------------------------------------*
* Compute coefficients needed for the quantization.
*
@@ -1849,6 +1783,7 @@ void gain_enc_amr_wb_fx(
* Product and have been computed in Adpt_enr() and
* are in vector g_coeff[].
*----------------------------------------------------------------*/
+
coeff[0] = g_coeff[0];
move16();
exp_coeff[0] = g_coeff[1];
@@ -1882,6 +1817,7 @@ void gain_enc_amr_wb_fx(
* L_tmp = MEAN_ENER - 10log10(energy of code/ L_subfr)
* = MEAN_ENER - 3.0103*log2(energy of code/ L_subfr)
*----------------------------------------------------------------*/
+
L_tmp = Dot_product12( code, code, L_SUBFR, &exp_code );
L_inov = L_add( L_tmp, 0 );
/* exp_code: -18 (code in Q9), -6 (/L_subfr), -31 (L_tmp Q31->Q0) */
@@ -1901,6 +1837,7 @@ void gain_enc_amr_wb_fx(
/*----------------------------------------------------------------*
* predicted codebook gain
*----------------------------------------------------------------*/
+
L_tmp = L_shl( L_tmp, 10 ); /* From Q14 to Q24 */
L_tmp = L_mac0( L_tmp, pred_gain_fx[0], past_qua_en[0] ); /* Q14*Q10 -> Q24 */
L_tmp = L_mac0( L_tmp, pred_gain_fx[1], past_qua_en[1] ); /* Q14*Q10 -> Q24 */
@@ -2018,11 +1955,7 @@ void gain_enc_amr_wb_fx(
L_tmp = L_mac( L_tmp, coeff[3], g_code ); /* 15 - coeff_exp + 13 - 1 */
L_tmp = L_mac( L_tmp, coeff[4], g_pit_cod ); /* 15 - coeff_exp + 13 - 1 */
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp1 = L_sub_sat( L_tmp, dist_min );
-#else
- L_tmp1 = L_sub_o( L_tmp, dist_min, &Overflow );
-#endif
/* splitting the if cost half the complexity of using IF macro */
if ( L_tmp1 < 0 )
{
@@ -2044,14 +1977,9 @@ void gain_enc_amr_wb_fx(
g_code = *p++; /* selected code gain in Q11 */
move16();
- L_tmp = L_mult( g_code, gcode0 ); /* Q11*Q0 -> Q12 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = L_mult( g_code, gcode0 ); /* Q11*Q0 -> Q12 */
L_tmp = L_shl_sat( L_tmp, add( exp_gcode0, 4 ) ); /* Q12 -> Q16 */
-#else
- L_tmp = L_shl_o( L_tmp, add( exp_gcode0, 4 ), &Overflow ); /* Q12 -> Q16 */
-#endif
-
- *gain_code = L_tmp; /* gain of code in Q16 */
+ *gain_code = L_tmp; /* gain of code in Q16 */
move16();
/*---------------------------------------------------*
diff --git a/lib_enc/gaus_enc_fx.c b/lib_enc/gaus_enc_fx.c
index 8b822b7042325b417568ed4fd4b5a575af82d532..fb93a67438c063fbda6678e1e59a2dd192073c2e 100644
--- a/lib_enc/gaus_enc_fx.c
+++ b/lib_enc/gaus_enc_fx.c
@@ -63,12 +63,6 @@ Word16 gaus_encode_fx(
Word32 Ltmp;
Word16 dn[L_SUBFR], exp_code, gcode; /* Correlation between xn and h1 */
Word16 exp, tmp, tmp_idx;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*----------------------------------------------------------------*
* Encode gaussian excitation
@@ -103,11 +97,9 @@ Word16 gaus_encode_fx(
/*----------------------------------------------------------------*
* Total excitation for Unvoiced coders
*----------------------------------------------------------------*/
-#ifdef ISSUE_1867_replace_overflow_libenc
+
gcode = round_fx_sat( L_shl_sat( *gain_code, Q_new ) ); /* scaled gain_code with Qnew */
-#else
- gcode = round_fx_o( L_shl_o( *gain_code, Q_new, &Overflow ), &Overflow ); /* scaled gain_code with Qnew */
-#endif
+
FOR( i = 0; i < L_SUBFR; i++ )
{
exc[i + i_subfr] = round_fx( L_shl( L_mult( gcode, code[i] ), 15 - 9 ) ); /* Q_new */
@@ -200,12 +192,6 @@ void gauss2v_fx(
Word16 gxx, gcc, index_delta, delta, m_sign, inv_delta;
Word16 hg[190], Gaus_dico2[190];
Word16 shiftP3;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*----------------------------------------------------------------*
* Encode the tilt of gaussian excitation
@@ -435,13 +421,8 @@ void gauss2v_fx(
cor2_norm = norm_l( cor2 );
eneri_norm = norm_l( eneri );
-#ifdef ISSUE_1867_replace_overflow_libenc
cor2_mantissa = round_fx_sat( L_shl_sat( cor2, cor2_norm ) );
eneri_mantissa = round_fx_sat( L_shl_sat( eneri, eneri_norm ) );
-#else
- cor2_mantissa = round_fx_o( L_shl_o( cor2, cor2_norm, &Overflow ), &Overflow );
- eneri_mantissa = round_fx_o( L_shl_o( eneri, eneri_norm, &Overflow ), &Overflow );
-#endif
difference_norm = sub( add( cor2_norm, enerw_norm ), add( cor2w_norm, eneri_norm ) );
update_best = 0;
@@ -610,15 +591,13 @@ void gauss2v_fx(
/* Gain must be output in a 32-bit variable as a Q16 */
/* Compensate for Q_new */
-#ifdef ISSUE_1867_replace_overflow_libenc
*gain = L_shl_sat( Portion, sub( 13, Q_new ) ); /* Q16 */
-#else
- *gain = L_shl_o( Portion, sub( 13, Q_new ), &Overflow ); /* Q16 */
-#endif
move32();
return;
}
+
+
/*---------------------------------------------------------------------*
* Put selected codevector positions and signs into quantization index
*---------------------------------------------------------------------*/
diff --git a/lib_enc/gp_clip_fx.c b/lib_enc/gp_clip_fx.c
index 05d385fe78de7ac707856b295e80ac12e50be42e..07b88103b29dc5c0f62fa32ce0c410189941d664 100644
--- a/lib_enc/gp_clip_fx.c
+++ b/lib_enc/gp_clip_fx.c
@@ -114,12 +114,6 @@ Word16 gp_clip_fx(
Word32 ener;
Word32 L_tmp;
Word16 thres;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
clip = 0;
move16();
@@ -144,18 +138,10 @@ Word16 gp_clip_fx(
}
}
-#ifdef ISSUE_1867_replace_overflow_libenc
ener = L_mac_sat( 1L, xn[0], xn[0] );
-#else
- ener = L_mac_o( 1L, xn[0], xn[0], &Overflow );
-#endif
FOR( i = 1; i < L_SUBFR; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
ener = L_mac_sat( ener, xn[i], xn[i] );
-#else
- ener = L_mac_o( ener, xn[i], xn[i], &Overflow );
-#endif
}
/* ener = 10.0f*(float)log10(ener) */
@@ -344,12 +330,7 @@ Word16 Mode2_gp_clip_fx(
Word16 clip, tmp, exp_xn;
Word16 i;
Word32 wener, Ltmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
move16();
clip = 0;
@@ -367,11 +348,7 @@ Word16 Mode2_gp_clip_fx(
FOR( i = 0; i < L_subfr; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
wener = L_mac0_sat( wener, xn[i], xn[i] );
-#else
- wener = L_mac0_o( wener, xn[i], xn[i], &Overflow );
-#endif
}
/*wener = 10.0f*(float)log10(wener);*/
diff --git a/lib_enc/gs_enc_fx.c b/lib_enc/gs_enc_fx.c
index e26d5abbf5320377e19d1ae7d404208fa46b034e..7a0d1a279b608c29f1064fb423549fd401e45548 100644
--- a/lib_enc/gs_enc_fx.c
+++ b/lib_enc/gs_enc_fx.c
@@ -1332,12 +1332,6 @@ static Word16 edyn_fx( /* o : ratio of max to mean */
Word32 L_tmp, ener_max, ener_mean;
Word16 tmp, exp2, tmp2, tmp1, exp1, exp3;
Word16 scale;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
ener_mean = L_shl( 1, shl( Qnew, 1 ) ); /*2*Qnew*/
ener_max = L_shl( 1, shl( Qnew, 1 ) );
@@ -1346,11 +1340,7 @@ static Word16 edyn_fx( /* o : ratio of max to mean */
{
L_tmp = L_mult0( vec[j], vec[j] ); /*2*Qnew*/
ener_max = L_max( ener_max, L_tmp );
-#ifdef ISSUE_1867_replace_overflow_libenc
ener_mean = L_add_sat( ener_mean, L_tmp );
-#else
- ener_mean = L_add_o( ener_mean, L_tmp, &Overflow );
-#endif
}
/*dyn = 10.0f * (ener_max / ener_mean);*/
ener_mean = Mult_32_16( ener_mean, div_s( 1, lvec ) ); /*2*Qnew*/
@@ -1358,11 +1348,7 @@ static Word16 edyn_fx( /* o : ratio of max to mean */
IF( ener_mean > 0 )
{
exp1 = norm_l( ener_mean );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp1 = round_fx_sat( L_shl( ener_mean, exp1 ) );
-#else
- tmp1 = round_fx_o( L_shl( ener_mean, exp1 ), &Overflow );
-#endif
exp1 = sub( 30, exp1 );
exp2 = norm_l( ener_max );
diff --git a/lib_enc/guided_plc_enc_fx.c b/lib_enc/guided_plc_enc_fx.c
index 50932734cedfb35226c981816594fe1999161ac5..599fc57f290dbd5f0ad4fdbfad43d5af80ea7f37 100644
--- a/lib_enc/guided_plc_enc_fx.c
+++ b/lib_enc/guided_plc_enc_fx.c
@@ -43,13 +43,6 @@ static void coderLookAheadInnovation(
move32();
move16();
move16();
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
/* Debug init (not instrumented) */
T0_fx = -3000;
@@ -167,14 +160,9 @@ static void coderLookAheadInnovation(
ps_e = add( alp_e, ps_e );
BASOP_SATURATE_WARNING_OFF_EVS
-#ifdef ISSUE_1867_replace_overflow_libenc
max_ps_tmp = L_shl_sat( max_ps, sub( max_ps_e, ps_e ) );
-#else
- max_ps_tmp = L_shl_o( max_ps, sub( max_ps_e, ps_e ), &Overflow );
-#endif
BASOP_SATURATE_WARNING_ON_EVS
-
IF( LT_32( max_ps_tmp, ps ) )
{
max_ps = L_add( ps, 0 );
@@ -438,6 +426,8 @@ Word16 encSideSpecPowDiffuseDetector_fx(
return idx;
}
+
+
/*-------------------------------------------------------------------*
* updateSpecPowDiffuseIdx_fx()
*
@@ -448,13 +438,6 @@ void updateSpecPowDiffuseIdx_fx(
{
Word16 min_gp;
Word16 k;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
move32();
move16();
@@ -463,26 +446,20 @@ void updateSpecPowDiffuseIdx_fx(
FOR( k = 1; k < 4; k++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
st->mean_gc[1] = L_add_sat( st->mean_gc[1], st->gain_code[k] );
-#else
- st->mean_gc[1] = L_add_o( st->mean_gc[1], st->gain_code[k], &Overflow );
-#endif
move32();
min_gp = s_min( min_gp, st->bpf_gainT[k] );
}
/* Suppress saturation warning in threshold comparison. */
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( LT_32( st->mean_gc[1], L_add_sat( st->mean_gc[0], Mpy_32_16_r( st->mean_gc[0], 3211 /*0.098 Q15*/ ) ) ) || GT_16( min_gp, 13435 /*0.82 Q14*/ ) )
-#else
- if ( LT_32( st->mean_gc[1], L_add_o( st->mean_gc[0], Mpy_32_16_r( st->mean_gc[0], 3211 /*0.098 Q15*/ ), &Overflow ) ) || GT_16( min_gp, 13435 /*0.82 Q14*/ ) )
-#endif
{
move16();
st->glr_idx[0] = 0;
}
move16();
st->mean_gc[0] = st->mean_gc[1]; /* Q15 */
+
+ return;
}
diff --git a/lib_enc/hf_cod_amrwb_fx.c b/lib_enc/hf_cod_amrwb_fx.c
index 860f5626bd9f16e20030708bbc8543b5157b90f7..e833201bc5e2614de96760e317ffa6d0c5d3e91c 100644
--- a/lib_enc/hf_cod_amrwb_fx.c
+++ b/lib_enc/hf_cod_amrwb_fx.c
@@ -87,11 +87,6 @@ void hf_cod_fx(
Word32 L_tmp;
Word16 *pt1;
const Word16 *pt2;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/* Original speech signal as reference for high band gain quantisation */
Copy( speech16k_fx, HF_SP_fx, L_SUBFR16k );
@@ -110,15 +105,10 @@ void hf_cod_fx(
ener_exc_fx = dot_prod_satcontr( exc_fx, exc_fx, Q_exc, Q_exc, &q1, L_SUBFR );
ener_hf_fx = dot_prod_satcontr( HF_fx, HF_fx, -3, -3, &q2, L_SUBFR16k );
- scale_fx = div_s( shl( 1, 14 ), ener_exc_fx ); /*Q(29-q1) */
- L_tmp = L_mult( ener_hf_fx, scale_fx ); /*30-q1+q2 */
- q2 = sub( q1, q2 ); /*30-q2 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ scale_fx = div_s( shl( 1, 14 ), ener_exc_fx ); /*Q(29-q1) */
+ L_tmp = L_mult( ener_hf_fx, scale_fx ); /*30-q1+q2 */
+ q2 = sub( q1, q2 ); /*30-q2 */
scale_fx = round_fx( Isqrt( L_shl_sat( L_tmp, sub( q2, 26 ) ) ) ); /*Q13 */
-#else
- scale_fx = round_fx( Isqrt( L_shl_o( L_tmp, sub( q2, 26 ), &Overflow ) ) ); /*Q13 */
-#endif
-
pt1 = HF_fx;
FOR( i = 0; i < L_SUBFR16k; i++ )
@@ -190,15 +180,10 @@ void hf_cod_fx(
ener_hf_fx = dot_prod_satcontr( HF_syn_fx, HF_syn_fx, 0, 0, &q2, L_SUBFR16k );
ener_input_fx = dot_prod_satcontr( HF_SP_fx, HF_SP_fx, 0, 0, &q1, L_SUBFR16k );
- HF_calc_gain_fx = div_s( shl( 1, 14 ), ener_input_fx ); /*Q(29-q1) */
- L_tmp = L_mult( ener_hf_fx, HF_calc_gain_fx ); /*30-q1+q2 */
- q2 = sub( q1, q2 ); /*30-q2 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ HF_calc_gain_fx = div_s( shl( 1, 14 ), ener_input_fx ); /*Q(29-q1) */
+ L_tmp = L_mult( ener_hf_fx, HF_calc_gain_fx ); /*30-q1+q2 */
+ q2 = sub( q1, q2 ); /*30-q2 */
HF_calc_gain_fx = round_fx_sat( Isqrt( L_shl_sat( L_tmp, sub( q2, 20 ) ) ) ); /*Q10 */
-#else
- HF_calc_gain_fx = round_fx_o( Isqrt( L_shl_sat( L_tmp, sub( q2, 20 ) ) ), &Overflow ); /*Q10 */
-#endif
-
/* set energy of HF synthesis to energy of original HF:
cross-fade between HF levels in active and inactive frame in hangover period */
diff --git a/lib_enc/hq_classifier_enc_fx.c b/lib_enc/hq_classifier_enc_fx.c
index 1f84c270aec9fec1e44cff439aec3217012f03ac..1253d55fd8a921fed876c0cc1e033c39158bed6e 100644
--- a/lib_enc/hq_classifier_enc_fx.c
+++ b/lib_enc/hq_classifier_enc_fx.c
@@ -652,14 +652,9 @@ void hvq_classifier_ivas_fx(
Word16 num_peak_cands, high, low;
Word16 sharp[HVQ_NSUB_32k];
Word16 peak_cand_idx[HVQ_THRES_BIN_32k], avail_peaks[HVQ_NSUB_32k];
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
Word16 temp_e = 0;
move16();
+
L_input_max = L_deposit_l( 0 );
set32_fx( L_thr, 0, L_FRAME16k );
@@ -810,11 +805,7 @@ void hvq_classifier_ivas_fx(
sharp[i] = extract_h( L_shl( L_tmp, shift ) ); /* 30-s+s-8-16 -> Q6 */
move16();
/*sharp_dist += (sharp[i]-HVQ_SHARP_THRES); */
-#ifdef ISSUE_1867_replace_overflow_libenc
sharp_dist = add_sat( sharp_dist, sub( sharp[i], HVQ_SHARP_THRES_FX ) ); /* Q6 */
-#else
- sharp_dist = add_o( sharp_dist, sub( sharp[i], HVQ_SHARP_THRES_FX ), &Overflow ); /* Q6 */
-#endif
if ( GT_16( sharp[i], HVQ_SHARP_THRES_FX ) )
{
num_sharp_bands = add( num_sharp_bands, 1 );
@@ -1091,12 +1082,7 @@ void hvq_classifier_fx(
Word16 num_peak_cands, high, low;
Word16 sharp[HVQ_NSUB_32k];
Word16 peak_cand_idx[HVQ_THRES_BIN_32k], avail_peaks[HVQ_NSUB_32k];
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
L_input_max = L_deposit_l( 0 );
set32_fx( L_thr, 0, L_FRAME16k );
@@ -1248,11 +1234,7 @@ void hvq_classifier_fx(
move16();
/*sharp_dist += (sharp[i]-HVQ_SHARP_THRES); */
-#ifdef ISSUE_1867_replace_overflow_libenc
sharp_dist = add_sat( sharp_dist, sub( sharp[i], HVQ_SHARP_THRES_FX ) );
-#else
- sharp_dist = add_o( sharp_dist, sub( sharp[i], HVQ_SHARP_THRES_FX ), &Overflow );
-#endif
IF( GT_16( sharp[i], HVQ_SHARP_THRES_FX ) )
{
num_sharp_bands = add( num_sharp_bands, 1 );
diff --git a/lib_enc/hq_core_enc_fx.c b/lib_enc/hq_core_enc_fx.c
index dd9f1f2b9a51e01c3a60498e4711aff5bf992e04..2879997ac5d6e225d7fc434ad1e4728dca32635b 100644
--- a/lib_enc/hq_core_enc_fx.c
+++ b/lib_enc/hq_core_enc_fx.c
@@ -307,6 +307,7 @@ void hq_core_enc_ivas_fx(
st->Nb_ACELP_frames = 0;
move16();
set_zero_fx( t_audio_fx, L_FRAME48k_EXT );
+
/* set input_frame length */
input_frame = input_frame_orig; /* Q0 */
@@ -429,11 +430,9 @@ void hq_core_enc_ivas_fx(
/* limit encoded band-width according to the command-line OR BWD limitation */
inner_frame = inner_frame_tbl[st->bwidth]; /* Q0 */
L_spec = l_spec_tbl[st->bwidth]; /* Q0 */
-
move16();
move16();
-
IF( GT_16( input_frame, inner_frame ) )
{
IF( EQ_16( is_transient, 1 ) )
@@ -449,7 +448,6 @@ void hq_core_enc_ivas_fx(
}
}
-
/* subtract signaling bits */
num_bits = sub( num_bits, hBstr->nb_bits_tot ); /* Q0 */
@@ -467,12 +465,12 @@ void hq_core_enc_ivas_fx(
{
FOR( i = 0; i < NUM_TIME_SWITCHING_BLOCKS; i++ )
{
- v_multc_fixed( t_audio_fx + add( i_mult2( i, shr( inner_frame, 2 ) ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ), L_tmp, t_audio_fx + add( i_mult2( i, shr( inner_frame, 2 ) ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ), sub( shr( inner_frame, 2 ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ) ); // Q_audio + Q31 - Q31 -> Q_audio
+ v_multc_fx( t_audio_fx + add( i_mult2( i, shr( inner_frame, 2 ) ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ), L_tmp, t_audio_fx + add( i_mult2( i, shr( inner_frame, 2 ) ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ), sub( shr( inner_frame, 2 ), L_FRAME16k / NUM_TIME_SWITCHING_BLOCKS ) ); // Q_audio + Q31 - Q31 -> Q_audio
}
}
ELSE
{
- v_multc_fixed( t_audio_fx + L_FRAME16k, L_tmp, t_audio_fx + L_FRAME16k, L_spec - L_FRAME16k ); // Q_audio + Q31 - Q31 -> Q_audio
+ v_multc_fx( t_audio_fx + L_FRAME16k, L_tmp, t_audio_fx + L_FRAME16k, L_spec - L_FRAME16k ); // Q_audio + Q31 - Q31 -> Q_audio
}
}
@@ -551,7 +549,6 @@ void hq_core_enc_ivas_fx(
Copy_Scale_sig_32_16( wtda_audio_fx32, wtda_audio_fx16, 2 * L_FRAME48k, negate( Q_audio ) ); // Q0
TCX_MDCT_Inverse( t_audio_fx, sub( sub( 31, Q_audio ), 15 ), wtda_audio_fx16, overlap, sub( L_frame, overlap ), overlap, st->element_mode );
-
/* Window current frame */
Word16 tcx_offset_tmp;
@@ -566,7 +563,6 @@ void hq_core_enc_ivas_fx(
}
tcx_windowing_synthesis_current_frame( wtda_audio_fx16, st->hTcxCfg->tcx_aldo_window_2, st->hTcxCfg->tcx_mdct_window_half, st->hTcxCfg->tcx_mdct_window_minimum, overlap, /*st->hTcxCfg->tcx_mdct_window_length*/ st->hTcxCfg->tcx_mdct_window_half_length, st->hTcxCfg->tcx_mdct_window_min_length, st->last_core == ACELP_CORE, st->hTcxCfg->tcx_last_overlap_mode, /*left mode*/ st->hTcxEnc->acelp_zir, st->hTcxEnc->Txnq, NULL, Aq_old_fx, st->hTcxCfg->tcx_mdct_window_trans, shr( st->L_frame, 1 ), tcx_offset_tmp, st->last_core, 0, 0 );
-
/*Compute windowed synthesis in case of switching to ALDO windows in next frame*/
Copy( wtda_audio_fx16 + sub( L_frame, nz ), st->hTcxEnc->old_out_fx, nz + overlap ); /* Q0 */
set16_fx( st->hTcxEnc->old_out_fx + add( nz, overlap ), 0, nz );
@@ -588,7 +584,7 @@ void hq_core_enc_ivas_fx(
{
Word16 tmp_q = Q_audio;
move16();
- Word32 ener_match_fx = SQRT2_FIXED;
+ Word32 ener_match_fx = SQRT2_FX;
move32();
FOR( i = 0; i < input_frame; i++ )
{
@@ -600,7 +596,6 @@ void hq_core_enc_ivas_fx(
scale_sig32( wtda_audio_fx32, 2 * L_FRAME48k, sub( Q_audio, tmp_q ) ); /* Q_audio */
Inverse_Transform( t_audio_fx, &Q_audio, wtda_audio_fx32, is_transient, L_FRAME16k, inner_frame, st->element_mode );
-
out_q = Q_audio;
move16();
window_ola_fx( wtda_audio_fx32, output_fx, &out_q, st->hTcxEnc->old_out_fx, &old_q, L_FRAME16k, st->hTcxCfg->tcx_last_overlap_mode, st->hTcxCfg->tcx_curr_overlap_mode, 0, 0, NULL );
diff --git a/lib_enc/hq_lr_enc_fx.c b/lib_enc/hq_lr_enc_fx.c
index 645c952e4f551efd7b9019e31e7347ec1a518a4a..cd58e3b95358314438c169dbcc95f32a5efce782 100644
--- a/lib_enc/hq_lr_enc_fx.c
+++ b/lib_enc/hq_lr_enc_fx.c
@@ -271,13 +271,6 @@ void hq_lr_enc_fx(
Word16 beta_fx; /*Q14 1.05f; */
HQ_ENC_HANDLE hHQ_core = st_fx->hHQ_core;
BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
set32_fx( L_y2, 0x0L, L_FRAME48k );
set16_fx( inp_vector_fx, 0, inner_frame_fx );
@@ -607,13 +600,9 @@ void hq_lr_enc_fx(
exp = 0;
move16();
}
- L_tmp = Mult_32_16( Ep_vari_fx, 3277 ); /*13+15-15=13 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Mult_32_16( Ep_vari_fx, 3277 ); /*13+15-15=13 */
L_tmp = L_shl_sat( Mult_32_16( L_tmp, tmp ), sub( 12, exp ) ); /*Q(13+exp-15 +12-exp +4 = 14) */
-#else
- L_tmp = L_shl_o( Mult_32_16( L_tmp, tmp ), sub( 12, exp ), &Overflow ); /*Q(13+exp-15 +12-exp +4 = 14) */
-#endif
- tmp2 = extract_h( Ep_avrg_fx ); /*Q13-16=-3 */
+ tmp2 = extract_h( Ep_avrg_fx ); /*Q13-16=-3 */
IF( tmp2 != 0 )
{
exp = norm_s( tmp2 );
@@ -628,14 +617,10 @@ void hq_lr_enc_fx(
exp = 0;
move16();
}
- L_tmp2 = Mult_32_16( Ep_vari_fx, 6554 ); /*13+15-15=13 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp2 = Mult_32_16( Ep_vari_fx, 6554 ); /*13+15-15=13 */
L_tmp2 = L_shl_sat( Mult_32_16( L_tmp2, tmp2 ), sub( 13, exp ) ); /*Q(13+exp-15 +13-exp +3 = 14) */
-#else
- L_tmp2 = L_shl_o( Mult_32_16( L_tmp2, tmp2 ), sub( 13, exp ), &Overflow ); /*Q(13+exp-15 +13-exp +3 = 14) */
-#endif
- L_tmp = L_min( L_tmp, L_tmp2 ); /*Q14 */
- tmp = extract_l( L_min( L_tmp, 13107 ) ); /*Q14 */
+ L_tmp = L_min( L_tmp, L_tmp2 ); /*Q14 */
+ tmp = extract_l( L_min( L_tmp, 13107 ) ); /*Q14 */
alpha_fx = add( 16384, tmp );
}
IF( EQ_16( hHQ_core->last_bitalloc_max_band[j++], 1 ) )
@@ -656,14 +641,10 @@ void hq_lr_enc_fx(
exp = 0;
move16();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_shl_sat( Mult_32_16( Ep_avrg_fx, tmp ), sub( 14, exp ) ); /*Q(13+exp-15 +14-exp+2 = 14) */
-#else
- L_tmp = L_shl_o( Mult_32_16( Ep_avrg_fx, tmp ), sub( 14, exp ), &Overflow ); /*Q(13+exp-15 +14-exp+2 = 14) */
-#endif
- L_tmp = L_max( L_tmp, 16384 ); /*Q14 */
- tmp = extract_l( L_min( L_tmp, beta_fx ) ); /*Q14 */
- alpha_fx = shl( mult( alpha_fx, tmp ), 1 ); /*14+14-15 +1=Q14 */
+ L_tmp = L_max( L_tmp, 16384 ); /*Q14 */
+ tmp = extract_l( L_min( L_tmp, beta_fx ) ); /*Q14 */
+ alpha_fx = shl( mult( alpha_fx, tmp ), 1 ); /*14+14-15 +1=Q14 */
}
ELSE
{
@@ -683,15 +664,11 @@ void hq_lr_enc_fx(
exp = 0;
move16();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_shl_sat( Mult_32_16( Ep_tmp_fx[i], tmp2 ), sub( 19, exp ) ); /*Q(13+exp-15 +19-exp +3 = 20) */
-#else
- L_tmp = L_shl_o( Mult_32_16( Ep_tmp_fx[i], tmp2 ), sub( 19, exp ), &Overflow ); /*Q(13+exp-15 +19-exp +3 = 20) */
-#endif
- L_tmp = Mult_32_16( L_tmp, shl( sub( bands_fx, lowband ), 9 ) ); /*20 +9 -15 =Q14 */
- L_tmp = L_max( L_tmp, 13926 ); /*Q14 */
- tmp2 = extract_l( L_min( L_tmp, 16384 ) ); /*Q14 */
- alpha_fx = shl( mult( alpha_fx, tmp2 ), 1 ); /*14+14-15+1 =Q14 */
+ L_tmp = Mult_32_16( L_tmp, shl( sub( bands_fx, lowband ), 9 ) ); /*20 +9 -15 =Q14 */
+ L_tmp = L_max( L_tmp, 13926 ); /*Q14 */
+ tmp2 = extract_l( L_min( L_tmp, 16384 ) ); /*Q14 */
+ alpha_fx = shl( mult( alpha_fx, tmp2 ), 1 ); /*14+14-15+1 =Q14 */
}
L_band_energy_tmp[i] = L_shl( Mult_32_16( L_band_energy_tmp[i], alpha_fx ), 1 ); /*Q(Q_band_energy+14-15 +1= Q_band_energy) */
move32();
@@ -766,11 +743,7 @@ void hq_lr_enc_fx(
bit_budget_fx = sub( bit_budget_fx, 2 ); /* bits in high bands to indicate the last 2 subbands is allocated bits or not Q0*/
FOR( i = 0; i < bands_fx; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ep_tmp_fx[i] = L_shl_sat( Ep_tmp_fx[i], 2 ); /* Q15 */
-#else
- Ep_tmp_fx[i] = L_shl_o( Ep_tmp_fx[i], 2, &Overflow ); /* Q15 */
-#endif
move32();
}
IF( EQ_32( st_fx->core_brate, ACELP_13k20 ) )
@@ -802,11 +775,7 @@ void hq_lr_enc_fx(
IF( GE_16( i, lowband ) && add( sub( i, bands_fx ), p2a_bands_fx ) < 0 )
{
Ep_vari_fx = L_add_sat( Ep_vari_fx, L_abs( L_sub_sat( Ep_tmp_fx[i], Ep_tmp_fx[( i - 1 )] ) ) ); /*Q15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
- Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#endif
+ Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
}
IF( GE_16( i, highband ) )
@@ -874,12 +843,8 @@ void hq_lr_enc_fx(
IF( EQ_16( hHQ_core->last_bitalloc_max_band[sub( i, add( tmp, 1 ) )], 1 ) )
{
tmp = sub( tmp, lowband );
- L_tmp = Mult_32_16( Ep_tmp_fx[i], tmp ); /*Q(15+0-15 = 0) */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Mult_32_16( Ep_tmp_fx[i], tmp ); /*Q(15+0-15 = 0) */
tmp = extract_h( L_shl_sat( L_tmp, 16 ) ); /*Q0 */
-#else
- tmp = extract_h( L_shl_o( L_tmp, 16, &Overflow ) ); /*Q0 */
-#endif
IF( tmp != 0 )
{
exp = norm_s( tmp );
@@ -940,19 +905,11 @@ void hq_lr_enc_fx(
{
IF( GE_16( i, lowband ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
- Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#endif
}
ELSE
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ep_avrgL_fx = L_add_sat( Ep_avrgL_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
- Ep_avrgL_fx = L_add_o( Ep_avrgL_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#endif
IF( GT_32( Ep_tmp_fx[i], Ep_peak_fx ) )
{
Ep_peak_fx = L_add( Ep_tmp_fx[i], 0 ); /*Q15 */
@@ -1216,15 +1173,9 @@ void hq_lr_enc_ivas_fx(
Word32 L_band_energy_tmp[BANDS_MAX];
UWord16 lo;
Word16 Q_band_energy;
-#ifndef ISSUE_1867_replace_overflow_libenc
- Flag Overflow;
- move32();
-#endif
-
BSTR_ENC_HANDLE hBstr = st->hBstr;
HQ_ENC_HANDLE hHQ_core = st->hHQ_core;
-
set32_fx( L_y2, 0x0L, L_FRAME48k );
set32_fx( inp_vector, 0, inner_frame );
flag_spt = 0;
@@ -1487,11 +1438,7 @@ void hq_lr_enc_ivas_fx(
}
ELSE
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ep_avrgL_fx = L_add_sat( Ep_avrgL_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
- Ep_avrgL_fx = L_add_o( Ep_avrgL_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#endif
IF( L_sub( Ep_tmp_fx[i], Ep_peak_fx ) > 0 )
{
Ep_peak_fx = Ep_tmp_fx[i]; /*Q15 */
@@ -1615,11 +1562,7 @@ void hq_lr_enc_ivas_fx(
move16();
}
Mpy_32_16_ss( Ep_avrg_fx, tmp, &L_tmp, &lo );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_shl_sat( L_tmp, sub( 14, exp ) ); /*Q(13+exp-15 +14-exp+2 = 14) */
-#else
- L_tmp = L_shl_o( L_tmp, sub( 14, exp ), &Overflow ); /*Q(13+exp-15 +14-exp+2 = 14) */
-#endif
L_tmp = L_max( L_tmp, 16384 ); /*14 */
tmp = extract_l( L_min( L_tmp, beta_fx ) ); /*14 */
alpha_fx = shl( mult( alpha_fx, tmp ), 1 ); /*14+14-15 +1=14 */
@@ -1666,11 +1609,7 @@ void hq_lr_enc_ivas_fx(
{
IF( sub( i, lowband ) >= 0 )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
- Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#endif
}
ELSE
{
@@ -1712,12 +1651,8 @@ void hq_lr_enc_ivas_fx(
Mpy_32_16_ss( Ep_peak_fx, tmp, &L_tmp, &lo );
Mpy_32_16_ss( L_tmp, lowband, &L_tmp, &lo );
Mpy_32_16_ss( L_tmp, 18842, &L_tmp, &lo );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_shl_sat( L_tmp, sub( 27, exp ) ); /*Q14 0.5 */
-#else
- L_tmp = L_shl_o( L_tmp, sub( 27, exp ), &Overflow ); /*Q14 0.5 */
-#endif
- tmp2 = extract_l( L_min( L_tmp, 19661 ) ); /*14 */
+ tmp2 = extract_l( L_min( L_tmp, 19661 ) ); /*14 */
Mpy_32_16_ss( L_band_energy_tmp[i], tmp2, &L_tmp, &lo );
L_band_energy_tmp[i] = L_shl( L_tmp, 1 ); /*Q_band_energy */
move32();
@@ -1740,11 +1675,7 @@ void hq_lr_enc_ivas_fx(
bit_budget = sub( bit_budget, 2 ); /* bits in high bands to indicate the last 2 subbands is allocated bits or not */
FOR( i = 0; i < bands; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ep_tmp_fx[i] = L_shl_sat( Ep_tmp_fx[i], 2 ); /* Q15 */
-#else
- Ep_tmp_fx[i] = L_shl_o( Ep_tmp_fx[i], 2, &Overflow ); /* Q15 */
-#endif
move32();
}
IF( EQ_32( st->core_brate, ACELP_13k20 ) )
@@ -1780,11 +1711,7 @@ void hq_lr_enc_ivas_fx(
IF( sub( i, lowband ) >= 0 && add( sub( i, bands ), p2a_bands ) < 0 )
{
Ep_vari_fx = L_add( Ep_vari_fx, L_abs( L_sub( Ep_tmp_fx[i], Ep_tmp_fx[sub( i, 1 )] ) ) ); /*Q15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
- Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#endif
+ Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
}
IF( sub( i, highband ) >= 0 )
@@ -1817,11 +1744,7 @@ void hq_lr_enc_ivas_fx(
tmp = sub( bands, p2a_bands );
tmp = sub( tmp, lowband ); /*Q0 */
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp1 = extract_h( L_shl_sat( Ep_avrg_fx, 1 ) ); /*Q0 */
-#else
- tmp1 = extract_h( L_shl_o( Ep_avrg_fx, 1, &Overflow ) ); /*Q0 */
-#endif
IF( tmp1 != 0 )
{
exp = norm_s( tmp1 );
@@ -1860,11 +1783,7 @@ void hq_lr_enc_ivas_fx(
{
tmp = sub( tmp, lowband );
Mpy_32_16_ss( Ep_tmp_fx[i], tmp, &L_tmp, &lo );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = extract_h( L_shl_sat( L_tmp, 16 ) ); /*Q0 */
-#else
- tmp = extract_h( L_shl_o( L_tmp, 16, &Overflow ) ); /*Q0 */
-#endif
IF( tmp != 0 )
{
exp = norm_s( tmp );
@@ -1888,12 +1807,7 @@ void hq_lr_enc_ivas_fx(
ELSE
{
tmp = sub( tmp, lowband );
-
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp1 = extract_h( L_shl_sat( Ep_avrg_fx, 1 ) ); /*Q0 */
-#else
- tmp1 = extract_h( L_shl_o( Ep_avrg_fx, 1, &Overflow ) ); /*Q0 */
-#endif
IF( tmp1 != 0 )
{
exp = norm_s( tmp1 );
@@ -1932,19 +1846,11 @@ void hq_lr_enc_ivas_fx(
{
IF( sub( i, lowband ) >= 0 )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ep_avrg_fx = L_add_sat( Ep_avrg_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
- Ep_avrg_fx = L_add_o( Ep_avrg_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#endif
}
ELSE
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ep_avrgL_fx = L_add_sat( Ep_avrgL_fx, Ep_tmp_fx[i] ); /*Q15 */
-#else
- Ep_avrgL_fx = L_add_o( Ep_avrgL_fx, Ep_tmp_fx[i], &Overflow ); /*Q15 */
-#endif
IF( L_sub( Ep_tmp_fx[i], Ep_peak_fx ) > 0 )
{
Ep_peak_fx = Ep_tmp_fx[i]; /* Q15 */
@@ -1969,11 +1875,7 @@ void hq_lr_enc_ivas_fx(
move16();
FOR( i = 0; i < lowband; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = extract_h( L_shl_sat( Ep_avrgL_fx, 1 ) ); /*Q0 */
-#else
- tmp = extract_h( L_shl_o( Ep_avrgL_fx, 1, &Overflow ) ); /*Q0 */
-#endif
IF( tmp != 0 )
{
exp = norm_s( tmp );
@@ -2238,14 +2140,14 @@ static Word16 small_symbol_enc_tran_ivas_fx( /* o : bit
* if flag_pack = 0, estimatng else packing bits
*--------------------------------------------------------------------------*/
-static Word16 small_symbol_enc_fx( /* o : bits */
- BSTR_ENC_HANDLE hBstr, /* i : handle to the bitstream */
- const Word16 *qbidx, /* i : input of dequantized differential energy Q0*/
- const Word16 BANDS, /* i : number of bands Q0*/
- Word16 *hLCmode, /* i/o: LC mode info Q0*/
- const Word16 flag_pack /* i : indicator of packing or estimating bits Q0*/
- ,
- const Word16 is_transient /* Q0 */ )
+/* o : bits */
+static Word16 small_symbol_enc_fx(
+ BSTR_ENC_HANDLE hBstr, /* i : handle to the bitstream */
+ const Word16 *qbidx, /* i : input of dequantized differential energy Q0*/
+ const Word16 BANDS, /* i : number of bands Q0*/
+ Word16 *hLCmode, /* i/o: LC mode info Q0*/
+ const Word16 flag_pack, /* i : indicator of packing or estimating bits Q0*/
+ const Word16 is_transient /* Q0 */ )
{
Word16 i, bits;
Word16 difidx[BANDS_MAX], LSB[BANDS_MAX];
@@ -2376,12 +2278,13 @@ static Word16 small_symbol_enc_ivas_fx(
}
-static Word16 large_symbol_enc_fx( /* o : bits Q0*/
- BSTR_ENC_HANDLE hBstr, /* i : handle to the bitstream */
- Word16 *qbidx, /* i : input of dequantized differential energy Q0*/
- const Word16 BANDS, /* i : number of bands Q0*/
- Word16 *hLCmode0, /* i/o: LC mode info Q0*/
- const Word16 flag_pack /* i : indicator of packing or estimating bits Q0*/
+/* o : bits Q0 */
+static Word16 large_symbol_enc_fx(
+ BSTR_ENC_HANDLE hBstr, /* i : handle to the bitstream */
+ Word16 *qbidx, /* i : input of dequantized differential energy Q0*/
+ const Word16 BANDS, /* i : number of bands Q0*/
+ Word16 *hLCmode0, /* i/o: LC mode info Q0*/
+ const Word16 flag_pack /* i : indicator of packing or estimating bits Q0*/
)
{
Word16 i, bits, tmp;
@@ -3252,7 +3155,7 @@ static Word16 band_energy_quant_fx(
static Word16 band_energy_quant_ivas_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
const Word32 *L_t_audio, /* i : Q12 : input MDCT signal (Qs) */
const Word16 band_start[], /* i : Q0 : band start table */
const Word16 band_end[], /* i : Q0 : band end table */
@@ -3260,7 +3163,8 @@ static Word16 band_energy_quant_ivas_fx(
const Word16 bands, /* i : Q0 : number of bands */
const Word32 L_qint, /* i : Q29 */
const Word16 eref_fx, /* i : Q10 */
- const Word16 is_transient /* i : Q0 : indicator for HQ_TRANSIENT */ )
+ const Word16 is_transient /* i : Q0 : indicator for HQ_TRANSIENT */
+)
{
Word16 i, k;
Word16 ebits;
@@ -3481,12 +3385,6 @@ static Word16 p2a_threshold_quant_fx(
Word32 L_p2a;
Word16 p2a_fx;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
exp_safe = 4; /* never happen overflow. */
move16();
@@ -3553,11 +3451,7 @@ static Word16 p2a_threshold_quant_fx(
/* 10/( log(10)/log(2) ) = 3.01029995663981195211 24660(Q13) */
L_p2a = Mpy_32_16_1( L_tmp, 24660 ); /* 16+13-15 -> Q14 */
-#ifdef ISSUE_1867_replace_overflow_libenc
p2a_fx = round_fx_sat( L_shl_sat( L_p2a, 13 ) ); /* 27 -16 -> 11 */
-#else
- p2a_fx = round_fx_o( L_shl_o( L_p2a, 13, &Overflow ), &Overflow ); /* 27 -16 -> 11 */
-#endif
}
IF( LE_16( p2a_fx, p2a_th_fx ) )
@@ -3607,12 +3501,6 @@ static Word16 p2a_threshold_quant_ivas_fx(
Word32 L_p2a;
Word16 p2a_fx;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
exp_safe = 4; /* never happen overflow. */
move16();
@@ -3678,11 +3566,7 @@ static Word16 p2a_threshold_quant_ivas_fx(
/* 10/( log(10)/log(2) ) = 3.01029995663981195211 24660(Q13) */
L_p2a = Mpy_32_16_1( L_tmp, 24660 ); /* 16+13-15 -> Q14 */
-#ifdef ISSUE_1867_replace_overflow_libenc
p2a_fx = round_fx_sat( L_shl_sat( L_p2a, 13 ) ); /* 27 -16 -> 11 */
-#else
- p2a_fx = round_fx_o( L_shl_o( L_p2a, 13, &Overflow ), &Overflow ); /* 27 -16 -> 11 */
-#endif
}
IF( LE_16( p2a_fx, p2a_th_fx ) )
@@ -3749,12 +3633,6 @@ static void mdct_spectrum_fine_gain_enc_fx(
Word16 d_fx;
Word16 dmin_fx;
Word16 imin_fx;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* Fine gain quantization on only the most significant energy bands */
@@ -3824,13 +3702,9 @@ static void mdct_spectrum_fine_gain_enc_fx(
exp_normn = norm_l( L_Exy );
exp_normn = sub( exp_normn, 1 );
exp_normd = norm_l( L_Eyy );
-#ifdef ISSUE_1867_replace_overflow_libenc
gamma_fx = div_l( L_shl( L_Exy, exp_normn ), round_fx_sat( L_shl( L_Eyy, exp_normd ) ) ); /* Qgamma */
-#else
- gamma_fx = div_l( L_shl_o( L_Exy, exp_normn, &Overflow ), round_fx_o( L_shl_o( L_Eyy, exp_normd, &Overflow ), &Overflow ) ); /* Qgamma */
-#endif
- Qgamma = add( sub( exp_normn, exp_normd ), 15 ); /* exp_normn - (exp_normd-16) - 1; */
- gamma_fx = shl( gamma_fx, sub( 14, Qgamma ) ); /* Qgamma -> Q14 */
+ Qgamma = add( sub( exp_normn, exp_normd ), 15 ); /* exp_normn - (exp_normd-16) - 1; */
+ gamma_fx = shl( gamma_fx, sub( 14, Qgamma ) ); /* Qgamma -> Q14 */
dmin_fx = 32767;
move16();
@@ -3917,12 +3791,6 @@ static void mdct_spectrum_fine_gain_enc_ivas_fx(
Word16 d_fx;
Word16 dmin_fx;
Word16 imin_fx;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* Fine gain quantization on only the most significant energy bands */
@@ -3992,13 +3860,9 @@ static void mdct_spectrum_fine_gain_enc_ivas_fx(
exp_normn = norm_l( L_Exy );
exp_normn = sub( exp_normn, 1 );
exp_normd = norm_l( L_Eyy );
-#ifdef ISSUE_1867_replace_overflow_libenc
gamma_fx = div_l( L_shl( L_Exy, exp_normn ), round_fx_sat( L_shl( L_Eyy, exp_normd ) ) ); /* Qgamma */
-#else
- gamma_fx = div_l( L_shl_o( L_Exy, exp_normn, &Overflow ), round_fx_o( L_shl_o( L_Eyy, exp_normd, &Overflow ), &Overflow ) ); /* Qgamma */
-#endif
- Qgamma = add( sub( exp_normn, exp_normd ), 15 ); /* exp_normn - (exp_normd-16) - 1; */
- gamma_fx = shl( gamma_fx, sub( 14, Qgamma ) ); /* Qgamma -> Q14 */
+ Qgamma = add( sub( exp_normn, exp_normd ), 15 ); /* exp_normn - (exp_normd-16) - 1; */
+ gamma_fx = shl( gamma_fx, sub( 14, Qgamma ) ); /* Qgamma -> Q14 */
dmin_fx = 32767;
move16();
diff --git a/lib_enc/hvq_enc_fx.c b/lib_enc/hvq_enc_fx.c
index 60cf0159a7cb65c07e85301813f0efa04a6f4bc1..1119656fc3bb66eba83d3d1349870aa17489e4b0 100644
--- a/lib_enc/hvq_enc_fx.c
+++ b/lib_enc/hvq_enc_fx.c
@@ -49,12 +49,7 @@ Word16 hvq_enc_ivas_fx( /*o : Consumed bits
Word16 expPeMean, expNfMean, expNfpe, expNfpe3, expo, expo3;
Word16 manPeMean, manNfMean, manNfpe, man;
Word16 tmp16, adjust;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
bits_used = 0;
move16();
@@ -120,11 +115,7 @@ Word16 hvq_enc_ivas_fx( /*o : Consumed bits
nf_cnt = add( nf_cnt, 1 ); /* Q0 */
}
-#ifdef ISSUE_1867_replace_overflow_libenc
pe_mean = L_add_sat( pe_mean, pe ); /* in Q12 and always positive */
-#else
- pe_mean = L_add_o( pe_mean, pe, &Overflow ); /* in Q12 and always positive */
-#endif
}
IF( pe_mean > 0 )
@@ -151,12 +142,8 @@ Word16 hvq_enc_ivas_fx( /*o : Consumed bits
acc = L_mult( tmp16, HVQ_NFPE_FACTOR_CUBE_FX ); /* in Q(12+6+1) = Q19 */
expNfpe3 = extract_l( L_mult0( expNfpe, 3 ) ); /* Cube operation */
/* Number of bits required to adjust to Q15 */
- adjust = add( 19 - ( 15 + 16 ), expNfpe3 ); /* +16 is due to the following extract_h(). */
-#ifdef ISSUE_1867_replace_overflow_libenc
- noise_level[i] = extract_h( L_shr_sat( acc, adjust ) ); /* noise_level[] in Q15 */
-#else
+ adjust = add( 19 - ( 15 + 16 ), expNfpe3 ); /* +16 is due to the following extract_h(). */
noise_level[i] = extract_h( L_shr_sat( acc, adjust ) ); /* noise_level[] in Q15 */
-#endif
move16();
q_noise_level_idx[i] = quant_lc_fx( noise_level[i], &q_noise_level[i] );
move16();
@@ -236,12 +223,7 @@ Word16 hvq_enc_fx( /*o : Consumed bits
Word16 expPeMean, expNfMean, expNfpe, expNfpe3, expo, expo3;
Word16 manPeMean, manNfMean, manNfpe, man;
Word16 tmp16, adjust;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
bits_used = 0;
move16();
@@ -307,11 +289,7 @@ Word16 hvq_enc_fx( /*o : Consumed bits
nf_cnt = add( nf_cnt, 1 ); /* Q0 */
}
-#ifdef ISSUE_1867_replace_overflow_libenc
pe_mean = L_add_sat( pe_mean, pe ); /* in Q12 and always positive */
-#else
- pe_mean = L_add_o( pe_mean, pe, &Overflow ); /* in Q12 and always positive */
-#endif
}
IF( pe_mean > 0 )
diff --git a/lib_enc/igf_enc_fx.c b/lib_enc/igf_enc_fx.c
index 4225570dd03e3b584e87b8b63a6f95a3c1123260..25dfa2534f78ec58f23306d021f7bf158f818331 100755
--- a/lib_enc/igf_enc_fx.c
+++ b/lib_enc/igf_enc_fx.c
@@ -105,12 +105,6 @@ static void IGF_CalculateEnvelope(
Word16 tmp_exp;
Word32 L_tmp;
Word16 shift;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* initialize variables */
Copy32( pMDCTSpectrum + IGF_START_MN, hInstance->spec_be_igf, hInstance->infoStopLine - IGF_START_MN );
@@ -232,13 +226,8 @@ static void IGF_CalculateEnvelope(
move16();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
BASOP_Util_Divide_MantExp( round_fx_sat( sfbEnergyTileR[sfb] ), sfbEnergyTileR_exp[sfb], width, 15, &gain, &gain_exp );
BASOP_Util_Divide_MantExp( round_fx_sat( sfbEnergyC[sfb] ), sfbEnergyC_exp[sfb], round_fx_sat( sfbEnergyTileC[sfb] ), sfbEnergyTileC_exp[sfb], &tmp, &tmp_exp );
-#else
- BASOP_Util_Divide_MantExp( round_fx_o( sfbEnergyTileR[sfb], &Overflow ), sfbEnergyTileR_exp[sfb], width, 15, &gain, &gain_exp );
- BASOP_Util_Divide_MantExp( round_fx_o( sfbEnergyC[sfb], &Overflow ), sfbEnergyC_exp[sfb], round_fx_o( sfbEnergyTileC[sfb], &Overflow ), sfbEnergyTileC_exp[sfb], &tmp, &tmp_exp );
-#endif
L_tmp = L_mult( gain, tmp );
gain_exp = add( gain_exp, tmp_exp );
}
@@ -266,11 +255,7 @@ static void IGF_CalculateEnvelope(
L_tmp = BASOP_Util_Log2( L_tmp );
L_tmp = L_add( L_tmp, L_deposit_h( shl( gain_exp, 15 - 6 ) ) );
shift = norm_l( L_tmp );
-#ifdef ISSUE_1867_replace_overflow_libenc
gain = round_fx_sat( L_shl( L_tmp, shift ) );
-#else
- gain = round_fx_o( L_shl_o( L_tmp, shift, &Overflow ), &Overflow );
-#endif
gain_exp = sub( 7, shift );
gain_exp = BASOP_Util_Add_MantExp( gain, gain_exp, 32767 /*16 Q11*/, 4, &gain );
gain_exp = BASOP_Util_Add_MantExp( gain, gain_exp, 0x4000, 0, &gain );
@@ -384,9 +369,6 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp, /**< ou
Word32 highPassEner; /* Q31 */
Word32 lastLine;
Word32 nextLine;
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Word32 L_c;
-#endif
Word32 highPassEner_Ovfl;
Word16 s;
Word16 tmploop;
@@ -400,17 +382,6 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp, /**< ou
Word16 tmp;
Word32 L_tmp;
-#if !defined( FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW ) && !defined( ISSUE_1867_replace_overflow_libenc )
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Flag Carry = 0;
-#endif
- move32();
- move32();
-#endif
-#endif
-
hPrivateData = &hInstance->igfData;
hGrid = &hPrivateData->igfInfo.grid[igfGridIdx];
igfBgn = hGrid->startLine;
@@ -441,32 +412,14 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp, /**< ou
IF( igfBgn > 0 )
{
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_c = 0;
- move32();
-#else
Word64 W_highPassEner = 0;
move64();
-#endif
FOR( i = 0; i < igfBgn; i++ )
{
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Carry = 0;
- move32();
- highPassEner = L_add_co( highPassEner, Mpy_32_16_1( pPowerSpectrum[i], shl( i, 4 ) /*Q4*/ ) /*Q20, pPowerSpectrum_exp*/, &Carry, &Overflow );
- Overflow = 0;
- move32();
- L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );
-#else
W_highPassEner = W_add( W_highPassEner, W_deposit32_l( Mpy_32_16_1( pPowerSpectrum[i], shl( i, 4 ) /*Q4*/ ) ) /*Q20, pPowerSpectrum_exp*/ );
-#endif
}
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- highPassEner = norm_llQ31( L_c, highPassEner, highPassEner_exp ); /*Q20, highPassEner_exp*/
-#else
highPassEner = w_norm_llQ31( W_highPassEner, highPassEner_exp ); /*Q20, highPassEner_exp*/
-#endif
*highPassEner_exp = add( *highPassEner_exp, pPowerSpectrum_exp );
move16();
test();
@@ -487,13 +440,8 @@ void IGF_ErodeSpectrum( Word16 *highPassEner_exp, /**< ou
/* May overflow - just for threshold comparison */
/* negate because the negated may be 1 larger in abs, */
/* so whenever compared to the negation of a maximum possible pPowerspectrum, it is still larger */
-#ifdef ISSUE_1867_replace_overflow_libenc
highPassEner_Ovfl = L_shl_sat( L_negate( highPassEner ), sub( *highPassEner_exp, pPowerSpectrum_exp ) );
L_tmp = L_add_sat( pPowerSpectrum[i - 1], highPassEner_Ovfl );
-#else
- highPassEner_Ovfl = L_shl_o( L_negate( highPassEner ), sub( *highPassEner_exp, pPowerSpectrum_exp ), &Overflow );
- L_tmp = L_add_o( pPowerSpectrum[i - 1], highPassEner_Ovfl, &Overflow );
-#endif
if ( L_tmp >= 0 )
{
@@ -930,22 +878,12 @@ Word16 IGF_getSFM( /**< out: Q15| SFM value
Word16 invDenom_exp, numf_exp;
Word16 numf;
Word32 SFM32;
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Word32 L_c;
-#endif
Word16 invDenom, SFM;
#ifdef BASOP_NOGLOB_DECLARE_LOCAL
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Flag Overflow = 0;
- Flag Carry = 0;
-#endif
move32();
move32();
#endif
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- L_c = 0;
-#endif
move32();
num = 0;
move32();
@@ -976,23 +914,10 @@ Word16 IGF_getSFM( /**< out: Q15| SFM value
n = s_max( 0, n );
num = L_add( num, L_deposit_l( n ) ); /*Q0*/
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- Carry = 0;
- move32();
- denom = L_add_co( energy[i], denom, &Carry, &Overflow );
- Overflow = 0;
- move32();
- L_c = L_macNs_co( L_c, 0, 0, &Carry, &Overflow );
-#else
W_denom = W_add( W_deposit32_l( energy[i] ), W_denom );
-#endif
}
-#ifndef FIX_ISSUE_1965_REPLACE_CARRY_OVERFLOW
- denom = norm_llQ31( L_c, denom, &denom_exp ); /*Q31*/
-#else
denom = w_norm_llQ31( W_denom, &denom_exp ); /*Q31*/
-#endif
denom_exp = add( denom_exp, *energy_exp );
/* calculate SFM only if signal is present */
diff --git a/lib_enc/init_enc_fx.c b/lib_enc/init_enc_fx.c
index b3ddbf663f702cbd1db6b37f5bdc9dc3563b2b73..6d5618ee1aea0b6ec74127325ecc50d71680ec80 100644
--- a/lib_enc/init_enc_fx.c
+++ b/lib_enc/init_enc_fx.c
@@ -20,9 +20,9 @@
*-----------------------------------------------------------------------*/
ivas_error init_encoder_fx(
- Encoder_State *st_fx, /* i/o: Encoder static variables structure */
- const int16_t var_SID_rate_flag, /* i : flag for variable SID update rate */
- const int16_t interval_SID /* i : interval for SID update */
+ Encoder_State *st_fx, /* i/o: Encoder static variables structure */
+ const Word16 var_SID_rate_flag, /* i : flag for variable SID update rate */
+ const Word16 interval_SID /* i : interval for SID update */
)
{
Word16 i;
diff --git a/lib_enc/inov_enc_fx.c b/lib_enc/inov_enc_fx.c
index 88f95864599a7aebc516b70f56e4f4790203ea48..536cf1479736567f950faf63cc395d23de7e92c5 100644
--- a/lib_enc/inov_enc_fx.c
+++ b/lib_enc/inov_enc_fx.c
@@ -13,7 +13,7 @@
/*==============================================================================*/
-/* FUNCTION : inov_encode_fx() */
+/* FUNCTION : inov_encode_fx() */
/*------------------------------------------------------------------------------*/
/* PURPOSE : Encode the algebraic innovation */
/*------------------------------------------------------------------------------*/
@@ -333,7 +333,6 @@ Word16 inov_encode_fx(
}
}
-
/*----------------------------------------------------------------*
* Pitch sharpening
*----------------------------------------------------------------*/
@@ -343,6 +342,7 @@ Word16 inov_encode_fx(
return stack_pulses;
}
+
Word16 inov_encode_ivas_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
const Word32 core_brate, /* i : core bitrate */
@@ -743,7 +743,6 @@ Word16 inov_encode_ivas_fx(
}
}
-
/*----------------------------------------------------------------*
* Pitch sharpening
*----------------------------------------------------------------*/
diff --git a/lib_enc/ivas_agc_enc_fx.c b/lib_enc/ivas_agc_enc_fx.c
index d74e10bdaf25ea124ae9326ad807ac835e6e6e97..10d7cb8c71c2b736bc7fa24bbd467bed6f7dc94b 100644
--- a/lib_enc/ivas_agc_enc_fx.c
+++ b/lib_enc/ivas_agc_enc_fx.c
@@ -49,13 +49,14 @@
#define TWO_IN_Q29 1073741824
#define ONE_MINUS_M_DELTA_PROD_FLT_FC 1073741824 // Q15
-static Word16 ceil_fx( Word16 inp, Word16 Q );
-static Word32 pow32_fx( Word16 inp, Word16 indx );
-static Word16 BASOP_Util_Cmp_Mant32Exp_sat( Word32 a_m, Word16 a_e, Word32 b_m, Word16 b_e );
-static Word16 ceil_fx( Word16 inp, Word16 Q )
+
+static Word16 ceil_fx_loc(
+ const Word16 inp,
+ const Word16 Q )
{
Word16 ret;
Word32 ret_32;
+
IF( inp > 0 )
{
IF( EQ_16( Q, 15 ) )
@@ -77,7 +78,8 @@ static Word16 ceil_fx( Word16 inp, Word16 Q )
return ret;
}
-Word16 BASOP_Util_Cmp_Mant32Exp_sat /*!< o: flag: result of comparison */
+
+static Word16 BASOP_Util_Cmp_Mant32Exp_sat /*!< o: flag: result of comparison */
/* 0, if a == b */
/* 1, if a > b */
/* -1, if a < b */
@@ -90,7 +92,6 @@ Word16 BASOP_Util_Cmp_Mant32Exp_sat /*!< o: flag: result of comparison */
Word32 diff_m;
Word16 diff_e, shift, result;
-
/*
This function compares two input parameters, both represented by a 32-bit mantissa and a 16-bit exponent.
If both values are identical, 0 is returned.
@@ -171,7 +172,9 @@ Word16 BASOP_Util_Cmp_Mant32Exp_sat /*!< o: flag: result of comparison */
return result;
}
-Word32 pow32_fx( Word16 inp, Word16 indx )
+static Word32 pow32_fx(
+ const Word16 inp,
+ const Word16 indx )
{
Word32 temp_1, temp_2;
IF( EQ_16( indx, 1 ) )
@@ -626,7 +629,7 @@ void ivas_agc_enc_process_fx(
div_e = 0;
move16();
}
- temp_16 = ceil_fx( temp_16, sub( Q15, div_e ) ); /* Q0 */
+ temp_16 = ceil_fx_loc( temp_16, sub( Q15, div_e ) ); /* Q0 */
}
pState->gain_state[i].gainExpVal = temp_16; /* Q0 */
move16();
diff --git a/lib_enc/ivas_core_enc_fx.c b/lib_enc/ivas_core_enc_fx.c
index dfca3d7ba9845e4c7a71ae4afd16e51c5d804c0c..d03f58ed5a18ac2a0a88e363816060f8a96e35b8 100644
--- a/lib_enc/ivas_core_enc_fx.c
+++ b/lib_enc/ivas_core_enc_fx.c
@@ -697,7 +697,6 @@ ivas_error ivas_core_enc_fx(
{
/* Common pre-processing for SWB(FB) TBE and SWB(FB) BWE */
/* Scaling cldfb_state_fx */
-#ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM
Word16 q_shift, scf_cldfb;
scf_cldfb = L_norm_arr( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length );
@@ -719,18 +718,10 @@ ivas_error ivas_core_enc_fx(
scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, q_shift ); // st->cldfbSynTd->Q_cldfb_state -> q_realImagBuffer
st->cldfbSynTd->Q_cldfb_state = sub( q_re_im_buf[n], 1 );
}
-#else
- scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, sub( q_re_im_buf[n], st->cldfbSynTd->Q_cldfb_state ) ); // st->cldfbSynTd->Q_cldfb_state -> q_realImagBuffer
-#endif
swb_pre_proc_ivas_fx( st, new_swb_speech_fx_16, new_swb_speech_fx, shb_speech_fx, &Q_shb_spch, realBuffer_fx[n], imagBuffer_fx[n], q_re_im_buf[n], hCPE );
-#ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM
st->cldfbSynTd->Q_cldfb_state = sub( q_re_im_buf[n], 1 );
-#else
- /* Re-scaling cldfb_state_fx */
- scale_sig32( st->cldfbSynTd->cldfb_state_fx, st->cldfbSynTd->p_filter_length, negate( sub( q_re_im_buf[n], st->cldfbSynTd->Q_cldfb_state ) ) ); // q_realImagBuffer -> st->cldfbSynTd->Q_cldfb_state
-#endif
}
ELSE IF( GE_32( input_Fs, 32000 ) )
{
diff --git a/lib_enc/ivas_dirac_enc_fx.c b/lib_enc/ivas_dirac_enc_fx.c
index efd6129032cbf9f514d40cfaa97e0a960e82f55d..9886b1cb76c99b094f6b57256954cde6fbcc4700 100644
--- a/lib_enc/ivas_dirac_enc_fx.c
+++ b/lib_enc/ivas_dirac_enc_fx.c
@@ -435,7 +435,7 @@ ivas_error ivas_dirac_enc_fx(
ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( &avg_dir_fx[0], Q30, &hQMetaData->q_direction[0].band_data[0].azimuth_fx[i], &hQMetaData->q_direction[0].band_data[0].elevation_fx[i] );
- Word32 tmp = dotp_fixed( avg_dir_fx, avg_dir_fx, 3 ); // 2*avg_dir_e
+ Word32 tmp = dotp_fx32( avg_dir_fx, avg_dir_fx, 3 ); // 2*avg_dir_e
Word16 tmp_e = shl( avg_dir_e, 1 );
tmp = Sqrt32( tmp, &tmp_e );
Word16 er_tmp_e = 0;
@@ -1132,9 +1132,10 @@ void ivas_dirac_param_est_enc_fx(
intensity_real_fx,
cldfb_q,
intensity_real_q );
+
IF( !hodirac_flag )
{
- computeDirectionVectors_fixed(
+ computeDirectionVectors_fx2(
intensity_real_fx[0],
intensity_real_fx[1],
intensity_real_fx[2],
@@ -1458,14 +1459,14 @@ void ivas_dirac_param_est_enc_fx(
*
*
*------------------------------------------------------------------------*/
+
static void computeIntensityVector_enc_fx(
const DIRAC_ENC_HANDLE hDirAC,
Word32 Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* q_cldfb */
Word32 Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* q_cldfb */
const Word16 enc_param_start_band, /* i : first band to process Q0*/
const Word16 num_frequency_bands, /* Q0 */
- Word32 intensity_real[DIRAC_NUM_DIMS][DIRAC_MAX_NBANDS] /* q_intensity_real */
- ,
+ Word32 intensity_real[DIRAC_NUM_DIMS][DIRAC_MAX_NBANDS], /* q_intensity_real */
Word16 q_cldfb,
Word16 q_intensity_real[DIRAC_MAX_NBANDS] )
{
diff --git a/lib_enc/ivas_enc_fx.c b/lib_enc/ivas_enc_fx.c
index c4d7b75a7ec81a0cfa02fce7e2f9a5135aedf0cf..095d4c2cf4e1c4ebfc579ce37ee4297db16f2c9b 100644
--- a/lib_enc/ivas_enc_fx.c
+++ b/lib_enc/ivas_enc_fx.c
@@ -310,7 +310,7 @@ ivas_error ivas_enc_fx(
/* Stereo transport is used also with monoMASA, duplicate mono if monoMASA */
IF( EQ_16( sub( st_ivas->hEncoderConfig->nchan_inp, hEncoderConfig->nchan_ism ), 1 ) )
{
- v_multc_fixed( data_fx[hEncoderConfig->nchan_ism], L_deposit_h( INV_SQRT2_FX_Q15 ) /* Q31 */, data_fx[hEncoderConfig->nchan_ism], input_frame );
+ v_multc_fx( data_fx[hEncoderConfig->nchan_ism], L_deposit_h( INV_SQRT2_FX_Q15 ) /* Q31 */, data_fx[hEncoderConfig->nchan_ism], input_frame );
Copy32( data_fx[hEncoderConfig->nchan_ism], data_fx[hEncoderConfig->nchan_ism + 1], input_frame ); /* st_ivas->q_data_fx */
}
diff --git a/lib_enc/ivas_front_vad_fx.c b/lib_enc/ivas_front_vad_fx.c
index ce09abdbc0e3806675880b57ba31e6820fdad1c9..99da0175f5811480995bcaa76c6323584143300c 100644
--- a/lib_enc/ivas_front_vad_fx.c
+++ b/lib_enc/ivas_front_vad_fx.c
@@ -304,7 +304,7 @@ ivas_error front_vad_fx(
IF( EQ_16( n_chan, CPE_CHANNELS ) )
{
/* get average channel energies, adding up was already done, so only need to scale by number of channels */
- v_multc_fixed( &band_energies_LR_fx[0], ONE_IN_Q30 /* 0.5f in Q31 */, &band_energies_LR_fx[0], 2 * NB_BANDS );
+ v_multc_fx( &band_energies_LR_fx[0], ONE_IN_Q30 /* 0.5f in Q31 */, &band_energies_LR_fx[0], 2 * NB_BANDS );
/* Logical OR between L and R decisions */
test();
diff --git a/lib_enc/ivas_init_enc_fx.c b/lib_enc/ivas_init_enc_fx.c
index 08cdfd044ecab931e1796de1f02f525b81972618..6b1185b1e40dba82ffc0307eb949293da2c3f9e5 100644
--- a/lib_enc/ivas_init_enc_fx.c
+++ b/lib_enc/ivas_init_enc_fx.c
@@ -279,6 +279,8 @@ Word16 getNumChanAnalysis_fx(
return n;
}
+
+
/*-------------------------------------------------------------------*
* copy_encoder_config_fx()
*
@@ -421,6 +423,7 @@ void ivas_initialize_handles_enc_fx(
*
* Initialize IVAS encoder state structure
*-------------------------------------------------------------------*/
+
ivas_error ivas_init_encoder_fx(
Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
)
@@ -464,7 +467,7 @@ ivas_error ivas_init_encoder_fx(
move16();
/*-----------------------------------------------------------------*
- * Allocate floating-point input audio buffers
+ * Allocate input audio buffers
*-----------------------------------------------------------------*/
nchan_inp_buff = hEncoderConfig->nchan_inp; /* Q0 */
@@ -489,7 +492,7 @@ ivas_error ivas_init_encoder_fx(
/* note: these are intra-frame heap memories */
IF( ( st_ivas->p_data_fx[n] = (Word32 *) malloc( Mpy_32_16_1( input_Fs, INV_FRAME_PER_SEC_Q15 ) * sizeof( Word32 ) ) ) == NULL )
{
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point input audio buffer!\n" ) );
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for input audio buffer!\n" ) );
}
set32_fx( st_ivas->p_data_fx[n], 0, extract_l( Mpy_32_16_1( input_Fs, INV_FRAME_PER_SEC_Q15 ) ) );
}
@@ -773,9 +776,6 @@ ivas_error ivas_init_encoder_fx(
}
ELSE IF( EQ_32( ivas_format, SBA_ISM_FORMAT ) )
{
- st_ivas->ism_mode = ISM_MODE_NONE;
- move16();
-
st_ivas->ism_mode = ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism );
IF( ( error = ivas_ism_metadata_enc_create_fx( st_ivas, hEncoderConfig->nchan_ism, element_brate_tmp ) ) != IVAS_ERR_OK )
@@ -833,12 +833,8 @@ ivas_error ivas_init_encoder_fx(
ELSE
{
/* allocate and initialize MCT core coder */
- {
- int16_t n_all;
-
- n_all = add( st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_ism );
- st_ivas->nCPE = shr_r( n_all, 1 );
- }
+ Word16 n_all = add( st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_ism );
+ st_ivas->nCPE = shr_r( n_all, 1 );
iDiv_and_mod_32( ivas_total_brate, st_ivas->nchan_transport, &tmp_br, &tmp32, 0 );
tmp_br = L_shl( tmp_br, CPE_CHANNELS_LOG2 );
@@ -865,7 +861,7 @@ ivas_error ivas_init_encoder_fx(
st_ivas->mc_mode = ivas_mc_mode_select_fx( hEncoderConfig->mc_input_setup, ivas_total_brate ); /* Q0 */
move32();
- IF( ( error = ivas_create_lfe_lpf_enc_fx( &st_ivas->hLfeLpf, hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )
+ IF( ( error = ivas_create_lfe_lpf_enc_fx( &st_ivas->hLfeLpf, input_Fs ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -977,6 +973,7 @@ ivas_error ivas_init_encoder_fx(
{
return error;
}
+
ivas_mcmasa_split_brate_fx( st_ivas->hMcMasa->separateChannelEnabled, ivas_total_brate, st_ivas->nSCE, st_ivas->nCPE, &brate_sce, &brate_cpe );
FOR( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ )
@@ -1032,6 +1029,8 @@ ivas_error ivas_init_encoder_fx(
return error;
}
+
+
/*-------------------------------------------------------------------------
* destroy_core_enc()
*
@@ -1190,6 +1189,7 @@ void destroy_core_enc_fx(
return;
}
+
void destroy_evs_core_enc_fx(
ENC_CORE_HANDLE hCoreCoder /* i/o: core encoder structure */
)
@@ -1347,11 +1347,13 @@ void destroy_evs_core_enc_fx(
*
* Close IVAS encoder handles
*-------------------------------------------------------------------------*/
+
void ivas_destroy_enc_fx(
Encoder_Struct *st_ivas /* i/o: IVAS encoder structure */
)
{
Word16 i, n, nchan_inp;
+
nchan_inp = st_ivas->hEncoderConfig->nchan_inp;
move16();
@@ -1459,7 +1461,7 @@ void ivas_destroy_enc_fx(
free( st_ivas->ind_list_metadata );
}
- /* floating-point input audio buffers */
+ /* input audio buffers */
FOR( n = 0; n < MAX_INPUT_CHANNELS + MAX_NUM_OBJECTS; n++ )
{
IF( st_ivas->p_data_fx[n] != NULL )
@@ -1475,6 +1477,7 @@ void ivas_destroy_enc_fx(
return;
}
+
/*-------------------------------------------------------------------------
* ivas_initialize_MD_bstr_enc_fx()
*
diff --git a/lib_enc/ivas_ism_enc_fx.c b/lib_enc/ivas_ism_enc_fx.c
index 6b75a6be7494dc6490eeb62381b0840438e4a4f5..d3aaa46caa6fa269dbf1f00a99bbf860cc59ae0e 100644
--- a/lib_enc/ivas_ism_enc_fx.c
+++ b/lib_enc/ivas_ism_enc_fx.c
@@ -520,7 +520,6 @@ ivas_error ivas_ism_enc_fx(
dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "element_brate", 0, id, ENC ) );
}
#endif
-
pop_wmops();
return error;
diff --git a/lib_enc/ivas_masa_enc_fx.c b/lib_enc/ivas_masa_enc_fx.c
index 2905491e3c7d20697ac3c905f1b4ea77ab4f2f0b..7d8a0f8354eaed50eefa768990027c5a38fe4e49 100644
--- a/lib_enc/ivas_masa_enc_fx.c
+++ b/lib_enc/ivas_masa_enc_fx.c
@@ -2774,7 +2774,7 @@ static Word16 encode_lfe_to_total_energy_ratio_fx(
FOR( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )
{
// log2LFEratio[i] = log2f( max( 0.001f, hMasa->data.lfeToTotalEnergyRatio[i] ) );
- maxVal = 2147484 /* 0.001f in Q31 */;
+ maxVal = INV_1000_Q31;
move32();
maxVal_e = 0;
move16();
diff --git a/lib_enc/ivas_mcmasa_enc_fx.c b/lib_enc/ivas_mcmasa_enc_fx.c
index 5c8822919feef1571338decf22762ada6081021e..280da94568e28c042476055c9fef075341e20982 100644
--- a/lib_enc/ivas_mcmasa_enc_fx.c
+++ b/lib_enc/ivas_mcmasa_enc_fx.c
@@ -286,7 +286,7 @@ ivas_error ivas_mcmasa_enc_open_fx(
bufferSize = (Word16) ( ( input_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES );
FOR( i = 0; i < 2; i++ )
{
- IF( ( hMcMasa->lfeAnaRingBuffer[i] = (Word32 *) malloc( bufferSize * sizeof( float ) ) ) == NULL )
+ IF( ( hMcMasa->lfeAnaRingBuffer[i] = (Word32 *) malloc( bufferSize * sizeof( Word32 ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for McMasa\n" ) );
}
@@ -1108,8 +1108,8 @@ void ivas_mcmasa_param_est_enc_fx(
}
/* Y */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[1][0], Foa_RealBuffer_fx[1], num_freq_bins ); // inp_q
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[1][0], Foa_ImagBuffer_fx[1], num_freq_bins ); // inp_q
+ v_multc_fx( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[1][0], Foa_RealBuffer_fx[1], num_freq_bins ); // inp_q
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[1][0], Foa_ImagBuffer_fx[1], num_freq_bins ); // inp_q
FOR( i = 1; i < numAnalysisChannels; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hMcMasa->chnlToFoaMtx_fx[1][i], Foa_RealBuffer_fx[1], num_freq_bins ); // inp_q
@@ -1125,8 +1125,8 @@ void ivas_mcmasa_param_est_enc_fx(
}
ELSE
{
- v_multc_fixed( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[2][0], Foa_RealBuffer_fx[2], num_freq_bins ); // inp_q
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[2][0], Foa_ImagBuffer_fx[2], num_freq_bins ); // inp_q
+ v_multc_fx( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[2][0], Foa_RealBuffer_fx[2], num_freq_bins ); // inp_q
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[2][0], Foa_ImagBuffer_fx[2], num_freq_bins ); // inp_q
FOR( i = 1; i < numAnalysisChannels; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hMcMasa->chnlToFoaMtx_fx[2][i], Foa_RealBuffer_fx[2], num_freq_bins ); // inp_q
@@ -1135,8 +1135,8 @@ void ivas_mcmasa_param_est_enc_fx(
}
/* X */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[3][0], Foa_RealBuffer_fx[3], num_freq_bins ); // inp_q
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[3][0], Foa_ImagBuffer_fx[3], num_freq_bins ); // inp_q
+ v_multc_fx( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[3][0], Foa_RealBuffer_fx[3], num_freq_bins ); // inp_q
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[3][0], Foa_ImagBuffer_fx[3], num_freq_bins ); // inp_q
FOR( i = 1; i < numAnalysisChannels; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hMcMasa->chnlToFoaMtx_fx[3][i], Foa_RealBuffer_fx[3], num_freq_bins ); // inp_q
@@ -1149,8 +1149,8 @@ void ivas_mcmasa_param_est_enc_fx(
Copy32( Foa_ImagBuffer_fx[0], FoaEven_ImagBuffer_fx[0], num_freq_bins ); // inp_q
/* Y */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[1][0], FoaEven_RealBuffer_fx[1], num_freq_bins ); // inp_q
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[1][0], FoaEven_ImagBuffer_fx[1], num_freq_bins ); // inp_q
+ v_multc_fx( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[1][0], FoaEven_RealBuffer_fx[1], num_freq_bins ); // inp_q
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[1][0], FoaEven_ImagBuffer_fx[1], num_freq_bins ); // inp_q
FOR( i = 1; i < numAnalysisChannels; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hMcMasa->chnlToFoaEvenMtx_fx[1][i], FoaEven_RealBuffer_fx[1], num_freq_bins ); // inp_q
@@ -1162,8 +1162,8 @@ void ivas_mcmasa_param_est_enc_fx(
set_zero_fx( FoaEven_ImagBuffer_fx[2], num_freq_bins ); // inp_q
/* X */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[3][0], FoaEven_RealBuffer_fx[3], num_freq_bins ); // inp_q
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[3][0], FoaEven_ImagBuffer_fx[3], num_freq_bins ); // inp_q
+ v_multc_fx( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[3][0], FoaEven_RealBuffer_fx[3], num_freq_bins ); // inp_q
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[3][0], FoaEven_ImagBuffer_fx[3], num_freq_bins ); // inp_q
FOR( i = 1; i < numAnalysisChannels; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hMcMasa->chnlToFoaEvenMtx_fx[3][i], FoaEven_RealBuffer_fx[3], num_freq_bins ); // inp_q
@@ -1181,7 +1181,7 @@ void ivas_mcmasa_param_est_enc_fx(
q_intensity_real_fx,
inp_q );
- computeDirectionVectors_fixed(
+ computeDirectionVectors_fx2(
intensity_real_fx[0],
intensity_real_fx[1],
intensity_real_fx[2],
diff --git a/lib_enc/ivas_mct_core_enc_fx.c b/lib_enc/ivas_mct_core_enc_fx.c
index e42ee56d716ea63ea6e34bd259c3f08430bca1fc..9bbf1260c8ed61e487b4b01a99eb6c38ebaea869 100644
--- a/lib_enc/ivas_mct_core_enc_fx.c
+++ b/lib_enc/ivas_mct_core_enc_fx.c
@@ -333,14 +333,10 @@ void ivas_mct_core_enc_fx(
{
FOR( ch = 0; ch < CPE_CHANNELS; ch++ )
{
-#ifdef ADJUST_MCT_CHANNELS_MAX
IF( LT_16( add( i_mult( cpe_id, CPE_CHANNELS ), ch ), nChannels ) )
{
-#endif
sts[i] = hCPE[cpe_id]->hCoreCoder[ch];
-#ifdef ADJUST_MCT_CHANNELS_MAX
}
-#endif
IF( EQ_32( hCPE[cpe_id]->hCoreCoder[ch]->mct_chan_mode, MCT_CHAN_MODE_IGNORE ) )
{
diff --git a/lib_enc/ivas_mct_enc_mct_fx.c b/lib_enc/ivas_mct_enc_mct_fx.c
index 0918c51d24cde78794b32dba5e23234010be407b..d402d834f9fa1b5dcbd409f5902e09c25ee907da 100644
--- a/lib_enc/ivas_mct_enc_mct_fx.c
+++ b/lib_enc/ivas_mct_enc_mct_fx.c
@@ -153,7 +153,7 @@ static void getNextBestCorrelation_fx(
tmp_idx = sub( shr( imult1616( nChannels, sub( nChannels, 1 ) ), 1 ), 1 );
/* sort values */
- v_sort_ind_fixed( tmp_corrVals, tmp_org, add( tmp_idx, 1 ) );
+ v_sort_ind_fx( tmp_corrVals, tmp_org, add( tmp_idx, 1 ) );
/* get max, or 2nd max and so on depending on sortInd value */
*max_corr = tmp_corrVals[( tmp_idx - sortInd )]; // Qx
@@ -236,7 +236,7 @@ static void getCorrelationMatrix_fx(
FOR( n = 0; n < nSubframes; n++ )
{
res_q = sub( 31, sts[0]->hTcxEnc->spectrum_e[0] );
- L_tmp = dotp_fixed_32( sts[ch1]->hTcxEnc->spectrum_fx[n], sts[ch2]->hTcxEnc->spectrum_fx[n], L_subframe, 1, &res_q );
+ L_tmp = dotp_fx32_fac( sts[ch1]->hTcxEnc->spectrum_fx[n], sts[ch2]->hTcxEnc->spectrum_fx[n], L_subframe, 1, &res_q );
xCorrMatrix[ch1][ch2] = BASOP_Util_Add_Mant32Exp( xCorrMatrix[ch1][ch2], xCorrMatrix_exp[ch1][ch2], L_tmp, sub( 31, res_q ), &xCorrMatrix_exp[ch1][ch2] );
move32();
}
@@ -607,8 +607,8 @@ static void getGlobalILD_fx(
FOR( k = 0; k < nSubframes; k++ )
{
- v_multc_fixed( sts[ch]->hTcxEnc->spectrum_fx[k], L_deposit_h( qratio ), sts[ch]->hTcxEnc->spectrum_fx[k], L_subframe ); // sts[ch]->hTcxEnc->spectrum_e
- v_multc_fixed( mdst_spectrum[ch][k], L_deposit_h( qratio ), mdst_spectrum[ch][k], L_subframe ); // sts[ch]->hTcxEnc->spectrum_e
+ v_multc_fx( sts[ch]->hTcxEnc->spectrum_fx[k], L_deposit_h( qratio ), sts[ch]->hTcxEnc->spectrum_fx[k], L_subframe ); // sts[ch]->hTcxEnc->spectrum_e
+ v_multc_fx( mdst_spectrum[ch][k], L_deposit_h( qratio ), mdst_spectrum[ch][k], L_subframe ); // sts[ch]->hTcxEnc->spectrum_e
}
}
}
@@ -874,8 +874,8 @@ void apply_MCT_enc_fx(
FOR( k = 0; k < nSubframes; k++ )
{
- v_multc_fixed( sts[ch]->hTcxEnc->spectrum_fx[k], L_deposit_h( qratio ), sts[ch]->hTcxEnc->spectrum_fx[k], L_subframeTCX );
- v_multc_fixed( mdst_spectrum[ch][k], L_deposit_h( qratio ), mdst_spectrum[ch][k], L_subframeTCX );
+ v_multc_fx( sts[ch]->hTcxEnc->spectrum_fx[k], L_deposit_h( qratio ), sts[ch]->hTcxEnc->spectrum_fx[k], L_subframeTCX );
+ v_multc_fx( mdst_spectrum[ch][k], L_deposit_h( qratio ), mdst_spectrum[ch][k], L_subframeTCX );
set32_fx( inv_spectrum[ch][k], 0, L_subframeTCX );
}
sts[ch]->hTcxEnc->spectrum_e[1] = add( sts[ch]->hTcxEnc->spectrum_e[0], exp );
diff --git a/lib_enc/ivas_mdct_core_enc_fx.c b/lib_enc/ivas_mdct_core_enc_fx.c
index 86ea8ebe919149397275a57349d1472ac931e4ca..b4eba62010700dd4e91a3944c7a4f0b6b936d6f9 100644
--- a/lib_enc/ivas_mdct_core_enc_fx.c
+++ b/lib_enc/ivas_mdct_core_enc_fx.c
@@ -362,8 +362,8 @@ static void kernel_switch_trafo_fx(
tmp = BASOP_Util_Divide1616_Scale( NORM_MDCT_FACTOR, add( shr( l, 1 ), add( m, shr( r, 1 ) ) ), &exp_tmp );
tmp = Sqrt16( tmp, &exp_tmp );
- factor = L_shl( L_deposit_h( tmp ), sub( exp_tmp, 1 ) ); // Q30
- v_multc_fixed( y, factor, y, add( shr( l, 1 ), add( m, shr( r, 1 ) ) ) ); // (Q_in, Q30) -> Q_in - 1
+ factor = L_shl( L_deposit_h( tmp ), sub( exp_tmp, 1 ) ); // Q30
+ v_multc_fx( y, factor, y, add( shr( l, 1 ), add( m, shr( r, 1 ) ) ) ); // (Q_in, Q30) -> Q_in - 1
return;
}
@@ -440,7 +440,7 @@ static void kernel_switch_update_transforms_fx(
tmp = BASOP_Util_Divide1616_Scale( NORM_MDCT_FACTOR, s, &exp_tmp );
tmp = Sqrt16( tmp, &exp_tmp );
factor = L_shl( L_deposit_h( tmp ), sub( exp_tmp, Q1 ) ); // Q30
- v_multc_fixed( sigR, factor, sigR, s ); // (Q6, Q30) -> Q5
+ v_multc_fx( sigR, factor, sigR, s ); // (Q6, Q30) -> Q5
q_com = L_norm_arr( sigR, s );
q_com = s_min( add( q_com, Q5 ), *q_sig );
@@ -591,8 +591,8 @@ static void kernel_switch_update_transforms_fx(
Word16 tmp, exp_tmp;
Word32 factor;
tmp = BASOP_Util_Divide1616_Scale( bwidthSwCnt, BWS_TRAN_PERIOD, &exp_tmp );
- factor = L_shl( L_deposit_h( tmp ), exp_tmp ); // Q31
- v_multc_fixed( sigR + L_FRAME16k / nSubframes, factor, sigR + L_FRAME16k / nSubframes, sub( s, idiv1616( L_FRAME16k, nSubframes ) ) ); // *q_sig
+ factor = L_shl( L_deposit_h( tmp ), exp_tmp ); // Q31
+ v_multc_fx( sigR + L_FRAME16k / nSubframes, factor, sigR + L_FRAME16k / nSubframes, sub( s, idiv1616( L_FRAME16k, nSubframes ) ) ); // *q_sig
}
return;
diff --git a/lib_enc/ivas_omasa_enc_fx.c b/lib_enc/ivas_omasa_enc_fx.c
index cbbbacf0988baa19a531b61698278e2acbf53bcf..166bd67318dff995663cc884565ce74a3dc2bf0f 100644
--- a/lib_enc/ivas_omasa_enc_fx.c
+++ b/lib_enc/ivas_omasa_enc_fx.c
@@ -961,7 +961,6 @@ void ivas_set_surplus_brate_enc(
dbgwrite( &tmpF, 4, 1, input_frame, "res/brate_MASA_MD" ); /* == MASA MD bitrate */
}
#endif
-
return;
}
@@ -1222,8 +1221,8 @@ static void ivas_omasa_param_est_enc_fx(
}
/* Y */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[1][0], Foa_RealBuffer_fx[1], num_freq_bins ); /*q*/
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[1][0], Foa_ImagBuffer_fx[1], num_freq_bins ); /*q*/
+ v_multc_fx( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[1][0], Foa_RealBuffer_fx[1], num_freq_bins ); /*q*/
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[1][0], Foa_ImagBuffer_fx[1], num_freq_bins ); /*q*/
FOR( i = 1; i < nchan_ism; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hOMasa->chnlToFoaMtx_fx[1][i], Foa_RealBuffer_fx[1], num_freq_bins ); /*q*/
@@ -1231,30 +1230,29 @@ static void ivas_omasa_param_est_enc_fx(
}
/* Z */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[2][0], Foa_RealBuffer_fx[2], num_freq_bins ); /*q*/
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[2][0], Foa_ImagBuffer_fx[2], num_freq_bins ); /*q*/
+ v_multc_fx( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[2][0], Foa_RealBuffer_fx[2], num_freq_bins ); /*q*/
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[2][0], Foa_ImagBuffer_fx[2], num_freq_bins ); /*q*/
FOR( i = 1; i < nchan_ism; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hOMasa->chnlToFoaMtx_fx[2][i], Foa_RealBuffer_fx[2], num_freq_bins ); /*q*/
v_multc_acc_32_32( Chnl_ImagBuffer_fx[i], hOMasa->chnlToFoaMtx_fx[2][i], Foa_ImagBuffer_fx[2], num_freq_bins ); /*q*/
}
-
/* X */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[3][0], Foa_RealBuffer_fx[3], num_freq_bins ); /*q*/
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[3][0], Foa_ImagBuffer_fx[3], num_freq_bins ); /*q*/
+ v_multc_fx( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[3][0], Foa_RealBuffer_fx[3], num_freq_bins ); /*q*/
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[3][0], Foa_ImagBuffer_fx[3], num_freq_bins ); /*q*/
FOR( i = 1; i < nchan_ism; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hOMasa->chnlToFoaMtx_fx[3][i], Foa_RealBuffer_fx[3], num_freq_bins ); /*q*/
v_multc_acc_32_32( Chnl_ImagBuffer_fx[i], hOMasa->chnlToFoaMtx_fx[3][i], Foa_ImagBuffer_fx[3], num_freq_bins ); /*q*/
}
+
/* Direction estimation */
computeIntensityVector_enc_fx( hOMasa->band_grouping, Foa_RealBuffer_fx, Foa_ImagBuffer_fx, num_freq_bands, intensity_real_fx, q_intensity_real_fx, q );
- computeDirectionVectors_fixed( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], 0, q_intensity_real_fx );
+ computeDirectionVectors_fx2( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], 0, q_intensity_real_fx );
/* Power estimation for diffuseness */
-
computeReferencePower_omasa_ivas_fx( hOMasa->band_grouping, Foa_RealBuffer_fx, Foa_ImagBuffer_fx, reference_power_fx[ts], 0, num_freq_bands, q, q_reference_power_fx );
minimum_fx( q_intensity_real_fx, num_freq_bands, &intensity_real_e );
@@ -1293,7 +1291,7 @@ static void ivas_omasa_param_est_enc_fx(
Copy32( reference_power_fx[ts], &( hOMasa->buffer_energy_fx[( index - 1 ) * num_freq_bands] ), num_freq_bands );
hOMasa->buffer_energy_q[( index - 1 )] = sub( 31, ref_exp );
move16();
- computeDiffuseness_fixed( hOMasa->buffer_intensity_real_fx, hOMasa->buffer_energy_fx, num_freq_bands, diffuseness_vector_fx, hOMasa->buffer_intensity_real_q, hOMasa->buffer_energy_q, &q_diffuseness_vector );
+ computeDiffuseness_fx( hOMasa->buffer_intensity_real_fx, hOMasa->buffer_energy_fx, num_freq_bands, diffuseness_vector_fx, hOMasa->buffer_intensity_real_q, hOMasa->buffer_energy_q, &q_diffuseness_vector );
FOR( band_m_idx = 0; band_m_idx < hOMasa->nbands; band_m_idx++ )
{
@@ -1430,14 +1428,7 @@ static void ivas_omasa_energy_and_ratio_est_fx(
{
q_cldfb = q_data;
move16();
-#ifdef FIX_1987_CRASH_OMASA_ENERGY
cldfbAnalysis_ts_fx_var_q( &( data_fx[i][l_ts * ts] ), Chnl_RealBuffer_fx[i], Chnl_ImagBuffer_fx[i], l_ts, hOMasa->cldfbAnaEnc[i], &q_cldfb );
-#else
- scale_sig32( hOMasa->cldfbAnaEnc[i]->cldfb_state_fx, hOMasa->cldfbAnaEnc[i]->cldfb_state_length, sub( q_cldfb, hOMasa->cldfbAnaEnc[i]->Q_cldfb_state ) );
- hOMasa->cldfbAnaEnc[i]->Q_cldfb_state = q_cldfb;
- move16();
- cldfbAnalysis_ts_fx_fixed_q( &( data_fx[i][l_ts * ts] ), Chnl_RealBuffer_fx[i], Chnl_ImagBuffer_fx[i], l_ts, hOMasa->cldfbAnaEnc[i], &q_cldfb );
-#endif
norm_Chnl = s_min( norm_Chnl, L_norm_arr( Chnl_ImagBuffer_fx[i], 60 ) );
norm_Chnl = s_min( norm_Chnl, L_norm_arr( Chnl_RealBuffer_fx[i], 60 ) );
}
diff --git a/lib_enc/ivas_osba_enc_fx.c b/lib_enc/ivas_osba_enc_fx.c
index 424e56e4d26131d02790cb5aaa22c67f863e9507..3629b856285ae840e4540f4f21685b290e1d624c 100644
--- a/lib_enc/ivas_osba_enc_fx.c
+++ b/lib_enc/ivas_osba_enc_fx.c
@@ -354,21 +354,19 @@ ivas_error ivas_osba_enc_reconfig(
/*-----------------------------------------------------------------*
* Allocate, initialize, and configure SCE/CPE/MCT handles
*-----------------------------------------------------------------*/
+
nchan_transport = st_ivas->nchan_transport;
test();
test();
IF( old_ism_mode == ISM_MODE_NONE && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
{
- {
- nchan_transport = add( st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_ism );
- st_ivas->nCPE = shr_r( nchan_transport, 1 );
- }
+ nchan_transport = add( st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_ism );
+ st_ivas->nCPE = shr_r( nchan_transport, 1 );
}
ELSE IF( EQ_32( old_ism_mode, ISM_SBA_MODE_DISC ) && st_ivas->ism_mode == ISM_MODE_NONE )
{
nchan_transport_old = add( nchan_transport_old, st_ivas->hEncoderConfig->nchan_ism );
-
nchan_transport = st_ivas->nchan_transport;
}
ELSE IF( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
@@ -377,6 +375,7 @@ ivas_error ivas_osba_enc_reconfig(
nchan_transport = add( st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_ism );
st_ivas->nCPE = shr_r( nchan_transport, 1 );
}
+
Word16 tmp_e;
Word32 bitrate_per_chan = L_deposit_h( BASOP_Util_Divide3216_Scale( ivas_total_brate, st_ivas->nchan_transport, &tmp_e ) );
bitrate_per_chan = L_shr( bitrate_per_chan, sub( 15, tmp_e ) );
diff --git a/lib_enc/ivas_pca_enc_fx.c b/lib_enc/ivas_pca_enc_fx.c
index 2cb347a026794ad3e32d70cad242c81d02731e86..7eb4f18e71e4fc428d47427a68b9349633fd6667 100644
--- a/lib_enc/ivas_pca_enc_fx.c
+++ b/lib_enc/ivas_pca_enc_fx.c
@@ -415,9 +415,9 @@ void ivas_pca_enc_fx(
{
temp_fx32 = r_sm_fx[k * FOA_CHANNELS + k]; // min_q
move32();
- IF( LT_32( temp_fx32, L_shr( 64424, sub( 31, hPCA->old_r_sm_q ) ) ) ) // IVAS_PCA_COV_THRES in Q31
+ IF( LT_32( temp_fx32, L_shr( 64424, sub( 31, hPCA->old_r_sm_q ) ) ) ) // IVAS_PCA_COV_THRES=3e-5f in Q31
{
- temp_fx32 = L_shr( 64424, sub( 31, hPCA->old_r_sm_q ) ); // IVAS_PCA_COV_THRES in Q31 /*hPCA->old_r_sm_q */
+ temp_fx32 = L_shr( 64424, sub( 31, hPCA->old_r_sm_q ) ); // IVAS_PCA_COV_THRES=3e-5f in Q31 /*hPCA->old_r_sm_q */
}
r_sm_fx[k * FOA_CHANNELS + k] = temp_fx32; /* pointer reuse */ // hPCA->old_r_sm_q
move32();
diff --git a/lib_enc/ivas_qmetadata_enc_fx.c b/lib_enc/ivas_qmetadata_enc_fx.c
index f69127ff4ca8fb6dd175b0c337b95b509c7138a9..3f18527746af83315451c5160e22d3e48c496f38 100644
--- a/lib_enc/ivas_qmetadata_enc_fx.c
+++ b/lib_enc/ivas_qmetadata_enc_fx.c
@@ -840,9 +840,8 @@ void ivas_qmetadata_enc_sid_encode_fx(
IF( EQ_16( ivas_format, SBA_FORMAT ) )
{
-
sba_spar_bitlen = ivas_sba_spar_sid_bitlen_fx( nchan_transport );
- metadata_sid_bits = (int16_t) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS - SBA_ORDER_BITS - SBA_PLANAR_BITS - 1; /* -1 for inactive mode header bit*/
+ metadata_sid_bits = (Word16) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS - SBA_ORDER_BITS - SBA_PLANAR_BITS - 1; /* -1 for inactive mode header bit*/
metadata_sid_bits = sub( metadata_sid_bits, sba_spar_bitlen );
}
ELSE
@@ -851,7 +850,6 @@ void ivas_qmetadata_enc_sid_encode_fx(
move16();
}
-
/* Save initial position in bitstream */
bit_pos_start = hMetaData->nb_bits_tot;
move16();
@@ -1031,8 +1029,8 @@ void ivas_qmetadata_enc_sid_encode_fx(
{
/*compute the average direction */
ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[b].azimuth_fx[m], q_direction->band_data[b].elevation_fx[m], direction_vector_fx );
- scale_sig32( direction_vector_fx, 3, Q22 - Q30 ); // Q30 -> Q22
- v_add_fixed_no_hdrm( avg_direction_vector_fx, direction_vector_fx, avg_direction_vector_fx, 3 ); // Q22
+ scale_sig32( direction_vector_fx, 3, Q22 - Q30 ); // Q30 -> Q22
+ v_add_fx_no_hdrm( avg_direction_vector_fx, direction_vector_fx, avg_direction_vector_fx, 3 ); // Q22
}
ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector_fx, Q22, &avg_azimuth_fx[b], &avg_elevation_fx[b] );
@@ -2375,7 +2373,7 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx(
/*compute the average direction */
ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[i].azimuth_fx[j], q_direction->band_data[i].elevation_fx[j], direction_vector );
scale_sig32( direction_vector, 3, -8 ); // Q30 -> Q22
- v_add_fixed_no_hdrm( avg_direction_vector, direction_vector, avg_direction_vector, 3 );
+ v_add_fx_no_hdrm( avg_direction_vector, direction_vector, avg_direction_vector, 3 );
}
}
}
@@ -2638,7 +2636,7 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx(
IF( LT_16( idx, 4 ) )
{
- v_add_fixed_no_hdrm( avg_direction_vector, direction_vector, avg_direction_vector, 3 );
+ v_add_fx_no_hdrm( avg_direction_vector, direction_vector, avg_direction_vector, 3 );
}
}
/* project the quantized average azimuth angle to the same grid as the current sample */
@@ -2669,7 +2667,7 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx(
ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[i].azimuth_fx[j], q_direction->band_data[i].elevation_fx[j], direction_vector );
scale_sig32( direction_vector, 3, -8 ); // Q30 -> Q22
- v_add_fixed_no_hdrm( avg_direction_vector, direction_vector, avg_direction_vector, 3 );
+ v_add_fx_no_hdrm( avg_direction_vector, direction_vector, avg_direction_vector, 3 );
ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector, Q22, &avg_azimuth, &avg_elevation );
avg_azimuth_index_upd = quantize_phi_enc_fx( L_add( avg_azimuth, 180 << Q22 ), 0, &avg_azimuth, avg_azimuth_alphabet );
diff --git a/lib_enc/ivas_sns_enc_fx.c b/lib_enc/ivas_sns_enc_fx.c
index 252637e73999bfd53a81b60a4640118f3db6cac1..0e3c0bd405c51fedc3cdc397b35271b23f445391 100644
--- a/lib_enc/ivas_sns_enc_fx.c
+++ b/lib_enc/ivas_sns_enc_fx.c
@@ -672,7 +672,7 @@ Word16 quantize_sns_fx(
Word32 ener_side_fx;
Word16 ener_side_q;
- v_sub_fixed_no_hdrm( snsQ_out_fx[0][k], snsQ_out_fx[1][k], side_fx, M );
+ v_sub_fx_no_hdrm( snsQ_out_fx[0][k], snsQ_out_fx[1][k], side_fx, M );
Word64 L64_sum;
L64_sum = 1;
diff --git a/lib_enc/ivas_spar_encoder_fx.c b/lib_enc/ivas_spar_encoder_fx.c
index 481b969b70cc3e830d3fe8346613775ad9e90243..0b1f77245a19521319ec8798eb0f65bde6e2162b 100644
--- a/lib_enc/ivas_spar_encoder_fx.c
+++ b/lib_enc/ivas_spar_encoder_fx.c
@@ -730,9 +730,11 @@ static ivas_error ivas_spar_enc_process_fx(
{
Copy32( data_fx[HOA_keep_ind[i]], data_fx[i], input_frame );
}
+
/*-----------------------------------------------------------------------------------------*
* Transient detector
*-----------------------------------------------------------------------------------------*/
+
ivas_transient_det_process_fx( hSpar->hTranDet, data_fx[0], input_frame, transient_det );
#ifdef DEBUGGING
@@ -743,7 +745,6 @@ static ivas_error ivas_spar_enc_process_fx(
dbgwrite_txt( a, 2, "fixed.txt", NULL );
}
#endif
-
if ( LT_32( ivas_total_brate, IVAS_24k4 ) )
{
transient_det[1] = 0;
@@ -890,12 +891,14 @@ static ivas_error ivas_spar_enc_process_fx(
/*-----------------------------------------------------------------------------------------*
* Covariance and MD processing
*-----------------------------------------------------------------------------------------*/
+
IF( NE_32( ( error = ivas_spar_cov_md_process_fx( hEncoderConfig, st_ivas->hSpar, st_ivas->hQMetaData, hMetaData, nchan_inp, sba_order, ppIn_FR_real_fx, ppIn_FR_imag_fx, transient_det, dtx_vad, nchan_transport, &dyn_active_w_flag, pp_fr_q ) ), IVAS_ERR_OK ) )
{
return error;
}
set16_fx( q_p_pcm_tmp_fx, pp_fr_q, nchan_fb_in );
+
/*-----------------------------------------------------------------------------------------*
* FB mixer
*-----------------------------------------------------------------------------------------*/
@@ -972,6 +975,7 @@ static ivas_error ivas_spar_enc_process_fx(
v_add_fx( data_fx[idx], p_pcm_tmp_fx[i] + num_del_samples, p_pcm_tmp_fx[i] + num_del_samples, sub( input_frame, num_del_samples ) );
}
}
+
/*-----------------------------------------------------------------------------------------*
* PCA encoder
*-----------------------------------------------------------------------------------------*/
@@ -990,7 +994,6 @@ static ivas_error ivas_spar_enc_process_fx(
}
}
-
/*-----------------------------------------------------------------------------------------*
* AGC
*-----------------------------------------------------------------------------------------*/
diff --git a/lib_enc/ivas_stereo_dft_enc_fx.c b/lib_enc/ivas_stereo_dft_enc_fx.c
index 1eb89a74af4cab0fbcf3994b059aa5dca5c23958..e5522fb377bf0ab53db392a8fae7c58230c46efa 100644
--- a/lib_enc/ivas_stereo_dft_enc_fx.c
+++ b/lib_enc/ivas_stereo_dft_enc_fx.c
@@ -51,7 +51,7 @@
#define STEREO_DFT_NRG_PAST_MAX_BAND 9
#define STEREO_DFT_NRG_PAST_MAX_BAND_LB 4
-#define STEREO_DFT_DMX_CROSSOVER ( int16_t )( 132 * ( (float) ( STEREO_DFT_N_NS_ENC ) / STEREO_DFT_N_NS ) + 0.5f ) /* crossover bin between binwise and bandwise DMX */
+#define STEREO_DFT_DMX_CROSSOVER ( Word16 )( 132 * ( (float) ( STEREO_DFT_N_NS_ENC ) / STEREO_DFT_N_NS ) + 0.5f ) /* crossover bin between binwise and bandwise DMX */
#define ITD_VAD_E_BAND_N_INIT 200000
#define ITD_SID_PREV_FRAMES 5
diff --git a/lib_enc/ivas_stereo_dft_enc_itd_fx.c b/lib_enc/ivas_stereo_dft_enc_itd_fx.c
index aee6e3a6b3d2365b45c45fd7b2b8994097cebacd..eb23e9d01862638d7789f34c293a2818b55ecdb9 100644
--- a/lib_enc/ivas_stereo_dft_enc_itd_fx.c
+++ b/lib_enc/ivas_stereo_dft_enc_itd_fx.c
@@ -77,7 +77,7 @@
#define ITD_VAD_NOISE_INIT_FRAMES 30
#define ITD_VAD_THRSHOLD 0.001f
-#define ITD_VAD_THRSHOLD_Q31 2147484
+#define ITD_VAD_THRSHOLD_Q31 INV_1000_Q31
#define ITD_VAD_MS_SNR_UPDATE_THRESH 15.0f
#define ITD_VAD_MS_SNR_UPDATE_THRESH_FX 15
#define HIGHT_SNR_VOICE_TH 10000.0f
diff --git a/lib_enc/ivas_stereo_dft_td_itd_fx.c b/lib_enc/ivas_stereo_dft_td_itd_fx.c
index 0e404a0de6fe6e81056f5767994d4d055674f3c7..2c044625c9afe432e74c86ab81a9ddde7ce46d14 100644
--- a/lib_enc/ivas_stereo_dft_td_itd_fx.c
+++ b/lib_enc/ivas_stereo_dft_td_itd_fx.c
@@ -573,10 +573,8 @@ void stereo_td_itd_mdct_stereo_fx(
Word16 DFT_e[CPE_CHANNELS];
Word16 DFT_tmp_e[CPE_CHANNELS][STEREO_DFT_N_MAX_ENC];
STEREO_MDCT_ENC_DATA_HANDLE hStereoMdct;
-#ifdef NONBE_1203_MDCT2DFT_SWITCHING
Word16 dft_ovl;
Word16 sf;
-#endif
test();
IF( hCPE->hStereoMdct != NULL && hCPE->hStereoMdct->hItd != NULL )
@@ -615,7 +613,6 @@ void stereo_td_itd_mdct_stereo_fx(
/* Time Domain ITD compensation using extrapolation */
stereo_td_itd_fx( hStereoMdct->hItd, NULL, NULL, 1, hStereoMdct->hDft_ana->dft_ovl, hCPE->hCoreCoder, input_frame, hCPE->input_mem_fx, hCPE->q_input_mem );
}
-#ifdef NONBE_1203_MDCT2DFT_SWITCHING
ELSE IF( hCPE->input_mem_fx[0] != NULL )
{
dft_ovl = extract_l( Mpy_32_32( imult3216( input_frame, STEREO_DFT_OVL_MAX ), 2236963 ) ); // 1/L_FRAME48k = 2236963 (Q31)
@@ -628,7 +625,6 @@ void stereo_td_itd_mdct_stereo_fx(
move16();
}
}
-#endif
return;
diff --git a/lib_enc/ivas_stereo_ica_enc_fx.c b/lib_enc/ivas_stereo_ica_enc_fx.c
index e5c7af987416ee004fd5405e36a175643b479827..924de4d6595451430d5ab5a91f8c5a96fbd444fa 100644
--- a/lib_enc/ivas_stereo_ica_enc_fx.c
+++ b/lib_enc/ivas_stereo_ica_enc_fx.c
@@ -609,13 +609,13 @@ static void utilCrossCorr_fx(
{
IF( EQ_16( winSymmFlag, 0 ) )
{
- v_mult_fixed( buf1, win, tempBuf1, len );
- v_mult_fixed( buf2, win, tempBuf2, len );
+ v_mult_fx( buf1, win, tempBuf1, len );
+ v_mult_fx( buf2, win, tempBuf2, len );
}
ELSE
{
- v_mult_fixed( buf1, win, tempBuf1, ( len >> 1 ) );
- v_mult_fixed( buf2, win, tempBuf2, ( len >> 1 ) );
+ v_mult_fx( buf1, win, tempBuf1, ( len >> 1 ) );
+ v_mult_fx( buf2, win, tempBuf2, ( len >> 1 ) );
FOR( i = shr( len, 1 ); i < len; i++ )
{
@@ -704,7 +704,7 @@ static void utilCrossCorr_fx(
*corrEst_e = max_e;
move16();
- v_multc_fixed( corrEst, scale, corrEst, j );
+ v_multc_fx( corrEst, scale, corrEst, j );
*corrEst_e = add( *corrEst_e, temp2_e );
move16();
@@ -885,9 +885,9 @@ static void corrStatsEst_fx(
move32();
/* long term corr Stats estimation */
- v_multc_fixed_16( hStereoTCA->corrEstLT_fx, alpha_fx, hStereoTCA->corrEstLT_fx, 2 * L_NCSHIFT_DS + 1 ); /* Q31-hStereoTCA->corrEstLT_exp */
- v_multc_fixed_16( corrEst_fx, sub( MAX_16, alpha_fx ), corrEst_fx, 2 * L_NCSHIFT_DS + 1 ); /* Q31-corrEst_exp */
- v_add_fixed_me( hStereoTCA->corrEstLT_fx, hStereoTCA->corrEstLT_exp, corrEst_fx, corrEst_exp, hStereoTCA->corrEstLT_fx, &hStereoTCA->corrEstLT_exp, 2 * L_NCSHIFT_DS + 1, 0 );
+ v_multc_fx_16( hStereoTCA->corrEstLT_fx, alpha_fx, hStereoTCA->corrEstLT_fx, 2 * L_NCSHIFT_DS + 1 ); /* Q31-hStereoTCA->corrEstLT_exp */
+ v_multc_fx_16( corrEst_fx, sub( MAX_16, alpha_fx ), corrEst_fx, 2 * L_NCSHIFT_DS + 1 ); /* Q31-corrEst_exp */
+ v_add_fx_me( hStereoTCA->corrEstLT_fx, hStereoTCA->corrEstLT_exp, corrEst_fx, corrEst_exp, hStereoTCA->corrEstLT_fx, &hStereoTCA->corrEstLT_exp, 2 * L_NCSHIFT_DS + 1, 0 );
hStereoTCA->ica_envVarLT_fx = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( hStereoTCA->ica_envVarLT_fx, SMOOTH_ENV_FACTOR_FX_Q15 ), hStereoTCA->ica_envVarLT_exp, Mpy_32_16_1( tempF_fx, ONE_IN_Q15 - SMOOTH_ENV_FACTOR_FX_Q15 ), tempF_exp, &hStereoTCA->ica_envVarLT_exp ); // SMOOTH_ENV_FACTOR_FX_Q15 (Q31-hStereoTCA->ica_envVarLT_exp)
move32();
@@ -1037,15 +1037,15 @@ static void corrStatsEst_fx(
IF( LT_32( hStereoTCA->prevTargetGain_fx, 429496730 /*0.8f in Q29*/ ) && vad_flag1 )
{
/* ch 2 is prev reference channel */
- v_multc_fixed( corrEst_fx, 644245095 /*1.2f in Q29*/, corrEst_fx, L_NCSHIFT_DS + 1 ); /* Q31-corrEst_exp */
- v_multc_fixed( corrEst_fx + L_NCSHIFT_DS + 1, 447213470 /* 0.833 in Q29*/, corrEst_fx + L_NCSHIFT_DS + 1, L_NCSHIFT_DS ); /* Q31-corrEst_exp */
+ v_multc_fx( corrEst_fx, 644245095 /*1.2f in Q29*/, corrEst_fx, L_NCSHIFT_DS + 1 ); /* Q31-corrEst_exp */
+ v_multc_fx( corrEst_fx + L_NCSHIFT_DS + 1, 447213470 /* 0.833 in Q29*/, corrEst_fx + L_NCSHIFT_DS + 1, L_NCSHIFT_DS ); /* Q31-corrEst_exp */
corrEst_exp = add( corrEst_exp, 2 );
}
ELSE IF( GT_32( hStereoTCA->prevTargetGain_fx, 644245094 /*1.2f in Q29*/ ) && vad_flag1 )
{
/* ch 1 is prev reference channel */
- v_multc_fixed( corrEst_fx, 447213470 /* 0.833 f in Q29*/, corrEst_fx, L_NCSHIFT_DS ); /* Q31-corrEst_exp */
- v_multc_fixed( corrEst_fx + L_NCSHIFT_DS, 644245095 /*1.2f in Q29*/, corrEst_fx + L_NCSHIFT_DS, L_NCSHIFT_DS + 1 ); /* Q31-corrEst_exp */
+ v_multc_fx( corrEst_fx, 447213470 /* 0.833 f in Q29*/, corrEst_fx, L_NCSHIFT_DS ); /* Q31-corrEst_exp */
+ v_multc_fx( corrEst_fx + L_NCSHIFT_DS, 644245095 /*1.2f in Q29*/, corrEst_fx + L_NCSHIFT_DS, L_NCSHIFT_DS + 1 ); /* Q31-corrEst_exp */
corrEst_exp = add( corrEst_exp, 2 );
}
test();
@@ -1055,9 +1055,9 @@ static void corrStatsEst_fx(
j = s_min( 2 * L_NCSHIFT_DS, add( hStereoTCA->prevCorrLagStats[0], 1 + L_NCSHIFT_DS ) );
k = add( sub( j, i ), 1 );
- v_multc_fixed( corrEst_fx, ONE_IN_Q29 /*1.0f in Q29*/, corrEst_fx, i ); // to allign in same exp (Q31-corrEst_exp)
- v_multc_fixed( corrEst_fx + i, 644245095 /*1.2f in Q29*/, corrEst_fx + i, k ); /* Q31-corrEst_exp */
- v_multc_fixed( corrEst_fx + i + k, ONE_IN_Q29 /*1.0f in Q29*/, corrEst_fx + i + k, sub( 2 * L_NCSHIFT_DS + 1, i + k ) ); // to allign in same exp (Q31-corrEst_exp)
+ v_multc_fx( corrEst_fx, ONE_IN_Q29 /*1.0f in Q29*/, corrEst_fx, i ); // to allign in same exp (Q31-corrEst_exp)
+ v_multc_fx( corrEst_fx + i, 644245095 /*1.2f in Q29*/, corrEst_fx + i, k ); /* Q31-corrEst_exp */
+ v_multc_fx( corrEst_fx + i + k, ONE_IN_Q29 /*1.0f in Q29*/, corrEst_fx + i + k, sub( 2 * L_NCSHIFT_DS + 1, i + k ) ); // to allign in same exp (Q31-corrEst_exp)
corrEst_exp = add( corrEst_exp, 2 );
}
@@ -1876,17 +1876,17 @@ void stereo_tca_enc_fx(
IF( EQ_16( hStereoTCA->prevRefChanIndx, L_CH_INDX ) )
{
- v_multc_fixed( bufChanL_fx, ONE_IN_Q29, bufChanL_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q - 2*/
- Copy32( ptrChanL_fx - add( lMemRecalc, lMemRecalc_SCh ), input_mem_loc_fx[0], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q - 2
- v_multc_fixed( ptrChanR_fx + sub( prevNCShift, add( lMemRecalc, lMemRecalc_SCh ) ), hStereoTCA->prevTargetGain_fx, input_mem_loc_fx[1], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q-2
- v_multc_fixed( bufChanR_fx, ONE_IN_Q29, bufChanR_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q -2*/
+ v_multc_fx( bufChanL_fx, ONE_IN_Q29, bufChanL_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q - 2*/
+ Copy32( ptrChanL_fx - add( lMemRecalc, lMemRecalc_SCh ), input_mem_loc_fx[0], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q - 2
+ v_multc_fx( ptrChanR_fx + sub( prevNCShift, add( lMemRecalc, lMemRecalc_SCh ) ), hStereoTCA->prevTargetGain_fx, input_mem_loc_fx[1], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q-2
+ v_multc_fx( bufChanR_fx, ONE_IN_Q29, bufChanR_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q -2*/
}
ELSE
{
- v_multc_fixed( bufChanL_fx, ONE_IN_Q29, bufChanL_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q -2*/
- Copy32( ptrChanL_fx + sub( prevNCShift, add( lMemRecalc, lMemRecalc_SCh ) ), input_mem_loc_fx[0], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q -2
- v_multc_fixed( ptrChanR_fx - add( lMemRecalc, lMemRecalc_SCh ), hStereoTCA->prevTargetGain_fx, input_mem_loc_fx[1], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q -2
- v_multc_fixed( bufChanR_fx, ONE_IN_Q29, bufChanR_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q -2*/
+ v_multc_fx( bufChanL_fx, ONE_IN_Q29, bufChanL_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q -2*/
+ Copy32( ptrChanL_fx + sub( prevNCShift, add( lMemRecalc, lMemRecalc_SCh ) ), input_mem_loc_fx[0], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q -2
+ v_multc_fx( ptrChanR_fx - add( lMemRecalc, lMemRecalc_SCh ), hStereoTCA->prevTargetGain_fx, input_mem_loc_fx[1], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q -2
+ v_multc_fx( bufChanR_fx, ONE_IN_Q29, bufChanR_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q -2*/
}
bufChan_q = sub( bufChan_q, 2 );
q_com = bufChan_q;
@@ -1937,7 +1937,7 @@ void stereo_tca_enc_fx(
}
ELSE
{
- v_multc_fixed( target_fx - tempS, hStereoTCA->prevTargetGain_fx, &( input_mem_loc_fx[target_idx][lMemRecalc + lMemRecalc_SCh - tempS - currentNCShift] ), add( currentNCShift, tempS ) ); /* bufChan_q - 2 */
+ v_multc_fx( target_fx - tempS, hStereoTCA->prevTargetGain_fx, &( input_mem_loc_fx[target_idx][lMemRecalc + lMemRecalc_SCh - tempS - currentNCShift] ), add( currentNCShift, tempS ) ); /* bufChan_q - 2 */
scale_sig32( input_mem_loc_fx[target_idx], sub( sub( add( lMemRecalc, lMemRecalc_SCh ), tempS ), currentNCShift ), -2 );
scale_sig32( &input_mem_loc_fx[target_idx][lMemRecalc + lMemRecalc_SCh], sub( NS2SA( 48000, L_MEM_RECALC_NS + L_MEM_RECALC_SCH_NS ), add( lMemRecalc, lMemRecalc_SCh ) ), -2 );
scale_sig32( input_mem_loc_fx[0], NS2SA( 48000, L_MEM_RECALC_NS + L_MEM_RECALC_SCH_NS ), -2 );
@@ -1989,12 +1989,12 @@ void stereo_tca_enc_fx(
target_idx = L_CH_INDX; /* only to avoid compilation warning */
move16();
- v_multc_fixed( bufChanL_fx, ONE_IN_Q29, bufChanL_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q -2*/
+ v_multc_fx( bufChanL_fx, ONE_IN_Q29, bufChanL_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q -2*/
- Copy32( ptrChanL_fx - add( lMemRecalc, lMemRecalc_SCh ), input_mem_loc_fx[0], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q -2
- v_multc_fixed( ptrChanR_fx - add( lMemRecalc, lMemRecalc_SCh ), hStereoTCA->prevTargetGain_fx, input_mem_loc_fx[1], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q -2
+ Copy32( ptrChanL_fx - add( lMemRecalc, lMemRecalc_SCh ), input_mem_loc_fx[0], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q -2
+ v_multc_fx( ptrChanR_fx - add( lMemRecalc, lMemRecalc_SCh ), hStereoTCA->prevTargetGain_fx, input_mem_loc_fx[1], add( lMemRecalc, lMemRecalc_SCh ) ); // bufChan_q -2
- v_multc_fixed( bufChanR_fx, ONE_IN_Q29, bufChanR_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q -2 */
+ v_multc_fx( bufChanR_fx, ONE_IN_Q29, bufChanR_fx, L_MEM_RECALC_48K + L_MEM_RECALC_48k_SCH + L_FRAME48k + L_NCSHIFTMAX ); /* TO make in common Q bufChan_q -2 */
bufChan_q = sub( bufChan_q, 2 );
q_com = bufChan_q;
move16();
diff --git a/lib_enc/ivas_stereo_icbwe_enc_fx.c b/lib_enc/ivas_stereo_icbwe_enc_fx.c
index 85c35ed50f80ab35a492daf9b536088e6573dffe..f6bf1a0999fecbf98301544fcca9ad8bb4e2f04d 100644
--- a/lib_enc/ivas_stereo_icbwe_enc_fx.c
+++ b/lib_enc/ivas_stereo_icbwe_enc_fx.c
@@ -132,14 +132,14 @@ static Word16 ic_bwe_enc_specMapping_ivas_fx(
/* Calculate rxx(1)/rxx(0) of the non ref target */
- temp00_fx = dotp_fixed_ivas_fx( shb_frame_target_fx, shb_frame_target_e, shb_frame_target_fx, shb_frame_target_e, L_FRAME16k - 1, &temp00_exp ); /* Q31-temp0_exp */
- temp11_fx = dotp_fixed_ivas_fx( shb_frame_target_fx, shb_frame_target_e, shb_frame_target_fx + 1, shb_frame_target_e, L_FRAME16k - 1, &temp11_exp ); /* Q31-temp1_exp */
+ temp00_fx = dotp_fx_ivas_fx( shb_frame_target_fx, shb_frame_target_e, shb_frame_target_fx, shb_frame_target_e, L_FRAME16k - 1, &temp00_exp ); /* Q31-temp0_exp */
+ temp11_fx = dotp_fx_ivas_fx( shb_frame_target_fx, shb_frame_target_e, shb_frame_target_fx + 1, shb_frame_target_e, L_FRAME16k - 1, &temp11_exp ); /* Q31-temp1_exp */
/* Calculate rxx(1)/rxx(0) of the non ref synth */
- temp0_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx, *shb_synth_nonref_e, L_FRAME16k - 3, &temp0_exp ); /* Q31-temp0_exp */
- temp1_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx + 1, *shb_synth_nonref_e, L_FRAME16k - 3, &temp1_exp ); /* Q31-temp1_exp */
- temp2_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx + 2, *shb_synth_nonref_e, L_FRAME16k - 3, &temp2_exp ); /* Q31-temp2_exp */
- temp3_fx = dotp_fixed_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx + 3, *shb_synth_nonref_e, L_FRAME16k - 3, &temp3_exp ); /* Q31-temp3_exp */
+ temp0_fx = dotp_fx_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx, *shb_synth_nonref_e, L_FRAME16k - 3, &temp0_exp ); /* Q31-temp0_exp */
+ temp1_fx = dotp_fx_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx + 1, *shb_synth_nonref_e, L_FRAME16k - 3, &temp1_exp ); /* Q31-temp1_exp */
+ temp2_fx = dotp_fx_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx + 2, *shb_synth_nonref_e, L_FRAME16k - 3, &temp2_exp ); /* Q31-temp2_exp */
+ temp3_fx = dotp_fx_ivas_fx( shb_synth_nonref_fx, *shb_synth_nonref_e, shb_synth_nonref_fx + 3, *shb_synth_nonref_e, L_FRAME16k - 3, &temp3_exp ); /* Q31-temp3_exp */
exp = s_max( *memShbSpecXcorr_e, s_max( s_max( s_max( temp00_exp, temp11_exp ), s_max( temp0_exp, temp1_exp ) ), s_max( temp2_exp, temp3_exp ) ) );
@@ -734,7 +734,7 @@ void stereo_icBWE_enc_ivas_fx(
test();
IF( LT_32( gTarget_fx, 268435456 ) || GT_32( gTarget_fx, 1073741824 ) ) // 0.5 in Q29 or 2.0 in Q29
{
- v_multc_fixed( voice_factors_fx, 1073741824, nlMixFac_fx, NB_SUBFR16k ); // Q31, 0.5 in Q31 -> 1073741824
+ v_multc_fx( voice_factors_fx, 1073741824, nlMixFac_fx, NB_SUBFR16k ); // Q31, 0.5 in Q31 -> 1073741824
}
Word16 L_FRAME16k_by_nbSubFr = L_FRAME16k / NB_SUBFR;
@@ -947,7 +947,7 @@ void stereo_icBWE_enc_ivas_fx(
test();
IF( LT_32( gTarget_fx, 268435456 ) || GT_32( gTarget_fx, 1073741824 ) ) // 0.5 in Q29 & 2.0 in Q29
{
- v_multc_fixed( voice_factors_fx, 1073741824 /*0.5 in Q31*/, nlMixFac_fx, NB_SUBFR16k ); /* Q31 */
+ v_multc_fx( voice_factors_fx, 1073741824 /*0.5 in Q31*/, nlMixFac_fx, NB_SUBFR16k ); /* Q31 */
}
Word16 L_FRAME16k_by_nbSubFr = L_FRAME16k / NB_SUBFR;
diff --git a/lib_enc/ivas_stereo_mdct_igf_enc_fx.c b/lib_enc/ivas_stereo_mdct_igf_enc_fx.c
index 6c3588cabc6d7a93997e0937dfd86940f859dee8..d22e1b885b7791d5cdadd3e62de61d00262b0588 100644
--- a/lib_enc/ivas_stereo_mdct_igf_enc_fx.c
+++ b/lib_enc/ivas_stereo_mdct_igf_enc_fx.c
@@ -80,13 +80,13 @@ static Word16 calcCoh_fx( // Q15
move16();
q_cc = q_ener1;
move16();
- ener1_fx = dotp_fixed_o( sig1_fx, sig1_fx, nSamples, gB, &q_ener1 ); /* q_ener1 */
- ener2_fx = dotp_fixed_o( sig2_fx, sig2_fx, nSamples, gB, &q_ener2 ); /* q_ener2 */
- cEner_fx = Mpy_32_32( ener1_fx, ener2_fx ); /* q_ener1+q_ener2-31 */
+ ener1_fx = dotp_fx32_o( sig1_fx, sig1_fx, nSamples, gB, &q_ener1 ); /* q_ener1 */
+ ener2_fx = dotp_fx32_o( sig2_fx, sig2_fx, nSamples, gB, &q_ener2 ); /* q_ener2 */
+ cEner_fx = Mpy_32_32( ener1_fx, ener2_fx ); /* q_ener1+q_ener2-31 */
q_cEner = sub( 62, add( q_ener1, q_ener2 ) );
cEner_fx = Sqrt32( cEner_fx, &q_cEner ); /* Q31-q_cEner */
q_cEner = sub( Q31, q_cEner );
- cc_fx = dotp_fixed_o( sig1_fx, sig2_fx, nSamples, gB, &q_cc ); /* q_cc */
+ cc_fx = dotp_fx32_o( sig1_fx, sig2_fx, nSamples, gB, &q_cc ); /* q_cc */
IF( corr != NULL )
{
diff --git a/lib_enc/ivas_stereo_mdct_stereo_enc_fx.c b/lib_enc/ivas_stereo_mdct_stereo_enc_fx.c
index bcc4462a23f3d3574a5996509226e5e9174a0491..d53eb365d3dcca44ca72231143fec4127c002df0 100644
--- a/lib_enc/ivas_stereo_mdct_stereo_enc_fx.c
+++ b/lib_enc/ivas_stereo_mdct_stereo_enc_fx.c
@@ -255,8 +255,8 @@ void stereo_coder_tcx_fx(
tmp = Inv16( extract_h( nrgRatio_fx[k] ), &e_tmp ); /* Q15-e_tmp */
tmp = shl( tmp, e_tmp ); /* Q15 */
- v_multc_fixed_16( sts[1]->hTcxEnc->spectrum_fx[k], tmp, sts[1]->hTcxEnc->spectrum_fx[k], L_frameTCX ); /* exp: exp_spec */
- v_multc_fixed_16( mdst_spectrum_fx[1][k], tmp, mdst_spectrum_fx[1][k], L_frameTCX ); /* exp: exp_mdct_spec */
+ v_multc_fx_16( sts[1]->hTcxEnc->spectrum_fx[k], tmp, sts[1]->hTcxEnc->spectrum_fx[k], L_frameTCX ); /* exp: exp_spec */
+ v_multc_fx_16( mdst_spectrum_fx[1][k], tmp, mdst_spectrum_fx[1][k], L_frameTCX ); /* exp: exp_mdct_spec */
}
ELSE IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( nrgRatio_fx[k], nrgRatio_e[k], ONE_IN_Q27, 4 ), -1 ) && LT_16( k, EQ_16( sts[0]->core, TCX_20_CORE ) ? 1 : NB_DIV ) )
{
@@ -264,8 +264,8 @@ void stereo_coder_tcx_fx(
L_frameTCX = idiv1616( L_frameTCX, ( sts[0]->core == TCX_20_CORE ) ? 1 : NB_DIV ); /* Q0 */
/* This operation is resulting in some high MLDs in fixed point. */
- v_multc_fixed_16( sts[0]->hTcxEnc->spectrum_fx[k], extract_l( L_shr( nrgRatio_fx[k], 16 - nrgRatio_e[k] ) ), sts[0]->hTcxEnc->spectrum_fx[k], L_frameTCX ); /* exp: exp_spec */
- v_multc_fixed_16( mdst_spectrum_fx[0][k], extract_l( L_shr( nrgRatio_fx[k], 16 - nrgRatio_e[k] ) ), mdst_spectrum_fx[0][k], L_frameTCX ); /* exp: exp_mdct_spec */
+ v_multc_fx_16( sts[0]->hTcxEnc->spectrum_fx[k], extract_l( L_shr( nrgRatio_fx[k], 16 - nrgRatio_e[k] ) ), sts[0]->hTcxEnc->spectrum_fx[k], L_frameTCX ); /* exp: exp_spec */
+ v_multc_fx_16( mdst_spectrum_fx[0][k], extract_l( L_shr( nrgRatio_fx[k], 16 - nrgRatio_e[k] ) ), mdst_spectrum_fx[0][k], L_frameTCX ); /* exp: exp_mdct_spec */
}
}
}
@@ -309,7 +309,7 @@ void stereo_coder_tcx_fx(
}
for ( k = 0; k < nSubframes; k++ )
{
- convertToMS_fx( L_frameTCX, sts[0]->hTcxEnc->spectrum_fx[k], sts[1]->hTcxEnc->spectrum_fx[k], SQRT2_OVER_2_FIXED );
+ convertToMS_fx( L_frameTCX, sts[0]->hTcxEnc->spectrum_fx[k], sts[1]->hTcxEnc->spectrum_fx[k], SQRT2_OVER_2_FX );
/* Make sure that the MDST is processed in the correct way also */
set_s( &ms_mask[k][0], 1, MAX_SFB );
@@ -428,15 +428,15 @@ void stereo_coder_tcx_fx(
move32();
- v_multc_fixed( &sts[0]->hTcxEnc->spectrum_fx[k][startLine], nrgRatio_fx[0], &sts[0]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth ); /* exp: exp_spec+1 */
- v_multc_fixed( &mdst_spectrum_fx[0][k][startLine], nrgRatio_fx[0], &mdst_spectrum_fx[0][k][startLine], sfbWidth ); /* exp: exp_mdct_spec+1 */
- scale_sig32( &sts[0]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth, Q1 ); // exp: exp_spec
- scale_sig32( &mdst_spectrum_fx[0][k][startLine], sfbWidth, Q1 ); // exp: exp_mdct_spec
+ v_multc_fx( &sts[0]->hTcxEnc->spectrum_fx[k][startLine], nrgRatio_fx[0], &sts[0]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth ); /* exp: exp_spec+1 */
+ v_multc_fx( &mdst_spectrum_fx[0][k][startLine], nrgRatio_fx[0], &mdst_spectrum_fx[0][k][startLine], sfbWidth ); /* exp: exp_mdct_spec+1 */
+ scale_sig32( &sts[0]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth, Q1 ); // exp: exp_spec
+ scale_sig32( &mdst_spectrum_fx[0][k][startLine], sfbWidth, Q1 ); // exp: exp_mdct_spec
- v_multc_fixed( &sts[1]->hTcxEnc->spectrum_fx[k][startLine], nrgRatio_fx[1], &sts[1]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth ); /* exp: exp_spec+1 */
- v_multc_fixed( &mdst_spectrum_fx[1][k][startLine], nrgRatio_fx[1], &mdst_spectrum_fx[1][k][startLine], sfbWidth ); /* exp: exp_mdct_spec+1 */
- scale_sig32( &sts[1]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth, Q1 ); // exp: exp_spec
- scale_sig32( &mdst_spectrum_fx[1][k][startLine], sfbWidth, Q1 ); // exp: exp_mdct_spec
+ v_multc_fx( &sts[1]->hTcxEnc->spectrum_fx[k][startLine], nrgRatio_fx[1], &sts[1]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth ); /* exp: exp_spec+1 */
+ v_multc_fx( &mdst_spectrum_fx[1][k][startLine], nrgRatio_fx[1], &mdst_spectrum_fx[1][k][startLine], sfbWidth ); /* exp: exp_mdct_spec+1 */
+ scale_sig32( &sts[1]->hTcxEnc->spectrum_fx[k][startLine], sfbWidth, Q1 ); // exp: exp_spec
+ scale_sig32( &mdst_spectrum_fx[1][k][startLine], sfbWidth, Q1 ); // exp: exp_mdct_spec
}
}
}
@@ -584,7 +584,7 @@ void ms_processing_fx(
{
IF( NE_16( ms_mask[iSubframe][sfb], 0 ) )
{
- convertToBwMS_fx( sfbConf->sfbOffset[sfb], sfbConf->sfbOffset[sfb + 1], x_0_fx, x_1_fx, SQRT2_OVER_2_FIXED );
+ convertToBwMS_fx( sfbConf->sfbOffset[sfb], sfbConf->sfbOffset[sfb + 1], x_0_fx, x_1_fx, SQRT2_OVER_2_FX );
}
}
@@ -640,7 +640,7 @@ void ms_inv_mask_processing_fx(
IF( EQ_16( ms_mask[iSubframe][sfb], 0 ) )
{
- convertToBwMS_fx( sfbConf->sfbOffset[sfb], sfbConf->sfbOffset[sfb + 1], x_inv_0_fx, x_inv_1_fx, SQRT2_OVER_2_FIXED );
+ convertToBwMS_fx( sfbConf->sfbOffset[sfb], sfbConf->sfbOffset[sfb + 1], x_inv_0_fx, x_inv_1_fx, SQRT2_OVER_2_FX );
}
}
@@ -1185,9 +1185,9 @@ static void MsStereoDecision_fx(
FOR( i = 0; i < length; i++ )
{
- specM_fx[i] = Mpy_32_32( L_add( specL_fx[i], specR_fx[i] ), SQRT2_OVER_2_FIXED ); // Q( q_spec )
+ specM_fx[i] = Mpy_32_32( L_add( specL_fx[i], specR_fx[i] ), SQRT2_OVER_2_FX ); // Q( q_spec )
move32();
- specS_fx[i] = Mpy_32_32( L_sub( specL_fx[i], specR_fx[i] ), SQRT2_OVER_2_FIXED ); // Q( q_spec )
+ specS_fx[i] = Mpy_32_32( L_sub( specL_fx[i], specR_fx[i] ), SQRT2_OVER_2_FX ); // Q( q_spec )
move32();
}
diff --git a/lib_enc/ivas_stereo_switching_enc_fx.c b/lib_enc/ivas_stereo_switching_enc_fx.c
index 24ff57217cb95b64d983a3f0ddf6f27312fab872..4375046237747b0b603012af082f673e133b9bf4 100644
--- a/lib_enc/ivas_stereo_switching_enc_fx.c
+++ b/lib_enc/ivas_stereo_switching_enc_fx.c
@@ -649,25 +649,17 @@ void stereo_switching_enc_fx(
dft_ovl = extract_l( Mpy_32_32( imult3216( input_frame, STEREO_DFT_OVL_MAX ), 2236963 ) ); // 1/L_FRAME48k = 2236963 (Q31)
/* update DFT analysis overlap memory */
-#ifdef NONBE_1203_MDCT2DFT_SWITCHING
/* note: in MDCT stereo, the update is done in stereo_td_itd_mdct_stereo() */
-#endif
test();
test();
IF( GT_16( hCPE->element_mode, IVAS_CPE_DFT ) && hCPE->input_mem_fx[0] != NULL && NE_16( hCPE->element_mode, IVAS_CPE_MDCT ) )
{
FOR( n = 0; n < CPE_CHANNELS; n++ )
{
-#ifdef NONBE_1203_MDCT2DFT_SWITCHING
Word16 sf = L_norm_arr( sts[n]->input32_fx + input_frame - dft_ovl, dft_ovl );
Copy_Scale_sig32_16( sts[n]->input32_fx + input_frame - dft_ovl, hCPE->input_mem_fx[n], dft_ovl, sf ); /* sts[n]->q_inp32 - 16 */
hCPE->q_input_mem[n] = sub( add( sts[n]->q_inp32, sf ), 16 );
move16();
-#else
- Copy_Scale_sig32_16( sts[n]->input32_fx + input_frame - dft_ovl, hCPE->input_mem_fx[n], dft_ovl, 0 ); /* sts[n]->q_inp32 - 16 */
- hCPE->q_input_mem[n] = sub( sts[n]->q_inp32, 16 );
- move16();
-#endif
}
}
@@ -831,7 +823,7 @@ void stereo_switching_enc_fx(
test();
IF( hCPE->hStereoTD != NULL && EQ_16( hCPE->hStereoTD->tdm_last_ratio_idx, LRTD_STEREO_LEFT_IS_PRIM ) )
{
- v_multc_fixed( hCPE->hCoreCoder[1]->old_input_signal32_fx + sub( input_frame, add( offset, NS2SA_FX2( L_mult0( input_frame, FRAMES_PER_SEC ), L_MEM_RECALC_TBE_NS ) ) ), -MAX_32, sts[1]->cldfbAnaEnc->cldfb_state_fx, offset ); /* Q16+q_inp */
+ v_multc_fx( hCPE->hCoreCoder[1]->old_input_signal32_fx + sub( input_frame, add( offset, NS2SA_FX2( L_mult0( input_frame, FRAMES_PER_SEC ), L_MEM_RECALC_TBE_NS ) ) ), -MAX_32, sts[1]->cldfbAnaEnc->cldfb_state_fx, offset ); /* Q16+q_inp */
sts[1]->cldfbAnaEnc->Q_cldfb_state = q_inp;
move16();
}
diff --git a/lib_enc/ivas_tcx_core_enc_fx.c b/lib_enc/ivas_tcx_core_enc_fx.c
index 52cc9db8308401ab6eb97c7c01d2ff51d4e9bae0..c10705e5db5192984f0279374dce3288edab1870 100644
--- a/lib_enc/ivas_tcx_core_enc_fx.c
+++ b/lib_enc/ivas_tcx_core_enc_fx.c
@@ -760,9 +760,6 @@ Word16 ivas_acelp_tcx20_switching_fx(
Word32 offset_tcx, target;
Word32 y_fx[N_MAX];
Word32 tcx_snr;
-#ifndef ISSUE_1867_replace_overflow_libenc
- Flag Overflow;
-#endif
Word32 gain, noise;
Word16 noise_e = 0;
move16();
@@ -1250,11 +1247,7 @@ Word16 ivas_acelp_tcx20_switching_fx(
test();
if ( ( GT_32( snr_acelp, tcx_snr ) ) &&
( LT_32( snr_acelp, L_add( tcx_snr, 131072 /*2.0f Q16*/ ) ) ) &&
-#ifdef ISSUE_1867_replace_overflow_libenc
( LT_32( L_add_sat( st->prevTempFlatness_32fx, currFlatness ), 6815744 /*3.25f Q21*/ ) || EQ_16( stab_fac, 0x7fff ) ||
-#else
- ( LT_32( L_add_o( st->prevTempFlatness_32fx, currFlatness, &Overflow ), 6815744 /*3.25f Q21*/ ) || EQ_16( stab_fac, 0x7fff ) ||
-#endif
( !flag_16k_smc && ( st->sp_aud_decision0 > 0 ) && LT_32( L_add_sat( st->prevTempFlatness_32fx, currFlatness ), 41943040 /*20.f Q21*/ ) ) ) &&
( LE_16( st->Nb_ACELP_frames, 6 ) ) )
{
diff --git a/lib_enc/ivas_td_low_rate_enc_fx.c b/lib_enc/ivas_td_low_rate_enc_fx.c
index 8832af43c6514cd37d29c9b7b1c5336fff71cbb5..21fa7131243fcfef33162a6c624179eb68126900 100644
--- a/lib_enc/ivas_td_low_rate_enc_fx.c
+++ b/lib_enc/ivas_td_low_rate_enc_fx.c
@@ -376,11 +376,7 @@ void encod_gen_2sbfr(
* Prepare TBE excitation
*-----------------------------------------------------------------*/
-#ifdef FIX_2010_PREP_TBE_EXC
prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR], bwe_exc, 0, NULL, Q10, Q_new, T0, T0_frac, coder_type, st->core_brate, st->element_mode, st->idchan, st->hBWE_TD != NULL, st->tdm_LRTD_flag );
-#else
- prep_tbe_exc_fx( L_frame, L_SUBFR, i_subfr, gain_pit, gain_code, code, voice_fac, &voice_factors[i_subfr / L_SUBFR], bwe_exc, 0, NULL, Q_new, T0, T0_frac, coder_type, st->core_brate, st->element_mode, st->idchan, st->hBWE_TD != NULL, st->tdm_LRTD_flag );
-#endif
voice_factors[i_subfr / L_SUBFR + 1] = voice_factors[i_subfr / L_SUBFR]; /* Q15 */
move16();
diff --git a/lib_enc/lib_enc_fx.c b/lib_enc/lib_enc_fx.c
index 295608d6fb902cc09274d92c175fc9668df4ddf9..a242ad6792288918e0eafa5c736b8a3a863b1f55 100644
--- a/lib_enc/lib_enc_fx.c
+++ b/lib_enc/lib_enc_fx.c
@@ -540,12 +540,16 @@ ivas_error IVAS_ENC_FeedObjectMetadata(
{
return IVAS_ERR_INVALID_INDEX;
}
+#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS
+ error = ivas_set_ism_metadata_fx( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth_fx, metadata.elevation_fx, metadata.radius_fx, metadata.yaw_fx, metadata.pitch_fx, metadata.non_diegetic_flag );
+#else
Word32 azimuth_fx = float_to_fix( metadata.azimuth, Q22 ); /* Q22 */
Word32 elevation_fx = float_to_fix( metadata.elevation, Q22 ); /* Q22 */
Word16 radius_fx = float_to_fix16( metadata.radius, Q9 ); /* Q9 */
Word32 yaw_fx = float_to_fix( metadata.yaw, Q22 ); /* Q22 */
Word32 pitch_fx = float_to_fix( metadata.pitch, Q22 ); /* Q22 */
error = ivas_set_ism_metadata_fx( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], azimuth_fx, elevation_fx, radius_fx, yaw_fx, pitch_fx, metadata.non_diegetic_flag );
+#endif
IF( error != IVAS_ERR_OK )
{
diff --git a/lib_enc/lp_exc_e_fx.c b/lib_enc/lp_exc_e_fx.c
index 3b77bf3cd4697c528d9248c1aadf575422f1cf9a..4d6084c879694fe13d70d85916e1378c8c5584c3 100644
--- a/lib_enc/lp_exc_e_fx.c
+++ b/lib_enc/lp_exc_e_fx.c
@@ -1,10 +1,10 @@
/*====================================================================================
EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0
====================================================================================*/
+
#include
#include "options.h" /* Compilation switches */
#include "cnst.h" /* Common constants */
-//#include "prot_fx.h" /* Function prototypes */
#include "basop_util.h"
#include "prot_fx.h" /* Function prototypes */
#include "prot_fx_enc.h" /* Function prototypes */
@@ -173,6 +173,7 @@ Word16 lp_filt_exc_enc_fx(
return select;
}
+
/*-------------------------------------------------------------------*
* adpt_enr_fx()
*
@@ -180,20 +181,20 @@ Word16 lp_filt_exc_enc_fx(
* This serves to decide about the filtering of the adaptive excitation
*-------------------------------------------------------------------*/
-static Word16 adpt_enr_fx( /* o : adaptive excitation energy mant */
- const Word16 codec_mode, /* i : MODE1 or MODE2 */
- const Word16 *exc, /* i : excitation vector Q_new */
- const Word16 *h1, /* i : impuls response Q15 */
- Word16 *y1, /* o : zero-memory filtered adpt. excitation 12 bits */
- const Word16 L_subfr, /* i : vector length */
- Word16 *gain, /* o : subframe adaptive gain Q14 */
- Word16 *g_corr, /* o : correlations for adptive gain mant/exp*/
- const Word16 clip_gain, /* i : adaptive gain clipping flag Q0 */
- const Word16 *xn, /* i : adaptive codebook target 12 bits Q_new-1+shift*/
- Word16 *xn2, /* o : algebraic codebook target 12 bits Q_new-1+shift*/
- Word16 *exp_ener /* o : adaptive excitation energy exp */
- ,
- Word16 use_prev_sf_pit_gain /* i : flag to use prev sf pitch gain or not */
+/* o : adaptive excitation energy mant */
+static Word16 adpt_enr_fx(
+ const Word16 codec_mode, /* i : MODE1 or MODE2 */
+ const Word16 *exc, /* i : excitation vector Q_new */
+ const Word16 *h1, /* i : impuls response Q15 */
+ Word16 *y1, /* o : zero-memory filtered adpt. excitation 12 bits */
+ const Word16 L_subfr, /* i : vector length */
+ Word16 *gain, /* o : subframe adaptive gain Q14 */
+ Word16 *g_corr, /* o : correlations for adptive gain mant/exp*/
+ const Word16 clip_gain, /* i : adaptive gain clipping flag Q0 */
+ const Word16 *xn, /* i : adaptive codebook target 12 bits Q_new-1+shift*/
+ Word16 *xn2, /* o : algebraic codebook target 12 bits Q_new-1+shift*/
+ Word16 *exp_ener, /* o : adaptive excitation energy exp */
+ Word16 use_prev_sf_pit_gain /* i : flag to use prev sf pitch gain or not */
)
{
Word16 ener, i;
@@ -274,14 +275,14 @@ static Word16 adpt_enr_fx( /* o : adaptive excitation
* codebook excitation y1[]. ( and -2 )
*-------------------------------------------------------------------*/
-Word16 corr_xy1_fx( /* o : pitch gain (0..GAIN_PIT_MAX) */
- const Word16 xn_1[], /* i : target signal Q_new*/
- const Word16 y1_1[], /* i : filtered adaptive codebook excitation 12 bits*/
- Word16 g_corr[], /* o : correlations and -2 mant/exp*/
- const Word16 L_subfr, /* i : vector length */
- const Word16 norm_flag /* i : flag for constraining pitch contribution */
- ,
- Flag *Overflow_out /* o : propagating the Overflow flag to upper level */
+/* o : pitch gain (0..GAIN_PIT_MAX) */
+Word16 corr_xy1_fx(
+ const Word16 xn_1[], /* i : target signal Q_new*/
+ const Word16 y1_1[], /* i : filtered adaptive codebook excitation 12 bits*/
+ Word16 g_corr[], /* o : correlations and -2 mant/exp*/
+ const Word16 L_subfr, /* i : vector length */
+ const Word16 norm_flag, /* i : flag for constraining pitch contribution */
+ Flag *Overflow_out /* o : propagating the Overflow flag to upper level */
)
{
Word16 i;
diff --git a/lib_enc/lsf_enc_fx.c b/lib_enc/lsf_enc_fx.c
index 469b3baa2490497d27584bbd9a3c6513c295516a..0c5656ac447fdddddd91746589b0cce60dc03081 100644
--- a/lib_enc/lsf_enc_fx.c
+++ b/lib_enc/lsf_enc_fx.c
@@ -766,11 +766,6 @@ static Word16 qlsf_Mode_Select_fx(
Word32 temp32, En = 0;
Word16 safety_net;
Word16 i, cs, cl;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/* calculate the prediction residual */
cl = 0;
@@ -786,11 +781,7 @@ static Word16 qlsf_Mode_Select_fx(
{
pred_pow2[i] = shl( pred1[i], cs );
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
En = L_mac_sat( En, mult( pred_pow2[i], shl_sat( w[i], 2 ) ), pred_pow2[i] ); /* 2.56*2.56 at Q-4 */
-#else
- En = L_mac_o( En, mult( pred_pow2[i], shl_sat( w[i], 2 ) ), pred_pow2[i], &Overflow ); /* 2.56*2.56 at Q-4 */
-#endif
}
cs = shl( cs, 1 );
@@ -1358,9 +1349,11 @@ void lsf_end_enc_fx(
/* Update AR-predictor memories */
Copy( qlsf, st->mem_AR_fx, M );
+
return;
}
+
void lsf_end_enc_ivas_fx(
Encoder_State *st, /* i/o: encoder state structure */
const Word16 *lsf, /* i : LSF in the frequency domain (0..6400) x2.56*/
@@ -1372,8 +1365,7 @@ void lsf_end_enc_ivas_fx(
Word16 *lpc_param,
Word16 *no_indices,
Word16 *bits_param_lpc,
- Word16 coder_type_raw /* i : Coder type (LSF coder_type have some special cases)*/
- ,
+ Word16 coder_type_raw, /* i : Coder type (LSF coder_type have some special cases)*/
const Word16 tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */
)
{
@@ -1444,10 +1436,11 @@ void lsf_end_enc_ivas_fx(
move16();
}
- /*----------------------------------------------------------------------------------- -*
+ /*------------------------------------------------------------------------------------*
* Calculate the number of stages and levels for each stage based on allowed bit budget
* Set absolute threshold for codebook-type decision logic depending on signal bandwidth
- *------------------------------------------------------------------------------------ -*/
+ *-------------------------------------------------------------------------------------*/
+
IF( st->bwidth == NB )
{
abs_threshold = SFNETLOWLIMIT_NB / 2;
@@ -1464,6 +1457,7 @@ void lsf_end_enc_ivas_fx(
/*--------------------------------------------------------------------------------*
* LSF quantization of SID frames
*--------------------------------------------------------------------------------*/
+
IF( EQ_32( st->core_brate, SID_2k40 ) )
{
lsfq_CNG_ivas_fx( hBstr, lsf, wghts, qlsf );
@@ -1479,8 +1473,8 @@ void lsf_end_enc_ivas_fx(
* Calculate number of stages and levels for each stage based on the allowed bit allocation
* (subtract one bit for LSF predictor selection)
*----------------------------------------------------------------*/
- lsf_allocate_fx( sub( nBits, shr( predmode, 1 ) ), mode_lvq, mode_lvq_p, &stages0, &stages1, levels0, levels1, bits0, bits1 );
+ lsf_allocate_fx( sub( nBits, shr( predmode, 1 ) ), mode_lvq, mode_lvq_p, &stages0, &stages1, levels0, levels1, bits0, bits1 );
/*--------------------------------------------------------------------------------*
* LSF quantization of all other frames but SID frames
@@ -1546,6 +1540,7 @@ void lsf_end_enc_ivas_fx(
pred2[i] = add( pred0[i], mult( Predictors_fx[mode_lvq_p][i], sub( st->mem_AR_fx[i], pred0[i] ) ) );
Tmp2[i] = sub( lsf[i], pred2[i] );
}
+
/* Adaptive scaling factor (multiplier) is updated in order to reduce the amount of consecutive predictive frames in
case of possible frame erasure. AR-predictive usage for VOICED mode is allowed to be higher than other modes. */
test();
@@ -1692,6 +1687,7 @@ void lsf_end_enc_ivas_fx(
}
}
}
+
/*--------------------------------------------------------------------------*
* Write indices to array
*--------------------------------------------------------------------------*/
@@ -1877,7 +1873,6 @@ void lsf_end_enc_ivas_fx(
}
}
-
/*--------------------------------------------------------------------------*
* De-quantize encoded LSF vector
*--------------------------------------------------------------------------*/
@@ -1944,9 +1939,11 @@ void lsf_end_enc_ivas_fx(
/* Update AR-predictor memories */
Copy( qlsf, st->mem_AR_fx, M );
+
return;
}
+
/*-------------------------------------------------------------------*
* first_VQstages()
*
@@ -1970,11 +1967,6 @@ static void first_VQstages(
Word16 *pTmp_short, idx_buf[2 * LSFMBEST * MAX_VQ_STAGES], parents[LSFMBEST], counter = 0, j,
m, s, c, c2, p_max, *indices[2];
Word16 maxC = LSFMBEST;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/*float dd[16];*/
const Word16 *cb_stage, *cbp;
@@ -2000,13 +1992,9 @@ static void first_VQstages(
L_tmp = L_deposit_l( 0 );
FOR( j = 0; j < N; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp1 = L_shl_sat( L_mult0( u[j], w[j] ), 7 ); /*x2.56 + Q8 + Q7 */
-#else
- L_tmp1 = L_shl_o( L_mult0( u[j], w[j] ), 7, &Overflow ); /*x2.56 + Q8 + Q7 */
-#endif
- L_tmp1 = Mult_32_16( L_tmp1, u[j] ); /*x2.56 + Q15 + x2.56 -Q15 */
- L_tmp = L_add( L_tmp, L_tmp1 ); /*Q0 + x2.56 +x2.56 */
+ L_tmp1 = Mult_32_16( L_tmp1, u[j] ); /*x2.56 + Q15 + x2.56 -Q15 */
+ L_tmp = L_add( L_tmp, L_tmp1 ); /*Q0 + x2.56 +x2.56 */
}
set32_fx( dist[1], L_tmp, maxC );
@@ -2125,6 +2113,7 @@ static void first_VQstages(
/*------------------------------------------------------------*
* Compute error vectors for each node
*------------------------------------------------------------*/
+
cs = 0;
move16();
FOR( c = 0; c < maxC; c++ )
@@ -2149,6 +2138,7 @@ static void first_VQstages(
return;
}
+
static void first_VQstages_ivas_fx(
const Word16 *const *cb,
Word16 u[], /* i : vector to be encoded (prediction and mean removed) */
@@ -2166,11 +2156,6 @@ static void first_VQstages_ivas_fx(
Word16 *pTmp_short, idx_buf[2 * LSFMBEST * MAX_VQ_STAGES], parents[LSFMBEST], counter = 0, j,
m, s, c, c2, p_max, *indices[2];
Word16 maxC = LSFMBEST;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/*float dd[16];*/
const Word16 *cb_stage, *cbp;
@@ -2196,13 +2181,9 @@ static void first_VQstages_ivas_fx(
L_tmp = L_deposit_l( 0 );
FOR( j = 0; j < N; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp1 = L_shl_sat( L_mult0( u[j], w[j] ), 7 ); /*x2.56 + Q8 + Q7 */
-#else
- L_tmp1 = L_shl_o( L_mult0( u[j], w[j] ), 7, &Overflow ); /*x2.56 + Q8 + Q7 */
-#endif
- L_tmp1 = Mult_32_16( L_tmp1, u[j] ); /*x2.56 + Q15 + x2.56 -Q15 */
- L_tmp = L_add( L_tmp, L_tmp1 ); /*Q0 + x2.56 +x2.56 */
+ L_tmp1 = Mult_32_16( L_tmp1, u[j] ); /*x2.56 + Q15 + x2.56 -Q15 */
+ L_tmp = L_add( L_tmp, L_tmp1 ); /*Q0 + x2.56 +x2.56 */
}
set32_fx( dist[1], L_shr( L_tmp, 1 ), maxC ); /*Q-1 + x2.56 +x2.56 */
@@ -2321,6 +2302,7 @@ static void first_VQstages_ivas_fx(
/*------------------------------------------------------------*
* Compute error vectors for each node
*------------------------------------------------------------*/
+
cs = 0;
move16();
FOR( c = 0; c < maxC; c++ )
@@ -2344,6 +2326,8 @@ static void first_VQstages_ivas_fx(
return;
}
+
+
/*---------------------------------------------------------------------------
* vq_enc_lsf_lvq()
*
@@ -2404,7 +2388,6 @@ static Word32 vq_lvq_lsf_enc(
first_VQstages( cb, u, levels, stagesVQ, w, M, MSVQ_MAXCNT, indices_firstVQ );
}
-
FOR( i = 0; i < maxC; i++ )
{
Copy( pred, cand[i], M );
@@ -2464,6 +2447,7 @@ static Word32 vq_lvq_lsf_enc(
return e[c2];
}
+
static Word32 vq_lvq_lsf_enc_ivas_fx(
Word16 pred_flag,
Word16 mode,
@@ -2524,7 +2508,6 @@ static Word32 vq_lvq_lsf_enc_ivas_fx(
first_VQstages_ivas_fx( cb, u, levels, stagesVQ, w, M, MSVQ_MAXCNT, indices_firstVQ );
}
-
FOR( i = 0; i < maxC; i++ )
{
Copy( pred, cand[i], M );
@@ -2559,11 +2542,7 @@ static Word32 vq_lvq_lsf_enc_ivas_fx(
L_tmp = L_mult( mult( diff[0], shl_sat( w[0], 1 ) ), diff[0] ); /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
FOR( j = 1; j < M; j++ )
{
-#ifdef FIX_1979_SAT_MISSING_IN_LSF_ENC
L_tmp = L_mac_sat( L_tmp, mult( diff[j], shl_sat( w[j], 1 ) ), diff[j] ); /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
-#else
- L_tmp = L_mac( L_tmp, mult( diff[j], shl_sat( w[j], 1 ) ), diff[j] ); /*(2.56+Q5+ Q10 -Q15) + 2.56+ Q5 + Q1 = 2.56 + 2.56 + Q6 */
-#endif
}
e[i] = L_tmp;
move32();
@@ -2586,6 +2565,8 @@ static Word32 vq_lvq_lsf_enc_ivas_fx(
return e[c2];
}
+
+
static void BcTcvq_1st_fx(
Word16 x_fx[][2], /*x2.56*/
const Word16 CB_fx[][128][2], /*x2.56*/
@@ -2736,7 +2717,6 @@ static void BcTcvq_SubBlock_fx(
Word16 stage1, stage2, state, prev_state, branch;
Word16 index, bestCode, brCode[N_DIM];
Word16 temp16_fx;
-
Word32 dist_fx, minDist_fx, brDist_fx[N_DIM];
Word16 pred_fx[N_DIM], target_fx[N_DIM], brQuant_fx[N_DIM][N_DIM];
@@ -2745,7 +2725,6 @@ static void BcTcvq_SubBlock_fx(
FOR( state = 0; state < NUM_STATE; state++ )
{
-
/* 1st branch search */
prev_state = NTRANS[0][state];
move16();
@@ -2943,8 +2922,11 @@ static Word32 BcTcvq_FixSearch_fx(
move16();
minDist_fx = L_shr( minDist_fx, 2 ); /*2.56*2.56*Q(-5 - 2)*/
+
return minDist_fx;
}
+
+
static Word16 optimalPath_fx(
Word32 cDist_fx[][16], /*2.56*2.56*Q(-5 - 2)*/
Word32 blockDist_fx[], /*2.56*2.56*Q(-5 - 2)*/
@@ -3084,7 +3066,6 @@ static void buildCode_fx(
set16_fx( BrIndex, 0, ( N_STAGE_VQ - 4 ) );
-
FOR( stage = N_STAGE_VQ - 4; stage >= 1; stage-- )
{
if ( GT_16( s[stage], 7 ) )
@@ -3123,6 +3104,8 @@ static void buildCode_fx(
return;
}
+
+
static void BcTcvq_fx(
Word16 snFlag,
const Word16 *x_fx, // x2.65
@@ -3338,11 +3321,7 @@ Word32 qlsf_ARSN_tcvq_Enc_16k_fx(
Word16 error_svq_fx[M], error_svq_q_fx[M];
Word16 cl, cs;
Word32 temp_l;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
+
IF( EQ_16( safety_net, 1 ) )
{
indice[0] = 1;
@@ -3414,11 +3393,7 @@ Word32 qlsf_ARSN_tcvq_Enc_16k_fx(
{
yy_fx[i] = shl( yy_fx[i], cs );
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
temp_l = L_mac_sat( temp_l, mult( yy_fx[i], shl_sat( w_fx[i], 2 ) ), yy_fx[i] );
-#else
- temp_l = L_mac_o( temp_l, mult( yy_fx[i], shl_sat( w_fx[i], 2 ) ), yy_fx[i], &Overflow );
-#endif
}
cs = shl( cs, 1 );
temp_l = L_shr( temp_l, cs );
@@ -3437,20 +3412,11 @@ static void FFT_Mid_Interpol_16k_fx(
)
{
Word16 i;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
FOR( i = 0; i < L_FFT / 2; i++ )
{
/* Interpolation */
-#ifdef ISSUE_1867_replace_overflow_libenc
Bin_Ener_mid[i] = L_shr( L_add_sat( Bin_Ener_old[i], Bin_Ener[i] ), 1 );
-#else
- Bin_Ener_mid[i] = L_shr( L_add_o( Bin_Ener_old[i], Bin_Ener[i], &Overflow ), 1 );
-#endif
/* Memory update */
Bin_Ener_old[i] = Bin_Ener[i];
@@ -3515,11 +3481,6 @@ static void lsf_mid_enc_fx(
Word32 L_tmp;
Word16 tmp, k1;
const Word16 *ratio = NULL;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/* convert LSPs to LSFs */
lsp2lsf_fx( lsp, lsf, M, int_fs );
@@ -3631,13 +3592,8 @@ static void lsf_mid_enc_fx(
/* err += wghts[j] * ftemp * ftemp; */
/* tmp is usually very small, we can have some extra precision with very rare saturation */
tmp = shl_sat( tmp, 4 );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = mult_r_sat( tmp, tmp );
err = L_mac_sat( err, tmp, shl_sat( wghts[j], 2 ) );
-#else
- tmp = mult_ro( tmp, tmp, &Overflow );
- err = L_mac_o( err, tmp, shl_sat( wghts[j], 2 ), &Overflow );
-#endif
}
/* err = L_shl(err,Wscale); */
err = Mult_32_16( err, LSF_1_OVER_256SQ );
@@ -3699,11 +3655,6 @@ static void lsf_mid_enc_ivas_fx(
Word32 L_tmp;
Word16 tmp, k1;
const Word16 *ratio = NULL;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/* convert LSPs to LSFs */
lsp2lsf_fx( lsp, lsf, M, int_fs );
@@ -3824,13 +3775,8 @@ static void lsf_mid_enc_ivas_fx(
/* err += wghts[j] * ftemp * ftemp; */
/* tmp is usually very small, we can have some extra precision with very rare saturation */
tmp = shl_sat( tmp, 4 );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = mult_r_sat( tmp, tmp );
err = L_mac_sat( err, tmp, shl_sat( wghts[j], 2 ) );
-#else
- tmp = mult_ro( tmp, tmp, &Overflow );
- err = L_mac_o( err, tmp, shl_sat( wghts[j], 2 ), &Overflow );
-#endif
}
/* err = L_shl(err,Wscale); */
err = Mult_32_16( err, LSF_1_OVER_256SQ );
diff --git a/lib_enc/lsf_msvq_ma_enc_fx.c b/lib_enc/lsf_msvq_ma_enc_fx.c
index 333ea97ff14438722073c9a9b7192a8d8ae49d8b..c0e02d6c245bafbdd51e2a5ffc2c02bb85a2e4c1 100644
--- a/lib_enc/lsf_msvq_ma_enc_fx.c
+++ b/lib_enc/lsf_msvq_ma_enc_fx.c
@@ -1576,11 +1576,6 @@ void midlsf_enc_fx(
Word32 err, err_min, L_tmp;
Word16 k, k1, j, tmp, size, qlsf[M], wghts[M];
const Word16 *ratio;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
IF( EQ_16( coder_type, UNVOICED ) )
{
@@ -1631,18 +1626,10 @@ void midlsf_enc_fx(
/* err += wghts[j] * ftemp * ftemp; */
/* tmp is usually very small, we can have some extra precision with very rare saturation */
tmp = shl_sat( tmp, 4 );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = mult_r_sat( tmp, tmp );
-#else
- tmp = mult_ro( tmp, tmp, &Overflow );
-#endif
err = L_mac( err, tmp, wghts[j] );
}
-#ifdef ISSUE_1867_replace_overflow_libenc
err = L_shl_sat( err, 2 );
-#else
- err = L_shl_o( err, 2, &Overflow );
-#endif
/* err = L_shl(err,Wscale); */
err = Mult_32_16( err, LSF_1_OVER_256SQ );
diff --git a/lib_enc/mdct_classifier_fx.c b/lib_enc/mdct_classifier_fx.c
index 790ec7aa8db0985304b0d493b99aace1fc44c3e6..2b55889f57d542899ea5ec7f52c9ec2010a83a5b 100644
--- a/lib_enc/mdct_classifier_fx.c
+++ b/lib_enc/mdct_classifier_fx.c
@@ -118,16 +118,9 @@ Word16 mdct_classifier_fx( /* o: MDCT A/B decision
Word16 exp, exp1, exp2, exp3;
Word32 L_tmp, L_tmp1;
TCX_ENC_HANDLE hTcxEnc = st_fx->hTcxEnc;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
- test();
- {
- dft_mag_square_fx( fft_buff, magSq, 256 );
- }
+ dft_mag_square_fx( fft_buff, magSq, 256 );
+
nf = L_add( magSq[0], 0 );
pe = L_add( magSq[0], 0 );
np = 0;
@@ -358,11 +351,7 @@ Word16 mdct_classifier_fx( /* o: MDCT A/B decision
test();
test();
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
IF( GT_32( Mult_32_16( gain3, 27307 ), gain2 ) || ( GE_32( gain3, Mult_32_16( gain2, 26214 ) ) && GT_32( peak_H1, L_shl_sat( avrg_H1, 1 ) ) ) || ( LT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( L_tmp, exp ), L_shl( avrg_l, exp1 ) ) ) || GT_32( Mult_32_32( L_shl( L_tmp1, exp2 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp2 ), L_shl( avrg_l, exp1 ) ) ) ) )
-#else
- IF( GT_32( Mult_32_16( gain3, 27307 ), gain2 ) || ( GE_32( gain3, Mult_32_16( gain2, 26214 ) ) && GT_32( peak_H1, L_shl_o( avrg_H1, 1, &Overflow ) ) ) || ( LT_32( Mult_32_32( L_shl_o( peak_l, exp, &Overflow ), L_shl_o( avrg_h, exp1, &Overflow ) ), Mult_32_32( L_shl_o( L_tmp, exp, &Overflow ), L_shl_o( avrg_l, exp1, &Overflow ) ) ) || GT_32( Mult_32_32( L_shl_o( L_tmp1, exp2, &Overflow ), L_shl_o( avrg_h, exp1, &Overflow ) ), Mult_32_32( L_shl_o( peak_h, exp2, &Overflow ), L_shl_o( avrg_l, exp1, &Overflow ) ) ) ) )
-#endif
{
condition3 = 1;
move16();
@@ -456,11 +445,7 @@ Word16 mdct_classifier_fx( /* o: MDCT A/B decision
test();
test();
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
IF( ( EQ_16( hTcxEnc->clas_final_old, HQ_CORE ) || EQ_16( hTcxEnc->clas_final_old, TCX_20_CORE ) ) && ( ( GT_32( hTcxEnc->last_gain1, L_shr( gain1_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain1, L_shl_sat( gain1_tmp, 1 ) ) ) && ( GT_32( hTcxEnc->last_gain2, L_shr( gain2_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain2, L_shl_sat( gain2_tmp, 1 ) ) ) ) )
-#else
- IF( ( EQ_16( hTcxEnc->clas_final_old, HQ_CORE ) || EQ_16( hTcxEnc->clas_final_old, TCX_20_CORE ) ) && ( ( GT_32( hTcxEnc->last_gain1, L_shr( gain1_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain1, L_shl_o( gain1_tmp, 1, &Overflow ) ) ) && ( GT_32( hTcxEnc->last_gain2, L_shr( gain2_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain2, L_shl_o( gain2_tmp, 1, &Overflow ) ) ) ) )
-#endif
{
clas_final = hTcxEnc->clas_final_old;
move16();
@@ -553,10 +538,6 @@ Word16 mdct_classifier_ivas_fx(
Word16 exp, exp1, exp2, exp3;
Word32 gain1_tmp = 0, gain2_tmp = 0;
Word32 L_tmp, L_tmp1;
-#ifndef ISSUE_1867_replace_overflow_libenc
- Flag Overflow = 0;
- move16();
-#endif
move16();
move16();
@@ -900,11 +881,7 @@ Word16 mdct_classifier_ivas_fx(
test();
test();
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
IF( GT_32( Mult_32_16( gain3, 27307 ), gain2 ) || ( GE_32( gain3, Mult_32_16( gain2, 26214 ) ) && GT_32( peak_H1, L_shl_sat( avrg_H1, 1 ) ) ) || ( LT_32( Mult_32_32( L_shl( peak_l, exp ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( L_tmp, exp ), L_shl( avrg_l, exp1 ) ) ) || GT_32( Mult_32_32( L_shl( L_tmp1, exp2 ), L_shl( avrg_h, exp1 ) ), Mult_32_32( L_shl( peak_h, exp2 ), L_shl( avrg_l, exp1 ) ) ) ) )
-#else
- IF( GT_32( Mult_32_16( gain3, 27307 ), gain2 ) || ( GE_32( gain3, Mult_32_16( gain2, 26214 ) ) && GT_32( peak_H1, L_shl_o( avrg_H1, 1, &Overflow ) ) ) || ( LT_32( Mult_32_32( L_shl_o( peak_l, exp, &Overflow ), L_shl_o( avrg_h, exp1, &Overflow ) ), Mult_32_32( L_shl_o( L_tmp, exp, &Overflow ), L_shl_o( avrg_l, exp1, &Overflow ) ) ) || GT_32( Mult_32_32( L_shl_o( L_tmp1, exp2, &Overflow ), L_shl_o( avrg_h, exp1, &Overflow ) ), Mult_32_32( L_shl_o( peak_h, exp2, &Overflow ), L_shl_o( avrg_l, exp1, &Overflow ) ) ) ) )
-#endif
{
condition3 = 1;
move16();
@@ -1005,11 +982,7 @@ Word16 mdct_classifier_ivas_fx(
test();
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
IF( ( EQ_16( hTcxEnc->clas_final_old, HQ_CORE ) || EQ_16( hTcxEnc->clas_final_old, TCX_20_CORE ) ) && ( ( GT_32( hTcxEnc->last_gain1, L_shr( gain1_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain1, L_shl_sat( gain1_tmp, 1 ) ) ) && ( GT_32( hTcxEnc->last_gain2, L_shr( gain2_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain2, L_shl_sat( gain2_tmp, 1 ) ) ) ) )
-#else
- IF( ( EQ_16( hTcxEnc->clas_final_old, HQ_CORE ) || EQ_16( hTcxEnc->clas_final_old, TCX_20_CORE ) ) && ( ( GT_32( hTcxEnc->last_gain1, L_shr( gain1_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain1, L_shl_o( gain1_tmp, 1, &Overflow ) ) ) && ( GT_32( hTcxEnc->last_gain2, L_shr( gain2_tmp, 1 ) ) && LT_32( hTcxEnc->last_gain2, L_shl_o( gain2_tmp, 1, &Overflow ) ) ) ) )
-#endif
{
clas_final = hTcxEnc->clas_final_old;
move16();
diff --git a/lib_enc/multi_harm_fx.c b/lib_enc/multi_harm_fx.c
index ba68b685208adcafee3a7dfaf8ae74fead13a6f7..10d89ea75405eefb6f0b9bda29c6626357e08eee 100644
--- a/lib_enc/multi_harm_fx.c
+++ b/lib_enc/multi_harm_fx.c
@@ -1,10 +1,10 @@
/*====================================================================================
EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0
====================================================================================*/
+
#include
-#include "options.h" /* Compilation switches */
-#include "cnst.h" /* Common constants */
-//#include "prot_fx.h" /* Function prototypes */
+#include "options.h" /* Compilation switches */
+#include "cnst.h" /* Common constants */
#include "prot_fx.h" /* Function prototypes */
#include "prot_fx_enc.h" /* Function prototypes */
#include "basop_util.h"
@@ -20,19 +20,21 @@
* Perform multi-harmonic analysis, information used for UV and VAD decision
*---------------------------------------------------------------------*/
-Word16 multi_harm_fx( /* o : frame multi-harmonicity (1-harmonic, 0-not) */
- const Word16 Bin_E[], /* i : log-energy spectrum of the current frame Q7 */
- Word16 old_S[], /* i/o: prev. log-energy spectrum w. subtracted floor Q7 */
- Word16 cor_map_LT[], /* i/o: LT correlation map Q15 */
- Word16 *multi_harm_limit, /* i/o: multi harminic threshold Q9 */
- const Word32 total_brate, /* i : total bitrate Q0 */
- const Word16 bwidth, /* i : input signal bandwidth Q0 */
- Word16 *cor_strong_limit, /* i/o: HF correlation indicator Q0 */
- Word16 *st_mean_avr_dyn, /* i/o: long term average dynamic Q7 */
- Word16 *st_last_sw_dyn, /* i/o: last dynamic Q7 */
- Word16 *cor_map_sum, /* i : sum of correlation map Q8 */
- Word16 *sp_floor, /* o: noise floor estimate Q7 */
- Word16 S_map[] /* o : short-term correlation map Q7 */
+/* o : frame multi-harmonicity (1-harmonic, 0-not) */
+Word16 multi_harm_fx(
+
+ const Word16 Bin_E[], /* i : log-energy spectrum of the current frame Q7 */
+ Word16 old_S[], /* i/o: prev. log-energy spectrum w. subtracted floor Q7 */
+ Word16 cor_map_LT[], /* i/o: LT correlation map Q15 */
+ Word16 *multi_harm_limit, /* i/o: multi harminic threshold Q9 */
+ const Word32 total_brate, /* i : total bitrate Q0 */
+ const Word16 bwidth, /* i : input signal bandwidth Q0 */
+ Word16 *cor_strong_limit, /* i/o: HF correlation indicator Q0 */
+ Word16 *st_mean_avr_dyn, /* i/o: long term average dynamic Q7 */
+ Word16 *st_last_sw_dyn, /* i/o: last dynamic Q7 */
+ Word16 *cor_map_sum, /* i : sum of correlation map Q8 */
+ Word16 *sp_floor, /* o: noise floor estimate Q7 */
+ Word16 S_map[] /* o : short-term correlation map Q7 */
)
{
Word16 i, j, k, L, stemp, N_mins, ind_mins[L_FFT / 4], *pt_mins, harm;
@@ -41,12 +43,6 @@ Word16 multi_harm_fx( /* o : frame multi-harmonicity
Word32 L_acc;
Word32 Lcorx2, Lcory2, Lcorxy, Lcor_map_LT_sum;
Word16 mean_dyn;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*------------------------------------------------------------------*
* initialization
@@ -214,11 +210,7 @@ Word16 multi_harm_fx( /* o : frame multi-harmonicity
IF( EQ_16( i, ind_mins[k] ) )
{
/* include the last peak point (new minimum) to the corr. sum */
-#ifdef ISSUE_1867_replace_overflow_libenc
Lcory2 = L_mac_sat( Lcory2, old_S[i], old_S[i] );
-#else
- Lcory2 = L_mac_o( Lcory2, old_S[i], old_S[i], &Overflow );
-#endif
/* calculation of the norm. peak correlation */
test();
@@ -269,15 +261,9 @@ Word16 multi_harm_fx( /* o : frame multi-harmonicity
k++;
}
-#ifdef ISSUE_1867_replace_overflow_libenc
Lcorx2 = L_mac_sat( Lcorx2, S[i], S[i] );
Lcory2 = L_mac_sat( Lcory2, old_S[i], old_S[i] );
Lcorxy = L_mac_sat( Lcorxy, S[i], old_S[i] );
-#else
- Lcorx2 = L_mac_o( Lcorx2, S[i], S[i], &Overflow );
- Lcory2 = L_mac_o( Lcory2, old_S[i], old_S[i], &Overflow );
- Lcorxy = L_mac_o( Lcorxy, S[i], old_S[i], &Overflow );
-#endif
}
Copy( S, old_S, ind_mins[0] );
@@ -374,19 +360,21 @@ Word16 multi_harm_fx( /* o : frame multi-harmonicity
return harm;
}
-Word16 multi_harm_ivas_fx( /* o : frame multi-harmonicity (1-harmonic, 0-not) */
- const Word16 Bin_E[], /* i : log-energy spectrum of the current frame Q7 */
- Word16 old_S[], /* i/o: prev. log-energy spectrum w. subtracted floor Q7 */
- Word16 cor_map_LT[], /* i/o: LT correlation map Q15 */
- Word16 *multi_harm_limit, /* i/o: multi harminic threshold Q9 */
- const Word32 total_brate, /* i : total bitrate Q0 */
- const Word16 bwidth, /* i : input signal bandwidth Q0 */
- Word16 *cor_strong_limit, /* i/o: HF correlation indicator Q0 */
- Word16 *st_mean_avr_dyn, /* i/o: long term average dynamic Q7 */
- Word16 *st_last_sw_dyn, /* i/o: last dynamic Q7 */
- Word16 *cor_map_sum, /* i : sum of correlation map Q8 */
- Word16 *sp_floor, /* o: noise floor estimate Q7 */
- Word16 S_map[] /* o : short-term correlation map Q7 */
+
+/* o : frame multi-harmonicity (1-harmonic, 0-not) */
+Word16 multi_harm_ivas_fx(
+ const Word16 Bin_E[], /* i : log-energy spectrum of the current frame Q7 */
+ Word16 old_S[], /* i/o: prev. log-energy spectrum w. subtracted floor Q7 */
+ Word16 cor_map_LT[], /* i/o: LT correlation map Q15 */
+ Word16 *multi_harm_limit, /* i/o: multi harminic threshold Q9 */
+ const Word32 total_brate, /* i : total bitrate Q0 */
+ const Word16 bwidth, /* i : input signal bandwidth Q0 */
+ Word16 *cor_strong_limit, /* i/o: HF correlation indicator Q0 */
+ Word16 *st_mean_avr_dyn, /* i/o: long term average dynamic Q7 */
+ Word16 *st_last_sw_dyn, /* i/o: last dynamic Q7 */
+ Word16 *cor_map_sum, /* i : sum of correlation map Q8 */
+ Word16 *sp_floor, /* o: noise floor estimate Q7 */
+ Word16 S_map[] /* o : short-term correlation map Q7 */
)
{
Word16 i, j, k, L, stemp, N_mins, ind_mins[L_FFT / 4], *pt_mins, harm;
@@ -396,12 +384,6 @@ Word16 multi_harm_ivas_fx( /* o : frame multi-harmoni
Word32 L_acc;
Word32 Lcorx2, Lcory2, Lcorxy, Lcor_map_LT_sum;
Word16 mean_dyn;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*------------------------------------------------------------------*
* initialization
@@ -563,11 +545,7 @@ Word16 multi_harm_ivas_fx( /* o : frame multi-harmoni
IF( EQ_16( i, ind_mins[k] ) )
{
/* include the last peak point (new minimum) to the corr. sum */
-#ifdef ISSUE_1867_replace_overflow_libenc
Lcory2 = L_mac_sat( Lcory2, old_S[i], old_S[i] );
-#else
- Lcory2 = L_mac_o( Lcory2, old_S[i], old_S[i], &Overflow );
-#endif
/* calculation of the norm. peak correlation */
test();
@@ -618,15 +596,9 @@ Word16 multi_harm_ivas_fx( /* o : frame multi-harmoni
k++;
}
-#ifdef ISSUE_1867_replace_overflow_libenc
Lcorx2 = L_mac_sat( Lcorx2, S[i], S[i] );
Lcory2 = L_mac_sat( Lcory2, old_S[i], old_S[i] );
Lcorxy = L_mac_sat( Lcorxy, S[i], old_S[i] );
-#else
- Lcorx2 = L_mac_o( Lcorx2, S[i], S[i], &Overflow );
- Lcory2 = L_mac_o( Lcory2, old_S[i], old_S[i], &Overflow );
- Lcorxy = L_mac_o( Lcorxy, S[i], old_S[i], &Overflow );
-#endif
}
Copy( S, old_S, ind_mins[0] );
diff --git a/lib_enc/nelp_enc_fx.c b/lib_enc/nelp_enc_fx.c
index 9d192500f9f83c415b6ad3031c9c9b99b9959163..9122be431e58c675afd23259c8c2f78f30d5892e 100644
--- a/lib_enc/nelp_enc_fx.c
+++ b/lib_enc/nelp_enc_fx.c
@@ -354,12 +354,6 @@ void nelp_encoder_fx(
move32();
Word16 BP1_ORDER;
Word16 rf_flag;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
RF_ENC_HANDLE hRF = st_fx->hRF;
@@ -424,15 +418,10 @@ void nelp_encoder_fx(
E1_fx = L_deposit_l( 0 );
FOR( i = 0; i < L_FRAME; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
E1_fx = L_mac0_sat( E1_fx, in_fx[i], in_fx[i] ); /*Q(qE1+qE1) */
-#else
- E1_fx = L_mac0_o( E1_fx, in_fx[i], in_fx[i], &Overflow ); /*Q(qE1+qE1) */
-#endif
}
qE1 = shl( qE1, 1 );
- ;
qf = qIn;
move16();
@@ -444,11 +433,7 @@ void nelp_encoder_fx(
EL1_fx = L_deposit_l( 0 );
FOR( i = 0; i < L_FRAME; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
EL1_fx = L_mac0_sat( EL1_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qIn) */
-#else
- EL1_fx = L_mac0_o( EL1_fx, filtRes_fx[i], filtRes_fx[i], &Overflow ); /*Q(2*qIn) */
-#endif
}
qEL1 = shl( qEL1, 1 );
@@ -464,11 +449,7 @@ void nelp_encoder_fx(
EH1_fx = L_deposit_l( 0 );
FOR( i = 0; i < L_FRAME; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
EH1_fx = L_mac0_sat( EH1_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEH1) */
-#else
- EH1_fx = L_mac0_o( EH1_fx, filtRes_fx[i], filtRes_fx[i], &Overflow ); /*Q(2*qEH1) */
-#endif
}
qEH1 = 2 * qEH1;
move16();
@@ -484,11 +465,7 @@ void nelp_encoder_fx(
Ltemp = L_deposit_l( 0 );
FOR( j = (Word16) ( i * lag ); j < (Word16) ( ( i + 1 ) * lag ); j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltemp = L_mac0_sat( Ltemp, in_fx[j], in_fx[j] ); /*Q(2*qGain) */
-#else
- Ltemp = L_mac0_o( Ltemp, in_fx[j], in_fx[j], &Overflow ); /*Q(2*qGain) */
-#endif
}
/*Gains[i] = (float) sqrt(Gains[i]/lag); */
@@ -512,11 +489,7 @@ void nelp_encoder_fx(
Ltemp = L_deposit_l( 0 );
FOR( j = (Word16) ( i * lag ); j < L_FRAME; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltemp = L_mac0_sat( Ltemp, in_fx[j], in_fx[j] ); /*Q(2*qGain) */
-#else
- Ltemp = L_mac0_o( Ltemp, in_fx[j], in_fx[j], &Overflow ); /*Q(2*qGain) */
-#endif
}
/*Gains[i] = (float) sqrt(Gains[i]/(L_FRAME-(lag*i))); */
@@ -1121,12 +1094,6 @@ void nelp_encoder_ivas_fx(
move32();
Word16 BP1_ORDER;
Word16 rf_flag;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;
BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
RF_ENC_HANDLE hRF = st_fx->hRF;
@@ -1193,11 +1160,7 @@ void nelp_encoder_ivas_fx(
E1_fx = L_deposit_l( 0 );
FOR( i = 0; i < L_FRAME; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
E1_fx = L_mac0_sat( E1_fx, in_fx[i], in_fx[i] ); /*Q(qE1+qE1) */
-#else
- E1_fx = L_mac0_o( E1_fx, in_fx[i], in_fx[i], &Overflow ); /*Q(qE1+qE1) */
-#endif
}
qE1 = shl( qE1, 1 );
@@ -1212,11 +1175,7 @@ void nelp_encoder_ivas_fx(
EL1_fx = L_deposit_l( 0 );
FOR( i = 0; i < L_FRAME; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
EL1_fx = L_mac0_sat( EL1_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qIn) */
-#else
- EL1_fx = L_mac0_o( EL1_fx, filtRes_fx[i], filtRes_fx[i], &Overflow ); /*Q(2*qIn) */
-#endif
}
qEL1 = shl( qEL1, 1 );
@@ -1232,11 +1191,7 @@ void nelp_encoder_ivas_fx(
EH1_fx = L_deposit_l( 0 );
FOR( i = 0; i < L_FRAME; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
EH1_fx = L_mac0_sat( EH1_fx, filtRes_fx[i], filtRes_fx[i] ); /*Q(2*qEH1) */
-#else
- EH1_fx = L_mac0_o( EH1_fx, filtRes_fx[i], filtRes_fx[i], &Overflow ); /*Q(2*qEH1) */
-#endif
}
qEH1 = shl( qEH1, 1 );
move16();
@@ -1251,11 +1206,7 @@ void nelp_encoder_ivas_fx(
Ltemp = L_deposit_l( 0 );
FOR( j = (Word16) ( i * lag ); j < (Word16) ( ( i + 1 ) * lag ); j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltemp = L_mac0_sat( Ltemp, in_fx[j], in_fx[j] ); /*Q(2*qGain) */
-#else
- Ltemp = L_mac0_o( Ltemp, in_fx[j], in_fx[j], &Overflow ); /*Q(2*qGain) */
-#endif
}
/*Gains[i] = (float) sqrt(Gains[i]/lag); */
@@ -1279,11 +1230,7 @@ void nelp_encoder_ivas_fx(
Ltemp = L_deposit_l( 0 );
FOR( j = i_mult( i, lag ); j < L_FRAME; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltemp = L_mac0_sat( Ltemp, in_fx[j], in_fx[j] ); /*Q(2*qGain) */
-#else
- Ltemp = L_mac0_o( Ltemp, in_fx[j], in_fx[j], &Overflow ); /*Q(2*qGain) */
-#endif
}
/*Gains[i] = (float) sqrt(Gains[i]/(L_FRAME-(lag*i))); */
diff --git a/lib_enc/nois_est_fx.c b/lib_enc/nois_est_fx.c
index fb07df485a5f63e9f9df553bfc626e90bdcac6dd..181b1f10efdaa1b64a506e835250cf7b7f2480ab 100644
--- a/lib_enc/nois_est_fx.c
+++ b/lib_enc/nois_est_fx.c
@@ -102,16 +102,8 @@ static Word16 noise_est_ln_q8_fx(
{
Word16 e_ener, f_ener;
Word32 L_tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
- L_tmp = L_add_o( L_enr, L_shl( (Word32) 1L, q_new_plus_q_scale ), &Overflow ); /* +1.0f */
-#else
L_tmp = L_add_sat( L_enr, L_shl( (Word32) 1L, q_new_plus_q_scale ) ); /* +1.0f */
-#endif
if ( flag_add1p0 == 0 )
{
L_tmp = L_add( L_enr, 0 ); /* +0 , no offset */
@@ -123,9 +115,11 @@ static Word16 noise_est_ln_q8_fx(
f_ener = Log2_norm_lc( L_shl( L_tmp, e_ener ) );
e_ener = sub( sub( 30, e_ener ), q_new_plus_q_scale );
L_tmp = Mpy_32_16( e_ener, f_ener, 22713 ); /* Q16 (22713 = Ln(2) in Q15)*/
- return round_fx( L_shl( L_tmp, 8 ) ); /* Q8 */
+
+ return round_fx( L_shl( L_tmp, 8 ) ); /* Q8 */
}
+
/*-----------------------------------------------------------------*
* eps_quota_fx()
*
@@ -668,11 +662,6 @@ void noise_est_down_fx(
Word16 scale;
Word32 totalNoise_temp;
Word32 L_Etot, L_Etot_last, L_Etot_v_h2, L_Etot_v;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
L_Etot = L_shl( Etot, 16 ); /*Q24 for later AR1 computations*/
L_Etot_last = L_shl( *Etot_last, 16 );
@@ -687,15 +676,9 @@ void noise_est_down_fx(
totalNoise_temp = L_deposit_l( 0 );
FOR( i = min_band; i <= max_band; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
totalNoise_temp = L_add_sat( totalNoise_temp, bckr[i] ); /*Q_new+QSCALE*/
-#else
- totalNoise_temp = L_add_o( totalNoise_temp, bckr[i], &Overflow ); /*Q_new+QSCALE*/
-#endif
}
totalNoise_temp = L_max( totalNoise_temp, L_shl( e_min, 4 ) );
-
-
totalNoise_temp = L_max( totalNoise_temp, (Word32) 1L ); /* make sure log2_norm_lc does not cause table reading out of bounds */
/*totalNoise = 10.0f * (float)log10( *totalNoise );*/
@@ -715,11 +698,7 @@ void noise_est_down_fx(
FOR( i = 0; i < NB_BANDS; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp = L_add_sat( L_shr_r( *pt1, 1 ), L_shr_r( *pt2, 1 ) );
-#else
- Ltmp = L_add_o( L_shr_r( *pt1, 1 ), L_shr_r( *pt2, 1 ), &Overflow );
-#endif
/*Ltmp = L_shr_r(L_add(*pt1,*pt2),1);*/
enr[i] = Ltmp;
move32(); /*Q_new+QSCALE*/
@@ -1010,19 +989,8 @@ void noise_est_fx(
SP_MUS_CLAS_HANDLE hSpMusClas;
hSpMusClas = st_fx->hSpMusClas;
(void) ( ncharX );
-
- /* Check if LR-VAD */
- {
- hNoiseEst = st_fx->hNoiseEst;
- }
-
+ hNoiseEst = st_fx->hNoiseEst;
GSC_ENC_HANDLE hGSCEnc = st_fx->hGSCEnc;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*-----------------------------------------------------------------*
* Initialization
@@ -1073,6 +1041,7 @@ void noise_est_fx(
}
}
}
+
/*-----------------------------------------------------------------*
* Set the threshold for eps & non_sta based on input sampling rate
* The reason is that in case of 8kHz sampling input, there is nothing
@@ -1104,7 +1073,6 @@ void noise_est_fx(
move16();
}
-
/*-----------------------------------------------------------------*
* Estimation of pitch stationarity
*-----------------------------------------------------------------*/
@@ -1117,13 +1085,8 @@ void noise_est_fx(
Ltmp = L_deposit_h( corr_shift );
Ltmp = L_mac( Ltmp, st_fx->voicing_fx[0], 10923 );
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp = L_mac_sat( Ltmp, st_fx->voicing_fx[1], 10923 );
wtmp = mac_r_sat( Ltmp, st_fx->voicing_fx[2], 10923 );
-#else
- Ltmp = L_mac_o( Ltmp, st_fx->voicing_fx[1], 10923, &Overflow );
- wtmp = mac_ro( Ltmp, st_fx->voicing_fx[2], 10923, &Overflow );
-#endif
tmp_pc = pc;
move16();
@@ -1139,16 +1102,15 @@ void noise_est_fx(
* Multi-harmonic analysis
*-----------------------------------------------------------------*/
+ IF( st_fx->hSpMusClas != NULL )
{
- IF( st_fx->hSpMusClas != NULL )
- {
- i = 0;
- move16();
- *loc_harm = multi_harm_fx( EspecdB, hNoiseEst->old_S_fx, hNoiseEst->cor_map_fx, &hNoiseEst->multi_harm_limit_fx, st_fx->total_brate,
- st_fx->bwidth, ( st_fx->hGSCEnc != NULL ) ? &hGSCEnc->cor_strong_limit : &i, &hSpMusClas->mean_avr_dyn_fx, &hSpMusClas->last_sw_dyn_fx, cor_map_sum, sp_floor, S_map );
- move16();
- }
+ i = 0;
+ move16();
+ *loc_harm = multi_harm_fx( EspecdB, hNoiseEst->old_S_fx, hNoiseEst->cor_map_fx, &hNoiseEst->multi_harm_limit_fx, st_fx->total_brate,
+ st_fx->bwidth, ( st_fx->hGSCEnc != NULL ) ? &hGSCEnc->cor_strong_limit : &i, &hSpMusClas->mean_avr_dyn_fx, &hSpMusClas->last_sw_dyn_fx, cor_map_sum, sp_floor, S_map );
+ move16();
}
+
/*-----------------------------------------------------------------*
* Detection of frames with non-stationary spectral content
*-----------------------------------------------------------------*/
@@ -1176,11 +1138,7 @@ void noise_est_fx(
FOR( i = 10; i <= st_fx->max_band; i++ )
{
Lnum = L_max( *pt1, *pt2 ); /* Don't need if anymore */
-#ifdef ISSUE_1867_replace_overflow_libenc
Lsum_den = L_add_sat( Lsum_den, Lnum );
-#else
- Lsum_den = L_add_o( Lsum_den, Lnum, &Overflow );
-#endif
Ltmpden = L_min( *pt1, *pt2 );
if ( Ltmpden == 0 )
{
@@ -1296,11 +1254,7 @@ void noise_est_fx(
/* alpha = 0.064f * ftemp + 0.75f; */
Ltmp = Mult_32_16( (Word32) 137438953L, tmp ); /* Q31(.064)+Q8+1-16 --> Q24 */
Ltmp = L_mac( Ltmp, 256, 24576 ); /* Q8+Q15(.75)+1 --> Q24 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- alpha = round_fx_sat( L_shl_sat( Ltmp, 7 ) ); /*Q24 +7 --> Q31 Q15*/
-#else
- alpha = round_fx_o( L_shl_o( Ltmp, 7, &Overflow ), &Overflow ); /*Q24 +7 --> Q31 Q15*/
-#endif
+ alpha = round_fx_sat( L_shl_sat( Ltmp, 7 ) ); /*Q24 +7 --> Q31 Q15*/
/*if( alpha > 0.999f { alpha = 0.999f;} */
alpha = s_min( alpha, 32735 ); /*.999 in Q15*/
@@ -1335,14 +1289,9 @@ void noise_est_fx(
/* + 1.0f added to reduce sensitivity to non stationarity in low energies */
/* tmp_enr = enr[i] + 1.0f; */
tmp_Q = add( Q_new, Q_SCALE );
- Ltmp = L_shl( (Word32) 1L, tmp_Q ); /* 1.0 added in the right dynamic domain */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ Ltmp = L_shl( (Word32) 1L, tmp_Q ); /* 1.0 added in the right dynamic domain */
L_tmp_enr = L_add_sat( enr[i], Ltmp ); /* enr scale dynamic */
L_tmp_ave_enr = L_add_sat( hNoiseEst->ave_enr_fx[i], Ltmp ); /* ave__enr scale dynamic */
-#else
- L_tmp_enr = L_add_o( enr[i], Ltmp, &Overflow ); /* enr scale dynamic */
- L_tmp_ave_enr = L_add_o( hNoiseEst->ave_enr_fx[i], Ltmp, &Overflow ); /* ave__enr scale dynamic */
-#endif
IF( LE_32( non_sta, th_sta ) ) /* Just to limit the saturation */
{
@@ -1381,14 +1330,10 @@ void noise_est_fx(
} */
/* ave_enr2:: calculation of another non-stationarity measure (following attacks) */
- Ltmp = L_shl( (Word32) 1L, tmp_Q ); /* 1.0 added in the right dynamic domain */
- /*L_tmp_enr = L_add(enr[i] , Ltmp );*/ /* enr scale dynamic , done above */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ Ltmp = L_shl( (Word32) 1L, tmp_Q ); /* 1.0 added in the right dynamic domain */
+ /*L_tmp_enr = L_add(enr[i] , Ltmp );*/ /* enr scale dynamic , done above */
L_tmp_ave_enr2 = L_add_sat( hNoiseEst->ave_enr2_fx[i], Ltmp ); /* ave__enr scale dynamic */
-#else
- L_tmp_ave_enr2 = L_add_o( hNoiseEst->ave_enr2_fx[i], Ltmp, &Overflow ); /* ave__enr scale dynamic */
-#endif
- IF( LE_32( Lnon_sta2, th_sta ) ) /* Just to limit the saturation */
+ IF( LE_32( Lnon_sta2, th_sta ) ) /* Just to limit the saturation */
{
Lnum = L_max( L_tmp_enr, L_tmp_ave_enr2 );
Lden = L_min( L_tmp_enr, L_tmp_ave_enr2 );
@@ -1419,11 +1364,7 @@ void noise_est_fx(
/* log_enr = (float)ln_fx(enr[i]); */
log_enr16 = noise_est_ln_q8_fx( enr[i], 0, tmp_Q );
wtmp = abs_s( sub( log_enr16, hSpMusClas->past_log_enr_fx[i - START_BAND_SPMUS] ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
*non_staX = add_sat( *non_staX, wtmp );
-#else
- *non_staX = add_o( *non_staX, wtmp, &Overflow );
-#endif
move16(); /* Q8 */
hSpMusClas->past_log_enr_fx[i - START_BAND_SPMUS] = log_enr16;
move16();
@@ -1439,11 +1380,7 @@ void noise_est_fx(
tmp_floor = LN_E_MIN_PLUS_ONE_FX;
move16(); /* non dynamic init constant in Q8 */
tmp_floor = noise_est_ln_q8_fx( hNoiseEst->bckr_fx[i], 1, tmp_Q );
-#ifdef ISSUE_1867_replace_overflow_libenc
non_staB = add_sat( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ) ); /* Q8 */
-#else
- non_staB = add_o( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ), &Overflow ); /* Q8 */
-#endif
}
ELSE /*ini_frame < 100*/
{
@@ -1452,11 +1389,7 @@ void noise_est_fx(
tmp_floor = LN_E_MIN_PLUS_ONE_FX;
move16(); /* non dynamic init constant in Q8 */
tmp_floor = noise_est_ln_q8_fx( E_MIN_FX, 1, tmp_Q );
-#ifdef ISSUE_1867_replace_overflow_libenc
non_staB = add_sat( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ) ); /* Q8 */
-#else
- non_staB = add_o( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ), &Overflow ); /* Q8 */
-#endif
}
}
@@ -1568,12 +1501,8 @@ void noise_est_fx(
Ltmp = eps_quota_fx( epsP_h[0], epsP_l[0],
epsP_h[2], epsP_l[2], 12 ); /* Word32 Q12 */
BASOP_SATURATE_WARNING_OFF_EVS /* may saturate*/
-#ifdef ISSUE_1867_replace_overflow_libenc
epsP_0_2 = round_fx_sat( L_shl_sat( Ltmp, 16 ) );
/* Q12+16 -16 -> Q12 , NB saturation in Q12 sets max value to 7,999 */
-#else
- epsP_0_2 = round_fx_o( L_shl_o( Ltmp, 16, &Overflow ), &Overflow ); /* Q12+16 -16 -> Q12 , NB saturation in Q12 sets max value to 7,999 */
-#endif
BASOP_SATURATE_WARNING_ON_EVS
epsP_0_2 = s_max( 0, epsP_0_2 ); /* min value is 0 , Q12 */
@@ -1610,13 +1539,9 @@ void noise_est_fx(
/* epsP_2_16 = max(0 , min(8, epsP[2] / epsP[16])); */
Ltmp = eps_quota_fx( epsP_h[2], epsP_l[2],
- epsP_h[16], epsP_l[16], 12 ); /* Word32 Q12 */
- BASOP_SATURATE_WARNING_OFF_EVS /* may saturate*/
-#ifdef ISSUE_1867_replace_overflow_libenc
+ epsP_h[16], epsP_l[16], 12 ); /* Word32 Q12 */
+ BASOP_SATURATE_WARNING_OFF_EVS /* may saturate*/
epsP_2_16 = round_fx_sat( L_shl_sat( Ltmp, 16 ) ); /* Q12+16 -16 -> Q12 ,*/
-#else
- epsP_2_16 = round_fx_o( L_shl_o( Ltmp, 16, &Overflow ), &Overflow ); /* Q12+16 -16 -> Q12 ,*/
-#endif
/*NB saturation in Q12 sets max value to 7,999 */
BASOP_SATURATE_WARNING_ON_EVS
@@ -1739,12 +1664,7 @@ void noise_est_fx(
*-----------------------------------------------------------------*/
Ltmp = L_mult( st_fx->voicing_fx[0], 16384 );
Ltmp = L_mac( Ltmp, st_fx->voicing_fx[1], 16384 );
-#ifdef ISSUE_1867_replace_overflow_libenc
cor_tmp = mac_r_sat( Ltmp, corr_shift, MAX_16 );
-#else
- cor_tmp = mac_ro( Ltmp, corr_shift, MAX_16, &Overflow );
-#endif
-
LepsP = eps_quota_fx( epsP_h[2], epsP_l[2],
epsP_h[16], epsP_l[16], 11 ); /* L_epsP in Q11 */
/* note this epsP2/eps16 is not limited to 8 as, epsP_2_16 is !! */
@@ -2346,12 +2266,6 @@ void noise_est_ivas_fx(
Le_min_scaled = L_shl( E_MIN_FXQ31, sub( q_fr_bands, Q31 ) ); // q_fr_bands
GSC_ENC_HANDLE hGSCEnc = st_fx->hGSCEnc;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* Check if LR-VAD */
IF( hFrontVad != NULL )
@@ -2454,7 +2368,6 @@ void noise_est_ivas_fx(
move16();
}
-
/*-----------------------------------------------------------------*
* Estimation of pitch stationarity
*-----------------------------------------------------------------*/
@@ -2464,16 +2377,10 @@ void noise_est_ivas_fx(
wtmp1 = abs_s( sub( st_fx->pitch[1], st_fx->pitch[0] ) );
pc = add( wtmp, wtmp1 );
-
Ltmp = L_deposit_h( corr_shift );
Ltmp = L_mac( Ltmp, st_fx->voicing_fx[0], 10923 );
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp = L_mac_sat( Ltmp, st_fx->voicing_fx[1], 10923 );
wtmp = mac_r_sat( Ltmp, st_fx->voicing_fx[2], 10923 );
-#else
- Ltmp = L_mac_o( Ltmp, st_fx->voicing_fx[1], 10923, &Overflow );
- wtmp = mac_ro( Ltmp, st_fx->voicing_fx[2], 10923, &Overflow );
-#endif
tmp_pc = pc;
move16();
@@ -2685,11 +2592,7 @@ void noise_est_ivas_fx(
/* alpha = 0.064f * ftemp + 0.75f; */
Ltmp = Madd_32_16( 12582912 /* 0.75 in Q24*/, 137438953, tmp ); // Q24
-#ifdef ISSUE_1867_replace_overflow_libenc
- alpha = round_fx_sat( L_shl_sat( Ltmp, 7 ) ); /*Q24 +7 --> Q31 Q15*/
-#else
- alpha = round_fx_o( L_shl_o( Ltmp, 7, &Overflow ), &Overflow ); /*Q24 +7 --> Q31 Q15*/
-#endif
+ alpha = round_fx_sat( L_shl_sat( Ltmp, 7 ) ); /*Q24 +7 --> Q31 Q15*/
/*if( alpha > 0.999f { alpha = 0.999f;} */
alpha = s_min( alpha, 32735 ); /*.999 in Q15*/
@@ -2842,11 +2745,7 @@ void noise_est_ivas_fx(
IF( LT_16( ini_frame, 100 ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
non_staB = add_sat( non_staB, abs_s( sub( tmp_enr, LN_E_MIN_PLUS_ONE_FX ) ) ); /* Q8 */
-#else
- non_staB = add_o( non_staB, abs_s( sub( tmp_enr, LN_E_MIN_PLUS_ONE_FX ) ), &Overflow ); /* Q8 */
-#endif
}
ELSE /*ini_frame < 100*/
{
@@ -2868,11 +2767,7 @@ void noise_est_ivas_fx(
Ltmp1 = Mpy_32_16_1( Ltmp1, 22713 ); // Q15
tmp_floor = round_fx( L_shl( Ltmp1, 9 ) ); /* Q8 */
}
-#ifdef ISSUE_1867_replace_overflow_libenc
non_staB = add_sat( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ) ); /* Q8 */
-#else
- non_staB = add_o( non_staB, abs_s( sub( tmp_enr, tmp_floor ) ), &Overflow ); /* Q8 */
-#endif
}
}
diff --git a/lib_enc/normalizecoefs_fx.c b/lib_enc/normalizecoefs_fx.c
index 1dcf6b6e2fc71319aa587875835a7adfcf5ecf0f..696bf272fdf4e7be2f18900e29613a0914550fbc 100644
--- a/lib_enc/normalizecoefs_fx.c
+++ b/lib_enc/normalizecoefs_fx.c
@@ -29,12 +29,7 @@ void normalizecoefs_fx(
Word16 *pcoefs16;
Word32 *pcoefs;
Word16 subvec_start, subvec_end, num_coefs;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
+
pcoefs = coefs;
pcoefs16 = coefs_norm;
@@ -57,11 +52,7 @@ void normalizecoefs_fx(
*pcoefs = Mpy_32_16_1( *pcoefs, INV2POWHALF );
move32();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
*pcoefs16++ = round_fx_sat( L_shl_sat( *pcoefs++, 16 - k ) ); /* Q12 */
-#else
- *pcoefs16++ = round_fx_o( L_shl_o( *pcoefs++, 16 - k, &Overflow ), &Overflow ); /* Q12 */
-#endif
move16();
}
}
diff --git a/lib_enc/pit_enc_fx.c b/lib_enc/pit_enc_fx.c
index be35a5a1262b8e617f4adc3e0bbfb8ec2823e6d3..c20ec2479ba48060bd8f32dcf2d2a85d0eb69ce0 100644
--- a/lib_enc/pit_enc_fx.c
+++ b/lib_enc/pit_enc_fx.c
@@ -964,12 +964,6 @@ void norm_corr_ivas_fx(
Word16 h_e, e_max;
Word32 L_tmp;
Word64 W_tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
k = negate( t_min );
h_e = add( 1, norm_s( h[0] ) ); // exponent of h
@@ -987,15 +981,10 @@ void norm_corr_ivas_fx(
FOR( t = t_min; t <= t_max; t++ )
{
/* Compute correlation between xn[] and excf[] */
-
L_tmp = L_mac( 0, xn[0], excf[0] );
FOR( i = 1; i < L_subfr; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac_sat( L_tmp, xn[i], excf[i] ); // (Q_new - 1) + (Q_new - h_e) + 1
-#else
- L_tmp = L_mac_o( L_tmp, xn[i], excf[i], &Overflow ); // (Q_new - 1) + (Q_new - h_e) + 1
-#endif
}
exp = norm_l( L_tmp );
L_tmp = L_shl( L_tmp, exp );
@@ -1066,12 +1055,6 @@ void norm_corr_fx(
Word16 corr, exp_corr, norm, exp_norm, exp, scale;
Word16 excf[L_FRAME16k];
Word32 L_tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
k = negate( t_min );
@@ -1082,18 +1065,10 @@ void norm_corr_fx(
conv_fx( &exc[k], h, excf, L_subfr );
/* Compute rounded down 1/sqrt(energy of xn[]) */
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac_sat( 1, xn[0], xn[0] );
-#else
- L_tmp = L_mac_o( 1, xn[0], xn[0], &Overflow );
-#endif
FOR( i = 1; i < L_subfr; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac_sat( L_tmp, xn[i], xn[i] );
-#else
- L_tmp = L_mac_o( L_tmp, xn[i], xn[i], &Overflow );
-#endif
}
exp = norm_l( L_tmp );
exp = sub( 30, exp );
@@ -1108,15 +1083,10 @@ void norm_corr_fx(
FOR( t = t_min; t <= t_max; t++ )
{
/* Compute correlation between xn[] and excf[] */
-
L_tmp = L_mac( 1, xn[0], excf[0] );
FOR( i = 1; i < L_subfr; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac_sat( L_tmp, xn[i], excf[i] );
-#else
- L_tmp = L_mac_o( L_tmp, xn[i], excf[i], &Overflow );
-#endif
}
exp = norm_l( L_tmp );
L_tmp = L_shl( L_tmp, exp );
@@ -1127,11 +1097,7 @@ void norm_corr_fx(
L_tmp = L_mac( 1, excf[0], excf[0] );
FOR( i = 1; i < L_subfr; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac_sat( L_tmp, excf[i], excf[i] );
-#else
- L_tmp = L_mac_o( L_tmp, excf[i], excf[i], &Overflow );
-#endif
}
exp = norm_l( L_tmp );
diff --git a/lib_enc/pitch_ol2_fx.c b/lib_enc/pitch_ol2_fx.c
index 3e2ef6c3151ce4faea8936c6312aa98ddcebf99a..ab97b615007e4aa8422ebec85113eea3ee455434 100644
--- a/lib_enc/pitch_ol2_fx.c
+++ b/lib_enc/pitch_ol2_fx.c
@@ -50,12 +50,6 @@ void pitch_ol2_fx(
Word32 R1, R2;
Word16 R0, exp_R0, exp_R1, exp_R2, j;
Word16 pit_max;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* initialization */
pit_max = PIT_MAX;
@@ -84,13 +78,8 @@ void pitch_ol2_fx(
pt_cor_fx = cor_fx;
FOR( t = t_min; t <= t_max; t++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
t0 = L_shl_sat( *pt_cor_32++, exp3 );
*pt_cor_fx++ = round_fx_sat( t0 );
-#else
- t0 = L_shl_o( *pt_cor_32++, exp3, &Overflow );
- *pt_cor_fx++ = round_fx_o( t0, &Overflow );
-#endif
move16();
}
@@ -196,11 +185,7 @@ void pitch_ol2_fx(
exp_R2 = norm_l( R2 );
R2 = L_shl( R2, exp_R2 );
-#ifdef ISSUE_1867_replace_overflow_libenc
R1 = L_mult_sat( round_fx_sat( R1 ), round_fx_sat( R2 ) );
-#else
- R1 = L_mult_o( round_fx_o( R1, &Overflow ), round_fx_o( R2, &Overflow ), &Overflow );
-#endif
i = norm_l( R1 );
R1 = L_shl( R1, i );
@@ -210,19 +195,11 @@ void pitch_ol2_fx(
R1 = Isqrt_lc( R1, &exp_R1 );
-#ifdef ISSUE_1867_replace_overflow_libenc
R1 = L_mult( R0, round_fx_sat( R1 ) );
-#else
- R1 = L_mult( R0, round_fx_o( R1, &Overflow ) );
-#endif
exp_R0 = sub( 31, exp_R0 );
exp_R0 = sub( add( exp_R0, exp_R1 ), exp3 );
-#ifdef ISSUE_1867_replace_overflow_libenc
*voicing_fr_fx = round_fx_sat( L_shl_sat( R1, exp_R0 ) ); /*Q15*/
-#else
- *voicing_fr_fx = round_fx_o( L_shl_o( R1, exp_R0, &Overflow ), &Overflow ); /*Q15*/
-#endif
move16();
}
ELSE
@@ -262,12 +239,6 @@ void StableHighPitchDetect_fx(
Word16 tmp, tmp1, exp, diff16, cor_max16, exp1, exp2, pit_min_up;
Word32 L_tmp, L_tmp1;
Word16 Top;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*voicing = (voicing[0] + voicing[1] + voicing[2] )/3;*/
L_tmp = L_mult( voicing[0], 10923 /*1/3 in Q15*/ );
@@ -316,35 +287,21 @@ void StableHighPitchDetect_fx(
tmp = div_s( 16384, tmp ); /*Q(15+exp)*/
BASOP_SATURATE_WARNING_OFF_EVS
diff = L_negate( L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
BASOP_SATURATE_WARNING_ON_EVS
diff16 = round_fx_sat( diff );
-#else
- BASOP_SATURATE_WARNING_ON_EVS
- diff16 = round_fx_o( diff, &Overflow );
-#endif
}
ELSE
{
tmp = div_s( 16384, tmp ); /*Q(15+exp)*/
BASOP_SATURATE_WARNING_OFF_EVS
diff = L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
BASOP_SATURATE_WARNING_ON_EVS
diff16 = round_fx_sat( diff );
-#else
- BASOP_SATURATE_WARNING_ON_EVS
- diff16 = round_fx_o( diff, &Overflow );
-#endif
}
}
ELSE
{
-#ifdef ISSUE_1867_replace_overflow_libenc
diff16 = round_fx_sat( L_shl_sat( diff, 25 ) );
-#else
- diff16 = round_fx_o( L_shl_o( diff, 25, &Overflow ), &Overflow );
-#endif
}
test();
test();
@@ -421,11 +378,7 @@ void StableHighPitchDetect_fx(
L_tmp1 = Isqrt_lc( L_tmp1, &exp ); /*Q(31-exp)*/
cor_max = Mult_32_32( cor_max, L_tmp1 );
exp = 31 - ( shl( Q_new, 1 ) + 1 ) - ( 31 - exp ) + 31;
-#ifdef ISSUE_1867_replace_overflow_libenc
cor_max16 = round_fx_sat( L_shl_sat( cor_max, exp ) ); /*Q15*/
-#else
- cor_max16 = round_fx_o( L_shl_o( cor_max, exp, &Overflow ), &Overflow ); /*Q15*/
-#endif
/**voicing0_sm = add(mult_r(24576 ,(*voicing0_sm)) , mult_r(8192 , cor_max16));*/
*voicing0_sm = round_fx( L_mac( L_mult( 24576 /*.75f Q15*/, *voicing0_sm ), 8192 /*.25f Q15*/, cor_max16 ) );
move16();
@@ -490,12 +443,6 @@ void StableHighPitchDetect_ivas_fx(
Word16 tmp, tmp1, exp, diff16, cor_max16, exp1, exp2, pit_min_up;
Word32 L_tmp, L_tmp1;
Word16 Top;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*voicing = (voicing[0] + voicing[1] + voicing[2] )/3;*/
L_tmp = L_mult( voicing[0], 10923 /*1/3 in Q15*/ );
@@ -551,35 +498,21 @@ void StableHighPitchDetect_ivas_fx(
tmp = div_s( 16384, tmp ); /*Q(15+exp)*/
BASOP_SATURATE_WARNING_OFF_EVS
diff = L_negate( L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
BASOP_SATURATE_WARNING_ON_EVS
diff16 = round_fx_sat( diff );
-#else
- BASOP_SATURATE_WARNING_ON_EVS
- diff16 = round_fx_o( diff, &Overflow );
-#endif
}
ELSE
{
tmp = div_s( 16384, tmp ); /*Q(15+exp)*/
BASOP_SATURATE_WARNING_OFF_EVS
diff = L_shr_sat( Mult_32_16( diff, tmp ), sub( exp + 7, 31 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
BASOP_SATURATE_WARNING_ON_EVS
diff16 = round_fx_sat( diff );
-#else
- BASOP_SATURATE_WARNING_ON_EVS
- diff16 = round_fx_o( diff, &Overflow );
-#endif
}
}
ELSE
{
-#ifdef ISSUE_1867_replace_overflow_libenc
diff16 = round_fx_sat( L_shl_sat( diff, 25 ) );
-#else
- diff16 = round_fx_o( L_shl_o( diff, 25, &Overflow ), &Overflow );
-#endif
}
test();
test();
@@ -665,11 +598,7 @@ void StableHighPitchDetect_ivas_fx(
L_tmp1 = Isqrt_lc( L_tmp1, &exp ); /*Q(31-exp)*/
cor_max = Mult_32_32( cor_max, L_tmp1 );
exp = add( sub( sub( 31, add( shl( Q_new, 1 ), 1 ) ), sub( 31, exp ) ), 31 );
-#ifdef ISSUE_1867_replace_overflow_libenc
cor_max16 = round_fx_sat( L_shl_sat( cor_max, exp ) ); /*Q15*/
-#else
- cor_max16 = round_fx_o( L_shl_o( cor_max, exp, &Overflow ), &Overflow ); /*Q15*/
-#endif
/**voicing0_sm = add(mult_r(24576 ,(*voicing0_sm)) , mult_r(8192 , cor_max16));*/
*voicing0_sm = round_fx( L_mac( L_mult( 24576 /*.75f Q15*/, *voicing0_sm ), 8192 /*.25f Q15*/, cor_max16 ) );
move16();
diff --git a/lib_enc/pitch_ol_fx.c b/lib_enc/pitch_ol_fx.c
index 8bf8065c8ae5da2f4dd3c1b5fea889099ae4faac..a27db58597618dbcfe64c48090fb7b9722428aef 100644
--- a/lib_enc/pitch_ol_fx.c
+++ b/lib_enc/pitch_ol_fx.c
@@ -182,11 +182,6 @@ void pitch_ol_fx(
const Word16 *len, *len1, *sublen, *sublen1, *pit_max, *sec_length, *sec_length1;
Word16 pit_min_coding;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
/*--------------------------------------------------------------*
* Initialization
@@ -738,11 +733,7 @@ void pitch_ol_fx(
enr1_exp = 0;
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
enr1 = add_sat( extract_h( dotp_fx( pt2, pt2, len[j], &enr1_exp ) ), 1 );
-#else
- enr1 = add_o( extract_h( dotp_fx( pt2, pt2, len[j], &enr1_exp ) ), 1, &Overflow );
-#endif
enr2 = L_mult( enr0[j], enr1 );
enr2_exp = norm_l( enr2 );
@@ -778,11 +769,7 @@ void pitch_ol_fx(
move16(); /* selected moving vector */
enr1_exp = 0;
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
enr1 = add_sat( extract_h( dotp_fx( pt4, pt4, len1[j], &enr1_exp ) ), 1 );
-#else
- enr1 = add_o( extract_h( dotp_fx( pt4, pt4, len1[j], &enr1_exp ) ), 1, &Overflow );
-#endif
enr2 = L_mult( enr0_1[j], enr1 );
enr2_exp = norm_l( enr2 );
@@ -877,11 +864,7 @@ void pitch_ol_fx(
move16();
pitch_tmp[i] = pitchX[i][ind];
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
cor_tmp[i] = add_sat( corX[i][ind], corr_shift );
-#else
- cor_tmp[i] = add_o( corX[i][ind], corr_shift, &Overflow );
-#endif
move16();
/* Higher is the neighbour's correlation, higher is the weighting */
@@ -895,11 +878,7 @@ void pitch_ol_fx(
move16();
pitch_tmp[i + NHFR] = pitchX[i][ind1];
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
cor_tmp[i + NHFR] = add_sat( corX[i][ind1], corr_shift );
-#else
- cor_tmp[i + NHFR] = add_o( corX[i][ind1], corr_shift, &Overflow );
-#endif
move16();
/* Higher is the neighbour's correlation, higher is the weighting */
@@ -1120,11 +1099,6 @@ void pitch_ol_ivas_fx(
const Word16 *len, *len1, *sublen, *sublen1, *pit_max, *sec_length, *sec_length1;
Word16 pit_min_coding;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
Word16 new_q;
new_q = sub( 63, shl( qwsp, 1 ) );
@@ -1726,12 +1700,7 @@ void pitch_ol_ivas_fx(
enr1 = ISqrt32( enr1, &enr1_exp ); /* 1/sqrt(energy) */ /*31-enr2_exp*/
Ltmp = Mpy_32_16_1( enr1, cor_buf[ind] );
-#ifdef ISSUE_1867_replace_overflow_libenc
corX[i][j] = extract_h( L_shl_sat( Ltmp, add( enr1_exp, cor_buf_exp[ind] ) ) ); // Q15
-#else
-
- corX[i][j] = extract_h( L_shl_o( Ltmp, add( enr1_exp, cor_buf_exp[ind] ), &Overflow ) ); // Q15
-#endif
move16();
Ltmp = Mpy_32_16_1( enr1, pt_cor0[ind] );
@@ -1774,11 +1743,7 @@ void pitch_ol_ivas_fx(
enr1 = ISqrt32( enr1, &enr1_exp ); /* 1/sqrt(energy) */ /*31-enr1_exp*/
Ltmp = Mpy_32_16_1( enr1, cor_buf[ind1 + len_x] );
-#ifdef ISSUE_1867_replace_overflow_libenc
corX[i][j + NSECT] = extract_h( L_shl_sat( Ltmp, add( enr1_exp, cor_buf_exp[ind1 + len_x] ) ) ); // Q15
-#else
- corX[i][j + NSECT] = extract_h( L_shl_o( Ltmp, add( enr1_exp, cor_buf_exp[ind1 + len_x] ), &Overflow ) ); // Q15
-#endif
move16();
Ltmp = Mpy_32_16_1( enr1, pt_cor0[ind1 + ( DELTA_COH - 1 ) + len_x] );
@@ -1855,11 +1820,7 @@ void pitch_ol_ivas_fx(
move16();
pitch_tmp[i] = pitchX[i][ind];
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
cor_tmp[i] = add_sat( corX[i][ind], corr_shift );
-#else
- cor_tmp[i] = add_o( corX[i][ind], corr_shift, &Overflow );
-#endif
move16();
/* Higher is the neighbour's correlation, higher is the weighting */
@@ -1873,11 +1834,7 @@ void pitch_ol_ivas_fx(
move16();
pitch_tmp[i + NHFR] = pitchX[i][ind1];
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
cor_tmp[i + NHFR] = add_sat( corX[i][ind1], corr_shift );
-#else
- cor_tmp[i + NHFR] = add_o( corX[i][ind1], corr_shift, &Overflow );
-#endif
move16();
/* Higher is the neighbour's correlation, higher is the weighting */
diff --git a/lib_enc/ppp_enc_fx.c b/lib_enc/ppp_enc_fx.c
index df422582d1970020214578bba0c74b9d99ef8c06..5e977c8f7b96f8b151deae0e406657ba2c6fbc11 100644
--- a/lib_enc/ppp_enc_fx.c
+++ b/lib_enc/ppp_enc_fx.c
@@ -618,18 +618,17 @@ static Word16 DTFS_quant_cw_fx(
/* CALLED FROM : TX */
/*===================================================================*/
-static Word16 DTFS_alignment_fine_new_fx( DTFS_STRUCTURE X1_fx, DTFS_STRUCTURE X2_fx, Word16 *S_fx, Word16 *C_fx )
+static Word16 DTFS_alignment_fine_new_fx(
+ DTFS_STRUCTURE X1_fx,
+ DTFS_STRUCTURE X2_fx,
+ Word16 *S_fx,
+ Word16 *C_fx )
{
Word16 temp, temp1, k, Qcorr, Qmaxcorr;
Word16 n, fshift_fx, HalfLag, ab1[MAXLAG_WI], ab2[MAXLAG_WI];
Word32 corr_fx;
Word32 maxcorr_fx, wcorr_fx, diff_corr;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
+
IF( LT_16( X1_fx.lag_fx, X2_fx.lag_fx ) )
{
DTFS_zeroPadd_fx( X2_fx.lag_fx, &X1_fx );
@@ -667,15 +666,9 @@ static Word16 DTFS_alignment_fine_new_fx( DTFS_STRUCTURE X1_fx, DTFS_STRUCTURE X
FOR( k = 0; k <= HalfLag; k++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
corr_fx = L_mac_sat( corr_fx, ab1[k], C_fx[temp % ( 4 * X2_fx.lag_fx )] );
corr_fx = L_mac_sat( corr_fx, ab2[k], S_fx[temp % ( 4 * X2_fx.lag_fx )] );
temp = add_sat( temp, temp1 );
-#else
- corr_fx = L_mac_o( corr_fx, ab1[k], C_fx[temp % ( 4 * X2_fx.lag_fx )], &Overflow );
- corr_fx = L_mac_o( corr_fx, ab2[k], S_fx[temp % ( 4 * X2_fx.lag_fx )], &Overflow );
- temp = add_o( temp, temp1, &Overflow );
-#endif
}
temp = sub( 32767, extract_l( L_shr( L_mult( 82, abs_s( n ) ), 1 ) ) ); /* Q15 */
Qcorr = norm_l( corr_fx );
@@ -685,40 +678,23 @@ static Word16 DTFS_alignment_fine_new_fx( DTFS_STRUCTURE X1_fx, DTFS_STRUCTURE X
move16();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
temp1 = round_fx_sat( (Word32) L_shl_sat( corr_fx, Qcorr ) ); /* Q(Qcorr-16) */
wcorr_fx = L_mult_sat( temp1, temp ); /* Q(Qcorr-16+15+1)=Q(Qcorr) */
-#else
- temp1 = round_fx_o( (Word32) L_shl_o( corr_fx, Qcorr, &Overflow ), &Overflow ); /* Q(Qcorr-16) */
- wcorr_fx = L_mult_o( temp1, temp, &Overflow ); /* Q(Qcorr-16+15+1)=Q(Qcorr) */
-#endif
IF( GE_16( Qmaxcorr, Qcorr ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
diff_corr = L_sub_sat( wcorr_fx, L_shl_sat( maxcorr_fx, sub( Qcorr, Qmaxcorr ) ) ); /* Qcorr */
-#else
- diff_corr = L_sub_o( wcorr_fx, L_shl_o( maxcorr_fx, sub( Qcorr, Qmaxcorr ), &Overflow ), &Overflow ); /* Qcorr */
-#endif
}
ELSE
{
-#ifdef ISSUE_1867_replace_overflow_libenc
diff_corr = L_sub_sat( L_shl_sat( wcorr_fx, sub( Qmaxcorr, Qcorr ) ), maxcorr_fx ); /* Qmaxcorr */
-#else
- diff_corr = L_sub_o( L_shl_o( wcorr_fx, sub( Qmaxcorr, Qcorr ), &Overflow ), maxcorr_fx, &Overflow ); /* Qmaxcorr */
-#endif
}
if ( diff_corr > 0 )
{
fshift_fx = n;
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
maxcorr_fx = (Word32) L_shl_sat( corr_fx, Qcorr ); /* Qcorr */
-#else
- maxcorr_fx = (Word32) L_shl_o( corr_fx, Qcorr, &Overflow ); /* Qcorr */
-#endif
Qmaxcorr = Qcorr;
move16();
}
@@ -726,6 +702,8 @@ static Word16 DTFS_alignment_fine_new_fx( DTFS_STRUCTURE X1_fx, DTFS_STRUCTURE X
return fshift_fx;
}
+
+
/*===================================================================*/
/* FUNCTION : LPCPowSpect_fx () */
/*-------------------------------------------------------------------*/
@@ -766,12 +744,7 @@ static void LPCPowSpect_fx(
Word32 Ltemp, Lw;
Word32 Lacc;
Word16 tmp, exp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
+
FOR( k = 0; k < Nf; k++ )
{
@@ -802,17 +775,11 @@ static void LPCPowSpect_fx(
t1 = add( t1, (Word16) L_shr( Ltemp, 16 ) ); /* t1 is interpolated cos(w) */
Ltemp = L_shr( L_mult( LPC[i], t1 ), 1 ); /* Ltemp in Q27 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- Re = L_add_sat( Re, Ltemp ); /* Re=1-sum(LPC[i]*cos(Lw)); */
- Ltemp = L_add_sat( Lw, 0x6000 ); /* add 0.75, which is 3pi/2 to convert sin to cos */
- Ltemp = L_shl_sat( Ltemp, 10 ); /* Q25 */
-#else
- Re = L_add_o( Re, Ltemp, &Overflow ); /* Re=1-sum(LPC[i]*cos(Lw)); */
- Ltemp = L_add_o( Lw, 0x6000, &Overflow ); /* add 0.75, which is 3pi/2 to convert sin to cos */
- Ltemp = L_shl_o( Ltemp, 10, &Overflow ); /* Q25 */
-#endif
- w = extract_h( Ltemp ); /* w is equivalent cos index */
- dl = extract_l( Ltemp ); /* dl is 6 bit left-over for interpolation */
+ Re = L_add_sat( Re, Ltemp ); /* Re=1-sum(LPC[i]*cos(Lw)); */
+ Ltemp = L_add_sat( Lw, 0x6000 ); /* add 0.75, which is 3pi/2 to convert sin to cos */
+ Ltemp = L_shl_sat( Ltemp, 10 ); /* Q25 */
+ w = extract_h( Ltemp ); /* w is equivalent cos index */
+ dl = extract_l( Ltemp ); /* dl is 6 bit left-over for interpolation */
w = s_and( w, 511 );
t1 = cos_table[w];
/*t2=cos_table[s_and(add(w,1),511)]; */
@@ -832,13 +799,8 @@ static void LPCPowSpect_fx(
t1 = add( t1, (Word16) L_shr( Ltemp, 16 ) ); /* t1 is interpolated cos(w) */
Ltemp = L_shr( L_mult( LPC[i], t1 ), 1 ); /* Ltemp in Q27 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- Im = L_sub_sat( Im, Ltemp ); /* Im=sum(LPC[i]*sin(Lw)) */
- Lw = L_add_sat( Lw, freq[k] ); /* Lw=(i+1)*freq[k] */
-#else
- Im = L_sub_o( Im, Ltemp, &Overflow ); /* Im=sum(LPC[i]*sin(Lw)) */
- Lw = L_add_o( Lw, freq[k], &Overflow ); /* Lw=(i+1)*freq[k] */
-#endif
+ Im = L_sub_sat( Im, Ltemp ); /* Im=sum(LPC[i]*sin(Lw)) */
+ Lw = L_add_sat( Lw, freq[k] ); /* Lw=(i+1)*freq[k] */
}
/* If necessary, we can block-normalize Re and Im to improve precision */
dh = extract_h( Re );
@@ -853,11 +815,7 @@ static void LPCPowSpect_fx(
ELSE
Lacc = L_mult0( dh, dl );
-#ifdef ISSUE_1867_replace_overflow_libenc
Lacc = L_add_sat( L_shr( Lacc, 15 ), L_shr( L_mult_sat( dh, dh ), 1 ) ); /* Lacc=Re*Re */
-#else
- Lacc = L_add_o( L_shr( Lacc, 15 ), L_shr( L_mult_o( dh, dh, &Overflow ), 1 ), &Overflow ); /* Lacc=Re*Re */
-#endif
dh = extract_h( Im );
dl = extract_l( Im );
@@ -888,18 +846,16 @@ static void LPCPowSpect_fx(
move16();
}
Ltemp = L_deposit_h( tmp );
-#ifdef ISSUE_1867_replace_overflow_libenc
out[k] = round_fx_sat( L_shl_sat( Ltemp, negate( add( exp, 8 ) ) ) );
-#else
- out[k] = round_fx_o( L_shl_o( Ltemp, negate( add( exp, 8 ) ), &Overflow ), &Overflow );
-#endif
move16();
/* out[k] = shl(tmp,-exp-8); in Q7 */
}
+
return;
}
+
/*===================================================================*/
/* FUNCTION : erb_diff_fx () */
/*-------------------------------------------------------------------*/
diff --git a/lib_enc/prot_fx_enc.h b/lib_enc/prot_fx_enc.h
index e64c18468db76ef4f161075c927b97b44f1e13e2..448a93b9ff07d372b829a09e6da8983bc9c7c4d7 100644
--- a/lib_enc/prot_fx_enc.h
+++ b/lib_enc/prot_fx_enc.h
@@ -33,34 +33,32 @@
#ifndef PROT_FX_ENC_H
#define PROT_FX_ENC_H
+#include "options.h"
#include "ivas_cnst.h"
#include "stat_enc.h"
#include "stat_dec.h"
#include "ivas_stat_dec.h"
-#include "ivas_error.h"
-#include "ivas_error_utils.h"
-#include "complex_basop.h"
#include "ivas_stat_enc.h"
ivas_error acelp_core_enc_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 inp_fx[], /* i : input signal of the current frame Q_new*/
- const Word32 ener_fx, /* i : residual energy from Levinson-Durbin Q6*/
- Word16 A_fx[NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes Q12*/
- Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquant. for subframes Q12*/
- const Word16 epsP_h_fx[M + 1], /* i : LP prediction errors Qx*/
- const Word16 epsP_l_fx[M + 1], /* i : LP prediction errors Qx*/
- Word16 lsp_new_fx[M], /* i : LSPs at the end of the frame Q15*/
- Word16 lsp_mid_fx[M], /* i : LSPs in the middle of the frame Q15*/
- Word16 vad_hover_flag_fx, /* i : VAD hangover flag Q0*/
- const Word16 attack_flag, /* i : attack flag (GSC or TC) Q0*/
- Word32 bwe_exc_extended_fx[], /* i/o: bandwidth extended excitation st->prev_Q_bwe_exc*/
- Word16 *voice_factors_fx, /* o : voicing factors Q15*/
+ Encoder_State *st_fx, /* i/o: encoder state structure */
+ const Word16 inp_fx[], /* i : input signal of the current frame Q_new*/
+ const Word32 ener_fx, /* i : residual energy from Levinson-Durbin Q6*/
+ Word16 A_fx[NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes Q12*/
+ Word16 Aw_fx[NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquant. for subframes Q12*/
+ const Word16 epsP_h_fx[M + 1], /* i : LP prediction errors Qx*/
+ const Word16 epsP_l_fx[M + 1], /* i : LP prediction errors Qx*/
+ Word16 lsp_new_fx[M], /* i : LSPs at the end of the frame Q15*/
+ Word16 lsp_mid_fx[M], /* i : LSPs in the middle of the frame 15*/
+ Word16 vad_hover_flag_fx, /* i : VAD hangover flag Q0*/
+ const Word16 attack_flag, /* i : attack flag (GSC or TC) Q0*/
+ Word32 bwe_exc_extended_fx[], /* i/o: bandwidth extended excitation st->prev_Q_bwe_exc*/
+ Word16 *voice_factors_fx, /* o : voicing factors Q15*/
Word16 old_syn_12k8_16k_fx[], /* o : intermediate ACELP synthesis at 12.8kHz or 16kHz to be used by SWB BWE q_old_syn*/
- Word16 pitch_buf_fx[NB_SUBFR16k], /* o : floating pitch for each subframe Q6*/
- Word16 *unbits_fx, /* o : number of unused bits Q0*/
- STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle */
+ Word16 pitch_buf_fx[NB_SUBFR16k], /* o : floating pitch for each subframe Q6*/
+ Word16 *unbits_fx, /* o : number of unused bits Q0*/
+ STEREO_TD_ENC_DATA_HANDLE hStereoTD, /* i/o: TD stereo encoder handle */
const Word16 Q_new,
const Word16 shift );
@@ -97,7 +95,7 @@ void AVQ_encmux_fx(
BSTR_ENC_HANDLE hBstr, /* i/o: bitstream handle */
const Word16 extl, /* i : extension layer */
Word16 xriq[], /* i/o: rounded subvectors [0..8*Nsv-1] followed
- by rounded bit allocations [8*Nsv..8*Nsv+Nsv-1] */
+ by rounded bit allocations [8*Nsv..8*Nsv+Nsv-1] */
Word16 *nb_bits, /* i/o: number of allocated bits */
const Word16 Nsv, /* i: number of subvectors */
Word16 nq_out[], /* o : AVQ nq index */
@@ -107,7 +105,7 @@ void AVQ_encmux_fx(
void bw_detect_fx(
Encoder_State *st, /* i/o: Encoder State */
- const Word16 signal_in[], /* i : input signal */
+ const Word16 signal_in[], /* i : input signal */
Word16 *spectrum, /* i : MDCT spectrum Q_spec */
const Word32 *enerBuffer, /* i : CLDFB Energy Q31 */
const Word16 *cldfbBuf_Ener_Exp, /* i : CLDFB Energy Exponent */
@@ -122,14 +120,14 @@ void core_switching_post_enc_fx(
const Word16 A[], /* i : unquant. LP filter coefs. (Q12) */
Word16 Qshift,
Word16 Q_new,
- const Word16 Qsp, /* i/o : Q from acelp synthsis */
+ const Word16 Qsp, /* i/o : Q from acelp synthsis */
Word16 *Qmus /* i/o : Q from mdct synthsis / Q of output synthesis */
);
void core_switching_pre_enc_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 *old_inp_12k8, /* i : old i signal @12.8kHz Qx*/
- const Word16 *old_inp_16k, /* i : old i signal @16kHz Qx*/
+ Encoder_State *st_fx, /* i/o: encoder state structure */
+ const Word16 *old_inp_12k8, /* i : old i signal @12.8kHz Qx*/
+ const Word16 *old_inp_16k, /* i : old i signal @16kHz Qx*/
const Word16 active_cnt, /* i : active frame counter Q0*/
const Word16 last_element_mode /* i : last_element_mode Q0*/
);
@@ -140,19 +138,19 @@ Word16 correlation_shift_fx(
);
void dtx_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
+ Encoder_State *st_fx, /* i/o: encoder state structure */
const Word16 vad, /* i : vad flag Q0*/
- const Word16 speech[], /* i : Pointer to the speech frame Q_speech*/
- Word16 Q_speech /* i : Q factor for speech */
+ const Word16 speech[], /* i : Pointer to the speech frame Q_speech*/
+ Word16 Q_speech /* i : Q factor for speech */
);
void dtx_ivas_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
+ Encoder_State *st_fx, /* i/o: encoder state structure */
const Word32 last_ivas_total_brate, /* i : last IVAS total bitrate Q0*/
- const Word32 ivas_total_brate, /* i : IVAS total bitrate Q0*/
+ const Word32 ivas_total_brate, /* i : IVAS total bitrate Q0*/
const Word16 vad, /* i : vad flag for DTX Q0*/
- const Word16 speech[], /* i : Pointer to the speech frame Q_speech*/
- Word16 Q_speech /* i : Q factor for speech */
+ const Word16 speech[], /* i : Pointer to the speech frame Q_speech*/
+ Word16 Q_speech /* i : Q factor for speech */
);
Word16 dtx_hangover_addition_fx(
@@ -161,28 +159,30 @@ Word16 dtx_hangover_addition_fx(
const Word16 lp_snr, /* i Q8 */
const Word16 cldfb_subtraction, /* i Q0 number of DTX-HO frames CLDFB wants to reduce */
Word16 *vad_hover_flag_ptr,
- VAD_HANDLE hVAD, /* i/o: VAD data handle */
+ VAD_HANDLE hVAD, /* i/o: VAD data handle */
NOISE_EST_HANDLE hNoiseEst /* i : Noise estimation handle */
);
+
Word16 ivas_dtx_hangover_addition_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
const Word16 vad_flag, /* i Q0 */
const Word16 lp_snr, /* i Q8 */
const Word16 cldfb_subtraction, /* i Q0 number of DTX-HO frames CLDFB wants to reduce */
Word16 *vad_hover_flag_ptr,
- VAD_HANDLE hVAD, /* i/o: VAD data handle */
+ VAD_HANDLE hVAD, /* i/o: VAD data handle */
NOISE_EST_HANDLE hNoiseEst, /* i : Noise estimation handle */
Word16 *rem_dtx_ho );
+
void fb_tbe_enc_fx(
- Encoder_State *st, /* i/o: encoder state structure */
+ Encoder_State *st, /* i/o: encoder state structure */
const Word16 new_input[], /* i : i speech at 48 kHz sample rate */
- const Word16 fb_exc[], /* i : FB excitation from the SWB part */
+ const Word16 fb_exc[], /* i : FB excitation from the SWB part */
Word16 Q_fb_exc );
void fb_tbe_enc_ivas_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- const Word16 new_input[], /* i : i speech at 48 kHz sample rate Q_new_input*/
- const Word16 fb_exc[], /* i : FB excitation from the SWB part Q_fb_exc*/
+ Encoder_State *st, /* i/o: encoder state structure */
+ const Word16 new_input[], /* i : i speech at 48 kHz sample rate Q_new_input*/
+ const Word16 fb_exc[], /* i : FB excitation from the SWB part Q_fb_exc*/
Word16 Q_fb_exc,
Word16 Q_new_input );
@@ -196,54 +196,54 @@ Word16 ffr_getSfWord32(
const Word32 *vector, /*!< Pointer to i vector */
const Word16 len /*!< Length of i vector */
);
+
void find_tilt_ivas_fx(
- const Word32 fr_bands[], /* i : energy in frequency bands q_fr_bands*/
- const Word16 q_fr_bands, /* i : Q of fr_bands Q0*/
- const Word32 bckr[], /* i : per band background noise energy estimate q_bckr*/
- const Word16 q_bckr, /* i : Q of bckr Q0*/
+ const Word32 fr_bands[], /* i : energy in frequency bands q_fr_bands*/
+ const Word16 q_fr_bands, /* i : Q of fr_bands Q0*/
+ const Word32 bckr[], /* i : per band background noise energy estimate q_bckr*/
+ const Word16 q_bckr, /* i : Q of bckr Q0*/
Word32 ee[2], /* o : lf/hf E ration for present frame Q_bckr*/
const Word16 pitch[3], /* i : open loop pitch values for 3 half-frames Q0*/
const Word16 voicing[3], /* i : normalized correlation for 3 half-frames Q15*/
- const Word32 *lf_E, /* i : per bin energy for low frequencies q_lf_E*/
- const Word16 q_lf_E, /* i : Q of lf_E */
- const Word16 corr_shift, /* i : normalized correlation correction Q15*/
- const Word16 bwidth, /* i : i signal bandwidth */
- const Word16 max_band, /* i : maximum critical band */
+ const Word32 *lf_E, /* i : per bin energy for low frequencies q_lf_E*/
+ const Word16 q_lf_E, /* i : Q of lf_E */
+ const Word16 corr_shift, /* i : normalized correlation correction Q15*/
+ const Word16 bwidth, /* i : i signal bandwidth */
+ const Word16 max_band, /* i : maximum critical band */
Word32 hp_E[], /* o : energy in HF Q_new*/
- const Word16 codec_mode, /* i : MODE1 or MODE2 */
+ const Word16 codec_mode, /* i : MODE1 or MODE2 */
Word32 *bckr_tilt_lt,
Word16 Opt_vbr_mode );
void find_tilt_fx(
- const Word32 fr_bands[], /* i : energy in frequency bands Q_new + Q_SCALE*/
- const Word32 bckr[], /* i : per band background noise energy estimate Q_new + Q_SCALE*/
- Word32 ee[2], /* o : lf/hf E ration for present frame Q6*/
- const Word16 pitch[3], /* i : open loop pitch values for 3 half-frames Q0*/
- const Word16 voicing[3], /* i : normalized correlation for 3 half-frames Q15*/
+ const Word32 fr_bands[], /* i : energy in frequency bands Q_new + Q_SCALE*/
+ const Word32 bckr[], /* i : per band background noise energy estimate Q_new + Q_SCALE*/
+ Word32 ee[2], /* o : lf/hf E ration for present frame Q6*/
+ const Word16 pitch[3], /* i : open loop pitch values for 3 half-frames Q0*/
+ const Word16 voicing[3], /* i : normalized correlation for 3 half-frames Q15*/
const Word32 *lf_E, /* i : per bin energy for low frequencies Q_new + Q_SCALE - 2*/
- const Word16 corr_shift, /* i : normalized correlation correction Q15*/
+ const Word16 corr_shift, /* i : normalized correlation correction Q15*/
const Word16 bwidth, /* i : input signal bandwidth Q0*/
const Word16 max_band, /* i : maximum critical band Q0*/
Word32 hp_E[], /* o : energy in HF Q_new + Q_SCALE*/
- const Word16 codec_mode, /* i : MODE1 or MODE2 Q0*/
- const Word16 Q_new, /* i : scaling factor */
- Word32 *bckr_tilt_lt /* i/o: lf/hf E ratio of background noise Q16*/
- ,
- Word16 Opt_vbr_mode /* Q0 */
+ const Word16 codec_mode, /* i : MODE1 or MODE2 Q0*/
+ const Word16 Q_new, /* i : scaling factor */
+ Word32 *bckr_tilt_lt, /* i/o: lf/hf E ratio of background noise Q16*/
+ Word16 Opt_vbr_mode /* Q0 */
);
/* o : coding type */
Word16 find_uv_ivas_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 *T_op_fr, /* i : pointer to adjusted fractional pitch (4 val.) Q6*/
- const Word16 *voicing_fr, /* i : refined correlation for each subframes Q15*/
- const Word16 *speech, /* i : pointer to speech signal for E computation Q_new*/
- const Word32 *ee, /* i : lf/hf Energy ratio for present frame Q6*/
+ const Word16 *T_op_fr, /* i : pointer to adjusted fractional pitch (4 val.) Q6*/
+ const Word16 *voicing_fr, /* i : refined correlation for each subframes Q15*/
+ const Word16 *speech, /* i : pointer to speech signal for E computation Q_new*/
+ const Word32 *ee, /* i : lf/hf Energy ratio for present frame Q6*/
Word32 *dE1X, /* o : sudden energy increase for S/M classifier Q13*/
- const Word16 corr_shift, /* i : normalized correlation correction in noise Q15*/
- const Word16 relE, /* i : relative frame energy Q8*/
- const Word16 Etot, /* i : total energy Q8*/
- const Word32 hp_E[], /* i : energy in HF q_hp_E*/
+ const Word16 corr_shift, /* i : normalized correlation correction in noise Q15*/
+ const Word16 relE, /* i : relative frame energy Q8*/
+ const Word16 Etot, /* i : total energy Q8*/
+ const Word32 hp_E[], /* i : energy in HF q_hp_E*/
Word16 *flag_spitch, /* i/o: flag to indicate very short stable pitch and high correlation Q0*/
const Word16 last_core_orig, /* i : original last core Q0*/
STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure */
@@ -252,23 +252,23 @@ Word16 find_uv_ivas_fx(
/* o : coding type */
Word16 find_uv_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 *T_op_fr, /* i : pointer to adjusted fractional pitch (4 val.) Q6*/
- const Word16 *voicing_fr, /* i : refined correlation for each subframes Q15*/
- const Word16 *speech, /* i : pointer to speech signal for E computation Q_new*/
- const Word32 *ee, /* i : lf/hf Energy ratio for present frame Q6*/
- const Word16 corr_shift, /* i : normalized correlation correction in noise Q15*/
- const Word16 relE, /* i : relative frame energy Q8*/
- const Word16 Etot, /* i : total energy Q8*/
- const Word32 hp_E[], /* i : energy in HF Q_new + Q_SCALE*/
+ Encoder_State *st_fx, /* i/o: encoder state structure */
+ const Word16 *T_op_fr, /* i : pointer to adjusted fractional pitch (4 val.) Q6*/
+ const Word16 *voicing_fr, /* i : refined correlation for each subframes Q15*/
+ const Word16 *speech, /* i : pointer to speech signal for E computation Q_new*/
+ const Word32 *ee, /* i : lf/hf Energy ratio for present frame Q6*/
+ const Word16 corr_shift, /* i : normalized correlation correction in noise Q15*/
+ const Word16 relE, /* i : relative frame energy Q8*/
+ const Word16 Etot, /* i : total energy Q8*/
+ const Word32 hp_E[], /* i : energy in HF Q_new + Q_SCALE*/
const Word16 Q_new,
- Word16 *flag_spitch, /* i/o: flag to indicate very short stable pitch and high correlation Q0*/
+ Word16 *flag_spitch, /* i/o: flag to indicate very short stable pitch and high correlation Q0*/
const Word16 shift,
- const Word16 last_core_orig /* i : original last core Q0*/
+ const Word16 last_core_orig /* i : original last core Q0*/
);
void fine_gain_quant_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
const Word16 *ord, /* i : Indices for energy order */
const Word16 num_sfm, /* i : Number of bands */
const Word16 *gain_bits, /* i : Gain adjustment bits per sub band */
@@ -278,21 +278,21 @@ void fine_gain_quant_fx(
void hq_core_enc_fx(
Encoder_State *st_fx,
- const Word16 *audio, /* i : i audio signal Q0 */
- const Word16 input_frame_orig, /* i : frame length Q0*/
- const Word16 hq_core_type, /* i : HQ core type Q0*/
+ const Word16 *audio, /* i : i audio signal Q0*/
+ const Word16 input_frame_orig, /* i : frame length Q0*/
+ const Word16 hq_core_type, /* i : HQ core type Q0*/
const Word16 Voicing_flag, /* i : Voicing flag for FER method selection Q0*/
- const Word16 vad_hover_flag /* i : VAD hangover flag Q0*/
+ const Word16 vad_hover_flag /* i : VAD hangover flag Q0*/
);
void long_enr_fx(
- Encoder_State *st_fx, /* i/o: state structure */
+ Encoder_State *st_fx, /* i/o: state structure */
const Word16 Etot, /* i : total channel E (see lib_enc\analy_sp.c) */
const Word16 localVAD_HE_SAD, /* i : HE-SAD flag without hangover */
Word16 high_lpn_flag );
void ivas_long_enr_fx(
- Encoder_State *st_fx, /* i/o: state structure */
+ Encoder_State *st_fx, /* i/o: state structure */
const Word32 Etot, /* i : total channel E (see lib_enc\analy_sp.c) Q=24*/
const Word16 localVAD_HE_SAD, /* i : HE-SAD flag without hangover */
Word16 high_lpn_flag, /* i : sp/mus LPN flag */
@@ -300,10 +300,9 @@ void ivas_long_enr_fx(
const Word16 n_chan, /* i : number of channels */
const Word16 localVAD_HE_SAD_LR[], /* i : HE-SAD flag without hangover LR channels */
const Word16 Etot_LR[] /* i : total channel energy LR channels Q=8*/
-
);
-/* o: MDCT A/B decision */
+/* o: MDCT A/B decision */
Word16 mdct_classifier_fx(
const Word16 *Y, /* i: re[0], re[1], ..., re[n/2], im[n/2 - 1], im[n/2 - 2], ..., im[1] */
Encoder_State *st_fx, /* i/o: Encoder state variable */
@@ -371,7 +370,7 @@ void noise_est_fx(
const Word32 Le_min_scaled, /*i : Minimum energy value in Q_new + Q_SCALE */
Word16 *sp_floor, /* o : noise floor estimate Q7 */
Word16 S_map[], /* o : short-term correlation map Q7 */
- const Word16 ini_frame /* i : Frame number (init) */
+ const Word16 ini_frame /* i : Frame number (init) */
);
void noise_est_ivas_fx(
@@ -402,19 +401,18 @@ void noise_est_ivas_fx(
Word16 EspecdB[], /* i/o: log E spectrum (with f=0) of the current frame Q7 for multi harm */
Word16 *sp_floor, /* o : noise floor estimate Q7 */
Word16 S_map[], /* o : short-term correlation map Q7 */
- STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure */
- FRONT_VAD_ENC_HANDLE hFrontVad, /* i/o: front-VAD handle */
- const Word16 ini_frame /* i : Frame number (init) */
+ STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure */
+ FRONT_VAD_ENC_HANDLE hFrontVad, /* i/o: front-VAD handle */
+ const Word16 ini_frame /* i : Frame number (init) */
);
void noise_est_pre_fx(
const Word16 Etot, /* i : Energy of current frame */
const Word16 ini_frame_fx, /* i : Frame number (init) */
- NOISE_EST_HANDLE hNoiseEst, /* i/o: Noise estimation handle */
- const Word16 idchan, /* i : channel ID */
- const Word16 element_mode, /* i : element mode */
- const Word16 last_element_mode /* i : last element mode */
-
+ NOISE_EST_HANDLE hNoiseEst, /* i/o: Noise estimation handle */
+ const Word16 idchan, /* i : channel ID */
+ const Word16 element_mode, /* i : element mode */
+ const Word16 last_element_mode /* i : last element mode */
);
void noise_est_pre_32fx(
@@ -424,7 +422,6 @@ void noise_est_pre_32fx(
const Word16 idchan, /* i : channel ID */
const Word16 element_mode, /* i : element mode */
const Word16 last_element_mode /* i : last element mode */
-
);
void pitch_ol2_fx(
@@ -481,17 +478,17 @@ void pitch_ol_init_fx(
);
void Preemph_scaled(
- Word16 new_speech[], /* i : Speech to scale already on 14 bits Q_new*/
- Word16 *Q_new, /* o : Scaling factor */
- Word16 *mem_preemph, /* i/o: Preemph memory Q(-1)*/
- Word16 *Q_max, /* i/o: Q_new limitation */
- const Word16 Preemph_factor, /* i : Preemphasis factor Q15*/
- const Word16 bits, /* i : Bit to remove from the output to (15-bits) */
- const Word16 bit1, /* i : Limit the output scaling to ((15-bits)-bit1) bits */
- const Word16 L_Q_mem, /* i : Number of old scaling to take into account Q0*/
- const Word16 Lframe, /* i : Frame length Q0*/
- const Word16 last_coder_type, /* i : coder_type Q0*/
- const Word16 Search_scaling /* i : enable the search of a proper scaling factor Q0*/
+ Word16 new_speech[], /* i : Speech to scale already on 14 bits Q_new*/
+ Word16 *Q_new, /* o : Scaling factor */
+ Word16 *mem_preemph, /* i/o: Preemph memory Q(-1)*/
+ Word16 *Q_max, /* i/o: Q_new limitation */
+ const Word16 Preemph_factor, /* i : Preemphasis factor Q15*/
+ const Word16 bits, /* i : Bit to remove from the output to (15-bits) */
+ const Word16 bit1, /* i : Limit the output scaling to ((15-bits)-bit1) bits */
+ const Word16 L_Q_mem, /* i : Number of old scaling to take into account Q0*/
+ const Word16 Lframe, /* i : Frame length Q0*/
+ const Word16 last_coder_type, /* i : coder_type Q0*/
+ const Word16 Search_scaling /* i : enable the search of a proper scaling factor Q0*/
);
void Scale_mem_enc(
@@ -530,10 +527,10 @@ void Scale_wsp(
Word16 *old_wsp, /* i/o: Old weighted speech buffer */
Word16 *mem_decim2, /* i/o: Decimation buffer */
Word16 *old_wsp12k8, /* i/o: wsp memory @ 12.8 kHz used in pitol2 */
- const Word16 Len_p_look /* i : L_frame + look ahead Q0*/
+ const Word16 Len_p_look /* i : L_frame + look ahead Q0*/
);
-/* o : classification for current frames */
+/* o : classification for current frames */
Word16 signal_clas_fx(
Encoder_State *st, /* i/o: encoder state structure */
const Word16 *speech, /* i : pointer to speech signal for E computation */
@@ -543,7 +540,7 @@ Word16 signal_clas_fx(
Word16 *uc_clas /* o : temporary classification used in music/speech class*/
);
-/* o : classification for current frames */
+/* o : classification for current frames */
Word16 signal_clas_ivas_fx(
Encoder_State *st, /* i/o: encoder state structure */
const Word16 *speech, /* i : pointer to speech signal for E computation */
@@ -554,27 +551,27 @@ Word16 signal_clas_ivas_fx(
);
void speech_music_classif_fx(
- Encoder_State *st, /* i/o: state structure */
- const Word16 *new_inp, /* i : new input signal */
- const Word16 *inp, /* i : input signal to locate attach position */
- const Word16 localVAD_HE_SAD, /* i : HE-SAD flag without hangover */
- const Word16 lsp_new[M], /* i : LSPs in current frame Q15 */
- const Word16 cor_map_sum, /* i : correlation map sum (from multi-harmonic anal.)Q8*/
- const Word32 epsP[M + 1], /* i : LP prediciton error Q_esp*/
- const Word32 PS[], /* i : energy spectrum Q_new+QSCALE*/
- const Word16 Etot, /* i : total frame energy Q8 */
- const Word16 old_cor, /* i : max correlation from previous frame Q15 */
+ Encoder_State *st, /* i/o: state structure */
+ const Word16 *new_inp, /* i : new input signal */
+ const Word16 *inp, /* i : input signal to locate attach position */
+ const Word16 localVAD_HE_SAD, /* i : HE-SAD flag without hangover */
+ const Word16 lsp_new[M], /* i : LSPs in current frame Q15 */
+ const Word16 cor_map_sum, /* i : correlation map sum (from multi-harmonic anal.) Q8*/
+ const Word32 epsP[M + 1], /* i : LP prediciton error Q_esp*/
+ const Word32 PS[], /* i : energy spectrum Q_new+QSCALE*/
+ const Word16 Etot, /* i : total frame energy Q8 */
+ const Word16 old_cor, /* i : max correlation from previous frame Q15 */
Word16 *attack_flag, /* o : flag to indicate if attack is to be treated by TC or GSC */
- Word16 non_sta, /* i : unbound non-stationarity for sp/mus classifier */
- Word16 relE, /* i : relative frame energy */
- Word16 Q_esp, /* i : scaling of esP */
- Word16 Q_inp, /* i : scaling of input */
- Word16 *high_lpn_flag_ptr, /* o : noise log prob flag for NOISE_EST */
- Word16 flag_spitch /* i : flag to indicate very short stable pitch */
+ Word16 non_sta, /* i : unbound non-stationarity for sp/mus classifier */
+ Word16 relE, /* i : relative frame energy */
+ Word16 Q_esp, /* i : scaling of esP */
+ Word16 Q_inp, /* i : scaling of input */
+ Word16 *high_lpn_flag_ptr, /* o : noise log prob flag for NOISE_EST */
+ Word16 flag_spitch /* i : flag to indicate very short stable pitch */
);
void StableHighPitchDetect_fx(
- Word16 *flag_spitch, /* o : flag to indicate very short stable pitch */
+ Word16 *flag_spitch, /* o : flag to indicate very short stable pitch*/
Word16 pitch[], /* i/o: OL pitch buffer */
const Word16 voicing[], /* i : OL pitch gains */
const Word16 wsp[], /* i : weighted speech */
@@ -606,10 +603,10 @@ void StableHighPitchDetect_ivas_fx(
void swb_bwe_enc_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
- Word16 *old_input_12k8_fx, /* i : i signal @12.8kHz for SWB BWE */
- Word16 *old_input_16k_fx, /* i : i signal @16kHz for SWB BWE */
+ Word16 *old_input_12k8_fx, /* i : i signal @12.8kHz for SWB BWE */
+ Word16 *old_input_16k_fx, /* i : i signal @16kHz for SWB BWE */
const Word16 *old_syn_12k8_16k_fx, /* i : ACELP core synthesis at 12.8kHz or 16kHz */
- const Word16 *new_swb_speech_fx, /* i : original i signal at 32kHz */
+ const Word16 *new_swb_speech_fx, /* i : original i signal at 32kHz */
Word16 *shb_speech_fx, /* i : SHB target signal (6-14kHz) at 16kHz */
const Word16 coder_type, /* i : coding type */
Word16 Q_shb_speech,
@@ -617,9 +614,9 @@ void swb_bwe_enc_fx(
void swb_bwe_enc_ivas_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 last_element_mode, /* i : last element mode */
- Word16 *old_input_12k8_fx, /* i : input signal @12.8kHz for SWB BWE */
- Word16 *old_input_16k_fx, /* i : input signal @16kHz for SWB BWE */
+ const Word16 last_element_mode, /* i : last element mode */
+ Word16 *old_input_12k8_fx, /* i : input signal @12.8kHz for SWB BWE */
+ Word16 *old_input_16k_fx, /* i : input signal @16kHz for SWB BWE */
const Word16 *old_syn_12k8_16k_fx, /* i : ACELP core synthesis at 12.8kHz or 16kHz */
const Word16 *new_swb_speech_fx, /* i : original input signal at 32kHz */
const Word16 Q_new_swb_speech, /* i : Q for new_swb_speech_fx */
@@ -635,19 +632,19 @@ void swb_CNG_enc_fx(
void swb_CNG_enc_ivas_fx(
Encoder_State *st, /* i/o: State structure */
- const Word16 *shb_speech_fx, /* i : SHB target signal (6-14kHz) at 16kHz Q0 */
+ const Word16 *shb_speech_fx, /* i : SHB target signal (6-14kHz) at 16kHz Q0 */
const Word16 *syn_12k8_16k_fx /* i : ACELP core synthesis at 12.8kHz or 16kHz Q0 */
);
void swb_pre_proc_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 *input_fx, /* i : original i signal */
- Word16 *new_swb_speech_fx, /* o : original i signal at 32kHz */
+ const Word16 *input_fx, /* i : original i signal */
+ Word16 *new_swb_speech_fx, /* o : original i signal at 32kHz */
Word16 *shb_speech_fx, /* o : SHB target signal (6-14kHz) at 16kHz */
Word16 *Q_shb_spch, /* o : shb target signal Q factor */
- Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : real buffer */
- Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : imag buffer */
- const CLDFB_SCALE_FACTOR *cldfbScale /* i : scale data of real and imag CLDFB buffers */
+ Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : real buffer */
+ Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : imag buffer */
+ const CLDFB_SCALE_FACTOR *cldfbScale /* i : scale data of real and imag CLDFB buffers*/
);
void InitSWBencBufferStates_fx(
@@ -658,19 +655,19 @@ void InitSWBencBufferStates_fx(
void swb_tbe_enc_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
const Word16 coder_type, /* i : coding type */
- Word16 *new_speech_fx, /* i : original i signal */
+ Word16 *new_speech_fx, /* i : original i signal */
Word32 *bwe_exc_extended_fx, /* i : bandwidth extended excitation */
const Word16 voice_factors_fx[], /* i : voicing factors */
Word16 *White_exc16k_fx, /* o : shaped white excitation for the FB TBE */
Word16 *Q_white_exc, /* o : generated white noise for FB Q factor */
Word16 Q_bwe_exc, /* i : bandwidth extended excitation Q factor */
- Word16 Q_shb, /* i : SHB target Q factor */
+ Word16 Q_shb, /* i : SHB target Q factor */
Word16 *voicing_fx, /* i : OL maximum normalized correlation */
const Word16 pitch_buf[] /* i : pitch for each subframe */
);
void swb_tbe_enc_ivas_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
+ Encoder_State *st_fx, /* i/o: encoder state structure */
STEREO_ICBWE_ENC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure */
Word16 *shb_speech_fx, /* i : SHB target signal (6-14kHz) at 16kHz Q_shb */
Word32 *bwe_exc_extended, /* i : bandwidth extended exciatation 2 * Q_new */
@@ -716,26 +713,26 @@ void vad_param_updt_fx(
Encoder_State *st_fx, /* i/o: state structure */
const Word16 old_pitch1, /* i : OL pitch value from last frame */
const Word16 corr_shift, /* i : correlation shift Q15*/
- const Word16 corr_shiftR, /* i : correlation shift */
+ const Word16 corr_shiftR, /* i : correlation shift */
const Word16 Az[], /* i: a coeffs Q12 */
- FRONT_VAD_ENC_HANDLE hFrontVad[], /* i/o: front-VAD handles */
- const Word16 n_channels /* i : number of channels */
+ FRONT_VAD_ENC_HANDLE hFrontVad[], /* i/o: front-VAD handles */
+ const Word16 n_channels /* i : number of channels */
);
void wb_bwe_enc_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 *new_wb_speech_fx, /* i : original i signal at 16kHz */
+ const Word16 *new_wb_speech_fx, /* i : original i signal at 16kHz */
Word16 coder_type /* i : coding type */
);
void wb_bwe_enc_ivas_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 *new_wb_speech_fx /* i : original i signal at 16kHz */
+ const Word16 *new_wb_speech_fx /* i : original i signal at 16kHz */
);
void wb_pre_proc_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 *new_inp_resamp16k, /* i : original i signal */
+ Encoder_State *st_fx, /* i/o: encoder state structure */
+ const Word16 *new_inp_resamp16k, /* i : original i signal */
Word16 *hb_speech /* o : HB target signal (6-8kHz) at 16kHz */
);
@@ -767,46 +764,46 @@ void wb_tbe_enc_ivas_fx(
);
Word16 wb_vad_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word32 fr_bands[], /* i : per band i energy (contains 2 vectors) Q_new+QSCALE*/
+ Encoder_State *st_fx, /* i/o: encoder state structure */
+ const Word32 fr_bands[], /* i : per band i energy (contains 2 vectors) Q_new+QSCALE*/
Word16 *noisy_speech_HO, /* o : SC-VBR noisy speech HO flag */
Word16 *clean_speech_HO, /* o : SC-VBR clean speech HO flag */
Word16 *NB_speech_HO, /* o : SC-VBR NB speech HO flag */
Word16 *snr_sum_he, /* o : Output snr_sum as weighted spectral measure*/
Word16 *localVAD_HE_SAD,
Word16 *flag_noisy_speech_snr, /* o : */
- const Word16 Q_new, /* i : scaling factor Q0 */
- VAD_HANDLE hVAD, /* i/o: VAD data handle */
- NOISE_EST_HANDLE hNoiseEst, /* i : Noise estimation handle */
+ const Word16 Q_new, /* i : scaling factor Q0 */
+ VAD_HANDLE hVAD, /* i/o: VAD data handle */
+ NOISE_EST_HANDLE hNoiseEst, /* i : Noise estimation handle */
Word16 lp_speech, /* i : long term active speech energy average */
Word16 lp_noise /* i : long term noise energy */
);
Word16 wb_vad_ivas_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word32 fr_bands[], /* i : per band i energy (contains 2 vectors) q_fr_bands*/
- const Word16 q_fr_bands, /* i : Q of fr_bands */
+ Encoder_State *st_fx, /* i/o: encoder state structure */
+ const Word32 fr_bands[], /* i : per band i energy (contains 2 vectors) q_fr_bands*/
+ const Word16 q_fr_bands, /* i : Q of fr_bands */
Word16 *noisy_speech_HO, /* o : SC-VBR noisy speech HO flag */
Word16 *clean_speech_HO, /* o : SC-VBR clean speech HO flag */
Word16 *NB_speech_HO, /* o : SC-VBR NB speech HO flag */
Word16 *snr_sum_he, /* o : Output snr_sum as weighted spectral measure*/
Word16 *localVAD_HE_SAD,
Word16 *flag_noisy_speech_snr, /* o : */
- VAD_HANDLE hVAD, /* i/o: VAD data handle */
- NOISE_EST_HANDLE hNoiseEst, /* i : Noise estimation handle */
+ VAD_HANDLE hVAD, /* i/o: VAD data handle */
+ NOISE_EST_HANDLE hNoiseEst, /* i : Noise estimation handle */
Word16 lp_speech, /* i : long term active speech energy average */
Word16 lp_noise /* i : long term noise energy */
);
Word32 construct_snr_thresh_fx(
- Word16 sp_center[], /*(i) spectral center Q10*/
- Word32 snr_flux, /*(i) snr flux Q25*/
- Word32 lt_snr, /*(i) long time time domain snr Q25*/
- Word32 l_snr, /*(i) long time frequency domain snr Q25*/
- Word32 continuous_speech_num, /*(i) amount of continuous speech frames Q0*/
- Word16 continuous_noise_num, /*(i) amount of continuous noise frames Q0*/
- Word32 fg_energy_est_start, /*(i) whether if estimated energy Q0*/
- Word16 bw_index /*(i) band width index Q0*/
+ Word16 sp_center[], /*(i) spectral center Q10*/
+ Word32 snr_flux, /*(i) snr flux Q25*/
+ Word32 lt_snr, /*(i) long time time domain snr Q25*/
+ Word32 l_snr, /*(i) long time frequency domain snr Q25*/
+ Word32 continuous_speech_num, /*(i) amount of continuous speech frames Q0*/
+ Word16 continuous_noise_num, /*(i) amount of continuous noise frames Q0*/
+ Word32 fg_energy_est_start, /*(i) whether if estimated energy Q0*/
+ Word16 bw_index /*(i) band width index Q0*/
);
void sc_vbr_enc_init_fx(
@@ -825,12 +822,12 @@ void attenuateNbSpectrum_fx(
/* o : pitch gain (0..GAIN_PIT_MAX) */
Word16 corr_xy1_fx(
- const Word16 xn_1[], /* i : target signal */
- const Word16 y1_1[], /* i : filtered adaptive codebook excitation */
- Word16 g_corr[], /* o : correlations and -2 */
- const Word16 L_subfr, /* i : vector length */
- const Word16 norm_flag, /* i : flag for constraining pitch contribution */
- Flag *Overflow_out /* o : propagating the Overflow flag to upper level */
+ const Word16 xn_1[], /* i : target signal */
+ const Word16 y1_1[], /* i : filtered adaptive codebook excitation */
+ Word16 g_corr[], /* o : correlations and -2 */
+ const Word16 L_subfr, /* i : vector length */
+ const Word16 norm_flag, /* i : flag for constraining pitch contribution */
+ Flag *Overflow_out /* o : propagating the Overflow flag to upper level */
);
Word16 E_ACELP_indexing_fx(
@@ -850,14 +847,14 @@ void fcb_pulse_track_joint_fx(
Word16 gain_quant_fx(
Word32 *gain, /* i/o: quantized gain */
Word16 *gain16,
- const Word16 c_min, /* i: log10 of lower limit in Q14 */
- const Word16 c_max, /* i: log10 of upper limit in Q13 */
+ const Word16 c_min, /* i: log10 of lower limit in Q14 */
+ const Word16 c_max, /* i: log10 of upper limit in Q13 */
const Word16 bits, /* i: number of bits to quantize */
Word16 *expg );
void gsc_enc_fx(
- Encoder_State *st_fx, /* i/o: State structure */
- Word16 res_dct_in[], /* i : dct of residual signal */
+ Encoder_State *st_fx, /* i/o: State structure */
+ Word16 res_dct_in[], /* i : dct of residual signal */
Word16 exc_dct_in[], /* i/o: dct of pitch-only excitation / total excitation */
const Word16 Diff_len,
const Word16 bits_used,
@@ -888,10 +885,10 @@ void LPDmem_enc_init_ivas_fx(
);
void lsf_end_enc_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- const Word16 *lsf, /* i : LSF in the frequency domain (0..6400) */
- Word16 *qlsf, /* o : quantized LSF */
- const Word16 nBits_in, /* i : number of bits to spend on ISF quantization */
+ Encoder_State *st, /* i/o: encoder state structure */
+ const Word16 *lsf, /* i : LSF in the frequency domain (0..6400) */
+ Word16 *qlsf, /* o : quantized LSF */
+ const Word16 nBits_in, /* i : number of bits to spend on ISF quantization */
const Word16 coder_type_org, /* i : coding type */
Word16 Q_ener, /* i : Q valuen for Bin_Ener */
Word16 force_sf, /* i : Force safety-net usage if coding type supports */
@@ -902,10 +899,10 @@ void lsf_end_enc_fx(
);
void lsf_end_enc_ivas_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- const Word16 *lsf, /* i : LSF in the frequency domain (0..6400) */
- Word16 *qlsf, /* o : quantized LSF */
- const Word16 nBits_in, /* i : number of bits to spend on ISF quantization */
+ Encoder_State *st, /* i/o: encoder state structure */
+ const Word16 *lsf, /* i : LSF in the frequency domain (0..6400) */
+ Word16 *qlsf, /* o : quantized LSF */
+ const Word16 nBits_in, /* i : number of bits to spend on ISF quantization */
const Word16 coder_type_org, /* i : coding type */
Word16 Q_ener, /* i : Q valuen for Bin_Ener */
Word16 force_sf, /* i : Force safety-net usage if coding type supports */
@@ -913,7 +910,7 @@ void lsf_end_enc_ivas_fx(
Word16 *no_indices,
Word16 *bits_param_lpc,
Word16 coder_type_raw, /* i : Coder type (LSF coder_type have some special cases)*/
- const Word16 tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */
+ const Word16 tdm_lsfQ_PCh[M] /* i : Q LSFs for primary channel */
);
void Mode2_abs_pit_enc_fx(
@@ -957,11 +954,12 @@ void norm_corr_ivas_fx(
Word16 peak_avrg_ratio_fx(
const Word32 total_brate, /* Q0 */
- const Word32 *input_hi_fx, /* i : i signal Q_coeff*/
+ const Word32 *input_hi_fx, /* i : i signal Q_coeff*/
const Word16 length, /* i : number of coefficients Q0*/
Word16 *mode_count, /* i/o: HQ_HARMONIC mode count Q0*/
Word16 *mode_count1, /* i/o: HQ_NORMAL mode count Q0*/
Word16 Q_coeff );
+
Word16 peak_avrg_ratio_ivas_fx(
const Word32 total_brate, /* Q0 */
const Word32 *input_hi_fx, /* i : i signal Q_coeff*/
@@ -969,6 +967,7 @@ Word16 peak_avrg_ratio_ivas_fx(
Word16 *mode_count, /* i/o: HQ_HARMONIC mode count Q0*/
Word16 *mode_count1, /* i/o: HQ_NORMAL mode count Q0*/
Word16 Q_coeff );
+
void hvq_classifier_ivas_fx(
const Word32 *input, /* i : input signal Q12 */
Word16 *prev_Npeaks, /* i/o: Peak number memory Q0 */
@@ -982,8 +981,9 @@ void hvq_classifier_ivas_fx(
Word16 *hvq_hangover, /* i/o: Mode-switch hangover Q0 */
Word32 *L_pe_gains /* o : peak gains Q12 */
);
+
void pit16k_Q_enc_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
const Word16 nBits, /* i : # of Q bits */
const Word16 limit_flag, /* i : restrained(0) or extended(1) Q limits */
const Word16 T0, /* i : integer pitch lag */
@@ -991,23 +991,23 @@ void pit16k_Q_enc_fx(
Word16 *T0_min, /* i/o: delta search min */
Word16 *T0_max /* o : delta search max */
);
-/* o : chosen integer pitch lag */
+
+/* o : chosen integer pitch lag */
Word16 pitch_fr4_fx(
- const Word16 exc[], /* i : excitation buffer Q_new*/
- const Word16 xn[], /* i : target signal Q_new-1+shift*/
- const Word16 h[], /* i : weighted synthesis filter impulse response Q(14+shift)*/
- const Word16 t0_min, /* i : minimum value in the searched range. Q0*/
- const Word16 t0_max, /* i : maximum value in the searched range. Q0*/
- Word16 *pit_frac, /* o : chosen fraction (0, 1, 2 or 3) */
- const Word16 i_subfr, /* i : flag to first subframe */
- const Word16 limit_flag, /* i : flag for limits (0=restrained, 1=extended) */
- const Word16 t0_fr2, /* i : minimum value for resolution 1/2 */
- const Word16 t0_fr1, /* i : minimum value for resolution 1 */
- const Word16 L_frame, /* i : length of the frame */
- const Word16 L_subfr /* i : size of subframe */
- ,
- const Word16 element_mode, /* i : mode element */
- const Word16 Q_new /* i : scaling factor */
+ const Word16 exc[], /* i : excitation buffer Q_new*/
+ const Word16 xn[], /* i : target signal Q_new-1+shift*/
+ const Word16 h[], /* i : weighted synthesis filter impulse response Q(14+shift)*/
+ const Word16 t0_min, /* i : minimum value in the searched range. Q0*/
+ const Word16 t0_max, /* i : maximum value in the searched range. Q0*/
+ Word16 *pit_frac, /* o : chosen fraction (0, 1, 2 or 3) */
+ const Word16 i_subfr, /* i : flag to first subframe */
+ const Word16 limit_flag, /* i : flag for limits (0=restrained, 1=extended) */
+ const Word16 t0_fr2, /* i : minimum value for resolution 1/2 */
+ const Word16 t0_fr1, /* i : minimum value for resolution 1 */
+ const Word16 L_frame, /* i : length of the frame */
+ const Word16 L_subfr, /* i : size of subframe */
+ const Word16 element_mode, /* i : mode element */
+ const Word16 Q_new /* i : scaling factor */
);
void pit_Q_enc_fx(
@@ -1059,7 +1059,7 @@ Word16 WB_BWE_encoding_ivas_fx(
void calculate_hangover_attenuation_gain_fx(
Encoder_State *st, /* i : encoder state structure */
Word16 *att, /* o : attenuation factor */
- const Word16 vad_hover_flag /* i : VAD hangover flag */
+ const Word16 vad_hover_flag /* i : VAD hangover flag */
);
/*transient_detection.h*/
@@ -1093,12 +1093,11 @@ void RunTransientDetection_fx(
const Word16 nSamplesAvailable,
TRAN_DET_HANDLE hTranDet );
-
void RunTransientDetection_ivas_fx(
- Word16 *input_fx, /* i : input signal Q: q_input */
+ Word16 *input_fx, /* i : input signal Q: q_input */
const Word16 length, /* i : frame length */
TRAN_DET_HANDLE hTranDet, /* i/o: transient detection handle */
- Word16 q_input /*i: stores q for input_fx*/
+ Word16 q_input /* i : stores q for input_fx */
);
/** Get the average temporal flatness measure using subblock energies aligned with the TCX.
@@ -1131,7 +1130,6 @@ Word16 GetTCXMaxenergyChange_fx(
const Word16 nCurrentSubblocks,
const Word16 nPrevSubblocks );
-
Word16 GetTCXMaxenergyChange_ivas_fx(
TRAN_DET_HANDLE hTranDet,
const Word8 isTCX10,
@@ -1219,24 +1217,24 @@ void HQ_core_enc_init_fx(
void AVQ_cod_lpc_fx(
Word16 *nvec, /* i : vector to quantize (normalized) */
- Word16 *nvecq, /* o : quantized vector */
- Word16 *indx, /* o : index[] (4 bits per words) */
+ Word16 *nvecq, /* o : quantized vector */
+ Word16 *indx, /* o : index[] (4 bits per words) */
Word16 Nsv /* i : number of subvectors (lg=Nsv*8) */
);
void ProcessIGF_ivas_fx(
Encoder_State *st, /* i : Encoder state */
- Word16 powerSpec_len, /* i : length of pPowerSpectrum buffer */
+ Word16 powerSpec_len, /* i : length of pPowerSpectrum buffer */
Word32 *pMDCTSpectrum, /* i : MDCT spectrum */
- Word16 *q_spectrum, /* i/o: Q of spectrum */
+ Word16 *q_spectrum, /* i/o: Q of spectrum */
const Word32 *pITFMDCTSpectrum, /* i : MDCT spectrum fir ITF */
- const Word16 q_ITFMDCTSpectrum, /* i : Q of MDCT spectrum fir ITF */
+ const Word16 q_ITFMDCTSpectrum, /* i : Q of MDCT spectrum fir ITF */
Word32 *pPowerSpectrum, /* i : MDCT^2 + MDST^2 spectrum, or estimate */
- Word16 *q_powerSpec, /* i/o: Q of power spectrum */
+ Word16 *q_powerSpec, /* i/o: Q of power spectrum */
const Word16 isTCX20, /* i : flag indicating if the input is TCX20 or TCX10/2xTCX5 */
const Word16 frameno, /* i : flag indicating index of current subframe */
- const Word16 sp_aud_decision0, /* i : first stage switching decision */
- const Word16 vad_hover_flag /* i : VAD hangover flag */
+ const Word16 sp_aud_decision0, /* i : first stage switching decision */
+ const Word16 vad_hover_flag /* i : VAD hangover flag */
);
void ProcessIGF_fx(
@@ -1253,7 +1251,7 @@ void ProcessIGF_fx(
);
void AnalyzePowerSpectrum_fx(
- Encoder_State *st, /* i/o: encoder states */
+ Encoder_State *st, /* i/o: encoder states */
Word16 L_frame, /* i : frame length */
Word16 L_frameTCX, /* i : full band frame length */
Word16 left_overlap, /* i : left overlap length */
@@ -1265,7 +1263,7 @@ void AnalyzePowerSpectrum_fx(
Word16 *powerSpec_e );
void AnalyzePowerSpectrum_ivas_fx(
- Encoder_State *st, /* i/o: encoder states */
+ Encoder_State *st, /* i/o: encoder states */
Word16 L_frame, /* i : frame length */
Word16 L_frameTCX, /* i : full band frame length */
Word16 left_overlap, /* i : left overlap length */
@@ -1290,30 +1288,33 @@ void AdaptLowFreqEmph_fx(
/* o : SQ gain */
Word16 SQ_gain_fx(
- Word32 x[], /* i : vector to quantize */
- Word16 x_e, /* i : exponent */
- Word16 nbitsSQ, /* i : number of bits targeted */
- Word16 lg, /* i : vector size (2048 max) */
- Word16 *gain_e ); /* o : SQ gain exponent */
+ Word32 x[], /* i : vector to quantize */
+ Word16 x_e, /* i : exponent */
+ Word16 nbitsSQ, /* i : number of bits targeted */
+ Word16 lg, /* i : vector size (2048 max) */
+ Word16 *gain_e /* o : SQ gain exponent */
+);
/* o : SQ gain */
Word16 SQ_gain_ivas_fx(
- Word32 x[], /* i : vector to quantize */
- Word16 x_e, /* i : exponent */
- Word16 nbitsSQ, /* i : number of bits targeted */
- Word16 lg, /* i : vector size (2048 max) */
- Word16 *gain_e ); /* o : SQ gain exponent */
+ Word32 x[], /* i : vector to quantize */
+ Word16 x_e, /* i : exponent */
+ Word16 nbitsSQ, /* i : number of bits targeted */
+ Word16 lg, /* i : vector size (2048 max) */
+ Word16 *gain_e /* o : SQ gain exponent */
+);
/* o : SQ gain */
Word16 SQ_gain_estimate_fx(
- Word32 x[], /* i : vector to quantize */
- Word16 x_e, /* i : exponent */
- Word16 nbitsSQ, /* i : number of bits targeted */
- Word16 lg, /* i : vector size (2048 max) */
- Word16 *gain_e ); /* o : SQ gain exponent */
+ Word32 x[], /* i : vector to quantize */
+ Word16 x_e, /* i : exponent */
+ Word16 nbitsSQ, /* i : number of bits targeted */
+ Word16 lg, /* i : vector size (2048 max) */
+ Word16 *gain_e /* o : SQ gain exponent */
+);
void tcx_scalar_quantization_fx(
- Word32 *x, /* i: i coefficients */
+ Word32 *x, /* i: i coefficients */
Word16 x_e, /* i: exponent */
Word16 *xq, /* o: quantized coefficients */
Word16 L_frame, /* i: frame length */
@@ -1324,7 +1325,7 @@ void tcx_scalar_quantization_fx(
const Word16 alfe_flag );
Word16 tcx_scalar_quantization_rateloop_fx(
- Word32 *x, /* i : i coefficients */
+ Word32 *x, /* i : i coefficients */
Word16 x_e, /* i : exponent */
Word16 *xq, /* o : quantized coefficients */
Word16 L_frame, /* i : frame length */
@@ -1396,29 +1397,30 @@ void tcx_noise_factor_ivas_fx(
);
void tcx_encoder_memory_update_ivas_fx(
- Word16 *wsig, /* i : target weighted signal, Q_new */
- Word16 *xn_buf, /* i/o: mdct output buffer/time domain weigthed synthesis, Q_new */
- Word16 L_frame_glob, /* i: global frame length */
- const Word16 *Ai, /* i: Unquantized (interpolated) LPC coefficients, Q12 */
- const Word16 *A, /* i: Quantized LPC coefficients, Q = 14 - norm_s(A[0]) */
- Word16 preemph, /* i: preemphasis factor, Q15 */
- LPD_state *LPDmem, /* i/o: coder memory state */
+ Word16 *wsig, /* i : target weighted signal, Q_new */
+ Word16 *xn_buf, /* i/o: mdct output buffer/time domain weigthed synthesis, Q_new */
+ Word16 L_frame_glob, /* i : global frame length */
+ const Word16 *Ai, /* i : Unquantized (interpolated) LPC coefficients, Q12 */
+ const Word16 *A, /* i : Quantized LPC coefficients, Q = 14 - norm_s(A[0]) */
+ Word16 preemph, /* i : preemphasis factor, Q15 */
+ LPD_state *LPDmem, /* i/o: coder memory state */
Encoder_State *st,
Word16 *synthout, /* Q_new */
Word16 Q_new );
void tcx_encoder_memory_update_fx(
- Word16 *wsig, /* i: targert weighted signal */
+ Word16 *wsig, /* i: targert weighted signal */
Word16 *xn_buf, /* i/o: mdct output buffer/TD weigthed synthesis */
Word16 L_frame_glob, /* i: global frame length */
const Word16 *Ai, /* i: Unquantized (interpolated) LPC coefficients */
const Word16 *A, /* i: Quantized LPC coefficients */
- Word16 preemph, /* i: preemphasis factor*/
+ Word16 preemph, /* i: preemphasis factor */
LPD_state *LPDmem, /* i/o: coder memory state */
Encoder_State *st,
Word16 *synthout, /* o: synthesis signal */
Word16 Q_new,
Word16 shift );
+
Word16 tcx_ari_res_Q_spec_fx(
const Word32 x_orig[], /* i: original spectrum Q31-e */
Word16 x_orig_e, /* i: original spectrum exponent Q0 */
@@ -1558,6 +1560,7 @@ void Mode2_pit_encode_fx(
Word16 pit_fr2,
Word16 pit_max,
Word16 pit_res_max );
+
void E_ACELP_4tsearch_fx(
Word16 dn[] /*Qdn*/,
const Word16 cn[] /*Q_xn*/,
@@ -1567,6 +1570,7 @@ void E_ACELP_4tsearch_fx(
Word16 ind[] /*Q0*/,
Word16 y[] /*Qy*/,
const Word16 element_mode );
+
void E_ACELP_4t_fx(
Word16 dn[], /* Qdn */
Word16 cn[] /* Q_xn */,
@@ -1585,13 +1589,13 @@ void E_ACELP_4t_fx(
);
void E_ACELP_innovative_codebook_fx(
- Word16 *exc, /* i : pointer to the excitation frame Q_new */
+ Word16 *exc, /* i : pointer to the excitation frame Q_new */
Word16 T0, /* i : integer pitch lag Q0 */
Word16 T0_frac, /* i : fraction of lag Q0 */
Word16 T0_res, /* i : pitch resolution Q0 */
Word16 pitch_gain, /* i : adaptive codebook gain 1Q14 */
Word16 tilt_code, /* i : tilt factor Q15 */
- ACELP_config *acelp_cfg, /* i/o: configuration of the ACELP */
+ ACELP_config *acelp_cfg, /* i/o: configuration of the ACELP */
Word16 i_subfr, /* i : subframe index */
const Word16 *Aq, /* i : quantized LPC coefficients 3Q12 */
Word16 *h1, /* i : impulse response of weighted synthesis filter 1Q14+shift */
@@ -1610,55 +1614,27 @@ void E_ACELP_innovative_codebook_fx(
void CalculateTnsFilt_fx(
STnsConfig const *pTnsConfig, /* i : TNS Configuration struct */
- const Word32 pSpectrum[], /* i : MDCT spectrum Qx*/
+ const Word32 pSpectrum[], /* i : MDCT spectrum Qx*/
const Word16 pSpectrum_e,
STnsData *pTnsData /* o : TNS data struct */
);
-/** Detect TNS parameters.
- * Detects if TNS should be used and fills TNS data in pTnsData.
- * @param pTnsConfig TNS configuration.
- * @param pSpectrum Spectrum lines.
- TNS is tested on the spectrum defined by pSpectrum.
- * @param sbCnt Number of active subbands.
- * @param pTnsData TNS data is filled with sensible information.
- * @return Returns 1 if Tns should be used, otherwise 0.
- */
Word16 DetectTnsFilt_fx(
STnsConfig const *pTnsConfig,
Word32 const pSpectrum[],
STnsData *pTnsData,
Word16 *predictionGain );
-/** Detect TNS parameters.
-* Detects if TNS should be used and fills TNS data in pTnsData.
-* @param pTnsConfig TNS configuration.
-* @param pSpectrum Spectrum lines.
-TNS is tested on the spectrum defined by pSpectrum.
-* @param sbCnt Number of active subbands.
-* @param pTnsData TNS data is filled with sensible information.
-* @return Returns 1 if Tns should be used, otherwise 0.
-*/
Word16 DetectTnsFilt_ivas_fx(
- STnsConfig const *pTnsConfig, /* i : TNS Configuration struct */
- Word32 const pSpectrum[], /* i : MDCT spectrum Q=Qx */
- STnsData *pTnsData, /* o : TNS data struct */
- TRAN_DET_HANDLE hTranDet, /* i : transient detection handle */
- Word8 isTCX10, /* i : TCX10 or TCX20? */
- Word16 ltp_gain, /* i : LTP gain Q=15 */
- Word16 *predictionGain /* o : TNS prediction gain Q=7 */
-);
-
-
-/** Write TNS data into a stream of integers.
- * Writes TNS data into a stream of integers.
- * @param pTnsConfig TNS configuration.
- * @param pTnsData TNS data to be written to a bitstream.
- * @param stream Output stream of integers.
- * @param pnSize Set to the number of elements written to the stream.
- * @param pnBits Set to the number of required.
- * @return 0 on success, otherwise 1.
- */
+ STnsConfig const *pTnsConfig, /* i : TNS Configuration struct */
+ Word32 const pSpectrum[], /* i : MDCT spectrum Q=Qx */
+ STnsData *pTnsData, /* o : TNS data struct */
+ TRAN_DET_HANDLE hTranDet, /* i : transient detection handle */
+ Word8 isTCX10, /* i : TCX10 or TCX20? */
+ Word16 ltp_gain, /* i : LTP gain Q=15 */
+ Word16 *predictionGain /* o : TNS prediction gain Q=7 */
+);
+
Word16 EncodeTnsData_fx(
STnsConfig const *pTnsConfig,
STnsData const *pTnsData,
@@ -1666,15 +1642,6 @@ Word16 EncodeTnsData_fx(
Word16 *pnSize,
Word16 *pnBits );
-/** Write TNS data into a bitstream.
- * Writes TNS data into a bitstream.
- * @param pTnsConfig TNS configuration.
- * @param stream Contains TNS data written with EncodeTnsData.
- * @param pnSize Set to the number of used elements from stream.
- * @param st Encoder state.
- * @param pnBits Set to the number of bits written.
- * @return 0 on success, otherwise 1.
- */
Word16 WriteTnsData_fx(
STnsConfig const *pTnsConfig,
Word16 const *stream,
@@ -1696,6 +1663,7 @@ void subband_FFT_fx(
Word32 Offset, /*(i) offset of the CLDFB*/
Word16 *fftoQ /*(o) the Scaling */
);
+
Word16 E_ACELP_toeplitz_mul_fx(
const Word16 R[], /* Q9 */
const Word16 c[], /* Qx */
@@ -1732,7 +1700,7 @@ Word16 gain_enc_uv_fx(
Word16 mean_ener, /*, -2,, -2 and 2 Qx*/
- const Word16 clip_gain /* i : gain pitch clipping flag (1 = clipping) Q0*/
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ const Word16 gains_mode[], /* i : gain bits Q0*/
+ const Word16 element_mode, /* i : element mode Q0*/
+ const Word16 L_frame, /* i : length of the frame Q0*/
+ const Word16 i_subfr, /* i : subframe index Q0*/
+ const Word16 tc_subfr, /* i : TC subframe index Q0*/
+ const Word16 *xn, /* i : target vector Q_xn*/
+ const Word16 *y1, /* i : zero-memory filtered adaptive excitation Q_xn*/
+ const Word16 Q_xn, /* i : xn and y1 scaling */
+ const Word16 *y2, /* i : zero-memory filtered algebraic codebook excitation Q9*/
+ const Word16 *code, /* i : algebraic excitation Q9*/
+ const Word16 Es_pred, /* i : predicted scaled innovation energy Q8*/
+ Word16 *gain_pit, /* o : quantized pitch gain Q14*/
+ Word32 *gain_code, /* o : quantized codebook gain Q16*/
+ Word16 *gain_inov, /* o : gain of the innovation (used for normalization) Q12*/
+ Word32 *norm_gain_code, /* o : norm. gain of the codebook excitation Q16*/
+ Word16 *g_corr, /* i/o: correlations , -2,, -2 and 2 Qx*/
+ const Word16 clip_gain /* i : gain pitch clipping flag (1 = clipping) Q0*/
);
+
void updt_IO_switch_enc_fx(
- Encoder_State *st, /* i/o: state structure */
+ Encoder_State *st, /* i/o: state structure */
const Word16 input_frame /* i : i frame length */
);
@@ -3630,31 +3594,31 @@ void hf_cod_init_fx(
);
void analy_lp_AMR_WB_fx(
- const Word16 speech[], /* i : pointer to the speech frame Q_new*/
- Word32 *ener, /* o : residual energy from Levinson-Durbin Q_r*/
- Word16 A[], /* o : A(z) filter coefficients Q14*/
- Word16 epsP_h[], /* o : LP analysis residual energies for each iteration Q_r*/
- Word16 epsP_l[], /* o : LP analysis residual energies for each iteration Q_r*/
- Word16 isp_new[], /* o : current frame ISPs Q15*/
- Word16 isp_old[], /* i/o: previous frame unquantized ISPs Q15*/
- Word16 isf_new[], /* o : current frame ISPs Q15*/
- Word16 Top, /* i : open loop pitch lag Q0*/
- Word16 Tnc, /* i : open loop pitch gain Qx*/
+ const Word16 speech[], /* i : pointer to the speech frame Q_new*/
+ Word32 *ener, /* o : residual energy from Levinson-Durbin Q_r*/
+ Word16 A[], /* o : A(z) filter coefficients Q14*/
+ Word16 epsP_h[], /* o : LP analysis residual energies for each iteration Q_r*/
+ Word16 epsP_l[], /* o : LP analysis residual energies for each iteration Q_r*/
+ Word16 isp_new[], /* o : current frame ISPs Q15*/
+ Word16 isp_old[], /* i/o: previous frame unquantized ISPs Q15*/
+ Word16 isf_new[], /* o : current frame ISPs Q15*/
+ Word16 Top, /* i : open loop pitch lag Q0*/
+ Word16 Tnc, /* i : open loop pitch gain Qx*/
Word16 Q_new,
Word16 *Q_r );
void encod_amr_wb_fx(
- Encoder_State *st, /* i/o: state structure */
- const Word16 speech[], /* i : i speech Q_new-1*/
- const Word16 Aw[], /* i : weighted A(z) unquantized for subframes Q12*/
- const Word16 Aq[], /* i : 12k8 Lp coefficient Q12*/
- const Word16 *res, /* i : residual signal Q_new*/
- Word16 *syn, /* i/o: core synthesis st->Q_syn*/
- Word16 *exc, /* i/o: current non-enhanced excitation Q_new*/
- Word16 *exc2, /* i/o: current enhanced excitation Q_new*/
- Word16 *pitch_buf, /* i/o: floating pitch values for each subframe Q6*/
- Word16 hf_gain_fx[NB_SUBFR], /* o : decoded HF gain Q0*/
- const Word16 *speech16k_fx, /* i : i speech @16kHz Qx*/
+ Encoder_State *st, /* i/o: state structure */
+ const Word16 speech[], /* i : i speech Q_new-1*/
+ const Word16 Aw[], /* i : weighted A(z) unquantized for subframes Q12*/
+ const Word16 Aq[], /* i : 12k8 Lp coefficient Q12*/
+ const Word16 *res, /* i : residual signal Q_new*/
+ Word16 *syn, /* i/o: core synthesis st->Q_syn*/
+ Word16 *exc, /* i/o: current non-enhanced excitation Q_new*/
+ Word16 *exc2, /* i/o: current enhanced excitation Q_new*/
+ Word16 *pitch_buf, /* i/o: floating pitch values for each subframe Q6*/
+ Word16 hf_gain_fx[NB_SUBFR], /* o : decoded HF gain Q0*/
+ const Word16 *speech16k_fx, /* i : i speech @16kHz Qx*/
Word16 shift,
Word16 Q_new );
@@ -3671,36 +3635,36 @@ void TBEreset_enc_fx(
);
void acelp_core_switch_enc_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 inp12k8[], /* i : i signal @12.8 kHz Q0 */
- const Word16 inp16k[], /* i : i signal @16 kHz Q0 */
- const Word16 A[NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes Q12*/
+ Encoder_State *st_fx, /* i/o: encoder state structure */
+ const Word16 inp12k8[], /* i : i signal @12.8 kHz Q0 */
+ const Word16 inp16k[], /* i : i signal @16 kHz Q0 */
+ const Word16 A[NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes Q12 */
Word16 shift,
Word16 Q_new );
void acelp_core_switch_enc_ivas_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 inp12k8[], /* i : i signal @12.8 kHz Q0 */
- const Word16 inp16k[], /* i : i signal @16 kHz Q0 */
- const Word16 A[NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes Q12*/
+ Encoder_State *st_fx, /* i/o: encoder state structure */
+ const Word16 inp12k8[], /* i : i signal @12.8 kHz Q0 */
+ const Word16 inp16k[], /* i : i signal @16 kHz Q0 */
+ const Word16 A[NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes Q12 */
Word16 shift,
Word16 Q_new );
void gain_enc_amr_wb_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- const Word16 *xn, /* i : target vector Q_xn*/
- const Word16 Q_xn, /* i : xn and yy1 format */
- const Word16 *yy1, /* i : zero-memory filtered adaptive excitation Q_xn*/
- const Word16 *y2, /* i : zero-memory filtered algebraic codebook excitation Q9*/
- const Word16 *code, /* i : algebraic excitation Q9*/
- const Word32 core_brate, /* i : core bitrate Q0*/
- Word16 *gain_pit, /* i/o: pitch gain / Quantized pitch gain Q14*/
- Word32 *gain_code, /* o : quantized codebook gain Q16*/
- Word16 *gain_inov, /* o : gain of the innovation (used for normalization) Q12*/
- Word32 *norm_gain_code, /* o : norm. gain of the codebook excitation Q16*/
- Word16 *g_coeff, /* i/o: correlations , -2,, -2 and 2 Qx*/
- const Word16 clip_gain, /* i : gain pitch clipping flag (1 = clipping) Q0*/
- Word16 *past_qua_en /* i/o: gain quantization memory (4 words) Q10*/
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ const Word16 *xn, /* i : target vector Q_xn*/
+ const Word16 Q_xn, /* i : xn and yy1 format */
+ const Word16 *yy1, /* i : zero-memory filtered adaptive excitation Q_xn*/
+ const Word16 *y2, /* i : zero-memory filtered algebraic codebook excitation Q9*/
+ const Word16 *code, /* i : algebraic excitation Q9*/
+ const Word32 core_brate, /* i : core bitrate Q0*/
+ Word16 *gain_pit, /* i/o: pitch gain / Quantized pitch gain Q14*/
+ Word32 *gain_code, /* o : quantized codebook gain Q16*/
+ Word16 *gain_inov, /* o : gain of the innovation (used for normalization) Q12*/
+ Word32 *norm_gain_code, /* o : norm. gain of the codebook excitation Q16*/
+ Word16 *g_coeff, /* i/o: correlations , -2,, -2 and 2 Qx*/
+ const Word16 clip_gain, /* i : gain pitch clipping flag (1 = clipping) Q0*/
+ Word16 *past_qua_en /* i/o: gain quantization memory (4 words) Q10*/
);
void hf_cod_fx(
@@ -3771,13 +3735,13 @@ void transf_cdbk_enc_ivas_fx(
);
void gain_enc_lbr_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
const Word16 gains_mode[], /* i : gain bits Q0*/
const Word16 coder_type, /* i : coding type Q0*/
const Word16 i_subfr, /* i : subframe index Q0*/
const Word16 *xn, /* i : target vector Q_xn*/
const Word16 *y1, /* i : zero-memory filtered adaptive excitation Q_xn*/
- const Word16 Q_xn, /* i : xn and y1 format */
+ const Word16 Q_xn, /* i : xn and y1 format */
const Word16 *y2, /* i : zero-memory filtered algebraic codebook excitation Q9*/
const Word16 *code, /* i : algebraic excitation Q9*/
Word16 *gain_pit, /* o : quantized pitch gain Q14*/
@@ -3787,28 +3751,29 @@ void gain_enc_lbr_fx(
Word16 *g_corr, /* i/o: correlations , -2,, -2 and 2 mant/exp*/
Word32 gc_mem[], /* i/o: gain_code from previous subframes Q16*/
Word16 gp_mem[], /* i/o: gain_pitch from previous subframes Q14*/
- const Word16 clip_gain, /* i : gain pitch clipping flag (1 = clipping) Q0*/
- const Word16 L_subfr /* i : subframe length Q0*/
- ,
- const Word16 element_mode /* i : mode element Q0*/
+ const Word16 clip_gain, /* i : gain pitch clipping flag (1 = clipping) Q0*/
+ const Word16 L_subfr, /* i : subframe length Q0*/
+ const Word16 element_mode /* i : mode element Q0*/
);
+
void gain_enc_SQ_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- const Word16 gains_mode[], /* i : gain bits Q0*/
- const Word16 i_subfr, /* i : subframe index Q0*/
- const Word16 *xn, /* i : target vector Q_xn*/
- const Word16 *yy1, /* i : zero-memory filtered adaptive excitation Q_xn*/
- const Word16 *y2, /* i : zero-memory filtered algebraic codebook excitation Q9*/
- const Word16 *code, /* i : algebraic excitation Q9*/
- const Word16 Es_pred, /* i : predicted scaled innovation energy Q8*/
- Word16 *gain_pit, /* o : quantized pitch gain Q14*/
- Word32 *gain_code, /* o : quantized codebook gain Q16*/
- Word16 *gain_inov, /* o : gain of the innovation (used for normalization) Q12*/
- Word32 *norm_gain_code, /* o : norm. gain of the codebook excitation Q16*/
- Word16 *g_corr, /* i/o: correlations , ,, -2 and 2 Qx*/
- const Word16 clip_gain, /* i : gain pitch clipping flag (1 = clipping) Q0*/
- const Word16 Q_xn /* i : xn and y1 scaling */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ const Word16 gains_mode[], /* i : gain bits Q0*/
+ const Word16 i_subfr, /* i : subframe index Q0*/
+ const Word16 *xn, /* i : target vector Q_xn*/
+ const Word16 *yy1, /* i : zero-memory filtered adaptive excitation Q_xn*/
+ const Word16 *y2, /* i : zero-memory filtered algebraic codebook excitation Q9*/
+ const Word16 *code, /* i : algebraic excitation Q9*/
+ const Word16 Es_pred, /* i : predicted scaled innovation energy Q8*/
+ Word16 *gain_pit, /* o : quantized pitch gain Q14*/
+ Word32 *gain_code, /* o : quantized codebook gain Q16*/
+ Word16 *gain_inov, /* o : gain of the innovation (used for normalization) Q12*/
+ Word32 *norm_gain_code, /* o : norm. gain of the codebook excitation Q16*/
+ Word16 *g_corr, /* i/o: correlations , ,, -2 and 2 Qx*/
+ const Word16 clip_gain, /* i : gain pitch clipping flag (1 = clipping) Q0*/
+ const Word16 Q_xn /* i : xn and y1 scaling */
);
+
void updt_tar_fx(
const Word16 *x, /* i : old target (for pitch search) */
Word16 *x2, /* o : new target (for codebook search) */
@@ -3816,20 +3781,21 @@ void updt_tar_fx(
const Word16 gain, /* i : adaptive codebook gain */
const Word16 L /* i : subframe size */
);
+
void updt_tar_HR_fx(
- const Word16 *x, /* i : old target (for pitch search) */
- Word16 *x2, /* o : new target (for codebook search) */
- const Word16 *y, /* i : filtered adaptive codebook vector */
- const Word16 gain, /* i : adaptive codebook gain */
- const Word16 Qx, /* i : Scaling factor to adapt output to i */
- const Word16 L /* i : subframe size */
+ const Word16 *x, /* i : old target (for pitch search) */
+ Word16 *x2, /* o : new target (for codebook search) */
+ const Word16 *y, /* i : filtered adaptive codebook vector */
+ const Word16 gain, /* i : adaptive codebook gain */
+ const Word16 Qx, /* i : Scaling factor to adapt output to i */
+ const Word16 L /* i : subframe size */
);
Flag conv_fx(
- const Word16 x[], /* i : i vector Q_new*/
- const Word16 h[], /* i : impulse response (or second i vector) Q(15)*/
- Word16 y[], /* o : output vetor (result of convolution) 12 bits*/
- const Word16 L /* i : vector size */
+ const Word16 x[], /* i : i vector Q_new*/
+ const Word16 h[], /* i : impulse response (or second i vector) Q(15)*/
+ Word16 y[], /* o : output vetor (result of convolution) 12 bits*/
+ const Word16 L /* i : vector size */
);
ivas_error ppp_voiced_encoder_fx(
@@ -3838,13 +3804,13 @@ ivas_error ppp_voiced_encoder_fx(
const Word16 bwidth, /* i : audio bandwidth */
const Word16 last_coder_type_raw, /* i : raw last_coder_type */
const Word16 old_pitch_buf[], /* i : buffer of old subframe pitch values */
- Word16 *in_fx, /* i : residual signal */
- Word16 *out_fx, /* o : Quantized residual signal */
- Word16 delay_fx, /* i : open loop pitch */
- Word16 *lpc1_fx, /* i : prev frame de-emphasized LPC */
- Word16 *lpc2_fx, /* i : current frame de-emphasized LPC */
- Word16 *exc_fx, /* i: previous frame quantized excitation */
- Word16 *pitch_fx, /* o: floating pitch values for each subframe */
+ Word16 *in_fx, /* i : residual signal */
+ Word16 *out_fx, /* o : Quantized residual signal */
+ Word16 delay_fx, /* i : open loop pitch */
+ Word16 *lpc1_fx, /* i : prev frame de-emphasized LPC */
+ Word16 *lpc2_fx, /* i : current frame de-emphasized LPC */
+ Word16 *exc_fx, /* i: previous frame quantized excitation */
+ Word16 *pitch_fx, /* o: floating pitch values for each subframe */
Word16 Qres );
void signalling_enc_fx(
@@ -3852,7 +3818,7 @@ void signalling_enc_fx(
);
void transition_enc_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
+ Encoder_State *st_fx, /* i/o: encoder state structure */
const Word16 i_subfr, /* i : subframe index */
Word16 *tc_subfr, /* i/o: TC subframe index */
Word16 *Jopt_flag, /* i : joint optimization flag */
@@ -3863,7 +3829,7 @@ void transition_enc_fx(
Word16 *T0_max, /* i/o: higher limit for close-loop search Q0*/
Word16 *exc_fx, /* i/o: pointer to excitation signal frame Q_new*/
Word16 *y1_fx, /* o : zero-memory filtered adaptive excitation Q_new-1+shift*/
- const Word16 *h1_fx, /* i : weighted filter i response Q(14+shift)*/
+ const Word16 *h1_fx, /* i : weighted filter i response Q(14+shift)*/
const Word16 *xn_fx, /* i : target vector Q_new-1+shift*/
Word16 *xn2_fx, /* o : target vector for innovation search Q_new-1+shift*/
Word16 *gp_cl_fx, /* i/o: memory of gain of pitch clipping algorithm */
@@ -3873,13 +3839,12 @@ void transition_enc_fx(
Word16 **pt_pitch_fx, /* o : floating pitch values */
Word16 *bwe_exc_fx, /* o : excitation for SWB TBE Q_new*/
Word16 *unbits_ACELP, /* i/o: unused bits */
- Word16 Q_new, /* i : Current scaling */
- Word16 shift /* i : downscaling needs for 12 bits convolutions */
-
+ Word16 Q_new, /* i : Current scaling */
+ Word16 shift /* i : downscaling needs for 12 bits convolutions */
);
void transition_enc_ivas_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
+ Encoder_State *st_fx, /* i/o: encoder state structure */
const Word16 i_subfr, /* i : subframe index */
Word16 *tc_subfr, /* i/o: TC subframe index */
Word16 *Jopt_flag, /* i : joint optimization flag */
@@ -3900,13 +3865,12 @@ void transition_enc_ivas_fx(
Word16 **pt_pitch_fx, /* o : floating pitch values */
Word16 *bwe_exc_fx, /* o : excitation for SWB TBE Q_new*/
Word16 *unbits_ACELP, /* i/o: unused bits */
- Word16 Q_new, /* i : Current scaling */
- Word16 shift /* i : downscaling needs for 12 bits convolutions */
-
+ Word16 Q_new, /* i : Current scaling */
+ Word16 shift /* i : downscaling needs for 12 bits convolutions */
);
void gain_enc_tc_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
const Word16 gains_mode[], /* i : gain bits Q0*/
const Word16 i_subfr, /* i : subframe index Q0*/
const Word16 xn_fx[], /* i : target vector Q_xn*/
@@ -3917,69 +3881,69 @@ void gain_enc_tc_fx(
Word32 *gain_code_fx, /* o : quantized codebook gain Q16*/
Word16 *gain_inov_fx, /* o : innovation gain Q12*/
Word32 *norm_gain_code_fx, /* o : norm. gain of the codebook excitation Q16*/
- const Word16 Q_xn /* i : xn and y1 scaling */
+ const Word16 Q_xn /* i : xn and y1 scaling */
);
void gain_enc_tc_ivas_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- const Word16 gains_mode[], /* i : gain bits Q0*/
- const Word16 i_subfr, /* i : subframe index Q0*/
- const Word16 xn_fx[], /* i : target vector Q_xn*/
- const Word16 y2_fx[], /* i : zero-memory filtered algebraic codebook excitation Q_xn*/
- const Word16 code_fx[], /* i : algebraic excitation Q9*/
- const Word16 Es_pred_fx, /* i : predicted scaled innovation energy Q8*/
- Word16 *gain_pit_fx, /* o : Pitch gain / Quantized pitch gain Q14*/
- Word32 *gain_code_fx, /* o : quantized codebook gain Q16*/
- Word16 *gain_inov_fx, /* o : innovation gain Q12*/
- Word32 *norm_gain_code_fx, /* o : norm. gain of the codebook excitation Q6*/
- const Word16 Q_xn /* i : xn and y1 scaling */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ const Word16 gains_mode[], /* i : gain bits Q0*/
+ const Word16 i_subfr, /* i : subframe index Q0*/
+ const Word16 xn_fx[], /* i : target vector Q_xn*/
+ const Word16 y2_fx[], /* i : zero-memory filtered algebraic codebook excitation Q_xn*/
+ const Word16 code_fx[], /* i : algebraic excitation Q9*/
+ const Word16 Es_pred_fx, /* i : predicted scaled innovation energy Q8*/
+ Word16 *gain_pit_fx, /* o : Pitch gain / Quantized pitch gain Q14*/
+ Word32 *gain_code_fx, /* o : quantized codebook gain Q16*/
+ Word16 *gain_inov_fx, /* o : innovation gain Q12*/
+ Word32 *norm_gain_code_fx, /* o : norm. gain of the codebook excitation Q6*/
+ const Word16 Q_xn /* i : xn and y1 scaling */
);
Word16 gaus_encode_fx(
- Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 i_subfr, /* i : subframe index Q0*/
- const Word16 *h1, /* i : weighted filter input response Q14*/
- const Word16 *xn, /* i : target vector Q12*/
- Word16 *exc, /* o : pointer to excitation signal frame Q_new*/
- Word16 *mem_w0, /* o : weighting filter denominator memory Q_new*/
- Word16 *clip_gain, /* o : memory of gain of pitch clipping algorithm [2.56x,Q14,Q8,Q0,Q14,Q14]*/
- Word16 *tilt_code, /* o : synthesis excitation spectrum tilt Q15*/
- Word16 *code, /* o : algebraic excitation Q9*/
- Word32 *gain_code, /* o : Code gain. Q16*/
- Word16 *y2, /* o : zero-memory filtered adaptive excitation Q9*/
- Word16 *gain_inov, /* o : innovation gain Q12*/
- Word16 *voice_fac, /* o : voicing factor Q15*/
- Word16 *gain_pit, /* o : adaptive excitation gain Q14*/
- const Word16 Q_new, /* i : scaling factor */
- const Word16 shift, /* i : scaling factor */
- Word32 *norm_gain_code /* o : normalized innovative cb. gain Q16*/
+ Encoder_State *st_fx, /* i/o: encoder state structure */
+ const Word16 i_subfr, /* i : subframe index Q0*/
+ const Word16 *h1, /* i : weighted filter input response Q14*/
+ const Word16 *xn, /* i : target vector Q12*/
+ Word16 *exc, /* o : pointer to excitation signal frame Q_new*/
+ Word16 *mem_w0, /* o : weighting filter denominator memory Q_new*/
+ Word16 *clip_gain, /* o : memory of gain of pitch clipping algorithm [2.56x,Q14,Q8,Q0,Q14,Q14]*/
+ Word16 *tilt_code, /* o : synthesis excitation spectrum tilt Q15*/
+ Word16 *code, /* o : algebraic excitation Q9*/
+ Word32 *gain_code, /* o : Code gain. Q16*/
+ Word16 *y2, /* o : zero-memory filtered adaptive excitation Q9*/
+ Word16 *gain_inov, /* o : innovation gain Q12*/
+ Word16 *voice_fac, /* o : voicing factor Q15*/
+ Word16 *gain_pit, /* o : adaptive excitation gain Q14*/
+ const Word16 Q_new, /* i : scaling factor */
+ const Word16 shift, /* i : scaling factor */
+ Word32 *norm_gain_code /* o : normalized innovative cb. gain Q16*/
);
Word16 gaus_encode_ivas_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
- const Word16 i_subfr, /* i : subframe index Q0*/
- const Word16 *h1, /* i : weighted filter input response Q14*/
- const Word16 *xn, /* i : target vector Q12*/
- Word16 *exc, /* o : pointer to excitation signal frame Q_new*/
- Word16 *mem_w0, /* o : weighting filter denominator memory Q_new*/
- Word16 *clip_gain, /* o : memory of gain of pitch clipping algorithm [2.56x,Q14,Q8,Q0,Q14,Q14]*/
- Word16 *tilt_code, /* o : synthesis excitation spectrum tilt Q15*/
- Word16 *code, /* o : algebraic excitation Q9*/
- Word32 *gain_code, /* o : Code gain. Q16*/
- Word16 *y2, /* o : zero-memory filtered adaptive excitation Q9*/
- Word16 *gain_inov, /* o : innovation gain Q12*/
- Word16 *voice_fac, /* o : voicing factor Q15*/
- Word16 *gain_pit, /* o : adaptive excitation gain Q14*/
- const Word16 Q_new, /* i : scaling factor */
- const Word16 shift, /* i : scaling factor */
- Word32 *norm_gain_code /* o : normalized innovative cb. gain Q16*/
+ const Word16 i_subfr, /* i : subframe index Q0*/
+ const Word16 *h1, /* i : weighted filter input response Q14*/
+ const Word16 *xn, /* i : target vector Q12*/
+ Word16 *exc, /* o : pointer to excitation signal frame Q_new*/
+ Word16 *mem_w0, /* o : weighting filter denominator memory Q_new*/
+ Word16 *clip_gain, /* o : memory of gain of pitch clipping algorithm [2.56x,Q14,Q8,Q0,Q14,Q14]*/
+ Word16 *tilt_code, /* o : synthesis excitation spectrum tilt Q15*/
+ Word16 *code, /* o : algebraic excitation Q9*/
+ Word32 *gain_code, /* o : Code gain. Q16*/
+ Word16 *y2, /* o : zero-memory filtered adaptive excitation Q9*/
+ Word16 *gain_inov, /* o : innovation gain Q12*/
+ Word16 *voice_fac, /* o : voicing factor Q15*/
+ Word16 *gain_pit, /* o : adaptive excitation gain Q14*/
+ const Word16 Q_new, /* i : scaling factor */
+ const Word16 shift, /* i : scaling factor */
+ Word32 *norm_gain_code /* o : normalized innovative cb. gain Q16*/
);
void pre_proc_fx(
Encoder_State *st, /* i/o: encoder state structure */
const Word16 input_frame, /* i : frame length */
- Word16 old_inp_12k8[], /* i/o: buffer of old i signal */
- Word16 old_inp_16k[], /* i/o: buffer of old i signal @ 16kHz */
+ Word16 old_inp_12k8[], /* i/o: buffer of old i signal */
+ Word16 old_inp_16k[], /* i/o: buffer of old i signal @ 16kHz */
Word16 **inp, /* o : ptr. to inp. signal in the current frame */
Word32 fr_bands[2 * NB_BANDS], /* o : energy in frequency bands */
Word16 *Etot, /* o : total energy */
@@ -3995,33 +3959,35 @@ void pre_proc_fx(
Word16 lsp_new[M], /* o : LSPs at the end of the frame */
Word16 lsp_mid[M], /* o : LSPs in the middle of the frame */
Word16 *vad_hover_flag,
- Word16 *attack_flag, /* o : flag signalling attack encoded by AC mode (GSC) */
+ Word16 *attack_flag, /* o : flag signalling attack encoded by AC mode (GSC) */
Word16 *new_inp_resamp16k, /* o : new i signal @16kHz, non pre-emphasised, used by the WB TBE/BWE */
- Word16 *Voicing_flag, /* o : voicing flag for HQ FEC */
- Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o : cldfb real buffer */
- Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o : cldfb imag buffer */
- CLDFB_SCALE_FACTOR *cldfbScale, /* o : cldfb scale */
- Word16 *old_exc, /* i/o: static excitation memory */
- Word16 *hq_core_type, /* o : HQ core type */
+ Word16 *Voicing_flag, /* o : voicing flag for HQ FEC */
+ Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o : cldfb real buffer */
+ Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o : cldfb imag buffer */
+ CLDFB_SCALE_FACTOR *cldfbScale, /* o : cldfb scale */
+ Word16 *old_exc, /* i/o: static excitation memory */
+ Word16 *hq_core_type, /* o : HQ core type */
Word16 *Q_new,
Word16 *shift,
Word16 *Q_r );
void swb_bwe_enc_hr_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
- Word16 *new_input_fx, /* i : i signal */
- Word16 new_input_fx_exp, /* i : Exponent of i signal */
+ Word16 *new_input_fx, /* i : i signal */
+ Word16 new_input_fx_exp, /* i : Exponent of i signal */
const Word16 input_frame, /* i : frame length */
const Word16 unbits /* i : number of core unused bits */
);
-Word16 gain_enc_gaus_fx( /* o : Return index of quantization */
- Word32 *gain, /* i/o: Code gain to quantize Q16*/
- const Word16 bits, /* i : number of bits to quantize Q0*/
- const Word16 lowBound, /* i : lower bound of quantizer (dB) Q8*/
- const Word16 stepSize, /* i : Step size choice Q14*/
- const Word16 inv_stepSize /* i : Step size choice Q15*/
+/* o : Return index of quantization */
+Word16 gain_enc_gaus_fx(
+ Word32 *gain, /* i/o: Code gain to quantize Q16*/
+ const Word16 bits, /* i : number of bits to quantize Q0*/
+ const Word16 lowBound, /* i : lower bound of quantizer (dB) Q8*/
+ const Word16 stepSize, /* i : Step size choice Q14*/
+ const Word16 inv_stepSize /* i : Step size choice Q15*/
);
+
void enc_pit_exc_fx(
Encoder_State *st_fx, /* i/o: State structure */
const Word16 *speech, /* i : Input speech Q_new-1*/
@@ -4036,9 +4002,9 @@ void enc_pit_exc_fx(
Word16 *pitch_buf, /* i/o: Fractionnal per subframe pitch Q6*/
const Word16 nb_subfr, /* i : Number of subframe considered Q0*/
Word16 *gpit, /* o : pitch mean gpit Q15*/
- Word16 *saved_bit_pos, /* o : saved position in the bitstream before pitch contribution Q0*/
- const Word16 tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag Q0*/
- const Word16 tdm_Pri_pitch_buf[], /* i : primary channel pitch buffer Q6*/
+ Word16 *saved_bit_pos, /* o : saved position in the bitstream before pitch contribution Q0*/
+ const Word16 tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag Q0*/
+ const Word16 tdm_Pri_pitch_buf[], /* i : primary channel pitch buffer Q6*/
Word16 Q_new,
Word16 shift );
@@ -4056,29 +4022,31 @@ void enc_pit_exc_ivas_fx(
Word16 *pitch_buf, /* i/o: Fractionnal per subframe pitch Q6*/
const Word16 nb_subfr, /* i : Number of subframe considered Q0*/
Word16 *gpit, /* o : pitch mean gpit Q15*/
- Word16 *saved_bit_pos, /* o : saved position in the bitstream before pitch contribution Q0*/
- const Word16 tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag Q0*/
- const Word16 tdm_Pri_pitch_buf[], /* i : primary channel pitch buffer Q6*/
+ Word16 *saved_bit_pos, /* o : saved position in the bitstream before pitch contribution Q0*/
+ const Word16 tdm_Pitch_reuse_flag, /* i : primary channel pitch reuse flag Q0*/
+ const Word16 tdm_Pri_pitch_buf[], /* i : primary channel pitch buffer Q6*/
Word16 Q_new,
Word16 shift );
-Word16 Pit_exc_contribution_len_fx( /* o : bin where pitch contribution is significant */
- Encoder_State *st_fx, /* i/o: state structure */
- const Word16 *dct_res, /* i : DCT of residual Qnew*/
- Word16 *dct_pitex, /* i/o: DCT of pitch contribution Qnew*/
- Word16 *pitch_buf, /* i/o: Pitch per subframe Q6*/
- const Word16 nb_subfr, /* i : Number of subframe considered Q0*/
- Word16 *hangover, /* i : hangover for the time contribution switching Q0*/
- Word16 Qnew );
-
-Word16 Pit_exc_contribution_len_ivas_fx( /* o : bin where pitch contribution is significant */
- Encoder_State *st_fx, /* i/o: state structure */
- const Word16 *dct_res, /* i : DCT of residual Qnew*/
- Word16 *dct_pitex, /* i/o: DCT of pitch contribution Qnew*/
- Word16 *pitch_buf, /* i/o: Pitch per subframe Q6*/
- const Word16 nb_subfr, /* i : Number of subframe considered Q0*/
- Word16 *hangover, /* i : hangover for the time contribution switching Q0*/
- Word16 Qnew );
+/* o : bin where pitch contribution is significant */
+Word16 Pit_exc_contribution_len_fx(
+ Encoder_State *st_fx, /* i/o: state structure */
+ const Word16 *dct_res, /* i : DCT of residual Qnew*/
+ Word16 *dct_pitex, /* i/o: DCT of pitch contribution Qnew*/
+ Word16 *pitch_buf, /* i/o: Pitch per subframe Q6*/
+ const Word16 nb_subfr, /* i : Number of subframe considered Q0*/
+ Word16 *hangover, /* i : hangover for the time contribution switching Q0*/
+ Word16 Qnew );
+
+/* o : bin where pitch contribution is significant */
+Word16 Pit_exc_contribution_len_ivas_fx(
+ Encoder_State *st_fx, /* i/o: state structure */
+ const Word16 *dct_res, /* i : DCT of residual Qnew*/
+ Word16 *dct_pitex, /* i/o: DCT of pitch contribution Qnew*/
+ Word16 *pitch_buf, /* i/o: Pitch per subframe Q6*/
+ const Word16 nb_subfr, /* i : Number of subframe considered Q0*/
+ Word16 *hangover, /* i : hangover for the time contribution switching Q0*/
+ Word16 Qnew );
Word16 pvq_core_enc_fx(
BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
@@ -4096,6 +4064,7 @@ Word16 pvq_core_enc_fx(
Word16 *maxpulse, /* i : maximum pulse per band */
const Word16 core /* i : number of bands */
);
+
Word16 pvq_core_enc_ivas_fx(
BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
Word16 coefs_norm[], /* i/o: normalized coefficients to encode */
@@ -4135,7 +4104,6 @@ void hq_lr_enc_ivas_fx(
const Word16 is_transient_fx /* i : Q0 : transient flag */
);
-
void hq_hr_enc_fx(
Encoder_State *st_fx, /* i/o: encoder state structure fx */
Word32 *t_audio, /* i/o: transform-domain coefficients Q12 */
@@ -4168,7 +4136,7 @@ void diffcod_fx(
Word16 *difidx /* (o) differential code Q0*/
);
-/* o : Consumed bits Q0 */
+/* o : Consumed bits Q0 */
Word16 hq_classifier_enc_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
const Word16 length, /* i : Frame length Q0 */
@@ -4181,7 +4149,7 @@ Word16 hq_classifier_enc_fx(
Word16 *hqswb_clas /* o : HQ class Q0 */
);
-/* o : Consumed bits Q0 */
+/* o : Consumed bits Q0 */
Word16 hq_classifier_enc_ivas_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
const Word16 length, /* i : Frame length Q0 */
@@ -4211,8 +4179,7 @@ Word16 encode_envelope_indices_ivas_fx(
Word16 *difidx, /* i/o: Diff indices/encoded diff indices Q0 */
Word16 *LCmode, /* o : Coding mode if flag_pack=0, i : if flag_pack=1 Q0 */
const Word16 flag_pack, /* i : indicator of packing or estimating bits Q0 */
- const Word16 flag_HQ2 /* i : indicator of HQ2 core Q0 */
- ,
+ const Word16 flag_HQ2, /* i : indicator of HQ2 core Q0 */
const Word16 is_transient /* i : indicator of HQ_TRANSIENT Q0 */
);
@@ -4292,7 +4259,6 @@ Word16 noise_adjust_fx(
const Word16 core_sfm /* i : index of the end band for core Q0 */
);
-
ivas_error tcq_core_LR_enc_fx(
BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
Word16 inp_vector_fx[], /* x5 */
@@ -4313,7 +4279,6 @@ ivas_error tcq_core_LR_enc_fx(
const Word16 adjustFlag,
const Word16 is_transient );
-
ivas_error tcq_core_LR_enc_ivas_fx(
BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
Word32 inp_vector[],
@@ -4355,8 +4320,8 @@ void diffcod_lrmdct_fx(
);
Word16 peak_vq_enc_ivas_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- const Word16 bwidth, /* i : audio bandwidth */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ const Word16 bwidth, /* i : audio bandwidth */
const Word32 *coefs, /* i : Input coefficient vector Q12 */
Word32 *coefs_out, /* o : Quantized output vector Q12 */
const Word32 core_brate, /* i : Core bitrate */
@@ -4369,8 +4334,8 @@ Word16 peak_vq_enc_ivas_fx(
);
Word16 peak_vq_enc_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- const Word16 bwidth, /* i : audio bandwidth */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ const Word16 bwidth, /* i : audio bandwidth */
const Word32 *coefs, /* i : Input coefficient vector Q12 */
Word32 *coefs_out, /* o : Quantized output vector Q12 */
const Word32 brate, /* i : Core bitrate */
@@ -4410,7 +4375,8 @@ Word16 E_ACELP_hh_corr(
Word16 *x /*Q11*/,
Word16 *y /*Qy*/,
Word16 L_subfr /*Q0*/,
- Word16 bits /*Q0*/ );
+ Word16 bits /*Q0*/
+);
void acelp_1t64_fx(
BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
@@ -4420,6 +4386,7 @@ void acelp_1t64_fx(
Word16 y[], /* o : filtered fixed codebook excitation */
const Word16 L_subfr /* i : subframe length */
);
+
void acelp_2t32_fx(
BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
const Word16 dn[], /* i : corr. between target and h[]. */
@@ -4427,8 +4394,9 @@ void acelp_2t32_fx(
Word16 code[], /* o : algebraic (fixed) codebook excitation */
Word16 y[] /* o : filtered fixed codebook excitation */
);
+
Word16 acelp_4t64_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
Word16 dn[], /* i : corr. between target and h[]. */
const Word16 cn[], /* i : residual after long term prediction Q_new*/
const Word16 H[], /* i : impulse response of weighted synthesis filter Q12*/
@@ -4438,153 +4406,152 @@ Word16 acelp_4t64_fx(
Word16 y[], /* o : filtered fixed codebook excitation Q9*/
Word16 nbbits, /* i : number of bits per codebook */
const Word16 cmpl_flag, /* i : coomplexity reduction flag */
- const Word16 Opt_AMR_WB /* i : flag indicating AMR-WB IO mode */
- ,
+ const Word16 Opt_AMR_WB, /* i : flag indicating AMR-WB IO mode */
const Word16 element_mode );
ivas_error evs_enc_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- const Word16 *data, /* i : input signal Q0*/
- Word32 *mem_hp20_in_fx, /* i/o: hp20 filter memory Qx*/
- const Word16 n_samples /* i : number of input samples Q0*/
+ Encoder_State *st, /* i/o: encoder state structure */
+ const Word16 *data, /* i : input signal Q0*/
+ Word32 *mem_hp20_in_fx, /* i/o: hp20 filter memory Qx*/
+ const Word16 n_samples /* i : number of input samples Q0*/
);
/* o: Qx y(n) */
/* y(n)(Qx) = alpha(Q15) * x(Qx) + (1.0f-alpha)* y(n-1) (Qx) */
Word16 noise_est_AR1_Qx(
- Word16 x, /* i : Qx x(n) */
- Word16 y, /* i : Qx y(n-1) */
- Word16 alpha /*i : Q15 scaling of driving x(n) */
+ Word16 x, /* i : Qx x(n) */
+ Word16 y, /* i : Qx y(n-1) */
+ Word16 alpha /* i : Q15 scaling of driving x(n) */
);
/*o : Qx y( n ) */
Word32 noise_est_AR1_Qx_32(
- Word32 x, /* i : Qx x(n) */
- Word32 y, /* i : Qx y(n-1) */
- Word32 alpha /*i : Q15 scaling of driving x(n) */
+ Word32 x, /* i : Qx x(n) */
+ Word32 y, /* i : Qx y(n-1) */
+ Word32 alpha /* i : Q15 scaling of driving x(n) */
);
void FEC_lsf_estim_enc_fx(
- Encoder_State *st_fx, /* i : Encoder static memory */
+ Encoder_State *st_fx, /* i : Encoder static memory */
Word16 *lsf /* o : estimated LSF vector Qlog2(2.56)*/
);
Word32 mslvq_cng_fx(
- Word16 idx_cv, /* i : index of cv from previous stage */
- Word16 *pTmp, /* i : 16 dimensional i vector x2.56*/
- Word16 *quant, /* o : quantized vector x2.56*/
+ Word16 idx_cv, /* i : index of cv from previous stage */
+ Word16 *pTmp, /* i : 16 dimensional i vector x2.56*/
+ Word16 *quant, /* o : quantized vector x2.56*/
Word16 *cv_out, /* o : corresponding 8-dim lattice codevectors (without the scaling) Q13*/
- Word16 *idx_lead, /* o : leader index for each 8-dim subvector */
- Word16 *idx_scale, /* o : scale index for each subvector */
- const Word16 *w, /* i : weights for LSF quantization Q10*/
+ Word16 *idx_lead, /* o : leader index for each 8-dim subvector */
+ Word16 *idx_scale, /* o : scale index for each subvector */
+ const Word16 *w, /* i : weights for LSF quantization Q10*/
Word16 *no_scales );
Word32 mslvq_cng_ivas_fx(
- Word16 idx_cv, /* i : index of cv from previous stage */
- Word16 *pTmp, /* i : 16 dimensional i vector x2.56*/
- Word16 *quant, /* o : quantized vector x2.56*/
+ Word16 idx_cv, /* i : index of cv from previous stage */
+ Word16 *pTmp, /* i : 16 dimensional i vector x2.56*/
+ Word16 *quant, /* o : quantized vector x2.56*/
Word16 *cv_out, /* o : corresponding 8-dim lattice codevectors (without the scaling) Q13*/
- Word16 *idx_lead, /* o : leader index for each 8-dim subvector */
- Word16 *idx_scale, /* o : scale index for each subvector */
- const Word16 *w /* i : weights for LSF quantization Q10*/
+ Word16 *idx_lead, /* o : leader index for each 8-dim subvector */
+ Word16 *idx_scale, /* o : scale index for each subvector */
+ const Word16 *w /* i : weights for LSF quantization Q10*/
);
void Unified_weighting_fx(
- const Word32 Bin_Ener_128_fx[], /* i : FFT Bin energy 128 bins in two sets Q_ener */
+ const Word32 Bin_Ener_128_fx[], /* i : FFT Bin energy 128 bins in two sets Q_ener */
Word16 Q_ener,
- const Word16 lsf_fx[], /* i : LSF vector x2.56 */
- Word16 w_fx[], /* o : LP weighting filter (numerator) Q8 */
- const Word16 narrowBand, /* i : flag for Narrowband Q0*/
- const Word16 unvoiced, /* i : flag for Unvoiced frame Q0*/
- const Word32 sr_core, /* i : sampling rate of core-coder Q0*/
- const Word16 order /* i : LP order Q0*/
+ const Word16 lsf_fx[], /* i : LSF vector x2.56 */
+ Word16 w_fx[], /* o : LP weighting filter (numerator) Q8 */
+ const Word16 narrowBand, /* i : flag for Narrowband Q0*/
+ const Word16 unvoiced, /* i : flag for Unvoiced frame Q0*/
+ const Word32 sr_core, /* i : sampling rate of core-coder Q0*/
+ const Word16 order /* i : LP order Q0*/
);
Word32 qlsf_ARSN_tcvq_Enc_16k_fx(
const Word16 *x_fx, /* i : Vector to be encoded x2.65 */
Word16 *y_fx, /* o : Quantized LSF vector x2.65 */
- Word16 *indice, /* o : Indices */
- const Word16 *w_fx, /* i : LSF Weights Q10 */
- const Word16 nBits, /* i : number of bits */
- Word16 safety_net /* i : safety_net flag */
+ Word16 *indice, /* o : Indices */
+ const Word16 *w_fx, /* i : LSF Weights Q10 */
+ const Word16 nBits, /* i : number of bits */
+ Word16 safety_net /* i : safety_net flag */
);
Word32 mslvq_fx(
- Word16 *pTmp, /* i : M-dimensional i vector */
- Word16 *quant, /* o : quantized vector */
- Word16 *cv_out, /* o : corresponding 8-dim lattice codevectors (without the scaling) */
- Word16 *idx_lead, /* o : leader index for each 8-dim subvector */
- Word16 *idx_scale, /* o : scale index for each subvector */
- Word16 *w, /* i : weights for LSF quantization */
- Word16 mode, /* i : number indicating the coding type (V/UV/G...)*/
- Word16 mode_glb, /* i : LVQ coding mode */
- Word16 pred_flag, /* i : prediction flag (0: safety net, 1 - predictive )*/
+ Word16 *pTmp, /* i : M-dimensional i vector */
+ Word16 *quant, /* o : quantized vector */
+ Word16 *cv_out, /* o : corresponding 8-dim lattice codevectors (without the scaling) */
+ Word16 *idx_lead, /* o : leader index for each 8-dim subvector */
+ Word16 *idx_scale, /* o : scale index for each subvector */
+ Word16 *w, /* i : weights for LSF quantization */
+ Word16 mode, /* i : number indicating the coding type (V/UV/G...) */
+ Word16 mode_glb, /* i : LVQ coding mode */
+ Word16 pred_flag, /* i : prediction flag (0: safety net, 1 - predictive ) */
Word16 no_scales[][2] );
-
-/* o : frame multi-harmonicity (1-harmonic, 0-not) */
+/* o : frame multi-harmonicity (1-harmonic, 0-not) */
Word16 multi_harm_fx(
- const Word16 Bin_E[], /* i : log-energy spectrum of the current frame Q7 */
- Word16 old_S[], /* i/o: prev. log-energy spectrum w. subtracted floor Q7 */
- Word16 cor_map_LT[], /* i/o: LT correlation map Q15 */
- Word16 *multi_harm_limit, /* i/o: multi harminic threshold Q9 */
- const Word32 total_brate, /* i : total bitrate Q0 */
- const Word16 bwidth, /* i : i signal bandwidth Q0 */
- Word16 *cor_strong_limit, /* i/o: HF correlation indicator Q0 */
- Word16 *st_mean_avr_dyn, /* i/o: long term average dynamic Q7 */
- Word16 *st_last_sw_dyn, /* i/o: last dynamic Q7 */
- Word16 *cor_map_sum, /* i : sum of correlation map Q8 */
+ const Word16 Bin_E[], /* i : log-energy spectrum of the current frame Q7 */
+ Word16 old_S[], /* i/o: prev. log-energy spectrum w. subtracted floor Q7 */
+ Word16 cor_map_LT[], /* i/o: LT correlation map Q15 */
+ Word16 *multi_harm_limit, /* i/o: multi harminic threshold Q9 */
+ const Word32 total_brate, /* i : total bitrate Q0 */
+ const Word16 bwidth, /* i : i signal bandwidth Q0 */
+ Word16 *cor_strong_limit, /* i/o: HF correlation indicator Q0 */
+ Word16 *st_mean_avr_dyn, /* i/o: long term average dynamic Q7 */
+ Word16 *st_last_sw_dyn, /* i/o: last dynamic Q7 */
+ Word16 *cor_map_sum, /* i : sum of correlation map Q8 */
Word16 *sp_floor, /* o: noise floor estimate Q7 */
Word16 S_map[] /* o : short-term correlation map Q7 */
);
-/* o : frame multi-harmonicity (1-harmonic, 0-not) */
+/* o : frame multi-harmonicity (1-harmonic, 0-not) */
Word16 multi_harm_ivas_fx(
- const Word16 Bin_E[], /* i : log-energy spectrum of the current frame Q7 */
- Word16 old_S[], /* i/o: prev. log-energy spectrum w. subtracted floor Q7 */
- Word16 cor_map_LT[], /* i/o: LT correlation map Q15 */
- Word16 *multi_harm_limit, /* i/o: multi harminic threshold Q9 */
- const Word32 total_brate, /* i : total bitrate Q0 */
- const Word16 bwidth, /* i : i signal bandwidth Q0 */
- Word16 *cor_strong_limit, /* i/o: HF correlation indicator Q0 */
- Word16 *st_mean_avr_dyn, /* i/o: long term average dynamic Q7 */
- Word16 *st_last_sw_dyn, /* i/o: last dynamic Q7 */
- Word16 *cor_map_sum, /* i : sum of correlation map Q8 */
+ const Word16 Bin_E[], /* i : log-energy spectrum of the current frame Q7 */
+ Word16 old_S[], /* i/o: prev. log-energy spectrum w. subtracted floor Q7 */
+ Word16 cor_map_LT[], /* i/o: LT correlation map Q15 */
+ Word16 *multi_harm_limit, /* i/o: multi harminic threshold Q9 */
+ const Word32 total_brate, /* i : total bitrate Q0 */
+ const Word16 bwidth, /* i : i signal bandwidth Q0 */
+ Word16 *cor_strong_limit, /* i/o: HF correlation indicator Q0 */
+ Word16 *st_mean_avr_dyn, /* i/o: long term average dynamic Q7 */
+ Word16 *st_last_sw_dyn, /* i/o: last dynamic Q7 */
+ Word16 *cor_map_sum, /* i : sum of correlation map Q8 */
Word16 *sp_floor, /* o: noise floor estimate Q7 */
Word16 S_map[] /* o : short-term correlation map Q7 */
);
void pvq_encode_frame_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- const Word16 *coefs_norm, /* i : normalized coefficients to encode */
- Word16 Q_coefs, /* i : Q-point of coefs_norm[] */
- Word16 *coefs_quant, /* o : quantized coefficients */
- Word16 *gopt, /* o : optimal shape gains */
- Word16 *npulses, /* o : number of pulses per band */
- Word16 *pulse_vector, /* o : non-normalized pulse shapes */
- const Word16 *sfm_start, /* i : indices of first coefficients in the bands */
- const Word16 *sfm_end, /* i : indices of last coefficients in the bands */
- const Word16 *sfmsize, /* i : band sizes */
- const Word16 nb_sfm, /* i : total number of bands */
- const Word16 *R, /* i : bitallocation per band Q3 */
- const Word16 pvq_bits, /* i : number of bits avaiable */
- const Word16 core /* i : core */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ const Word16 *coefs_norm, /* i : normalized coefficients to encode */
+ Word16 Q_coefs, /* i : Q-point of coefs_norm[] */
+ Word16 *coefs_quant, /* o : quantized coefficients */
+ Word16 *gopt, /* o : optimal shape gains */
+ Word16 *npulses, /* o : number of pulses per band */
+ Word16 *pulse_vector, /* o : non-normalized pulse shapes */
+ const Word16 *sfm_start, /* i : indices of first coefficients in the bands */
+ const Word16 *sfm_end, /* i : indices of last coefficients in the bands */
+ const Word16 *sfmsize, /* i : band sizes */
+ const Word16 nb_sfm, /* i : total number of bands */
+ const Word16 *R, /* i : bitallocation per band Q3 */
+ const Word16 pvq_bits, /* i : number of bits avaiable */
+ const Word16 core /* i : core */
);
+
void pvq_encode_frame_ivas_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- const Word16 *coefs_norm, /* i : normalized coefficients to encode */
- Word16 Q_coefs, /* i : Q-point of coefs_norm[] */
- Word16 *coefs_quant, /* o : quantized coefficients */
- Word16 *gopt, /* o : optimal shape gains */
- Word16 *npulses, /* o : number of pulses per band */
- Word16 *pulse_vector, /* o : non-normalized pulse shapes */
- const Word16 *sfm_start, /* i : indices of first coefficients in the bands */
- const Word16 *sfm_end, /* i : indices of last coefficients in the bands */
- const Word16 *sfmsize, /* i : band sizes */
- const Word16 nb_sfm, /* i : total number of bands */
- const Word16 *R, /* i : bitallocation per band Q3 */
- const Word16 pvq_bits, /* i : number of bits avaiable */
- const Word16 core /* i : core */
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ const Word16 *coefs_norm, /* i : normalized coefficients to encode */
+ Word16 Q_coefs, /* i : Q-point of coefs_norm[] */
+ Word16 *coefs_quant, /* o : quantized coefficients */
+ Word16 *gopt, /* o : optimal shape gains */
+ Word16 *npulses, /* o : number of pulses per band */
+ Word16 *pulse_vector, /* o : non-normalized pulse shapes */
+ const Word16 *sfm_start, /* i : indices of first coefficients in the bands */
+ const Word16 *sfm_end, /* i : indices of last coefficients in the bands */
+ const Word16 *sfmsize, /* i : band sizes */
+ const Word16 nb_sfm, /* i : total number of bands */
+ const Word16 *R, /* i : bitallocation per band Q3 */
+ const Word16 pvq_bits, /* i : number of bits avaiable */
+ const Word16 core /* i : core */
);
/*Qx o : interpolated value */
@@ -4594,49 +4561,49 @@ Word16 Interpol_4(
);
void set_ppp_mode_fx(
- Encoder_State *st_fx, /* i/o: state structure */
- const Word16 noisy_speech_HO, /* i : SC-VBR noisy speech HO flag */
- const Word16 clean_speech_HO, /* i : SC-VBR clean speech HO flag */
- const Word16 NB_speech_HO, /* i : SC-VBR NB speech HO flag */
- const Word16 localVAD_he /* i : HE-SAD flag without hangover */
+ Encoder_State *st_fx, /* i/o: state structure */
+ const Word16 noisy_speech_HO, /* i : SC-VBR noisy speech HO flag */
+ const Word16 clean_speech_HO, /* i : SC-VBR clean speech HO flag */
+ const Word16 NB_speech_HO, /* i : SC-VBR NB speech HO flag */
+ const Word16 localVAD_he /* i : HE-SAD flag without hangover */
);
void decision_matrix_enc_fx(
- Encoder_State *st_fx, /* i : encoder state structure */
+ Encoder_State *st_fx, /* i : encoder state structure */
Word16 *hq_core_type /* o : HQ core_fx type Q0*/
);
void pvq_encode_fx(
BSTR_ENC_HANDLE hBstr,
- PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
- const Word16 *x, /* i: vector to quantize Q15-3=>Q12 */
- Word16 *y, /* o: raw pulses (non-scaled short) Q0 */
- Word16 *xq, /* o: quantized vector Q15 */
- Word32 *L_xq, /* o: quantized vector Q31 */
- const Word16 pulses, /* i: number of allocated pulses */
- const Word16 dim, /* i: Length of vector */
- const Word16 neg_gain /* i: - Gain use - negative gain in Q15 0 ..1 */
+ PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
+ const Word16 *x, /* i : vector to quantize Q15-3=>Q12 */
+ Word16 *y, /* o : raw pulses (non-scaled short) Q0 */
+ Word16 *xq, /* o : quantized vector Q15 */
+ Word32 *L_xq, /* o : quantized vector Q31 */
+ const Word16 pulses, /* i : number of allocated pulses */
+ const Word16 dim, /* i : Length of vector */
+ const Word16 neg_gain /* i : Gain use - negative gain in Q15 0 ..1 */
);
void pvq_encode_ivas_fx(
BSTR_ENC_HANDLE hBstr,
- PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
- const Word16 *x, /* i: vector to quantize Q15-3=>Q12 */
- Word16 *y, /* o: raw pulses (non-scaled short) Q0 */
- Word16 *xq, /* o: quantized vector Q15 */
- Word32 *L_xq, /* o: quantized vector Q31 */
- const Word16 pulses, /* i: number of allocated pulses */
- const Word16 dim, /* i: Length of vector */
- const Word16 neg_gain /* i: - Gain use - negative gain in Q15 0 ..1 */
+ PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
+ const Word16 *x, /* i : vector to quantize Q15-3=>Q12 */
+ Word16 *y, /* o : raw pulses (non-scaled short) Q0 */
+ Word16 *xq, /* o : quantized vector Q15 */
+ Word32 *L_xq, /* o : quantized vector Q31 */
+ const Word16 pulses, /* i : number of allocated pulses */
+ const Word16 dim, /* i : Length of vector */
+ const Word16 neg_gain /* i : Gain use - negative gain in Q15 0 ..1 */
);
void rc_enc_init_fx(
- PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
- Word16 tot_bits /* i : Total bit budget Q0*/
+ PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
+ Word16 tot_bits /* i : Total bit budget Q0*/
);
void rc_enc_finish_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: Encoder state */
+ BSTR_ENC_HANDLE hBstr, /* i/o: Encoder state */
PVQ_ENC_HANDLE hPVQ /* i/o: PVQ encoder handle */
);
@@ -4647,47 +4614,47 @@ void rc_enc_finish_ivas_fx(
);
void rc_encode_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
- UWord32 cum_freq, /* i : Cumulative frequency up to symbol Q0*/
- UWord32 sym_freq, /* i : Symbol probability Q0*/
- UWord32 tot /* i : Total cumulative frequency Q0*/
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
+ UWord32 cum_freq, /* i : Cumulative frequency up to symbol Q0*/
+ UWord32 sym_freq, /* i : Symbol probability Q0*/
+ UWord32 tot /* i : Total cumulative frequency Q0*/
);
void rc_encode_ivas_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
- UWord32 cum_freq, /* i : Cumulative frequency up to symbol Q0*/
- UWord32 sym_freq, /* i : Symbol probability Q0*/
- UWord32 tot /* i : Total cumulative frequency Q0*/
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
+ UWord32 cum_freq, /* i : Cumulative frequency up to symbol Q0*/
+ UWord32 sym_freq, /* i : Symbol probability Q0*/
+ UWord32 tot /* i : Total cumulative frequency Q0*/
);
void rc_enc_uniform_ivas_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
- UWord32 value, /* i : Value to encode Q0*/
- UWord32 tot /* i : Maximum value Q0*/
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
+ UWord32 value, /* i : Value to encode Q0*/
+ UWord32 tot /* i : Maximum value Q0*/
);
void rc_enc_uniform_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
- UWord32 value, /* i : Value to encode Q0*/
- UWord32 tot /* i : Maximum value Q0*/
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
+ UWord32 value, /* i : Value to encode Q0*/
+ UWord32 tot /* i : Maximum value Q0*/
);
void rc_enc_bits_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
- UWord32 value, /* i : Value to encode Q0*/
- Word16 bits /* i : Number of bits used Q0*/
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
+ UWord32 value, /* i : Value to encode Q0*/
+ Word16 bits /* i : Number of bits used Q0*/
);
void rc_enc_bits_ivas_fx(
- BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
- PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
- UWord32 value, /* i : Value to encode Q0*/
- Word16 bits /* i : Number of bits used Q0*/
+ BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
+ PVQ_ENC_HANDLE hPVQ, /* i/o: PVQ encoder handle */
+ UWord32 value, /* i : Value to encode Q0*/
+ Word16 bits /* i : Number of bits used Q0*/
);
void re8_compute_base_index_fx(
@@ -4700,7 +4667,7 @@ void tfaCalcEnv_fx(
const Word16 *shb_speech,
Word32 *enr );
-/* o : pitch index */
+/* o : pitch index */
Word16 delta_pit_enc_fx(
const Word16 fr_steps, /* i : fractional resolution steps (2 or 4)*/
const Word16 T0, /* i : integer pitch lag */
@@ -4709,17 +4676,17 @@ Word16 delta_pit_enc_fx(
);
void set_impulse_fx(
- const Word16 xn_fx[], /* i : target signal Q_new-1+shift*/
- const Word16 h_orig_fx[], /* i : impulse response of weighted synthesis filter Q(14+shift)*/
- Word16 exc_fx[], /* o : adaptive codebook excitation Q_new*/
- Word16 yy1_fx[], /* o : filtered adaptive codebook excitation Q_new*/
- Word16 *imp_shape, /* o : adaptive codebook index Q0*/
- Word16 *imp_pos, /* o : position of the glottal impulse center index Q0*/
- Word32 *gain_trans_fx, /* o : transition gain Q7*/
- Word16 Q_new /* i : Current scaling */
+ const Word16 xn_fx[], /* i : target signal Q_new-1+shift*/
+ const Word16 h_orig_fx[], /* i : impulse response of weighted synthesis filter Q(14+shift)*/
+ Word16 exc_fx[], /* o : adaptive codebook excitation Q_new*/
+ Word16 yy1_fx[], /* o : filtered adaptive codebook excitation Q_new*/
+ Word16 *imp_shape, /* o : adaptive codebook index Q0*/
+ Word16 *imp_pos, /* o : position of the glottal impulse center index Q0*/
+ Word32 *gain_trans_fx, /* o : transition gain Q7*/
+ Word16 Q_new /* i : Current scaling */
);
-/* o : pitch index */
+/* o : pitch index */
Word16 abs_pit_enc_fx(
const Word16 fr_steps, /* i : fractional resolution steps (2 or 4) for shortest pitches*/
const Word16 limit_flag, /* i : restrained(0) or extended(1) limits */
@@ -4728,19 +4695,19 @@ Word16 abs_pit_enc_fx(
);
ivas_error ppp_quarter_encoder_fx(
- Word16 *returnFlag, /* o : return value */
- DTFS_STRUCTURE *CURRCW_Q_FX, /* o : Quantized (amp/phase) DTFS */
- DTFS_STRUCTURE *TARGETCW_FX, /* o : DTFS with quant phase but unquant Amp */
- Word16 prevCW_lag, /* i : previous lag */
- DTFS_STRUCTURE vCURRCW_NQ_FX, /* i : Unquantized DTFS */
- const Word16 *curr_lpc_fx, /* i : LPCS */
- Word16 *lastLgainE_fx, /* i/o: last low band gain */
- Word16 *lastHgainE_fx, /* i/o: last high band gain */
- Word16 *lasterbE_fx, /* i/o: last ERB vector */
- DTFS_STRUCTURE PREV_CW_E_FX, /* i : past DTFS */
- Word16 *S_fx, /* i : sin table, Q15 */
- Word16 *C_fx, /* i : cos table, Q15 */
- BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle */
+ Word16 *returnFlag, /* o : return value */
+ DTFS_STRUCTURE *CURRCW_Q_FX, /* o : Quantized (amp/phase) DTFS */
+ DTFS_STRUCTURE *TARGETCW_FX, /* o : DTFS with quant phase but unquant Amp */
+ Word16 prevCW_lag, /* i : previous lag */
+ DTFS_STRUCTURE vCURRCW_NQ_FX, /* i : Unquantized DTFS */
+ const Word16 *curr_lpc_fx, /* i : LPCS */
+ Word16 *lastLgainE_fx, /* i/o: last low band gain */
+ Word16 *lastHgainE_fx, /* i/o: last high band gain */
+ Word16 *lasterbE_fx, /* i/o: last ERB vector */
+ DTFS_STRUCTURE PREV_CW_E_FX, /* i : past DTFS */
+ Word16 *S_fx, /* i : sin table, Q15 */
+ Word16 *C_fx, /* i : cos table, Q15 */
+ BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle */
);
void index_lvq_fx(
@@ -4762,15 +4729,15 @@ void index_lvq_ivas_fx(
const Word16 prediction_flag );
ivas_error init_encoder_fx(
- Encoder_State *st_fx, /* i/o: Encoder static variables structure */
- const int16_t var_SID_rate_flag, /* i : flag for variable SID update rate */
- const int16_t interval_SID /* i : interval for SID update */
+ Encoder_State *st_fx, /* i/o: Encoder static variables structure */
+ const Word16 var_SID_rate_flag, /* i : flag for variable SID update rate */
+ const Word16 interval_SID /* i : interval for SID update */
);
void copy_encoder_config_fx(
- Encoder_Struct *st_ivas, /* i : IVAS encoder structure */
- Encoder_State *st, /* o : encoder state structure */
- const Word16 flag_all /* i : flag 1==update all, 0=partial update Q0*/
+ Encoder_Struct *st_ivas, /* i : IVAS encoder structure */
+ Encoder_State *st, /* o : encoder state structure */
+ const Word16 flag_all /* i : flag 1==update all, 0=partial update Q0*/
);
void destroy_encoder_fx(
@@ -4778,9 +4745,9 @@ void destroy_encoder_fx(
);
void amr_wb_enc_fx(
- Encoder_State *st, /* i/o: encoder state structure */
- const Word16 input_sp[], /* i : i signal Q0*/
- const Word16 n_samples /* i : number of i samples Q0*/
+ Encoder_State *st, /* i/o: encoder state structure */
+ const Word16 input_sp[], /* i : i signal Q0*/
+ const Word16 n_samples /* i : number of i samples Q0*/
);
void writeLPCparam_fx(
diff --git a/lib_enc/pvq_encode_fx.c b/lib_enc/pvq_encode_fx.c
index 0e8363654694ffd1f8df7a66b193ce6ca524b519..85704ccf3ba1417296f037dc7caccd8d63ddda6a 100644
--- a/lib_enc/pvq_encode_fx.c
+++ b/lib_enc/pvq_encode_fx.c
@@ -63,17 +63,11 @@ static Word16 one_pulse_search(
UWord32 UL_left_l, UL_right_l, UL_dummy;
Word32 L_tmp;
UWord16 u_sgn;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
en_tmp = en_dn_shift; /* dummy assignment to avoid compiler warning for unused parameter */
/* maximize correlation precision, prior to every unit pulse addition in the vector */
- corr_up_shift = norm_l( L_mac( *L_xy_ptr, 1, max_xabs ) ); /* pre analyze worst case L_xy update in the dim loop , 2 ops */
+ corr_up_shift = norm_l( L_mac( *L_xy_ptr, 1, max_xabs ) ); /* pre analyze worst case L_xy update in the dim loop, 2 ops */
imax = -1; /* not needed for search, only added to avoid compiler warning */
/* clean BE code, with split out low/high precision loops */
@@ -90,14 +84,9 @@ static Word16 one_pulse_search(
FOR( i = 0; i < dim; i++ ) /* FOR 3 ops */
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp_corr = L_shl_sat( L_mac_sat( *L_xy_ptr, 1, x_abs[i] ), corr_up_shift ); /* actual in-loop target value, 2 ops */
corr_tmp = round_fx_sat( L_tmp_corr ); /* 1 op */
-#else
- L_tmp_corr = L_shl_o( L_mac_o( *L_xy_ptr, 1, x_abs[i], &Overflow ), corr_up_shift, &Overflow ); /* actual in-loop target value, 2 ops */
- corr_tmp = round_fx_o( L_tmp_corr, &Overflow ); /* 1 op */
-#endif
- corr_sq_tmp = mult( corr_tmp, corr_tmp ); /* CorrSq, is a 16bit for low compelxity cross multiplication 1 op */
+ corr_sq_tmp = mult( corr_tmp, corr_tmp ); /* CorrSq, is a 16bit for low compelxity cross multiplication 1 op */
L_tmp_en_lc = L_mac( *L_yy_ptr, 1, y[i] ); /*Q1 result , energy may span up to ~14+1(Q1)+1(sign)=16 bits, 1 op */
/* extract_l without shift can always be used for this section as energy is guaranteed to stay in the lower word, 1 op */
@@ -212,12 +201,6 @@ void pvq_encode_ivas_fx(
Word16 neg_gain_norm, shift_tot;
Word16 high_pulse_density_flag;
PvqEntry entry;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
L_proj_fac = 4096;
move32();
@@ -371,13 +354,8 @@ void pvq_encode_ivas_fx(
}
Mpy_32_16_ss( L_isqrt, tmp, &L_tmp, &u16_tmp ); /* Q31*Q(0+x) +1 */
Mpy_32_16_ss( L_tmp, neg_gain_norm, &L_tmp, &u16_tmp ); /* Q31*Q(0+x) *Q15 +1 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- L_tmp = L_shr_sat( L_tmp, shift_tot ); /* Q31+x */
- xq[i] = round_fx_sat( L_tmp ); /* Q15, array move */
-#else
- L_tmp = L_shr_sat( L_tmp, shift_tot ); /* Q31+x */
- xq[i] = round_fx_o( L_tmp, &Overflow ); /* Q15, array move */
-#endif
+ L_tmp = L_shr_sat( L_tmp, shift_tot ); /* Q31+x */
+ xq[i] = round_fx_sat( L_tmp ); /* Q15, array move */
move16();
L_xq[i] = L_tmp; /* Q31 currently unused */
move32();
@@ -427,12 +405,6 @@ void pvq_encode_fx(
Word16 neg_gain_norm, shift_tot;
Word16 high_pulse_density_flag;
PvqEntry entry;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
L_proj_fac = 4096;
move32();
@@ -586,13 +558,8 @@ void pvq_encode_fx(
}
Mpy_32_16_ss( L_isqrt, tmp, &L_tmp, &u16_tmp ); /* Q31*Q(0+x) +1 */
Mpy_32_16_ss( L_tmp, neg_gain_norm, &L_tmp, &u16_tmp ); /* Q31*Q(0+x) *Q15 +1 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- L_tmp = L_shr_sat( L_tmp, shift_tot ); /* Q31+x */
- xq[i] = round_fx_sat( L_tmp ); /* Q15, array move */
-#else
- L_tmp = L_shr_sat( L_tmp, shift_tot ); /* Q31+x */
- xq[i] = round_fx_o( L_tmp, &Overflow ); /* Q15, array move */
-#endif
+ L_tmp = L_shr_sat( L_tmp, shift_tot ); /* Q31+x */
+ xq[i] = round_fx_sat( L_tmp ); /* Q15, array move */
move16();
L_xq[i] = L_tmp; /* Q31 currently unused */
move32();
diff --git a/lib_enc/q_gain2p_fx.c b/lib_enc/q_gain2p_fx.c
index ddb3eec9e6fc17a46946ded234b69f4652490f5b..c576c25f6120a5092e5f5c3f6d80dd76cb1ed63a 100644
--- a/lib_enc/q_gain2p_fx.c
+++ b/lib_enc/q_gain2p_fx.c
@@ -145,13 +145,6 @@ static Word16 gain_enc( /* o : quantization pitch index
const Word16 *p;
const Word16 *t_qua_gain;
Word32 L_tmp, dist_min, L_tmp1;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
-
assert( ( func_type != FUNC_GAIN_ENC_UV ) && ( func_type != FUNC_GAIN_ENC_GACELP_UV ) );
@@ -167,15 +160,13 @@ static Word16 gain_enc( /* o : quantization pitch index
/* gain_inov = 1.0f / sqrt((dot_product(code, code, L_SUBFR) + 0.01) / L_SUBFR) */
L_tmp = calc_gain_inov( code, lcode, &L_tmp1, &exp_L_tmp1 );
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
*gain_inov = round_fx_sat( L_shl_sat( L_tmp, 15 - 3 ) ); /* gain_inov in Q12 */
-#else
- *gain_inov = round_fx_o( L_shl_o( L_tmp, 15 - 3, &Overflow ), &Overflow ); /* gain_inov in Q12 */
-#endif
move16();
+
/*----------------------------------------------------------------*
* calculate the predicted gain code
*----------------------------------------------------------------*/
+
IF( func_type == FUNC_GAIN_ENC_MLESS )
{
/*j = 10 * log10((dot_product(code, code, lcode) + 0.01) / lcode) */
@@ -383,11 +374,7 @@ static Word16 gain_enc( /* o : quantization pitch index
/* Here, we use L_mult0 to compensate the factor 0.5 applied to coeff[1..4] before */
L_tmp = L_add( L_tmp, L_shr( L_mult0( p[2 * i + 0], p[2 * i + 0] ), shr_coeff0 ) );
L_tmp = L_sub( L_tmp, L_shr( L_mult( p[2 * i + 0], coeff1 ), shr_coeff1 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp1 = L_sub_sat( L_tmp, dist_min );
-#else
- L_tmp1 = L_sub_o( L_tmp, dist_min, &Overflow );
-#endif
BASOP_SATURATE_WARNING_ON_EVS
if ( L_tmp1 < 0 )
{
@@ -407,26 +394,19 @@ static Word16 gain_enc( /* o : quantization pitch index
L_tmp = L_mult( g_code, gcode0 ); /* Q11*Q15 -> Q27 */
exp_gcode0 = add( exp_gcode0, -11 );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_shl_sat( L_tmp, exp_gcode0 ); /* Q27 -> Q16 */
-#else
- L_tmp = L_shl_o( L_tmp, exp_gcode0, &Overflow ); /* Q27 -> Q16 */
-#endif
*gain_code = L_tmp;
move32();
/* Q16/Q12 => Q5 */
L_tmp = L_deposit_h( BASOP_Util_Divide3216_Scale( L_tmp, *gain_inov, &i ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
*past_gcode = L_shl_sat( L_tmp, sub( i, 15 - 12 ) );
-#else
- *past_gcode = L_shl_o( L_tmp, sub( i, 15 - 12 ), &Overflow );
-#endif
move16();
return index;
}
+
Word16 gain_enc_uv_fx( /* o : quantization pitch index */
const Word16 *code, /* i : algebraic excitation */
const Word16 *code2, /* i : gaussian excitation */
@@ -454,12 +434,6 @@ Word16 gain_enc_uv_fx( /* o : quantization pitch ind
Word16 index2;
const Word16 log2_scale = 16;
move16();
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
pred_nrg_frame = 0; /* to suppress compilation warnings */
g_code2 = 0; /* to suppress compilation warnings */
exp_gcode2 = 0; /* to suppress compilation warnings */
@@ -467,7 +441,6 @@ Word16 gain_enc_uv_fx( /* o : quantization pitch ind
move16();
move16();
-
assert( ( func_type != FUNC_GAIN_ENC_MLESS ) );
/* Debug check value (not instrumented) */
@@ -615,11 +588,7 @@ Word16 gain_enc_uv_fx( /* o : quantization pitch ind
}
s1 = norm_l( *gain_code );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp1 = round_fx_sat( L_shl( *gain_code, s1 ) );
-#else
- tmp1 = round_fx_o( L_shl_o( *gain_code, s1, &Overflow ), &Overflow );
-#endif
s1 = sub( 15, s1 );
tmp1 = mult_r( mult_r( tmp1, tmp1 ), g_coeff->y2y2 );
@@ -632,11 +601,7 @@ Word16 gain_enc_uv_fx( /* o : quantization pitch ind
L_tmp1 = L_add( L_tmp, 0 );
s1 = norm_l( *gain_code );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp1 = round_fx_sat( L_shl( *gain_code, s1 ) );
-#else
- tmp1 = round_fx_o( L_shl_o( *gain_code, s1, &Overflow ), &Overflow );
-#endif
s1 = sub( 15, s1 );
c_index2 = 0x7FFF;
diff --git a/lib_enc/qlpc_stoch_fx.c b/lib_enc/qlpc_stoch_fx.c
index 702afbadd283a6d4e7cd131b6e4b25195d04d37e..70a41378f66e8295ea6a4aa3162d177e06538846 100644
--- a/lib_enc/qlpc_stoch_fx.c
+++ b/lib_enc/qlpc_stoch_fx.c
@@ -396,12 +396,6 @@ void Unified_weighting_fx(
Word16 nf_fx;
Word32 Bin_Ener_160_fx[160];
const Word32 *Freq_w_Table_fx, *Bin_Ener_fx;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*Config. weighting*/
IF( narrowBand )
@@ -440,11 +434,7 @@ void Unified_weighting_fx(
L_tmp = L_deposit_l( 0 );
FOR( i = 95; i < 127; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_add_sat( L_tmp, Bin_Ener_160_fx[i] ); /* Q_ener */
-#else
- L_tmp = L_add_o( L_tmp, Bin_Ener_160_fx[i], &Overflow ); /* Q_ener */
-#endif
}
L_tmp = L_shr( L_tmp, 5 );
@@ -525,11 +515,7 @@ void Unified_weighting_fx(
}
ELSE
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_shl_sat( L_deposit_l( sub_sat( w_fft_fx[i], min_fx ) ), 13 ); /* Q21 */
-#else
- L_tmp = L_shl_o( L_deposit_l( sub_o( w_fft_fx[i], min_fx, &Overflow ) ), 13, &Overflow ); /* Q21 */
-#endif
exp = norm_l( L_tmp );
frac = round_fx( L_shl( L_tmp, exp ) );
exp = sub( add( exp, 21 ), 30 );
diff --git a/lib_enc/scale_enc_fx.c b/lib_enc/scale_enc_fx.c
index c561903868d8d078871a50842c43c991ffc89d32..5fd11bd31bff4f5ac2e3749167a4cd28e0ee8446 100644
--- a/lib_enc/scale_enc_fx.c
+++ b/lib_enc/scale_enc_fx.c
@@ -62,6 +62,8 @@ void Scale_wsp(
Scale_sig( mem_decim2, 3, *Q_exp );
Copy( old_wsp12k8, wsp - L_WSP_MEM, L_WSP_MEM ); /* Now memory and wsp vector have the same scaling */
+
+ return;
}
/*-------------------------------------------------------------------*
@@ -87,12 +89,6 @@ void Preemph_scaled(
Word16 mu, shift, QVal;
Word32 L_tmp, L_maxloc;
Word16 Q_min;
-#if !defined( ISSUE_1867_replace_overflow_libenc )
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/*---------------------------------------------------------------*
* Perform fixed preemphasis through 1 - g z^-1 *
@@ -100,13 +96,7 @@ void Preemph_scaled(
*---------------------------------------------------------------*/
BASOP_SATURATE_WARNING_OFF_EVS
-
-#ifdef ISSUE_1867_replace_overflow_libenc
QVal = shl_sat( 1, sub( 15, bits ) ); //?sat
-#else
- Overflow = 0;
- QVal = shl_sat( 1, sub( 15, bits ) );
-#endif
BASOP_SATURATE_WARNING_ON_EVS
mu = shr( Preemph_factor, bits ); /* Q15 --> Q(15-bits) */
@@ -123,11 +113,7 @@ void Preemph_scaled(
/* Equivalent to tmp = max((abs(x[i] - mu*x[i-1]),tmp)
* finds the max of preemphasized signal */
L_tmp = L_mult( new_speech[i], QVal );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_msu_sat( L_tmp, new_speech[i - 1], mu );
-#else
- L_tmp = L_msu_o( L_tmp, new_speech[i - 1], mu, &Overflow );
-#endif
L_tmp = L_abs( L_tmp );
L_maxloc = L_max( L_tmp, L_maxloc );
}
@@ -177,11 +163,7 @@ void Preemph_scaled(
FOR( i = sub( Lframe, 1 ); i > 0; i-- )
{
L_tmp = L_mult( new_speech[i], QVal );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_msu_sat( L_tmp, new_speech[i - 1], mu );
-#else
- L_tmp = L_msu_o( L_tmp, new_speech[i - 1], mu, &Overflow );
-#endif
L_tmp = L_shl( L_tmp, *Q_new );
new_speech[i] = round_fx_sat( L_tmp ); // Q_new
}
@@ -192,7 +174,11 @@ void Preemph_scaled(
new_speech[0] = round_fx_sat( L_tmp );
*mem_preemph = tmp_fixed;
move16();
+
+ return;
}
+
+
/*-------------------------------------------------------------------*
* Scale_mem
*
@@ -214,11 +200,6 @@ Word32 Scale_mem_pre_proc( /* o : Min energy scaled
{
Word16 i;
Word32 e_min_scaled;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
-#endif
-#endif
e_min_scaled = L_shr_r( L_add( L_shr( E_MIN_FXQ15, sub( 14, add( *Q_new, QSCALE ) ) ), 1 ), 1 );
@@ -247,21 +228,12 @@ Word32 Scale_mem_pre_proc( /* o : Min energy scaled
/* Do scaling and valide minimum energy value */
FOR( i = 0; i < NB_BANDS; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
enrO[i] = L_max( L_shl_sat( enrO[i], Q_exp ), e_min_scaled );
bckr[i] = L_max( L_shl_sat( bckr[i], Q_exp ), e_min_scaled );
ave_enr[i] = L_max( L_shl_sat( ave_enr[i], Q_exp ), e_min_scaled );
ave_enr2[i] = L_max( L_shl_sat( ave_enr2[i], Q_exp ), e_min_scaled );
st_fr_bands1[i] = L_max( L_shl_sat( st_fr_bands1[i], Q_exp ), e_min_scaled );
st_fr_bands2[i] = L_max( L_shl_sat( st_fr_bands2[i], Q_exp ), e_min_scaled );
-#else
- enrO[i] = L_max( L_shl_o( enrO[i], Q_exp, &Overflow ), e_min_scaled );
- bckr[i] = L_max( L_shl_o( bckr[i], Q_exp, &Overflow ), e_min_scaled );
- ave_enr[i] = L_max( L_shl_o( ave_enr[i], Q_exp, &Overflow ), e_min_scaled );
- ave_enr2[i] = L_max( L_shl_o( ave_enr2[i], Q_exp, &Overflow ), e_min_scaled );
- st_fr_bands1[i] = L_max( L_shl_o( st_fr_bands1[i], Q_exp, &Overflow ), e_min_scaled );
- st_fr_bands2[i] = L_max( L_shl_o( st_fr_bands2[i], Q_exp, &Overflow ), e_min_scaled );
-#endif
move32();
move32();
move32();
@@ -271,9 +243,11 @@ Word32 Scale_mem_pre_proc( /* o : Min energy scaled
}
}
}
+
return e_min_scaled;
}
+
void Scale_mem_enc(
Word16 Q_exp, /* i : Diff scaling factor */
Word16 *old_speech16k, /* i/o: Speech memory */
diff --git a/lib_enc/set_impulse_fx.c b/lib_enc/set_impulse_fx.c
index e1f9cf6e9a843de43166481a49042a5565da17b4..68dc2038ea38dd93e3680312453c32b8858a48a0 100644
--- a/lib_enc/set_impulse_fx.c
+++ b/lib_enc/set_impulse_fx.c
@@ -12,6 +12,7 @@
/*-----------------------------------------------------------------*
* Local constant
+
*-----------------------------------------------------------------*/
#define INPOL 4 /* +- range in samples for impulse position searching */
@@ -69,12 +70,7 @@ void set_impulse_fx(
Word16 krit_fx, krit_max_fx, gain16;
Word32 Lrr, Ldd, Ltmp, Ltmp1;
const Word16 *pt_Glt;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
krit_max_fx = -32768;
move16();
@@ -125,21 +121,12 @@ void set_impulse_fx(
/* nominator & DEnominator row <0> */
FOR( i = 0; i < L_SUBFR; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
Lrr = L_mac_sat( Lrr, gh_fx[i], gh_fx[i] ); // Q27
Ldd = L_mac_sat( Ldd, gh_fx[i], xn_fx[i] ); // Q27
-#else
- Lrr = L_mac_o( Lrr, gh_fx[i], gh_fx[i], &Overflow ); // Q27
- Ldd = L_mac_o( Ldd, gh_fx[i], xn_fx[i], &Overflow ); // Q27
-#endif
}
rr_fx[start1] = Lrr;
move32();
-#ifdef ISSUE_1867_replace_overflow_libenc
dd_fx[start1] = round_fx_sat( Ldd ); // Q11
-#else
- dd_fx[start1] = round_fx_o( Ldd, &Overflow ); // Q11
-#endif
rr_fx[start1] = L_max( rr_fx[start1], 1 );
FOR( i = add( start1, 1 ); i < L_IMPULSE2; i++ )
@@ -153,25 +140,15 @@ void set_impulse_fx(
gh_fx[j] = mac_r( L_deposit_h( gh_fx[j - 1] ),
Glottal_cdbk_fx[m * L_IMPULSE + L_IMPULSE2 - i], h_orig_fx[j] ); // Q13
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
Lrr = L_mac_sat( Lrr, gh_fx[j], gh_fx[j] ); // Q27
Ldd = L_mac_sat( Ldd, gh_fx[j], xn_fx[j] ); // Q27
-#else
- Lrr = L_mac_o( Lrr, gh_fx[j], gh_fx[j], &Overflow ); // Q27
- Ldd = L_mac_o( Ldd, gh_fx[j], xn_fx[j], &Overflow ); // Q27
-#endif
}
gh_fx[0] = mult_r( Glottal_cdbk_fx[m * L_IMPULSE + L_IMPULSE2 - i], h_orig_fx[0] ); // Q13
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
Lrr = L_mac_sat( Lrr, gh_fx[0], gh_fx[0] ); // Q27
Ldd = L_mac_sat( Ldd, gh_fx[0], xn_fx[0] ); // Q27
-#else
- Lrr = L_mac_o( Lrr, gh_fx[0], gh_fx[0], &Overflow ); // Q27
- Ldd = L_mac_o( Ldd, gh_fx[0], xn_fx[0], &Overflow ); // Q27
-#endif
- dd_fx[i] = round_fx_sat( Ldd ); // Q11
+ dd_fx[i] = round_fx_sat( Ldd ); // Q11
rr_fx[i] = L_max( Lrr, 1 );
move32();
/* move rr and dd into rr[i] and dd[i] */
@@ -204,11 +181,7 @@ void set_impulse_fx(
FOR( i = L_SUBFR - 2; i >= start2; i-- )
{
/*rr[i] = rr[i+1] + gh[L_SUBFR+L_IMPULSE2-1-i]*gh[L_SUBFR+L_IMPULSE2-1-i];*/
-#ifdef ISSUE_1867_replace_overflow_libenc
rr_fx[i] = L_mac_sat( rr_fx[i + 1], gh_fx[L_SUBFR + L_IMPULSE2 - 1 - i], gh_fx[L_SUBFR + L_IMPULSE2 - 1 - i] ); // Q27
-#else
- rr_fx[i] = L_mac_o( rr_fx[i + 1], gh_fx[L_SUBFR + L_IMPULSE2 - 1 - i], gh_fx[L_SUBFR + L_IMPULSE2 - 1 - i], &Overflow ); // Q27
-#endif
move32();
}
/* nominator rows */
diff --git a/lib_enc/sig_clas_fx.c b/lib_enc/sig_clas_fx.c
index beb97514a0d139e512f3936143a461e75d89de6e..78caad798f008b29eaa213f9f11c55fe575f3713 100644
--- a/lib_enc/sig_clas_fx.c
+++ b/lib_enc/sig_clas_fx.c
@@ -5,7 +5,6 @@
#include
#include "options.h" /* Compilation switches */
#include "cnst.h" /* Common constants */
-//#include "prot_fx.h" /* Function prototypes */
#include "rom_com.h"
#include "prot_fx.h" /* Function prototypes */
#include "prot_fx_enc.h" /* Function prototypes */
diff --git a/lib_enc/speech_music_classif_fx.c b/lib_enc/speech_music_classif_fx.c
index 045000fcea581d967261fe3ea86befff50edfbba..38fd1726005ea31439079f1bdebb53e8d36bb85a 100644
--- a/lib_enc/speech_music_classif_fx.c
+++ b/lib_enc/speech_music_classif_fx.c
@@ -660,12 +660,6 @@ static Word16 sp_mus_classif_gmm_fx( /* o : decis
Word16 tmp1, tmp2, exp2, scale, exp3;
SP_MUS_CLAS_HANDLE hSpMusClas = st_fx->hSpMusClas;
HQ_ENC_HANDLE hHQ_core = st_fx->hHQ_core;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
/*------------------------------------------------------------------*
* Initialization
@@ -794,18 +788,10 @@ static Word16 sp_mus_classif_gmm_fx( /* o : decis
sum_PS = L_deposit_l( 0 );
FOR( i = LOWEST_FBIN; i < HIGHEST_FBIN; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sum_PS = L_add_sat( sum_PS, PS[i] );
-#else
- sum_PS = L_add_o( sum_PS, PS[i], &Overflow );
-#endif
}
exp1 = norm_l( sum_PS );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp1 = round_fx_sat( L_shl( sum_PS, exp1 ) );
-#else
- tmp1 = round_fx_o( L_shl( sum_PS, exp1 ), &Overflow );
-#endif
exp1 = sub( 30, exp1 );
FOR( i = LOWEST_FBIN; i < HIGHEST_FBIN; i++ )
@@ -813,11 +799,7 @@ static Word16 sp_mus_classif_gmm_fx( /* o : decis
/*PS_norm[i] = PS[i] / sum_PS;*/
/*dPS[i] = (float)fabs(PS_norm[i] - st->past_PS[i]);*/
exp2 = norm_l( PS[i] );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp2 = round_fx_sat( L_shl( PS[i], exp2 ) );
-#else
- tmp2 = round_fx_o( L_shl( PS[i], exp2 ), &Overflow );
-#endif
exp2 = sub( 30, exp2 );
scale = shr( sub( tmp1, tmp2 ), 15 );
@@ -878,11 +860,7 @@ static Word16 sp_mus_classif_gmm_fx( /* o : decis
ELSE
{
exp1 = norm_l( L_add( dPS[i], 336 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp1 = round_fx_sat( L_shl_sat( L_add( dPS[i], 336 ), exp1 ) );
-#else
- tmp1 = round_fx_o( L_shl_o( L_add( dPS[i], 336 ), exp1, &Overflow ), &Overflow );
-#endif
exp1 = sub( 30, exp1 );
exp2 = norm_l( mx );
@@ -939,11 +917,7 @@ static Word16 sp_mus_classif_gmm_fx( /* o : decis
FOR( i = 0; i < N_FEATURES; i++ )
{
/**pFV = pSF[0] * *pFV + pSF[1];*/
-#ifdef ISSUE_1867_replace_overflow_libenc
*pFV = round_fx_sat( L_shl_sat( L_mac( pSF_a[i], *pFV, pSF_m[i] ), ishift[i] ) );
-#else
- *pFV = round_fx_o( L_shl_o( L_mac( pSF_a[i], *pFV, pSF_m[i] ), ishift[i], &Overflow ), &Overflow );
-#endif
move16();
pFV++;
}
@@ -974,11 +948,7 @@ static Word16 sp_mus_classif_gmm_fx( /* o : decis
FOR( p = 0; p < N_FEATURES; p++ )
{
/* xm[p] = FV[p] - m_speech[k*N_FEATURES+p];*/
-#ifdef ISSUE_1867_replace_overflow_libenc
xm[p] = sub_sat( FV[p], m_speech_fx[k * N_FEATURES + p] );
-#else
- xm[p] = sub_o( FV[p], m_speech_fx[k * N_FEATURES + p], &Overflow );
-#endif
move16(); /*Q15 */
}
@@ -994,11 +964,7 @@ static Word16 sp_mus_classif_gmm_fx( /* o : decis
FOR( p = 0; p < N_FEATURES; p++ )
{
/*xm[p] = FV[p] - m_noise[k*N_FEATURES+p];*/
-#ifdef ISSUE_1867_replace_overflow_libenc
xm[p] = sub_sat( FV[p], m_noise_fx[k * N_FEATURES + p] );
-#else
- xm[p] = sub_o( FV[p], m_noise_fx[k * N_FEATURES + p], &Overflow );
-#endif
move16(); /*Q15 */
}
@@ -1013,11 +979,7 @@ static Word16 sp_mus_classif_gmm_fx( /* o : decis
FOR( p = 0; p < N_FEATURES; p++ )
{
/*xm[p] = FV[p] - m_music[k*N_FEATURES+p];*/
-#ifdef ISSUE_1867_replace_overflow_libenc
xm[p] = sub_sat( FV[p], m_music_fx[k * N_FEATURES + p] );
-#else
- xm[p] = sub_o( FV[p], m_music_fx[k * N_FEATURES + p], &Overflow );
-#endif
move16(); /*Q15 */
}
@@ -1031,11 +993,7 @@ static Word16 sp_mus_classif_gmm_fx( /* o : decis
/* calculate log-probability */
/*log(0.0001)-0.5f * N_FEATURES * LOG_PI2 in Q9 */
-#ifdef ISSUE_1867_replace_overflow_libenc
lps = extract_h( L_shl_sat( L_sub( max_s, LOG_PROB_CONST ), 16 - 1 ) ); /*Q9 */
-#else
- lps = extract_h( L_shl_o( L_sub( max_s, LOG_PROB_CONST ), 16 - 1, &Overflow ) ); /*Q9 */
-#endif
lps = s_max( lps, -10832 );
lpm = extract_h( L_shl( L_sub( max_m, LOG_PROB_CONST ), 16 - 1 ) ); /*Q9 */
@@ -1043,11 +1001,7 @@ static Word16 sp_mus_classif_gmm_fx( /* o : decis
/*
lpn = (float)log(pyn) - 0.5f * N_FEATURES * (float)log(2*PI);
*/
-#ifdef ISSUE_1867_replace_overflow_libenc
lpn = extract_h( L_shl_sat( L_sub( max_n, LOG_PROB_CONST ), 16 - 1 ) ); /*Q9 */
-#else
- lpn = extract_h( L_shl_o( L_sub( max_n, LOG_PROB_CONST ), 16 - 1, &Overflow ) ); /*Q9 */
-#endif
lpn = s_max( lpn, -10832 );
*high_lpn_flag_ptr = 0;
@@ -1499,12 +1453,6 @@ static Word16 attack_det_fx( /* o : attack flag
Word16 i, j, tmp, tmp1, attack, exp1;
Word32 L_tmp, etmp, etmp2, finc[ATT_NSEG];
Word16 att_3lsub_pos;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
att_3lsub_pos = ATT_3LSUB_POS;
move16();
@@ -1521,11 +1469,7 @@ static Word16 attack_det_fx( /* o : attack flag
FOR( j = 1; j < ATT_SEG_LEN; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac0_sat( L_tmp, inp[i * ATT_SEG_LEN + j], inp[i * ATT_SEG_LEN + j] ); /*2*Qx */
-#else
- L_tmp = L_mac0_o( L_tmp, inp[i * ATT_SEG_LEN + j], inp[i * ATT_SEG_LEN + j], &Overflow ); /*2*Qx */
-#endif
}
finc[i] = L_tmp;
@@ -1550,11 +1494,7 @@ static Word16 attack_det_fx( /* o : attack flag
FOR( i = 1; i < att_3lsub_pos; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_add_sat( L_tmp, L_shr_sat( finc[i], Qx ) ); /*Qx */
-#else
- L_tmp = L_add_o( L_tmp, L_shr_sat( finc[i], Qx ), &Overflow ); /*Qx */
-#endif
}
L_tmp = Mult_32_16( L_tmp, tmp ); /*Q(14-exp1+Qx) */
etmp = L_shl( L_tmp, sub( exp1, 14 ) ); /*Qx */
@@ -1566,11 +1506,7 @@ static Word16 attack_det_fx( /* o : attack flag
L_tmp = L_shr_sat( finc[attack], Qx ); /*Qx */
FOR( i = 1; i < tmp1; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_add_sat( L_tmp, L_shr_sat( finc[i + attack], Qx ) ); /*Qx */
-#else
- L_tmp = L_add_o( L_tmp, L_shr_sat( finc[i + attack], Qx ), &Overflow ); /*Qx */
-#endif
}
L_tmp = Mult_32_16( L_tmp, tmp ); /*Q(14-exp1+Qx) */
etmp2 = L_shl( L_tmp, sub( exp1, 14 ) ); /*Qx */
@@ -1977,8 +1913,8 @@ Word16 ivas_smc_gmm_fx(
Word16 guard_bits = find_guarded_bits_fx( NB_MEL_BANDS );
move16();
- v_mult_mat_fixed( mfcc_fx, melS_fx, dct_mtx_fx, NB_MEL_BANDS, NB_MEL_COEF, guard_bits ); // Q19
- *pFV_fx++ = L_shl( mfcc_fx[2], 1 ); // Q20
+ v_mult_mat_fx( mfcc_fx, melS_fx, dct_mtx_fx, NB_MEL_BANDS, NB_MEL_COEF, guard_bits ); // Q19
+ *pFV_fx++ = L_shl( mfcc_fx[2], 1 ); // Q20
move32();
*pFV_fx++ = L_shl( mfcc_fx[6], 1 );
move32();
@@ -2235,8 +2171,9 @@ Word16 ivas_smc_gmm_fx(
}
/* PCA */
- v_sub_fixed_no_hdrm( FV_fx, pca_mean_fx, FV_fx, N_SMC_FEATURES );
- v_mult_mat_fixed( FV_fx, FV_fx, pca_components_fx, N_SMC_FEATURES, N_PCA_COEF, 0 );
+ v_sub_fx_no_hdrm( FV_fx, pca_mean_fx, FV_fx, N_SMC_FEATURES );
+ v_mult_mat_fx( FV_fx, FV_fx, pca_components_fx, N_SMC_FEATURES, N_PCA_COEF, 0 );
+
/*------------------------------------------------------------------*
* Calculation of posterior probability
* Log-probability
@@ -2251,15 +2188,15 @@ Word16 ivas_smc_gmm_fx(
FOR( m = 0; m < N_SMC_MIXTURES; m++ )
{
v_sub32_fx( FV_fx, &means_speech_fx[m * N_PCA_COEF], fvm_fx, N_PCA_COEF );
- wprob_fx = dot_product_cholesky_fixed( fvm_fx, &prec_chol_speech_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF ); // Q10
+ wprob_fx = dot_product_cholesky_fx( fvm_fx, &prec_chol_speech_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF ); // Q10
ps_fx[m] = L_sub( L_sub( L_add( log_weights_speech_compute[m], log_det_chol_speech_fx[m] ), W_extract_l( W_shr( wprob_fx, Q10 ) ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18
move32();
v_sub32_fx( FV_fx, &means_music_fx[m * N_PCA_COEF], fvm_fx, N_PCA_COEF );
- wprob_fx = dot_product_cholesky_fixed( fvm_fx, &prec_chol_music_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF ); // Q10
+ wprob_fx = dot_product_cholesky_fx( fvm_fx, &prec_chol_music_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF ); // Q10
pm_fx[m] = L_sub( L_sub( L_add( log_weights_music_compute[m], log_det_chol_music_fx[m] ), W_extract_l( W_shr( wprob_fx, Q10 ) ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18
move32();
v_sub32_fx( FV_fx, &means_noise_fx[m * N_PCA_COEF], fvm_fx, N_PCA_COEF );
- wprob_fx = dot_product_cholesky_fixed( fvm_fx, &prec_chol_noise_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF ); // Q10
+ wprob_fx = dot_product_cholesky_fx( fvm_fx, &prec_chol_noise_fx[m * ( N_PCA_COEF * N_PCA_COEF + N_PCA_COEF ) / 2], N_PCA_COEF ); // Q10
pn_fx[m] = L_sub( L_sub( L_add( log_weights_noise_compute[m], log_det_chol_noise_fx[m] ), W_extract_l( W_shr( wprob_fx, Q10 ) ) ), HALF_N_PCA_COEF_LOG_P12_Q18 ); // Q18
move32();
}
@@ -2669,13 +2606,6 @@ static Word16 attack_det_ivas_fx( /* o : attack flag
Word64 W_tmp;
Word16 q_diff;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
att_3lsub_pos = ATT_3LSUB_POS;
move16();
if ( GE_32( total_brate, ACELP_24k40 ) )
@@ -2691,11 +2621,7 @@ static Word16 attack_det_ivas_fx( /* o : attack flag
FOR( j = 1; j < ATT_SEG_LEN; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac0_sat( L_tmp, inp[i * ATT_SEG_LEN + j], inp[i * ATT_SEG_LEN + j] ); /*2*Qx */
-#else
- L_tmp = L_mac0_o( L_tmp, inp[i * ATT_SEG_LEN + j], inp[i * ATT_SEG_LEN + j], &Overflow ); /*2*Qx */
-#endif
}
finc[i] = L_tmp;
@@ -3736,12 +3662,6 @@ static void spec_analysis_fx(
Word16 peak_idx[65];
Word16 valey_idx[65];
Word16 p2v[65];
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* find spectral peaks */
k = 0;
@@ -3824,15 +3744,7 @@ static void spec_analysis_fx(
test();
IF( GT_16( peak_idx[k], valey_idx[i] ) && LT_16( peak_idx[k], valey_idx[i + 1] ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
p2v[k] = sub_sat( shl_sat( peak[k], 1 ), add_sat( valley[i], valley[i + 1] ) );
-#else
-#ifdef ISSUE_1796_replace_shl_o
- p2v[k] = sub_o( shl_sat( peak[k], 1 ), add_o( valley[i], valley[i + 1], &Overflow ), &Overflow );
-#else
- p2v[k] = sub_o( shl_o( peak[k], 1, &Overflow ), add_o( valley[i], valley[i + 1], &Overflow ), &Overflow );
-#endif
-#endif
move16();
k = add( k, 1 );
}
diff --git a/lib_enc/stat_enc.h b/lib_enc/stat_enc.h
index d9afb7f996e8e889ddcf74a95f8a68dda943d4a8..e20c06fd45eee9b8b8b1158c0df4b16d9722d4a7 100644
--- a/lib_enc/stat_enc.h
+++ b/lib_enc/stat_enc.h
@@ -1685,7 +1685,6 @@ typedef struct enc_core_structure
Word16 encoderLookahead_FB;
/* pitch_ol for adaptive lag window */
-
Word16 old_pitch_la; /* past open loop pitch lag from look-ahead before very short stable pitch detection */
Word16 old_voicing_la; /* past open loop pitch gain from look-ahead */
diff --git a/lib_enc/stat_noise_uv_enc_fx.c b/lib_enc/stat_noise_uv_enc_fx.c
index 364bd1dcedc05f0c6b669cbe3b76f3512aaa34c1..a62963ff002602651abcb3aebf952f69d621c347 100644
--- a/lib_enc/stat_noise_uv_enc_fx.c
+++ b/lib_enc/stat_noise_uv_enc_fx.c
@@ -49,34 +49,21 @@ void stat_noise_uv_enc_fx(
Word16 noisiness = 0;
move16();
Word16 num, den, expn, expd;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
+
test();
test();
test();
IF( ( EQ_16( st_fx->coder_type, UNVOICED ) && uc_two_stage_flag == 0 ) || ( EQ_16( st_fx->coder_type, INACTIVE ) && LE_32( st_fx->core_brate, ACELP_9k60 ) ) )
{
-
/*-----------------------------------------------------------------*
* Calculate and write the noisiness parameter
*-----------------------------------------------------------------*/
+
/* epsP[2] is located in LepsP[0] and epsP[16] in LepsP[1] */
expn = sub( norm_l( LepsP[0] ), 1 );
-#ifdef ISSUE_1867_replace_overflow_libenc
num = extract_h( L_shl( LepsP[0], expn ) ); /*expn-16*/
-#else
- num = extract_h( L_shl_o( LepsP[0], expn, &Overflow ) ); /*expn-16*/
-#endif
expd = norm_l( LepsP[1] );
-#ifdef ISSUE_1867_replace_overflow_libenc
- den = extract_h( L_shl( LepsP[1], expd ) ); /*expd-16*/
-#else
- den = extract_h( L_shl_o( LepsP[1], expd, &Overflow ) ); /*expd-16*/
-#endif
+ den = extract_h( L_shl( LepsP[1], expd ) ); /*expd-16*/
num = div_s( num, den ); /*expn-expd+15*/
num = shr_sat( num, add( sub( expn, expd ), 5 ) ); /*Q10*/
num = sub( num, 1024 ); /*num - 1*/
@@ -132,34 +119,21 @@ void stat_noise_uv_enc_ivas_fx(
Word16 noisiness = 0;
move16();
Word16 num, den, expn, expd;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
test();
test();
test();
IF( ( EQ_16( st_fx->coder_type, UNVOICED ) && uc_two_stage_flag == 0 ) || ( EQ_16( st_fx->coder_type, INACTIVE ) && LE_32( st_fx->core_brate, ACELP_9k60 ) ) )
{
-
/*-----------------------------------------------------------------*
* Calculate and write the noisiness parameter
*-----------------------------------------------------------------*/
+
/* epsP[2] is located in LepsP[0] and epsP[16] in LepsP[1] */
expn = sub( norm_l( LepsP[0] ), 1 );
-#ifdef ISSUE_1867_replace_overflow_libenc
num = extract_h( L_shl( LepsP[0], expn ) ); /*expn-16*/
-#else
- num = extract_h( L_shl_o( LepsP[0], expn, &Overflow ) ); /*expn-16*/
-#endif
expd = norm_l( LepsP[1] );
-#ifdef ISSUE_1867_replace_overflow_libenc
- den = extract_h( L_shl( LepsP[1], expd ) ); /*expd-16*/
-#else
- den = extract_h( L_shl_o( LepsP[1], expd, &Overflow ) ); /*expd-16*/
-#endif
+ den = extract_h( L_shl( LepsP[1], expd ) ); /*expd-16*/
num = div_s( num, den ); /*expn-expd+15*/
num = shr_sat( num, add( sub( expn, expd ), 5 ) ); /*Q10*/
num = sub( num, 1024 ); /*num - 1*/
diff --git a/lib_enc/swb_bwe_enc_fx.c b/lib_enc/swb_bwe_enc_fx.c
index 4af21c5cb1bbc82ea808ee2f243436890273281b..af72e0f4926c25256e65079a8429764c0bf1d520 100644
--- a/lib_enc/swb_bwe_enc_fx.c
+++ b/lib_enc/swb_bwe_enc_fx.c
@@ -302,12 +302,6 @@ void swb_bwe_enc_ivas_fx(
Word16 fb_ener_adjust_fx;
Word16 ener_adjust_quan_fx = 0;
move16();
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
Word16 fb_band_begin;
Word16 q_new_input_hp;
@@ -409,11 +403,8 @@ void swb_bwe_enc_ivas_fx(
*----------------------------------------------------------------------*/
/* tilt returned in Q24 goto to Q11 */
-#ifdef ISSUE_1867_replace_overflow_libenc
tilt_nb_fx = round_fx_sat( L_shl_sat( calc_tilt_bwe_fx( old_input_lp_fx, Q_slb_speech, st_fx->L_frame ), 3 ) );
-#else
- tilt_nb_fx = round_fx_o( L_shl_o( calc_tilt_bwe_fx( old_input_lp_fx, Q_slb_speech, st_fx->L_frame ), 3, &Overflow ), &Overflow );
-#endif
+
/*---------------------------------------------------------------------*
* SWB BWE encoding
* FB BWE encoding
@@ -440,7 +431,7 @@ void swb_bwe_enc_ivas_fx(
/* high-band gain control in case of BWS */
IF( st_fx->bwidth_sw_cnt > 0 )
{
- v_multc_fixed_16( &yorig_32[L_FRAME16k], div_s( st_fx->bwidth_sw_cnt, BWS_TRAN_PERIOD ), &yorig_32[L_FRAME16k], sub( inner_frame, L_FRAME16k ) );
+ v_multc_fx_16( &yorig_32[L_FRAME16k], div_s( st_fx->bwidth_sw_cnt, BWS_TRAN_PERIOD ), &yorig_32[L_FRAME16k], sub( inner_frame, L_FRAME16k ) );
}
/* Convert to 16 Bits (Calc Shift Required to Stay within MAX_Q_NEW_INPUT) */
@@ -547,12 +538,8 @@ void swb_bwe_enc_ivas_fx(
exp1 = norm_l( L_tmp );
L_tmp = L_shl( L_tmp, exp1 );
exp = sub( sub( 31, exp1 ), sub( 30, exp ) );
- L_tmp = Isqrt_lc( L_tmp, &exp ); /*31-exp */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Isqrt_lc( L_tmp, &exp ); /*31-exp */
fb_ener_adjust_fx = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q15 */
-#else
- fb_ener_adjust_fx = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /*Q15 */
-#endif
}
ELSE
{
@@ -632,16 +619,8 @@ void swb_bwe_enc_fx(
Word16 fb_ener_adjust_fx;
Word16 ener_adjust_quan_fx = 0;
move16();
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
-
/*---------------------------------------------------------------------*
* Delay the original input signal to be synchronized with ACELP core synthesis
*---------------------------------------------------------------------*/
@@ -694,15 +673,13 @@ void swb_bwe_enc_fx(
*----------------------------------------------------------------------*/
/* tilt returned in Q24 goto to Q11 */
-#ifdef ISSUE_1867_replace_overflow_libenc
tilt_nb_fx = round_fx_sat( L_shl_sat( calc_tilt_bwe_fx( old_input_lp_fx, Q_slb_speech, st_fx->L_frame ), 3 ) );
-#else
- tilt_nb_fx = round_fx_o( L_shl_o( calc_tilt_bwe_fx( old_input_lp_fx, Q_slb_speech, st_fx->L_frame ), 3, &Overflow ), &Overflow );
-#endif
+
/*---------------------------------------------------------------------*
* SWB BWE encoding
* FB BWE encoding
*---------------------------------------------------------------------*/
+
new_input_fx_exp = 0;
move16();
/* MDCT of the core synthesis signal */
@@ -820,12 +797,8 @@ void swb_bwe_enc_fx(
L_tmp = L_shl( L_tmp, exp1 );
// exp = 31 - exp1 - ( 30 - exp );
exp = add( 31 - 30, sub( exp, exp1 ) );
- L_tmp = Isqrt_lc( L_tmp, &exp ); /*31-exp */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Isqrt_lc( L_tmp, &exp ); /*31-exp */
fb_ener_adjust_fx = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /*Q15 */
-#else
- fb_ener_adjust_fx = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /*Q15 */
-#endif
}
ELSE
{
@@ -845,6 +818,8 @@ void swb_bwe_enc_fx(
return;
}
+
+
/*==========================================================================*/
/* FUNCTION : static Word16 WB_BWE_fenv_q_fx() */
/*--------------------------------------------------------------------------*/
@@ -1026,13 +1001,6 @@ static Word16 FD_BWE_class_fx( /* o : FD BWE class
Word16 sharplimit;
Word16 numsharp, num, den;
Word16 numharmonic, tmp, expn, expd, scale;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
-
FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
mode = NORMAL;
@@ -1067,28 +1035,16 @@ static Word16 FD_BWE_class_fx( /* o : FD BWE class
{
IF( hBWE_FD->prev_global_gain_fx == 0 )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
gain_tmp = round_fx_sat( L_shl_sat( fGain, 30 ) ); /*Q14 */
-#else
- gain_tmp = round_fx_o( L_shl_o( fGain, 30, &Overflow ), &Overflow ); /*Q14 */
-#endif
}
ELSE
{
expn = norm_l( fGain );
-#ifdef ISSUE_1867_replace_overflow_libenc
num = extract_h( L_shl( fGain, expn ) );
-#else
- num = extract_h( L_shl_o( fGain, expn, &Overflow ) );
-#endif
expn = sub( sub( 30, expn ), shl( Q_shb, 1 ) );
expd = norm_l( hBWE_FD->prev_global_gain_fx );
-#ifdef ISSUE_1867_replace_overflow_libenc
den = extract_h( L_shl( hBWE_FD->prev_global_gain_fx, expd ) );
-#else
- den = extract_h( L_shl_o( hBWE_FD->prev_global_gain_fx, expd, &Overflow ) );
-#endif
expd = sub( sub( 30, expd ), shl( st_fx->prev_Q_shb, 1 ) );
scale = shr( sub( den, num ), 15 );
@@ -1186,13 +1142,9 @@ static Word16 FD_BWE_class_fx( /* o : FD BWE class
move16();
}
expd = norm_s( den );
- tmp = div_s( shl( 1, sub( 14, expd ) ), den ); /*Q(29-expd-Q_syn) */
- L_tmp = L_mult( tmp, peak ); /*Q(30-expd) */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ tmp = div_s( shl( 1, sub( 14, expd ) ), den ); /*Q(29-expd-Q_syn) */
+ L_tmp = L_mult( tmp, peak ); /*Q(30-expd) */
sharp = round_fx_sat( L_shl_sat( L_tmp, sub( expd, 4 ) ) ); /*Q10 */
-#else
- sharp = round_fx_o( L_shl_o( L_tmp, sub( expd, 4 ), &Overflow ), &Overflow ); /*Q10 */
-#endif
}
ELSE
{
@@ -1388,12 +1340,7 @@ static void vqWithCand_w_fx(
const Word16 *p_E_ROM_dico;
Word16 dist, temp1;
Word32 L_dist, L_tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
IF( flag )
{
set32_fx( dist_min, MAX_32, surv ); /* FLT_MAX */
@@ -1409,22 +1356,14 @@ static void vqWithCand_w_fx(
FOR( i = 0; i < E_ROM_dico_size; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
dist = sub_sat( x[0], *p_E_ROM_dico++ ); /*Q8 */
-#else
- dist = sub_o( x[0], *p_E_ROM_dico++, &Overflow ); /*Q8 */
-#endif
- L_dist = L_mult( dist, w[0] ); /*Q22 */
- L_dist = Mult_32_16( L_dist, dist ); /*Q15 */
- L_dist = L_shr( L_dist, 10 ); /*Q5 */
+ L_dist = L_mult( dist, w[0] ); /*Q22 */
+ L_dist = Mult_32_16( L_dist, dist ); /*Q15 */
+ L_dist = L_shr( L_dist, 10 ); /*Q5 */
FOR( j = 1; j < dim; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
temp1 = sub_sat( x[j], *p_E_ROM_dico++ );
-#else
- temp1 = sub_o( x[j], *p_E_ROM_dico++, &Overflow );
-#endif
L_tmp = L_mult( temp1, w[j] ); /*Q22 */
L_tmp = Mult_32_16( L_tmp, temp1 ); /*Q15 */
L_dist = L_add( L_dist, L_shr( L_tmp, 10 ) ); /*Q5 */
@@ -1699,12 +1638,6 @@ static void msvq_interpol_fx(
Word16 quant_select[SWB_FENV], w_env11[SWB_FENV / 2], w_env12[SWB_FENV / 2], tmp;
Word32 L_tmp, distCand[N_CAND], L_dist, L_minDist;
Word16 synth_energy[SWB_FENV];
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* Extract target vector */
FOR( n_band = 0; n_band < DIM11; n_band++ )
@@ -1744,21 +1677,13 @@ static void msvq_interpol_fx(
/* Extract vector for odd position */
FOR( n_band = 0; n_band < DIM11; n_band++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
quant_tmp[n_band] = add_sat( quant_tmp1[n_band], quant_tmp2[n_band] );
-#else
- quant_tmp[n_band] = add_o( quant_tmp1[n_band], quant_tmp2[n_band], &Overflow );
-#endif
move16();
}
FOR( n_band = 0; n_band < DIM12 - 1; n_band++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = add_sat( quant_tmp[n_band], quant_tmp[n_band + 1] ); /*Q8 */
-#else
- tmp = add_o( quant_tmp[n_band], quant_tmp[n_band + 1], &Overflow ); /*Q8 */
-#endif
tmp = shr( tmp, 1 );
quant_tmp2[n_band] = sub( env_temp12[n_band], tmp );
move16(); /*Q8 */
@@ -1781,11 +1706,7 @@ static void msvq_interpol_fx(
FOR( n_band = 0; n_band < DIM12 - 1; n_band++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = add_sat( quant_tmp[n_band], quant_tmp[n_band + 1] );
-#else
- tmp = add_o( quant_tmp[n_band], quant_tmp[n_band + 1], &Overflow );
-#endif
tmp = shr( tmp, 1 );
quant_select[( n_band << 1 ) + 1] = add( tmp, quant_tmp2[n_band] );
move16(); /*Q8 */
@@ -1845,12 +1766,7 @@ static void msvq_interpol_2_fx(
Word16 quant_select[SWB_FENV], w_env11[SWB_FENV / 2], w_env12[SWB_FENV / 2];
Word32 L_tmp, distCand[N_CAND], L_dist, L_minDist;
Word16 synth_energy[SWB_FENV];
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
/* Extract target vector */
FOR( n_band = 0; n_band < DIM11 - 1; n_band++ )
{
@@ -1907,17 +1823,9 @@ static void msvq_interpol_2_fx(
move16();
FOR( n_band = 1; n_band < DIM12 - 1; n_band++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp_q = add_sat( quant_tmp[n_band - 1], quant_tmp[n_band] );
-#else
- tmp_q = add_o( quant_tmp[n_band - 1], quant_tmp[n_band], &Overflow );
-#endif
tmp_q = shr( tmp_q, 1 );
-#ifdef ISSUE_1867_replace_overflow_libenc
quant_tmp2[n_band] = sub_sat( env_temp12[n_band], tmp_q );
-#else
- quant_tmp2[n_band] = sub_o( env_temp12[n_band], tmp_q, &Overflow );
-#endif
move16();
}
@@ -1938,17 +1846,9 @@ static void msvq_interpol_2_fx(
move16(); /*Q8 */
FOR( n_band = 1; n_band < DIM12 - 1; n_band++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp_q = add_sat( quant_tmp[n_band - 1], quant_tmp[n_band] );
-#else
- tmp_q = add_o( quant_tmp[n_band - 1], quant_tmp[n_band], &Overflow );
-#endif
tmp_q = shr( tmp_q, 1 );
-#ifdef ISSUE_1867_replace_overflow_libenc
quant_select[( n_band << 1 ) - 1] = add_sat( quant_tmp2[n_band], tmp_q );
-#else
- quant_select[( n_band << 1 ) - 1] = add_o( quant_tmp2[n_band], tmp_q, &Overflow );
-#endif
}
L_dist = L_deposit_l( 0 );
@@ -2010,12 +1910,6 @@ static void calculate_Tonality_fx(
Word16 org_spec[80], gen_spec[80];
Word32 L_log_gm_org, L_log_gm_gen;
Word16 l_shift;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* to reduce dynamic range of original spectrum */
max = 0;
@@ -2120,11 +2014,7 @@ static void calculate_Tonality_fx(
L_tmp2 = Mpy_32_16_1( L_log_gm_org, inv_len ); /* Q14 */
L_tmp = L_sub( L_tmp1, L_tmp2 );
-#ifdef ISSUE_1867_replace_overflow_libenc
*SFM_org = round_fx_sat( L_shl_sat( L_tmp, 14 ) ); /*Q12 */
-#else
- *SFM_org = round_fx_o( L_shl_o( L_tmp, 14, &Overflow ), &Overflow ); /*Q12 */
-#endif
move16();
*SFM_org = s_max( 0, s_min( *SFM_org, 24547 ) );
move16(); /*0.0001 and 5.993 in Q12 */
@@ -2145,11 +2035,7 @@ static void calculate_Tonality_fx(
L_tmp2 = Mpy_32_16_1( L_log_gm_gen, inv_len ); /* Q14 */
L_tmp = L_sub( L_tmp1, L_tmp2 );
-#ifdef ISSUE_1867_replace_overflow_libenc
*SFM_gen = round_fx_sat( L_shl_sat( L_tmp, 14 ) ); /*Q12 */
-#else
- *SFM_gen = round_fx_o( L_shl_o( L_tmp, 14, &Overflow ), &Overflow ); /*Q12 */
-#endif
move16();
*SFM_gen = s_max( 0, s_min( *SFM_gen, 24547 ) );
move16(); /*0.0001 and 5.993 in Q12 */
@@ -2178,12 +2064,6 @@ static void calculate_Tonality_ivas_fx(
Word16 org_spec[80], gen_spec[80];
Word32 L_log_gm_org, L_log_gm_gen;
Word16 l_shift;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
/* to reduce dynamic range of original spectrum */
max = 0;
@@ -2288,11 +2168,7 @@ static void calculate_Tonality_ivas_fx(
L_tmp2 = Mpy_32_16_1( L_log_gm_org, inv_len ); /* Q14 */
L_tmp = L_sub( L_tmp1, L_tmp2 );
-#ifdef ISSUE_1867_replace_overflow_libenc
*SFM_org = round_fx_sat( L_shl_sat( L_tmp, 14 ) ); /*Q12 */
-#else
- *SFM_org = round_fx_o( L_shl_o( L_tmp, 14, &Overflow ), &Overflow ); /*Q12 */
-#endif
move16();
*SFM_org = s_max( 0, s_min( *SFM_org, 24547 ) );
move16(); /*0.0001 and 5.993 in Q12 */
@@ -2313,11 +2189,7 @@ static void calculate_Tonality_ivas_fx(
L_tmp2 = Mpy_32_16_1( L_log_gm_gen, inv_len ); /* Q14 */
L_tmp = L_sub( L_tmp1, L_tmp2 );
-#ifdef ISSUE_1867_replace_overflow_libenc
*SFM_gen = round_fx_sat( L_shl_sat( L_tmp, 14 ) ); /*Q12 */
-#else
- *SFM_gen = round_fx_o( L_shl_o( L_tmp, 14, &Overflow ), &Overflow ); /*Q12 */
-#endif
move16();
*SFM_gen = s_max( 0, s_min( *SFM_gen, 24547 ) );
move16(); /*0.0001 and 5.993 in Q12 */
@@ -2705,13 +2577,6 @@ static Word16 SWB_BWE_encoding_fx(
Word16 SWB_tenv_tmp_fx[SWB_TENV];
Word16 max_fx;
Word16 energy_factor_fx[SWB_FENV], w_env_fx[SWB_FENV];
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
-
FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
@@ -2752,11 +2617,8 @@ static Word16 SWB_BWE_encoding_fx(
}
/* tilt returned in Q24 go to Q11 */
-#ifdef ISSUE_1867_replace_overflow_libenc
tilt_fx = round_fx_sat( L_shl_sat( calc_tilt_bwe_fx( insig_fx, 0, L_FRAME32k ), 3 ) );
-#else
- tilt_fx = round_fx_o( L_shl_o( calc_tilt_bwe_fx( insig_fx, 0, L_FRAME32k ), 3, &Overflow ), &Overflow );
-#endif
+
test();
test();
IF( EQ_16( IsTransient, 1 ) && ( GT_16( tilt_fx, 16384 ) || GT_16( st_fx->clas, 1 ) ) )
@@ -2860,11 +2722,7 @@ static Word16 SWB_BWE_encoding_fx(
L_tmp = L_deposit_h( tmp );
L_tmp = Isqrt_lc( L_tmp, &expn ); /*31-expn */
-#ifdef ISSUE_1867_replace_overflow_libenc
Rat_tenv_fx = round_fx_sat( L_shl_sat( L_tmp, sub( expn, 1 ) ) ); /*Q14 */
-#else
- Rat_tenv_fx = round_fx_o( L_shl_o( L_tmp, sub( expn, 1 ), &Overflow ), &Overflow ); /*Q14 */
-#endif
}
ELSE
{
@@ -2876,11 +2734,7 @@ static Word16 SWB_BWE_encoding_fx(
{
L_tmp = L_mult( Rat_tenv_fx, 19661 ); /*Q29 */
-#ifdef ISSUE_1867_replace_overflow_libenc
Rat_tenv_fx = round_fx_sat( L_shl_sat( L_tmp, 2 ) ); /*Q15 */
-#else
- Rat_tenv_fx = round_fx_o( L_shl_o( L_tmp, 2, &Overflow ), &Overflow ); /*Q15 */
-#endif
}
ELSE IF( GT_16( Rat_tenv_fx, 16384 ) )
{
@@ -3164,12 +3018,6 @@ static Word16 SWB_BWE_encoding_ivas_fx(
Word16 SWB_tenv_tmp_fx[SWB_TENV];
Word16 max_fx;
Word16 energy_factor_fx[SWB_FENV], w_env_fx[SWB_FENV];
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
Word16 inner_frame;
Word16 q_shift;
Word16 yos_fx_16[L_FRAME_MAX];
@@ -3229,11 +3077,7 @@ static Word16 SWB_BWE_encoding_ivas_fx(
}
/* tilt returned in Q24 go to Q11 */
-#ifdef ISSUE_1867_replace_overflow_libenc
tilt_fx = round_fx_sat( L_shl_sat( calc_tilt_bwe_fx( insig_fx, 0, L_FRAME32k ), 3 ) );
-#else
- tilt_fx = round_fx_o( L_shl_o( calc_tilt_bwe_fx( insig_fx, 0, L_FRAME32k ), 3, &Overflow ), &Overflow );
-#endif
test();
test();
IF( EQ_16( IsTransient, 1 ) && ( GT_16( tilt_fx, 16384 ) || GT_16( st_fx->clas, 1 ) ) )
@@ -3338,11 +3182,7 @@ static Word16 SWB_BWE_encoding_ivas_fx(
expn = sub( sub( 30, expn ), sub( shl( Q_insig_lp, 1 ), 7 ) );
expd = norm_l( WB_tenv_syn_fx );
-#ifdef ISSUE_1867_replace_overflow_libenc
den = round_fx_sat( L_shl( WB_tenv_syn_fx, expd ) );
-#else
- den = round_fx_o( L_shl( WB_tenv_syn_fx, expd ), &Overflow );
-#endif
expd = sub( sub( 30, expd ), sub( shl( Q_insig_lp, 1 ), 7 ) );
scale = shr( sub( den, num ), 15 );
@@ -3355,11 +3195,7 @@ static Word16 SWB_BWE_encoding_ivas_fx(
L_tmp = L_deposit_h( tmp );
L_tmp = Isqrt_lc( L_tmp, &expn ); /*31-expn */
-#ifdef ISSUE_1867_replace_overflow_libenc
Rat_tenv_fx = round_fx_sat( L_shl_sat( L_tmp, sub( expn, 1 ) ) ); /*Q14 */
-#else
- Rat_tenv_fx = round_fx_o( L_shl_o( L_tmp, sub( expn, 1 ), &Overflow ), &Overflow ); /*Q14 */
-#endif
}
ELSE
{
@@ -3369,12 +3205,8 @@ static Word16 SWB_BWE_encoding_ivas_fx(
IF( LT_16( Rat_tenv_fx, 8192 ) )
{
- L_tmp = L_mult( Rat_tenv_fx, 19661 ); /*Q29 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = L_mult( Rat_tenv_fx, 19661 ); /*Q29 */
Rat_tenv_fx = round_fx_sat( L_shl_sat( L_tmp, 2 ) ); /*Q15 */
-#else
- Rat_tenv_fx = round_fx_o( L_shl_o( L_tmp, 2, &Overflow ), &Overflow ); /*Q15 */
-#endif
}
ELSE IF( GT_16( Rat_tenv_fx, 16384 ) )
{
diff --git a/lib_enc/swb_bwe_enc_hr_fx.c b/lib_enc/swb_bwe_enc_hr_fx.c
index 872d7d403e920cf3119448fb837c86022b853e60..5fa034fbfa236c4e27737fd1a34a7d4302d800d5 100644
--- a/lib_enc/swb_bwe_enc_hr_fx.c
+++ b/lib_enc/swb_bwe_enc_hr_fx.c
@@ -117,12 +117,6 @@ void swb_bwe_enc_hr_fx(
Word32 L_t_audio_tmp_fx[N_BANDS_BWE_HR * WIDTH_NONTRANS_FREQ_COEF];
#else
Word32 L_t_audio_tmp_fx[L_FRAME48k];
-#endif
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
#endif
FD_BWE_ENC_HANDLE hBWE_FD = st_fx->hBWE_FD;
BSTR_ENC_HANDLE hBstr = st_fx->hBstr;
@@ -771,11 +765,7 @@ void swb_bwe_enc_hr_fx(
{
L_tmp = L_mult( temp, t_audio_fx[i] );
L_tmp = L_shr_sat( L_tmp, temp2 );
-#ifdef ISSUE_1867_replace_overflow_libenc
t_audio_fx[i] = round_fx_sat( L_tmp );
-#else
- t_audio_fx[i] = round_fx_o( L_tmp, &Overflow );
-#endif
move16();
}
diff --git a/lib_enc/swb_bwe_enc_lr_fx.c b/lib_enc/swb_bwe_enc_lr_fx.c
index ad178ab55171e24fc809772c6eb82fee24d20062..a8b6f0a6df0ed02e1f59f63d68d7e6902c727585 100644
--- a/lib_enc/swb_bwe_enc_lr_fx.c
+++ b/lib_enc/swb_bwe_enc_lr_fx.c
@@ -698,12 +698,7 @@ static void gethar_noisegn_fx(
Word16 temp_lo, temp_hi;
Word16 Qg;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
+
/*Generate HF noise*/
genhf_noise_fx( noise_flr_fx, Qss, L_xSynth_har, QsL, sspectra_fx, bands, har_bands, har_freq_est2, pos_max_hfe2, pul_res_fx, pk_sf_fx, fLenLow,
fLenHigh, sbWidth, lagIndices, subband_offsets, subband_search_offset );
@@ -785,13 +780,8 @@ static void gethar_noisegn_fx(
L_temp = L_Comp( exp, frac );
L_temp = Mpy_32_16_1( L_temp, 19728 ); /* log(2)/log(10)=.30102999566398119521 = 19728.3(Q16) Q(0+16+1)=Q17 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- L_temp = L_shl_sat( L_temp, 13 ); /* Q17+13=30 30-16=14 */
+ L_temp = L_shl_sat( L_temp, 13 ); /* Q17+13=30 30-16=14 */
g_fx = round_fx_sat( L_temp );
-#else
- L_temp = L_shl_o( L_temp, 13, &Overflow ); /* Q17+13=30 30-16=14 */
- g_fx = round_fx_o( L_temp, &Overflow );
-#endif
}
gqlevs_fx = 4;
diff --git a/lib_enc/swb_pre_proc_fx.c b/lib_enc/swb_pre_proc_fx.c
index f857cbec0b2daa6e0c1894b271f2b9a3c70134be..6a108ce6f24092fd1ad90d79101d5d3c37992e77 100644
--- a/lib_enc/swb_pre_proc_fx.c
+++ b/lib_enc/swb_pre_proc_fx.c
@@ -1104,10 +1104,8 @@ void swb_pre_proc_ivas_fx(
IF( ( ( st->core == ACELP_CORE ) && NE_16( st->extl, SWB_BWE_HIGHRATE ) && NE_16( st->extl, FB_BWE_HIGHRATE ) ) ||
( ( EQ_32( st->total_brate, ACELP_9k60 ) || st->rf_mode ) && EQ_16( st->bwidth, SWB ) && ( st->element_mode == EVS_MONO ) ) )
{
-#ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM
Word64 CldfbHB64_fx = 0;
move64();
-#endif
Word32 CldfbHB_fx = 0; // fixed counterpart
Word16 CldfbHB_fx_e = 0; // fixed counterpart
#ifdef BASOP_NOGLOB_DECLARE_LOCAL
@@ -1218,28 +1216,15 @@ void swb_pre_proc_ivas_fx(
{
FOR( ts = 0; ts < CLDFB_NO_COL_MAX; ts++ )
{
-#ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM
CldfbHB64_fx = W_mac_32_32( CldfbHB64_fx, realBufferFlipped[ts][nB], realBufferFlipped[ts][nB] );
CldfbHB64_fx = W_mac_32_32( CldfbHB64_fx, imagBufferFlipped[ts][nB], imagBufferFlipped[ts][nB] );
-#else
- realQ_neg1 = extract_l( L_shr( realBufferFlipped[ts][nB], 16 ) );
- imagQ_neg1 = extract_l( L_shr( imagBufferFlipped[ts][nB], 16 ) ); /* Q(-1), headroom needed */
-
- CldfbHB_fx = L_mac0_o( CldfbHB_fx, realQ_neg1, realQ_neg1, &Overflow );
- CldfbHB_fx = L_mac0_o( CldfbHB_fx, imagQ_neg1, imagQ_neg1, &Overflow ); /* Q(-2) */
-#endif
}
}
-#ifdef FIX_2021_BANDWIDTH_EXTENSION_PROBLEM
+
Word16 scf = W_norm( CldfbHB64_fx );
CldfbHB64_fx = W_shl( CldfbHB64_fx, scf );
CldfbHB_fx = W_extract_h( CldfbHB64_fx );
CldfbHB_fx_e = sub( Q31, add( shl( q_reImBuffer, 1 ), sub( scf, Q31 ) ) );
-#else
- CldfbHB_fx_e = sub( Q31, shl( sub( q_reImBuffer, Q16 ), 1 ) );
- exp = norm_l( CldfbHB_fx );
- CldfbHB_fx = L_shl( CldfbHB_fx, exp ); /* CldfbHB_ener = CldfbHB_fl*2^(exp) */
-#endif
Cldfbtemp1 = Log2_norm_lc( CldfbHB_fx ); /* Log2_norm_lc(t) = 2^15*(log2(t/2^30)) */
Cldfbtemp1 = sub( shr( Cldfbtemp1, 6 ), shl( add( sub( Q31 - Q30, CldfbHB_fx_e ), exp ), 9 ) );
CldfbHB_fx = L_mult( Cldfbtemp1, 9864 ); /* Q9 + Q15 + Q1 = Q25 */
diff --git a/lib_enc/swb_tbe_enc_fx.c b/lib_enc/swb_tbe_enc_fx.c
index 0d9a3d0cb1cc1b21c135f9d323fdc5502e98f026..0dc1ad698662af60efa13bf37c3ddf24066b0ef1 100644
--- a/lib_enc/swb_tbe_enc_fx.c
+++ b/lib_enc/swb_tbe_enc_fx.c
@@ -52,13 +52,17 @@ static Word32 pow_off_pk_fx( Word16 a[], Word16 len, Word16 step );
static Word32 pow_off_pk_corrected_fx( Word16 a[], Word16 len, Word16 step );
static void find_max_mem_enc( Encoder_State *st_fx, Word16 *n_mem, Word16 *n_mem2 );
+
static void rescale_genSHB_mem_enc( Encoder_State *st_fx, Word16 sf );
+
static void find_max_mem_wb_enc( Encoder_State *st_fx, Word16 *n_mem );
+
static void rescale_genWB_mem_enc( Encoder_State *st_fx, Word16 sf );
static void Quant_lower_LSF_fx( const Word16 lsf[], Word16 lsf_q[], Word16 lsf_idx[] );
static Word16 Quant_mirror_point_fx( const Word16 lsf[], const Word16 lsf_q[], Word16 *m );
+
static Word16 Find_LSF_grid_fx( const Word16 lsf[], Word16 lsf_q[], const Word16 m );
static void Quant_BWE_LSF_fx( Encoder_State *st_fx, const Word16 lsp_shb[], Word16 Q_lsfs[] );
@@ -83,6 +87,7 @@ static void gainFrSmooth_En_ivas_fx( Encoder_State *st_fx, Word16 *shb_frame_fx
*
* Find norm and max in TBE memories and past buffers
*-------------------------------------------------------------------*/
+
void find_max_mem_enc(
Encoder_State *st_fx,
Word16 *n_mem,
@@ -188,6 +193,8 @@ void find_max_mem_enc(
tempQ15 = sub( s_min( *n_mem, n_mem_32 ), 1 );
*n_mem = s_max( tempQ15, 0 );
move16();
+
+ return;
}
@@ -196,7 +203,10 @@ void find_max_mem_enc(
*
* Rescale genSHB memories
*-------------------------------------------------------------------*/
-void rescale_genSHB_mem_enc( Encoder_State *st_fx, Word16 sf )
+
+void rescale_genSHB_mem_enc(
+ Encoder_State *st_fx,
+ Word16 sf )
{
Word16 i;
TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
@@ -697,12 +707,6 @@ void wb_tbe_enc_fx(
Word16 avg_voice_fac;
TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
RF_ENC_HANDLE hRF = st_fx->hRF;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
/*Word16 att = 32767;*/
@@ -1168,13 +1172,8 @@ void wb_tbe_enc_fx(
exp = norm_s( voicingBufAvg_fx );
tmp = div_s( shl( 1, sub( 14, exp ) ), voicingBufAvg_fx ); /* (14-exp) */
L_tmp = L_mult( pitBufAvg_fx, tmp ); /* (21-exp) */
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_shl_sat( L_tmp, add( exp, 10 ) );
tmp = round_fx_sat( L_tmp ); /* Q15 */
-#else
- L_tmp = L_shl_o( L_tmp, add( exp, 10 ), &Overflow );
- tmp = round_fx_o( L_tmp, &Overflow ); /* Q15 */
-#endif
}
tmp = s_max( s_min( tmp, 32767 ), 22938 ); /* Q15 */
@@ -1304,12 +1303,6 @@ void wb_tbe_enc_ivas_fx(
Word16 dummy = 0;
Word16 avg_voice_fac;
TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
move16();
/*Word16 att = 32767;*/
@@ -1340,11 +1333,7 @@ void wb_tbe_enc_ivas_fx(
FOR( j = 0; j < L_SUBFR16k; j = j + 4 )
{
L_tmp = L_mult( hb_old_speech[i], ola_win_shb_switch_fold_fx[j] );
-#ifdef ISSUE_1867_replace_overflow_libenc
hb_old_speech[i] = mac_r_sat( L_tmp, hb_speech[k], ola_win_shb_switch_fold_fx[L_SUBFR16k - 4 - j] );
-#else
- hb_old_speech[i] = mac_ro( L_tmp, hb_speech[k], ola_win_shb_switch_fold_fx[L_SUBFR16k - 4 - j], &Overflow );
-#endif
move16();
i--;
k++;
@@ -1832,13 +1821,8 @@ void wb_tbe_enc_ivas_fx(
exp = norm_s( voicingBufAvg_fx );
tmp = div_s( shl( 1, sub( 14, exp ) ), voicingBufAvg_fx ); /* (14-exp) */
L_tmp = L_mult( pitBufAvg_fx, tmp ); /* (21-exp) */
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_shl_sat( L_tmp, add( exp, 10 ) );
tmp = round_fx_sat( L_tmp ); /* Q15 */
-#else
- L_tmp = L_shl_o( L_tmp, add( exp, 10 ), &Overflow );
- tmp = round_fx_o( L_tmp, &Overflow ); /* Q15 */
-#endif
}
tmp = s_max( s_min( tmp, 32767 ), 22938 ); /* Q15 */
@@ -2019,12 +2003,6 @@ void swb_tbe_enc_fx(
Word16 tilt_para;
Word16 Q_bwe_exc_fb;
Word16 n_subfr_saturation;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
TD_BWE_ENC_HANDLE hBWE_TD = st_fx->hBWE_TD;
RF_ENC_HANDLE hRF = st_fx->hRF;
@@ -2491,13 +2469,8 @@ void swb_tbe_enc_fx(
curr_pow_fx = L_shl( 21475l /*0.00001f Q31*/, tmp ); /* 2*(Q_bwe_exc) */
FOR( i = 0; i < L_SHB_LAHEAD + 10; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
prev_pow_fx = L_mac0_sat( prev_pow_fx, shaped_shb_excitation_fx[i], shaped_shb_excitation_fx[i] ); /* 2*Q_bwe_exc */
curr_pow_fx = L_mac0_sat( curr_pow_fx, shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10], shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10] ); /* 2*Q_bwe_exc */
-#else
- prev_pow_fx = L_mac0_o( prev_pow_fx, shaped_shb_excitation_fx[i], shaped_shb_excitation_fx[i], &Overflow ); /* 2*Q_bwe_exc */
- curr_pow_fx = L_mac0_o( curr_pow_fx, shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10], shaped_shb_excitation_fx[i + L_SHB_LAHEAD + 10], &Overflow ); /* 2*Q_bwe_exc */
-#endif
}
if ( GT_16( voice_factors_fx[0], 24576 /*0.75f Q15*/ ) )
@@ -2531,20 +2504,12 @@ void swb_tbe_enc_fx(
{
FOR( ; i < L_SHB_LAHEAD + 10; i++ )
{
- tmp = i_mult_sat( sub( i, 19 ), 3277 /*0.1f Q15*/ ); /* Q15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ tmp = i_mult_sat( sub( i, 19 ), 3277 /*0.1f Q15*/ ); /* Q15 */
L_tmp1 = Mult_32_16( L_shl_sat( 1, sub( 31, exp ) ), tmp ); /* Q31-exp */
-#else
- L_tmp1 = Mult_32_16( L_shl_o( 1, sub( 31, exp ), &Overflow ), tmp ); /* Q31-exp */
-#endif
tmp = sub( 32767 /*1.0f Q15*/, tmp );
Lscale = L_add( Mult_32_16( Lscale, tmp ), L_tmp1 );
- L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] ); /* Q_bwe_exc + (31-exp) - 15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] ); /* Q_bwe_exc + (31-exp) - 15 */
shaped_shb_excitation_fx[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
-#else
- shaped_shb_excitation_fx[i] = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /* Q_bwe_exc */
-#endif
move16();
}
}
@@ -2553,19 +2518,11 @@ void swb_tbe_enc_fx(
FOR( ; i < L_SHB_LAHEAD + 10; i++ )
{
tmp = round_fx_sat( L_shl( L_mult( 0x6666 /* 0.1 in Q12 */, shl( sub( i, 19 ), 11 ) ), 1 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp1 = Mult_32_16( L_shl_sat( 1, sub( 31, exp ) ), tmp ); /* Q31-exp */
-#else
- L_tmp1 = Mult_32_16( L_shl_o( 1, sub( 31, exp ), &Overflow ), tmp ); /* Q31-exp */
-#endif
tmp = sub( 32767 /*1.0f Q15*/, tmp );
Lscale = L_add( Mult_32_16( Lscale, tmp ), L_tmp1 );
- L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] ); /* Q_bwe_exc + (31-exp) - 15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] ); /* Q_bwe_exc + (31-exp) - 15 */
shaped_shb_excitation_fx[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
-#else
- shaped_shb_excitation_fx[i] = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /* Q_bwe_exc */
-#endif
move16();
}
}
@@ -2794,13 +2751,9 @@ void swb_tbe_enc_fx(
tmp = div_s( shl( 1, sub( 14, exp ) ), voicingBufAvg_fx ); /* (14-exp) */
/* sd_uq_q*pitBufAvg */
- L_tmp = Mult_32_16( L_tmp, pitBufAvg_fx ); /* Q13 * Q10 + 1 -16 => Q8 */
- L_tmp = Mult_32_16( L_tmp, tmp ); /* Q8 + (14 - exp) - 15 => Q7 - exp */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Mult_32_16( L_tmp, pitBufAvg_fx ); /* Q13 * Q10 + 1 -16 => Q8 */
+ L_tmp = Mult_32_16( L_tmp, tmp ); /* Q8 + (14 - exp) - 15 => Q7 - exp */
tmp = round_fx_sat( L_shl_sat( L_tmp, 31 - ( 7 - exp ) ) ); /* Q15 */
-#else
- tmp = round_fx_o( L_shl_o( L_tmp, 31 - ( 7 - exp ), &Overflow ), &Overflow ); /* Q15 */
-#endif
}
tmp = s_min( tmp, 32767 /*1.0f Q15*/ );
@@ -2988,12 +2941,6 @@ void swb_tbe_enc_ivas_fx(
Word16 tilt_para_fx;
Word16 Q_bwe_exc_fb;
Word16 n_subfr_saturation;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
Env_error_fx = 0;
move16();
@@ -3113,7 +3060,6 @@ void swb_tbe_enc_ivas_fx(
enerG = Enr_1_Az_fx( lpc_shb1, 2 * L_SUBFR ); /* Q3 */
/* if the LP gain is greater than a threshold, avoid saturation */
-#ifdef FIX_ISSUE_2004_LPC_SHB_SAT
Word16 flag_sat = 0;
Word16 lpc_shb_fx0_req_shift = sub( norm_s( lpc_shb_fx[0] ), 2 );
IF( GT_16( lpc_shb_fx0_req_shift, 0 ) )
@@ -3129,9 +3075,6 @@ void swb_tbe_enc_ivas_fx(
}
IF( GT_16( enerG, 256 /* 32.0 in Q3 */ ) || flag_sat )
-#else
- IF( GT_16( enerG, 256 /*32 Q3*/ ) )
-#endif
{
set16_fx( lpc_shb_fx, 0, LPC_SHB_ORDER + 1 );
E_LPC_lev_dur( R_h, R_l, lpc_shb_fx, LepsP, 2, NULL ); /* LPC in Q14 */
@@ -3869,12 +3812,8 @@ void swb_tbe_enc_ivas_fx(
FOR( i = 0; i < L_SHB_LAHEAD; i++ )
{
- L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] ); /* Q(16-exp+Q_bwe_exc) */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Mult_32_16( Lscale, shaped_shb_excitation_fx[i] ); /* Q(16-exp+Q_bwe_exc) */
shaped_shb_excitation_fx[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
-#else
- shaped_shb_excitation_fx[i] = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /* Q_bwe_exc */
-#endif
move16();
}
IF( exp < 0 )
@@ -3891,20 +3830,12 @@ void swb_tbe_enc_ivas_fx(
{
FOR( ; i < L_SHB_LAHEAD + 10; i++ )
{
- tmp = i_mult_sat( sub( i, 19 ), 3277 /*0.1f Q15*/ ); /* Q15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ tmp = i_mult_sat( sub( i, 19 ), 3277 /*0.1f Q15*/ ); /* Q15 */
L_tmp1 = Mult_32_16( L_shl_sat( 1, sub( 31, exp ) ), tmp ); /* Q31-exp */
-#else
- L_tmp1 = Mult_32_16( L_shl_o( 1, sub( 31, exp ), &Overflow ), tmp ); /* Q31-exp */
-#endif
tmp = sub( 32767 /*1.0f Q15*/, tmp );
L_tmp = L_add( Mult_32_16( Lscale, tmp ), L_tmp1 );
- L_tmp = Mult_32_16( L_tmp, shaped_shb_excitation_fx[i] ); /* Q_bwe_exc + (31-exp) - 15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Mult_32_16( L_tmp, shaped_shb_excitation_fx[i] ); /* Q_bwe_exc + (31-exp) - 15 */
shaped_shb_excitation_fx[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
-#else
- shaped_shb_excitation_fx[i] = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /* Q_bwe_exc */
-#endif
move16();
}
}
@@ -3913,19 +3844,11 @@ void swb_tbe_enc_ivas_fx(
FOR( ; i < L_SHB_LAHEAD + 10; i++ )
{
tmp = round_fx_sat( L_shl( L_mult( 0x6666 /* 0.1 in Q12 */, shl( sub( i, 19 ), 11 ) ), 1 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp1 = Mult_32_16( L_shl_sat( 1, sub( 31, exp ) ), tmp ); /* Q31-exp */
-#else
- L_tmp1 = Mult_32_16( L_shl_o( 1, sub( 31, exp ), &Overflow ), tmp ); /* Q31-exp */
-#endif
tmp = sub( 32767 /*1.0f Q15*/, tmp );
L_tmp = L_add( Mult_32_16( Lscale, tmp ), L_tmp1 );
- L_tmp = Mult_32_16( L_tmp, shaped_shb_excitation_fx[i] ); /* Q_bwe_exc + (31-exp) - 15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Mult_32_16( L_tmp, shaped_shb_excitation_fx[i] ); /* Q_bwe_exc + (31-exp) - 15 */
shaped_shb_excitation_fx[i] = round_fx_sat( L_shl_sat( L_tmp, exp ) ); /* Q_bwe_exc */
-#else
- shaped_shb_excitation_fx[i] = round_fx_o( L_shl_o( L_tmp, exp, &Overflow ), &Overflow ); /* Q_bwe_exc */
-#endif
move16();
}
}
@@ -4432,13 +4355,9 @@ void swb_tbe_enc_ivas_fx(
tmp = div_s( shl( 1, sub( 14, exp ) ), voicingBufAvg_fx ); /* (14-exp) */
/* sd_uq_q*pitBufAvg */
- L_tmp = Mult_32_16( L_tmp, pitBufAvg_fx ); /* Q13 * Q10 + 1 -16 => Q8 */
- L_tmp = Mult_32_16( L_tmp, tmp ); /* Q8 + (14 - exp) - 15 => Q7 - exp */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Mult_32_16( L_tmp, pitBufAvg_fx ); /* Q13 * Q10 + 1 -16 => Q8 */
+ L_tmp = Mult_32_16( L_tmp, tmp ); /* Q8 + (14 - exp) - 15 => Q7 - exp */
tmp = round_fx_sat( L_shl_sat( L_tmp, 31 - ( 7 - exp ) ) ); /* Q15 */
-#else
- tmp = round_fx_o( L_shl_o( L_tmp, 31 - ( 7 - exp ), &Overflow ), &Overflow ); /* Q15 */
-#endif
}
tmp = s_min( tmp, 32767 /*1.0f Q15*/ );
tmp = s_max( tmp, 19661 /*0.6f Q15*/ );
@@ -4593,12 +4512,6 @@ static void EstimateSHBFrameGain_fx(
Word16 exp_out;
Word16 tmp;
Word16 scaling = 0;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
move16();
/* initilaization */
@@ -4708,47 +4621,26 @@ static void EstimateSHBFrameGain_fx(
FOR( i = 0; i < l_shb_lahead; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sig = mult_r_sat( oriSHB[i], win_shb[i] ); /* Q_oriSHB */
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_orisHB*/
sig = round_fx_sat( Mult_32_16( mod_syn[i], win_shb[i] ) ); /*Q_synSHB */
synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2*Q_synSHB */
-#else
- sig = mult_ro( oriSHB[i], win_shb[i], &Overflow ); /* Q_oriSHB */
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_orisHB*/
- sig = round_fx_o( Mult_32_16( mod_syn[i], win_shb[i] ), &Overflow ); /*Q_synSHB */
- synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2*Q_synSHB */
-#endif
}
FOR( ; i < l_frame; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
oriNrg = L_mac0_sat( oriNrg, oriSHB[i], oriSHB[i] ); /* 2*Q_oriSHB */
sig = round_fx_sat( mod_syn[i] ); /* Q_oriSHB */
synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2*Q_oriSHB */
-#else
- oriNrg = L_mac0_o( oriNrg, oriSHB[i], oriSHB[i], &Overflow ); /* 2*Q_oriSHB */
- sig = round_fx_o( mod_syn[i], &Overflow ); /* Q_oriSHB */
- synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB */
-#endif
}
tmp = add( l_frame, l_shb_lahead );
FOR( ; i < tmp; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sig = mult_r_sat( oriSHB[i], win_shb[l_frame + l_shb_lahead - 1 - i] ); /* Q_oriSHB */
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB */
sig = round_fx_sat( Mult_32_16( mod_syn[i], win_shb[l_frame + l_shb_lahead - 1 - i] ) ); /* Q_oriSHB */
synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2*Q_oriSHB */
-#else
- sig = mult_ro( oriSHB[i], win_shb[l_frame + l_shb_lahead - 1 - i], &Overflow ); /* Q_oriSHB */
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB */
-
- sig = round_fx_o( Mult_32_16( mod_syn[i], win_shb[l_frame + l_shb_lahead - 1 - i] ), &Overflow ); /* Q_oriSHB */
- synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB */
-#endif
}
IF( EQ_32( oriNrg, MAX_32 ) )
{
@@ -4757,33 +4649,18 @@ static void EstimateSHBFrameGain_fx(
move32();
FOR( i = 0; i < l_shb_lahead; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sig = mult_r( shl_sat( oriSHB[i], scaling ), win_shb[i] );
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB + 2*scaling */
-#else
- sig = mult_r( shl_sat( oriSHB[i], scaling ), win_shb[i] );
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
-#endif
}
FOR( ; i < l_frame; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sig = shl_sat( oriSHB[i], scaling );
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB + 2*scaling */
-#else
- sig = shl_sat( oriSHB[i], scaling );
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
-#endif
}
FOR( ; i < tmp; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sig = mult_r( shl_sat( oriSHB[i], scaling ), win_shb[l_frame + l_shb_lahead - 1 - i] );
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB + 2*scaling */
-#else
- sig = mult_r( shl_sat( oriSHB[i], scaling ), win_shb[l_frame + l_shb_lahead - 1 - i] );
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
-#endif
}
}
L_tmp = root_a_over_b_fx( oriNrg, 2 * Q_oriSHB, synNrg, 2 * Q_synSHB, &exp_out );
@@ -4819,12 +4696,6 @@ static void EstimateSHBFrameGain_ivas_fx(
Word16 exp_out;
Word16 tmp;
Word16 scaling = 0;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
move16();
/* initilaization */
@@ -4934,47 +4805,26 @@ static void EstimateSHBFrameGain_ivas_fx(
FOR( i = 0; i < l_shb_lahead; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sig = mult_r_sat( oriSHB[i], win_shb[i] ); /* Q_oriSHB */
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_orisHB*/
sig = round_fx_sat( Mult_32_16( mod_syn[i], win_shb[i] ) ); /*Q_synSHB */
synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2*Q_synSHB - 2*/
-#else
- sig = mult_ro( oriSHB[i], win_shb[i], &Overflow ); /* Q_oriSHB */
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_orisHB*/
- sig = round_fx_o( Mult_32_16( mod_syn[i], win_shb[i] ), &Overflow ); /*Q_synSHB */
- synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2*Q_synSHB - 2*/
-#endif
}
FOR( ; i < l_frame; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
oriNrg = L_mac0_sat( oriNrg, oriSHB[i], oriSHB[i] ); /* 2*Q_oriSHB */
sig = round_fx_sat( mod_syn[i] ); /* Q_oriSHB */
synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2*Q_oriSHB - 2*/
-#else
- oriNrg = L_mac0_o( oriNrg, oriSHB[i], oriSHB[i], &Overflow ); /* 2*Q_oriSHB */
- sig = round_fx_o( mod_syn[i], &Overflow ); /* Q_oriSHB */
- synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB - 2*/
-#endif
}
tmp = add( l_frame, l_shb_lahead );
FOR( ; i < tmp; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sig = mult_r_sat( oriSHB[i], win_shb[l_frame + l_shb_lahead - 1 - i] ); /* Q_oriSHB */
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB */
sig = round_fx_sat( Mult_32_16( mod_syn[i], win_shb[l_frame + l_shb_lahead - 1 - i] ) ); /* Q_oriSHB */
synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2*Q_oriSHB - 2*/
-#else
- sig = mult_ro( oriSHB[i], win_shb[l_frame + l_shb_lahead - 1 - i], &Overflow ); /* Q_oriSHB */
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB */
-
- sig = round_fx_o( Mult_32_16( mod_syn[i], win_shb[l_frame + l_shb_lahead - 1 - i] ), &Overflow ); /* Q_oriSHB */
- synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB - 2*/
-#endif
}
IF( EQ_32( oriNrg, MAX_32 ) )
{
@@ -4983,33 +4833,18 @@ static void EstimateSHBFrameGain_ivas_fx(
move32();
FOR( i = 0; i < l_shb_lahead; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sig = mult_r( shl_sat( oriSHB[i], scaling ), win_shb[i] );
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB + 2*scaling */
-#else
- sig = mult_r( shl_sat( oriSHB[i], scaling ), win_shb[i] );
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
-#endif
}
FOR( ; i < l_frame; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sig = shl_sat( oriSHB[i], scaling );
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB + 2*scaling */
-#else
- sig = shl_sat( oriSHB[i], scaling );
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
-#endif
}
FOR( ; i < tmp; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
sig = mult_r( shl_sat( oriSHB[i], scaling ), win_shb[l_frame + l_shb_lahead - 1 - i] );
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2*Q_oriSHB + 2*scaling */
-#else
- sig = mult_r( shl_sat( oriSHB[i], scaling ), win_shb[l_frame + l_shb_lahead - 1 - i] );
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2*Q_oriSHB + 2*scaling */
-#endif
}
}
L_tmp = root_a_over_b_fx( oriNrg, shl( Q_oriSHB, 1 ), synNrg, sub( shl( Q_synSHB, 1 ), 2 ), &exp_out );
@@ -5123,12 +4958,6 @@ static void EstimateSHBGainShape_fx(
Word16 length_tmp;
Word32 L_tmp, normFact;
Word16 scaling = 0;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
move32();
move16();
move16();
@@ -5246,43 +5075,25 @@ static void EstimateSHBGainShape_fx(
FOR( k = 0; k < length; k++ )
{
sig = mult_r( oriSHB[j + k], subwin[k + 1] ); /* Q_oriSHB */
-#ifdef ISSUE_1867_replace_overflow_libenc
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2* Q_oriSHB */
sig = mult_r( synSHB[j + k], subwin[k + 1] ); /* Q_oriSHB */
synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2* Q_oriSHB */
-#else
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
- sig = mult_r( synSHB[j + k], subwin[k + 1] ); /* Q_oriSHB */
- synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
-#endif
}
FOR( k = 0; k < ( join_length - length ); k++ )
{
sig = mult_r( oriSHB[length + j + k], 32767 ); /* Q_oriSHB */
-#ifdef ISSUE_1867_replace_overflow_libenc
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2* Q_oriSHB */
sig = mult_r( synSHB[length + j + k], 32767 ); /* Q_oriSHB */
synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2* Q_oriSHB */
-#else
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
- sig = mult_r( synSHB[length + j + k], 32767 ); /* Q_oriSHB */
- synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
-#endif
}
FOR( k = 0; k < length; k++ )
{
sig = mult_r( oriSHB[j + join_length + k], subwin[length - k - 1] ); /* Q_oriSHB */
-#ifdef ISSUE_1867_replace_overflow_libenc
oriNrg = L_mac0_sat( oriNrg, sig, sig ); /* 2* Q_oriSHB */
sig = mult_r( synSHB[j + join_length + k], subwin[length - k - 1] ); /* Q_oriSHB */
synNrg = L_mac0_sat( synNrg, sig, sig ); /* 2* Q_oriSHB */
-#else
- oriNrg = L_mac0_o( oriNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
- sig = mult_r( synSHB[j + join_length + k], subwin[length - k - 1] ); /* Q_oriSHB */
- synNrg = L_mac0_o( synNrg, sig, sig, &Overflow ); /* 2* Q_oriSHB */
-#endif
}
/* Only implemented in SWB because the length of samples in SWB frame is longer, more likely to saturate */
scaling = 0;
@@ -5329,13 +5140,8 @@ static void EstimateSHBGainShape_fx(
FOR( i = 0; i < num_gains; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
subgain[i] = round_fx_sat( L_shl_sat( L_subgain[i], sub( norm[i], n_max + 1 ) ) ); /* Q(14-n_max) */
L_sum_gain = L_mac0_sat( L_sum_gain, subgain[i], subgain[i] ); /* Q(28-2*n_max) */
-#else
- subgain[i] = round_fx_o( L_shl_o( L_subgain[i], sub( norm[i], n_max + 1 ), &Overflow ), &Overflow ); /* Q(14-n_max) */
- L_sum_gain = L_mac0_o( L_sum_gain, subgain[i], subgain[i], &Overflow ); /* Q(28-2*n_max) */
-#endif
move16();
}
@@ -5349,12 +5155,8 @@ static void EstimateSHBGainShape_fx(
{
FOR( i = 0; i < num_gains; i++ )
{
- L_tmp = Mpy_32_16_1( normFact, subgain[i] ); /*Q(31-n) * Q(31-norm[i]) */ /* Q(30-n-n_max) */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = Mpy_32_16_1( normFact, subgain[i] ); /*Q(31-n) * Q(31-norm[i]) */ /* Q(30-n-n_max) */
subgain[i] = s_max( round_fx_sat( L_shl_sat( L_tmp, add( n, n_max + 1 ) ) ), 3277 /*0.1f Q15*/ ); /* Q15 */
-#else
- subgain[i] = s_max( round_fx_o( L_shl_o( L_tmp, add( n, n_max + 1 ), &Overflow ), &Overflow ), 3277 /*0.1f Q15*/ ); /* Q15 */
-#endif
move16();
}
}
@@ -5363,11 +5165,7 @@ static void EstimateSHBGainShape_fx(
FOR( i = 0; i < num_gains; i++ )
{
L_tmp = Mpy_32_16_1( normFact, subgain[i] ); /*Q(31-n) * Q(31-norm[i]) */ /* Q(30-n-n_max) */
-#ifdef ISSUE_1867_replace_overflow_libenc
- subgain[i] = round_fx_sat( L_shl_sat( L_tmp, add( n, n_max + 1 ) ) ); /* Q15 */
-#else
- subgain[i] = round_fx_o( L_shl_o( L_tmp, add( n, n_max + 1 ), &Overflow ), &Overflow ); /* Q15 */
-#endif
+ subgain[i] = round_fx_sat( L_shl_sat( L_tmp, add( n, n_max + 1 ) ) ); /* Q15 */
move16();
}
}
@@ -5811,6 +5609,7 @@ static void Quant_shb_ener_sf_fx(
{
push_indice( st_fx->hBstr, IND_SHB_ENER_SF, idxSubEner_fx, NUM_BITS_SHB_ENER_SF );
}
+
return;
}
@@ -5865,6 +5664,7 @@ static void Quant_shb_ener_sf_ivas_fx(
{
push_indice( st_fx->hBstr, IND_SHB_ENER_SF, idxSubEner_fx, NUM_BITS_SHB_ENER_SF );
}
+
return;
}
@@ -5899,6 +5699,8 @@ static void Quant_shb_res_gshape_fx(
push_indice( st_fx->hBstr, IND_SHB_RES_GS + i, idxSubGain_fx[i], NUM_BITS_SHB_RES_GS );
}
}
+
+ return;
}
@@ -5935,6 +5737,8 @@ static void Quant_shb_res_gshape_ivas_fx(
push_indice( st->hBstr, IND_SHB_RES_GS + i, idxSubGain_fx[i], NUM_BITS_SHB_RES_GS );
}
}
+
+ return;
}
@@ -5962,8 +5766,7 @@ static void QuantizeSHBframegain_fx(
Encoder_State *st_fx, /* i/o: encoder state structure */
Word32 *GainFrame, /* i/o: Gain Q18 */
const Word16 extl, /* i : extension layer */
- Word32 extl_brate /* i : extension layer bitrate */
- ,
+ Word32 extl_brate, /* i : extension layer bitrate */
Word16 *rf_gainFrame_ind )
{
Word16 idxFrameGain;
@@ -6842,7 +6645,7 @@ static void gainFrSmooth_En_fx( Encoder_State *st_fx,
}
test();
- if ( LT_32( lsp_slow_evol_rate, 2147484l /*0.001f Q31*/ ) && LT_32( lsp_fast_evol_rate, 2147484l /*0.001f Q31*/ ) )
+ if ( LT_32( lsp_slow_evol_rate, INV_1000_Q31 ) && LT_32( lsp_fast_evol_rate, 2147484l /*0.001f Q31*/ ) )
{
*frGainSmoothEn = 1;
move16();
@@ -6969,7 +6772,7 @@ static void gainFrSmooth_En_ivas_fx( Encoder_State *st_fx,
}
test();
- if ( ( BASOP_Util_Cmp_Mant32Exp( lsp_slow_evol_rate, lsp_slow_evol_rate_e, 2147484l /*0.001f in Q31*/, 0 ) < 0 ) && ( BASOP_Util_Cmp_Mant32Exp( lsp_fast_evol_rate, lsp_fast_evol_rate_e, 2147484l /*0.001f in Q31*/, 0 ) < 0 ) )
+ if ( ( BASOP_Util_Cmp_Mant32Exp( lsp_slow_evol_rate, lsp_slow_evol_rate_e, INV_1000_Q31, 0 ) < 0 ) && ( BASOP_Util_Cmp_Mant32Exp( lsp_fast_evol_rate, lsp_fast_evol_rate_e, 2147484l /*0.001f in Q31*/, 0 ) < 0 ) )
{
*frGainSmoothEn = 1;
move16();
@@ -6997,12 +6800,6 @@ static void first_VQstages_fx(
move16();
Word16 maxC = LSFMBEST;
move16();
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
/*float dd[16];*/
const Word16 *cb_stage, *cbp;
@@ -7028,13 +6825,9 @@ static void first_VQstages_fx(
L_tmp = L_deposit_l( 0 );
FOR( j = 0; j < N; j++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp1 = L_shl_sat( L_mult0( u[j], w[j] ), 7 ); /*x2.56 + Q8 + Q7 */
-#else
- L_tmp1 = L_shl_o( L_mult0( u[j], w[j] ), 7, &Overflow ); /*x2.56 + Q8 + Q7 */
-#endif
- L_tmp1 = Mult_32_16( L_tmp1, u[j] ); /*x2.56 + Q15 + x2.56 -Q15 */
- L_tmp = L_add( L_tmp, L_tmp1 ); /*Q0 + x2.56 +x2.56 */
+ L_tmp1 = Mult_32_16( L_tmp1, u[j] ); /*x2.56 + Q15 + x2.56 -Q15 */
+ L_tmp = L_add( L_tmp, L_tmp1 ); /*Q0 + x2.56 +x2.56 */
}
set32_fx( dist[1], L_tmp, maxC );
@@ -7522,12 +7315,7 @@ void fb_tbe_enc_fx(
Word16 tmp, tmp1, tmp2, exp, exp2, exp_norm;
Word16 s_max_value, exp_temp, i;
TD_BWE_ENC_HANDLE hBWE_TD = st->hBWE_TD;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move16();
-#endif
-#endif
+
s_max_value = 0;
FOR( i = 0; i < L_FRAME48k; i++ )
{
@@ -7561,13 +7349,9 @@ void fb_tbe_enc_fx(
Copy( hBWE_TD->old_input_fhb_fx, input_fhb, Sample_Delay_HP );
Copy( tmp_vec, input_fhb + Sample_Delay_HP, L_FRAME48k - Sample_Delay_HP );
Copy( tmp_vec + L_FRAME48k - Sample_Delay_HP, hBWE_TD->old_input_fhb_fx, Sample_Delay_HP );
- temp2 = sum2_fx_mod( input_fhb, L_FRAME48k / 2 ); /* Q11 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ temp2 = sum2_fx_mod( input_fhb, L_FRAME48k / 2 ); /* Q11 */
temp2 = L_add_sat( temp2, L_shl_sat( hBWE_TD->prev_fb_energy_fx, sub( sub( add( exp_temp, exp_temp ), 6 ), hBWE_TD->prev_fb_energy_fx_Q ) ) ); /* Q11 */
-#else
- temp2 = L_add_o( temp2, L_shl_o( hBWE_TD->prev_fb_energy_fx, sub( sub( add( exp_temp, exp_temp ), 6 ), hBWE_TD->prev_fb_energy_fx_Q ), &Overflow ), &Overflow ); /* Q11 */
-#endif
- hBWE_TD->prev_fb_energy_fx = sum2_fx_mod( input_fhb + L_FRAME48k / 2, L_FRAME48k / 2 ); /*Q11*/
+ hBWE_TD->prev_fb_energy_fx = sum2_fx_mod( input_fhb + L_FRAME48k / 2, L_FRAME48k / 2 ); /*Q11*/
hBWE_TD->prev_fb_energy_fx_Q = sub( add( exp_temp, exp_temp ), 6 );
fb_exc_energy = sum2_fx_mod( fb_exc, L_FRAME16k ); /* Q(2*Q_fb_exc+1 -7) */
diff --git a/lib_enc/tcx_ltp_enc_fx.c b/lib_enc/tcx_ltp_enc_fx.c
index c492fd100fb159608d1780c7d6ea85f170805093..9f8b26cf8e751119ba541900953f8e53ae3dd3d1 100644
--- a/lib_enc/tcx_ltp_enc_fx.c
+++ b/lib_enc/tcx_ltp_enc_fx.c
@@ -495,13 +495,6 @@ static void tcx_ltp_find_gain( Word16 *speech, Word16 *pred_speech, Word16 L_fra
{
Word32 corr, ener;
Word16 i, g, s1, s2, tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
s1 = sub( getScaleFactor16( speech, L_frame ), 4 );
s2 = sub( getScaleFactor16( pred_speech, L_frame ), 4 );
@@ -528,21 +521,13 @@ static void tcx_ltp_find_gain( Word16 *speech, Word16 *pred_speech, Word16 L_fra
ener = L_shl( ener, tmp );
s2 = sub( s2, tmp );
-#ifdef ISSUE_1867_replace_overflow_libenc
g = divide1616( round_fx_sat( corr ), round_fx_sat( ener ) );
-#else
- g = divide1616( round_fx_o( corr, &Overflow ), round_fx_o( ener, &Overflow ) );
-#endif
BASOP_SATURATE_WARNING_OFF_EVS
g = shl_sat( g, sub( s1, s2 ) );
BASOP_SATURATE_WARNING_ON_EVS
/* Quantize gain */
-#ifdef ISSUE_1867_replace_overflow_libenc
g = shr( sub_sat( g, 0x1000 ), 13 );
-#else
- g = shr( sub_o( g, 0x1000, &Overflow ), 13 );
-#endif
g = s_max( g, -1 );
*gain_index = g;
@@ -557,12 +542,6 @@ static void tcx_ltp_find_gain_ivas_fx( Word16 *speech /*Qx*/, Word16 *pred_speec
{
Word32 corr, ener;
Word16 i, g, s1, s2, tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
s1 = sub( getScaleFactor16( speech, L_frame ), 4 );
s2 = sub( getScaleFactor16( pred_speech, L_frame ), 4 );
@@ -589,11 +568,7 @@ static void tcx_ltp_find_gain_ivas_fx( Word16 *speech /*Qx*/, Word16 *pred_speec
ener = L_shl( ener, tmp );
s2 = sub( s2, tmp );
-#ifdef ISSUE_1867_replace_overflow_libenc
g = divide1616( round_fx_sat( corr ), round_fx_sat( ener ) );
-#else
- g = divide1616( round_fx_o( corr, &Overflow ), round_fx_o( ener, &Overflow ) );
-#endif
BASOP_SATURATE_WARNING_OFF_EVS
g = shl_sat( g, sub( s1, s2 ) ); /*Q15*/
BASOP_SATURATE_WARNING_ON_EVS
@@ -650,12 +625,6 @@ void tcx_ltp_encode_fx(
Word16 buf_zir[M + L_SUBFR], *zir;
Word16 Aest[M + 1];
Word16 alpha, step;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
norm_corr = 0;
move16();
@@ -813,18 +782,10 @@ void tcx_ltp_encode_fx(
FOR( n = 0; n < L_subfr; n++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
speech_ltp[n] = sub_sat( speech[n], mult_r_sat( *gain, mult_r_sat( alpha, pred_speech[n] ) ) );
-#else
- speech_ltp[n] = sub_o( speech[n], mult_ro( *gain, mult_ro( alpha, pred_speech[n], &Overflow ), &Overflow ), &Overflow );
-#endif
move16();
BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef ISSUE_1867_replace_overflow_libenc
alpha = add_sat( alpha, step );
-#else
- alpha = add_o( alpha, step, &Overflow );
-#endif
BASOP_SATURATE_WARNING_ON_EVS;
}
}
@@ -875,11 +836,7 @@ void tcx_ltp_encode_fx(
FOR( n = 0; n < L_subfr; n++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
speech_ltp[n] = add_sat( sub_sat( speech[n], mult_r_sat( *gain, pred_speech[n] ) ), zir[n] );
-#else
- speech_ltp[n] = add_o( sub_o( speech[n], mult_ro( *gain, pred_speech[n], &Overflow ), &Overflow ), zir[n], &Overflow );
-#endif
move16();
}
}
@@ -897,11 +854,7 @@ void tcx_ltp_encode_fx(
{
FOR( n = L_subfr; n < L_frame; n++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
speech_ltp[n] = sub_sat( speech[n], mult( *gain, pred_speech[n] ) );
-#else
- speech_ltp[n] = sub_o( speech[n], mult( *gain, pred_speech[n] ), &Overflow );
-#endif
move16();
}
}
@@ -947,11 +900,6 @@ void tcx_ltp_encode_ivas_fx(
Word16 Aest_fx[M + 1];
Word16 exponent;
Word16 sqr;
-#ifndef ISSUE_1867_replace_overflow_libenc
- Flag Overflow = 0;
- move32();
-#endif
-
TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;
tcxOnly = st->tcxonly;
@@ -1243,11 +1191,7 @@ void tcx_ltp_encode_ivas_fx(
FOR( n = 0; n < L_subfr; n++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
speech_ltp_fx[n] = sub_sat( speech_fx[n], mult_r_sat( hTcxEnc->tcxltp_gain, mult_r_sat( alpha_fx, pred_speech_fx[n] ) ) );
-#else
- speech_ltp_fx[n] = sub_o( speech_fx[n], mult_ro( hTcxEnc->tcxltp_gain, mult_ro( alpha_fx, pred_speech_fx[n], &Overflow ), &Overflow ), &Overflow );
-#endif
move16();
alpha_fx = add_sat( alpha_fx, step_fx );
}
@@ -1297,11 +1241,7 @@ void tcx_ltp_encode_ivas_fx(
FOR( n = 0; n < L_subfr; n++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
speech_ltp_fx[n] = add_sat( sub_sat( speech_fx[n], mult_r_sat( hTcxEnc->tcxltp_gain, pred_speech_fx[n] ) ), zir_fx[n] );
-#else
- speech_ltp_fx[n] = add_o( sub_o( speech_fx[n], mult_ro( hTcxEnc->tcxltp_gain, pred_speech_fx[n], &Overflow ), &Overflow ), zir_fx[n], &Overflow );
-#endif
move16();
}
}
@@ -1319,11 +1259,7 @@ void tcx_ltp_encode_ivas_fx(
{
FOR( n = L_subfr; n < L_frame; n++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
speech_ltp_fx[n] = sub_sat( speech_fx[n], mult( hTcxEnc->tcxltp_gain, pred_speech_fx[n] ) );
-#else
- speech_ltp_fx[n] = sub_o( speech_fx[n], mult( hTcxEnc->tcxltp_gain, pred_speech_fx[n] ), &Overflow );
-#endif
move16();
}
}
diff --git a/lib_enc/tcx_utils_enc_fx.c b/lib_enc/tcx_utils_enc_fx.c
index b8f187205de3b3e3ef02d87751b1a40c061dbdc6..bbeb26ee394d24ee76664d0f3c1293532f83b663 100644
--- a/lib_enc/tcx_utils_enc_fx.c
+++ b/lib_enc/tcx_utils_enc_fx.c
@@ -287,31 +287,16 @@ static void detectLowpassFac( const Word32 *powerSpec, Word16 powerSpec_e, Word1
{
Word16 i, tmp;
Word32 threshold;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
threshold = 256l /*0.1f * 2*NORM_MDCT_FACTOR Q3*/; /* Q3 */
move32();
BASOP_SATURATE_WARNING_OFF_EVS /* Allow saturation, because threshold is being compared to powerSpec[i] below. */
-#ifdef ISSUE_1867_replace_overflow_libenc
threshold = L_shl_sat( threshold, sub( 28, powerSpec_e ) );
-#else
- threshold = L_shl_o( threshold, sub( 28, powerSpec_e ), &Overflow );
-#endif
IF( rectWin != 0 )
{
/* compensate for bad side-lobe attenuation with asymmetric windows */
-#ifdef ISSUE_1867_replace_overflow_libenc
threshold = L_shl_sat( threshold, 1 );
-#else
- threshold = L_shl_o( threshold, 1, &Overflow );
-#endif
}
BASOP_SATURATE_WARNING_ON_EVS
@@ -2504,12 +2489,6 @@ void tcx_noise_factor_ivas_fx(
Word16 att; /* noise level attenuation factor for transient windows */
Word32 xMax;
Word16 exp_spQ[N_MAX];
-#if !defined( ISSUE_1867_replace_overflow_libenc )
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
assert( nTransWidth <= 16 );
@@ -2758,11 +2737,7 @@ void tcx_noise_factor_ivas_fx(
tmp4 = BASOP_Util_Divide3232_Scale_newton( Mpy_32_16_1( sqErrorNrg, att ), n, &s );
s = add( add( exp_sqErrorNrg, -15 ), s );
BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp4 = L_shl_sat( tmp4, s );
-#else
- tmp4 = L_shl_o( tmp4, s, &Overflow );
-#endif
BASOP_SATURATE_WARNING_ON_EVS;
}
ELSE
diff --git a/lib_enc/tns_base_enc_fx.c b/lib_enc/tns_base_enc_fx.c
index 945b5c0024aa2c7775c8934318640282a64264ba..3f671f705930b82e4fdce2858c72e23b2c60052e 100644
--- a/lib_enc/tns_base_enc_fx.c
+++ b/lib_enc/tns_base_enc_fx.c
@@ -76,12 +76,6 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig,
Word16 idx1;
Word16 nSubdivisions;
Word16 iSubdivisions;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
move16();
move16();
@@ -127,11 +121,7 @@ Word16 DetectTnsFilt_fx( STnsConfig const *pTnsConfig,
/* Check threshold HLM_MIN_NRG */
BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp32 = L_sub( L_shl_sat( L_tmp, s_min( 31, sub( shift, 24 - 31 * 2 ) ) ), 3277l /*HLM_MIN_NRG Q7*/ );
-#else
- tmp32 = L_sub( L_shl_o( L_tmp, s_min( 31, sub( shift, 24 - 31 * 2 ) ), &Overflow ), 3277l /*HLM_MIN_NRG Q7*/ );
-#endif
BASOP_SATURATE_WARNING_ON_EVS;
/* get pre-shift for autocorrelation */
@@ -447,12 +437,6 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i : TNS Configur
Word16 idx1;
Word16 nSubdivisions;
Word16 iSubdivisions;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
move16();
move16();
@@ -498,11 +482,7 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i : TNS Configur
/* Check threshold HLM_MIN_NRG */
BASOP_SATURATE_WARNING_OFF_EVS;
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp32 = L_sub( L_shl_sat( L_tmp, s_min( 31, sub( shift, 24 - 31 * 2 ) ) ), 3277l /*HLM_MIN_NRG Q7*/ );
-#else
- tmp32 = L_sub( L_shl_o( L_tmp, s_min( 31, sub( shift, 24 - 31 * 2 ) ), &Overflow ), 3277l /*HLM_MIN_NRG Q7*/ );
-#endif
BASOP_SATURATE_WARNING_ON_EVS;
/* get pre-shift for autocorrelation */
diff --git a/lib_enc/transient_detection_fx.c b/lib_enc/transient_detection_fx.c
index bb8239f90a4ab6ae55edc1b245017274bec24154..b0593456d05d7aeada3e57c854eb50b4a398e020 100644
--- a/lib_enc/transient_detection_fx.c
+++ b/lib_enc/transient_detection_fx.c
@@ -259,88 +259,6 @@ static void GetAttackForTCXDecision_ivas_fx(
}
-void GetAttackForTCXDecision_fx(
- Word32 const *pSubblockNrg,
- Word32 const *pAccSubblockNrg,
- Word16 nSubblocks,
- Word16 nPastSubblocks,
- Word16 attackRatioThreshold,
- Word16 *pbIsAttackPresent,
- Word16 *pAttackIndex )
-{
- Word16 i;
- Word16 bIsAttackPresent, attackIndex;
- Word16 attackRatioThreshold_1_5;
-
- assert( nSubblocks >= NSUBBLOCKS );
- assert( nPastSubblocks >= 2 );
-
- /* attackRatioThreshold_1_5 = attackRatioThreshold * 1.5, exponent is ATTACKTHRESHOLD_E+1 */
- attackRatioThreshold_1_5 = add( shr( attackRatioThreshold, 2 ), shr( attackRatioThreshold, 1 ) );
-
- move16();
- move16();
- bIsAttackPresent = FALSE;
- attackIndex = 0;
- /* Search for the last attack in the subblocks */
- if ( s_or( (Word16) GT_32( L_shr( pSubblockNrg[-1], ATTACKTHRESHOLD_E ), Mpy_32_16_1( pAccSubblockNrg[-1], attackRatioThreshold ) ),
- L_sub( L_shr( pSubblockNrg[-2], ATTACKTHRESHOLD_E ), Mpy_32_16_1( pAccSubblockNrg[-2], attackRatioThreshold ) ) > 0 ) )
- {
- move16();
- bIsAttackPresent = TRUE;
- }
-
- FOR( i = 0; i < NSUBBLOCKS; i++ )
- {
- IF( GT_32( L_shr( pSubblockNrg[i], ATTACKTHRESHOLD_E ), Mpy_32_16_1( pAccSubblockNrg[i], attackRatioThreshold ) ) )
- {
- if ( i < 6 )
- {
- move16();
- bIsAttackPresent = TRUE;
- }
-
- if ( s_and( (Word16) NE_16( attackIndex, 2 ), (Word16) NE_16( attackIndex, 6 ) ) )
- {
- move16();
- attackIndex = i;
- }
- }
- ELSE /* no attack, but set index anyway in case of strong energy increase */
- {
- IF( s_and( ( (Word16) GT_32( L_shr( pSubblockNrg[i], 1 + ATTACKTHRESHOLD_E ), Mpy_32_16_1( pSubblockNrg[sub( i, 1 )], attackRatioThreshold_1_5 ) ) ),
- ( L_sub( L_shr( pSubblockNrg[i], 1 + ATTACKTHRESHOLD_E ), Mpy_32_16_1( pSubblockNrg[sub( i, 2 )], attackRatioThreshold_1_5 ) ) > 0 ) ) )
- {
-
- if ( s_and( (Word16) NE_16( attackIndex, 2 ), (Word16) NE_16( attackIndex, 6 ) ) )
- {
- move16();
- attackIndex = i;
- }
- }
- }
- }
- /* avoid post-echos on click sounds (very short transients) due to TNS aliasing */
- if ( EQ_16( attackIndex, 4 ) )
- {
- move16();
- attackIndex = 7;
- }
- if ( EQ_16( attackIndex, 5 ) )
- {
- move16();
- attackIndex = 6;
- }
-
- move16();
- move16();
- *pAttackIndex = attackIndex;
- *pbIsAttackPresent = bIsAttackPresent;
-
- return;
-}
-
-
/** Initialize TCX transient detector.
* See InitTransientDetector_fx for definition of parameters.
*/
diff --git a/lib_enc/transition_enc_fx.c b/lib_enc/transition_enc_fx.c
index e19a89e0b86f79b6452f3a699a27b53827177383..842b635515650a93aea44655363ad030ea3c5de6 100644
--- a/lib_enc/transition_enc_fx.c
+++ b/lib_enc/transition_enc_fx.c
@@ -2203,12 +2203,6 @@ static void gain_trans_enc_fx(
)
{
Word16 i, imax, istart, tmp16, gain_trans, gscale;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
istart = 0;
move16();
@@ -2216,19 +2210,11 @@ static void gain_trans_enc_fx(
move16();
gscale = 7;
move16();
-#ifdef ISSUE_1867_replace_overflow_libenc
gain_trans = extract_h( L_shl_sat( gain_trans32, 16 ) ); /* Q7 */
-#else
- gain_trans = extract_h( L_shl_o( gain_trans32, 16, &Overflow ) ); /* Q7 */
-#endif
IF( GT_32( L_abs( gain_trans32 ), 29862L ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
gain_trans = extract_h( L_shl_sat( gain_trans32, 16 - 3 ) ); /* Q4 */
-#else
- gain_trans = extract_h( L_shl_o( gain_trans32, 16 - 3, &Overflow ) ); /* Q4 */
-#endif
istart = 4;
move16();
imax = N_GAIN_TC - 1;
@@ -2261,11 +2247,7 @@ static void gain_trans_enc_fx(
FOR( i = 0; i < L_SUBFR; i++ )
{
/*exc[i] *= (*gain_trans);*/
-#ifdef ISSUE_1867_replace_overflow_libenc
exc[i] = round_fx_sat( L_shl_sat( L_mult( exc[i], gain_trans ), tmp16 ) );
-#else
- exc[i] = round_fx_o( L_shl_o( L_mult( exc[i], gain_trans ), tmp16, &Overflow ), &Overflow );
-#endif
move16();
}
@@ -2291,12 +2273,6 @@ void tc_classif_enc_fx(
{
Word32 temp;
Word16 T_op, i;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
T_op = pitch;
move16();
@@ -2371,11 +2347,7 @@ void tc_classif_enc_fx(
L_sum = L_mac_sat( 1L, res[0], res[0] );
FOR( i = 1; i < len; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_sum = L_mac0_sat( L_sum, res[i], res[i] );
-#else
- L_sum = L_mac0_o( L_sum, res[i], res[i], &Overflow );
-#endif
}
aver = L_sum; /*Q = 2*Q_new */
move32();
@@ -2388,13 +2360,8 @@ void tc_classif_enc_fx(
L_temp1 = Mult_32_16( temp, 8192 ); /* Q=31-exp */
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
IF( GT_32( temp2, L_shl_sat( L_temp2, ( 31 - exp2 ) - ( 31 - exp ) ) ) &&
LT_32( aver, L_shl_sat( L_temp1, ( 31 - exp_aver ) - ( 31 - exp ) ) ) )
-#else
- IF( GT_32( temp2, L_shl_o( L_temp2, ( 31 - exp2 ) - ( 31 - exp ), &Overflow ) ) &&
- LT_32( aver, L_shl_o( L_temp1, ( 31 - exp_aver ) - ( 31 - exp ), &Overflow ) ) )
-#endif
{
*position = position_tmp;
move16();
diff --git a/lib_enc/vad_fx.c b/lib_enc/vad_fx.c
index 9883d9fae5366185dbfa83f79b66104cd0b73ea2..c4c6df6c3b4e55a8e1aa0beccac0951ecdbb63d7 100644
--- a/lib_enc/vad_fx.c
+++ b/lib_enc/vad_fx.c
@@ -1,10 +1,10 @@
/*====================================================================================
EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0
====================================================================================*/
+
#include
#include "options.h"
#include "cnst.h" /* Common constants */
-//#include "prot_fx.h" /* Function prototypes */
#include "rom_enc.h"
#include "prot_fx.h" /* Function prototypes */
#include "prot_fx_enc.h" /* Function prototypes */
@@ -75,9 +75,10 @@
/* snr_sum = "scale" * (float)log10( L_snr_sum ) ;*/
-static Word16 vad_snr_log_fx( /* o: Q8 */
- Word32 L_snr, /* i: Q4 */
- Word16 scale /* i: scale Q13 , 10.0*log10(2) or 1.0*log10(2) */
+/* o: Q8 */
+static Word16 vad_snr_log_fx(
+ Word32 L_snr, /* i: Q4 */
+ Word16 scale /* i: scale Q13 , 10.0*log10(2) or 1.0*log10(2) */
)
{
Word16 e_snr, f_snr;
@@ -199,6 +200,7 @@ static void sign_thr_snr_acc_ivas_fx(
move32();
move32();
}
+
static void sign_thr_snr_acc_fx(
Word32 *L_snr_sum, /* o: Q4 */
Word32 L_snr, /* i: Q4 */
@@ -208,12 +210,6 @@ static void sign_thr_snr_acc_fx(
{
/*if( snr >= sign_thr ) */
Word32 L_tmp;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
L_tmp = L_deposit_l( min_snr );
IF( GE_32( L_snr, L_deposit_l( sign_thr ) ) )
@@ -221,12 +217,8 @@ static void sign_thr_snr_acc_fx(
L_tmp = L_add( L_snr, 0 ); /* Q4 */
}
BASOP_SATURATE_WARNING_OFF_EVS /* may saturate in BASOP */
-#ifdef ISSUE_1867_replace_overflow_libenc
*L_snr_sum = L_add_sat( *L_snr_sum, L_tmp );
/* Q4 */
-#else
- *L_snr_sum = L_add_o( *L_snr_sum, L_tmp, &Overflow ); /* Q4 */
-#endif
move32();
BASOP_SATURATE_WARNING_ON_EVS
}
@@ -702,12 +694,6 @@ Word16 wb_vad_fx(
Word32 L_accum_ener_H;
Word16 vad_bwidth_fx;
Word16 last_7k2_coder_type;
-#if !defined( ISSUE_1867_replace_overflow_libenc )
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
if ( hNoiseEst == NULL )
{
@@ -1052,35 +1038,19 @@ Word16 wb_vad_fx(
tmp = shl_sat( snr, 5 ); /* Q8 -> Q13 */
IF( LT_16( i, 2 ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = add_sat( tmp, delta1 ); /*Q13 */
-#else
- tmp = add_o( tmp, delta1, &Overflow ); /*Q13 */
-#endif
}
ELSE IF( LT_16( i, 7 ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = add_sat( tmp, delta2 ); /*Q13 */
-#else
- tmp = add_o( tmp, delta2, &Overflow ); /*Q13 */
-#endif
}
ELSE IF( LT_16( i, 18 ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = add_sat( tmp, delta3 ); /*Q13 */
-#else
- tmp = add_o( tmp, delta3, &Overflow ); /*Q13 */
-#endif
}
ELSE
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp = add_sat( tmp, delta4 ); /*Q13 */
-#else
- tmp = add_o( tmp, delta4, &Overflow ); /*Q13 */
-#endif
}
tmp1 = tmp;
@@ -1088,11 +1058,7 @@ Word16 wb_vad_fx(
sub( 0, 0 );
if ( LT_16( i, 7 ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
tmp1 = add_sat( tmp, 3277 ); /*.4 in Q13 ftmp1 = ftmp + 0.4f; */
-#else
- tmp1 = add_o( tmp, 3277, &Overflow ); /*.4 in Q13 ftmp1 = ftmp + 0.4f; */
-#endif
}
tmp = s_min( tmp, 16384 ); /* Q13, ftmp = min(ftmp, 2.0f); */
@@ -1176,19 +1142,11 @@ Word16 wb_vad_fx(
/* accumulate background noise energy in bands [0-2] and in bands [3-19]*/
IF( LT_16( i, 3 ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_accum_ener_L = L_add_sat( L_accum_ener_L, hNoiseEst->bckr_fx[i] ); /*Q_new+QSCALE */
-#else
- L_accum_ener_L = L_add_o( L_accum_ener_L, hNoiseEst->bckr_fx[i], &Overflow ); /*Q_new+QSCALE */
-#endif
}
ELSE
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_accum_ener_H = L_add_sat( L_accum_ener_H, hNoiseEst->bckr_fx[i] ); /*Q_new+QSCALE */
-#else
- L_accum_ener_H = L_add_o( L_accum_ener_H, hNoiseEst->bckr_fx[i], &Overflow ); /*Q_new+QSCALE */
-#endif
}
/* Identify the outlier band */
@@ -1282,11 +1240,7 @@ Word16 wb_vad_fx(
}
}
/*st_fx->snr_sum_vad_fx = 0.5f * st->snr_sum_vad + 0.5f * snr_sum_ol;*/
-#ifdef ISSUE_1867_replace_overflow_libenc
hVAD->L_snr_sum_vad_fx = L_shr( L_add_sat( hVAD->L_snr_sum_vad_fx, L_snr_sum_ol ), 1 ); /*Q4*/
-#else
- hVAD->L_snr_sum_vad_fx = L_shr( L_add_o( hVAD->L_snr_sum_vad_fx, L_snr_sum_ol, &Overflow ), 1 ); /*Q4*/
-#endif
move32();
/* snr_sum_ol = 10.0f * (float)log10( snr_sum_ol ); */
@@ -1400,11 +1354,7 @@ Word16 wb_vad_fx(
thr1_ol = thr1;
move16();
L_tmp2 = Msub_32_16( (Word32) 614, L_snr_outlier, 20972 ); /* .6*1024= */ /* 0.6 Q26(Q10 in high word) - Q4*Q21+1 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- tmp2 = round_fx( L_shl_sat( L_tmp2, 14 ) ); /* Q10(high word)+ 14 -16 --> Q8*/
-#else
- tmp2 = round_fx( L_shl_o( L_tmp2, 14, &Overflow ) ); /* Q10(high word)+ 14 -16 --> Q8*/
-#endif
+ tmp2 = round_fx( L_shl_sat( L_tmp2, 14 ) ); /* Q10(high word)+ 14 -16 --> Q8*/
IF( L_tmp2 > 0 )
{
thr1_ol = add( thr1_ol, tmp2 ); /* Q24 >>16 + Q8 */
@@ -1974,12 +1924,6 @@ Word16 wb_vad_ivas_fx(
Word16 last_7k2_coder_type;
Word16 q_shift, q_ener, q_diff1, q_diff2;
Word16 q_L_snr_sum_ol, e_snr, f_snr;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
Word16 L_msnr_e = 0, L_mssnr_e = 0, L_mssnr_hov_e = 0, L_msnr18_e = 0, L_msnr19_e = 0;
move16(); /*L_msnr_e*/
move16(); /*L_mssnr_e*/
@@ -2444,19 +2388,11 @@ Word16 wb_vad_ivas_fx(
/* accumulate background noise energy in bands [0-2] and in bands [3-19]*/
IF( LT_16( i, 3 ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_accum_ener_L = L_add_sat( L_accum_ener_L, hNoiseEst->bckr_fx[i] ); /* hNoiseEst->q_bckr */
-#else
- L_accum_ener_L = L_add_o( L_accum_ener_L, hNoiseEst->bckr_fx[i], &Overflow ); /* hNoiseEst->q_bckr */
-#endif
}
ELSE
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_accum_ener_H = L_add_sat( L_accum_ener_H, hNoiseEst->bckr_fx[i] ); /*hNoiseEst->q_bckr */
-#else
- L_accum_ener_H = L_add_o( L_accum_ener_H, hNoiseEst->bckr_fx[i], &Overflow ); /*hNoiseEst->q_bckr */
-#endif
}
/* Identify the outlier band */
@@ -2470,11 +2406,8 @@ Word16 wb_vad_ivas_fx(
move16();
}
} /* end of band loop */
-#ifdef ISSUE_1867_replace_overflow_libenc
+
L_snr_sum_HE_SAD = L_shl_sat( L_snr_sum_HE_SAD, sub( 4, q_snr_sum_HE_SAD ) ); // q_snr_sum_HE_SAD->q4
-#else
- L_snr_sum_HE_SAD = L_shl_o( L_snr_sum_HE_SAD, sub( 4, q_snr_sum_HE_SAD ), &Overflow ); // q_snr_sum_HE_SAD->q4
-#endif
snr_sumt = extract_h( L_shl( L_snr_sumt, Q4 ) ); // Q16 -> Q4
diff --git a/lib_enc/vad_param_updt_fx.c b/lib_enc/vad_param_updt_fx.c
index 8cafb40da2e7edc026b6c10d8dc8c001c37b0d0a..9738da4d653187e2e8c9c77ad19b984e32af1e3a 100644
--- a/lib_enc/vad_param_updt_fx.c
+++ b/lib_enc/vad_param_updt_fx.c
@@ -1,11 +1,11 @@
/*====================================================================================
EVS Codec 3GPP TS26.452 Aug 12, 2021. Version 16.3.0
====================================================================================*/
+
#include
#include
-#include "options.h" /* Compilation switches */
-#include "cnst.h" /* Common constants */
-//#include "prot_fx.h" /* Function prototypes */
+#include "options.h" /* Compilation switches */
+#include "cnst.h" /* Common constants */
#include "ivas_stat_enc.h" /* Function prototypes */
#include "prot_fx.h" /* Function prototypes */
#include "prot_fx_enc.h" /* Function prototypes */
@@ -34,12 +34,6 @@ void vad_param_updt_fx(
Word16 i, ini_frame, corr_shift_temp[2];
VAD_HANDLE hVAD;
DTX_ENC_HANDLE hDtxEnc = st_fx->hDtxEnc;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
corr_shift_temp[0] = corr_shift; /*Q15*/
corr_shift_temp[1] = corr_shiftR; /*Q15*/
@@ -64,8 +58,7 @@ void vad_param_updt_fx(
}
IF( !st_fx->Opt_AMR_WB )
{
- /* fix explanation
- , after function dtx_fx, the "vad_flag" parameter can not be used for SID scheduling purposes any longer
+ /* fix explanation, after function dtx_fx, the "vad_flag" parameter can not be used for SID scheduling purposes any longer
as dtx_fx can schedules active frames even if the initial analyzed vad_flag is 0 )
in the worst case without the fix an active frame could be classified as SID frame, quite/very unlikley though
*/
@@ -162,18 +155,12 @@ void vad_param_updt_fx(
}
}
-
/* (voicing[0] + voicing[1] + voicing[2]) / 3 + corr_shift */
L_tmp = L_mult( st_fx->voicing_fx[0], 10923 );
L_tmp = L_mac( L_tmp, st_fx->voicing_fx[1], 10923 );
- L_tmp = L_mac( L_tmp, st_fx->voicing_fx[2], 10923 ); /*Q15 */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ L_tmp = L_mac( L_tmp, st_fx->voicing_fx[2], 10923 ); /*Q15 */
L_tmp = L_mac_sat( L_tmp, corr_shift_temp[i], 32767 ); /*Q15 */
voice_tmp = round_fx_sat( L_tmp ); /*Q15 */
-#else
- L_tmp = L_mac_o( L_tmp, corr_shift_temp[i], 32767, &Overflow ); /*Q15 */
- voice_tmp = round_fx_o( L_tmp, &Overflow ); /*Q15 */
-#endif
/* abs(pitch[0] - *pitO) + abs(pitch[1] - pitch[0]) + abs(pitch[2] - pitch[1]) */
pitch_tmp = abs_s( sub( st_fx->pitch[0], old_pitch1 ) ); /*Q0 */
diff --git a/lib_enc/vbr_average_rate_fx.c b/lib_enc/vbr_average_rate_fx.c
index 668dd06d7249339beaa3b5dc7b9894b2d5546172..f1f75a30a40dff5cef50c030d359d1bfd2fcabb4 100644
--- a/lib_enc/vbr_average_rate_fx.c
+++ b/lib_enc/vbr_average_rate_fx.c
@@ -47,13 +47,6 @@ void update_average_rate_fx(
Word16 tmp;
Word32 L_tmp;
Word32 L_tmp1, L_tmp2;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
Word16 exp, recip, Qrecip;
IF( EQ_16( hSC_VBR->numactive, RATEWIN ) ) /* goes into rate control only the numactive ==RATEWIN. So rate control is triggered after each RATEWIN avtive frames */
@@ -258,11 +251,8 @@ void update_average_rate_fx(
/* sum the total number of bits (in kbytes) * 10 here */
/*st->sum_of_rates += (hSC_VBR->core_brate / 1000.0f) * 10; */
L_tmp = L_shl( Mult_32_16( core_brate_fx, 20972 ), 7 ); /*Q13*/
-#ifdef ISSUE_1867_replace_overflow_libenc
hSC_VBR->sum_of_rates_fx = L_add_sat( hSC_VBR->sum_of_rates_fx, L_tmp );
-#else
- hSC_VBR->sum_of_rates_fx = L_add_o( hSC_VBR->sum_of_rates_fx, L_tmp, &Overflow );
-#endif
move32();
+
return;
}
diff --git a/lib_enc/vlpc_2st_cod_fx.c b/lib_enc/vlpc_2st_cod_fx.c
index 3f56add3986225e0cede5f6931e97488e3b150df..6db7cd3ef6e350ce3cced4767ed7bffb466cd9a6 100644
--- a/lib_enc/vlpc_2st_cod_fx.c
+++ b/lib_enc/vlpc_2st_cod_fx.c
@@ -30,13 +30,6 @@ Word16 vlpc_2st_cod_fx( /* output: number of allocated bits
Word16 nq, xq[M];
Word32 L_tmp;
Word16 gap;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
-
/* 0 bit with true weighting: save 0.5 bit */
lsf_weight_2st( lsf, w, 1 ); /*w:0Q15*1.28*/
@@ -59,11 +52,7 @@ Word16 vlpc_2st_cod_fx( /* output: number of allocated bits
BASOP_SATURATE_WARNING_OFF_EVS /* Allow saturate because we only need to know if the result is smaller than 8.0f */
FOR( i = 1; i < M; i++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
L_tmp = L_mac_sat( L_tmp, x[i], x[i] ); /*10Q21*/
-#else
- L_tmp = L_mac_o( L_tmp, x[i], x[i], &Overflow ); /*10Q21*/
-#endif
}
BASOP_SATURATE_WARNING_ON_EVS
diff --git a/lib_enc/voiced_enc_fx.c b/lib_enc/voiced_enc_fx.c
index 705c5f6ea255eff5edc483d8c5fccfdcd8b80075..a78ec7648031fa923d47c90b184a8b6aeab61ca6 100644
--- a/lib_enc/voiced_enc_fx.c
+++ b/lib_enc/voiced_enc_fx.c
@@ -123,12 +123,6 @@ ivas_error ppp_voiced_encoder_fx(
Word32 low_band_en_fx;
Word32 curr_Engy, prev_Engy;
Word16 temp_Fs;
-#if !defined( ISSUE_1867_replace_overflow_libenc )
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
DTFS_STRUCTURE *CURRP_NQ_FX;
DTFS_STRUCTURE *TMPDTFS_FX;
DTFS_STRUCTURE *TMPDTFS2_FX;
@@ -566,11 +560,7 @@ ivas_error ppp_voiced_encoder_fx(
/*if ( res_enratio > 5.0 && tmp < 0.65 ) */
/* 5 in Q11, 0.65 in Q15 // L_shl(tmp_fx,sub(31,Qtmp)) makes tmp_fx FIXED Q31 */
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( ( GT_32( res_enratio_fx, 10240 ) ) && ( LT_16( extract_h( L_shl_sat( tmp_fx, sub( 31, Qtmp ) ) ), 21299 ) ) )
-#else
- if ( ( GT_32( res_enratio_fx, 10240 ) ) && ( LT_16( extract_h( L_shl_o( tmp_fx, sub( 31, Qtmp ), &Overflow ) ), 21299 ) ) )
-#endif
{
PPP_MODE_E = 'B';
move16();
@@ -581,11 +571,7 @@ ivas_error ppp_voiced_encoder_fx(
/* if ( res_enratio > 3.0 && tmp < 1.2 ) */
/*3 in Q11, 1.2 in Q14 // L_shl(tmp_fx,sub(31,Qtmp)) makes tmp_fx FIXED Q14 */
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( ( GT_32( res_enratio_fx, 6144 ) ) && ( LT_16( extract_h( L_shl_sat( tmp_fx, sub( 30, Qtmp ) ) ), 19661 ) ) )
-#else
- if ( ( GT_32( res_enratio_fx, 6144 ) ) && ( LT_16( extract_h( L_shl_o( tmp_fx, sub( 30, Qtmp ), &Overflow ) ), 19661 ) ) )
-#endif
{
PPP_MODE_E = 'B';
move16();
@@ -599,12 +585,7 @@ ivas_error ppp_voiced_encoder_fx(
IF( LT_16( shl_sat( hSC_VBR->vadsnr_fx, 1 ), hSC_VBR->SNR_THLD_fx ) ) /*Q8 */
{
/* if (res_enratio < 0.025) */
-#ifdef ISSUE_1867_replace_overflow_libenc
- IF( LT_32( L_shl_sat( res_enratio_fx, 4 ), 819 ) )
- /*0x0333 = 0.025 in Q15, res_enratio_fx in Q15 after shl 4 */
-#else
- IF( LT_32( L_shl_o( res_enratio_fx, 4, &Overflow ), 819 ) ) /*0x0333 = 0.025 in Q15, res_enratio_fx in Q15 after shl 4 */
-#endif
+ IF( LT_32( L_shl_sat( res_enratio_fx, 4 ), 819 ) ) /*0x0333 = 0.025 in Q15, res_enratio_fx in Q15 after shl 4 */
{
hSC_VBR->bump_up = 1;
move16();
@@ -620,11 +601,7 @@ ivas_error ppp_voiced_encoder_fx(
ELSE
{
/* if ( res_enratio < 0.092f) */
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( LT_32( L_shl_sat( res_enratio_fx, 4 ), 3015 ) ) /*3015 = 0.092 in Q15, res_enratio_fx in Q15 after shl 4 */
-#else
- if ( LT_32( L_shl_o( res_enratio_fx, 4, &Overflow ), 3015 ) ) /*3015 = 0.092 in Q15, res_enratio_fx in Q15 after shl 4 */
-#endif
{
hSC_VBR->bump_up = 1;
move16();
@@ -633,12 +610,7 @@ ivas_error ppp_voiced_encoder_fx(
/* if (min(res_enratio, sp_enratio) < 0.075 && tmp < -0.5f)) : 2458 = 0.075 in Q15 */
test();
-#ifdef ISSUE_1867_replace_overflow_libenc
if ( LT_32( L_min( L_shl_sat( res_enratio_fx, 4 ), sp_enratio_fx ), 2458 ) && LT_32( tmp_fx, shl_sat( -1, sub( Qtmp, 1 ) ) ) )
-#else
-
- if ( LT_32( L_min( L_shl_o( res_enratio_fx, 4, &Overflow ), sp_enratio_fx ), 2458 ) && LT_32( tmp_fx, shl_sat( -1, sub( Qtmp, 1 ) ) ) )
-#endif
{
hSC_VBR->bump_up = 1;
move16();
@@ -757,11 +729,7 @@ ivas_error ppp_voiced_encoder_fx(
Ltemp1 = L_negate( Ltemp1 );
}
expa = norm_l( Ltemp2 );
-#ifdef ISSUE_1867_replace_overflow_libenc
fraca = extract_h( L_shl( Ltemp2, expa ) );
-#else
- fraca = extract_h( L_shl_o( Ltemp2, expa, &Overflow ) );
-#endif
expa = sub( 30, expa );
expb = norm_l( Ltemp1 );
@@ -774,11 +742,7 @@ ivas_error ppp_voiced_encoder_fx(
tmp = div_s( fracb, fraca );
exp = sub( expb, expa );
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltemp_fx = L_shl_sat( tmp, add( exp, 14 ) );
-#else
- Ltemp_fx = L_shl_o( tmp, add( exp, 14 ), &Overflow );
-#endif
/*-------------------------------------------*/
sp_hb_enratio_fx = L_add( Ltemp_fx, 0 ); /* Q29 */
}
@@ -802,11 +766,7 @@ ivas_error ppp_voiced_encoder_fx(
move32();
Qadj = sub( hSC_VBR->Q_prev_cw_en_fx, shl( CURRP_NQ_FX->Q, 1 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp_32 = L_shl_sat( Ltmp_32, Qadj ); /* shift left required to adjust Q of CURRP_NQ_FX = Q_prev_cw_en_fx */
-#else
- Ltmp_32 = L_shl_o( Ltmp_32, Qadj, &Overflow ); /* shift left required to adjust Q of CURRP_NQ_FX = Q_prev_cw_en_fx */
-#endif
/* Ltmp1_32 = 0.8f * st->prev_cw_en */
Ltmp1_32 = Mult_32_16( hSC_VBR->prev_cw_en_fx, 26214 ); /* Q = (Q_prev_cw_en_fx + Q15+1)-Q16 = Q_prev_cw_en_fx */
@@ -911,11 +871,7 @@ ivas_error ppp_voiced_encoder_fx(
/* compute energy of impz */
FOR( x_fx = 0; x_fx < 160; x_fx++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
energy_impz_fx = L_add_sat( energy_impz_fx, L_mult0( impzo_fx[x_fx], impzo_fx[x_fx] ) );
-#else
- energy_impz_fx = L_add_o( energy_impz_fx, L_mult0( impzo_fx[x_fx], impzo_fx[x_fx] ), &Overflow );
-#endif
}
/*energy_impz = (float)(10*log10((float)energy_impz)); */
@@ -929,11 +885,7 @@ ivas_error ppp_voiced_encoder_fx(
Ltmp_32 = DTFS_getEngy_fx( CURRP_Q_E_FX ); /*Q = 2*(CURRP_Q_E_FX->Q) */
move32();
Qadj = sub( hSC_VBR->Q_prev_cw_en_fx, shl( CURRP_Q_E_FX->Q, 1 ) );
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltmp_32 = L_shl_sat( Ltmp_32, Qadj ); /* shift left required to adjust Q of CURRP_Q_E_FX = Q_prev_cw_en_fx */
-#else
- Ltmp_32 = L_shl_o( Ltmp_32, Qadj, &Overflow ); /* shift left required to adjust Q of CURRP_Q_E_FX = Q_prev_cw_en_fx */
-#endif
/* if ((DTFS_getEngy(*CURRP_Q_E) > st->prev_cw_en)&&(max(pos_q,neg_q)>3.5) && energy_impz>15.0 && tmpres>0.7) */
test();
test();
@@ -995,13 +947,9 @@ ivas_error ppp_voiced_encoder_fx(
fracb = shl( fracb, scale );
expb = sub( expb, scale );
- tmp = div_s( fracb, fraca ); /* tmp in Q15 */
- exp = sub( expb, expa ); /* ans = tmp*2^(exp) */
-#ifdef ISSUE_1867_replace_overflow_libenc
+ tmp = div_s( fracb, fraca ); /* tmp in Q15 */
+ exp = sub( expb, expa ); /* ans = tmp*2^(exp) */
Ltemp_fx = L_shl_sat( tmp, add( exp, 12 ) ); /* make tmp Q27 */
-#else
- Ltemp_fx = L_shl_o( tmp, add( exp, 12 ), &Overflow ); /* make tmp Q27 */
-#endif
}
test();
IF( GT_32( Ltemp_fx, 6710886 ) && ( !hSC_VBR->rate_control ) ) /* 0.05 in Q27 = 6710886 */
@@ -1037,11 +985,7 @@ ivas_error ppp_voiced_encoder_fx(
tmp = div_s( fracb, fraca );
exp = sub( expb, expa );
-#ifdef ISSUE_1867_replace_overflow_libenc
Ltemp_fx = L_shl_sat( tmp, add( exp, 14 ) ); /* answer in Q29 */
-#else
- Ltemp_fx = L_shl_o( tmp, add( exp, 14 ), &Overflow ); /* answer in Q29 */
-#endif
}
/*-------------------------------------------*/
@@ -1109,11 +1053,7 @@ ivas_error ppp_voiced_encoder_fx(
exp = sub( 30, add( expa, sub( 31, exp ) ) );
frac = Log2_norm_lc( L_tmp );
L_tmp = Mpy_32_16( exp, frac, 12330 ); /* L_tmp is always Q13 */
-#ifdef ISSUE_1867_replace_overflow_libenc
- Ltemp = L_shl_sat( L_tmp, 10 ); /* Ltemp is always Q23 */
-#else
- Ltemp = L_shl_o( L_tmp, 10, &Overflow ); /* Ltemp is always Q23 */
-#endif
+ Ltemp = L_shl_sat( L_tmp, 10 ); /* Ltemp is always Q23 */
}
ELSE
{
@@ -1296,12 +1236,7 @@ static void synthesis_filter_fx( Word16 b[], Word16 x[], Word16 y[], Word16 buf[
{
Word32 acc;
Word16 i, j;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
FOR( i = 0; i < N; i++ )
{
acc = L_deposit_h( *x++ ); /*Q16 */
@@ -1310,28 +1245,15 @@ static void synthesis_filter_fx( Word16 b[], Word16 x[], Word16 y[], Word16 buf[
FOR( j = P - 1; j > 0; j-- )
{
/* acc = L_sub(acc, L_mult(memory[j], coef[j])); */
-#ifdef ISSUE_1867_replace_overflow_libenc
acc = L_msu_sat( acc, buf[j], b[j] ); /*Q13 */
-#else
- acc = L_msu_o( acc, buf[j], b[j], &Overflow ); /*Q13 */
-#endif
buf[j] = buf[j - 1];
move16();
}
/* acc = L_sub(acc, L_mult(memory[0], coef[0])); */
-#ifdef ISSUE_1867_replace_overflow_libenc
acc = L_msu_sat( acc, buf[0], b[0] );
acc = L_shl_sat( acc, 3 );
*y++ = round_fx_sat( acc );
buf[0] = round_fx_sat( acc );
-#else
- acc = L_msu_o( acc, buf[0], b[0], &Overflow );
- acc = L_shl_o( acc, 3, &Overflow );
-
- *y++ = round_fx_o( acc, &Overflow );
-
- buf[0] = round_fx_o( acc, &Overflow );
-#endif
move16();
move16();
}
@@ -1376,12 +1298,7 @@ static Word32 DTFS_freq_corr_fx(
Word16 exp, tmp;
Word32 L_tmp;
Word16 Q_num, Q_den;
-#if !defined( ISSUE_1867_replace_overflow_libenc )
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
IF( LT_16( X1_DTFS_fx.lag_fx, X2_DTFS_fx.lag_fx ) )
{
DTFS_zeroPadd_fx( X2_DTFS_fx.lag_fx, &X1_DTFS_fx );
@@ -1416,13 +1333,8 @@ static Word32 DTFS_freq_corr_fx(
FOR( k = lk; k < hk; k++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
corr_fx = L_mac0_sat( corr_fx, X1_DTFS_fx.a_fx[k], X2_DTFS_fx.a_fx[k] ); /* Q(1) */
corr_fx = L_mac0_sat( corr_fx, X1_DTFS_fx.b_fx[k], X2_DTFS_fx.b_fx[k] ); /* Q(1) */
-#else
- corr_fx = L_mac0_o( corr_fx, X1_DTFS_fx.a_fx[k], X2_DTFS_fx.a_fx[k], &Overflow ); /* Q(1) */
- corr_fx = L_mac0_o( corr_fx, X1_DTFS_fx.b_fx[k], X2_DTFS_fx.b_fx[k], &Overflow ); /* Q(1) */
-#endif
}
Qr = norm_l( corr_fx );
@@ -1432,12 +1344,8 @@ static Word32 DTFS_freq_corr_fx(
move16();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
E1_fx = round_fx_sat( L_shl_sat( corr_fx, Qr ) ); /* Q(Qr-16) */
-#else
- E1_fx = round_fx_o( L_shl_o( corr_fx, Qr, &Overflow ), &Overflow ); /* Q(Qr-16) */
-#endif
- Num = L_mult0( E1_fx, E1_fx ); /* Q(2+2*Qr-32+1) */
+ Num = L_mult0( E1_fx, E1_fx ); /* Q(2+2*Qr-32+1) */
Q_num = sub( shl( add( add( X1_DTFS_fx.Q, X2_DTFS_fx.Q ), Qr ), 1 ), 32 );
/* PORTING: Handling the functions with variable no. of arguments */
@@ -1450,11 +1358,7 @@ static Word32 DTFS_freq_corr_fx(
move16();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
E1_fx = round_fx_sat( L_shl_sat( E_fx, q1 ) ); /* Q(1+q1-16) */
-#else
- E1_fx = round_fx_o( L_shl_o( E_fx, q1, &Overflow ), &Overflow ); /* Q(1+q1-16) */
-#endif
/* PORTING: Handling the functions with variable no. of arguments */
E_fx = DTFS_getEngy_band_fx( X2_DTFS_fx, lband, hband ); /* Q(1) */
q2 = norm_l( E_fx );
@@ -1464,12 +1368,8 @@ static Word32 DTFS_freq_corr_fx(
move16();
}
-#ifdef ISSUE_1867_replace_overflow_libenc
E2_fx = round_fx_sat( L_shl_sat( E_fx, q2 ) ); /* Q(1+q2-16) */
-#else
- E2_fx = round_fx_o( L_shl_o( E_fx, q2, &Overflow ), &Overflow ); /* Q(1+q2-16) */
-#endif
- Den = L_mult0( E1_fx, E2_fx ); /* Q(2+q1+q2-32+1) */
+ Den = L_mult0( E1_fx, E2_fx ); /* Q(2+q1+q2-32+1) */
Q_den = sub( add( shl( add( X2_DTFS_fx.Q, X1_DTFS_fx.Q ), 1 ), add( q1, q2 ) ), 32 );
Num = L_max( Num, 1 );
@@ -1483,25 +1383,14 @@ static Word32 DTFS_freq_corr_fx(
}
ELSE
{
-
expa = norm_l( Num );
-#ifdef ISSUE_1867_replace_overflow_libenc
fraca = extract_h( L_shl_sat( Num, expa ) );
-#else
- fraca = extract_h( L_shl_o( Num, expa, &Overflow ) );
-#endif
expa = sub( 30, add( expa, Q_num ) );
-
expb = norm_l( Den );
-#ifdef ISSUE_1867_replace_overflow_libenc
fracb = round_fx_sat( L_shl( Den, expb ) );
-#else
- fracb = round_fx_o( L_shl_o( Den, expb, &Overflow ), &Overflow );
-#endif
expb = sub( 30, add( expb, Q_den ) );
-
scale = shr( sub( fraca, fracb ), 15 );
fracb = shl_sat( fracb, scale );
expb = sub( expb, scale );
@@ -1521,8 +1410,11 @@ static Word32 DTFS_freq_corr_fx(
*Qout = sub( 30, exp );
move16();
}
+
return Result;
}
+
+
/*===================================================================*/
/* FUNCTION : DTFS_alignment_extract_td_fx () */
/*-------------------------------------------------------------------*/
@@ -1547,12 +1439,7 @@ static Word16 DTFS_alignment_extract_td_fx( Word16 *x1, Word16 *x2, Word16 lag )
{
Word16 j, k, idx, Adiff_fx;
Word32 maxcorr, corr;
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
maxcorr = L_add( MIN_32, 0 );
Adiff_fx = (Word16) ( s_max( 4, shr( lag, 3 ) ) );
@@ -1563,11 +1450,7 @@ static Word16 DTFS_alignment_extract_td_fx( Word16 *x1, Word16 *x2, Word16 lag )
corr = L_deposit_l( 0 );
FOR( k = 0; k < lag; k++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
corr = L_mac_sat( corr, x1[k], x2[( k - j + lag ) % lag] );
-#else
- corr = L_mac_o( corr, x1[k], x2[( k - j + lag ) % lag], &Overflow );
-#endif
}
IF( GT_32( corr, maxcorr ) )
{
@@ -1610,15 +1493,11 @@ static Word32 DTFS_getEngy_band_fx(
Word32 freq_fx, L_lband, L_hband;
Word32 en_fx = 0;
move32();
-#ifndef ISSUE_1867_replace_overflow_libenc
-#ifdef BASOP_NOGLOB_DECLARE_LOCAL
- Flag Overflow = 0;
- move32();
-#endif
-#endif
+
L_lband = L_mult( lband, X_fx.lag_fx ); /* Q0 * Q0 -> Q1 */
L_hband = L_mult( hband, X_fx.lag_fx ); /* Q0 * Q0 -> Q1 */
HalfLag = s_min( shr( sub( X_fx.lag_fx, 1 ), 1 ), X_fx.nH_4kHz_fx );
+
/* get lband and hband */
FOR( k = 1; k <= HalfLag; k++ )
{
@@ -1643,13 +1522,8 @@ static Word32 DTFS_getEngy_band_fx(
FOR( k = lk; k < hk; k++ )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
en_fx = L_mac0_sat( en_fx, X_fx.a_fx[k], X_fx.a_fx[k] ); /* 2*X1.Q+1 */
en_fx = L_mac0_sat( en_fx, X_fx.b_fx[k], X_fx.b_fx[k] );
-#else
- en_fx = L_mac0_o( en_fx, X_fx.a_fx[k], X_fx.a_fx[k], &Overflow ); /* 2*X1.Q+1 */
- en_fx = L_mac0_o( en_fx, X_fx.b_fx[k], X_fx.b_fx[k], &Overflow );
-#endif
}
if ( lband == 0 )
@@ -1661,17 +1535,14 @@ static Word32 DTFS_getEngy_band_fx(
test();
IF( ( s_and( X_fx.lag_fx, 1 ) == 0 ) && ( hband == X_fx.upper_cut_off_freq_fx ) )
{
-#ifdef ISSUE_1867_replace_overflow_libenc
en_fx = L_mac0_sat( en_fx, X_fx.a_fx[k], X_fx.a_fx[k] );
en_fx = L_mac0_sat( en_fx, X_fx.b_fx[k], X_fx.b_fx[k] );
-#else
- en_fx = L_mac0_o( en_fx, X_fx.a_fx[k], X_fx.a_fx[k], &Overflow );
- en_fx = L_mac0_o( en_fx, X_fx.b_fx[k], X_fx.b_fx[k], &Overflow );
-#endif
}
return en_fx; /* 2*X1.Q */
}
+
+
/*---------------------------------------------------------------------*
* sc_vbr_enc_init_fx()
*
diff --git a/lib_isar/isar_cnst.h b/lib_isar/isar_cnst.h
index 9e8793130d395b65f0a5e54829995d79f426a9e3..40d6c393857ee28145728999a52dfded680ec8db 100644
--- a/lib_isar/isar_cnst.h
+++ b/lib_isar/isar_cnst.h
@@ -139,7 +139,7 @@ typedef enum
#define ISAR_SPLIT_REND_ROT_AXIS_BITS 3
#define ISAR_SPLIT_REND_RO_FLAG_BITS 1
-#define IVAS_LC3PLUS_MAX_NUM_DECODERS 2
+#define ISAR_LC3PLUS_MAX_NUM_DECODERS 2
/*----------------------------------------------------------------------------------*
* Split rendering bitrate constants
diff --git a/lib_isar/isar_lc3plus_dec.c b/lib_isar/isar_lc3plus_dec.c
index 38371d1343b81d0c4c484f9d29f3f78f00cdff85..279daee41d351702c6c9aee5a65d8858deea9651 100644
--- a/lib_isar/isar_lc3plus_dec.c
+++ b/lib_isar/isar_lc3plus_dec.c
@@ -67,9 +67,9 @@ ivas_error ISAR_LC3PLUS_DEC_Open(
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LC3plus wrapper handle\n" );
}
- if ( config.channels > IVAS_LC3PLUS_MAX_NUM_DECODERS )
+ if ( config.channels > ISAR_LC3PLUS_MAX_NUM_DECODERS )
{
- return IVAS_ERROR( IVAS_ERR_INIT_ERROR, "Maximum number of channels exceeds IVAS_LC3PLUS_MAX_NUM_DECODERS\n" );
+ return IVAS_ERROR( IVAS_ERR_INIT_ERROR, "Maximum number of channels exceeds ISAR_LC3PLUS_MAX_NUM_DECODERS\n" );
}
diff --git a/lib_isar/isar_splitRendererPLC.c b/lib_isar/isar_splitRendererPLC.c
index 60eeff74646131f51385c5ceb22327a587dcd128..d807a26e6ea2eebbd5a35efbadce5d281a56e74c 100644
--- a/lib_isar/isar_splitRendererPLC.c
+++ b/lib_isar/isar_splitRendererPLC.c
@@ -1277,8 +1277,8 @@ void isar_splitBinRendPLC(
{
FOR( k = 0; k < iNumCols; k++ )
{
- v_multc_fixed( &Cldfb_RealBuffer_Binaural_fx[n][k][0], fade_fac_fx, &Cldfb_RealBuffer_Binaural_fx[n][k][0], (Word16) CLDFB_NO_CHANNELS_MAX );
- v_multc_fixed( &Cldfb_ImagBuffer_Binaural_fx[n][k][0], fade_fac_fx, &Cldfb_ImagBuffer_Binaural_fx[n][k][0], (Word16) CLDFB_NO_CHANNELS_MAX );
+ v_multc_fx( &Cldfb_RealBuffer_Binaural_fx[n][k][0], fade_fac_fx, &Cldfb_RealBuffer_Binaural_fx[n][k][0], (Word16) CLDFB_NO_CHANNELS_MAX );
+ v_multc_fx( &Cldfb_ImagBuffer_Binaural_fx[n][k][0], fade_fac_fx, &Cldfb_ImagBuffer_Binaural_fx[n][k][0], (Word16) CLDFB_NO_CHANNELS_MAX );
}
}
}
diff --git a/lib_isar/isar_stat.h b/lib_isar/isar_stat.h
index 9cfc24e5ace2249bd5dc97757eedd7f3bd58b460..351cb4525e3d9f46914c5456e29a444e21c2480c 100644
--- a/lib_isar/isar_stat.h
+++ b/lib_isar/isar_stat.h
@@ -48,9 +48,9 @@
* ISAR post rend constants
*-------------------------------------------------------------------*/
-#define MAX_CLDFB_BUFFER_LENGTH_PER_CHANNEL ( MAX_BUFFER_LENGTH_PER_CHANNEL * 2 )
+#define MAX_CLDFB_BUFFER_LENGTH_PER_CHANNEL ( L_FRAME_MAX * 2 )
#define MAX_CLDFB_BUFFER_LENGTH ( MAX_CLDFB_BUFFER_LENGTH_PER_CHANNEL * MAX_INPUT_CHANNELS )
-#define MAX_BIN_BUFFER_LENGTH ( MAX_BUFFER_LENGTH_PER_CHANNEL * BINAURAL_CHANNELS )
+#define MAX_BIN_BUFFER_LENGTH ( L_FRAME_MAX * BINAURAL_CHANNELS )
#define MAX_CLDFB_BIN_BUFFER_LENGTH ( MAX_CLDFB_BUFFER_LENGTH_PER_CHANNEL * BINAURAL_CHANNELS )
/*-------------------------------------------------------------------*
diff --git a/lib_isar/lib_isar_post_rend.c b/lib_isar/lib_isar_post_rend.c
index 5ee7f4a167ca31924f6400155ccc7331a164c961..8178663ce2c087d88d568880e5f4c7bf01f8355e 100644
--- a/lib_isar/lib_isar_post_rend.c
+++ b/lib_isar/lib_isar_post_rend.c
@@ -1039,8 +1039,12 @@ ivas_error ISAR_POST_REND_FeedInputAudio(
cldfb2tdSampleFact = ( inputAudio.config.is_cldfb ) ? 2 : 1;
- IF( LE_16( inputAudio.config.numSamplesPerChannel, 0 ) || ( LT_16( MAX_BUFFER_LENGTH_PER_CHANNEL, inputAudio.config.numSamplesPerChannel ) && EQ_16( inputAudio.config.is_cldfb, 0 ) ) ||
- ( LT_16( DEPR_i_mult( MAX_BUFFER_LENGTH_PER_CHANNEL, cldfb2tdSampleFact ), inputAudio.config.numSamplesPerChannel ) && EQ_16( inputAudio.config.is_cldfb, 1 ) ) )
+ test();
+ test();
+ test();
+ test();
+ IF( LE_16( inputAudio.config.numSamplesPerChannel, 0 ) || ( LT_16( L_FRAME_MAX, inputAudio.config.numSamplesPerChannel ) && EQ_16( inputAudio.config.is_cldfb, 0 ) ) ||
+ ( LT_16( DEPR_i_mult( L_FRAME_MAX, cldfb2tdSampleFact ), inputAudio.config.numSamplesPerChannel ) && EQ_16( inputAudio.config.is_cldfb, 1 ) ) )
{
return IVAS_ERROR( IVAS_ERR_INVALID_BUFFER_SIZE, "Buffer size outside of supported range" );
}
@@ -1118,11 +1122,7 @@ ivas_error ISAR_POST_REND_InitConfig(
hIvasRend->splitRenderConfig.isar_frame_size_ms = 0; /* 0 means "use default for selected codec" */
hIvasRend->splitRenderConfig.codec = ISAR_SPLIT_REND_CODEC_DEFAULT;
hIvasRend->splitRenderConfig.poseCorrectionMode = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB;
-#ifdef FIX_HRTF_LOAD
hIvasRend->splitRenderConfig.rendererSelection = IVAS_BIN_RENDERER_TYPE_DEFAULT;
-#else
- hIvasRend->splitRenderConfig.rendererSelection = ISAR_SPLIT_REND_RENDERER_SELECTION_DEFAULT;
-#endif
}
return IVAS_ERR_OK;
@@ -1633,10 +1633,10 @@ static ivas_error renderInputSplitBin(
splitBinInput->base.numNewSamplesPerChannel = 0;
/* Apply input gain to new audio */
- v_multc_fixed( inAudio.data_fx,
- splitBinInput->base.gain_fx,
- inAudio.data_fx,
- inAudio.config.numSamplesPerChannel * inAudio.config.numChannels );
+ v_multc_fx( inAudio.data_fx,
+ splitBinInput->base.gain_fx,
+ inAudio.data_fx,
+ inAudio.config.numSamplesPerChannel * inAudio.config.numChannels );
SWITCH( outConfig )
{
@@ -1703,8 +1703,12 @@ ivas_error ISAR_POST_REND_getSamples(
cldfb2tdSampleFact = ( outAudio.config.is_cldfb ) ? 2 : 1;
- IF( outAudio.config.numSamplesPerChannel <= 0 || ( MAX_BUFFER_LENGTH_PER_CHANNEL < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 0 ) ||
- ( ( MAX_BUFFER_LENGTH_PER_CHANNEL * cldfb2tdSampleFact ) < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 1 ) )
+ test();
+ test();
+ test();
+ test();
+ IF( outAudio.config.numSamplesPerChannel <= 0 || ( L_FRAME_MAX < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 0 ) ||
+ ( ( L_FRAME_MAX * cldfb2tdSampleFact ) < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 1 ) )
{
return IVAS_ERR_INVALID_BUFFER_SIZE;
}
diff --git a/lib_isar/lib_isar_pre_rend.c b/lib_isar/lib_isar_pre_rend.c
index da4f6542f69b0cfefab4404a2182a7672c1731d3..1ba5cafc4ed0bfb5c5e7b8502b92475e80997521 100644
--- a/lib_isar/lib_isar_pre_rend.c
+++ b/lib_isar/lib_isar_pre_rend.c
@@ -119,8 +119,8 @@ ivas_error ISAR_PRE_REND_open(
FOR( ch = 0; ch < num_ch; ch++ )
{
- if ( ( error = openCldfb_ivas_fx( &( hSplitRendWrapper->hCldfbHandles->cldfbAna[ch] ),
- CLDFB_ANALYSIS, OutSampleRate, CLDFB_PROTOTYPE_5_00MS, DEC ) ) != IVAS_ERR_OK )
+ IF( ( error = openCldfb_ivas_fx( &( hSplitRendWrapper->hCldfbHandles->cldfbAna[ch] ),
+ CLDFB_ANALYSIS, OutSampleRate, CLDFB_PROTOTYPE_5_00MS, DEC ) ) != IVAS_ERR_OK )
{
return error;
}
@@ -152,7 +152,7 @@ ivas_error ISAR_PRE_REND_open(
{
IF( EQ_16( pSplitRendConfig->codec, ISAR_SPLIT_REND_CODEC_LC3PLUS ) )
{
- if ( ( error = split_renderer_open_lc3plus( hSplitRendWrapper, pSplitRendConfig, OutSampleRate, ivas_frame_size ) ) != IVAS_ERR_OK )
+ IF( ( error = split_renderer_open_lc3plus( hSplitRendWrapper, pSplitRendConfig, OutSampleRate, ivas_frame_size ) ) != IVAS_ERR_OK )
{
return error;
}
diff --git a/lib_lc3plus/lc3.c b/lib_lc3plus/lc3.c
index 2d3fbb51e171c3d1c86d7b9fd57b31930687d369..e8a73aec84ba5e03673a8bd14618fe963c4f597e 100644
--- a/lib_lc3plus/lc3.c
+++ b/lib_lc3plus/lc3.c
@@ -121,9 +121,9 @@ static int null_in_list(void **list, int n)
/* return pointer to aligned base + base_size, *base_size += size + 4 bytes align */
void *balloc(void *base, size_t *base_size, size_t size)
{
- uintptr_t ptr = ((uintptr_t)base + *base_size + 3) & ~3;
+ uintptr_t ptr = ((uintptr_t)base + *base_size + 3) & (uintptr_t)(~3);
assert((uintptr_t)base % 4 == 0); /* base must be 4-byte aligned */
- *base_size = (*base_size + size + 3) & ~3;
+ *base_size = (*base_size + size + 3) & (uintptr_t)(~3);
return (void *)ptr;
}
diff --git a/lib_rend/ivas_crend_fx.c b/lib_rend/ivas_crend_fx.c
index 45d923b3e6f017a63292b87fa1df348db9a415ec..9c3379527d84ee278052b0ce8099af94674a623c 100644
--- a/lib_rend/ivas_crend_fx.c
+++ b/lib_rend/ivas_crend_fx.c
@@ -46,10 +46,7 @@
#include "debug.h"
#endif
-#define float_to_fix( n, factor ) ( round( n * ( 1 << factor ) ) )
-#define fix_to_float( n, factor ) ( (float) n / ( 1 << factor ) )
-#ifdef FIX_CREND_SIMPLIFY_CODE
/*-------------------------------------------------------------------------
* ivas_Crend_hrtf_init()
*
@@ -58,16 +55,6 @@
ivas_error ivas_Crend_hrtf_init_fx(
HRTFS_CREND_DATA *hHrtf /* i/o: HRTF handle */
-#else
-/*-------------------------------------------------------------------------
- * ivas_hrtf_init()
- *
- * Initialize hHrtf handle
- *------------------------------------------------------------------------*/
-
-ivas_error ivas_hrtf_init(
- HRTFS_DATA *hHrtf /* i/o: HRTF handle */
-#endif
)
{
Word16 i, j;
@@ -89,14 +76,12 @@ ivas_error ivas_hrtf_init(
move16();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = 0;
move16();
hHrtf->factor_Q_inv_diffuse_weight = 0;
move16();
hHrtf->factor_Q_pOut_to_bin = 0;
move16();
-#endif
FOR( i = 0; i < MAX_INTERN_CHANNELS; i++ )
{
@@ -129,7 +114,6 @@ ivas_error ivas_hrtf_init(
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
/*-------------------------------------------------------------------------
* ivas_hrtf_open()
*
@@ -151,28 +135,6 @@ static ivas_error ivas_hrtf_open_fx(
}
IF( ( error = ivas_Crend_hrtf_init_fx( hHrtf ) ) != IVAS_ERR_OK )
-#else
-/*-------------------------------------------------------------------------
- * ivas_hrtf_open()
- *
- * Open hHrtf handle
- *------------------------------------------------------------------------*/
-static ivas_error ivas_hrtf_open_fx(
- HRTFS_HANDLE *hHrtf_out /* o : HRTF handle */
-)
-{
- HRTFS_HANDLE hHrtf;
- ivas_error error;
-
- IF( *hHrtf_out == NULL )
- {
- IF( ( hHrtf = (HRTFS_HANDLE) malloc( sizeof( HRTFS_DATA ) ) ) == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for SPAR decoder\n" );
- }
-
- IF( NE_32( ( error = ivas_hrtf_init( hHrtf ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -195,11 +157,7 @@ static ivas_error ivas_hrtf_open_fx(
*------------------------------------------------------------------------*/
static void ivas_hrtf_close(
-#ifdef FIX_CREND_SIMPLIFY_CODE
HRTFS_CREND_HANDLE *hHrtf /* i/o: Crend HRTF handle */
-#else
- HRTFS_HANDLE *hHrtf /* i/o: HRTF handle */
-#endif
)
{
test();
@@ -225,26 +183,14 @@ static ivas_error ivas_rend_initCrend_fx(
CREND_WRAPPER *pCrend,
const AUDIO_CONFIG inConfig,
const AUDIO_CONFIG outConfig,
-#ifdef FIX_CREND_SIMPLIFY_CODE
HRTFS_CREND_HANDLE hHrtfCrend,
const Word16 ext_rend_flag,
-#else
- HRTFS_CREND_HANDLE hSetOfHRTF,
-#endif
const Word32 output_Fs )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
Word16 i, j, tmp, tmp2;
-#else
- Word16 i, j, tmp;
-#endif
Word16 nchan_in;
IVAS_REND_AudioConfigType inConfigType;
-#ifdef FIX_CREND_SIMPLIFY_CODE
HRTFS_CREND_HANDLE hHrtf;
-#else
- HRTFS_HANDLE hHrtf;
-#endif
ivas_error error;
inConfigType = getAudioConfigType( inConfig );
@@ -266,7 +212,6 @@ static ivas_error ivas_rend_initCrend_fx(
IF( hHrtf == NULL )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
test();
IF( hHrtfCrend != NULL && ext_rend_flag == 0 )
{
@@ -291,12 +236,6 @@ static ivas_error ivas_rend_initCrend_fx(
move16();
}
}
-#else
- IF( NE_32( ivas_hrtf_open_fx( &hHrtf ), IVAS_ERR_OK ) )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for HRTF handle" );
- }
-#endif
}
IF( NE_32( ( error = getAudioConfigNumChannels( inConfig, &nchan_in ) ), IVAS_ERR_OK ) )
@@ -311,36 +250,8 @@ static ivas_error ivas_rend_initCrend_fx(
return IVAS_ERR_INTERNAL_FATAL;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
IF( hHrtf->init_from_rom )
{
-#else
- test();
- test();
- test();
- test();
- test();
- test();
- test();
- test();
- test();
- test();
- test();
- test();
- test();
- test();
- test();
- IF( ( hSetOfHRTF == NULL ) ||
- ( ( hSetOfHRTF->hHRTF_hrir_combined == NULL ) && ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) && ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) ||
- ( ( hSetOfHRTF->hHRTF_hrir_combined == NULL ) && ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) && ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL ) ) ||
- ( ( hSetOfHRTF->hHRTF_brir_combined == NULL ) && ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) && ( outConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) ) ||
- ( ( hSetOfHRTF->hHRTF_hrir_foa == NULL ) && ( inConfig == IVAS_AUDIO_CONFIG_FOA ) ) ||
- ( ( hSetOfHRTF->hHRTF_hrir_hoa2 == NULL ) && ( inConfig == IVAS_AUDIO_CONFIG_HOA2 ) ) ||
- ( ( hSetOfHRTF->hHRTF_hrir_hoa3 == NULL ) && ( inConfig == IVAS_AUDIO_CONFIG_HOA3 ) ) )
- {
- hHrtf->init_from_rom = 1;
- move16();
-#endif
IF( EQ_32( inConfigType, IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) )
{
hHrtf->max_num_ir = sub( hHrtf->max_num_ir, 1 ); /* subtract LFE */
@@ -355,31 +266,25 @@ static ivas_error ivas_rend_initCrend_fx(
hHrtf->latency_s_fx = CRendBin_Combined_BRIR_latency_s_fx; // Q31
hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_48kHz; // Q0
hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz; // Q0
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_Combined_BRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_Combined_BRIR_inv_diffuse_weight_Q_48kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_Combined_BRIR_coeff_Q_48kHz_fx;
-#endif
}
ELSE
{
hHrtf->latency_s_fx = CRendBin_Combined_HRIR_latency_s_fx; // Q31
hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_48kHz; // Q0
hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz; // Q0
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_Combined_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_Combined_HRIR_inv_diffuse_weight_Q_48kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_Combined_HRIR_coeff_Q_48kHz_fx;
-#endif
}
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
move16();
move16();
move16();
-#endif
FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
{
@@ -412,31 +317,25 @@ static ivas_error ivas_rend_initCrend_fx(
hHrtf->latency_s_fx = CRendBin_Combined_BRIR_latency_s_fx; // Q31
hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_32kHz; // Q0
hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz; // Q0
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_Combined_BRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_Combined_BRIR_inv_diffuse_weight_Q_32kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_Combined_BRIR_coeff_Q_32kHz_fx;
-#endif
}
ELSE
{
hHrtf->latency_s_fx = CRendBin_Combined_HRIR_latency_s_fx; // Q31
hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_32kHz; // Q0
hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz; // Q0
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_Combined_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_Combined_HRIR_inv_diffuse_weight_Q_32kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_Combined_HRIR_coeff_Q_32kHz_fx;
-#endif
}
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
move16();
move16();
move16();
-#endif
FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
{
@@ -469,31 +368,25 @@ static ivas_error ivas_rend_initCrend_fx(
hHrtf->latency_s_fx = CRendBin_Combined_BRIR_latency_s_fx; // Q31
hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_16kHz;
hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz;
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_Combined_BRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_Combined_BRIR_inv_diffuse_weight_Q_16kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_Combined_BRIR_coeff_Q_16kHz_fx;
-#endif
}
ELSE
{
hHrtf->latency_s_fx = CRendBin_Combined_HRIR_latency_s_fx; // Q31
hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_16kHz;
hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz;
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_Combined_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_Combined_HRIR_inv_diffuse_weight_Q_16kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_Combined_HRIR_coeff_Q_16kHz_fx;
-#endif
}
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
move16();
move16();
move16();
-#endif
FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
{
@@ -654,14 +547,12 @@ static ivas_error ivas_rend_initCrend_fx(
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_HOA3_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_HOA3_HRIR_inv_diffuse_weight_Q_48kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_HOA3_HRIR_coeff_Q_48kHz_fx;
move16();
move16();
move16();
-#endif
FOR( i = 0; i < hHrtf->max_num_ir; i++ )
{
@@ -701,14 +592,12 @@ static ivas_error ivas_rend_initCrend_fx(
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_HOA3_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_HOA3_HRIR_inv_diffuse_weight_Q_32kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_HOA3_HRIR_coeff_Q_32kHz_fx;
move16();
move16();
move16();
-#endif
FOR( i = 0; i < hHrtf->max_num_ir; i++ )
{
@@ -749,14 +638,12 @@ static ivas_error ivas_rend_initCrend_fx(
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_HOA3_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_HOA3_HRIR_inv_diffuse_weight_Q_16kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_HOA3_HRIR_coeff_Q_16kHz_fx;
move16();
move16();
move16();
-#endif
FOR( i = 0; i < hHrtf->max_num_ir; i++ )
{
@@ -805,14 +692,12 @@ static ivas_error ivas_rend_initCrend_fx(
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_HOA2_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_HOA2_HRIR_inv_diffuse_weight_Q_48kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_HOA2_HRIR_coeff_Q_48kHz_fx;
move16();
move16();
move16();
-#endif
FOR( i = 0; i < hHrtf->max_num_ir; i++ )
{
@@ -852,14 +737,12 @@ static ivas_error ivas_rend_initCrend_fx(
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_HOA2_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_HOA2_HRIR_inv_diffuse_weight_Q_32kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_HOA2_HRIR_coeff_Q_32kHz_fx;
move16();
move16();
move16();
-#endif
FOR( i = 0; i < hHrtf->max_num_ir; i++ )
{
@@ -900,14 +783,12 @@ static ivas_error ivas_rend_initCrend_fx(
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_HOA2_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_HOA2_HRIR_inv_diffuse_weight_Q_16kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_HOA2_HRIR_coeff_Q_16kHz_fx;
move16();
move16();
move16();
-#endif
FOR( i = 0; i < hHrtf->max_num_ir; i++ )
{
@@ -955,14 +836,12 @@ static ivas_error ivas_rend_initCrend_fx(
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_FOA_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_FOA_HRIR_inv_diffuse_weight_Q_48kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_FOA_HRIR_coeff_Q_48kHz_fx;
move16();
move16();
move16();
-#endif
FOR( i = 0; i < hHrtf->max_num_ir; i++ )
{
@@ -1002,14 +881,12 @@ static ivas_error ivas_rend_initCrend_fx(
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_FOA_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_FOA_HRIR_inv_diffuse_weight_Q_32kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_FOA_HRIR_coeff_Q_32kHz_fx;
move16();
move16();
move16();
-#endif
FOR( i = 0; i < hHrtf->max_num_ir; i++ )
{
@@ -1050,14 +927,12 @@ static ivas_error ivas_rend_initCrend_fx(
move32();
move16();
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
hHrtf->factor_Q_latency_s_fx = Q31 - CRendBin_FOA_HRIR_Q_latency_s_fx;
hHrtf->factor_Q_inv_diffuse_weight = Q15 - CRendBin_FOA_HRIR_inv_diffuse_weight_Q_16kHz_fx;
hHrtf->factor_Q_pOut_to_bin = Q15 - CRendBin_FOA_HRIR_coeff_Q_16kHz_fx;
move16();
move16();
move16();
-#endif
FOR( i = 0; i < hHrtf->max_num_ir; i++ )
{
@@ -1107,16 +982,12 @@ static ivas_error ivas_rend_initCrend_fx(
}
ELSE
{
-#ifndef FIX_CREND_SIMPLIFY_CODE
- hHrtf->init_from_rom = 0;
-#endif
IF( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED )
{
hHrtf->max_num_ir = sub( hHrtf->max_num_ir, 1 ); /* subtract LFE */
move16();
hHrtf->gain_lfe_fx = GAIN_LFE_FX;
move16();
-#ifdef FIX_CREND_SIMPLIFY_CODE
}
IF( EQ_16( ext_rend_flag, 1 ) )
@@ -1237,247 +1108,6 @@ static ivas_error ivas_rend_initCrend_fx(
hHrtf->pOut_to_bin_re_fx[i][j] = hHrtfCrend->pOut_to_bin_re_fx[tmp][j];
hHrtf->pOut_to_bin_im_fx[i][j] = hHrtfCrend->pOut_to_bin_im_fx[tmp][j];
}
-#else
- IF( EQ_16( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )
- {
- IF( hSetOfHRTF->hHRTF_brir_combined == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Invalid command wrong output format" );
- }
- hHrtf->latency_s_fx = hSetOfHRTF->hHRTF_brir_combined->latency_s_fx; // Q31
- hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_brir_combined->max_num_iterations;
- hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_brir_combined->index_frequency_max_diffuse;
- }
- ELSE
- {
- IF( hSetOfHRTF->hHRTF_hrir_combined == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Invalid command wrong output format" );
- }
- hHrtf->latency_s_fx = hSetOfHRTF->hHRTF_hrir_combined->latency_s_fx; // Q31
- hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_combined->max_num_iterations;
- hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_combined->index_frequency_max_diffuse;
- }
- move32();
- move16();
- move16();
-
- FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- IF( EQ_16( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )
- {
- hHrtf->num_iterations_diffuse[j] = hSetOfHRTF->hHRTF_brir_combined->num_iterations_diffuse[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = hSetOfHRTF->hHRTF_brir_combined->pIndex_frequency_max_diffuse[j];
-
- hHrtf->pOut_to_bin_diffuse_re_fx[j] = hSetOfHRTF->hHRTF_brir_combined->pOut_to_bin_diffuse_re_fx[j]; // Q31
- hHrtf->pOut_to_bin_diffuse_im_fx[j] = hSetOfHRTF->hHRTF_brir_combined->pOut_to_bin_diffuse_im_fx[j]; // Q31
- }
- ELSE
- {
- hHrtf->num_iterations_diffuse[j] = hSetOfHRTF->hHRTF_hrir_combined->num_iterations_diffuse[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = hSetOfHRTF->hHRTF_hrir_combined->pIndex_frequency_max_diffuse[j];
-
- hHrtf->pOut_to_bin_diffuse_re_fx[j] = hSetOfHRTF->hHRTF_hrir_combined->pOut_to_bin_diffuse_re_fx[j]; // Q31
- hHrtf->pOut_to_bin_diffuse_im_fx[j] = hSetOfHRTF->hHRTF_hrir_combined->pOut_to_bin_diffuse_im_fx[j]; // Q31
- }
- move32();
- move32();
- move16();
- move16();
- }
-
- FOR( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- IF( EQ_16( inConfig, IVAS_AUDIO_CONFIG_5_1 ) )
- {
- tmp = channelIndex_CICP6[i];
- }
- ELSE IF( EQ_16( inConfig, IVAS_AUDIO_CONFIG_7_1 ) )
- {
- tmp = channelIndex_CICP12[i];
- }
- ELSE IF( EQ_16( inConfig, IVAS_AUDIO_CONFIG_5_1_2 ) )
- {
- tmp = channelIndex_CICP14[i];
- }
- ELSE IF( EQ_16( inConfig, IVAS_AUDIO_CONFIG_5_1_4 ) )
- {
- tmp = channelIndex_CICP16[i];
- }
- ELSE IF( EQ_16( inConfig, IVAS_AUDIO_CONFIG_7_1_4 ) )
- {
- tmp = channelIndex_CICP19[i];
- }
- ELSE
- {
- return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error: Channel configuration not specified!\n\n" );
- }
- move16();
- FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- IF( EQ_16( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )
- {
- hHrtf->inv_diffuse_weight_fx[j][i] = hSetOfHRTF->hHRTF_brir_combined->inv_diffuse_weight_fx[j][tmp];
- move16();
- hHrtf->num_iterations[i][j] = hSetOfHRTF->hHRTF_brir_combined->num_iterations[tmp][j];
- hHrtf->pIndex_frequency_max[i][j] = hSetOfHRTF->hHRTF_brir_combined->pIndex_frequency_max[tmp][j];
-
- hHrtf->pOut_to_bin_re_fx[i][j] = hSetOfHRTF->hHRTF_brir_combined->pOut_to_bin_re_fx[tmp][j]; // Q29
- hHrtf->pOut_to_bin_im_fx[i][j] = hSetOfHRTF->hHRTF_brir_combined->pOut_to_bin_im_fx[tmp][j]; // Q29
- }
- ELSE
- {
- hHrtf->inv_diffuse_weight_fx[j][i] = hSetOfHRTF->hHRTF_hrir_combined->inv_diffuse_weight_fx[j][tmp];
- move16();
- hHrtf->num_iterations[i][j] = hSetOfHRTF->hHRTF_hrir_combined->num_iterations[tmp][j];
- hHrtf->pIndex_frequency_max[i][j] = hSetOfHRTF->hHRTF_hrir_combined->pIndex_frequency_max[tmp][j];
-
- hHrtf->pOut_to_bin_re_fx[i][j] = hSetOfHRTF->hHRTF_hrir_combined->pOut_to_bin_re_fx[tmp][j]; // Q29
- hHrtf->pOut_to_bin_im_fx[i][j] = hSetOfHRTF->hHRTF_hrir_combined->pOut_to_bin_im_fx[tmp][j]; // Q29
- }
- move32();
- move32();
- move16();
- move16();
- }
- }
- }
- ELSE IF( EQ_16( inConfigType, IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS ) )
- {
- IF( EQ_16( inConfig, IVAS_AUDIO_CONFIG_HOA3 ) )
- {
- IF( hSetOfHRTF->hHRTF_hrir_hoa3 == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Invalid function parameters " );
- }
- hHrtf->latency_s_fx = hSetOfHRTF->hHRTF_hrir_hoa3->latency_s_fx; // Q31
- hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_hoa3->max_num_iterations;
- hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_hoa3->index_frequency_max_diffuse;
- move32();
- move16();
- move16();
-
- FOR( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->inv_diffuse_weight_fx[j][i] = hSetOfHRTF->hHRTF_hrir_hoa3->inv_diffuse_weight_fx[j][i];
- move16();
- hHrtf->num_iterations[i][j] = hSetOfHRTF->hHRTF_hrir_hoa3->num_iterations[i][j];
- hHrtf->pIndex_frequency_max[i][j] = hSetOfHRTF->hHRTF_hrir_hoa3->pIndex_frequency_max[i][j];
-
- hHrtf->pOut_to_bin_re_fx[i][j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_re_fx[i][j]; // Q29
- hHrtf->pOut_to_bin_im_fx[i][j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_im_fx[i][j]; // Q29
- move32();
- move32();
- move16();
- move16();
- }
- }
- FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = hSetOfHRTF->hHRTF_hrir_hoa3->num_iterations_diffuse[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = hSetOfHRTF->hHRTF_hrir_hoa3->pIndex_frequency_max_diffuse[j];
-
- hHrtf->pOut_to_bin_diffuse_re_fx[j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_diffuse_re_fx[j]; // Q31
- hHrtf->pOut_to_bin_diffuse_im_fx[j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_diffuse_im_fx[j]; // Q31
- move32();
- move32();
- move16();
- move16();
- }
- }
- ELSE IF( EQ_16( inConfig, IVAS_AUDIO_CONFIG_HOA2 ) )
- {
- IF( hSetOfHRTF->hHRTF_hrir_hoa2 == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Invalid function parameters " );
- }
- hHrtf->latency_s_fx = hSetOfHRTF->hHRTF_hrir_hoa2->latency_s_fx; // Q31
- hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_hoa2->max_num_iterations;
- hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_hoa2->index_frequency_max_diffuse;
- move32();
- move16();
- move16();
-
- FOR( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->inv_diffuse_weight_fx[j][i] = hSetOfHRTF->hHRTF_hrir_hoa2->inv_diffuse_weight_fx[j][i];
- move16();
- hHrtf->num_iterations[i][j] = hSetOfHRTF->hHRTF_hrir_hoa2->num_iterations[i][j];
- hHrtf->pIndex_frequency_max[i][j] = hSetOfHRTF->hHRTF_hrir_hoa2->pIndex_frequency_max[i][j];
-
- hHrtf->pOut_to_bin_re_fx[i][j] = hSetOfHRTF->hHRTF_hrir_hoa2->pOut_to_bin_re_fx[i][j]; // Q29
- hHrtf->pOut_to_bin_im_fx[i][j] = hSetOfHRTF->hHRTF_hrir_hoa2->pOut_to_bin_im_fx[i][j]; // Q29
- move32();
- move32();
- move16();
- move16();
- }
- }
- FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = hSetOfHRTF->hHRTF_hrir_hoa2->num_iterations_diffuse[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = hSetOfHRTF->hHRTF_hrir_hoa2->pIndex_frequency_max_diffuse[j];
-
- hHrtf->pOut_to_bin_diffuse_re_fx[j] = hSetOfHRTF->hHRTF_hrir_hoa2->pOut_to_bin_diffuse_re_fx[j]; // Q31
- hHrtf->pOut_to_bin_diffuse_im_fx[j] = hSetOfHRTF->hHRTF_hrir_hoa2->pOut_to_bin_diffuse_im_fx[j]; // Q31
- move32();
- move32();
- move16();
- move16();
- }
- }
- ELSE IF( EQ_16( inConfig, IVAS_AUDIO_CONFIG_FOA ) )
- {
- IF( hSetOfHRTF->hHRTF_hrir_foa == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Invalid function parameters " );
- }
- hHrtf->latency_s_fx = hSetOfHRTF->hHRTF_hrir_foa->latency_s_fx; // Q31
- hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_foa->max_num_iterations;
- hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_foa->index_frequency_max_diffuse;
- move32();
- move16();
- move16();
-
- FOR( i = 0; i < hHrtf->max_num_ir; i++ )
- {
- FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->inv_diffuse_weight_fx[j][i] = hSetOfHRTF->hHRTF_hrir_foa->inv_diffuse_weight_fx[j][i];
- move16();
-
- hHrtf->num_iterations[i][j] = hSetOfHRTF->hHRTF_hrir_foa->num_iterations[i][j];
- hHrtf->pIndex_frequency_max[i][j] = hSetOfHRTF->hHRTF_hrir_foa->pIndex_frequency_max[i][j];
-
- hHrtf->pOut_to_bin_re_fx[i][j] = hSetOfHRTF->hHRTF_hrir_foa->pOut_to_bin_re_fx[i][j]; // Q29
- hHrtf->pOut_to_bin_im_fx[i][j] = hSetOfHRTF->hHRTF_hrir_foa->pOut_to_bin_im_fx[i][j]; // Q29
- move32();
- move32();
- move16();
- move16();
- }
- }
- FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
- {
- hHrtf->num_iterations_diffuse[j] = hSetOfHRTF->hHRTF_hrir_foa->num_iterations_diffuse[j];
- hHrtf->pIndex_frequency_max_diffuse[j] = hSetOfHRTF->hHRTF_hrir_foa->pIndex_frequency_max_diffuse[j];
-
- hHrtf->pOut_to_bin_diffuse_re_fx[j] = hSetOfHRTF->hHRTF_hrir_foa->pOut_to_bin_diffuse_re_fx[j]; // Q31
- hHrtf->pOut_to_bin_diffuse_im_fx[j] = hSetOfHRTF->hHRTF_hrir_foa->pOut_to_bin_diffuse_im_fx[j]; // Q31
- move32();
- move32();
- move16();
- move16();
- }
- }
- ELSE
- {
- return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported renderer type in Crend" );
-#endif
}
}
}
@@ -1777,12 +1407,11 @@ ivas_error ivas_rend_initCrendWrapper_fx(
( *pCrend )->io_qfactor = 0;
move16();
( *pCrend )->p_io_qfactor = &( *pCrend )->io_qfactor;
-#ifdef FIX_CREND_SIMPLIFY_CODE
+
FOR( pos_idx = 0; pos_idx < MAX_HEAD_ROT_POSES; pos_idx++ )
{
( *pCrend )->hCrend[pos_idx] = NULL;
}
-#endif
FOR( pos_idx = 0; pos_idx < num_poses; pos_idx++ )
{
@@ -1829,6 +1458,7 @@ ivas_error ivas_rend_initCrendWrapper_fx(
return IVAS_ERR_OK;
}
+
/*-------------------------------------------------------------------------
* ivas_rend_openMultiBinCrend()
*
@@ -1842,20 +1472,10 @@ ivas_error ivas_rend_openMultiBinCrend(
const MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData,
const Word32 output_Fs )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
return ivas_rend_openCrend_fx( pCrend, inConfig, outConfig, NULL /*hRendCfg*/, NULL, NULL /* hHrtfStatistics */, output_Fs, 0, pMultiBinPoseData->num_poses );
-#else
- ivas_error error;
-
- if ( ( error = ivas_rend_openCrend_fx( pCrend, inConfig, outConfig, NULL /*hRendCfg*/, NULL, NULL /* hHrtfStatistics */, output_Fs, pMultiBinPoseData->num_poses ) ) != IVAS_ERR_OK )
- {
- return error;
- }
-
- return error;
-#endif
}
+
/*-------------------------------------------------------------------------
* ivas_rend_openCrend()
*
@@ -1867,25 +1487,15 @@ ivas_error ivas_rend_openCrend_fx(
const AUDIO_CONFIG inConfig,
const AUDIO_CONFIG outConfig,
RENDER_CONFIG_DATA *hRendCfg,
-#ifdef FIX_CREND_SIMPLIFY_CODE
HRTFS_CREND_HANDLE hHrtfCrend,
-#else
- HRTFS_CREND_HANDLE hSetOfHRTF,
-#endif
HRTFS_STATISTICS_HANDLE hHrtfStatistics,
const Word32 output_Fs,
-#ifdef FIX_CREND_SIMPLIFY_CODE
const Word16 ext_rend_flag,
-#endif
const Word16 num_poses )
{
Word16 i, subframe_length;
Word32 max_total_ir_len;
-#ifdef FIX_CREND_SIMPLIFY_CODE
HRTFS_CREND_HANDLE hHrtf;
-#else
- HRTFS_HANDLE hHrtf;
-#endif
CREND_HANDLE hCrend;
ivas_error error;
Word16 pos_idx;
@@ -1899,11 +1509,7 @@ ivas_error ivas_rend_openCrend_fx(
IF( ( *pCrend )->hHrtfCrend == NULL )
{
-#ifdef FIX_CREND_SIMPLIFY_CODE
IF( NE_32( ( error = ivas_rend_initCrend_fx( *pCrend, inConfig, outConfig, hHrtfCrend, ext_rend_flag, output_Fs ) ), IVAS_ERR_OK ) )
-#else
- IF( NE_32( ( error = ivas_rend_initCrend_fx( *pCrend, inConfig, outConfig, hSetOfHRTF, output_Fs ) ), IVAS_ERR_OK ) )
-#endif
{
return error;
}
@@ -2061,11 +1667,7 @@ ivas_error ivas_rend_openCrend_fx(
{
hCrend->hReverb = NULL;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
( *pCrend )->binaural_latency_ns = L_shr_r( Mpy_32_32_r( ( *pCrend )->hHrtfCrend->latency_s_fx, (Word32) 1000000000 ), ( *pCrend )->hHrtfCrend->factor_Q_latency_s_fx );
-#else
- ( *pCrend )->binaural_latency_ns = Mult_32_32( ( *pCrend )->hHrtfCrend->latency_s_fx, (Word32) 1000000000 );
-#endif
move32();
}
@@ -2083,12 +1685,7 @@ ivas_error ivas_rend_openCrend_fx(
*------------------------------------------------------------------------*/
void ivas_rend_closeCrend_fx(
- CREND_WRAPPER_HANDLE *pCrend
-#ifndef FIX_CREND_SIMPLIFY_CODE
- ,
- const int16_t num_poses
-#endif
-)
+ CREND_WRAPPER_HANDLE *pCrend )
{
Word16 i;
Word16 pos_idx;
@@ -2100,21 +1697,13 @@ void ivas_rend_closeCrend_fx(
return;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
test();
IF( ( *pCrend )->hHrtfCrend != NULL && ( *pCrend )->hHrtfCrend->init_from_rom )
-#else
- IF( ( *pCrend )->hHrtfCrend != NULL )
-#endif
{
ivas_hrtf_close( &( *pCrend )->hHrtfCrend );
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
FOR( pos_idx = 0; pos_idx < MAX_HEAD_ROT_POSES; pos_idx++ )
-#else
- FOR( pos_idx = 0; pos_idx < num_poses; pos_idx++ )
-#endif
{
hCrend = ( *pCrend )->hCrend[pos_idx];
IF( hCrend != NULL )
@@ -2228,13 +1817,13 @@ void ivas_rend_closeCldfbRend(
return;
}
+
/*-----------------------------------------------------------------------------------------*
* Function ivas_rend_crendConvolver()
*
* Convolver block
*-----------------------------------------------------------------------------------------*/
-#ifdef FIX_CREND_SIMPLIFY_CODE
static ivas_error ivas_rend_crendConvolver_fx(
const CREND_WRAPPER *pCrend,
AUDIO_CONFIG inConfig,
@@ -2439,237 +2028,8 @@ static ivas_error ivas_rend_crendConvolver_fx(
return IVAS_ERR_OK;
}
-#else
-static ivas_error ivas_rend_crendConvolver_fx(
- const CREND_WRAPPER *pCrend,
- AUDIO_CONFIG inConfig,
- AUDIO_CONFIG outConfig,
- Word32 *pcm_in[], // Qx
- Word32 *pcm_out[], // Qx
- const Word32 output_Fs,
- const Word16 i_ts,
- const Word16 pos_idx )
-{
- Word16 i, j, k, m;
- Word16 subframe_length, idx_in;
- Word16 lfe_idx_in;
- Word32 offset, offset_in, offset_diffuse;
- Word16 index_in;
- Word16 nchan_in, nchan_out;
- const Word32 *pIn;
- Word32 *pFreq_buf_re, *pFreq_buf_im;
- Word32 *pFreq_buf2_re, *pFreq_buf2_im;
- const Word32 *pFreq_filt_re, *pFreq_filt_im;
- Word32 pOut[L_FRAME48k * 2];
- Word32 tmp_out_re[L_FRAME48k];
- Word32 tmp_out_im[L_FRAME48k];
- CREND_HANDLE hCrend;
- ivas_error error;
-
- hCrend = pCrend->hCrend[pos_idx];
-
- IF( NE_32( ( error = getAudioConfigNumChannels( inConfig, &nchan_in ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
-
- IF( NE_32( ( error = getAudioConfigNumChannels( outConfig, &nchan_out ) ), IVAS_ERR_OK ) )
- {
- return error;
- }
-
- /* subframe_length = (int16_t) ( output_Fs / FRAMES_PER_SEC ) / MAX_PARAM_SPATIAL_SUBFRAMES; */
- subframe_length = extract_l( Mpy_32_32_r( output_Fs, 10737418 /* 1 / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) in Q31 */ ) );
-
- lfe_idx_in = -1;
- move16();
- IF( EQ_32( getAudioConfigType( inConfig ), IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED ) )
- {
- IF( NE_32( inConfig, IVAS_AUDIO_CONFIG_LS_CUSTOM ) )
- {
- lfe_idx_in = LFE_CHANNEL;
- move16();
- }
- ELSE
- {
- assert( 0 && "Custom LS not supported in CRend" );
- }
- }
-
- offset = L_mult0( hCrend->delay_line_rw_index, subframe_length ); /* subframe_length * ( pCrend->hHrtfCrend->max_num_iterations - 1 ); */
- offset_diffuse = L_mult0( hCrend->diffuse_delay_line_rw_index, subframe_length ); /* subframe_length *( pCrend->hHrtfCrend->num_iterations_diffuse[0] - 1 ); */
-
- IF( pCrend->hHrtfCrend->num_iterations_diffuse[0] > 0 )
- {
- set32_fx( &hCrend->freq_buffer_re_diffuse_fx[0][offset_diffuse], 0, subframe_length );
- set32_fx( &hCrend->freq_buffer_im_diffuse_fx[0][offset_diffuse], 0, subframe_length );
- if ( pCrend->hHrtfCrend->same_inv_diffuse_weight == 0 )
- {
- set32_fx( &hCrend->freq_buffer_re_diffuse_fx[1][offset_diffuse], 0, subframe_length );
- set32_fx( &hCrend->freq_buffer_im_diffuse_fx[1][offset_diffuse], 0, subframe_length );
- }
- }
-
- i = 0;
- move16();
- FOR( idx_in = 0; idx_in < nchan_in; idx_in++ )
- {
- pIn = &pcm_in[idx_in][i_ts * subframe_length];
-
- IF( NE_16( idx_in, lfe_idx_in ) )
- {
- IF( pCrend->hHrtfCrend->num_iterations_diffuse[0] > 0 )
- {
- IF( pCrend->hHrtfCrend->same_inv_diffuse_weight )
- {
- pFreq_buf_re = &hCrend->freq_buffer_re_diffuse_fx[0][offset_diffuse];
- pFreq_buf_im = &hCrend->freq_buffer_im_diffuse_fx[0][offset_diffuse];
- pFreq_filt_re = &hCrend->freq_buffer_re_fx[i][offset];
- pFreq_filt_im = &hCrend->freq_buffer_im_fx[i][offset];
-
- FOR( k = 0; k < pCrend->hHrtfCrend->index_frequency_max_diffuse; k++ )
- {
- pFreq_buf_re[k] = L_add( Mpy_32_16_r( pFreq_filt_re[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i] ), pFreq_buf_re[k] ); // Qx
- pFreq_buf_im[k] = L_add( Mpy_32_16_r( pFreq_filt_im[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i] ), pFreq_buf_im[k] ); // Qx
- move32();
- move32();
- }
- }
- ELSE
- {
- pFreq_buf_re = &hCrend->freq_buffer_re_diffuse_fx[0][offset_diffuse];
- pFreq_buf_im = &hCrend->freq_buffer_im_diffuse_fx[0][offset_diffuse];
- pFreq_buf2_re = &hCrend->freq_buffer_re_diffuse_fx[1][offset_diffuse];
- pFreq_buf2_im = &hCrend->freq_buffer_im_diffuse_fx[1][offset_diffuse];
- pFreq_filt_re = &hCrend->freq_buffer_re_fx[i][offset];
- pFreq_filt_im = &hCrend->freq_buffer_im_fx[i][offset];
-
- for ( k = 0; k < pCrend->hHrtfCrend->index_frequency_max_diffuse; k++ )
- {
- pFreq_buf_re[k] = L_add( Mpy_32_16_r( pFreq_filt_re[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i] ), pFreq_buf_re[k] ); // Qx
- pFreq_buf_im[k] = L_add( Mpy_32_16_r( pFreq_filt_im[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[0][i] ), pFreq_buf_im[k] ); // Qx
- move32();
- move32();
- pFreq_buf2_re[k] = L_add( Mpy_32_16_r( pFreq_filt_re[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[1][i] ), pFreq_buf2_re[k] ); // Qx
- pFreq_buf2_im[k] = L_add( Mpy_32_16_r( pFreq_filt_im[k], pCrend->hHrtfCrend->inv_diffuse_weight_fx[1][i] ), pFreq_buf2_im[k] ); // Qx
- move32();
- move32();
- }
- }
- }
- pFreq_buf_re = &hCrend->freq_buffer_re_fx[i][offset]; // Qx
- pFreq_buf_im = &hCrend->freq_buffer_im_fx[i][offset]; // Qx
- ivas_mdft_fx( pIn, pFreq_buf_re, pFreq_buf_im, subframe_length, subframe_length );
-#ifdef DEBUGGING
- dbgwrite_txt( (const float *) pFreq_buf_re, subframe_length, "Fixed_pFreq_buf_re_mdft.txt", NULL );
- dbgwrite_txt( (const float *) pFreq_buf_im, subframe_length, "Fixed_pFreq_buf_im_mdft.txt", NULL );
-#endif
- i = add( i, 1 );
- }
- }
-
- FOR( j = 0; j < nchan_out; j++ )
- {
- set32_fx( tmp_out_re, 0, subframe_length );
- set32_fx( tmp_out_im, 0, subframe_length );
- i = 0;
- move16();
- FOR( idx_in = 0; idx_in < nchan_in; idx_in++ )
- {
- IF( NE_16( idx_in, lfe_idx_in ) )
- {
- offset = 0;
- move16();
- FOR( m = 0; m < pCrend->hHrtfCrend->num_iterations[i][j]; m++ )
- {
- index_in = add( add( hCrend->delay_line_rw_index, sub( pCrend->hHrtfCrend->max_num_iterations, pCrend->hHrtfCrend->num_iterations[i][j] ) ), add( m, 1 ) );
- index_in = index_in % ( pCrend->hHrtfCrend->max_num_iterations );
- move16();
- offset_in = L_mult0( index_in, subframe_length );
-
- pFreq_buf_re = &hCrend->freq_buffer_re_fx[i][offset_in]; // Qx
- pFreq_buf_im = &hCrend->freq_buffer_im_fx[i][offset_in]; // Qx
- pFreq_filt_re = &pCrend->hHrtfCrend->pOut_to_bin_re_fx[i][j][offset]; // Q29
- pFreq_filt_im = &pCrend->hHrtfCrend->pOut_to_bin_im_fx[i][j][offset]; // Q29
-
- FOR( k = 0; k < pCrend->hHrtfCrend->pIndex_frequency_max[i][j][m]; k++ )
- {
- tmp_out_re[k] = L_add( Msub_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_re[k] ), pFreq_buf_im[k], pFreq_filt_im[k] ), tmp_out_re[k] ); // Qx - 2
- tmp_out_im[k] = L_add( Madd_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_im[k] ), pFreq_buf_im[k], pFreq_filt_re[k] ), tmp_out_im[k] ); // Qx - 2
- move32();
- move32();
- }
-
- offset = L_add( offset, k );
- }
- i = add( i, 1 );
- }
- }
-
- offset = 0;
- move16();
- FOR( m = 0; m < pCrend->hHrtfCrend->num_iterations_diffuse[j]; m++ )
- {
- index_in = add( hCrend->diffuse_delay_line_rw_index, add( m, 1 ) );
- index_in = index_in % pCrend->hHrtfCrend->num_iterations_diffuse[0];
- move16();
- offset_diffuse = L_mult0( index_in, subframe_length );
- if ( pCrend->hHrtfCrend->same_inv_diffuse_weight )
- {
- pFreq_buf_re = &hCrend->freq_buffer_re_diffuse_fx[0][offset_diffuse];
- pFreq_buf_im = &hCrend->freq_buffer_im_diffuse_fx[0][offset_diffuse];
- }
- else
- {
- pFreq_buf_re = &hCrend->freq_buffer_re_diffuse_fx[j][offset_diffuse];
- pFreq_buf_im = &hCrend->freq_buffer_im_diffuse_fx[j][offset_diffuse];
- }
- pFreq_filt_re = &pCrend->hHrtfCrend->pOut_to_bin_diffuse_re_fx[j][offset]; // Q31
- pFreq_filt_im = &pCrend->hHrtfCrend->pOut_to_bin_diffuse_im_fx[j][offset]; // Q31
- FOR( k = 0; k < pCrend->hHrtfCrend->pIndex_frequency_max_diffuse[j][m]; k++ )
- {
- tmp_out_re[k] = L_add( L_shr( Msub_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_re[k] ), pFreq_buf_im[k], pFreq_filt_im[k] ), 2 ), tmp_out_re[k] ); // Qx - 2
- tmp_out_im[k] = L_add( L_shr( Madd_32_32( Mpy_32_32( pFreq_buf_re[k], pFreq_filt_im[k] ), pFreq_buf_im[k], pFreq_filt_re[k] ), 2 ), tmp_out_im[k] ); // Qx - 2
- move32();
- move32();
- }
- offset = L_add( offset, k );
- move32();
- }
-
- ivas_imdft_fx( tmp_out_re, tmp_out_im, pOut, subframe_length );
- scale_sig32( pOut, shl( subframe_length, 1 ), 2 );
-#ifdef DEBUGGING
- dbgwrite_txt( (const float *) pOut, subframe_length << 1, "Fixed_imdft_out.txt", NULL );
-#endif
- pFreq_buf_re = &pcm_out[j][i_ts * subframe_length];
- FOR( k = 0; k < subframe_length; k++ )
- {
- pFreq_buf_re[k] = L_add( pOut[k], hCrend->prev_out_buffer_fx[j][k] ); // Qx
- hCrend->prev_out_buffer_fx[j][k] = pOut[k + subframe_length]; // Qx
- move32();
- move32();
- }
- }
-
- hCrend->delay_line_rw_index = add( hCrend->delay_line_rw_index, 1 );
- hCrend->delay_line_rw_index = hCrend->delay_line_rw_index % ( pCrend->hHrtfCrend->max_num_iterations );
- move16();
- move16();
- IF( pCrend->hHrtfCrend->num_iterations_diffuse[0] > 0 )
- {
- hCrend->diffuse_delay_line_rw_index = add( hCrend->diffuse_delay_line_rw_index, 1 );
- hCrend->diffuse_delay_line_rw_index = hCrend->diffuse_delay_line_rw_index % ( pCrend->hHrtfCrend->num_iterations_diffuse[0] );
- move16();
- move16();
- }
-
- return IVAS_ERR_OK;
-}
-
-#endif
/*-----------------------------------------------------------------------------------------*
* Function ivas_rend_crendProcessSubframe()
*
@@ -2688,19 +2048,14 @@ ivas_error ivas_rend_crendProcessSubframe_fx(
Word32 *input_f[], /* i : transport channels Qx */
Word32 *output[], /* i/o: input/output audio channels Qx */
const Word16 n_samples_to_render, /* i : output frame length per channel */
- const Word32 output_Fs /* i : output sampling rate */
- ,
+ const Word32 output_Fs, /* i : output sampling rate */
const Word16 pos_idx )
{
Word16 subframe_idx, subframe_len;
Word16 nchan_out, nchan_in, ch, first_sf, last_sf, slot_size, slots_to_render;
Word32 *tc_local_fx[MAX_OUTPUT_CHANNELS];
-#ifdef FIX_CREND_SIMPLIFY_CODE
Word32 *p_output_fx[BINAURAL_CHANNELS];
Word32 pcm_tmp_fx[BINAURAL_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];
-#else
- Word32 pcm_tmp_fx[BINAURAL_CHANNELS][L_FRAME48k];
-#endif
Word32 *p_pcm_tmp_fx[BINAURAL_CHANNELS];
IVAS_REND_AudioConfigType inConfigType;
ivas_error error;
@@ -2739,9 +2094,7 @@ ivas_error ivas_rend_crendProcessSubframe_fx(
FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
{
p_pcm_tmp_fx[ch] = pcm_tmp_fx[ch];
-#ifdef FIX_CREND_SIMPLIFY_CODE
p_output_fx[ch] = output[ch];
-#endif
}
IF( hTcBuffer != NULL )
@@ -2858,12 +2211,6 @@ ivas_error ivas_rend_crendProcessSubframe_fx(
tc_local_fx[ch] += subframe_len;
}
-#ifndef FIX_CREND_SIMPLIFY_CODE
- FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
- {
- p_pcm_tmp_fx[ch] += subframe_len;
- }
-#endif
if ( hTcBuffer != NULL )
{
hTcBuffer->slots_rendered = add( hTcBuffer->subframe_nbslots[subframe_idx], hTcBuffer->slots_rendered );
@@ -2875,7 +2222,6 @@ ivas_error ivas_rend_crendProcessSubframe_fx(
return IVAS_ERR_INVALID_INPUT_FORMAT;
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
{
/* move to output */
@@ -2883,7 +2229,6 @@ ivas_error ivas_rend_crendProcessSubframe_fx(
p_output_fx[ch] += subframe_len;
}
-#endif
/* update combined orientation access index */
ivas_combined_orientation_update_index( hCombinedOrientationData, subframe_len );
@@ -2902,13 +2247,6 @@ ivas_error ivas_rend_crendProcessSubframe_fx(
}
}
}
-#ifndef FIX_CREND_SIMPLIFY_CODE
- /* move to output */
- FOR( ch = 0; ch < nchan_out; ch++ )
- {
- MVR2R_WORD32( pcm_tmp_fx[ch], output[ch], n_samples_to_render ); // Qx
- }
-#endif
if ( hTcBuffer != NULL )
{
@@ -3004,8 +2342,8 @@ ivas_error ivas_rend_crendProcessSubframesSplitBin(
{
Copy32( output[hIntSetup->index_lfe[0]], tmpLfeBuffer, n_samples_to_render );
gain_lfe = ( ( pCrend != NULL ) && ( pCrend->hHrtfCrend != NULL ) ) ? pCrend->hHrtfCrend->gain_lfe_fx : GAIN_LFE_FX;
- v_multc_fixed_16( tmpLfeBuffer, gain_lfe, tmpLfeBuffer, n_samples_to_render ); // q_input_fx - 1
- Scale_sig32( tmpLfeBuffer, n_samples_to_render, 1 ); // q_input_fx
+ v_multc_fx_16( tmpLfeBuffer, gain_lfe, tmpLfeBuffer, n_samples_to_render ); // q_input_fx - 1
+ Scale_sig32( tmpLfeBuffer, n_samples_to_render, 1 ); // q_input_fx
}
ELSE
{
diff --git a/lib_rend/ivas_dirac_ana_fx.c b/lib_rend/ivas_dirac_ana_fx.c
index 4e00b96232a515e7f08383a3c9451ac7aa2cadf5..502f4f5ae81acc7af1caa8d4935f9c1089f9923f 100644
--- a/lib_rend/ivas_dirac_ana_fx.c
+++ b/lib_rend/ivas_dirac_ana_fx.c
@@ -411,7 +411,7 @@ static void ivas_dirac_param_est_ana_fx(
/* Direction estimation */
computeIntensityVector_ana_fx( hDirAC->band_grouping, Foa_RealBuffer_fx, Foa_ImagBuffer_fx, num_freq_bands, intensity_real_fx, intensity_real_q, inp_q );
- computeDirectionVectors_fixed( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], 0, intensity_real_q );
+ computeDirectionVectors_fx2( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], 0, intensity_real_q );
/* Power estimation for diffuseness */
computeReferencePower_ana_fx( hDirAC->band_grouping, Foa_RealBuffer_fx, Foa_ImagBuffer_fx, reference_power_fx[ts], num_freq_bands, inp_q, &reference_power_q );
@@ -446,7 +446,7 @@ static void ivas_dirac_param_est_ana_fx(
Copy32( reference_power_fx[ts], &( hDirAC->buffer_energy_fx[( index - 1 ) * num_freq_bands] ), num_freq_bands );
hDirAC->buffer_energy_q[index - 1] = reference_power_q;
move16();
- computeDiffuseness_fixed( hDirAC->buffer_intensity_real_fx, hDirAC->buffer_energy_fx, num_freq_bands, diffuseness_vector_fx, hDirAC->buffer_intensity_real_q, hDirAC->buffer_energy_q, &diffuseness_q );
+ computeDiffuseness_fx( hDirAC->buffer_intensity_real_fx, hDirAC->buffer_energy_fx, num_freq_bands, diffuseness_vector_fx, hDirAC->buffer_intensity_real_q, hDirAC->buffer_energy_q, &diffuseness_q );
FOR( band_m_idx = 0; band_m_idx < hDirAC->nbands; band_m_idx++ )
{
@@ -537,10 +537,10 @@ static void ivas_dirac_dmx_fx(
IF( EQ_16( nchan_transport, 2 ) )
{
v_add_fx( data_in_fx[0], data_in_fx[1], data_out_fx[0], input_frame );
- v_multc_fixed( data_out_fx[0], ONE_IN_Q30, data_out_fx[0], input_frame ); // ONE_IN_Q30 = 0.5* ONE_IN_Q31
+ v_multc_fx( data_out_fx[0], ONE_IN_Q30, data_out_fx[0], input_frame ); // ONE_IN_Q30 = 0.5* ONE_IN_Q31
- v_sub_fixed_no_hdrm( data_in_fx[0], data_in_fx[1], data_out_fx[1], input_frame );
- v_multc_fixed( data_out_fx[1], ONE_IN_Q30, data_out_fx[1], input_frame );
+ v_sub_fx_no_hdrm( data_in_fx[0], data_in_fx[1], data_out_fx[1], input_frame );
+ v_multc_fx( data_out_fx[1], ONE_IN_Q30, data_out_fx[1], input_frame );
FOR( i = 0; i < nchan_transport; i++ )
{
diff --git a/lib_rend/ivas_dirac_dec_binaural_functions_fx.c b/lib_rend/ivas_dirac_dec_binaural_functions_fx.c
index 8f063a897f1b1102b81989ab4492aba523c1ecac..0539b7b85524aacc82866eb1afc7eb7d8bc0db43 100644
--- a/lib_rend/ivas_dirac_dec_binaural_functions_fx.c
+++ b/lib_rend/ivas_dirac_dec_binaural_functions_fx.c
@@ -51,20 +51,9 @@ Word16 slot_fx[4] = { 32767, 16384, 10922, 8192 };
* Local constants
*------------------------------------------------------------------------*/
-#define CLDFB_HALF_BIN_FREQUENCY_OFFSET 0.5f
-#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN ( 2.0f )
-#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR ( 3.0f )
-#define SBA_CARDI_TARGET_ENERGY_GAIN 0.5f
-
-#define STEREO_PREPROCESS_IIR_FACTOR ( 0.9f )
-#define STEREO_PREPROCESS_IIR_FACTOR_Q15 ( 29491 )
+#define STEREO_PREPROCESS_IIR_FACTOR_Q15 ( 29491 ) // 0.9f in Q15
/* powf(0.95f, 4.0f) for sub-frame smoothing instead of CLDFB slot */
-#define ADAPT_HTPROTO_IIR_FAC 0.81450625f
-
-#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_0_FX 429496736 // Q30
+#define ADAPT_HTPROTO_ROT_LIM_0_FX 429496736 // 0.4f in Q30
#define TWO_POINT_FIVE_IN_Q13 20480 // Q13
#define ADAPT_HTPROTO_IIR_FAC_FX 26689 // Q15
#define LOG_10_BASE_2_Q29 1783446528 // Q29
@@ -74,11 +63,8 @@ Word16 slot_fx[4] = { 32767, 16384, 10922, 8192 };
#define EPSILON_EXP ( -39 )
#define ONE_DIV_EPSILON_MANT 1953125000 /* 1e+12 = 0.9094947*(2^40) */
#define ONE_DIV_EPSILON_EXP ( 40 )
-#define ADAPT_HTPROTO_ROT_LIM_1 0.8f
-#ifdef FIX_1819_EIGENVALUE_ERROR
#define SMALL_EIGENVALUE 50
-#endif
#define MAX_GAIN_CACHE_SIZE ( ( MASA_MAXIMUM_DIRECTIONS * 3 ) + MAX_NUM_OBJECTS ) /* == different calls to get gains */
@@ -108,14 +94,11 @@ typedef struct parambin_rend_config_data
* Local function prototypes
*------------------------------------------------------------------------*/
-static void ivas_dirac_dec_binaural_internal_fx( Decoder_Struct *st_ivas, COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, Word32 *output_f[] /*Q11*/, const Word16 nchan_transport, const Word16 subframe );
-#ifdef FIX_2049_DIFF_IN_DECORR_TAIL
-static void ivas_dirac_dec_decorrelate_slot_fx( DIRAC_DEC_BIN_HANDLE hDiracDecBin, const Word16 num_freq_bands, const Word16 slot, Word32 inRe[][CLDFB_SLOTS_PER_SUBFRAME] /*q_inp*/[CLDFB_NO_CHANNELS_MAX], Word32 inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX] /*q_inp*/, Word16 q_inp, Word32 decRe[][CLDFB_NO_CHANNELS_MAX], Word32 decIm[][CLDFB_NO_CHANNELS_MAX], Word16 *q_out );
-#else
-static void ivas_dirac_dec_decorrelate_slot_fx( DIRAC_DEC_BIN_HANDLE hDiracDecBin, const Word16 num_freq_bands, const Word16 slot, Word32 inRe[][CLDFB_SLOTS_PER_SUBFRAME] /*q_inp*/[CLDFB_NO_CHANNELS_MAX], Word32 inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX] /*q_inp*/, Word16 q_inp, Word32 decRe[][CLDFB_NO_CHANNELS_MAX] /*q_inp*/, Word32 decIm[] /*q_inp*/[CLDFB_NO_CHANNELS_MAX] );
-#endif
+static void ivas_dirac_dec_binaural_internal_fx( Decoder_Struct *st_ivas, COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, Word32 *output_fx[] /*Q11*/, const Word16 nchan_transport, const Word16 subframe );
+
+static void ivas_dirac_dec_decorrelate_slot_fx( DIRAC_DEC_BIN_HANDLE hDiracDecBin, const Word16 num_freq_bands, const Word16 slot, Word32 inRe[][CLDFB_SLOTS_PER_SUBFRAME] /*q_inp*/[CLDFB_NO_CHANNELS_MAX], Word32 inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX] /*q_inp*/, const Word16 q_inp, Word32 decRe[][CLDFB_NO_CHANNELS_MAX], Word32 decIm[][CLDFB_NO_CHANNELS_MAX], Word16 *q_out );
-static void ivas_dirac_dec_binaural_formulate_input_covariance_matrices_fx( DIRAC_DEC_BIN_HANDLE hDiracDecBin, SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, PARAMBIN_REND_CONFIG_HANDLE hConfig, Word32 inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], Word32 inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const Word16 subframe, Word32 *subFrameTotalEne, Word16 *subFrameTotalEne_e, Word32 *IIReneLimiter, Word16 q );
+static void ivas_dirac_dec_binaural_formulate_input_covariance_matrices_fx( DIRAC_DEC_BIN_HANDLE hDiracDecBin, SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, PARAMBIN_REND_CONFIG_HANDLE hConfig, Word32 inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], Word32 inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], const Word16 subframe, Word32 *subFrameTotalEne, Word16 *subFrameTotalEne_e, Word32 *IIReneLimiter, const Word16 q );
static void ivas_dirac_dec_binaural_formulate_target_covariance_matrices_fx( DIRAC_DEC_BIN_HANDLE hDiracDecBin, const SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, const PARAMBIN_REND_CONFIG_HANDLE hConfig, Word32 Rmat[3][3], const Word16 subframe, const Word16 isHeadtracked, const Word32 *subFrameTotalEne, Word16 *subFrameTotalEne_e, const Word32 *IIReneLimiter, const MASA_ISM_DATA_HANDLE hMasaIsmData );
@@ -137,18 +120,7 @@ static void formulate2x2MixingMatrix_fx( Word32 Ein1_fx /*q_Ein*/, Word32 Ein2_f
static void matrixMul_fx( Word32 Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/, Word32 Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/, Word16 *q_A, Word32 Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/, Word32 Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/, Word16 *q_B, Word32 outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/, Word32 outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/, Word16 *q_out );
-static void matrixTransp2Mul_fx(
- Word32 Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/,
- Word32 Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/,
- Word16 *q_A,
- Word32 Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/,
- Word32 Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/,
- Word16 *q_B,
- Word32 Ascale,
- Word32 Bscale,
- Word32 outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/,
- Word32 outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/,
- Word16 *q_out );
+static void matrixTransp2Mul_fx( Word32 Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/, Word32 Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_A*/, Word16 *q_A, Word32 Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/, Word32 Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_B*/, Word16 *q_B, Word32 Ascale, Word32 Bscale, Word32 outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/, Word32 outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/, Word16 *q_out );
/*-------------------------------------------------------------------------
@@ -173,17 +145,26 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx(
Word16 tmp_e;
Word16 tmp2;
ivas_error error;
-
Word16 num_poses, pos_idx;
const IVAS_ROOM_ACOUSTICS_CONFIG_DATA *pRoomAcoustics;
num_poses = 1;
+ move16();
IF( st_ivas->hSplitBinRend != NULL )
{
num_poses = st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses;
move16();
}
+#ifdef NONBE_1303_REND_GRANULARITY
+ output_Fs = st_ivas->hDecoderConfig->output_Fs;
+ move32();
+ nBins = st_ivas->hSpatParamRendCom->num_freq_bands;
+ move16();
+ renderer_type = st_ivas->renderer_type;
+ move32();
+#endif
+
FOR( pos_idx = 0; pos_idx < num_poses; pos_idx++ )
{
hDiracDecBin = st_ivas->hDiracDecBin[pos_idx];
@@ -203,13 +184,14 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx(
hDiracDecBin->phHrtfParambin = NULL;
}
+#ifndef NONBE_1303_REND_GRANULARITY
output_Fs = st_ivas->hDecoderConfig->output_Fs;
move32();
nBins = st_ivas->hSpatParamRendCom->num_freq_bands;
move16();
renderer_type = st_ivas->renderer_type;
move32();
-
+#endif
FOR( j = 0; j < BINAURAL_CHANNELS; j++ )
{
FOR( k = 0; k < BINAURAL_CHANNELS + MAX_NUM_OBJECTS; k++ )
@@ -349,7 +331,7 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx(
ivas_dirac_dec_decorr_close_fx( &hDiracDecBin->h_freq_domain_decorr_ap_params, &hDiracDecBin->h_freq_domain_decorr_ap_state );
}
- if ( pos_idx == 0 ) /* open decorrelator only for the main direction */
+ IF( pos_idx == 0 ) /* open decorrelator only for the main direction */
{
IF( NE_32( ( error = ivas_td_decorr_reconfig_dec( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hDecoderConfig->output_Fs, &( hDiracDecBin->hTdDecorr ), &( hDiracDecBin->useTdDecorr ) ) ), IVAS_ERR_OK ) )
{
@@ -361,6 +343,7 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx(
IF( !hDiracDecBin->useTdDecorr && !( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) && EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) ) )
{
Word16 frequency_axis_fx[CLDFB_NO_CHANNELS_MAX];
+
ivas_dirac_dec_get_frequency_axis_fx( frequency_axis_fx, output_Fs, nBins );
IF( NE_32( ( error = ivas_dirac_dec_decorr_open_fx( &( hDiracDecBin->h_freq_domain_decorr_ap_params ),
@@ -378,9 +361,10 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx(
}
}
}
- else
+ ELSE
{
hDiracDecBin->useTdDecorr = st_ivas->hDiracDecBin[0]->useTdDecorr; /* copy the flag, but the implementation re-uses the decorrelated signal */
+ move16();
}
hDiracDecBin->reqularizationFactor_fx = configure_reqularization_factor_fx( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate ); /* Q14 */
@@ -397,13 +381,30 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx(
Word16 nchan_to_allocate;
Word16 n_samples_granularity;
+#ifdef FIX_NCHAN_BUFFERS
+ nchan_to_allocate = BINAURAL_CHANNELS;
+ move16();
+ IF( st_ivas->hDiracDecBin[0] != NULL && st_ivas->hDiracDecBin[0]->useTdDecorr )
+ {
+ nchan_to_allocate = 2 * BINAURAL_CHANNELS;
+ move16();
+ }
+ ELSE IF( st_ivas->hOutSetup.separateChannelEnabled )
+ {
+ nchan_to_allocate = add( nchan_to_allocate, 1 );
+ }
+#else
nchan_to_allocate = 2 * BINAURAL_CHANNELS;
move16();
+#endif
if ( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )
{
nchan_to_allocate = add( BINAURAL_CHANNELS, st_ivas->nchan_ism );
}
+#ifdef NONBE_1303_REND_GRANULARITY
+ n_samples_granularity = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, ivas_renderer_secondary_select_fx( st_ivas ), output_Fs );
+#else
n_samples_granularity = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );
test();
test();
@@ -411,6 +412,7 @@ ivas_error ivas_dirac_dec_init_binaural_data_fx(
{
n_samples_granularity = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES ); /* Use the same granularity as tdrend */
}
+#endif
IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, TC_BUFFER_MODE_RENDERER, ivas_jbm_dec_get_num_tc_channels_fx( st_ivas ), nchan_to_allocate, nchan_to_allocate, n_samples_granularity ) ), IVAS_ERR_OK ) )
{
@@ -432,7 +434,8 @@ void ivas_dirac_dec_close_binaural_data_fx(
DIRAC_DEC_BIN_HANDLE *hBinaural /* i/o: decoder DirAC binaural data handle */
)
{
- int16_t pos_idx;
+ Word16 pos_idx;
+
test();
IF( hBinaural == NULL || *hBinaural == NULL )
{
@@ -476,6 +479,7 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs_fx(
)
{
Word16 i, j;
+
test();
IF( hHrtfParambin != NULL && *hHrtfParambin != NULL )
{
@@ -490,7 +494,7 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs_fx(
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for parametric binauralizer HRTF tables" );
}
-#ifdef USE_FASTCONV_PARAMBIN_16BIT_ROM
+
FOR( i = 0; i < BINAURAL_CHANNELS; i++ )
{
FOR( j = 0; j < HRTF_SH_CHANNELS; j++ )
@@ -505,20 +509,7 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs_fx(
Copy_Scale_sig_16_32_r( parametricReverberationTimes_fx, hrtfParambin->parametricReverberationTimes_fx, CLDFB_NO_CHANNELS_MAX, Q26 - parametricReverberationTimes_factorQ_fx ); /*Q26*/
Copy_Scale_sig_16_32_r( parametricReverberationEneCorrections_fx, hrtfParambin->parametricReverberationEneCorrections_fx, CLDFB_NO_CHANNELS_MAX, Q31 - parametricReverberationEneCorrections_factorQ_fx ); /*Q31*/
Copy_Scale_sig_16_32_r( parametricEarlyPartEneCorrection_fx, hrtfParambin->parametricEarlyPartEneCorrection_fx, CLDFB_NO_CHANNELS_MAX, Q28 - parametricEarlyPartEneCorrection_factorQ_fx ); /*Q28*/
-#else
- FOR( i = 0; i < BINAURAL_CHANNELS; i++ )
- {
- FOR( j = 0; j < HRTF_SH_CHANNELS; j++ )
- {
- Copy( hrtfShCoeffsRe_fx[i][j], hrtfParambin->hrtfShCoeffsRe_fx[i][j], HRTF_NUM_BINS ); /*Q14*/
- Copy( hrtfShCoeffsIm_fx[i][j], hrtfParambin->hrtfShCoeffsIm_fx[i][j], HRTF_NUM_BINS ); /*Q14*/
- }
- }
- Copy32( parametricReverberationTimes_fx, hrtfParambin->parametricReverberationTimes_fx, CLDFB_NO_CHANNELS_MAX ); /*Q26*/
- Copy32( parametricReverberationEneCorrections_fx, hrtfParambin->parametricReverberationEneCorrections_fx, CLDFB_NO_CHANNELS_MAX ); /*Q31*/
- Copy32( parametricEarlyPartEneCorrection_fx, hrtfParambin->parametricEarlyPartEneCorrection_fx, CLDFB_NO_CHANNELS_MAX ); /*Q28*/
-#endif
*hHrtfParambin = hrtfParambin;
return IVAS_ERR_OK;
@@ -538,23 +529,29 @@ void ivas_dirac_dec_binaural_render_fx(
UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
UWord16 *nSamplesAvailable, /* o : number of CLDFB slots still to render */
const Word16 nchan_transport, /* i : number of transport channels */
- Word32 *output_f[] /* o : rendered time signal, Q11 */
+ Word32 *output_fx[] /* o : rendered time signal, Q11 */
)
{
- Word16 slots_to_render, first_sf, last_sf, subframe_idx;
+ Word16 slots_to_render, first_sf, last_sf, subframe_idx, n_samples_sf;
UWord16 slot_size, ch;
UWord16 nchan_out;
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
Word32 *output_fx_local[MAX_OUTPUT_CHANNELS];
+#ifndef FIX_RENDERER_STACK
Word32 output_fx_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k];
Word16 output_length;
+#endif
hSpatParamRendCom = st_ivas->hSpatParamRendCom;
nchan_out = BINAURAL_CHANNELS;
move16();
FOR( ch = 0; ch < nchan_out; ch++ )
{
+#ifdef FIX_RENDERER_STACK
+ output_fx_local[ch] = output_fx[ch];
+#else
output_fx_local[ch] = output_fx_local_buff[ch];
+#endif
}
slot_size = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );
@@ -573,11 +570,14 @@ void ivas_dirac_dec_binaural_render_fx(
last_sf = add( last_sf, 1 );
}
+#ifndef FIX_RENDERER_STACK
output_length = 0;
move16();
+#endif
FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
{
- Word16 n_samples_sf = imult1616( slot_size, hSpatParamRendCom->subframe_nbslots[subframe_idx] );
+ n_samples_sf = imult1616( slot_size, hSpatParamRendCom->subframe_nbslots[subframe_idx] );
+
ivas_dirac_dec_binaural_internal_fx( st_ivas, st_ivas->hCombinedOrientationData, output_fx_local, nchan_transport, subframe_idx );
FOR( ch = 0; ch < nchan_out; ch++ )
@@ -585,17 +585,19 @@ void ivas_dirac_dec_binaural_render_fx(
output_fx_local[ch] += n_samples_sf;
}
+#ifndef FIX_RENDERER_STACK
output_length = add( output_length, n_samples_sf );
-
+#endif
/* update combined orientation access index */
ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );
}
+#ifndef FIX_RENDERER_STACK
FOR( ch = 0; ch < nchan_out; ch++ )
{
- Copy32( output_fx_local_buff[ch], output_f[ch], output_length );
+ Copy32( output_fx_local_buff[ch], output_fx[ch], output_length );
}
-
+#endif
IF( EQ_16( hSpatParamRendCom->slots_rendered, hSpatParamRendCom->num_slots ) )
{
hSpatParamRendCom->dirac_read_idx = add( hSpatParamRendCom->dirac_read_idx, DEFAULT_JBM_SUBFRAMES_5MS ) % hSpatParamRendCom->dirac_md_buffer_length;
@@ -608,11 +610,13 @@ void ivas_dirac_dec_binaural_render_fx(
return;
}
+
/*-------------------------------------------------------------------------
* ivas_dirac_dec_binaural_sba_gain()
*
* loudness correction for parametric binaural renderer
*------------------------------------------------------------------------*/
+
void ivas_dirac_dec_binaural_sba_gain_fx(
Word32 *output[], /* i/o: synthesized core-coder transport channels/DirAC output, inp Qx, out Qx-1 */
const Word16 nchan_remapped, /* i : num channels after remapping of TCs */
@@ -635,7 +639,7 @@ void ivas_dirac_dec_binaural_sba_gain_fx(
FOR( n = 0; n < nchan_remapped; n++ )
{
- v_multc_fixed_16( output[n], gain, output[n], output_frame ); /* Qx to Qx-1*/
+ v_multc_fx_16( output[n], gain, output[n], output_frame ); /* Qx to Qx-1*/
}
return;
@@ -645,6 +649,7 @@ void ivas_dirac_dec_binaural_sba_gain_fx(
/*-------------------------------------------------------------------------
* Local functions
*------------------------------------------------------------------------*/
+
static void ivas_dirac_dec_binaural_internal_fx(
Decoder_Struct *st_ivas,
COMBINED_ORIENTATION_HANDLE hCombinedOrientationData,
@@ -652,7 +657,7 @@ static void ivas_dirac_dec_binaural_internal_fx(
const Word16 nchan_transport,
const Word16 subframe )
{
- Word16 q_input = 11;
+ Word16 q_input = Q11;
move16();
IF( st_ivas->hSCE[0] )
{
@@ -795,6 +800,7 @@ static void ivas_dirac_dec_binaural_internal_fx(
set32_fx( Cldfb_ImagBuffer_in_fx[i][j], 0, 60 );
}
}
+
/* CLDFB Analysis of input */
FOR( slot = 0; slot < hSpatParamRendCom->subframe_nbslots[subframe]; slot++ )
{
@@ -845,11 +851,7 @@ static void ivas_dirac_dec_binaural_internal_fx(
slot,
st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag && st_ivas->hSCE[0]->hCoreCoder[0]->flag_cna,
( st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == FRAME_NO_DATA || st_ivas->hSCE[0]->hCoreCoder[0]->core_brate == SID_2k40 ) && ( st_ivas->hSCE[0]->hCoreCoder[0]->cng_type == FD_CNG ) && st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag,
-#ifdef FIX_2009_HIGH_NOISE_FLOOR_FOR_FX_DEC
st_ivas->hTcBuffer->q_tc_fx, &q_cldfb[2][slot] );
-#else
- 11, &q_cldfb[2][slot] );
-#endif
generate_masking_noise_dirac_ivas_fx( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom,
st_ivas->cldfbAnaDec[1], /*nothing will be analyzed, just get cnst*/
@@ -884,18 +886,10 @@ static void ivas_dirac_dec_binaural_internal_fx(
{
Cldfb_RealBuffer_in_fx[0][slot][b] = Mpy_32_16_1( Cldfb_RealBuffer_in_fx[0][slot][b], 23170 );
Cldfb_RealBuffer_in_fx[1][slot][b] = L_add( L_add( Cldfb_RealBuffer_in_fx[0][slot][b], L_shr( Cldfb_RealBuffer_in_fx[1][slot][b], 1 ) ), Cldfb_RealBuffer_in_fx[0][slot][b] );
-#ifdef FIX_2009_HIGH_NOISE_FLOOR_FOR_FX_DEC
Cldfb_RealBuffer_in_fx[0][slot][b] = L_add( Cldfb_RealBuffer_in_fx[0][slot][b], L_shr( Cldfb_RealBuffer_in_fx[2][slot][b], add( sub( q_cldfb[2][slot], q_input ), 6 ) ) );
-#else
- Cldfb_RealBuffer_in_fx[0][slot][b] = L_add( Cldfb_RealBuffer_in_fx[0][slot][b], L_shr( Cldfb_RealBuffer_in_fx[2][slot][b], 1 ) );
-#endif
Cldfb_ImagBuffer_in_fx[0][slot][b] = Mpy_32_16_1( Cldfb_ImagBuffer_in_fx[0][slot][b], 23170 );
Cldfb_ImagBuffer_in_fx[1][slot][b] = L_add( Cldfb_ImagBuffer_in_fx[0][slot][b], L_shr( Cldfb_ImagBuffer_in_fx[1][slot][b], 1 ) );
-#ifdef FIX_2009_HIGH_NOISE_FLOOR_FOR_FX_DEC
Cldfb_ImagBuffer_in_fx[0][slot][b] = L_add( Cldfb_ImagBuffer_in_fx[0][slot][b], L_shr( Cldfb_ImagBuffer_in_fx[2][slot][b], add( sub( q_cldfb[2][slot], q_input ), 6 ) ) );
-#else
- Cldfb_ImagBuffer_in_fx[0][slot][b] = L_add( Cldfb_ImagBuffer_in_fx[0][slot][b], L_shr( Cldfb_ImagBuffer_in_fx[2][slot][b], 1 ) );
-#endif
move32();
move32();
move32();
@@ -908,8 +902,8 @@ static void ivas_dirac_dec_binaural_internal_fx(
{
/* At mono input duplicate the channel to dual-mono, and apply gain
correction to ensure same overall level as in stereo mode */
- v_multc_fixed_16( Cldfb_RealBuffer_in_fx[0][slot], 23170, Cldfb_RealBuffer_in_fx[0][slot], nBins );
- v_multc_fixed_16( Cldfb_ImagBuffer_in_fx[0][slot], 23170, Cldfb_ImagBuffer_in_fx[0][slot], nBins );
+ v_multc_fx_16( Cldfb_RealBuffer_in_fx[0][slot], 23170, Cldfb_RealBuffer_in_fx[0][slot], nBins );
+ v_multc_fx_16( Cldfb_ImagBuffer_in_fx[0][slot], 23170, Cldfb_ImagBuffer_in_fx[0][slot], nBins );
Copy32( Cldfb_RealBuffer_in_fx[0][slot], Cldfb_RealBuffer_in_fx[1][slot], nBins );
Copy32( Cldfb_ImagBuffer_in_fx[0][slot], Cldfb_ImagBuffer_in_fx[1][slot], nBins );
@@ -946,8 +940,8 @@ static void ivas_dirac_dec_binaural_internal_fx(
IF( EQ_16( config_data.nchan_transport, 1 ) &&
( EQ_32( config_data.ivas_format, SBA_FORMAT ) || EQ_32( config_data.ivas_format, SBA_ISM_FORMAT ) ) )
{
- v_multc_fixed_16( Cldfb_RealBuffer_in_fx[ch][slot], 23170, Cldfb_RealBuffer_in_fx[ch][slot], nBins );
- v_multc_fixed_16( Cldfb_ImagBuffer_in_fx[ch][slot], 23170, Cldfb_ImagBuffer_in_fx[ch][slot], nBins );
+ v_multc_fx_16( Cldfb_RealBuffer_in_fx[ch][slot], 23170, Cldfb_RealBuffer_in_fx[ch][slot], nBins );
+ v_multc_fx_16( Cldfb_ImagBuffer_in_fx[ch][slot], 23170, Cldfb_ImagBuffer_in_fx[ch][slot], nBins );
}
}
}
@@ -985,10 +979,11 @@ static void ivas_dirac_dec_binaural_internal_fx(
test();
test();
test();
- IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && EQ_16( nchan_transport, 2 ) && NE_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) && NE_32( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) )
+ test();
+ test();
+ IF( ( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && ( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) || ( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) && ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) ) ) ) ) || EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )
{
- /* Un-tested function. No test-case is hitting.*/
- ivas_omasa_preProcessStereoTransportsForMovedObjects_fx( st_ivas, Cldfb_RealBuffer_in_fx, Cldfb_ImagBuffer_in_fx, &q_inp, nBins, subframe );
+ ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( st_ivas, Cldfb_RealBuffer_in_fx, Cldfb_ImagBuffer_in_fx, &q_inp, nBins, subframe );
}
IF( hCombinedOrientationData )
@@ -1106,6 +1101,7 @@ static void ivas_dirac_dec_binaural_internal_fx(
move32();
}
+ test();
IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
{
ivas_dirac_dec_binaural_process_output_fx( hDiracDecBin, hSpatParamRendCom, st_ivas->cldfbSynDec, output_fx, &q_out, Cldfb_RealBuffer_in_fx, Cldfb_ImagBuffer_in_fx, q_inp, max_band_decorr, numInChannels, config_data.processReverb, subframe, q_mat,
@@ -1127,14 +1123,14 @@ static void ivas_dirac_dec_binaural_internal_fx(
}
hDiracDecBin->hDiffuseDist = NULL;
-
- if ( pMultiBinPoseData != NULL && pMultiBinPoseData->num_poses > 1 )
+ test();
+ IF( pMultiBinPoseData != NULL && GT_16( pMultiBinPoseData->num_poses, 1 ) )
{
/* quaternion-based rotation from ivas_binRenderer_internal.c:ivas_binRenderer(), but using absolute rotation instead of delta rotations */
IVAS_QUATERNION Quaternions_rot, Quaternions_abs, *Quaternions_ref;
Word32 Rmat_local[3][3];
- if ( hCombinedOrientationData )
+ IF( hCombinedOrientationData )
{
Quaternions_ref = &hCombinedOrientationData->Quaternions[0];
Copy_Quat_fx( Quaternions_ref, &Quaternions_abs );
@@ -1158,7 +1154,8 @@ static void ivas_dirac_dec_binaural_internal_fx(
hDiracDecBin = st_ivas->hDiracDecBin[pos_idx];
assert( hDiracDecBin != NULL && "No DiracDecBin handle for this position" );
- if ( config_data.ivas_format == SBA_FORMAT || config_data.ivas_format == SBA_ISM_FORMAT )
+ test();
+ IF( EQ_32( config_data.ivas_format, SBA_FORMAT ) || EQ_32( config_data.ivas_format, SBA_ISM_FORMAT ) )
{
hDiracDecBin->hDiffuseDist = &diffuseDistData;
}
@@ -1182,7 +1179,6 @@ static void ivas_dirac_dec_binaural_internal_fx(
hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[subframe] > 0,
nchanSeparateChannels, st_ivas->hMasaIsmData );
-
q_mat = hDiracDecBin->q_processMtx;
move16();
q_mat = s_min( q_mat, hDiracDecBin->q_processMtxPrev );
@@ -1263,16 +1259,10 @@ static void ivas_dirac_dec_decorrelate_slot_fx(
const Word16 slot,
Word32 inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /*q_inp*/
Word32 inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /*q_inp*/
- Word16 q_inp,
-#ifdef FIX_2049_DIFF_IN_DECORR_TAIL
+ const Word16 q_inp,
Word32 decRe[][CLDFB_NO_CHANNELS_MAX],
Word32 decIm[][CLDFB_NO_CHANNELS_MAX],
- Word16 *q_out
-#else
- Word32 decRe[][CLDFB_NO_CHANNELS_MAX], /*q_inp*/
- Word32 decIm[][CLDFB_NO_CHANNELS_MAX] /*q_inp*/
-#endif
-)
+ Word16 *q_out )
{
Word16 offset, ch, bin;
Word32 onset_filter_fx[BINAURAL_CHANNELS * CLDFB_NO_CHANNELS_MAX]; /* 2 ch, 60 bins */
@@ -1324,11 +1314,9 @@ static void ivas_dirac_dec_decorrelate_slot_fx(
move32();
}
}
-#ifdef FIX_2049_DIFF_IN_DECORR_TAIL
- *q_out = q_decorrelatedFrameInterleaved;
-#else
- // q_decorrelatedFrameInterleaved will be same as q_inp/q_protoFrame //
-#endif
+
+ *q_out = q_decorrelatedFrameInterleaved; // q_decorrelatedFrameInterleaved will be same as q_inp/q_protoFrame //
+
return;
}
@@ -1343,7 +1331,7 @@ static void ivas_dirac_dec_binaural_formulate_input_covariance_matrices_fx(
Word32 *subFrameTotalEne_fx,
Word16 *subFrameTotalEne_e,
Word32 *IIReneLimiter_fx,
- Word16 q )
+ const Word16 q )
{
Word16 ch, slot, bin;
Word16 nBins;
@@ -1371,11 +1359,9 @@ static void ivas_dirac_dec_binaural_formulate_input_covariance_matrices_fx(
nBins = hSpatParamRendCom->num_freq_bands; /* Actually bins */
move16();
-
set32_fx( hDiracDecBin->ChCrossRe_fx, 0, nBins );
set32_fx( hDiracDecBin->ChCrossIm_fx, 0, nBins );
-
set16_fx( hDiracDecBin->ChCrossRe_e, 0, nBins );
set16_fx( hDiracDecBin->ChCrossIm_e, 0, nBins );
@@ -1510,7 +1496,6 @@ static void ivas_dirac_dec_binaural_formulate_input_covariance_matrices_fx(
}
}
-
test();
/* Temporal IIR-type smoothing of covariance matrices. Also apply encoding quality based smoothing factor. */
IF( EQ_32( ivas_format, MASA_FORMAT ) && LT_32( ivas_total_brate, MASA_STEREO_MIN_BITRATE ) )
@@ -1524,7 +1509,6 @@ static void ivas_dirac_dec_binaural_formulate_input_covariance_matrices_fx(
FOR( bin = 0; bin < nBins; bin++ )
{
-
/* Temporally smooth cov mtx estimates for resulting mixing matrix stability. The design principle is that
* the energy history (IIR) must not be more than double of the current frame energy. This provides more
* robust performance at energy offsets when compared to typical IIR averaging. */
@@ -1737,18 +1721,18 @@ static void ivas_dirac_dec_binaural_formulate_target_covariance_matrices_fx(
UWord16 ismDirIndex;
ismDirIndex = sub( dirIndex, hSpatParamRendCom->numParametricDirections );
assert( hMasaIsmData != NULL && "hMasaIsmData should not be NULL if we use it" );
- IF( hMasaIsmData->ism_is_edited[ismDirIndex] )
+ IF( hMasaIsmData->ism_dir_is_edited[ismDirIndex] )
{
- aziDeg = hMasaIsmData->azimuth_ism_edited[ismDirIndex];
+ aziDeg = hMasaIsmData->azimuth_ism_edited_fx[ismDirIndex];
move16();
- eleDeg = hMasaIsmData->elevation_ism_edited[ismDirIndex];
+ eleDeg = hMasaIsmData->elevation_ism_edited_fx[ismDirIndex];
move16();
}
ELSE
{
- aziDeg = hMasaIsmData->azimuth_ism[ismDirIndex][dirac_read_idx];
+ aziDeg = hMasaIsmData->azimuth_ism_fx[ismDirIndex][dirac_read_idx];
move16();
- eleDeg = hMasaIsmData->elevation_ism[ismDirIndex][dirac_read_idx];
+ eleDeg = hMasaIsmData->elevation_ism_fx[ismDirIndex][dirac_read_idx];
move16();
}
ratio_fx = hMasaIsmData->energy_ratio_ism_fx[ismDirIndex][dirac_read_idx][bin];
@@ -2487,7 +2471,6 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices_fx(
q_gain = sub( 31, add( exp2, exp1 ) );
}
-
// 1073741824 = 4 in Q28
IF( LT_16( q_gain, Q28 ) )
{
@@ -2598,17 +2581,38 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices_fx(
{
IF( EQ_16( ism_mode, ISM_MASA_MODE_DISC ) )
{
- aziDeg = hMasaIsmData->azimuth_ism[chB][dirac_read_idx];
- move16();
- eleDeg = hMasaIsmData->elevation_ism[chB][dirac_read_idx];
- move16();
+ IF( hMasaIsmData->ism_dir_is_edited[chB] )
+ {
+ aziDeg = hMasaIsmData->azimuth_ism_edited_fx[chB];
+ move16();
+ eleDeg = hMasaIsmData->elevation_ism_edited_fx[chB];
+ move16();
+ }
+ ELSE
+ {
+ aziDeg = hMasaIsmData->azimuth_ism_fx[chB][dirac_read_idx];
+ move16();
+ eleDeg = hMasaIsmData->elevation_ism_fx[chB][dirac_read_idx];
+ move16();
+ }
}
ELSE
{
- aziDeg = hMasaIsmData->azimuth_separated_ism[dirac_read_idx];
- move16();
- eleDeg = hMasaIsmData->elevation_separated_ism[dirac_read_idx];
- move16();
+ test();
+ IF( ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && hMasaIsmData->ism_dir_is_edited[hMasaIsmData->idx_separated_ism] )
+ {
+ aziDeg = hMasaIsmData->azimuth_ism_edited_fx[hMasaIsmData->idx_separated_ism];
+ move16();
+ eleDeg = hMasaIsmData->elevation_ism_edited_fx[hMasaIsmData->idx_separated_ism];
+ move16();
+ }
+ ELSE
+ {
+ aziDeg = hMasaIsmData->azimuth_separated_ism_fx[dirac_read_idx];
+ move16();
+ eleDeg = hMasaIsmData->elevation_separated_ism_fx[dirac_read_idx];
+ move16();
+ }
instantChange = 1;
move16();
}
@@ -2748,11 +2752,7 @@ static void ivas_dirac_dec_binaural_process_output_fx(
move16();
move16();
move16();
-#ifdef FIX_2049_DIFF_IN_DECORR_TAIL
Word32 decSlotRe_fx[CLDFB_SLOTS_PER_SUBFRAME][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX], decSlotIm_fx[CLDFB_SLOTS_PER_SUBFRAME][BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];
-#else
- Word32 decSlotRe_fx[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX], decSlotIm_fx[BINAURAL_CHANNELS][CLDFB_NO_CHANNELS_MAX];
-#endif
Word32 outSlotRe_fx[CLDFB_NO_CHANNELS_MAX], outSlotIm_fx[CLDFB_NO_CHANNELS_MAX];
Word16 q_inp[6][CLDFB_SLOTS_PER_SUBFRAME];
Word16 interpVal_fx;
@@ -2762,11 +2762,9 @@ static void ivas_dirac_dec_binaural_process_output_fx(
move16();
Word16 ch_len = s_max( 4, numInChannels );
Word16 eff_q;
-#ifdef FIX_2049_DIFF_IN_DECORR_TAIL
Word16 q_decSlot[CLDFB_SLOTS_PER_SUBFRAME];
Word16 q_decSlotMin = 31;
move16();
-#endif
IF( processReverb )
{
@@ -2813,7 +2811,6 @@ static void ivas_dirac_dec_binaural_process_output_fx(
move16();
}
-#ifdef FIX_2049_DIFF_IN_DECORR_TAIL
IF( !hDiracDecBin->useTdDecorr && ( max_band_decorr > 0 ) )
{
FOR( slot = 0; slot < nSlots; slot++ )
@@ -2855,7 +2852,7 @@ static void ivas_dirac_dec_binaural_process_output_fx(
}
}
}
-#endif
+
eff_q = sub( add( q_inp_mix, q_mat ), 15 );
FOR( Word16 i = 0; i < ch_len; i++ )
@@ -2914,31 +2911,18 @@ static void ivas_dirac_dec_binaural_process_output_fx(
{
if ( recompute == 1 )
{
-#ifndef FIX_2049_DIFF_IN_DECORR_TAIL
- ivas_dirac_dec_decorrelate_slot_fx( hDiracDecBin, nBins, slot, inRe_fx, inIm_fx, q_inp_mix, decSlotRe_fx, decSlotIm_fx );
-#endif
FOR( chA = 0; chA < BINAURAL_CHANNELS; chA++ )
{
-#ifdef FIX_2049_DIFF_IN_DECORR_TAIL
Copy32( decSlotRe_fx[slot][chA], decorrRe_fx[chA][slot], CLDFB_NO_CHANNELS_MAX );
Copy32( decSlotIm_fx[slot][chA], decorrIm_fx[chA][slot], CLDFB_NO_CHANNELS_MAX );
-#else
- Copy32( decSlotRe_fx[chA], decorrRe_fx[chA][slot], CLDFB_NO_CHANNELS_MAX );
- Copy32( decSlotIm_fx[chA], decorrIm_fx[chA][slot], CLDFB_NO_CHANNELS_MAX );
-#endif
}
}
else
{
FOR( chA = 0; chA < BINAURAL_CHANNELS; chA++ )
{
-#ifdef FIX_2049_DIFF_IN_DECORR_TAIL
Copy32( decorrRe_fx[chA][slot], decSlotRe_fx[slot][chA], CLDFB_NO_CHANNELS_MAX );
Copy32( decorrIm_fx[chA][slot], decSlotIm_fx[slot][chA], CLDFB_NO_CHANNELS_MAX );
-#else
- Copy32( decorrRe_fx[chA][slot], decSlotRe_fx[chA], CLDFB_NO_CHANNELS_MAX );
- Copy32( decorrIm_fx[chA][slot], decSlotIm_fx[chA], CLDFB_NO_CHANNELS_MAX );
-#endif
}
}
}
@@ -2966,13 +2950,8 @@ static void ivas_dirac_dec_binaural_process_output_fx(
}
ELSE
{
-#ifdef FIX_2049_DIFF_IN_DECORR_TAIL
decSlotRePointer_fx = decSlotRe_fx[slot][chB];
decSlotImPointer_fx = decSlotIm_fx[slot][chB];
-#else
- decSlotRePointer_fx = decSlotRe_fx[chB];
- decSlotImPointer_fx = decSlotIm_fx[chB];
-#endif
}
}
ELSE
@@ -3706,7 +3685,7 @@ static void eig2x2_fx(
}
/* Numeric case, when input is near an identity matrix with a gain */
- tmp1 = Mpy_32_32( 2147484, add_fx ); // 2147484 = 1e-3f in Q31
+ tmp1 = Mpy_32_32( INV_1000_Q31, add_fx );
IF( LT_16( q_tmp1, q_tmp2 ) )
{
@@ -4572,7 +4551,7 @@ static void formulate2x2MixingMatrix_fx(
move32();
q_Sx = sub( add( q_Sx, Q14 ), 15 );
- temp = Mpy_32_32( E_in2, 2147484 ); // 2147484 = 0.001f in Q31
+ temp = Mpy_32_32( E_in2, INV_1000_Q31 );
temp = L_max( temp, E_in1 );
IF( temp == 0 )
@@ -4601,8 +4580,8 @@ static void formulate2x2MixingMatrix_fx(
}
move32();
- temp = Mpy_32_32( E_in1, 2147484 ); // 2147484 = 0.001f in Q31
- temp = L_max( temp, E_in2 ); // q_ein
+ temp = Mpy_32_32( E_in1, 2147484 );
+ temp = L_max( temp, E_in2 ); // q_ein
IF( temp == 0 )
{
IF( E_out2 == 0 )
@@ -4672,20 +4651,18 @@ static void formulate2x2MixingMatrix_fx(
eig2x2_fx( tmpRe_fx[0][0], tmpRe_fx[1][1], q_temp, tmpRe_fx[1][0], tmpIm_fx[1][0], q_temp, Ure_fx, Uim_fx, &q_U, D_fx, &q_D );
-#ifdef FIX_1819_EIGENVALUE_ERROR
IF( D_fx[0] != 0 && D_fx[1] == 0 ) // Due to an eig2x2 error, sometimes D_fx[1] becomes zero, which implies that the input matrix should be singular (i.e., determinant = 0).
{
Word32 det_fx = L_sub_sat( Mult_32_32( tmpRe_fx[0][0], tmpRe_fx[1][1] ),
- L_add_sat(
- Mult_32_32( tmpRe_fx[1][0], tmpRe_fx[1][0] ),
- Mult_32_32( tmpIm_fx[1][0], tmpIm_fx[1][0] ) ) );
+ L_add_sat( Mult_32_32( tmpRe_fx[1][0], tmpRe_fx[1][0] ),
+ Mult_32_32( tmpIm_fx[1][0], tmpIm_fx[1][0] ) ) );
if ( det_fx != 0 )
{
D_fx[1] = SMALL_EIGENVALUE; // Setting D_fx[1] to epsilon has no effect, as the value is too small to affect the output.
move32();
}
}
-#endif
+
IF( D_fx[0] == 0 )
{
temp = ONE_DIV_EPSILON_MANT; /* Result of 1.0/eps with full precision */
@@ -4944,7 +4921,6 @@ static void getDirectPartGains_fx(
const Word16 isHeadtracked,
HRTFS_PARAMBIN_HANDLE hHrtfParambin )
{
- // float aziRad, eleRad;
Word32 y, mappedX;
Word16 aziRadMapped, A, A2, A3;
const Word16 LsAngleRad = 17157; // Q15
@@ -4958,113 +4934,137 @@ static void getDirectPartGains_fx(
IF( renderStereoOutputInsteadOfBinaural ) /* In stereo (i.e. non-binaural) rendering mode */
{
- /* Convert azi and ele to an azi value of the cone of confusion */
-
- // y = ( sinf( aziRad ) * cosf( eleRad ) );
-
- IF( GT_16( abs_s( eleDeg ), 180 ) )
- {
- // cos(180 + x) = -cos(x)
- cos_val = -ptr_cos[sub( abs_s( eleDeg ), 180 )]; // Q31
- }
- ELSE
- {
- cos_val = ptr_cos[abs_s( eleDeg )]; // Q31
- }
+ *lImagp = 0;
+ *rImagp = 0;
+ move32();
move32();
- IF( GT_16( aziDeg, 180 ) )
- {
- // sin(180 + x) = -sin(x)
- sin_val = -ptr_sin[sub( aziDeg, 180 )]; // Q31
- }
- ELSE IF( LT_16( aziDeg, -180 ) )
+ test();
+ IF( EQ_16( aziDeg, gainCache->azi ) && EQ_16( eleDeg, gainCache->ele ) )
{
- // sin(-(180 + x)) = sin(180 + x) = sinx
- sin_val = ptr_sin[sub( abs_s( aziDeg ), 180 )]; // Q31
+ *lRealp = gainCache->shVec_fx[0]; /* Reused memory */
+ *rRealp = gainCache->shVec_fx[1]; /* Reused memory */
+ move32();
+ move32();
}
ELSE
{
- sin_val = ptr_sin[aziDeg]; // Q31
- }
- move32();
-
- y = Mpy_32_32( sin_val, cos_val ); // Q31
- e_mappedX = 0;
- move16();
- mappedX = Sqrt32( L_max( 0, L_sub( ONE_IN_Q31, Mpy_32_32( y, y ) ) ), &e_mappedX );
+ /* Convert azi and ele to an azi value of the cone of confusion */
- aziRadMapped = BASOP_util_atan2( y, mappedX, negate( e_mappedX ) ); // Q13
+ // y = ( sinf( aziRad ) * cosf( eleRad ) );
- /* Determine the real valued amplitude panning gains */
- *lImagp = 0;
- *rImagp = 0;
- move32();
- move32();
- IF( GE_16( aziRadMapped, shr( LsAngleRad, 2 ) ) )
- { /* Left side */
- *lRealp = ONE_IN_Q31;
- *rRealp = 0;
+ IF( GT_16( abs_s( eleDeg ), 180 ) )
+ {
+ // cos(180 + x) = -cos(x)
+ cos_val = -ptr_cos[sub( abs_s( eleDeg ), 180 )]; // Q31
+ }
+ ELSE
+ {
+ cos_val = ptr_cos[abs_s( eleDeg )]; // Q31
+ }
move32();
+
+ IF( GT_16( aziDeg, 180 ) )
+ {
+ // sin(180 + x) = -sin(x)
+ sin_val = -ptr_sin[sub( aziDeg, 180 )]; // Q31
+ }
+ ELSE IF( LT_16( aziDeg, -180 ) )
+ {
+ // sin(-(180 + x)) = sin(180 + x) = sinx
+ sin_val = ptr_sin[sub( abs_s( aziDeg ), 180 )]; // Q31
+ }
+ ELSE
+ {
+ sin_val = ptr_sin[aziDeg]; // Q31
+ }
move32();
- }
- ELSE IF( LE_16( aziRadMapped, negate( shr( LsAngleRad, 2 ) ) ) )
- { /* Right side */
- *lRealp = 0;
- *rRealp = ONE_IN_Q31;
+
+ y = Mpy_32_32( sin_val, cos_val ); // Q31
+ e_mappedX = 0;
+ move16();
+ mappedX = Sqrt32( L_max( 0, L_sub( ONE_IN_Q31, Mpy_32_32( y, y ) ) ), &e_mappedX );
+
+ aziRadMapped = BASOP_util_atan2( y, mappedX, negate( e_mappedX ) ); // Q13
+
+ /* Determine the real valued amplitude panning gains */
move32();
move32();
- }
- ELSE /* Tangent panning law */
- {
- Word16 e_div, div, e_a, e_a3, temp_16_1, temp_16_2, e_num, e_den;
- div = BASOP_Util_Divide3232_Scale( y, mappedX, &e_div );
- e_div = sub( e_div, e_mappedX );
+ IF( GE_16( aziRadMapped, shr( LsAngleRad, 2 ) ) )
+ { /* Left side */
+ *lRealp = ONE_IN_Q31;
+ *rRealp = 0;
+ move32();
+ move32();
+ }
+ ELSE IF( LE_16( aziRadMapped, negate( shr( LsAngleRad, 2 ) ) ) )
+ { /* Right side */
+ *lRealp = 0;
+ *rRealp = ONE_IN_Q31;
+ move32();
+ move32();
+ }
+ ELSE /* Tangent panning law */
+ {
+ Word16 e_div, div, e_a, e_a3, temp_16_1, temp_16_2, e_num, e_den;
+ div = BASOP_Util_Divide3232_Scale( y, mappedX, &e_div );
+ e_div = sub( e_div, e_mappedX );
- A = mult( div, INV_TAN30_FX );
- e_a = add( e_div, 1 );
+ A = mult( div, INV_TAN30_FX );
+ e_a = add( e_div, 1 );
- e_num = BASOP_Util_Add_MantExp( A, e_a, -32767, 0, &temp_16_1 );
- e_den = BASOP_Util_Add_MantExp( A, e_a, 32767, 0, &temp_16_2 );
- IF( temp_16_2 <= 0 )
- {
- temp_16_2 = 32;
- e_den = 0;
+ e_num = BASOP_Util_Add_MantExp( A, e_a, -32767, 0, &temp_16_1 );
+ e_den = BASOP_Util_Add_MantExp( A, e_a, 32767, 0, &temp_16_2 );
+ IF( temp_16_2 <= 0 )
+ {
+ temp_16_2 = 32;
+ e_den = 0;
+ move16();
+ move16();
+ }
+ A2 = BASOP_Util_Divide1616_Scale( temp_16_1, temp_16_2, &e_div );
+ e_div = add( e_div, sub( e_num, e_den ) );
+
+ e_den = BASOP_Util_Add_MantExp( mult( A2, A2 ), add( e_div, e_div ), 32767, 0, &temp_16_2 );
+ A3 = BASOP_Util_Divide1616_Scale( 32767, temp_16_2, &e_a3 );
+ e_a3 = sub( e_a3, e_den );
+ // A3 = 1.0f / ( A2 * A2 + 1.0f ); // Q15
+ Word32 temp_32 = L_shr( L_deposit_h( A3 ), sub( 0, e_a3 ) );
+ Word16 temp_e = 0;
+ e_a3 = 0;
move16();
move16();
+ *lRealp = Sqrt32( temp_32, &e_a3 );
+ *rRealp = Sqrt32( L_sub( ONE_IN_Q31, temp_32 ), &temp_e );
+ *lRealp = L_shr( *lRealp, sub( 0, e_a3 ) ); // Q31
+ *rRealp = L_shr( *rRealp, sub( 0, temp_e ) ); // Q31
+ move32();
+ move32();
+ move32();
+ move32();
}
- A2 = BASOP_Util_Divide1616_Scale( temp_16_1, temp_16_2, &e_div );
- e_div = add( e_div, sub( e_num, e_den ) );
- e_den = BASOP_Util_Add_MantExp( mult( A2, A2 ), add( e_div, e_div ), 32767, 0, &temp_16_2 );
- A3 = BASOP_Util_Divide1616_Scale( 32767, temp_16_2, &e_a3 );
- e_a3 = sub( e_a3, e_den );
- // A3 = 1.0f / ( A2 * A2 + 1.0f ); // Q15
- Word32 temp_32 = L_shr( L_deposit_h( A3 ), sub( 0, e_a3 ) );
- Word16 temp_e = 0;
- e_a3 = 0;
- move16();
- move16();
- *lRealp = Sqrt32( temp_32, &e_a3 );
- *rRealp = Sqrt32( L_sub( ONE_IN_Q31, temp_32 ), &temp_e );
- *lRealp = L_shr( *lRealp, sub( 0, e_a3 ) ); // Q31
- *rRealp = L_shr( *rRealp, sub( 0, temp_e ) ); // Q31
+ /* Scaling to have the same expected gain as for the HRTF rendering */
+ *lRealp = Mpy_32_32( *lRealp, SQRT2_FX ); // Q30
+ *rRealp = Mpy_32_32( *rRealp, SQRT2_FX ); // Q30
+
+ *lRealp = L_shr( *lRealp, 2 ); // Q28
+ *rRealp = L_shr( *rRealp, 2 ); // Q28
move32();
move32();
move32();
move32();
- }
-
- /* Scaling to have the same expected gain as for the HRTF rendering */
- *lRealp = Mpy_32_32( *lRealp, SQRT2_FIXED ); // Q30
- *rRealp = Mpy_32_32( *rRealp, SQRT2_FIXED ); // Q30
- *lRealp = L_shr( *lRealp, 2 ); // Q28
- *rRealp = L_shr( *rRealp, 2 ); // Q28
- move32();
- move32();
- move32();
- move32();
+ /* Store to gain cache */
+ gainCache->azi = aziDeg;
+ gainCache->ele = eleDeg;
+ gainCache->shVec_fx[0] = *lRealp; /* Reuse memory */
+ gainCache->shVec_fx[1] = *rRealp; /* Reuse memory */
+ move16();
+ move16();
+ move32();
+ move32();
+ }
}
ELSE /* In regular binaural rendering mode */
{
@@ -5093,6 +5093,7 @@ static void getDirectPartGains_fx(
return;
}
+
static void hrtfShGetHrtf_fx(
const Word16 bin,
const Word16 aziDeg,
@@ -5108,6 +5109,7 @@ static void hrtfShGetHrtf_fx(
Word16 k;
Word16( *hrtfShCoeffsReInt_fx )[16][60];
Word16( *hrtfShCoeffsImInt_fx )[16][60];
+
hrtfShCoeffsReInt_fx = hHrtfParambin->hrtfShCoeffsRe_fx;
hrtfShCoeffsImInt_fx = hHrtfParambin->hrtfShCoeffsIm_fx;
@@ -5141,11 +5143,7 @@ static void hrtfShGetHrtf_fx(
{
Word32 shVec[HRTF_SH_CHANNELS];
- ivas_dirac_dec_get_response_fx( aziDeg,
- eleDeg,
- shVec,
- HRTF_SH_ORDER,
- Q29 );
+ ivas_dirac_dec_get_response_fx( aziDeg, eleDeg, shVec, HRTF_SH_ORDER, Q29 );
FOR( k = 0; k < HRTF_SH_CHANNELS; k++ )
{
@@ -5246,29 +5244,51 @@ Word16 configure_reqularization_factor_fx(
return reqularizationFactor;
}
+
/*-------------------------------------------------------------------*
- * ivas_omasa_preProcessStereoTransportsForMovedObjects_fx()
+ * ivas_omasa_preProcessStereoTransportsForEditedObjects()
*
*
*-------------------------------------------------------------------*/
-void ivas_omasa_preProcessStereoTransportsForMovedObjects_fx(
+void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx(
Decoder_Struct *st_ivas,
- Word32 inRe_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /*cldfb_buf_q*/
- Word32 inIm_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /*cldfb_buf_q*/
+ Word32 inRe_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],
+ Word32 inIm_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],
Word16 *cldfb_buf_q,
const Word16 nBins,
const Word16 subframe )
{
- Word16 bin, ch, inCh, outCh, ismDirIndex, slot;
+ Word16 bin, ch, inCh, outCh, ismDirIndex, slot, band_idx, bin_lo, bin_hi, max_band, n_ism;
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
MASA_ISM_DATA_HANDLE hMasaIsmData;
+ PARAM_ISM_DEC_HANDLE hParamIsmDec;
UWord8 enableCentering;
Word16 dirac_read_idx;
Word16 nSlots;
+ Word16 panGainsOut[4][2];
+ Word16 panGainsIn[4][2];
+ Word16 panEnesOut[4][2];
+ Word16 panEnesIn[4][2];
+ UWord8 ismGainEdited[4];
+ UWord8 ismDirEdited[4];
+ UWord8 masaGainEdited;
+ UWord8 masaIsmMode;
hSpatParamRendCom = st_ivas->hSpatParamRendCom;
hMasaIsmData = st_ivas->hMasaIsmData;
+ hParamIsmDec = st_ivas->hParamIsmDec;
+
+ IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )
+ {
+ masaIsmMode = 1;
+ move16();
+ }
+ ELSE
+ {
+ masaIsmMode = 0;
+ move16();
+ }
test();
test();
@@ -5283,310 +5303,1154 @@ void ivas_omasa_preProcessStereoTransportsForMovedObjects_fx(
move16();
}
- /* Bypass processing until first object is moved */
- IF( hMasaIsmData->objectsMoved == 0 )
+ test();
+ IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) || EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )
+ {
+ n_ism = st_ivas->nchan_ism;
+ move16();
+ }
+ ELSE
+ {
+ n_ism = hSpatParamRendCom->numIsmDirections;
+ move16();
+ }
+
+ FOR( ismDirIndex = 0; ismDirIndex < n_ism; ismDirIndex++ )
+ {
+ ismGainEdited[ismDirIndex] = hMasaIsmData->ism_gain_is_edited[ismDirIndex];
+ move16();
+ ismDirEdited[ismDirIndex] = hMasaIsmData->ism_dir_is_edited[ismDirIndex];
+ move16();
+ }
+ masaGainEdited = hMasaIsmData->masa_gain_is_edited;
+ move16();
+
+ /* Bypass processing until first object is moved or gained */
+ IF( EQ_32( hMasaIsmData->objectsEdited, 0 ) )
{
- FOR( ismDirIndex = 0; ismDirIndex < hSpatParamRendCom->numIsmDirections; ismDirIndex++ )
+ FOR( ismDirIndex = 0; ismDirIndex < n_ism; ismDirIndex++ )
{
- if ( hMasaIsmData->ism_is_edited[ismDirIndex] )
+ IF( ismDirEdited[ismDirIndex] )
+ {
+ hMasaIsmData->objectsEdited = 1;
+ move16();
+ }
+
+ IF( ismGainEdited[ismDirIndex] )
{
- hMasaIsmData->objectsMoved = 1;
+ hMasaIsmData->objectsEdited = 1;
move16();
}
}
- IF( hMasaIsmData->objectsMoved == 0 )
+
+ IF( masaGainEdited )
+ {
+ hMasaIsmData->objectsEdited = 1;
+ move16();
+ }
+
+ IF( EQ_32( hMasaIsmData->objectsEdited, 0 ) )
{
/* No objects have moved so far */
return;
}
}
- /* Perform object-movement based processing */
- nSlots = hSpatParamRendCom->subframe_nbslots[subframe];
- move16();
- dirac_read_idx = hSpatParamRendCom->render_to_md_map[subframe];
- move16();
-
- FOR( bin = 0; bin < nBins; bin++ )
+ /* OMASA gaining for discrete OMASA mode with stereo_param/bin_room_param renderer */
+ test();
+ test();
+ test();
+ IF( ( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) ) && EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
{
- Word16 ismPreprocMtxNew_fx[2][2];
- Word16 ismPreprocMtxIncrement_fx[2][2];
- Word16 eneMove_fx[2];
- Word16 enePreserve_fx[2];
- Word16 ismRatioAcc_fx;
- Word32 subframeEne_fx;
- Word32 Enes_fx[2];
- Word16 normEnes_fx[2];
- Word16 remainderNormEne_fx;
- Word16 normEnes_q_fx[2], temp_q = 0;
- Word16 eneMove_q_fx[2], enePreserve_q_fx[2], temp1;
- Word32 temp;
+ /* ISM gaining */
+ FOR( ch = 0; ch < n_ism; ch++ )
+ {
+ IF( st_ivas->hMasaIsmData->ism_gain_is_edited[ch] )
+ {
+ FOR( slot = 0; slot < hSpatParamRendCom->subframe_nbslots[subframe]; slot++ )
+ {
+ Word16 gain;
+ gain = st_ivas->hMasaIsmData->gain_ism_edited_fx[ch];
+ move32();
- set16_fx( ismPreprocMtxNew_fx[0], 0, 2 );
- set16_fx( ismPreprocMtxNew_fx[1], 0, 2 );
- set16_fx( ismPreprocMtxIncrement_fx[0], 0, 2 );
- set16_fx( ismPreprocMtxIncrement_fx[1], 0, 2 );
- set16_fx( eneMove_fx, 0, 2 );
- set16_fx( enePreserve_fx, 0, 2 );
- ismRatioAcc_fx = 0;
- move16();
- subframeEne_fx = 0;
- move32();
- set16_fx( normEnes_fx, 0, 2 );
- set32_fx( Enes_fx, 0, 2 );
- set16_fx( normEnes_q_fx, Q31, 2 );
- set16_fx( eneMove_q_fx, Q31, 2 );
- set16_fx( enePreserve_q_fx, Q31, 2 );
+ v_multc_fx_16( inRe_fx[ch + 2][slot], gain, inRe_fx[ch + 2][slot], nBins ); // Q = *cldfb_buf_q - 3
+ Scale_sig32( inRe_fx[ch + 2][slot], nBins, Q3 ); // Q = *cldfb_buf_q
- /* Determine transport normalized energies and subframe energy */
- FOR( slot = 0; slot < nSlots; slot++ )
+ v_multc_fx_16( inIm_fx[ch + 2][slot], gain, inIm_fx[ch + 2][slot], nBins ); // Q = *cldfb_buf_q - 3
+ Scale_sig32( inIm_fx[ch + 2][slot], nBins, Q3 ); // Q = *cldfb_buf_q
+ }
+ }
+ }
+
+ /* MASA gaining */
+ FOR( ch = 0; ch < 2; ch++ )
{
- FOR( ch = 0; ch < 2; ch++ )
+ IF( masaGainEdited )
{
- Enes_fx[ch] = L_add( Enes_fx[ch], Mpy_32_32( inRe_fx[ch][slot][bin], inRe_fx[ch][slot][bin] ) ); // Q = *cldfb_buf_q + *cldfb_buf_q - 31 = Q-19
- move32();
- Enes_fx[ch] = L_add( Enes_fx[ch], Mpy_32_32( inIm_fx[ch][slot][bin], inIm_fx[ch][slot][bin] ) ); // Q = *cldfb_buf_q + *cldfb_buf_q - 31 = Q-19
- move32();
- }
+ FOR( slot = 0; slot < hSpatParamRendCom->subframe_nbslots[subframe]; slot++ )
+ {
+ Word16 gain_masa;
+ gain_masa = st_ivas->hMasaIsmData->gain_masa_edited_fx;
+ move32();
- subframeEne_fx = L_add( Enes_fx[0], Enes_fx[1] ); // Q = *cldfb_buf_q + *cldfb_buf_q - 31 = Q-19
+ v_multc_fx_16( inRe_fx[ch][slot], gain_masa, inRe_fx[ch][slot], nBins ); // Q = *cldfb_buf_q - 3
+ Scale_sig32( inRe_fx[ch][slot], nBins, Q3 ); // Q = *cldfb_buf_q
- IF( subframeEne_fx != 0 )
- {
- normEnes_fx[0] = BASOP_Util_Divide3232_Scale( Enes_fx[0], subframeEne_fx, &temp_q );
- move32();
- normEnes_fx[0] = shr( normEnes_fx[0], sub( sub( 15, temp_q ), Q12 ) ); // Q12
- move32();
- normEnes_fx[1] = BASOP_Util_Divide3232_Scale( Enes_fx[1], subframeEne_fx, &temp_q );
- move32();
- normEnes_fx[1] = shr( normEnes_fx[1], sub( sub( 15, temp_q ), Q12 ) ); // Q12
- move32();
+ v_multc_fx_16( inIm_fx[ch][slot], gain_masa, inIm_fx[ch][slot], nBins ); // Q = *cldfb_buf_q - 3
+ Scale_sig32( inIm_fx[ch][slot], nBins, Q3 ); // Q = *cldfb_buf_q
+ }
}
- ELSE
+ }
+ }
+ ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) && st_ivas->hISMDTX.dtx_flag ) /* If dtx on, perform just the smoothing of the processing gains */
+ {
+ Word32 totalTargetEne;
+ Word32 ismPreprocMtxNew[2][2];
+ Word32 ismPreprocMtxIncrement[2][2];
+ Word32 outSlotRe[2][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
+ Word32 outSlotIm[2][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
+ Word32 eqVal;
+ Word32 temp;
+ Word16 temp_q;
+ Word64 temp64;
+ Word16 exp1;
+ Word16 totalTargetEne_e;
+
+ nSlots = hSpatParamRendCom->subframe_nbslots[subframe];
+ move16();
+
+ /* Use diagonal mixing matrix as the instant mixing matrix, to slowly fade away the editing during dtx */
+ FOR( ch = 0; ch < 2; ch++ )
+ {
+ ismPreprocMtxNew[ch][ch] = ONE_IN_Q28;
+ move32();
+ ismPreprocMtxNew[sub( 1, ch )][ch] = 0;
+ move32();
+ }
+
+ /* Determine the highest band */
+ max_band = 0;
+ move16();
+ test();
+ WHILE( GT_16( sub( MAX_PARAM_ISM_NBANDS, max_band ), 0 ) && GT_16( sub( nBins, hParamIsmDec->hParamIsm->band_grouping[max_band] ), 0 ) )
+ {
+ max_band++;
+ }
+
+ /* Init out array */
+ FOR( slot = 0; slot < nSlots; slot++ )
+ {
+ FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
+ {
+ set32_fx( outSlotRe[ch][slot], 0, CLDFB_NO_CHANNELS_MAX );
+ set32_fx( outSlotIm[ch][slot], 0, CLDFB_NO_CHANNELS_MAX );
+ }
+ }
+
+ // /* Perform the processing in frequency bands */
+ FOR( band_idx = 0; band_idx < max_band; band_idx++ )
+ {
+ bin_lo = hParamIsmDec->hParamIsm->band_grouping[band_idx];
+ bin_hi = s_min( hParamIsmDec->hParamIsm->band_grouping[band_idx + 1], nBins );
+ move16();
+ move16();
+
+ /* Determine transport energies */
+ totalTargetEne = 0;
+ totalTargetEne_e = 0;
+ move32();
+ move16();
+ FOR( slot = 0; slot < nSlots; slot++ )
+ {
+ FOR( ch = 0; ch < 2; ch++ )
+ {
+ FOR( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+
+ Word32 instEne_fx;
+ temp64 = W_mult0_32_32( inRe_fx[ch][slot][bin], inRe_fx[ch][slot][bin] ); // 2q-3
+ temp64 = W_add( temp64, W_mult0_32_32( inIm_fx[ch][slot][bin], inIm_fx[ch][slot][bin] ) ); // 2q-3
+ exp1 = W_norm( temp64 );
+ instEne_fx = W_extract_h( W_shl( temp64, exp1 ) ); // 2*cldfb_buf_q - 32 + exp1
+ exp1 = 31 - ( 2 * ( *cldfb_buf_q ) - 32 + exp1 );
+ move16();
+
+ BASOP_Util_Add_Mant32Exp( totalTargetEne, totalTargetEne_e, instEne_fx, exp1, &totalTargetEne_e );
+ }
+ }
+ }
+
+ /* Get increment value for temporal interpolation */
+ FOR( inCh = 0; inCh < 2; inCh++ )
+ {
+ FOR( outCh = 0; outCh < 2; outCh++ )
+ {
+ temp = L_sub( ismPreprocMtxNew[outCh][inCh], hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][band_idx] ); // Q28
+ ismPreprocMtxIncrement[outCh][inCh] = L_shr( temp, 2 ); // Divide by 4
+ move32();
+ }
+ }
+
+ /* Mix signals */
+ hMasaIsmData->preprocEneTarget_fx[band_idx] = Mpy_32_16_1( hMasaIsmData->preprocEneTarget_fx[band_idx], STEREO_PREPROCESS_IIR_FACTOR_Q15 ); // Q = preprocEneTarget_e
+ move32();
+
+ hMasaIsmData->preprocEneRealized_fx[band_idx] = Mpy_32_16_1( hMasaIsmData->preprocEneRealized_fx[band_idx], STEREO_PREPROCESS_IIR_FACTOR_Q15 ); // Q = preprocEneRealized_e
+ move32();
+
+ hMasaIsmData->preprocEneTarget_fx[band_idx] = BASOP_Util_Add_Mant32Exp( hMasaIsmData->preprocEneTarget_fx[band_idx], hMasaIsmData->preprocEneTarget_e[band_idx], totalTargetEne, totalTargetEne_e, &hMasaIsmData->preprocEneTarget_e[band_idx] ); // Q = 31-preprocEneTarget_e
+ move32();
+
+ FOR( outCh = 0; outCh < 2; outCh++ )
{
- normEnes_fx[0] = BASOP_Util_Divide3232_Scale( Enes_fx[0], EPSILON_FX, &temp_q );
+ FOR( slot = 0; slot < nSlots; slot++ )
+ {
+ FOR( inCh = 0; inCh < 2; inCh++ )
+ {
+ hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][band_idx] = L_add( hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][band_idx], ismPreprocMtxIncrement[outCh][inCh] ); // Q28
+
+ FOR( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ temp = Mpy_32_32( inRe_fx[inCh][slot][bin], hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][band_idx] ); // Q = q_cldfb* + 28 - 31 = q_cldfb - 3
+ outSlotRe[outCh][slot][bin] = L_add( outSlotRe[outCh][slot][bin], L_shl( temp, 3 ) ); // Q = q_cldfb*
+ move32();
+
+ temp = Mpy_32_32( inIm_fx[inCh][slot][bin], hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][band_idx] ); // Q = q_cldfb* + 28 - 31 = q_cldfb*-3
+ outSlotIm[outCh][slot][bin] = L_add( outSlotIm[outCh][slot][bin], L_shl( temp, 3 ) ); // Q = q_cldfb*
+ move32();
+ }
+ }
+
+ FOR( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ Word32 instEne_fx;
+ temp64 = W_mult0_32_32( outSlotRe[outCh][slot][bin], outSlotRe[outCh][slot][bin] ); // 2q-3
+ temp64 = W_add( temp64, W_mult0_32_32( outSlotIm[outCh][slot][bin], outSlotIm[outCh][slot][bin] ) ); // 2q-3
+ exp1 = W_norm( temp64 );
+ instEne_fx = W_extract_h( W_shl( temp64, exp1 ) ); // 2*cldfb_buf_q - 32 + exp1
+ exp1 = 31 - ( 2 * ( *cldfb_buf_q ) - 32 + exp1 );
+ move16();
+
+ hMasaIsmData->preprocEneRealized_fx[band_idx] = BASOP_Util_Add_Mant32Exp( hMasaIsmData->preprocEneRealized_fx[band_idx], hMasaIsmData->preprocEneRealized_e[band_idx], instEne_fx, exp1, &hMasaIsmData->preprocEneRealized_e[band_idx] ); // Q= *cldfb_buf_q + *cldfb_buf_q - 31 = Q-19);
+ move32();
+ }
+ }
+ }
+
+ test();
+ IF( hMasaIsmData->preprocEneTarget_fx[band_idx] > 0 && hMasaIsmData->preprocEneRealized_fx[band_idx] > 0 )
+ {
+ temp = BASOP_Util_Divide3232_Scale_newton( hMasaIsmData->preprocEneTarget_fx[band_idx], L_max( 1, hMasaIsmData->preprocEneRealized_fx[band_idx] ), &temp_q );
+ temp_q = sub( Q31, sub( sub( Q31, temp_q ), sub( hMasaIsmData->preprocEneTarget_e[band_idx], hMasaIsmData->preprocEneRealized_e[band_idx] ) ) );
+ temp = Sqrt32( temp, &temp_q ); // Q: 31-temp_q
+ temp = L_shl( temp, sub( temp_q, 3 ) ); // Q28
+ temp_q = Q28;
move32();
- normEnes_fx[0] = shr( normEnes_fx[0], sub( sub( 15, temp_q ), Q12 ) ); // Q12
+ }
+ ELSE
+ {
+ temp = 0;
move32();
- normEnes_fx[1] = BASOP_Util_Divide3232_Scale( Enes_fx[1], EPSILON_FX, &temp_q );
+ }
+
+ IF( GT_32( ONE_IN_Q30, temp ) )
+ {
+ eqVal = temp;
move32();
- normEnes_fx[1] = shr( normEnes_fx[1], sub( sub( 15, temp_q ), Q12 ) ); // Q12
+ }
+ ELSE
+ {
+ eqVal = ONE_IN_Q30; // 4 in Q28
move32();
}
+ FOR( ch = 0; ch < 2; ch++ )
+ {
+ FOR( slot = 0; slot < nSlots; slot++ )
+ {
+ FOR( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ temp = Mpy_32_32( outSlotRe[ch][slot][bin], eqVal ); // Q = (cldfb_q) + 28 -31 = cldfb_q - 3
+ inRe_fx[ch][slot][bin] = L_shl( temp, 3 );
+ move32();
+
+ temp = Mpy_32_32( outSlotIm[ch][slot][bin], eqVal ); // Q = (cldfb_q) + 28 -31 = cldfb_q - 3
+ inIm_fx[ch][slot][bin] = L_shl( temp, 3 );
+ move32();
+ }
+ }
+ }
+ }
+ }
+ ELSE /* Other processing modes */
+ {
+ Word32 subframeEne;
+ Word32 subframeEneCh[2];
+ Word32 normEnes[2];
+ Word32 ratioAccOrig;
+ Word32 ratioAccNew;
+ Word32 ratio;
+ Word32 ismEneThis;
+ Word32 ismTargetEneThis;
+ Word32 ismTargetEneThisCh[2];
+ Word32 totalTargetEneCh[2];
+ Word32 totalTargetEne;
+ Word32 masaTargetEneThisCh[2];
+ Word32 ismPreprocMtxNew[2][2];
+ Word16 ismPreprocMtxNew_e[2][2];
+ Word32 ismPreprocMtxIncrement[2][2];
+ Word16 ismPreprocMtxIncrement_e[2][2];
+ Word32 eneMove[2];
+ Word32 enePreserve[2];
+ Word32 ismRatioAcc;
+ Word32 remainderNormEne;
+ Word16 centeringFactor;
+ Word16 eneMoveThis;
+ Word16 enePreserveThis;
+ Word32 normVal;
+ Word32 eqVal;
+ Word32 outSlotRe[2][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
+ Word32 outSlotIm[2][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
+ Word32 newRatios[6];
+ Word16 gainIsmThis;
+ Word16 gainMasaPow2;
+ Word32 tempDivisor;
+ Word32 masaEneThisCh[2];
+ Word32 ratioAccNewDivisor;
+ Word32 temp;
+ Word16 temp_q = 0;
+ Word16 temp1;
+ Word64 temp64;
+ Word16 norm, shift = 31;
+ Word16 exp, exp1;
+ Word16 subframeEneCh_e[2];
+ Word16 subframeEneCh_Q[2];
+ Word16 subQ = 0;
+ move16();
+ move16();
+ move16();
+
+ set16_fx( subframeEneCh_e, 0, 2 );
+ temp = 0;
+ move32();
+
+ gainMasaPow2 = ONE_IN_Q9;
+ move16();
+ IF( masaGainEdited )
+ {
+ gainMasaPow2 = hMasaIsmData->gain_masa_edited_fx; // Q12
+ move16();
+ gainMasaPow2 = mult( gainMasaPow2, gainMasaPow2 ); // Q = 12 + 12 - 15 = 9
+ move16();
+ }
+
+ nSlots = hSpatParamRendCom->subframe_nbslots[subframe];
+ move16();
+ dirac_read_idx = hSpatParamRendCom->render_to_md_map[subframe];
+ move16();
+
+ /* Determine panning gains and energies for each object */
+ FOR( ismDirIndex = 0; ismDirIndex < n_ism; ismDirIndex++ )
+ {
+ /* Get input and output panning gains */
+ ivas_get_stereo_panning_gains_fx( hMasaIsmData->azimuth_ism_fx[ismDirIndex][dirac_read_idx],
+ hMasaIsmData->elevation_ism_fx[ismDirIndex][dirac_read_idx],
+ panGainsIn[ismDirIndex] ); // Q15
+
+ IF( ismDirEdited[ismDirIndex] )
+ {
+ ivas_get_stereo_panning_gains_fx( hMasaIsmData->azimuth_ism_edited_fx[ismDirIndex],
+ hMasaIsmData->elevation_ism_edited_fx[ismDirIndex],
+ panGainsOut[ismDirIndex] ); // Q15
+ }
+ ELSE
+ {
+ /* When not edited, input and output pan gains are the same */
+ FOR( ch = 0; ch < 2; ch++ )
+ {
+ panGainsOut[ismDirIndex][ch] = panGainsIn[ismDirIndex][ch];
+ move16();
+ }
+ }
+
+ /* Determine pan enes */
+ FOR( ch = 0; ch < 2; ch++ )
+ {
+ panEnesOut[ismDirIndex][ch] = mult( panGainsOut[ismDirIndex][ch], panGainsOut[ismDirIndex][ch] ); // Q15
+ move16();
+ panEnesIn[ismDirIndex][ch] = mult( panGainsIn[ismDirIndex][ch], panGainsIn[ismDirIndex][ch] ); // Q15
+ move16();
+ }
+ }
+
+ /* Determine the highest band */
+ max_band = 0;
+ move16();
+ IF( masaIsmMode )
+ {
+ test();
+ WHILE( GT_16( sub( MASA_FREQUENCY_BANDS, max_band ), 0 ) && GT_16( sub( nBins, MASA_band_grouping_24[max_band] ), 0 ) )
+ {
+ max_band++;
+ }
+ }
+ ELSE
+ {
+ test();
+ WHILE( GT_16( sub( MAX_PARAM_ISM_NBANDS, max_band ), 0 ) && GT_16( sub( nBins, hParamIsmDec->hParamIsm->band_grouping[max_band] ), 0 ) )
+ {
+ max_band++;
+ }
+ }
+
+ /* Init out array */
+ FOR( Word16 k = 0; k < nSlots; k++ )
+ {
+ FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
+ {
+ set_zero_fx( outSlotRe[ch][k], CLDFB_NO_CHANNELS_MAX );
+ set_zero_fx( outSlotIm[ch][k], CLDFB_NO_CHANNELS_MAX );
+
+ norm = s_min( L_norm_arr( inRe_fx[ch][k], nBins ), L_norm_arr( inIm_fx[ch][k], nBins ) );
+ shift = s_min( norm, shift );
+ }
+ }
+
+ /* Perform the processing in frequency bands */
+ FOR( band_idx = 0; band_idx < max_band; band_idx++ )
+ {
+ ratioAccOrig = 0;
+ move32();
+ ratioAccNew = 0;
+ move32();
+ ismRatioAcc = 0;
+ move32();
+
+ set32_fx( eneMove, 0, 2 );
+ set32_fx( enePreserve, 0, 2 );
+ set32_fx( subframeEneCh, 0, 2 );
+ set32_fx( normEnes, 0, 2 );
+ set32_fx( ismTargetEneThisCh, 0, 2 );
+ set32_fx( totalTargetEneCh, 0, 2 );
+ set32_fx( masaTargetEneThisCh, 0, 2 );
+ set32_fx( ismPreprocMtxNew[0], 0, 2 );
+ set32_fx( ismPreprocMtxNew[1], 0, 2 );
+ set16_fx( ismPreprocMtxNew_e[0], 0, 2 );
+ set16_fx( ismPreprocMtxNew_e[1], 0, 2 );
+ set32_fx( ismPreprocMtxIncrement[0], 0, 2 );
+ set32_fx( ismPreprocMtxIncrement[1], 0, 2 );
+ set16_fx( ismPreprocMtxIncrement_e[1], 0, 2 );
+ set16_fx( ismPreprocMtxIncrement_e[1], 0, 2 );
+
+ IF( masaIsmMode )
+ {
+ bin_lo = MASA_band_grouping_24[band_idx];
+ move16();
+ bin_hi = s_min( MASA_band_grouping_24[band_idx + 1], nBins );
+ move16();
+ }
+ ELSE
+ {
+ bin_lo = hParamIsmDec->hParamIsm->band_grouping[band_idx];
+ move16();
+ bin_hi = s_min( hParamIsmDec->hParamIsm->band_grouping[band_idx + 1], nBins );
+ move16();
+ }
+
+ exp = sub( 63, shl( *cldfb_buf_q, 1 ) );
+ Word16 guardBits = 5;
+ move16();
- /* For each ismDir, formulate a mix-matrix that moves object audio signals between
- * left and right channels when needed. Make a combined matrix by a ratio-weighted sum */
- FOR( ismDirIndex = 0; ismDirIndex < hSpatParamRendCom->numIsmDirections; ismDirIndex++ )
+ /* Determine transport normalized energies and subframe energy */
+ FOR( ch = 0; ch < 2; ch++ )
{
- Word16 panGainsOut_fx[2];
- Word16 panGainsIn_fx[2];
- Word16 ratio;
- Word16 panEnesOut_fx[2];
- Word16 panEnesIn_fx[2];
- Word16 centeringFactor_fx;
+ FOR( slot = 0; slot < nSlots; slot++ )
+ {
+ FOR( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+
+ Word32 instEne_fx;
+ temp64 = W_mult0_32_32( inRe_fx[ch][slot][bin], inRe_fx[ch][slot][bin] ); // 2q
+ temp64 = W_add( temp64, W_mult0_32_32( inIm_fx[ch][slot][bin], inIm_fx[ch][slot][bin] ) ); // 2q
+ exp1 = W_norm( temp64 );
+ instEne_fx = W_extract_h( W_shl( temp64, exp1 ) ); // 2*cldfb_buf_q - 32 + exp1
+ /* exp of instEne_fx = 31 - (2q -32 + exp1) = 63 - 2q - exp1 = exp - exp1*/
- ratio = extract_l( hMasaIsmData->energy_ratio_ism_fx[ismDirIndex][dirac_read_idx][bin] ); // Q14
- ismRatioAcc_fx = add( ismRatioAcc_fx, ratio );
+ subframeEneCh[ch] = BASOP_Util_Add_Mant32Exp( subframeEneCh[ch], subframeEneCh_e[ch], instEne_fx, sub( exp, exp1 ), &subframeEneCh_e[ch] );
+ subframeEneCh_Q[ch] = 31 - subframeEneCh_e[ch];
+ move32();
+ move32();
+ }
+ }
+ }
- /* Get input and output panning gains */
- ivas_get_stereo_panning_gains_fx( hMasaIsmData->azimuth_ism[ismDirIndex][dirac_read_idx],
- hMasaIsmData->elevation_ism[ismDirIndex][dirac_read_idx],
- panGainsIn_fx );
+ // Align subframeEneCh Q values, shift 1 bit right to avoid overflow from sum
+ IF( EQ_32( subframeEneCh_Q[0], subframeEneCh_Q[1] ) )
+ {
+ subframeEneCh[0] = L_shr( subframeEneCh[0], 1 );
+ subframeEneCh[1] = L_shr( subframeEneCh[1], 1 );
+ subframeEne = L_add( subframeEneCh[0], subframeEneCh[1] ); // subQ
+ subframeEneCh_Q[1] = sub( subframeEneCh_Q[1], 1 );
+ subframeEneCh_Q[0] = sub( subframeEneCh_Q[0], 1 );
+ subQ = subframeEneCh_Q[0];
- IF( hMasaIsmData->ism_is_edited[ismDirIndex] )
+ move16();
+ move16();
+ move16();
+ move16();
+ move16();
+ }
+ ELSE
+ {
+ IF( GT_32( subframeEneCh_Q[0], subframeEneCh_Q[1] ) )
{
- ivas_get_stereo_panning_gains_fx( hMasaIsmData->azimuth_ism_edited[ismDirIndex],
- hMasaIsmData->elevation_ism_edited[ismDirIndex],
- panGainsOut_fx );
+ temp1 = sub( subframeEneCh_Q[0], subframeEneCh_Q[1] );
+ subframeEneCh[0] = L_shr( subframeEneCh[0], temp1 );
+ subframeEneCh[0] = L_shr( subframeEneCh[0], 1 );
+ subframeEneCh[1] = L_shr( subframeEneCh[1], 1 );
+ subframeEne = L_add( subframeEneCh[0], subframeEneCh[1] ); // subQ
+ subframeEneCh_Q[0] = sub( subframeEneCh_Q[1], 1 );
+ subframeEneCh_Q[1] = sub( subframeEneCh_Q[1], 1 );
+ subQ = subframeEneCh_Q[1];
+
+ move16();
+ move16();
+ move16();
+ move16();
+ move16();
+ move16();
+ }
+ ELSE
+ {
+ temp1 = sub( subframeEneCh_Q[1], subframeEneCh_Q[0] );
+ subframeEneCh[1] = L_shr( subframeEneCh[1], temp1 );
+ subframeEneCh[0] = L_shr( subframeEneCh[0], 1 );
+ subframeEneCh[1] = L_shr( subframeEneCh[1], 1 );
+
+ subframeEne = L_add( subframeEneCh[0], subframeEneCh[1] );
+ subframeEneCh_Q[1] = sub( subframeEneCh_Q[0], 1 );
+ subframeEneCh_Q[0] = sub( subframeEneCh_Q[0], 1 );
+ subQ = subframeEneCh_Q[0];
+
+ move16();
+ move16();
+ move16();
+ move16();
+ move16();
+ move16();
+ }
+ }
+
+ /* Shift subframeEnes right by the number of guard bits to avoid overflow */
+ subframeEne = L_shr( subframeEne, guardBits );
+ subframeEneCh[0] = L_shr( subframeEneCh[0], guardBits );
+ subframeEneCh[1] = L_shr( subframeEneCh[1], guardBits );
+
+ subQ = sub( subQ, guardBits );
+ subframeEneCh_Q[0] = sub( subframeEneCh_Q[0], guardBits );
+ subframeEneCh_Q[1] = sub( subframeEneCh_Q[1], guardBits );
+
+ move16();
+ move16();
+ move16();
+ move16();
+
+#ifdef FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES
+ totalTargetEneCh[0] = subframeEneCh[0]; // subQch[0]
+ move32();
+ totalTargetEneCh[1] = subframeEneCh[1]; // subQch[1]
+ move32();
+ masaEneThisCh[0] = subframeEneCh[0]; // subQch[0]
+ move32();
+ masaEneThisCh[1] = subframeEneCh[1]; // subQch[1]
+ move32();
+#else
+ /* Zero check */
+ IF( GT_32( subframeEne, 0 ) )
+ {
+ totalTargetEneCh[0] = subframeEneCh[0]; // subQch[0]
+ move32();
+ totalTargetEneCh[1] = subframeEneCh[1]; // subQch[1]
+ move32();
+ masaEneThisCh[0] = subframeEneCh[0]; // subQch[0]
+ move32();
+ masaEneThisCh[1] = subframeEneCh[1]; // subQch[1]
+ move32();
+ }
+#endif
+
+ /* Gain editing */
+ /* For each object, estimate new target energy per channel based on the applied gain */
+ FOR( ismDirIndex = 0; ismDirIndex < n_ism; ismDirIndex++ )
+ {
+ ratio = hMasaIsmData->energy_ratio_ism_fx[ismDirIndex][dirac_read_idx][bin_lo]; // Q30
+ move32();
+
+ ratioAccOrig = L_add( ratioAccOrig, ratio ); // Q30
+
+ /* Calculate MASA energy as a residual of original channel energies subtracted with ISM energies */
+ FOR( ch = 0; ch < 2; ch++ )
+ {
+ temp = Mpy_32_32( ratio, subframeEne ); // Q = 30 + subEneQ - 31 = subEneQ-1
+ temp = Mpy_32_16_1( temp, panEnesIn[ismDirIndex][ch] ); // Q = subEneQ-1
+
+ temp_q = sub( subframeEneCh_Q[ch], sub( subQ, 1 ) );
+ masaEneThisCh[ch] = L_sub( masaEneThisCh[ch], L_shl( temp, temp_q ) ); // Q = subframeEneCh_Q
+ move32();
+ }
+
+ /* Calculate target energy, gained ratio for accumulation, and transports gains, if ism gain is edited */
+ IF( ismGainEdited[ismDirIndex] )
+ {
+ gainIsmThis = hMasaIsmData->gain_ism_edited_fx[ismDirIndex]; // Q12
+ move16();
+
+ /* ISM original energy */
+ ismEneThis = Mpy_32_32( ratio, subframeEne ); // Q = 30 + subEneQ - 31 = subQ-1
+ move32();
+
+ /* ISM target energy */
+ temp1 = shl_sat( mult( gainIsmThis, gainIsmThis ), 2 ); // Q = 12 + 12 - 15 + 2 = 11
+ ismTargetEneThis = Mpy_32_16_1( ismEneThis, temp1 ); // Q = (subQ-1) + 11 - 15 = subQ-5
+ move32();
+
+ ratio = L_shl( Mpy_32_16_1( ratio, temp1 ), 1 ); // Q = 30 + 11 - 15 + 1 = 27
+ move32();
+
+
+ /* Determine panning energies and channel target energies */
+ FOR( ch = 0; ch < 2; ch++ )
+ {
+ /* Ism target energy per channel */
+ ismTargetEneThisCh[ch] = Mpy_32_16_1( ismTargetEneThis, panEnesIn[ismDirIndex][ch] ); // Q = subQ-5 + 15 + 1 - 16 = subQ-5
+ move32();
+
+ /* Reduce original ism energy */
+ temp = Mpy_32_16_1( ismEneThis, panEnesIn[ismDirIndex][ch] ); // subEneQ-1 + 15 + 1 - 16 = subQ-1
+ totalTargetEneCh[ch] = L_sub( totalTargetEneCh[ch], L_shl( temp, 1 ) ); // subEneQ
+ move32();
+
+ /* Add ism target energy per channel */
+ totalTargetEneCh[ch] = L_add( totalTargetEneCh[ch], L_shl( ismTargetEneThisCh[ch], 5 ) ); // SubQ
+ move32();
+ }
+
+
+ /* If separated ism edited, apply gain directly to the separated ism */
+ IF( EQ_16( ismDirIndex, hMasaIsmData->idx_separated_ism ) )
+ {
+ /* Separated object gaining is done elsewhere with DIRAC renderer */
+ IF( NE_32( st_ivas->renderer_type, RENDERER_DIRAC ) )
+ {
+ /* Gain transport channel of separated ism */
+ FOR( slot = 0; slot < nSlots; slot++ )
+ {
+ FOR( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ temp = Mpy_32_16_1( inRe_fx[2][slot][bin], gainIsmThis ); // Q = *cldfb_buf_q + 12 + 1 - 16 = *cldfb_buf_q - 3
+ inRe_fx[2][slot][bin] = L_shl( temp, Q3 );
+ move32();
+
+ temp = Mpy_32_16_1( inIm_fx[2][slot][bin], gainIsmThis ); // Q = *cldfb_buf_q + 12 + 1 - 16 = *cldfb_buf_q - 3
+ inIm_fx[2][slot][bin] = L_shl( temp, Q3 );
+ move32();
+ }
+ }
+ }
+ }
+ ratioAccNew = L_add( ratioAccNew, ratio ); // Q27
+ move32();
}
ELSE
{
- /* When not edited, input and output pan gains are the same */
+ ratioAccNew = L_add( ratioAccNew, L_shr( ratio, 3 ) ); // Q27
+ move32();
+ }
+ }
+
+ IF( masaIsmMode )
+ {
+ /* MASA original ratios */
+ ratio = L_add( hSpatParamRendCom->energy_ratio1_fx[dirac_read_idx][bin_lo], hSpatParamRendCom->energy_ratio2_fx[dirac_read_idx][bin_lo] ); // Q30
+ move32();
+ ratioAccOrig = L_add( ratioAccOrig, ratio ); // Q30
+ move32();
+
+ /* Estimate MASA original energies and determine adjusted target energies and gained ratio for accumulation, if a gain is applied to MASA */
+ IF( masaGainEdited )
+ {
+ /* Gained MASA ratio */
+ ratio = L_shl( Mpy_32_16_1( ratio, gainMasaPow2 ), 3 ); // Q = 30 + 9 - 15 + 3 = 27
+ move32();
+
+
+ /* Calculate MASA target energies and add to total target energy estimation */
FOR( ch = 0; ch < 2; ch++ )
{
- panGainsOut_fx[ch] = panGainsIn_fx[ch];
+ /* MASA original energy per channel */
+ masaEneThisCh[ch] = L_max( masaEneThisCh[ch], 0 ); // Q5
+ move32();
+
+ /* MASA target energy per channel */
+ temp = Mpy_32_16_1( masaEneThisCh[ch], shl( gainMasaPow2, 2 ) ); // Q = SubQ + 11 + 1 - 16 = SubQ-4
+ masaTargetEneThisCh[ch] = L_shl( temp, 4 ); // SubQ
+ move32();
+
+ /* Reduce original energy per channel */
+ totalTargetEneCh[ch] = L_sub( totalTargetEneCh[ch], masaEneThisCh[ch] ); // SubQ
+ move32();
+
+ /* Add target energy per channel */
+ totalTargetEneCh[ch] = L_add( totalTargetEneCh[ch], masaTargetEneThisCh[ch] ); // SubQ
+ move32();
+ }
+ ratioAccNew = L_add( ratioAccNew, ratio ); // Q27
+ }
+ ELSE
+ {
+ ratioAccNew = L_add( ratioAccNew, L_shr( ratio, 3 ) ); // Q27
+ }
+ }
+
+
+#ifdef NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES
+ /* Limit target energies to non-negative values */
+ FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
+ {
+ totalTargetEneCh[ch] = L_max( 0, totalTargetEneCh[ch] );
+ }
+#endif
+
+ /* due to rounding, the sum may exceed 1.0f ever so slightly, so clip it */
+ ratioAccOrig = L_min( ratioAccOrig, ONE_IN_Q30 );
+ move32();
+ IF( masaGainEdited )
+ {
+ temp = Mpy_32_16_1( L_sub( ONE_IN_Q30, ratioAccOrig ), gainMasaPow2 ); // Q = 30 + 9 + 1 - 16 = 24
+ ratioAccNew = L_add_sat( ratioAccNew, L_shl_sat( temp, 3 ) ); // Q27
+ move32();
+ }
+ ELSE
+ {
+ ratioAccNew = L_add( ratioAccNew, L_shr( L_sub( ONE_IN_Q30, ratioAccOrig ), 3 ) ); // Q27
+ move32();
+ }
+
+ /* New target total energy ratio divider */
+ IF( ratioAccNew > 0 )
+ {
+ ratioAccNewDivisor = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q27, ratioAccNew, &temp_q );
+ ratioAccNewDivisor = L_shl_sat( ratioAccNewDivisor, sub( temp_q, 4 ) ); // Q27, saturate to 16 in Q27
+
+ /* Determine and process object energy ratios based on gaining */
+ FOR( ismDirIndex = 0; ismDirIndex < n_ism; ismDirIndex++ )
+ {
+ newRatios[ismDirIndex + 2] = hMasaIsmData->energy_ratio_ism_fx[ismDirIndex][dirac_read_idx][bin_lo]; // Q30
+ move32();
+
+ IF( ismGainEdited[ismDirIndex] )
+ {
+ gainIsmThis = hMasaIsmData->gain_ism_edited_fx[ismDirIndex];
move16();
+
+ /* Gain original object energy ratio, if edited */
+ temp1 = mult( gainIsmThis, gainIsmThis ); // Q = 12 + 12 - 15 = 9
+ newRatios[ismDirIndex + 2] = Mpy_32_16_1( newRatios[ismDirIndex + 2], temp1 ); // Q = 30 + 9 + 1 - 16 = 24
+ move32();
+ }
+ ELSE
+ {
+ newRatios[ismDirIndex + 2] = L_shr( newRatios[ismDirIndex + 2], 6 );
+ move32();
}
+ /* Divide with new target total ratio */
+ newRatios[ismDirIndex + 2] = Mpy_32_32( newRatios[ismDirIndex + 2], ratioAccNewDivisor ); // Q = 24 + 27 - 31 = 20
+ move32();
}
- /* Determine pan enes */
- FOR( ch = 0; ch < 2; ch++ )
+ /* Determine and process MASA energy ratios based on gaining */
+ newRatios[0] = hSpatParamRendCom->energy_ratio1_fx[dirac_read_idx][bin_lo]; // Q30
+ newRatios[1] = hSpatParamRendCom->energy_ratio2_fx[dirac_read_idx][bin_lo]; // Q30
+ move32();
+ move32();
+
+ IF( masaGainEdited )
{
- panEnesOut_fx[ch] = mult( panGainsOut_fx[ch], panGainsOut_fx[ch] ); // Q15
- move16();
- panEnesIn_fx[ch] = mult( panGainsIn_fx[ch], panGainsIn_fx[ch] ); // Q15
- move16();
+ newRatios[0] = Mpy_32_16_1( newRatios[0], gainMasaPow2 ); // Q = 30 + 9 + 1 - 16 = 24
+ newRatios[1] = Mpy_32_16_1( newRatios[1], gainMasaPow2 ); // Q = 30 + 9 + 1 - 16 = 24
+ move32();
+ move32();
+ }
+ ELSE
+ {
+ newRatios[0] = L_shr( newRatios[0], 6 ); // Q = 30 + 9 + 1 - 16 = 24
+ newRatios[1] = L_shr( newRatios[0], 6 );
+ move32();
+ move32();
+ }
+ newRatios[0] = Mpy_32_32( newRatios[0], ratioAccNewDivisor ); // Q = 24 + 27 - 31 = 20
+ newRatios[1] = Mpy_32_32( newRatios[1], ratioAccNewDivisor ); // Q = 24 + 27 - 31 = 20
+ move32();
+ move32();
+
+ /* Set adjusted energy ratios */
+ FOR( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ FOR( ismDirIndex = 0; ismDirIndex < n_ism; ismDirIndex++ )
+ {
+ hMasaIsmData->energy_ratio_ism_fx[ismDirIndex][dirac_read_idx][bin] = L_shl( newRatios[ismDirIndex + 2], 10 ); // Q30
+ move32();
+ }
+
+ IF( masaIsmMode )
+ {
+ hSpatParamRendCom->energy_ratio1_fx[dirac_read_idx][bin] = L_shl( newRatios[0], 10 );
+ hSpatParamRendCom->energy_ratio2_fx[dirac_read_idx][bin] = L_shl( newRatios[1], 10 );
+ move32();
+ move32();
+ }
}
+ }
+
+ /* Direction editing */
+ /* Determine new energetic values after gaining */
+ totalTargetEne = L_add( totalTargetEneCh[0], totalTargetEneCh[1] ); // SubQ
+
+ IF( GT_32( totalTargetEne, 0 ) )
+ {
+ tempDivisor = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q28, max( EPSILON_FX, totalTargetEne ), &temp_q );
+
+ temp_q = sub( sub( Q31, temp_q ), sub( sub( Q31, Q28 ), sub( Q31, subQ ) ) );
+
+ normEnes[0] = Mpy_32_32( totalTargetEneCh[0], tempDivisor ); // Q = 25
+ normEnes[1] = Mpy_32_32( totalTargetEneCh[1], tempDivisor ); // Q = 25
+ temp_q = sub( add( subQ, temp_q ), Q31 );
+ normEnes[0] = L_shl( normEnes[0], sub( Q25, temp_q ) );
+ normEnes[1] = L_shl( normEnes[1], sub( Q25, temp_q ) );
+ move32();
+ move32();
+ move32();
+ move32();
+ }
+ ELSE
+ {
+ normEnes[0] = 0;
+ normEnes[1] = 0;
+ move32();
+ move32();
+ }
+
+ /* For each ismDir, determine moved and preserve energy ratio per channel */
+ FOR( ismDirIndex = 0; ismDirIndex < n_ism; ismDirIndex++ )
+ {
+ ratio = hMasaIsmData->energy_ratio_ism_fx[ismDirIndex][dirac_read_idx][bin_lo]; // Q30
+ move32();
+
+ ismRatioAcc = L_add( ismRatioAcc, ratio ); // Q30
IF( enableCentering )
{
- centeringFactor_fx = s_max( 0, sub( mult( shl( 2, 13 ), abs_s( sub( panEnesIn_fx[0], panEnesOut_fx[0] ) ) ), ONE_IN_Q13 ) ); // Q13
+ temp1 = abs_s( sub( panEnesIn[ismDirIndex][0], panEnesOut[ismDirIndex][0] ) ); // 2*sub(enes) -> Q14
+ centeringFactor = max( 0, sub( temp1, ONE_IN_Q14 ) ); // Q14
+
FOR( ch = 0; ch < 2; ch++ )
{
- panEnesOut_fx[ch] = mult( panEnesOut_fx[ch], sub( ONE_IN_Q13, centeringFactor_fx ) ); // Q13
+ temp1 = sub( ONE_IN_Q14, centeringFactor );
+ panEnesOut[ismDirIndex][ch] = mult( panEnesOut[ismDirIndex][ch], temp1 ); // Q = 15 + 14 - 15 = 14
+ move16();
+
+ temp1 = shr( centeringFactor, 1 ); // * 0.5f = Divide by 2
+ panEnesOut[ismDirIndex][ch] = add( panEnesOut[ismDirIndex][ch], temp1 ); // Q14
+ panEnesOut[ismDirIndex][ch] = shl( panEnesOut[ismDirIndex][ch], 1 ); // Q15
move16();
- panEnesOut_fx[ch] = add( panEnesOut_fx[ch], shr( centeringFactor_fx, 1 ) ); // Q13
move16();
}
}
FOR( ch = 0; ch < 2; ch++ )
{
- Word16 eneMoveThis_fx;
- Word16 enePreserveThis_fx;
-
- eneMoveThis_fx = s_max( 0, sub( shr( panEnesIn_fx[ch], 2 ), panEnesOut_fx[ch] ) ); // Q13
- enePreserveThis_fx = sub( shr( panEnesIn_fx[ch], 2 ), eneMoveThis_fx ); // Q13
-
- eneMove_fx[ch] = mult( ratio, eneMoveThis_fx ); // Q = 14 + 13 - 15 = 12
+ eneMoveThis = s_max( 0, sub( panEnesIn[ismDirIndex][ch], panEnesOut[ismDirIndex][ch] ) ); // Q15
move16();
- enePreserve_fx[ch] = mult( ratio, enePreserveThis_fx ); // Q = 14 + 13 - 15 = 12
+
+ enePreserveThis = sub( panEnesIn[ismDirIndex][ch], eneMoveThis ); // Q15
move16();
+ temp = Mpy_32_16_1( ratio, eneMoveThis ); // Q = 30 + 15 + 1 - 16 = 30
+ eneMove[ch] = L_add( eneMove[ch], temp ); // Q30
+ move32();
+
+ temp = Mpy_32_16_1( ratio, enePreserveThis ); // Q = 30 + 15 + 1 - 16 = 30
+ enePreserve[ch] = L_add( enePreserve[ch], temp ); // 30
+ move32();
+
/* Subtract object parts from normEnes */
- normEnes_fx[ch] = sub( normEnes_fx[ch], shr( mult( panEnesIn_fx[ch], ratio ), 2 ) ); // Q12
- move16();
+ temp = Mpy_32_16_1( L_shr( ratio, 5 ), panEnesIn[ismDirIndex][ch] ); // Q = 25 + 15 + 1 = 16 = 25;
+ normEnes[ch] = L_sub( normEnes[ch], temp ); // Q25
+ move32();
}
}
/* Any remaining (non-object) energy is set to be preserved at both channels */
- remainderNormEne_fx = s_max( 0, sub( sub( shr( sub( ONE_IN_Q14, ismRatioAcc_fx ), Q14 - Q12 ), normEnes_fx[0] ), normEnes_fx[1] ) ); // Q12
+ temp = L_sub( ONE_IN_Q25, L_shr( ismRatioAcc, 5 ) );
+ temp = L_sub( temp, normEnes[0] );
+ temp = L_sub( temp, normEnes[1] );
+ remainderNormEne = L_max( 0, temp ); // Q25
+ /* Normalize */
FOR( ch = 0; ch < 2; ch++ )
{
- enePreserve_fx[ch] = add( enePreserve_fx[ch], s_max( 0, add( enePreserve_fx[ch], shr( remainderNormEne_fx, 1 ) ) ) ); // Q12
- move16();
+ temp = L_shr( remainderNormEne, 1 ); // Division by 2, Q25
+ temp = L_add( normEnes[ch], temp ); // Q25
+ enePreserve[ch] = L_add( L_shr( enePreserve[ch], 5 ), L_max( 0, temp ) ); // Q25
+
+ temp = L_add( L_shr( eneMove[ch], 5 ), enePreserve[ch] ); // Q25
+ temp = L_max( EPSILON_FX, temp );
+ normVal = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q25, temp, &temp_q );
+ normVal = L_shl_sat( normVal, sub( temp_q, 6 ) ); // Q25
+
+ temp = L_max( EPSILON_FX, subframeEneCh[ch] ); // SubQ
+ temp = BASOP_Util_Divide3232_Scale_newton( totalTargetEneCh[ch], temp, &temp_q );
+ temp = L_shl_sat( temp, sub( temp_q, 6 ) ); // Q25
+ normVal = Mpy_32_32( normVal, L_min( 335544320, temp ) ); // Q = 25 + 25 + 1 - 32 = 19
+
+ eneMove[ch] = Mpy_32_32( eneMove[ch], normVal ); // Q = 30 + 19 + 1 - 32 = 18
+ move32();
+
+ enePreserve[ch] = Mpy_32_32( L_shl_sat( enePreserve[ch], 5 ), normVal ); // Q = 30 + 19 + 1 - 32 = 18
+ move32();
+
+ enePreserve[ch] = L_shl_sat( enePreserve[ch], 8 ); // Q26
+ eneMove[ch] = L_shl_sat( eneMove[ch], 8 ); // Q26
+ move32();
+ move32();
}
- /* Temporally average energy moving and preserving, and generate the transport signal preprocessing matrix */
+ /* Temporally average target energy */
+ hMasaIsmData->eneOrigIIR_fx[band_idx] = Mpy_32_16_1( hMasaIsmData->eneOrigIIR_fx[band_idx], STEREO_PREPROCESS_IIR_FACTOR_Q15 ); // Q = origIIR_Q + 15 + 1 - 16 = origIIR_Q
+ hMasaIsmData->eneOrigIIR_fx[band_idx] = BASOP_Util_Add_Mant32Exp( hMasaIsmData->eneOrigIIR_fx[band_idx], hMasaIsmData->eneOrigIIR_e[band_idx], totalTargetEne, sub( Q31, subQ ), &hMasaIsmData->eneOrigIIR_e[band_idx] );
+ move32();
+ move32();
+
+ /* Temporally average energy moving and preserving, and generate the transport signal preprocessing matrix for
+ * gaining objects and moving objects between left and right */
FOR( ch = 0; ch < 2; ch++ )
{
- Word32 normVal_fx;
- hMasaIsmData->eneMoveIIR_fx[ch][bin] = Mpy_32_16_1( hMasaIsmData->eneMoveIIR_fx[ch][bin], STEREO_PREPROCESS_IIR_FACTOR_Q15 );
+ hMasaIsmData->eneMoveIIR_fx[ch][band_idx] = Mpy_32_16_1( hMasaIsmData->eneMoveIIR_fx[ch][band_idx], STEREO_PREPROCESS_IIR_FACTOR_Q15 ); // Q = Enemove_Q + 15 + 1 -16 = Enemove_Q
+ move32();
+
+ temp = Mpy_32_32( totalTargetEne, eneMove[ch] ); // Q = SubQ + 26 + 1 - 32 = SubQ-5
+ shift = norm_l( temp );
+ temp = L_shl( temp, shift ); // Q = subQ-5+shift
+ hMasaIsmData->eneMoveIIR_fx[ch][band_idx] = BASOP_Util_Add_Mant32Exp( hMasaIsmData->eneMoveIIR_fx[ch][band_idx], hMasaIsmData->eneMoveIIR_e[ch][band_idx], temp, sub( Q31, add( sub( subQ, 5 ), shift ) ), &hMasaIsmData->eneMoveIIR_e[ch][band_idx] );
move32();
- temp = Mpy_32_16_1( subframeEne_fx, eneMove_fx[ch] );
- hMasaIsmData->eneMoveIIR_fx[ch][bin] = L_add( hMasaIsmData->eneMoveIIR_fx[ch][bin], temp ); // Q = *cldfb_buf_q + *cldfb_buf_q - 34 = Q-22
+
+ hMasaIsmData->enePreserveIIR_fx[ch][band_idx] = Mpy_32_16_1( hMasaIsmData->enePreserveIIR_fx[ch][band_idx], STEREO_PREPROCESS_IIR_FACTOR_Q15 ); // Q = enePreserve_Q + 15 + 1 - 16 = enePreserve_Q = 31- enePreserve_e
+ move32();
+
+ temp = Mpy_32_32( totalTargetEne, enePreserve[ch] ); // Q = subQ + 26 + 1 - 32 = subQ-5
+ shift = norm_l( temp );
+ temp = L_shl( temp, shift ); // Q = subQ-5+shift
+ hMasaIsmData->enePreserveIIR_fx[ch][band_idx] = BASOP_Util_Add_Mant32Exp( hMasaIsmData->enePreserveIIR_fx[ch][band_idx], hMasaIsmData->enePreserveIIR_e[ch][band_idx], temp, sub( Q31, add( sub( subQ, 5 ), shift ) ), &hMasaIsmData->enePreserveIIR_e[ch][band_idx] );
move32();
- hMasaIsmData->enePreserveIIR_fx[ch][bin] = Mpy_32_16_1( hMasaIsmData->enePreserveIIR_fx[ch][bin], STEREO_PREPROCESS_IIR_FACTOR_Q15 );
+ temp_q = norm_l( hMasaIsmData->enePreserveIIR_fx[ch][band_idx] );
+ hMasaIsmData->enePreserveIIR_fx[ch][band_idx] = L_shl( hMasaIsmData->enePreserveIIR_fx[ch][band_idx], temp_q );
+ hMasaIsmData->enePreserveIIR_e[ch][band_idx] = sub( hMasaIsmData->enePreserveIIR_e[ch][band_idx], temp_q );
move32();
- temp = Mpy_32_16_1( subframeEne_fx, enePreserve_fx[ch] );
- hMasaIsmData->enePreserveIIR_fx[ch][bin] = L_add( hMasaIsmData->enePreserveIIR_fx[ch][bin], temp ); // Q = *cldfb_buf_q + *cldfb_buf_q - 34 = Q-22
move32();
- normVal_fx = L_add( hMasaIsmData->eneMoveIIR_fx[ch][bin], hMasaIsmData->enePreserveIIR_fx[ch][bin] );
- IF( normVal_fx != 0 )
+ IF( GT_32( hMasaIsmData->enePreserveIIR_fx[ch][band_idx], 0 ) )
+ {
+ temp = BASOP_Util_Divide3232_Scale_newton( hMasaIsmData->enePreserveIIR_fx[ch][band_idx], L_max( 1, hMasaIsmData->eneOrigIIR_fx[band_idx] ), &temp_q );
+ temp_q = sub( Q31, sub( sub( Q31, temp_q ), sub( hMasaIsmData->enePreserveIIR_e[ch][band_idx], hMasaIsmData->eneOrigIIR_e[band_idx] ) ) );
+ temp = Sqrt32( temp, &temp_q ); // Q = 31-temp_q
+ temp = L_shl_sat( temp, sub( temp_q, 3 ) ); // Q28
+ }
+ ELSE
{
+ temp = 0;
+ move32();
+ }
- temp1 = BASOP_Util_Divide3232_Scale( hMasaIsmData->enePreserveIIR_fx[ch][bin], normVal_fx, &temp_q );
- ismPreprocMtxNew_fx[ch][ch] = Sqrt16( temp1, &temp_q );
- move16();
- ismPreprocMtxNew_fx[ch][ch] = shl( ismPreprocMtxNew_fx[ch][ch], temp_q ); // Q15
- move16();
- temp1 = BASOP_Util_Divide3232_Scale( hMasaIsmData->eneMoveIIR_fx[ch][bin], normVal_fx, &temp_q );
- ismPreprocMtxNew_fx[sub( 1, ch )][ch] = Sqrt16( temp1, &temp_q );
- move16();
- ismPreprocMtxNew_fx[sub( 1, ch )][ch] = shl( ismPreprocMtxNew_fx[sub( 1, ch )][ch], temp_q ); // Q15
- move16();
+ IF( GT_32( ONE_IN_Q30, temp ) )
+ {
+ ismPreprocMtxNew[ch][ch] = temp;
+ move32();
}
ELSE
{
- ismPreprocMtxNew_fx[ch][ch] = 0;
- move16();
- ismPreprocMtxNew_fx[sub( 1, ch )][ch] = 0;
- move16();
+ ismPreprocMtxNew[ch][ch] = ONE_IN_Q30; // 4 in Q28
+ move32();
+ }
+
+ ismPreprocMtxNew_e[ch][ch] = Q28;
+ move32();
+
+ temp_q = norm_l( hMasaIsmData->eneMoveIIR_fx[ch][band_idx] );
+ hMasaIsmData->eneMoveIIR_fx[ch][band_idx] = L_shl( hMasaIsmData->eneMoveIIR_fx[ch][band_idx], temp_q );
+ hMasaIsmData->eneMoveIIR_e[ch][band_idx] = sub( hMasaIsmData->eneMoveIIR_e[ch][band_idx], temp_q );
+ move32();
+ move16();
+
+ IF( GT_32( hMasaIsmData->eneMoveIIR_fx[ch][band_idx], 0 ) )
+ {
+ temp = BASOP_Util_Divide3232_Scale_newton( hMasaIsmData->eneMoveIIR_fx[ch][band_idx], L_max( 1, hMasaIsmData->eneOrigIIR_fx[band_idx] ), &temp_q );
+ temp_q = sub( Q31, sub( sub( Q31, temp_q ), sub( hMasaIsmData->eneMoveIIR_e[ch][band_idx], hMasaIsmData->eneOrigIIR_e[band_idx] ) ) );
+ temp = Sqrt32( temp, &temp_q );
+ temp = L_shl_sat( temp, sub( temp_q, 3 ) ); // Q28
+ }
+ ELSE
+ {
+ temp = 0;
+ move32();
+ }
+
+ IF( GT_32( ONE_IN_Q30, temp ) )
+ {
+ ismPreprocMtxNew[1 - ch][ch] = temp;
+ move32();
+ }
+ ELSE
+ {
+ ismPreprocMtxNew[1 - ch][ch] = ONE_IN_Q30; // 4 in Q28
+ move32();
}
+ ismPreprocMtxNew_e[1 - ch][ch] = Q28; // This may be removed
+ move32();
}
/* Get increment value for temporal interpolation */
FOR( inCh = 0; inCh < 2; inCh++ )
{
FOR( outCh = 0; outCh < 2; outCh++ )
- ismPreprocMtxIncrement_fx[outCh][inCh] = BASOP_Util_Divide1616_Scale( sub( ismPreprocMtxNew_fx[outCh][inCh], hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][bin] ), nSlots, &temp_q );
- move16();
- ismPreprocMtxIncrement_fx[outCh][inCh] = shl( ismPreprocMtxIncrement_fx[outCh][inCh], temp_q ); // Q15
- move16();
+ {
+ temp = L_sub( ismPreprocMtxNew[outCh][inCh], hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][band_idx] ); // Q28
+ ismPreprocMtxIncrement[outCh][inCh] = L_shr( temp, 2 ); // Divide by 4
+ move32();
+ }
}
- }
- /* Mix signals */
- FOR( slot = 0; slot < nSlots; slot++ )
- {
- Word16 eqVal_fx = 0;
- Word16 eqVal_q_fx = 0;
- move16();
- move16();
- Word32 outSlotRe_fx[2];
- Word32 outSlotIm_fx[2];
+ /* Mix signals */
+ hMasaIsmData->preprocEneTarget_fx[band_idx] = Mpy_32_16_1( hMasaIsmData->preprocEneTarget_fx[band_idx], STEREO_PREPROCESS_IIR_FACTOR_Q15 ); // Q = preprocEneTarget_e
+ move32();
+
+ hMasaIsmData->preprocEneRealized_fx[band_idx] = Mpy_32_16_1( hMasaIsmData->preprocEneRealized_fx[band_idx], STEREO_PREPROCESS_IIR_FACTOR_Q15 ); // Q = preprocEneRealized_e
+ move32();
- set_zero_fx( outSlotRe_fx, 2 );
- set_zero_fx( outSlotIm_fx, 2 );
+ hMasaIsmData->preprocEneTarget_fx[band_idx] = BASOP_Util_Add_Mant32Exp( hMasaIsmData->preprocEneTarget_fx[band_idx], hMasaIsmData->preprocEneTarget_e[band_idx], totalTargetEne, sub( Q31, subQ ), &hMasaIsmData->preprocEneTarget_e[band_idx] ); // Q = 31-preprocEneTarget_e
+ move32();
FOR( outCh = 0; outCh < 2; outCh++ )
{
- FOR( inCh = 0; inCh < 2; inCh++ )
+ FOR( slot = 0; slot < nSlots; slot++ )
{
- hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][bin] = add( hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][bin], ismPreprocMtxIncrement_fx[outCh][inCh] ); // Q = 15
- move16();
- outSlotRe_fx[outCh] = Mpy_32_16_1( inRe_fx[inCh][slot][bin], hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][bin] ); // Q = *cldfb_buf_q;
- move32();
- outSlotIm_fx[outCh] = Mpy_32_16_1( inIm_fx[inCh][slot][bin], hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][bin] ); // Q = *cldfb_buf_q;
- move32();
+ FOR( inCh = 0; inCh < 2; inCh++ )
+ {
+ hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][band_idx] = L_add( hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][band_idx], ismPreprocMtxIncrement[outCh][inCh] ); // Q28
+ move32();
+
+ FOR( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ temp = Mpy_32_32( inRe_fx[inCh][slot][bin], hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][band_idx] ); // Q = q_cldfb* + 28 - 31 = q_cldfb - 3
+ outSlotRe[outCh][slot][bin] = L_add( outSlotRe[outCh][slot][bin], L_shl( temp, 3 ) ); // Q = q_cldfb*
+ move32();
+
+ temp = Mpy_32_32( inIm_fx[inCh][slot][bin], hMasaIsmData->ismPreprocMatrix_fx[outCh][inCh][band_idx] ); // Q = q_cldfb* + 28 - 31 = q_cldfb*-3
+ outSlotIm[outCh][slot][bin] = L_add( outSlotIm[outCh][slot][bin], L_shl( temp, 3 ) ); // Q = q_cldfb*
+ move32();
+ }
+ }
+
+ FOR( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ Word32 instEne_fx;
+ temp64 = W_mult0_32_32( outSlotRe[outCh][slot][bin], outSlotRe[outCh][slot][bin] ); // 2q-3
+ temp64 = W_add( temp64, W_mult0_32_32( outSlotIm[outCh][slot][bin], outSlotIm[outCh][slot][bin] ) ); // 2q-3
+ exp1 = W_norm( temp64 );
+ instEne_fx = W_extract_h( W_shl( temp64, exp1 ) ); // 2*cldfb_buf_q - 32 + exp1
+ exp1 = 31 - ( 2 * ( *cldfb_buf_q ) - 32 + exp1 );
+
+ hMasaIsmData->preprocEneRealized_fx[band_idx] = BASOP_Util_Add_Mant32Exp( hMasaIsmData->preprocEneRealized_fx[band_idx], hMasaIsmData->preprocEneRealized_e[band_idx], instEne_fx, exp1, &hMasaIsmData->preprocEneRealized_e[band_idx] ); // Q= *cldfb_buf_q + *cldfb_buf_q - 31 = Q-19);
+ move32();
+ }
}
}
- /* IIR average the energy measures and determine and apply energy-preserving equalizer */
- hMasaIsmData->preprocEneTarget_fx[bin] = Mpy_32_16_1( hMasaIsmData->preprocEneTarget_fx[bin], STEREO_PREPROCESS_IIR_FACTOR_Q15 );
- move32();
- hMasaIsmData->preprocEneRealized_fx[bin] = Mpy_32_16_1( hMasaIsmData->preprocEneRealized_fx[bin], STEREO_PREPROCESS_IIR_FACTOR_Q15 );
- move32();
- FOR( ch = 0; ch < 2; ch++ )
+ test();
+ IF( hMasaIsmData->preprocEneTarget_fx[band_idx] > 0 && hMasaIsmData->preprocEneRealized_fx[band_idx] > 0 )
{
- hMasaIsmData->preprocEneTarget_fx[bin] = L_add( hMasaIsmData->preprocEneTarget_fx[bin], Madd_32_32( Mpy_32_32( inRe_fx[ch][slot][bin], inRe_fx[ch][slot][bin] ), inIm_fx[ch][slot][bin], inIm_fx[ch][slot][bin] ) ); // Q= *cldfb_buf_q + *cldfb_buf_q - 31 = Q-19
- move32();
- hMasaIsmData->preprocEneRealized_fx[bin] = L_add( hMasaIsmData->preprocEneRealized_fx[bin], Madd_32_32( Mpy_32_32( outSlotRe_fx[ch], outSlotRe_fx[ch] ), outSlotIm_fx[ch], outSlotIm_fx[ch] ) ); // Q= *cldfb_buf_q + *cldfb_buf_q - 31 = Q-19
+ temp = BASOP_Util_Divide3232_Scale_newton( hMasaIsmData->preprocEneTarget_fx[band_idx], L_max( 1, hMasaIsmData->preprocEneRealized_fx[band_idx] ), &temp_q );
+ temp_q = sub( Q31, sub( sub( Q31, temp_q ), sub( hMasaIsmData->preprocEneTarget_e[band_idx], hMasaIsmData->preprocEneRealized_e[band_idx] ) ) );
+ temp = Sqrt32( temp, &temp_q ); // Q: 31-temp_q
+ temp = L_shl( temp, sub( temp_q, 3 ) ); // Q28
+ temp_q = Q28;
+ move16();
+ }
+ ELSE
+ {
+ temp = 0;
move32();
}
- temp1 = BASOP_Util_Divide3232_Scale( hMasaIsmData->preprocEneTarget_fx[bin], L_max( EPSILON_FX, hMasaIsmData->preprocEneRealized_fx[bin] ), &eqVal_q_fx );
- eqVal_fx = Sqrt16( temp1, &eqVal_q_fx );
- temp1 = 4 << Q12; // Q12
- move16();
- IF( LT_16( eqVal_q_fx, Q12 ) )
+
+ IF( GT_32( ONE_IN_Q30, temp ) )
{
- IF( GT_16( eqVal_fx, shr( temp1, sub( Q12, eqVal_q_fx ) ) ) )
- {
- eqVal_fx = temp1;
- move16();
- eqVal_q_fx = Q12;
- move16();
- }
+ eqVal = temp;
+ move32();
}
ELSE
{
- if ( GT_16( shr( eqVal_fx, sub( eqVal_q_fx, Q12 ) ), temp1 ) )
+ eqVal = ONE_IN_Q30; // 4 in Q28
+ move32();
+ }
+
+ FOR( ch = 0; ch < 2; ch++ )
+ {
+ FOR( slot = 0; slot < nSlots; slot++ )
{
- eqVal_fx = temp1; // eqVal_q_fx
- move16();
+ FOR( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ temp = Mpy_32_32( outSlotRe[ch][slot][bin], eqVal ); // Q = (cldfb_q) + 28 -31 = cldfb_q - 3
+ inRe_fx[ch][slot][bin] = L_shl_sat( temp, 3 );
+ move32();
+
+ temp = Mpy_32_32( outSlotIm[ch][slot][bin], eqVal ); // Q = (cldfb_q) + 28 -31 = cldfb_q - 3
+ inIm_fx[ch][slot][bin] = L_shl_sat( temp, 3 );
+ move32();
+ }
}
}
+ }
- FOR( ch = 0; ch < 2; ch++ )
+ IF( !masaIsmMode )
+ {
+ Word16 obj_idx1, obj_idx2;
+
+ FOR( band_idx = 0; band_idx < hParamIsmDec->hParamIsm->nbands; band_idx++ )
{
- inRe_fx[ch][slot][bin] = Mpy_32_16_1( outSlotRe_fx[ch], eqVal_fx );
- move32();
- inIm_fx[ch][slot][bin] = Mpy_32_16_1( outSlotIm_fx[ch], eqVal_fx );
- move32();
+ bin_lo = hParamIsmDec->hParamIsm->band_grouping[band_idx];
+ bin_hi = hParamIsmDec->hParamIsm->band_grouping[band_idx + 1];
+ move16();
+ move16();
+
+ obj_idx1 = hParamIsmDec->hParamIsm->obj_indices[band_idx][0][0];
+ obj_idx2 = hParamIsmDec->hParamIsm->obj_indices[band_idx][0][1];
+ move16();
+ move16();
+
+ FOR( bin = bin_lo; bin < bin_hi; bin++ )
+ {
+ hSpatParamRendCom->energy_ratio1_fx[dirac_read_idx][bin] = hMasaIsmData->energy_ratio_ism_fx[obj_idx1][dirac_read_idx][bin];
+ hSpatParamRendCom->energy_ratio2_fx[dirac_read_idx][bin] = hMasaIsmData->energy_ratio_ism_fx[obj_idx2][dirac_read_idx][bin];
+ move32();
+ move32();
+ }
}
- *cldfb_buf_q = sub( add( *cldfb_buf_q, eqVal_q_fx ), 15 );
- move16();
}
}
return;
}
-
static void ivas_masa_ext_rend_parambin_internal_fx(
MASA_EXT_REND_HANDLE hMasaExtRend,
COMBINED_ORIENTATION_HANDLE hCombinedOrientationData,
@@ -5605,7 +6469,7 @@ static void ivas_masa_ext_rend_parambin_internal_fx(
Word16 i, j;
Word16 nchan_transport;
Word16 q_mat;
- int16_t pos_idx;
+ Word16 pos_idx;
const MULTI_BIN_REND_POSE_DATA *pMultiBinPoseData;
Word32 tmp_Cldfb_out_re[BINAURAL_CHANNELS][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
Word32 tmp_Cldfb_out_im[BINAURAL_CHANNELS][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];
@@ -5716,8 +6580,8 @@ static void ivas_masa_ext_rend_parambin_internal_fx(
{
/* At mono input duplicate the channel to dual-mono, and apply gain
correction to ensure same overall level as in stereo mode */
- v_multc_fixed( Cldfb_RealBuffer_in_fx[0][slot], 1518500224 /* INV_SQRT_2 in Q31 */, Cldfb_RealBuffer_in_fx[0][slot], nBins );
- v_multc_fixed( Cldfb_ImagBuffer_in_fx[0][slot], 1518500224 /* INV_SQRT_2 in Q31 */, Cldfb_ImagBuffer_in_fx[0][slot], nBins );
+ v_multc_fx( Cldfb_RealBuffer_in_fx[0][slot], 1518500224 /* INV_SQRT_2 in Q31 */, Cldfb_RealBuffer_in_fx[0][slot], nBins );
+ v_multc_fx( Cldfb_ImagBuffer_in_fx[0][slot], 1518500224 /* INV_SQRT_2 in Q31 */, Cldfb_ImagBuffer_in_fx[0][slot], nBins );
Copy32( Cldfb_RealBuffer_in_fx[0][slot], Cldfb_RealBuffer_in_fx[1][slot], nBins );
Copy32( Cldfb_ImagBuffer_in_fx[0][slot], Cldfb_ImagBuffer_in_fx[1][slot], nBins );
@@ -5954,7 +6818,7 @@ static void ivas_masa_ext_rend_parambin_internal_fx(
void ivas_masa_ext_rend_parambin_render_fx(
MASA_EXT_REND_HANDLE hMasaExtRend, /* i/o: MASA ext rend structure */
COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, /* i : combined orientation handle */
- Word32 *output_f[], /* i/o: synthesized core-coder transport channels/DirAC output Q11*/
+ Word32 *output_fx[], /* i/o: synthesized core-coder transport channels/DirAC output Q11*/
const Word16 num_subframes, /* i : number of subframes to render */
const SPLIT_REND_WRAPPER *hSplitRendWrapper, /* i : split rendering orientation data */
Word32 Cldfb_Out_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : rendered orientations for split rend. real part of cldfb */
@@ -5970,7 +6834,7 @@ void ivas_masa_ext_rend_parambin_render_fx(
FOR( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
{
- p_output[ch] = output_f[ch];
+ p_output[ch] = output_fx[ch];
}
hSpatParamRendCom->subframes_rendered = hSpatParamRendCom->dirac_read_idx;
diff --git a/lib_rend/ivas_dirac_decorr_dec_fx.c b/lib_rend/ivas_dirac_decorr_dec_fx.c
index bd1b4e35aafabfcce4548d7914afade13092b4ef..acbfb3bd2a5ca36e8b63b3ea9959d4c26272d66d 100644
--- a/lib_rend/ivas_dirac_decorr_dec_fx.c
+++ b/lib_rend/ivas_dirac_decorr_dec_fx.c
@@ -489,7 +489,7 @@ void ivas_dirac_dec_decorr_process_fx(
}
FOR( ch_idx = 0; ch_idx < num_protos_dir; ch_idx++ )
{
- v_mult_fixed( &aux_buffer_fx[2 * ch_idx * num_freq_bands], &aux_buffer_fx[2 * ch_idx * num_freq_bands], &aux_buffer_fx[2 * ch_idx * max_band_decorr_temp], imult1616( 2, max_band_decorr_temp ) ); // q_aux_buffer
+ v_mult_fx( &aux_buffer_fx[2 * ch_idx * num_freq_bands], &aux_buffer_fx[2 * ch_idx * num_freq_bands], &aux_buffer_fx[2 * ch_idx * max_band_decorr_temp], imult1616( 2, max_band_decorr_temp ) ); // q_aux_buffer
}
q_aux_buffer = sub( add( add( add( q_input_frame, q_input_frame ), q_shift ), q_shift ), 31 );
@@ -502,6 +502,7 @@ void ivas_dirac_dec_decorr_process_fx(
q_aux_buffer = 31;
move16();
}
+
/* compute onset filter */
max_band_decorr = h_freq_domain_decorr_ap_params->max_band_decorr;
move16();
@@ -546,9 +547,9 @@ void ivas_dirac_dec_decorr_process_fx(
FOR( ch_idx = 0; ch_idx < num_protos_dir; ch_idx++ )
{
//** this might effect when max_band_decorr is not equal to max_band_decorr_temp//
- v_mult_inc_fixed( &input_frame_fx[2 * ch_idx * num_freq_bands], 2, &onset_filter_fx[ch_idx * num_freq_bands], 1, &aux_buffer_fx[2 * ch_idx * max_band_decorr], 2, max_band_decorr ); // q_input_frame
+ v_mult_inc_fx( &input_frame_fx[2 * ch_idx * num_freq_bands], 2, &onset_filter_fx[ch_idx * num_freq_bands], 1, &aux_buffer_fx[2 * ch_idx * max_band_decorr], 2, max_band_decorr ); // q_input_frame
- v_mult_inc_fixed( &input_frame_fx[2 * ch_idx * num_freq_bands + 1], 2, &onset_filter_fx[ch_idx * num_freq_bands], 1, &aux_buffer_fx[2 * ch_idx * max_band_decorr + 1], 2, max_band_decorr ); // q_input_frame
+ v_mult_inc_fx( &input_frame_fx[2 * ch_idx * num_freq_bands + 1], 2, &onset_filter_fx[ch_idx * num_freq_bands], 1, &aux_buffer_fx[2 * ch_idx * max_band_decorr + 1], 2, max_band_decorr ); // q_input_frame
}
q_aux_buffer = q_input_frame;
move16();
@@ -750,8 +751,9 @@ void ivas_dirac_dec_decorr_process_fx(
IF( h_freq_domain_decorr_ap_params->use_ducker )
{
Word16 len1 = shl( imult1616( max_band_decorr, num_protos_dir ), 1 );
+
/* compute direct power w/o onsets for the energy ratio, signal is still in the aux buffer */
- v_mult_fixed( aux_buffer_fx, aux_buffer_fx, aux_buffer_fx, len1 ); // 2 *q_aux -31
+ v_mult_fx( aux_buffer_fx, aux_buffer_fx, aux_buffer_fx, len1 ); // 2 *q_aux -31
q_aux_buffer = sub( shl( q_aux_buffer, 1 ), 31 );
diff --git a/lib_rend/ivas_dirac_output_synthesis_dec_fx.c b/lib_rend/ivas_dirac_output_synthesis_dec_fx.c
index 574a6950ec9aa2337bfc0d825dbd0b22b89e00c9..29184695ce35ebc52a47cfc9f626e504e1ca7f34 100644
--- a/lib_rend/ivas_dirac_output_synthesis_dec_fx.c
+++ b/lib_rend/ivas_dirac_output_synthesis_dec_fx.c
@@ -724,8 +724,8 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
{
IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
{
- v_multc_fixed( hSpatParamRendCom->energy_ratio1_fx[md_idx], -MAX_32 /*-1 Q31*/, aux_buf, num_freq_bands ); /* 30 + 31 - 31 -> 30 */
- v_addc_fixed( aux_buf, ONE_IN_Q30 /*1 Q30*/, aux_buf, num_freq_bands ); /*30*/
+ v_multc_fx( hSpatParamRendCom->energy_ratio1_fx[md_idx], -MAX_32 /*-1 Q31*/, aux_buf, num_freq_bands ); /* 30 + 31 - 31 -> 30 */
+ v_addc_fx( aux_buf, ONE_IN_Q30 /*1 Q30*/, aux_buf, num_freq_bands ); /*30*/
Copy32( hSpatParamRendCom->energy_ratio1_fx[md_idx],
h_dirac_output_synthesis_state->direct_power_factor_fx,
num_freq_bands ); /*Q30*/
@@ -733,8 +733,8 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
h_dirac_output_synthesis_state->diffuse_power_factor_fx,
num_freq_bands ); /*Q30*/
- v_multc_fixed( hSpatParamRendCom->energy_ratio2_fx[md_idx], -MAX_32 /*-1 Q31*/, aux_buf, num_freq_bands ); /*30+31-31->30*/
- v_addc_fixed( aux_buf, ONE_IN_Q30 /*1 Q30*/, aux_buf, num_freq_bands ); /*30*/
+ v_multc_fx( hSpatParamRendCom->energy_ratio2_fx[md_idx], -MAX_32 /*-1 Q31*/, aux_buf, num_freq_bands ); /*30+31-31->30*/
+ v_addc_fx( aux_buf, ONE_IN_Q30 /*1 Q30*/, aux_buf, num_freq_bands ); /*30*/
Copy32( hSpatParamRendCom->energy_ratio2_fx[md_idx],
&h_dirac_output_synthesis_state->direct_power_factor_fx[hSpatParamRendCom->num_freq_bands],
num_freq_bands ); /*Q30*/
@@ -799,16 +799,15 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
h_dirac_output_synthesis_state->direct_power_factor_q = sub( 31, h_dirac_output_synthesis_state->direct_power_factor_q );
h_dirac_output_synthesis_state->diffuse_power_factor_q = sub( 31, h_dirac_output_synthesis_state->diffuse_power_factor_q );
- v_multc_fixed( h_dirac_output_synthesis_state->direct_power_factor_fx,
- ONE_IN_Q29 /*0.25f Q31*/,
- h_dirac_output_synthesis_state->direct_power_factor_fx,
- num_freq_bands ); /*h_dirac_output_synthesis_state->direct_power_factor_q+Q31-Q31->h_dirac_output_synthesis_state->direct_power_factor_q*/
- v_multc_fixed( h_dirac_output_synthesis_state->diffuse_power_factor_fx,
- ONE_IN_Q29 /*0.25f Q31*/,
- h_dirac_output_synthesis_state->diffuse_power_factor_fx,
- num_freq_bands ); /*h_dirac_output_synthesis_state->diffuse_power_factor_q+Q31-Q31->h_dirac_output_synthesis_state->diffuse_power_factor_q*/
+ v_multc_fx( h_dirac_output_synthesis_state->direct_power_factor_fx,
+ ONE_IN_Q29 /*0.25f Q31*/,
+ h_dirac_output_synthesis_state->direct_power_factor_fx,
+ num_freq_bands ); /*h_dirac_output_synthesis_state->direct_power_factor_q+Q31-Q31->h_dirac_output_synthesis_state->direct_power_factor_q*/
+ v_multc_fx( h_dirac_output_synthesis_state->diffuse_power_factor_fx,
+ ONE_IN_Q29 /*0.25f Q31*/,
+ h_dirac_output_synthesis_state->diffuse_power_factor_fx,
+ num_freq_bands ); /*h_dirac_output_synthesis_state->diffuse_power_factor_q+Q31-Q31->h_dirac_output_synthesis_state->diffuse_power_factor_q*/
/*Direct gain*/
-
Word16 *exp_temp_cy_cross_dir_smooth_fx = (Word16 *) malloc( num_freq_bands * num_channels_dir * sizeof( Word16 ) );
Word16 cy_cross_dir_smooth_e = sub( 31, h_dirac_output_synthesis_state->q_cy_cross_dir_smooth );
@@ -1114,19 +1113,19 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
/*Diffuse gain*/
FOR( ch_idx = s_min( 4, nchan_transport ); ch_idx < num_channels_diff; ch_idx++ )
{
- v_multc_fixed_16( h_dirac_output_synthesis_state->diffuse_power_factor_fx,
- hDirACRend->diffuse_response_function_fx[ch_idx],
- aux_buf,
- num_freq_bands_diff ); /* h_dirac_output_synthesis_state->diffuse_power_factor_q+15-15*/
+ v_multc_fx_16( h_dirac_output_synthesis_state->diffuse_power_factor_fx,
+ hDirACRend->diffuse_response_function_fx[ch_idx],
+ aux_buf,
+ num_freq_bands_diff ); /* h_dirac_output_synthesis_state->diffuse_power_factor_q+15-15*/
temp_q = h_dirac_output_synthesis_state->diffuse_power_factor_q;
IF( NE_16( temp_q, h_dirac_output_synthesis_state->q_cy_auto_diff_smooth ) )
{
Scale_sig32( aux_buf, num_freq_bands, sub( h_dirac_output_synthesis_state->q_cy_auto_diff_smooth, temp_q ) ); /*temp_q->(h_dirac_output_synthesis_state->q_cy_auto_diff_smooth)*/
}
- v_add_fixed_no_hdrm( aux_buf,
- &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff],
- &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff],
- num_freq_bands_diff ); /*h_dirac_output_synthesis_state->q_cy_auto_diff_smooth*/
+ v_add_fx_no_hdrm( aux_buf,
+ &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff],
+ &h_dirac_output_synthesis_state->cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff],
+ num_freq_bands_diff ); /*h_dirac_output_synthesis_state->q_cy_auto_diff_smooth*/
}
return;
@@ -1254,14 +1253,14 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
/*Direct gain*/
FOR( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ )
{
- v_multc_fixed( diffuseness, // Q30
- ONE_IN_Q31, // Q31
- &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q30
- num_freq_bands );
- v_multc_fixed( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q30
- L_sub( h_dirac_output_synthesis_params.diffuse_compensation_factor_fx, ONE_IN_Q27 ), // Q27
- &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q26
- num_freq_bands );
+ v_multc_fx( diffuseness, // Q30
+ ONE_IN_Q31, // Q31
+ &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q30
+ num_freq_bands );
+ v_multc_fx( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q30
+ L_sub( h_dirac_output_synthesis_params.diffuse_compensation_factor_fx, ONE_IN_Q27 ), // Q27
+ &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q26
+ num_freq_bands );
FOR( l = 0; l < num_freq_bands; l++ )
{
@@ -1292,20 +1291,21 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
move32();
}
- v_mult_fixed( aux_buf, ratio_float, ratio_float, num_freq_bands ); //(Q30, Q31) -> Q30
- v_mult_fixed( aux_buf, &ratio_float[num_freq_bands], &ratio_float[num_freq_bands], num_freq_bands ); //(Q30, Q31) -> Q30
+ v_mult_fx( aux_buf, ratio_float, ratio_float, num_freq_bands ); //(Q30, Q31) -> Q30
+ v_mult_fx( aux_buf, &ratio_float[num_freq_bands], &ratio_float[num_freq_bands], num_freq_bands ); //(Q30, Q31) -> Q30
/*Directional gain*/
FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_dir; ch_idx++ )
{
- v_mult_fixed( ratio_float, // Q30
- &h_dirac_output_synthesis_state.direct_responses_fx[ch_idx * num_freq_bands], // Q31
- &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], //(Q30, Q31) -> Q30
- num_freq_bands );
- v_mult_fixed( &ratio_float[num_freq_bands], // Q30
- &h_dirac_output_synthesis_state.direct_responses_fx[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir], // Q31
- &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir], //(Q30, Q31) -> Q30
- num_freq_bands );
+ v_mult_fx( ratio_float, // Q30
+ &h_dirac_output_synthesis_state.direct_responses_fx[ch_idx * num_freq_bands], // Q31
+ &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], //(Q30, Q31) -> Q30
+ num_freq_bands );
+
+ v_mult_fx( &ratio_float[num_freq_bands], // Q30
+ &h_dirac_output_synthesis_state.direct_responses_fx[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir], // Q31
+ &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + num_freq_bands * num_channels_dir], //(Q30, Q31) -> Q30
+ num_freq_bands );
// Scale to bring in common Q-factor
q_com = s_min( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, Q30 );
@@ -1331,10 +1331,10 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
/*Diffuse gain*/
FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_diff; ch_idx++ )
{
- v_multc_fixed_16( h_dirac_output_synthesis_state.diffuse_power_factor_fx, // Q31
- hDirACRend->diffuse_response_function_fx[ch_idx], // Q15
- &h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff], // Q31
- num_freq_bands_diff );
+ v_multc_fx_16( h_dirac_output_synthesis_state.diffuse_power_factor_fx, // Q31
+ hDirACRend->diffuse_response_function_fx[ch_idx], // Q15
+ &h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff], // Q31
+ num_freq_bands_diff );
// Scale to bring in common Q-factor
q_com = s_min( h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev, Q31 );
@@ -1356,18 +1356,18 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
/*Direct gain*/
FOR( ch_idx = 0; ch_idx < nchan_transport_foa; ch_idx++ )
{
- v_mult_fixed( h_dirac_output_synthesis_state.diffuse_power_factor_fx, // Q31
- h_dirac_output_synthesis_state.diffuse_power_factor_fx, // Q31
- &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q31
- num_freq_bands );
- v_multc_fixed( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q31
- L_sub( L_shr( h_dirac_output_synthesis_params.diffuse_compensation_factor_decorr_fx, Q3 ), ONE_IN_Q26 ), // Q26
- &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q26
- num_freq_bands_diff );
- v_multc_fixed( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + num_freq_bands_diff], // Q31
- L_sub( L_shr( h_dirac_output_synthesis_params.diffuse_compensation_factor_fx, Q1 ), ONE_IN_Q26 ), // Q26
- &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + num_freq_bands_diff], // Q26
- num_freq_bands - num_freq_bands_diff );
+ v_mult_fx( h_dirac_output_synthesis_state.diffuse_power_factor_fx, // Q31
+ h_dirac_output_synthesis_state.diffuse_power_factor_fx, // Q31
+ &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q31
+ num_freq_bands );
+ v_multc_fx( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q31
+ L_sub( L_shr( h_dirac_output_synthesis_params.diffuse_compensation_factor_decorr_fx, Q3 ), ONE_IN_Q26 ), // Q26
+ &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q26
+ num_freq_bands_diff );
+ v_multc_fx( &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + num_freq_bands_diff], // Q31
+ L_sub( L_shr( h_dirac_output_synthesis_params.diffuse_compensation_factor_fx, Q1 ), ONE_IN_Q26 ), // Q26
+ &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands + num_freq_bands_diff], // Q26
+ num_freq_bands - num_freq_bands_diff );
FOR( l = 0; l < num_freq_bands; l++ )
{
@@ -1391,10 +1391,10 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
/*Directional gain*/
FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_dir; ch_idx++ )
{
- v_mult_fixed( h_dirac_output_synthesis_state.direct_power_factor_fx, // Q31
- &h_dirac_output_synthesis_state.direct_responses_fx[ch_idx * num_freq_bands], // Q31
- &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q31
- num_freq_bands );
+ v_mult_fx( h_dirac_output_synthesis_state.direct_power_factor_fx, // Q31
+ &h_dirac_output_synthesis_state.direct_responses_fx[ch_idx * num_freq_bands], // Q31
+ &h_dirac_output_synthesis_state.cy_cross_dir_smooth_fx[ch_idx * num_freq_bands], // Q31
+ num_freq_bands );
// Scale to bring in common Q-factor
q_com = s_min( h_dirac_output_synthesis_state.q_cy_cross_dir_smooth_prev, Q31 );
@@ -1415,10 +1415,10 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
q_com = s_min( h_dirac_output_synthesis_state.q_cy_auto_diff_smooth_prev, Q31 );
FOR( ch_idx = nchan_transport_foa; ch_idx < num_channels_diff; ch_idx++ )
{
- v_multc_fixed_16( h_dirac_output_synthesis_state.diffuse_power_factor_fx, // Q31
- hDirACRend->diffuse_response_function_fx[ch_idx], // Q15
- &h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff], // Q31
- num_freq_bands_diff );
+ v_multc_fx_16( h_dirac_output_synthesis_state.diffuse_power_factor_fx, // Q31
+ hDirACRend->diffuse_response_function_fx[ch_idx], // Q15
+ &h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff], // Q31
+ num_freq_bands_diff );
// Scale to bring in common Q-factor
Scale_sig32( &h_dirac_output_synthesis_state.cy_auto_diff_smooth_fx[ch_idx * num_freq_bands_diff],
@@ -2715,14 +2715,14 @@ void ivas_dirac_dec_compute_directional_responses_fx(
/* Panning gains have to be computed only for the first bin of the coding band in MASA, for other bins the previous values can be used */
IF( NE_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
{
- mvr2r_inc_fixed( &hDirACRend->h_output_synthesis_psd_state.direct_responses_square_fx[k - 1],
- hSpatParamRendCom->num_freq_bands, &hDirACRend->h_output_synthesis_psd_state.direct_responses_square_fx[k],
- hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*direct_response_square_q*/
+ mvr2r_inc_fx( &hDirACRend->h_output_synthesis_psd_state.direct_responses_square_fx[k - 1],
+ hSpatParamRendCom->num_freq_bands, &hDirACRend->h_output_synthesis_psd_state.direct_responses_square_fx[k],
+ hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*direct_response_square_q*/
}
- mvr2r_inc_fixed( &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k - 1],
- hSpatParamRendCom->num_freq_bands,
- &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k],
- hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*direct_response_q*/
+ mvr2r_inc_fx( &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k - 1],
+ hSpatParamRendCom->num_freq_bands,
+ &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k],
+ hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*direct_response_q*/
}
ELSE
{
@@ -2754,11 +2754,11 @@ void ivas_dirac_dec_compute_directional_responses_fx(
test();
IF( masa_band_mapping == NULL && EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
{
- mvr2r_inc_fixed( direct_response_hoa_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*Q_direct_response_hoa*/
+ mvr2r_inc_fx( direct_response_hoa_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*Q_direct_response_hoa*/
IF( hodirac_flag )
{
- mvr2r_inc_fixed( direct_response_dir2_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k + hSpatParamRendCom->num_freq_bands * num_channels_dir], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*Q_direct_response_dir2*/
+ mvr2r_inc_fx( direct_response_dir2_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k + hSpatParamRendCom->num_freq_bands * num_channels_dir], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*Q_direct_response_dir2*/
}
}
ELSE IF( ( ( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) ) && ( masa_band_mapping != NULL ) ) ||
@@ -2853,13 +2853,13 @@ void ivas_dirac_dec_compute_directional_responses_fx(
FOR( dir = 0; dir < hSpatParamRendCom->numIsmDirections; dir++ )
{
- IF( hMasaIsm->ism_is_edited[dir] )
+ IF( hMasaIsm->ism_dir_is_edited[dir] )
{
- ivas_dirac_dec_get_response_fx( hMasaIsm->azimuth_ism_edited[dir], hMasaIsm->elevation_ism_edited[dir], direct_response_temp_fx, hDirACRend->hOutSetup.ambisonics_order, Q29 );
+ ivas_dirac_dec_get_response_fx( hMasaIsm->azimuth_ism_edited_fx[dir], hMasaIsm->elevation_ism_edited_fx[dir], direct_response_temp_fx, hDirACRend->hOutSetup.ambisonics_order, Q29 );
}
ELSE
{
- ivas_dirac_dec_get_response_fx( hMasaIsm->azimuth_ism[dir][md_idx], hMasaIsm->elevation_ism[dir][md_idx], direct_response_temp_fx, hDirACRend->hOutSetup.ambisonics_order, Q29 );
+ ivas_dirac_dec_get_response_fx( hMasaIsm->azimuth_ism_fx[dir][md_idx], hMasaIsm->elevation_ism_fx[dir][md_idx], direct_response_temp_fx, hDirACRend->hOutSetup.ambisonics_order, Q29 );
}
exp_direct_response_temp = 2;
move16();
@@ -2987,10 +2987,10 @@ void ivas_dirac_dec_compute_directional_responses_fx(
direct_response_fx = direct_response_hoa_fx;
IF( NE_32( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
{
- v_mult_fixed( direct_response_fx, direct_response_fx, direct_response_square_fx, num_channels_dir ); /*Q(2*direct_response_q-31)*/
+ v_mult_fx( direct_response_fx, direct_response_fx, direct_response_square_fx, num_channels_dir ); /*Q(2*direct_response_q-31)*/
direct_response_square_q = sub( add( direct_response_q, direct_response_q ), 31 );
- mvr2r_inc_fixed( direct_response_square_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_square_fx[k], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*direct_response_square_q*/
+ mvr2r_inc_fx( direct_response_square_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_square_fx[k], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*direct_response_square_q*/
IF( EQ_16( transport_signal_type, MASA_STEREO_SPACED_MICS ) )
{
@@ -3009,7 +3009,7 @@ void ivas_dirac_dec_compute_directional_responses_fx(
}
}
- mvr2r_inc_fixed( direct_response_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*q29*/
+ mvr2r_inc_fx( direct_response_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*q29*/
}
ELSE
{
@@ -3104,13 +3104,13 @@ void ivas_dirac_dec_compute_directional_responses_fx(
FOR( dir = 0; dir < hSpatParamRendCom->numIsmDirections; dir++ )
{
- IF( hMasaIsm->ism_is_edited[dir] )
+ IF( hMasaIsm->ism_dir_is_edited[dir] )
{
- vbap_determine_gains_fx( hVBAPdata, direct_response_temp_fx, hMasaIsm->azimuth_ism_edited[dir], hMasaIsm->elevation_ism_edited[dir], 1 );
+ vbap_determine_gains_fx( hVBAPdata, direct_response_temp_fx, hMasaIsm->azimuth_ism_edited_fx[dir], hMasaIsm->elevation_ism_edited_fx[dir], 1 );
}
ELSE
{
- vbap_determine_gains_fx( hVBAPdata, direct_response_temp_fx, hMasaIsm->azimuth_ism[dir][md_idx], hMasaIsm->elevation_ism[dir][md_idx], 1 );
+ vbap_determine_gains_fx( hVBAPdata, direct_response_temp_fx, hMasaIsm->azimuth_ism_fx[dir][md_idx], hMasaIsm->elevation_ism_fx[dir][md_idx], 1 );
}
Word32 tmp = 0;
move32();
@@ -3264,11 +3264,11 @@ void ivas_dirac_dec_compute_directional_responses_fx(
/* Set computed gains */
direct_response_fx = direct_response_ls_fx;
- v_mult_fixed( direct_response_fx, direct_response_fx, direct_response_square_fx, num_channels_dir ); /*2*direct_response_q-31*/
+ v_mult_fx( direct_response_fx, direct_response_fx, direct_response_square_fx, num_channels_dir ); /*2*direct_response_q-31*/
direct_response_square_q = sub( add( direct_response_q, direct_response_q ), 31 );
- mvr2r_inc_fixed( direct_response_square_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_square_fx[k], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*direct_response_square_q*/
- mvr2r_inc_fixed( direct_response_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*direct_response_q*/
+ mvr2r_inc_fx( direct_response_square_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_square_fx[k], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*direct_response_square_q*/
+ mvr2r_inc_fx( direct_response_fx, 1, &hDirACRend->h_output_synthesis_psd_state.direct_responses_fx[k], hSpatParamRendCom->num_freq_bands, num_channels_dir ); /*direct_response_q*/
}
ELSE
{
@@ -3364,16 +3364,15 @@ void ivas_dirac_dec_compute_power_factors_fx(
{
Word16 i;
- v_multc_fixed( diffuseness_fx, L_negate( ( ONE_IN_Q31 ) ), direct_power_factor, num_freq_bands ); // Q30
+ v_multc_fx( diffuseness_fx, L_negate( ( ONE_IN_Q31 ) ), direct_power_factor, num_freq_bands ); // Q30
- v_addc_fixed( direct_power_factor, ONE_IN_Q30, direct_power_factor, num_freq_bands ); // Q30
+ v_addc_fx( direct_power_factor, ONE_IN_Q30, direct_power_factor, num_freq_bands ); // Q30
Copy32( diffuseness_fx, diffuse_power_factor, num_freq_bands ); // Q30
- v_mult_fixed( &direct_power_factor[max_band_decorr], &direct_power_factor[max_band_decorr], &direct_power_factor[max_band_decorr], num_freq_bands - max_band_decorr ); // Q29
-
- v_mult_fixed( &diffuse_power_factor[max_band_decorr], &diffuse_power_factor[max_band_decorr], &diffuse_power_factor[max_band_decorr], num_freq_bands - max_band_decorr ); // Q29
+ v_mult_fx( &direct_power_factor[max_band_decorr], &direct_power_factor[max_band_decorr], &direct_power_factor[max_band_decorr], num_freq_bands - max_band_decorr ); // Q29
+ v_mult_fx( &diffuse_power_factor[max_band_decorr], &diffuse_power_factor[max_band_decorr], &diffuse_power_factor[max_band_decorr], num_freq_bands - max_band_decorr ); // Q29
FOR( i = 0; i < max_band_decorr; i++ )
{
@@ -3382,6 +3381,7 @@ void ivas_dirac_dec_compute_power_factors_fx(
diffuse_power_factor[i] = L_shr( diffuse_power_factor[i], 1 ); // Q29
move32();
}
+
return;
}
@@ -3391,6 +3391,7 @@ void ivas_dirac_dec_compute_power_factors_fx(
*
*
*------------------------------------------------------------------------*/
+
void ivas_lfe_synth_with_filters_fx(
MCMASA_LFE_SYNTH_DATA_HANDLE hMasaLfeSynth, /* i/o: LFE synthesis structure for McMASA */
Word32 *data_fx[], /* o : output signals (Q11) */
@@ -3605,7 +3606,7 @@ static void computeTargetPSDs_direct_fx(
Word32 aux_buffer_res[CLDFB_NO_CHANNELS_MAX]; /* size: num_freq_bands. */
/* estimate direct and diffuse power */
- v_mult_fixed( direct_power_factor, reference_power, direct_power, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
+ v_mult_fx( direct_power_factor, reference_power, direct_power, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
Word16 common1_q = s_min( *q_cy_auto_dir_smooth, s_min( q_reference_power[0], q_reference_power[1] ) );
Word16 common2_q = s_min( *q_cy_cross_dir_smooth, s_min( q_reference_power[0], q_reference_power[1] ) );
@@ -3615,17 +3616,17 @@ static void computeTargetPSDs_direct_fx(
{
cur_idx = imult1616( ch_idx, num_freq_bands );
- v_mult_fixed( direct_power, &direct_responses_square[cur_idx], aux_buffer_res, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
+ v_mult_fx( direct_power, &direct_responses_square[cur_idx], aux_buffer_res, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
scale_sig32( aux_buffer_res, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( common1_q, q_reference_power[0] ) ); /* Q(common1_q) */
scale_sig32( aux_buffer_res + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( common1_q, q_reference_power[1] ) ); /* Q(common1_q) */
scale_sig32( &cy_auto_dir_smooth[cur_idx], num_freq_bands, sub( common1_q, *q_cy_auto_dir_smooth ) ); /* Q(common1_q) */
- v_add_fixed( &cy_auto_dir_smooth[cur_idx], aux_buffer_res, &cy_auto_dir_smooth[cur_idx], num_freq_bands, Q1 ); /* Q(common1_q) - Q1 */
+ v_add_fx_hdrm( &cy_auto_dir_smooth[cur_idx], aux_buffer_res, &cy_auto_dir_smooth[cur_idx], num_freq_bands, Q1 ); /* Q(common1_q) - Q1 */
- v_mult_fixed( direct_power, &direct_responses[cur_idx], aux_buffer_res, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
+ v_mult_fx( direct_power, &direct_responses[cur_idx], aux_buffer_res, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
scale_sig32( aux_buffer_res, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( common2_q, q_reference_power[0] ) ); /* Q(common2_q) */
scale_sig32( aux_buffer_res + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ), sub( common2_q, q_reference_power[1] ) ); /* Q(common2_q) */
scale_sig32( &cy_cross_dir_smooth[cur_idx], num_freq_bands, sub( common2_q, *q_cy_cross_dir_smooth ) ); /* Q(common2_q) */
- v_add_fixed( &cy_cross_dir_smooth[cur_idx], aux_buffer_res, &cy_cross_dir_smooth[cur_idx], num_freq_bands, Q1 ); /* Q(common2_q) - Q1 */
+ v_add_fx_hdrm( &cy_cross_dir_smooth[cur_idx], aux_buffer_res, &cy_cross_dir_smooth[cur_idx], num_freq_bands, Q1 ); /* Q(common2_q) - Q1 */
}
/* Q adjustment */
@@ -3659,7 +3660,8 @@ static void computeTargetPSDs_direct_subframe_fx(
Word32 direct_power[CLDFB_NO_CHANNELS_MAX]; /* size: num_freq_bands. */
/* estimate direct and diffuse power */
- v_mult_fixed( direct_power_factor, reference_power, direct_power, num_freq_bands );
+ v_mult_fx( direct_power_factor, reference_power, direct_power, num_freq_bands );
+
/* compute target auto and cross PSDs of current frame (smoothed) */
FOR( ch_idx = 0; ch_idx < num_channels; ++ch_idx )
{
@@ -3667,7 +3669,7 @@ static void computeTargetPSDs_direct_subframe_fx(
q_tmp = L_norm_arr( &direct_responses_square[cur_idx], num_freq_bands );
Copy_Scale_sig32( &direct_responses_square[cur_idx], L_tmp, num_freq_bands, q_tmp );
- v_mult_fixed( direct_power, L_tmp, &cy_auto_dir_smooth[cur_idx], num_freq_bands ); // (q_reference_power, q_tmp) -> q_reference_power + q_tmp
+ v_mult_fx( direct_power, L_tmp, &cy_auto_dir_smooth[cur_idx], num_freq_bands ); // (q_reference_power, q_tmp) -> q_reference_power + q_tmp
q_cy_auto_dir_smooth_local[0] = add( add( q_reference_power[0], q_tmp ), L_norm_arr( cy_auto_dir_smooth + cur_idx, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
q_cy_auto_dir_smooth_local[1] = add( add( q_reference_power[1], q_tmp ), L_norm_arr( cy_auto_dir_smooth + cur_idx + CLDFB_NO_CHANNELS_HALF, s_max( sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), 0 ) ) );
@@ -3677,7 +3679,7 @@ static void computeTargetPSDs_direct_subframe_fx(
Scale_sig32( cy_auto_dir_smooth + cur_idx, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_cy_auto_dir_smooth[ch_idx], add( q_reference_power[0], q_tmp ) ) );
Scale_sig32( cy_auto_dir_smooth + cur_idx + CLDFB_NO_CHANNELS_HALF, s_max( sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), 0 ), sub( q_cy_auto_dir_smooth[ch_idx], add( q_reference_power[1], q_tmp ) ) );
- v_mult_fixed( direct_power, &direct_responses[cur_idx], &cy_cross_dir_smooth[cur_idx], num_freq_bands ); // (q_reference_power, Q31) -> q_reference_power
+ v_mult_fx( direct_power, &direct_responses[cur_idx], &cy_cross_dir_smooth[cur_idx], num_freq_bands ); // (q_reference_power, Q31) -> q_reference_power
Scale_sig32( &cy_cross_dir_smooth[cur_idx] + CLDFB_NO_CHANNELS_HALF, s_max( sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), 0 ), sub( q_reference_power[0], q_reference_power[1] ) );
}
@@ -3706,7 +3708,7 @@ static void computeTargetPSDs_diffuse_fx(
Word32 aux_buffer_res[CLDFB_NO_CHANNELS_MAX]; /* size: num_freq_bands. */
/* estimate direct and diffuse power */
- v_mult_fixed( diffuse_power_factor, reference_power, diffuse_power, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
+ v_mult_fx( diffuse_power_factor, reference_power, diffuse_power, num_freq_bands ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
Word16 common_q = s_min( *q_cy_auto_diff_smooth, s_min( q_reference_power[0], q_reference_power[1] ) );
@@ -3715,11 +3717,11 @@ static void computeTargetPSDs_diffuse_fx(
{
cur_idx = imult1616( ch_idx, num_freq_bands );
- v_multc_fixed( &diffuse_power[start_band], diffuse_responses_square[ch_idx], aux_buffer_res, sub( num_freq_bands, start_band ) ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
+ v_multc_fx( &diffuse_power[start_band], diffuse_responses_square[ch_idx], aux_buffer_res, sub( num_freq_bands, start_band ) ); /* Q31 + Q(q_reference_power) - Q31 = Q(q_reference_power) */
scale_sig32( aux_buffer_res, s_min( sub( num_freq_bands, start_band ), CLDFB_NO_CHANNELS_HALF ), sub( common_q, q_reference_power[0] ) ); /* Q(common_q) */
scale_sig32( aux_buffer_res + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( sub( num_freq_bands, start_band ), CLDFB_NO_CHANNELS_HALF ) ), sub( common_q, q_reference_power[1] ) ); /* Q(common_q) */
scale_sig32( &cy_auto_diff_smooth[cur_idx + start_band], sub( num_freq_bands, start_band ), sub( common_q, *q_cy_auto_diff_smooth ) ); /* Q(common_q) */
- v_add_fixed( &cy_auto_diff_smooth[cur_idx + start_band], aux_buffer_res, &cy_auto_diff_smooth[cur_idx + start_band], sub( num_freq_bands, start_band ), Q1 ); /* Q(common_q) - Q1 */
+ v_add_fx_hdrm( &cy_auto_diff_smooth[cur_idx + start_band], aux_buffer_res, &cy_auto_diff_smooth[cur_idx + start_band], sub( num_freq_bands, start_band ), Q1 ); /* Q(common_q) - Q1 */
}
/* Q adjustment */
@@ -3746,7 +3748,7 @@ static void computeTargetPSDs_diffuse_subframe_fx(
Word16 q_cy_auto_diff_smooth_new, q_diffuse_power;
/* estimate direct and diffuse power */
- v_mult_fixed( diffuse_power_factor, reference_power, diffuse_power, num_freq_bands ); // (Q31, q_reference_power) -> q_reference_power
+ v_mult_fx( diffuse_power_factor, reference_power, diffuse_power, num_freq_bands ); // (Q31, q_reference_power) -> q_reference_power
q_diffuse_power = s_min( q_reference_power[0], q_reference_power[1] );
Scale_sig32( diffuse_power, s_min( num_freq_bands, CLDFB_NO_CHANNELS_HALF ), sub( q_diffuse_power, q_reference_power[0] ) );
@@ -3767,7 +3769,7 @@ static void computeTargetPSDs_diffuse_subframe_fx(
{
Scale_sig32( &cy_auto_diff_smooth[cur_idx], start_band, sub( q_diffuse_power, *q_cy_auto_diff_smooth ) );
}
- v_multc_fixed( &diffuse_power[start_band], diffuse_responses_square[ch_idx], &cy_auto_diff_smooth[cur_idx + start_band], sub( num_freq_bands, start_band ) ); // (q_reference_power, Q31) -> q_reference_power
+ v_multc_fx( &diffuse_power[start_band], diffuse_responses_square[ch_idx], &cy_auto_diff_smooth[cur_idx + start_band], sub( num_freq_bands, start_band ) ); // (q_reference_power, Q31) -> q_reference_power
}
*q_cy_auto_diff_smooth = q_cy_auto_diff_smooth_new;
@@ -3801,7 +3803,7 @@ static void computeTargetPSDs_diffuse_with_onsets_fx(
q_reference_power_min_one[1] = sub( q_reference_power[1], Q1 );
/* estimate direct and diffuse power */
- v_mult_fixed( diffuse_power_factor, reference_power, diffuse_power, num_decorr_freq_bands ); // (Q31, q_reference_power) -> q_reference_power
+ v_mult_fx( diffuse_power_factor, reference_power, diffuse_power, num_decorr_freq_bands ); // (Q31, q_reference_power) -> q_reference_power
q_common = s_min( *q_cy_auto_diff_smooth, s_min( q_reference_power_min_one[0], q_reference_power_min_one[1] ) );
@@ -3813,12 +3815,12 @@ static void computeTargetPSDs_diffuse_with_onsets_fx(
cur_idx = imult1616( ch_idx, num_freq_bands );
diff_idx = imult1616( proto_frame_diff_index[ch_idx], num_freq_bands );
- v_multc_fixed( &onset_filter[diff_idx], diffuse_responses_square[ch_idx], aux_buffer_res1, num_decorr_freq_bands ); // (Q31, Q31) -> Q31
- v_multc_fixed( &onset_filter[diff_idx], INT_MIN, aux_buffer_res, num_decorr_freq_bands ); // (Q31, Q31) -> Q31
- v_addc_fixed( aux_buffer_res, ONE_IN_Q31, aux_buffer_res, num_decorr_freq_bands ); // Q31
- v_multc_fixed( aux_buffer_res, diffuse_response_p4, aux_buffer_res, num_decorr_freq_bands ); // (Q31, Q31) -> Q31
- v_add_fixed( aux_buffer_res1, aux_buffer_res, aux_buffer_res, num_decorr_freq_bands, Q1 ); // Q30
- v_mult_fixed( aux_buffer_res, diffuse_power, aux_buffer_res, num_decorr_freq_bands ); // (Q30, q_reference_power) -> q_reference_power - Q1
+ v_multc_fx( &onset_filter[diff_idx], diffuse_responses_square[ch_idx], aux_buffer_res1, num_decorr_freq_bands ); // (Q31, Q31) -> Q31
+ v_multc_fx( &onset_filter[diff_idx], INT_MIN, aux_buffer_res, num_decorr_freq_bands ); // (Q31, Q31) -> Q31
+ v_addc_fx( aux_buffer_res, ONE_IN_Q31, aux_buffer_res, num_decorr_freq_bands ); // Q31
+ v_multc_fx( aux_buffer_res, diffuse_response_p4, aux_buffer_res, num_decorr_freq_bands ); // (Q31, Q31) -> Q31
+ v_add_fx_hdrm( aux_buffer_res1, aux_buffer_res, aux_buffer_res, num_decorr_freq_bands, Q1 ); // Q30
+ v_mult_fx( aux_buffer_res, diffuse_power, aux_buffer_res, num_decorr_freq_bands ); // (Q30, q_reference_power) -> q_reference_power - Q1
IF( NE_16( q_common, q_reference_power_min_one[0] ) )
{
@@ -3832,7 +3834,7 @@ static void computeTargetPSDs_diffuse_with_onsets_fx(
{
scale_sig32( &cy_auto_diff_smooth[cur_idx], num_decorr_freq_bands, sub( q_common, *q_cy_auto_diff_smooth ) ); // q_common
}
- v_add_fixed( &cy_auto_diff_smooth[cur_idx], aux_buffer_res, &cy_auto_diff_smooth[cur_idx], num_decorr_freq_bands, Q1 ); // (q_common - Q1)
+ v_add_fx_hdrm( &cy_auto_diff_smooth[cur_idx], aux_buffer_res, &cy_auto_diff_smooth[cur_idx], num_decorr_freq_bands, Q1 ); // (q_common - Q1)
scale_sig32( &cy_auto_diff_smooth[cur_idx + num_decorr_freq_bands], sub( num_freq_bands, num_decorr_freq_bands ), sub( sub( q_common, Q1 ), *q_cy_auto_diff_smooth ) ); // (q_common - Q1)
}
diff --git a/lib_rend/ivas_dirac_rend_fx.c b/lib_rend/ivas_dirac_rend_fx.c
index 83615cfb77fe3968a8bada855aa31b04d86f8d4d..bde35181ee7c12d7d3da54a92c1be9e4cb051725 100644
--- a/lib_rend/ivas_dirac_rend_fx.c
+++ b/lib_rend/ivas_dirac_rend_fx.c
@@ -2632,17 +2632,11 @@ void protoSignalComputation4_fx(
Word32 sq_tmp_fx;
Word32 *p_proto_buffer_fx;
Word16 min_q_shift, q_shift;
-#ifndef FIX_1985_SBA_714_HF_LOSS
- Word16 min_q_shift2, q_shift2;
-#endif
Word32 re, im;
Word16 proto_power_smooth_fx_q, sq_tmp_q;
-#ifdef FIX_1985_SBA_714_HF_LOSS
Word64 ref_pow64[CLDFB_NO_CHANNELS_MAX], re64;
Word16 sf1, sf2;
-#endif
-#ifdef FIX_1985_SBA_714_HF_LOSS
FOR( l = 0; l < num_freq_bands; l++ )
{
re64 = W_mult_32_32( RealBuffer_fx[0][0][l], RealBuffer_fx[0][0][l] );
@@ -2673,69 +2667,7 @@ void protoSignalComputation4_fx(
reference_power_fx[l] = W_extract_h( W_shl( ref_pow64[l], sf2 ) );
}
reference_power_q[1] = sub( add( shl( q_cldfb, 1 ), sf2 ), 31 );
-#else
- min_q_shift = Q31;
- move16();
- q_shift = Q31;
- move16();
- min_q_shift2 = Q31;
- move16();
- q_shift2 = Q31;
- move16();
- sq_tmp_q = 0;
- move16();
-
- set_zero_fx( reference_power_fx, num_freq_bands );
-
- /* calculate the shift possible for both RealBuffer_fx and ImagBuffer_fx buffers*/
- FOR( k = 0; k < s_max( 4, nchan_transport ); k++ )
- {
- q_shift = L_norm_arr( RealBuffer_fx[k][0], s_min( CLDFB_NO_CHANNELS_HALF, num_freq_bands ) );
- min_q_shift = s_min( q_shift, min_q_shift );
- q_shift = L_norm_arr( ImagBuffer_fx[k][0], s_min( CLDFB_NO_CHANNELS_HALF, num_freq_bands ) );
- min_q_shift = s_min( q_shift, min_q_shift );
- q_shift2 = L_norm_arr( RealBuffer_fx[k][0] + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
- min_q_shift2 = s_min( q_shift2, min_q_shift2 );
- q_shift2 = L_norm_arr( ImagBuffer_fx[k][0] + CLDFB_NO_CHANNELS_HALF, s_max( 0, sub( num_freq_bands, CLDFB_NO_CHANNELS_HALF ) ) );
- min_q_shift2 = s_min( q_shift2, min_q_shift2 );
- }
- q_shift = min_q_shift;
- min_q_shift = sub( min_q_shift, find_guarded_bits_fx( i_mult( 2, 4 ) ) );
- q_shift2 = min_q_shift2;
- min_q_shift2 = sub( min_q_shift2, find_guarded_bits_fx( i_mult( 2, 4 ) ) );
- FOR( k = 0; k < 4; k++ )
- {
- FOR( l = 0; l < s_min( CLDFB_NO_CHANNELS_HALF, num_freq_bands ); l++ )
- {
- re = L_shl( RealBuffer_fx[k][0][l], min_q_shift ); // q_cldfb+min_q_shift
- im = L_shl( ImagBuffer_fx[k][0][l], min_q_shift ); // q_cldfb+min_q_shift
-
- sq_tmp_fx = Madd_32_32( Mpy_32_32( re, re ), im, im ); // 2*(q_cldfb+min_q_shift)-31
-
- reference_power_fx[l] = Madd_32_16( reference_power_fx[l], sq_tmp_fx, 16384 /*0.5 in Q15*/ ); // 2*(q_cldfb+min_q_shift)-31
- move32();
- }
- FOR( l = CLDFB_NO_CHANNELS_HALF; l < num_freq_bands; l++ )
- {
- re = L_shl( RealBuffer_fx[k][0][l], min_q_shift2 ); // q_cldfb+min_q_shift
- im = L_shl( ImagBuffer_fx[k][0][l], min_q_shift2 ); // q_cldfb+min_q_shift
-
- sq_tmp_fx = Madd_32_32( Mpy_32_32( re, re ), im, im ); // 2*(q_cldfb+min_q_shift)-31
-
- reference_power_fx[l] = Madd_32_16( reference_power_fx[l], sq_tmp_fx, 16384 /*0.5 in Q15*/ ); // 2*(q_cldfb+min_q_shift)-31
- move32();
- }
- }
- sq_tmp_q = sub( add( add( q_cldfb, min_q_shift ), add( q_cldfb, min_q_shift ) ), 31 );
- reference_power_q[0] = sq_tmp_q;
- move16();
- sq_tmp_q = sub( add( add( q_cldfb, min_q_shift2 ), add( q_cldfb, min_q_shift2 ) ), 31 );
- reference_power_q[1] = sq_tmp_q;
- move16();
-#endif
-
-#ifdef FIX_1985_SBA_714_HF_LOSS
min_q_shift = Q31;
/* calculate the shift possible for both RealBuffer_fx and ImagBuffer_fx buffers*/
FOR( k = 0; k < s_max( 4, nchan_transport ); k++ )
@@ -2746,9 +2678,6 @@ void protoSignalComputation4_fx(
min_q_shift = s_min( q_shift, min_q_shift );
}
min_q_shift = sub( min_q_shift, find_guarded_bits_fx( 2 ) );
-#else
- min_q_shift = sub( s_min( q_shift, q_shift2 ), find_guarded_bits_fx( 2 ) );
-#endif
/*For decorrelated diffuseness*/
FOR( l = 0; l < num_outputs_diff; l++ )
@@ -3640,7 +3569,7 @@ void rotateAziEle_DirAC_fx(
/* A reduced rewrite of the corresponding decoder side function */
static void ivas_masa_ext_dirac_render_sf_fx(
MASA_EXT_REND_HANDLE hMasaExtRend, /* i/o: IVAS decoder structure */
- Word32 *output_f_fx[] /* i/o: synthesized core-coder transport channels/DirAC output q11*/
+ Word32 *output_fx[] /* i/o: synthesized core-coder transport channels/DirAC output q11*/
)
{
Word16 i, ch, idx_in, idx_lfe;
@@ -3854,7 +3783,7 @@ static void ivas_masa_ext_dirac_render_sf_fx(
move16();
hMasaExtRend->cldfbAnaRend[ch]->Q_cldfb_state = q_cldfb;
move16();
- cldfbAnalysis_ts_fx_fixed_q( &( output_f_fx[ch][hSpatParamRendCom->num_freq_bands * index_slot] ),
+ cldfbAnalysis_ts_fx_fixed_q( &( output_fx[ch][hSpatParamRendCom->num_freq_bands * index_slot] ),
Cldfb_RealBuffer_fx[ch][0],
Cldfb_ImagBuffer_fx[ch][0],
hSpatParamRendCom->num_freq_bands,
@@ -4070,9 +3999,9 @@ static void ivas_masa_ext_dirac_render_sf_fx(
hDirACRend->h_freq_domain_decorr_ap_params,
hDirACRend->h_freq_domain_decorr_ap_state );
- v_multc_fixed( onset_filter_fx, 536870912 /* 0.25f in Q31 */, onset_filter_fx, hSpatParamRendCom->num_freq_bands ); /* Q31 */
- v_add_fixed_no_hdrm( onset_filter_fx, onset_filter_subframe_fx, onset_filter_subframe_fx, hSpatParamRendCom->num_freq_bands ); /* Q31 */
- p_onset_filter_fx = onset_filter_subframe_fx; /*q31*/
+ v_multc_fx( onset_filter_fx, 536870912 /* 0.25f in Q31 */, onset_filter_fx, hSpatParamRendCom->num_freq_bands ); /* Q31 */
+ v_add_fx_no_hdrm( onset_filter_fx, onset_filter_subframe_fx, onset_filter_subframe_fx, hSpatParamRendCom->num_freq_bands ); /* Q31 */
+ p_onset_filter_fx = onset_filter_subframe_fx; /*q31*/
}
ELSE
{
@@ -4160,7 +4089,7 @@ static void ivas_masa_ext_dirac_render_sf_fx(
DirAC_mem.reference_power_smooth_q[1] = DirAC_mem.reference_power_q[1];
move16();
move16();
- v_add_fixed_no_hdrm( reference_power_fix, reference_power_smooth_fx, reference_power_smooth_fx, hSpatParamRendCom->num_freq_bands ); // DirAC_mem.reference_power_smooth_q
+ v_add_fx_no_hdrm( reference_power_fix, reference_power_smooth_fx, reference_power_smooth_fx, hSpatParamRendCom->num_freq_bands ); // DirAC_mem.reference_power_smooth_q
}
}
/*Rescaling proto_direct_buffer_f*/
@@ -4473,7 +4402,7 @@ static void ivas_masa_ext_dirac_render_sf_fx(
IF( hDirACRend->hOutSetup.num_lfe > 0 && ( EQ_16( hDirACRend->hOutSetup.index_lfe[idx_lfe], ch ) ) )
{
/* No LFE for MASA rendering */
- set32_fx( &( output_f_fx[ch][index_slot * hSpatParamRendCom->num_freq_bands] ), 0, imult1616( hSpatParamRendCom->subframe_nbslots[subframe_idx], hSpatParamRendCom->num_freq_bands ) );
+ set32_fx( &( output_fx[ch][index_slot * hSpatParamRendCom->num_freq_bands] ), 0, imult1616( hSpatParamRendCom->subframe_nbslots[subframe_idx], hSpatParamRendCom->num_freq_bands ) );
IF( LT_16( idx_lfe, sub( hDirACRend->hOutSetup.num_lfe, 1 ) ) )
{
@@ -4506,8 +4435,8 @@ static void ivas_masa_ext_dirac_render_sf_fx(
ImagBuffer_fx[i] = Cldfb_ImagBuffer_fx[idx_in][i]; // q_cldfb
}
Word16 out_size = imult1616( hSpatParamRendCom->num_freq_bands, hSpatParamRendCom->subframe_nbslots[subframe_idx] );
- cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_f_fx[ch][index_slot * hSpatParamRendCom->num_freq_bands] ), out_size, 0, 0, hMasaExtRend->cldfbSynRend[idx_in] );
- scale_sig32( &( output_f_fx[ch][index_slot * hSpatParamRendCom->num_freq_bands] ), out_size, sub( 11, q_out ) ); // q11
+ cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch][index_slot * hSpatParamRendCom->num_freq_bands] ), out_size, 0, 0, hMasaExtRend->cldfbSynRend[idx_in] );
+ scale_sig32( &( output_fx[ch][index_slot * hSpatParamRendCom->num_freq_bands] ), out_size, sub( 11, q_out ) ); // q11
idx_in++;
}
}
@@ -4524,7 +4453,7 @@ static void ivas_masa_ext_dirac_render_sf_fx(
void ivas_masa_ext_dirac_render_fx(
MASA_EXT_REND_HANDLE hMasaExtRend, /* i/o: MASA renderer structure */
- Word32 *output_f[], /* i/o: input/output signals in time domain q11*/
+ Word32 *output_fx[], /* i/o: input/output signals in time domain q11*/
const Word16 num_subframes /* i : number of subframes to render */
)
{
@@ -4539,7 +4468,7 @@ void ivas_masa_ext_dirac_render_fx(
FOR( n = 0; n < MAX_OUTPUT_CHANNELS; n++ )
{
- output_f_local[n] = output_f[n]; // q11
+ output_f_local[n] = output_fx[n]; // q11
}
hSpatParamRendCom->subframes_rendered = hSpatParamRendCom->dirac_read_idx;
diff --git a/lib_rend/ivas_efap_fx.c b/lib_rend/ivas_efap_fx.c
index 68908cfaa36eb8aef6acb6aef1964a83e79a3cd1..23ffbe0bd17bffb0c2f17d128bac4ba46e9325d4 100644
--- a/lib_rend/ivas_efap_fx.c
+++ b/lib_rend/ivas_efap_fx.c
@@ -66,7 +66,6 @@
* Local function prototypes
*-----------------------------------------------------------------------*/
-
static ivas_error poly_init_fx( EFAP *efap, const Word16 efip_flag );
static ivas_error sphere_triangulation_fx( const Word16 numSpk, EFAP_VERTEX_DATA *vtxData, EFAP_POLYSET_DATA *polyData, Word32 ***dmTranspose /*q31*/, Word16 *numTot, const Word16 efip_flag );
static void initial_polyeder_fx( EFAP_VERTEX_DATA *vtxData, EFAP_LS_TRIANGLE *triArray, Word16 *numTri, Word16 *vtxInHull );
@@ -75,7 +74,6 @@ static void add_vertex_to_convex_hull_fx( const EFAP_VERTEX_DATA *vtxData, const
static void sort_vertices_fx( const EFAP_VERTEX *vertexArray, const Word16 *numVtx, Word16 *order );
static void visible_edges_fx( const EFAP_LS_TRIANGLE *triArray, const Word16 *visible, const Word16 numSurface, Word16 *numEdges, Word16 *edges );
-
static void flip_plane_fx( const EFAP_VERTEX *vtxArray, Word16 *surface, const Word32 centroid[3] /*q31*/ );
static void remap_ghosts_fx( EFAP_VERTEX *vtxArray, EFAP_LS_TRIANGLE *triArray, Word16 numSpk, Word16 *numVertex, Word16 numTri, Word32 **downmixMatrix /*q31*/ );
static void vertex_init_fx( const Word32 *aziSpk /*q22*/, const Word32 *eleSpk /*q22*/, EFAP_VERTEX_DATA *efapVtxData );
@@ -83,6 +81,7 @@ static void efap_panning_fx( const Word32 azi /*q22*/, const Word32 ele /*q22*/,
static void get_poly_gains_fx( const Word32 azi /*q22*/, const Word32 ele /*q22*/, const Word32 aziPoly[EFAP_MAX_CHAN_NUM] /*q22*/, const Word32 elePoly[EFAP_MAX_CHAN_NUM] /*q22*/, const Word16 numChan, Word32 *buffer /*q31*/ );
static Word32 get_tri_gain_fx( const Word32 A[2] /*q22*/, const Word32 B[2] /*q22*/, const Word32 C[2] /*q22*/, const Word32 P_minus_A[2] /*q22*/ );
+
/*-----------------------------------------------------------------------*
* EFAP Utils
*-----------------------------------------------------------------------*/
@@ -90,7 +89,6 @@ static Word32 get_tri_gain_fx( const Word32 A[2] /*q22*/, const Word32 B[2] /*q2
static void add_vertex_fx( EFAP_VERTEX *vtxArray, const Word32 azi /*q22*/, const Word32 ele /*q22*/, const Word16 pos, const EFAP_VTX_DMX_TYPE );
static void efap_sort_s_fx( Word16 *x, Word16 *idx, const Word16 len );
-
static Word32 vertex_distance_fx( const EFAP_VERTEX *vtxArray, const EFAP_LS_TRIANGLE tri, const Word16 vtxIdx );
static Word32 point_plane_distance_fx( const Word32 P1[3] /*q31*/, const Word32 P2[3] /*q31*/, const Word32 P3[3] /*q31*/, const Word32 X[3] /*q31*/ );
static Word32 point_poly_distance_fx( const EFAP_POLYSET poly, const Word32 X[3] /*q31*/ );
@@ -110,6 +108,7 @@ static Word16 in_poly_fx( const Word32 P[2] /*q22*/, const EFAP_POLYSET poly );
static Word16 in_tri_fx( Word32 A[2] /*q22*/, Word32 B[2] /*q22*/, Word32 C[2] /*q22*/, Word32 P_minus_A[2] /*q22*/ );
static void sph2cart_fx( const Word32 azi /*q22*/, const Word32 ele /*q22*/, Word32 *pos /*q31*/ );
+
/*-----------------------------------------------------------------------*
* Global function definitions
*-----------------------------------------------------------------------*/
@@ -175,6 +174,7 @@ ivas_error efap_init_data_fx(
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for EFAP bufferS\n" ) );
}
+
/* get upper bound of number of polygons required */
polyset_size = efap_poly_limit[num_speaker_nodes - 1];
@@ -636,11 +636,11 @@ static void initial_polyeder_fx(
/* 2. attempt to create a triangle with nonzero area */
tmp = 0;
move32();
- v_sub_fixed( vtxData->vertexArray[tetrahedron[1]].pos, vtxData->vertexArray[tetrahedron[0]].pos, tmp1, 3, 1 ); // tmp1 Q(31-1)
+ v_sub_fx( vtxData->vertexArray[tetrahedron[1]].pos, vtxData->vertexArray[tetrahedron[0]].pos, tmp1, 3, 1 ); // tmp1 Q(31-1)
WHILE( LT_16( tetrahedron[2], numVtx ) )
{
- v_sub_fixed( vtxData->vertexArray[tetrahedron[2]].pos, vtxData->vertexArray[tetrahedron[0]].pos, tmp2, 3, 1 ); // tmp2 Q(31-1)
- efap_crossp_fx( tmp1, tmp2, tmpCross ); // tmpCross Q29
+ v_sub_fx( vtxData->vertexArray[tetrahedron[2]].pos, vtxData->vertexArray[tetrahedron[0]].pos, tmp2, 3, 1 ); // tmp2 Q(31-1)
+ efap_crossp_fx( tmp1, tmp2, tmpCross ); // tmpCross Q29
FOR( i = 0; i < 3; i++ )
{
tmp = L_add( tmp, Mpy_32_32( tmpCross[i], tmpCross[i] ) ); // tmp Q27
@@ -659,8 +659,8 @@ static void initial_polyeder_fx(
move32();
WHILE( LT_16( tetrahedron[3], numVtx ) )
{
- v_sub_fixed( vtxData->vertexArray[tetrahedron[3]].pos, vtxData->vertexArray[tetrahedron[0]].pos, tmp3, 3, 1 ); // tmp3 Q30
- tmp = dotp_fixed( tmp3, tmpCross, 3 ); // tmp Q28
+ v_sub_fx( vtxData->vertexArray[tetrahedron[3]].pos, vtxData->vertexArray[tetrahedron[0]].pos, tmp3, 3, 1 ); // tmp3 Q30
+ tmp = dotp_fx32( tmp3, tmpCross, 3 ); // tmp Q28
IF( GT_32( L_abs( tmp ), POLY_THRESH_Q28 /*1e-4f Q28*/ ) )
{
BREAK;
@@ -867,7 +867,7 @@ static void add_ghost_speakers_fx(
{
tmpAngleDiff[i] = L_sub( tmpAzi[i + 1], tmpAzi[i] ); // q22
move32();
- sectors[i] = ceil_fixed( Mpy_32_32( tmpAngleDiff[i], maxAngle ), Q22 ); // q22
+ sectors[i] = ceil_fx( Mpy_32_32( tmpAngleDiff[i], maxAngle ), Q22 ); // q22
move32();
if ( GT_32( sectors[i], Q22_1 /*1 q22*/ ) )
@@ -877,7 +877,7 @@ static void add_ghost_speakers_fx(
}
tmpAngleDiff[k - 1] = L_sub( L_add( tmpAzi[0], Q22_360_DEG /*360 q22*/ ), tmpAzi[k - 1] ); // q22
- sectors[k - 1] = ceil_fixed( Mpy_32_32( tmpAngleDiff[k - 1], maxAngle ), Q22 ); // q22
+ sectors[k - 1] = ceil_fx( Mpy_32_32( tmpAngleDiff[k - 1], maxAngle ), Q22 ); // q22
if ( GT_32( sectors[k - 1], Q22_1 /*1 q22*/ ) )
{
@@ -1551,7 +1551,7 @@ static void get_poly_gains_fx(
A[1] = elePoly[i - 1]; // q22
move32();
- v_sub_fixed_no_hdrm( P, A, P_minus_A, 2 ); /* Precalculate value of (P-A) q22*/
+ v_sub_fx_no_hdrm( P, A, P_minus_A, 2 ); /* Precalculate value of (P-A) q22*/
FOR( j = i; j < numChan - 2 + i; ++j )
{
@@ -1604,18 +1604,18 @@ static Word32 get_tri_gain_fx(
tmpN[1] = L_sub( C[0], B[0] ); // q22
move32();
- v_sub_fixed_no_hdrm( B, A, tmpSub1, 2 ); // tmpSub1 q22
+ v_sub_fx_no_hdrm( B, A, tmpSub1, 2 ); // tmpSub1 q22
- tmpDot1 = dotp_fixed( tmpN, tmpSub1, 2 ); // Q13
+ tmpDot1 = dotp_fx32( tmpN, tmpSub1, 2 ); // Q13
Word16 exp = Q18;
move16();
Word32 inv_tmpDot2 = L_shl( tmpDot1, norm_l( tmpDot1 ) );
exp = sub( exp, norm_l( tmpDot1 ) );
- Word16 inv_tmpDot1 = Inv16( extract_h( inv_tmpDot2 ), &exp ); // 15-exp
- v_multc_fixed( tmpN, L_shl( inv_tmpDot1, add( Q16, exp ) ), N, 2 ); // 22+31-31->22
+ Word16 inv_tmpDot1 = Inv16( extract_h( inv_tmpDot2 ), &exp ); // 15-exp
+ v_multc_fx( tmpN, L_shl( inv_tmpDot1, add( Q16, exp ) ), N, 2 ); // 22+31-31->22
- tmpDot2 = dotp_fixed( P_minus_A, N, 2 ); // 22+22-31->13
+ tmpDot2 = dotp_fx32( P_minus_A, N, 2 ); // 22+22-31->13
if ( EQ_32( tmpDot2, 8191 ) )
{
@@ -1660,15 +1660,23 @@ static void add_vertex_fx(
move32();
IF( LT_32( Q22_180_DEG /*180 q22*/, ele ) )
- tmp = Q22_180_DEG /*180 q22*/;
+ {
+ tmp = Q22_180_DEG /*180 q22*/;
+ }
ELSE
+ {
tmp = ele; // Q22
+ }
move32();
+
IF( GT_32( -Q22_180_DEG /*180 q22*/, tmp ) )
- vtxArray[pos].ele = -Q22_180_DEG /*180 q22*/;
+ {
+ vtxArray[pos].ele = -Q22_180_DEG /*180 q22*/;
+ }
ELSE
- vtxArray[pos]
- .ele = tmp; // q22
+ {
+ vtxArray[pos].ele = tmp; // q22
+ }
move32();
/* Converting spherical coordinates to cartesians, assuming radius = 1 */
@@ -1678,7 +1686,7 @@ static void add_vertex_fx(
/* IdxAziTmp */
tmp = L_abs( L_sub( Q22_90_DEG /*90 q22*/, L_abs( vtxArray[pos].azi ) ) ); // Q22
- idxAziTmp = L_shr( anint_fixed( tmp, Q22 ), Q22 ); // q22-q22->q0
+ idxAziTmp = L_shr( anint_fx( tmp, Q22 ), Q22 ); // q22-q22->q0
/* IdxEleTmp */
tmp = L_abs( vtxArray[pos].ele ); // q22
@@ -1837,20 +1845,21 @@ static Word32 point_plane_distance_fx( // returns output in Q28
}
/* Cross Product */
- v_sub_fixed( P1, P2, tmpCross1, 3, 1 ); // tmpCross1 q30
- v_sub_fixed( P1, P3, tmpCross2, 3, 1 ); // tmpCross2 q30
+ v_sub_fx( P1, P2, tmpCross1, 3, 1 ); // tmpCross1 q30
+ v_sub_fx( P1, P3, tmpCross2, 3, 1 ); // tmpCross2 q30
/* resultCross = cross(P1-P2,P1-P3) */
efap_crossp_fx( tmpCross1, tmpCross2, resultCross ); // Q29
/* Dot Product */
- tmpNorm = dotp_fixed( resultCross, resultCross, 3 ); // Q27
+ tmpNorm = dotp_fx32( resultCross, resultCross, 3 ); // Q27
Word16 exp = 4;
move16();
- tmpNorm = ISqrt32( tmpNorm, &exp ); // Q29
- v_sub_fixed( X, P1, tmpDot1, 3, 1 ); // Q30
- v_multc_fixed( resultCross, tmpNorm, tmpDot2, 3 ); // Q29 - exp
- dist = L_shl( dotp_fixed( tmpDot1, tmpDot2, 3 ), exp ); // Q28
+ tmpNorm = ISqrt32( tmpNorm, &exp ); // Q29
+ v_sub_fx( X, P1, tmpDot1, 3, 1 ); // Q30
+ v_multc_fx( resultCross, tmpNorm, tmpDot2, 3 ); // Q29 - exp
+ dist = L_shl( dotp_fx32( tmpDot1, tmpDot2, 3 ), exp ); // Q28
+
return dist;
}
@@ -2246,16 +2255,16 @@ static void sort_channels_vertex_fx(
}
/* First Base Vector */
- v_sub_fixed( P2, P1, tmpU, 3, 1 ); // tmpU Q30
+ v_sub_fx( P2, P1, tmpU, 3, 1 ); // tmpU Q30
Word16 exp1 = 2;
move16();
- normU = ISqrt32( dotp_fixed( tmpU, tmpU, 3 ) /*q29*/, &exp1 ); /*q=31-exp1*/
+ normU = ISqrt32( dotp_fx32( tmpU, tmpU, 3 ) /*q29*/, &exp1 ); /*q=31-exp1*/
// normU = L_shl_sat( normU, exp ); //normU Q31
- v_multc_fixed( tmpU, normU, U, 3 ); // U Q30 - exp1
+ v_multc_fx( tmpU, normU, U, 3 ); // U Q30 - exp1
/* Second Base Vector */
- v_sub_fixed( P3, P2, tmpV1, 3, 1 ); // tmpV1 Q30
- v_multc_fixed( U, dotp_fixed( U, tmpV1, 3 ), tmpV2, 3 ); // tmpV2 Q28 - 2*exp1
+ v_sub_fx( P3, P2, tmpV1, 3, 1 ); // tmpV1 Q30
+ v_multc_fx( U, dotp_fx32( U, tmpV1, 3 ), tmpV2, 3 ); // tmpV2 Q28 - 2*exp1
FOR( i = 0; i < 3; i++ )
{
@@ -2263,12 +2272,12 @@ static void sort_channels_vertex_fx(
move32();
}
- v_sub_fixed_no_hdrm( tmpV1, tmpV2, tmpV3, 3 ); // tmpV3 Q30
+ v_sub_fx_no_hdrm( tmpV1, tmpV2, tmpV3, 3 ); // tmpV3 Q30
Word16 exp2 = 2;
move16();
- normV = ISqrt32( dotp_fixed( tmpV3, tmpV3, 3 ) /*q29*/, &exp2 ); // q=31-exp2
+ normV = ISqrt32( dotp_fx32( tmpV3, tmpV3, 3 ) /*q29*/, &exp2 ); // q=31-exp2
- v_multc_fixed( tmpV3, normV, V, 3 ); // V Q30 - exp2
+ v_multc_fx( tmpV3, normV, V, 3 ); // V Q30 - exp2
/* Center of the first Triangle */
FOR( i = 0; i < 3; ++i )
@@ -2286,10 +2295,10 @@ static void sort_channels_vertex_fx(
move32();
}
- v_sub_fixed( tmpP, MC, P, 3, 1 ); // P Q30
+ v_sub_fx( tmpP, MC, P, 3, 1 ); // P Q30
- x = dotp_fixed( P, U, 3 ); // x Q29 - exp1
- y = dotp_fixed( P, V, 3 ); // y Q29 - exp2
+ x = dotp_fx32( P, U, 3 ); // x Q29 - exp1
+ y = dotp_fx32( P, V, 3 ); // y Q29 - exp2
// Executing azi[i] = atan2f( y, x );
azi[i] = L_shl( BASOP_util_atan2( y, x, sub( exp2, exp1 ) ), Q16 ); // azi 2Q29
@@ -2297,7 +2306,7 @@ static void sort_channels_vertex_fx(
}
/* Sorting the azi vec */
- v_sort_ind_fixed( azi, order, lengthChannels );
+ v_sort_ind_fx( azi, order, lengthChannels );
/* Updating the channel array */
FOR( i = 0; i < lengthChannels; ++i )
@@ -2445,7 +2454,7 @@ static Word16 in_poly_fx( /* Angles are in Q22 */
A[1] = poly.polyEle[0]; // q22
move32();
- v_sub_fixed_no_hdrm( P, A, P_minus_A, 2 ); /* Precalculate value of (P-A) q22*/
+ v_sub_fx_no_hdrm( P, A, P_minus_A, 2 ); /* Precalculate value of (P-A) q22*/
FOR( n = 1; n < sub( numVertices, 1 ); ++n )
{
@@ -2514,8 +2523,8 @@ static Word16 in_tri_fx(
I'll just compute the determinant and if it's equal to 0, that means the two vectors are colinear
*/
- v_sub_fixed_no_hdrm( B, A, tmpDot1, 2 ); // tmpDot1 q22
- v_sub_fixed_no_hdrm( C, A, tmpDot2, 2 ); // tmpDot2 q22
+ v_sub_fx_no_hdrm( B, A, tmpDot1, 2 ); // tmpDot1 q22
+ v_sub_fx_no_hdrm( C, A, tmpDot2, 2 ); // tmpDot2 q22
/* Verification of the non-colinearity : Q22 * Q22 = Q13 */
invFactor = Msub_32_32( Mpy_32_32( tmpDot1[0], tmpDot2[1] ), tmpDot1[1], tmpDot2[0] ); /*q22+q22-q31->q13*/
diff --git a/lib_rend/ivas_hrtf_fx.c b/lib_rend/ivas_hrtf_fx.c
index 958f38dc440db2e01d23d6aa8ff2f12d2b62b0f5..8bc3c037980dc68ea0f0efb65cd69a47a63d27bc 100644
--- a/lib_rend/ivas_hrtf_fx.c
+++ b/lib_rend/ivas_hrtf_fx.c
@@ -83,8 +83,6 @@ void ivas_HRTF_binary_close_fx(
}
-#ifdef FIX_CREND_SIMPLIFY_CODE
-
/*-----------------------------------------------------------------------*
* ivas_HRTF_CRend_binary_open()
*
@@ -131,35 +129,6 @@ ivas_error ivas_HRTF_CRend_binary_open_buffers_int16(
return IVAS_ERR_OK;
}
-#else
-/*-----------------------------------------------------------------------*
- * ivas_HRTF_CRend_binary_open()
- *
- * Allocate HRTF binary handle
- *-----------------------------------------------------------------------*/
-
-ivas_error ivas_HRTF_CRend_binary_open_fx(
- HRTFS_CREND **hSetOfHRTF )
-{
- /* Allocate HR filter set for headphones configuration */
- *hSetOfHRTF = (HRTFS_CREND *) malloc( sizeof( HRTFS_CREND ) );
- IF( *hSetOfHRTF == NULL )
- {
- return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for set of HRTF binary!" );
- }
-
- ( *hSetOfHRTF )->hHRTF_hrir_combined = NULL;
- ( *hSetOfHRTF )->hHRTF_hrir_hoa3 = NULL;
- ( *hSetOfHRTF )->hHRTF_hrir_hoa2 = NULL;
- ( *hSetOfHRTF )->hHRTF_hrir_foa = NULL;
- ( *hSetOfHRTF )->hHRTF_brir_combined = NULL;
-
- return IVAS_ERR_OK;
-}
-
-#endif
-
-#ifdef FIX_CREND_SIMPLIFY_CODE
/*-------------------------------------------------------------------*
* ivas_HRTF_CRend_binary_close()
@@ -217,28 +186,6 @@ void ivas_HRTF_CRend_binary_close_fx(
return;
}
-#else
-/*-------------------------------------------------------------------*
- * ivas_HRTF_CRend_binary_close()
- *
- * Close HRTF CRend binary handle
- *-------------------------------------------------------------------*/
-
-void ivas_HRTF_CRend_binary_close_fx(
- HRTFS_CREND **hSetOfHRTF )
-{
- test();
- IF( hSetOfHRTF == NULL || *hSetOfHRTF == NULL )
- {
- return;
- }
-
- free( *hSetOfHRTF );
- *hSetOfHRTF = NULL;
-
- return;
-}
-#endif
/*-----------------------------------------------------------------------*
@@ -375,12 +322,7 @@ void ivas_HRTF_statistics_close_fx(
ivas_error ivas_HRTF_statistics_init_fx(
HRTFS_STATISTICS_HANDLE *hHrtfStatistics,
-#ifdef FIX_CREND_SIMPLIFY_CODE
- const Word32 sampleRate
-#else
- Word32 sampleRate
-#endif
-)
+ const Word32 sampleRate )
{
HRTFS_STATISTICS *HrtfStatistics;
@@ -419,15 +361,9 @@ ivas_error ivas_HRTF_statistics_init_fx(
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
-#ifdef USE_REVERB_16BIT_ROM
Copy_Scale_sig_16_32_r( defaultHRIR_left_avg_power_48kHz_fx, HrtfStatistics->average_energy_l_dyn, LR_IAC_LENGTH_NR_FC, Q28 - defaultHRIR_Q_48kHz_fx ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
Copy_Scale_sig_16_32_r( defaultHRIR_right_avg_power_48kHz_fx, HrtfStatistics->average_energy_r_dyn, LR_IAC_LENGTH_NR_FC, Q28 - defaultHRIR_Q_48kHz_fx ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
Copy_Scale_sig_16_32_r( defaultHRIR_coherence_48kHz_fx, HrtfStatistics->inter_aural_coherence_dyn, LR_IAC_LENGTH_NR_FC, Q26 - defaultHRIR_Q_48kHz_fx ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
-#else
- floatToFixed_arr32( defaultHRIR_left_avg_power_48kHz_fx, HrtfStatistics->average_energy_l_dyn, Q28, LR_IAC_LENGTH_NR_FC ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
- floatToFixed_arr32( defaultHRIR_right_avg_power_48kHz_fx, HrtfStatistics->average_energy_r_dyn, Q28, LR_IAC_LENGTH_NR_FC ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
- floatToFixed_arr32( defaultHRIR_coherence_48kHz_fx, HrtfStatistics->inter_aural_coherence_dyn, Q26, LR_IAC_LENGTH_NR_FC ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
-#endif
HrtfStatistics->average_energy_l = (const Word32 *) HrtfStatistics->average_energy_l_dyn;
HrtfStatistics->average_energy_r = (const Word32 *) HrtfStatistics->average_energy_r_dyn;
HrtfStatistics->inter_aural_coherence = (const Word32 *) HrtfStatistics->inter_aural_coherence_dyn;
@@ -448,15 +384,9 @@ ivas_error ivas_HRTF_statistics_init_fx(
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
-#ifdef USE_REVERB_16BIT_ROM
Copy_Scale_sig_16_32_r( defaultHRIR_left_avg_power_32kHz_fx, HrtfStatistics->average_energy_l_dyn, LR_IAC_LENGTH_NR_FC, Q28 - defaultHRIR_Q_32kHz_fx ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
Copy_Scale_sig_16_32_r( defaultHRIR_right_avg_power_32kHz_fx, HrtfStatistics->average_energy_r_dyn, LR_IAC_LENGTH_NR_FC, Q28 - defaultHRIR_Q_32kHz_fx ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
Copy_Scale_sig_16_32_r( defaultHRIR_coherence_32kHz_fx, HrtfStatistics->inter_aural_coherence_dyn, LR_IAC_LENGTH_NR_FC, Q26 - defaultHRIR_Q_32kHz_fx ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
-#else
- floatToFixed_arr32( defaultHRIR_left_avg_power_32kHz_fx, HrtfStatistics->average_energy_l_dyn, Q28, LR_IAC_LENGTH_NR_FC ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
- floatToFixed_arr32( defaultHRIR_right_avg_power_32kHz_fx, HrtfStatistics->average_energy_r_dyn, Q28, LR_IAC_LENGTH_NR_FC ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
- floatToFixed_arr32( defaultHRIR_coherence_32kHz_fx, HrtfStatistics->inter_aural_coherence_dyn, Q26, LR_IAC_LENGTH_NR_FC ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
-#endif
HrtfStatistics->average_energy_l = (const Word32 *) HrtfStatistics->average_energy_l_dyn;
HrtfStatistics->average_energy_r = (const Word32 *) HrtfStatistics->average_energy_r_dyn;
HrtfStatistics->inter_aural_coherence = (const Word32 *) HrtfStatistics->inter_aural_coherence_dyn;
@@ -477,15 +407,9 @@ ivas_error ivas_HRTF_statistics_init_fx(
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
-#ifdef USE_REVERB_16BIT_ROM
Copy_Scale_sig_16_32_r( defaultHRIR_left_avg_power_16kHz_fx, HrtfStatistics->average_energy_l_dyn, LR_IAC_LENGTH_NR_FC_16KHZ, Q28 - defaultHRIR_Q_16kHz_fx ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
Copy_Scale_sig_16_32_r( defaultHRIR_right_avg_power_16kHz_fx, HrtfStatistics->average_energy_r_dyn, LR_IAC_LENGTH_NR_FC_16KHZ, Q28 - defaultHRIR_Q_16kHz_fx ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
Copy_Scale_sig_16_32_r( defaultHRIR_coherence_16kHz_fx, HrtfStatistics->inter_aural_coherence_dyn, LR_IAC_LENGTH_NR_FC_16KHZ, Q26 - defaultHRIR_Q_16kHz_fx ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
-#else
- floatToFixed_arr32( defaultHRIR_left_avg_power_16kHz_fx, HrtfStatistics->average_energy_l_dyn, Q28, LR_IAC_LENGTH_NR_FC_16KHZ ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
- floatToFixed_arr32( defaultHRIR_right_avg_power_16kHz_fx, HrtfStatistics->average_energy_r_dyn, Q28, LR_IAC_LENGTH_NR_FC_16KHZ ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
- floatToFixed_arr32( defaultHRIR_coherence_16kHz_fx, HrtfStatistics->inter_aural_coherence_dyn, Q26, LR_IAC_LENGTH_NR_FC_16KHZ ); /* tables from which lr_energy_and_iac is updated has Q27 for i=2 */
-#endif
HrtfStatistics->average_energy_l = (const Word32 *) HrtfStatistics->average_energy_l_dyn;
HrtfStatistics->average_energy_r = (const Word32 *) HrtfStatistics->average_energy_r_dyn;
HrtfStatistics->inter_aural_coherence = (const Word32 *) HrtfStatistics->inter_aural_coherence_dyn;
diff --git a/lib_rend/ivas_mcmasa_ana_fx.c b/lib_rend/ivas_mcmasa_ana_fx.c
index 0236b080b5da2c5179acc2aac1bc8e06b3dd945a..dbaf5b7d90079e783bb42ca5e2f5c9d995630a96 100644
--- a/lib_rend/ivas_mcmasa_ana_fx.c
+++ b/lib_rend/ivas_mcmasa_ana_fx.c
@@ -715,8 +715,8 @@ void ivas_mcmasa_param_est_ana_fx(
}
/* Y */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[1][0], Foa_RealBuffer_fx[1], num_freq_bins ); /*inp_q*/
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[1][0], Foa_ImagBuffer_fx[1], num_freq_bins ); /*inp_q*/
+ v_multc_fx( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[1][0], Foa_RealBuffer_fx[1], num_freq_bins ); /*inp_q*/
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[1][0], Foa_ImagBuffer_fx[1], num_freq_bins ); /*inp_q*/
FOR( i = 1; i < numAnalysisChannels; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hMcMasa->chnlToFoaMtx_fx[1][i], Foa_RealBuffer_fx[1], num_freq_bins ); /*inp_q*/
@@ -731,8 +731,8 @@ void ivas_mcmasa_param_est_ana_fx(
}
ELSE
{
- v_multc_fixed( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[2][0], Foa_RealBuffer_fx[2], num_freq_bins ); /*inp_q*/
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[2][0], Foa_ImagBuffer_fx[2], num_freq_bins ); /*inp_q*/
+ v_multc_fx( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[2][0], Foa_RealBuffer_fx[2], num_freq_bins ); /*inp_q*/
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[2][0], Foa_ImagBuffer_fx[2], num_freq_bins ); /*inp_q*/
FOR( i = 1; i < numAnalysisChannels; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hMcMasa->chnlToFoaMtx_fx[2][i], Foa_RealBuffer_fx[2], num_freq_bins ); /*inp_q*/
@@ -740,8 +740,8 @@ void ivas_mcmasa_param_est_ana_fx(
}
}
/* X */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[3][0], Foa_RealBuffer_fx[3], num_freq_bins ); /*inp_q*/
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[3][0], Foa_ImagBuffer_fx[3], num_freq_bins ); /*inp_q*/
+ v_multc_fx( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[3][0], Foa_RealBuffer_fx[3], num_freq_bins ); /*inp_q*/
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaMtx_fx[3][0], Foa_ImagBuffer_fx[3], num_freq_bins ); /*inp_q*/
FOR( i = 1; i < numAnalysisChannels; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hMcMasa->chnlToFoaMtx_fx[3][i], Foa_RealBuffer_fx[3], num_freq_bins ); /*inp_q*/
@@ -754,8 +754,8 @@ void ivas_mcmasa_param_est_ana_fx(
Copy32( Foa_ImagBuffer_fx[0], FoaEven_ImagBuffer_fx[0], num_freq_bins ); /*inp_q*/
/* Y */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[1][0], FoaEven_RealBuffer_fx[1], num_freq_bins ); /*inp_q*/
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[1][0], FoaEven_ImagBuffer_fx[1], num_freq_bins ); /*inp_q*/
+ v_multc_fx( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[1][0], FoaEven_RealBuffer_fx[1], num_freq_bins ); /*inp_q*/
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[1][0], FoaEven_ImagBuffer_fx[1], num_freq_bins ); /*inp_q*/
FOR( i = 1; i < numAnalysisChannels; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hMcMasa->chnlToFoaEvenMtx_fx[1][i], FoaEven_RealBuffer_fx[1], num_freq_bins ); /*inp_q*/
@@ -767,8 +767,8 @@ void ivas_mcmasa_param_est_ana_fx(
set_zero_fx( FoaEven_ImagBuffer_fx[2], num_freq_bins );
/* X */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[3][0], FoaEven_RealBuffer_fx[3], num_freq_bins ); /*inp_q*/
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[3][0], FoaEven_ImagBuffer_fx[3], num_freq_bins ); /*inp_q*/
+ v_multc_fx( Chnl_RealBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[3][0], FoaEven_RealBuffer_fx[3], num_freq_bins ); /*inp_q*/
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hMcMasa->chnlToFoaEvenMtx_fx[3][0], FoaEven_ImagBuffer_fx[3], num_freq_bins ); /*inp_q*/
FOR( i = 1; i < numAnalysisChannels; i++ )
{
v_multc_acc_32_32( Chnl_RealBuffer_fx[i], hMcMasa->chnlToFoaEvenMtx_fx[3][i], FoaEven_RealBuffer_fx[3], num_freq_bins ); /*inp_q*/
@@ -778,8 +778,7 @@ void ivas_mcmasa_param_est_ana_fx(
/* Direction estimation */
computeIntensityVector_ana_fx( hMcMasa->band_grouping, Foa_RealBuffer_fx, Foa_ImagBuffer_fx, num_freq_bands, intensity_real_fx, intensity_real_q, inp_q );
- computeDirectionVectors_fixed( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], 0,
- intensity_real_q ); /* Q direction_vector_fx = Q30*/
+ computeDirectionVectors_fx2( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], 0, intensity_real_q ); /* Q direction_vector_fx = Q30*/
/* Power and intensity estimation for diffuseness */
computeIntensityVector_ana_fx( hMcMasa->band_grouping, FoaEven_RealBuffer_fx, FoaEven_ImagBuffer_fx, num_freq_bands, intensity_even_real_fx, intensity_even_real_q, inp_q );
@@ -824,7 +823,8 @@ void ivas_mcmasa_param_est_ana_fx(
Copy32( reference_power_fx[ts], &( hMcMasa->buffer_energy_fx[i_mult( index - 1, num_freq_bands )] ), num_freq_bands );
hMcMasa->buffer_energy_q[index - 1] = reference_power_q;
move16();
- computeDiffuseness_fixed( hMcMasa->buffer_intensity_real_fx, hMcMasa->buffer_energy_fx, num_freq_bands, diffuseness_vector_fx, hMcMasa->buffer_intensity_real_q, hMcMasa->buffer_energy_q, out_exp ); // out_exp = Q30
+ computeDiffuseness_fx( hMcMasa->buffer_intensity_real_fx, hMcMasa->buffer_energy_fx, num_freq_bands, diffuseness_vector_fx, hMcMasa->buffer_intensity_real_q, hMcMasa->buffer_energy_q, out_exp ); // out_exp = Q30
+
/* Compute vertical diffuseness, and tune original diffuseness if needed */
IF( !hMcMasa->isHorizontalSetup )
{
diff --git a/lib_rend/ivas_objectRenderer_fx.c b/lib_rend/ivas_objectRenderer_fx.c
index 463c0315872826c42cc368498a3b7e080e00be3a..fc1acd28352267ee9c6dbcbd33625f31bceb4874 100644
--- a/lib_rend/ivas_objectRenderer_fx.c
+++ b/lib_rend/ivas_objectRenderer_fx.c
@@ -234,6 +234,7 @@ ivas_error ivas_td_binaural_open_unwrap_fx(
}
}
}
+
test();
test();
IF( EQ_16( ivas_format, ISM_FORMAT ) || EQ_16( ivas_format, MASA_ISM_FORMAT ) || EQ_16( ivas_format, SBA_ISM_FORMAT ) )
@@ -257,7 +258,8 @@ ivas_error ivas_td_binaural_open_unwrap_fx(
move32();
move32();
move32();
- if ( NULL == distAtt )
+
+ IF( NULL == distAtt )
{
DistAtten.DistAttenModel = TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED; // Q0
move16();
@@ -268,13 +270,18 @@ ivas_error ivas_td_binaural_open_unwrap_fx(
DistAtten.RollOffFactor_fx = ONE_IN_Q30; // Q30
move32();
}
- else
+ ELSE
{
DistAtten.DistAttenModel = TDREND_DIST_ATTEN_MODEL_INV_DIST_CLAMPED; // Q0
+ move16();
DistAtten.MaxDist_fx = distAtt[0];
+ move32();
DistAtten.RefDist_fx = distAtt[1];
+ move32();
DistAtten.RollOffFactor_fx = distAtt[2];
+ move32();
}
+
IF( NE_32( ( error = TDREND_MIX_SRC_SetDirAtten_fx( pBinRendTd, nS, DirAtten_p ) ), IVAS_ERR_OK ) )
{
return error;
@@ -290,11 +297,7 @@ ivas_error ivas_td_binaural_open_unwrap_fx(
test();
IF( NE_16( ivas_format, MASA_ISM_FORMAT ) && NE_16( ivas_format, SBA_ISM_FORMAT ) )
{
-#ifdef USE_TDREND_16BIT_ROM
*binaural_latency_ns = L_shr_r( Mpy_32_32_r( ( *hBinRendererTd )->HrFiltSet_p->latency_s_fx, (Word32) 1000000000 ), ( *hBinRendererTd )->HrFiltSet_p->latency_s_Q_fx );
-#else
- *binaural_latency_ns = Mult_32_32( ( *hBinRendererTd )->HrFiltSet_p->latency_s_fx, 1000000000 /* 1000000000.f in Q0 */ );
-#endif
move32();
}
@@ -452,13 +455,11 @@ ivas_error ivas_td_binaural_renderer_unwrap_fx(
}
/* Render subframe */
-
IF( NE_32( ( error = TDREND_GetMix_fx( hBinRendererTd, output_fx, subframe_length, subframe_idx ) ), IVAS_ERR_OK ) )
{
return error;
}
-
/* Advance subframe pointer */
c_indx = 0;
move16();
@@ -508,6 +509,10 @@ ivas_error TDREND_GetMix_fx(
Word32 hrf_left_delta[SFX_SPAT_BIN_MAX_FILTER_LENGTH];
Word32 hrf_right_delta[SFX_SPAT_BIN_MAX_FILTER_LENGTH];
Word16 intp_count;
+#ifdef NONBE_1300_TDREND_LARGE_ITD
+ Word16 currShift, prevShift, transition_len, length_in2;
+ Word16 tmp1, tmp2, tmp_e, tmp3, tmp4, tmp_e2, tlen1, tlen2;
+#endif
Word16 hrf_left_delta_e = 0, hrf_right_delta_e = 0;
move16();
@@ -544,6 +549,29 @@ ivas_error TDREND_GetMix_fx(
&intp_count, &Src_p->filterlength, &Src_p->itd,
&Src_p->Gain_fx,
Src_p );
+#ifdef NONBE_1300_TDREND_LARGE_ITD
+ /* For large ITD values at lower sampling rate, check if the transition can be done */
+ IF( LT_16( i_mult( Src_p->previtd, Src_p->itd ), 0 ) )
+ {
+ currShift = abs_s( Src_p->itd ); // Q0
+ prevShift = abs_s( Src_p->previtd );
+ transition_len = sub( subframe_length, s_max( 0, sub( SFX_SPAT_BIN_SINC_M, currShift ) ) );
+ tmp1 = imult1616( transition_len, prevShift ); // Q0
+ tmp2 = add( prevShift, currShift ); // Q0
+ tmp3 = BASOP_Util_Divide1616_Scale( tmp1, tmp2, &tmp_e ); // exp(tmp_e)
+ tmp_e2 = BASOP_Util_Add_MantExp( tmp3, tmp_e, ONE_IN_Q14, 0, &tmp4 ); // exp(tmp_e2)
+ tlen1 = shr( tmp4, sub( 15, tmp_e2 ) ); // Q0
+ tlen2 = sub( transition_len, tlen1 ); // Q0
+ length_in2 = sub( tlen2, currShift ); // Q0
+
+ IF( LE_16( length_in2, 0 ) )
+ {
+ /* Subframe too short for ITD transition -- change to ITD=0 and push the rest of the transition to next subframe */
+ Src_p->itd = 0;
+ move16();
+ }
+ }
+#endif
}
/* Render source if needed */
@@ -586,10 +614,8 @@ static void TDREND_Clear_Update_flags_fx(
{
hBinRendererTd->Sources[i]->SrcSpatial_p->Updated = FALSE;
move16();
-#ifdef OBJ_EDITING_API
hBinRendererTd->Sources[i]->SrcRend_p->SrcGainUpdated = FALSE;
move16();
-#endif
}
return;
@@ -649,6 +675,10 @@ ivas_error TDREND_Update_object_positions_fx(
return error;
}
#endif
+ if ( ( error = TDREND_MIX_SRC_SetGain( hBinRendererTd, nS, hIsmMetaData[nS]->gain_fx ) ) != IVAS_ERR_OK ) // TODO: Check Gain has correct Q-value
+ {
+ return error;
+ }
IF( hIsmMetaData[nS]->non_diegetic_flag )
{
@@ -955,6 +985,7 @@ ivas_error ivas_td_binaural_renderer_ext_fx(
move32();
hIsmMetaData[0]->radius_fx = currentPos->radius_fx;
move32();
+ hIsmMetaData[0]->gain_fx = ONE_IN_Q29; // TODO: check Q value
hIsmMetaData[0]->non_diegetic_flag = currentPos->non_diegetic_flag;
move16();
}
diff --git a/lib_rend/ivas_objectRenderer_hrFilt_fx.c b/lib_rend/ivas_objectRenderer_hrFilt_fx.c
index f5dbaea7350343b1967a31f3515a61a17a01ecc1..2a67d7a39a5277407bf20b818de4324978ac5b66 100644
--- a/lib_rend/ivas_objectRenderer_hrFilt_fx.c
+++ b/lib_rend/ivas_objectRenderer_hrFilt_fx.c
@@ -44,13 +44,13 @@
* Local function prototypes
*---------------------------------------------------------------------*/
-static Word32 round_fixed( Word32 n, Word16 q );
static void getPeriodicBSplineSampVec_fx( Word32 *BfVec_fx, Word16 *AzIdx, const Word16 NumBFs, const Word32 t_fx, Word16 *num_az_idx, const Word32 knot_interval_fx, const Word32 azimKSeq_0_fx, const Word16 azimSegSamples, const Word32 *azimBsShape_fx, const Word16 subSampFactor );
static void getStandardBSplineSampVec_fx( Word32 *BfVec_fx, Word16 *NzIdx, Word16 *num_idx, const Word16 NumBFs, const Word32 t_fx, const Word32 *KSeq_fx, const Word16 SegSamples, const Word16 *BsLen, const Word16 *BsStart, const Word32 *BsShape_fx );
static void GenerateFilter_fx( const Word32 elev, Word32 azim, ModelParams_t *model, ModelEval_t *modelEval );
static void GenerateITD_fx( const Word32 elev, Word32 azim, ModelParamsITD_t *model, ModelEval_t *modelEval );
static void SkipSmallest_ValueIndex_fx( Word16 *use_inds, const ValueIndex_t *VI, const Word16 N, const Word16 n_smallest );
+
/*-------------------------------------------------------------------*
* TDREND_REND_RenderSourceHRFilt()
*
@@ -151,21 +151,19 @@ void GetFilterFromAngle_fx(
return;
}
-static Word32 round_fixed( /* o : Output value Q0 */
- Word32 num, /* i : Input value */
- Word16 q /* i : Input q-factor */
+
+/* o : Output value Q0 */
+static Word32 round_hrFilt_fx(
+ Word32 num, /* i : Input value */
+ Word16 q /* i : Input q-factor */
)
{
-#ifdef USE_TDREND_16BIT_ROM
Word32 half;
if ( q == 0 )
{
return num;
}
half = L_shl( 1, sub( q, 1 ) );
-#else
- Word32 half = L_shl( 1, sub( q, 1 ) );
-#endif
half = L_shr( half, 1 ); // one guard bit
num = L_shr( num, 1 ); // one guard bit
@@ -330,17 +328,13 @@ static void GenerateFilter_fx(
ESynL_e = sub( ESynL_e, 32 );
ESynL = W_shl_sat_l( temp1, ESynL_e );
ESynL_e = sub( BMEnergiesL_e, ESynL_e );
-#ifdef FIX_1166_TDREND_DIV0
ESynL = BASOP_Util_Add_Mant32Exp( ESynL, ESynL_e, EPSILON_FX_M, EPSILON_FX_E, &ESynL_e );
-#endif
ESynR_e = W_norm( temp2 );
ESynR_e = sub( ESynR_e, 32 );
ESynR = W_shl_sat_l( temp2, ESynR_e );
ESynR_e = sub( BMEnergiesR_e, ESynR_e );
-#ifdef FIX_1166_TDREND_DIV0
ESynR = BASOP_Util_Add_Mant32Exp( ESynR, ESynR_e, EPSILON_FX_M, EPSILON_FX_E, &ESynR_e );
-#endif
tmp32 = L_deposit_h( BASOP_Util_Divide3232_Scale( ETotL, ESynL, &ScaleL_e ) );
@@ -565,6 +559,7 @@ static void GenerateITD_fx(
Word32 tmp32 = Mpy_32_16_1( modelEval->itdMod_fx, model->resamp_factor_fx ); // Q = 31 - ( itdMod_e + 1 )
Word16 tmp_q = sub( 30, itdMod_e );
+
IF( tmp_q < 0 )
{
tmp32 = L_shr( tmp32, tmp_q );
@@ -577,7 +572,7 @@ static void GenerateITD_fx(
tmp_q = 31;
move16();
}
- modelEval->itdMod_fx = L_negate( round_fixed( tmp32, tmp_q ) ); // Q0
+ modelEval->itdMod_fx = L_negate( round_hrFilt_fx( tmp32, tmp_q ) ); // Q0
return;
}
@@ -627,7 +622,7 @@ static void getPeriodicBSplineSampVec_fx(
tmp32 = L_deposit_h( BASOP_Util_Divide3232_Scale( L_sub( t_fx, azimKSeq_0_fx ), tmp32, &tmp_e2 ) );
tmp_e2 = add( tmp_e2, sub( 9, tmp_e1 ) );
tmp32 = L_shr( tmp32, sub( 9, tmp_e2 ) ); // Q22 (assuming tmp32 will be in range of Q22)
- d0 = extract_l( round_fixed( tmp32, Q22 ) );
+ d0 = extract_l( round_hrFilt_fx( tmp32, Q22 ) );
}
/* find segment */
@@ -695,7 +690,7 @@ static void getStandardBSplineSampVec_fx(
tmp32 = L_deposit_h( BASOP_Util_Divide3232_Scale( L_sub( t_fx, KSeq_fx[0] ), tmp32, &tmp_e3 ) );
tmp_e3 = add( tmp_e3, sub( 9, tmp_e2 ) );
tmp32 = L_shr( tmp32, sub( 9, tmp_e3 ) ); // Q22 (assuming tmp32 will be in range of Q22)
- d0 = extract_l( round_fixed( tmp32, 22 ) );
+ d0 = extract_l( round_hrFilt_fx( tmp32, 22 ) );
/* find segment */
nI = 0;
@@ -782,13 +777,11 @@ void BSplineModelEvalDealloc_fx(
IF( model->modelROM )
{
-#ifdef USE_TDREND_16BIT_ROM
- for ( i = 0; i < model->num_unique_azim_splines; i++ )
+ FOR( i = 0; i < model->num_unique_azim_splines; i++ )
{
free( model->azimBsShape_dyn_fx[i] );
}
free( model->azimBsShape_dyn_fx );
-#endif
free( (void *) model->azimBsShape_fx ); /* void* cast needed to please both gcc and Visual studio compilers. Deallocating const float** should be fine and gcc agrees, but Visual studio complains. */
FOR( i = 0; i < model->elevDim3; i++ )
{
diff --git a/lib_rend/ivas_objectRenderer_mix_fx.c b/lib_rend/ivas_objectRenderer_mix_fx.c
index 31e43f9e2e2764e7aadb38e2abc31ae0ee05a0b8..28ee13931346b1418d16bbc945f33fc3765e62a7 100644
--- a/lib_rend/ivas_objectRenderer_mix_fx.c
+++ b/lib_rend/ivas_objectRenderer_mix_fx.c
@@ -38,26 +38,13 @@
#include "ivas_error.h"
#include "wmc_auto.h"
#include "ivas_rom_rend.h"
-#ifndef FIX_989_TD_REND_ROM
-#include "ivas_rom_binaural_crend_head.h"
-#endif
#include "ivas_prot_fx.h"
-/*-------------------------------------------------------------------*
- * Local constants
- *-------------------------------------------------------------------*/
-#ifndef FIX_989_TD_REND_ROM
-#define RESAMPLE_FACTOR_16_48 ( 16.0f / 48.0f )
-#define RESAMPLE_FACTOR_32_48 ( 32.0f / 48.0f )
-#endif
-#ifndef FIX_CREND_SIMPLIFY_CODE
-#define RESAMPLE_FACTOR_16_48_FX ( 5461 ) // Q14
-#define RESAMPLE_FACTOR_32_48_FX ( 10922 ) // Q14
-#endif
/*-------------------------------------------------------------------------
* Local functions declaration
*-------------------------------------------------------------------------*/
+
static ivas_error DefaultBSplineModel_fx( TDREND_HRFILT_FiltSet_t *HrFiltSet_p, const Word32 output_Fs );
/*-------------------------------------------------------------------*
@@ -188,10 +175,9 @@ void TDREND_MIX_Dealloc_fx(
}
}
-#ifdef USE_TDREND_16BIT_ROM
IF( hBinRendererTd->HrFiltSet_p->ModelParams.modelROM )
{
- if ( hBinRendererTd->HrFiltSet_p->ModelParams.UseItdModel )
+ IF( hBinRendererTd->HrFiltSet_p->ModelParams.UseItdModel )
{
free( hBinRendererTd->HrFiltSet_p->ModelParamsITD.elevKSeq_dyn_fx );
free( hBinRendererTd->HrFiltSet_p->ModelParamsITD.azimKSeq_dyn_fx );
@@ -200,15 +186,11 @@ void TDREND_MIX_Dealloc_fx(
free( hBinRendererTd->HrFiltSet_p->ModelParamsITD.elevBsShape_dyn_fx );
}
free( hBinRendererTd->HrFiltSet_p->ModelParams.elevKSeq_dyn_fx );
-#ifndef FIX_989_TD_REND_ROM
- free( hBinRendererTd->HrFiltSet_p->ModelParams.azimDim2_dyn );
-#endif
free( hBinRendererTd->HrFiltSet_p->ModelParams.AlphaL_dyn_fx );
free( hBinRendererTd->HrFiltSet_p->ModelParams.AlphaR_dyn_fx );
free( hBinRendererTd->HrFiltSet_p->ModelParams.elevBsShape_dyn_fx );
}
-#endif
IF( EQ_16( hBinRendererTd->HrFiltSet_p->ModelParams.modelROM, 1 ) )
@@ -341,10 +323,6 @@ ivas_error TDREND_MIX_AddSrc_fx(
TDREND_SRC_t *Src_p;
ivas_error error;
-#ifndef FIX_989_TD_REND_ROM
- error = IVAS_ERR_OK;
-#endif
- move32();
/* Get unique source index */
*SrcInd = add( hBinRendererTd->MaxSrcInd, 1 ); // Q0
move16();
@@ -387,13 +365,10 @@ ivas_error TDREND_MIX_AddSrc_fx(
}
}
-#ifdef FIX_989_TD_REND_ROM
return IVAS_ERR_OK;
-#else
- return error;
-#endif
}
+
/*-------------------------------------------------------------------*
* BSplineModelEvalAlloc()
*
@@ -434,9 +409,7 @@ static ivas_error DefaultBSplineModel_fx(
ModelParamsITD_t *modelITD;
Word16 i, j;
ivas_error error;
-#ifdef FIX_989_TD_REND_ROM
Word16 azimSegSamples;
-#endif
HrFiltSet_p->FilterMethod = TDREND_HRFILT_Method_BSplineModel;
move16();
model = &( HrFiltSet_p->ModelParams );
@@ -447,7 +420,6 @@ static ivas_error DefaultBSplineModel_fx(
model->modelROM = TRUE;
move16();
-#ifdef FIX_989_TD_REND_ROM
model->UseItdModel = defaultHRIR_rom_model_configuration[0]; // Q0
move16();
model->elevDim3 = defaultHRIR_rom_model_configuration[1]; // Q0
@@ -458,102 +430,52 @@ static ivas_error DefaultBSplineModel_fx(
move16();
model->elevSegSamples = defaultHRIR_rom_model_configuration[4]; // Q0
move16();
- model->elevBsLen = defaultHRIR_rom_elevBsLen; // Q0
- model->elevBsStart = defaultHRIR_rom_elevBsStart; // Q0
-#else
- /* int16_t parameters */
- model->UseItdModel = 1; // Q0
- move16();
- model->SplineDegree = 4; // Q0
- move16();
- model->elevDim2 = 17; // Q0
- move16();
- model->elevDim3 = 15; // Q0
- move16();
- model->AlphaN = 470; // Q0
- move16();
- model->num_unique_azim_splines = 1; // Q0
- move16();
- model->elevSegSamples = 4; // Q0
- move16();
- model->elevBsLen[0] = 5; // Q0
- move16();
- model->elevBsLen[1] = 9; // Q0
- move16();
- model->elevBsLen[2] = 13; // Q0
- move16();
- model->elevBsLen[3] = 9; // Q0
- move16();
- model->elevBsStart[0] = 0; // Q0
- move16();
- model->elevBsStart[1] = 5; // Q0
- move16();
- model->elevBsStart[2] = 14; // Q0
- move16();
- model->elevBsStart[3] = 27; // Q0
- move16();
-
- model->azimDim2 = defaultHRIR_rom_azimDim2; // Q0
-#endif
+ model->elevBsLen = defaultHRIR_rom_elevBsLen; // Q0
+ model->elevBsStart = defaultHRIR_rom_elevBsStart; // Q0
model->azimDim3 = defaultHRIR_rom_azimDim3; // Q0
model->azim_start_idx = defaultHRIR_rom_azim_start_idx; // Q0
model->azimSegSamples = defaultHRIR_rom_azimSegSamples; // Q0
model->azimShapeIdx = defaultHRIR_rom_azimShapeIdx; // Q0
model->azimShapeSampFactor = defaultHRIR_rom_azimShapeSampFactor; // Q0
-#ifdef USE_TDREND_16BIT_ROM
model->elevKSeq_dyn_fx = (Word32 *) malloc( ( model->elevDim3 - 2 ) * sizeof( Word32 ) );
- if ( model->elevKSeq_dyn_fx == NULL )
+ IF( model->elevKSeq_dyn_fx == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
Copy_Scale_sig_16_32_r( defaultHRIR_rom_elevKSeq_fx, model->elevKSeq_dyn_fx, ( model->elevDim3 - 2 ), Q22 - defaultHRIR_rom_elevKSeq_Q_fx ); // Q22
model->elevKSeq_fx = model->elevKSeq_dyn_fx;
-#else
- model->elevKSeq_fx = defaultHRIR_rom_elevKSeq_fx; // Q22
-#endif
-#ifdef USE_TDREND_16BIT_ROM
model->elevBsShape_dyn_fx = (Word32 *) malloc( sizeof( defaultHRIR_rom_elevBsShape_fx ) * sizeof( Word32 ) / sizeof( Word16 ) );
- if ( model->elevBsShape_dyn_fx == NULL )
+ IF( model->elevBsShape_dyn_fx == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
Copy_Scale_sig_16_32_r( defaultHRIR_rom_elevBsShape_fx, model->elevBsShape_dyn_fx, sizeof( defaultHRIR_rom_elevBsShape_fx ) / sizeof( Word16 ), Q30 - defaultHRIR_rom_elevBsShape_Q_fx ); // Q30
model->elevBsShape_fx = model->elevBsShape_dyn_fx;
-#else
- model->elevBsShape_fx = (const Word32 *) defaultHRIR_rom_elevBsShape_fx; // Q30
-#endif
IF( ( model->azimBsShape_fx = (const Word32 **) malloc( model->num_unique_azim_splines * sizeof( Word32 * ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
}
-#ifdef USE_TDREND_16BIT_ROM
model->azimBsShape_dyn_fx = (Word32 **) malloc( sizeof( Word32 * ) );
- if ( model->azimBsShape_dyn_fx == NULL )
+ IF( model->azimBsShape_dyn_fx == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
model->azimBsShape_dyn_fx[0] = (Word32 *) malloc( sizeof( defaultHRIR_rom_azimBsShape_fx ) * sizeof( Word32 ) / sizeof( Word16 ) );
- if ( model->azimBsShape_dyn_fx[0] == NULL )
+ IF( model->azimBsShape_dyn_fx[0] == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
Copy_Scale_sig_16_32_r( defaultHRIR_rom_azimBsShape_fx, model->azimBsShape_dyn_fx[0], sizeof( defaultHRIR_rom_azimBsShape_fx ) / sizeof( Word16 ), Q30 - defaultHRIR_rom_azimBsShape_Q_fx ); // Q30
model->azimBsShape_fx[0] = model->azimBsShape_dyn_fx[0];
-#else
- model->azimBsShape_fx[0] = defaultHRIR_rom_azimBsShape_fx; // Q30
-#endif
-#ifdef FIX_989_TD_REND_ROM
- if ( ( model->azimKSeq_fx = (Word32 **) malloc( model->elevDim3 * sizeof( Word32 * ) ) ) == NULL )
-#else
- IF( ( model->azimKSeq_fx = (Word32 **) malloc( 18 * sizeof( Word32 * ) ) ) == NULL )
-#endif
+
+ IF( ( model->azimKSeq_fx = (Word32 **) malloc( model->elevDim3 * sizeof( Word32 * ) ) ) == NULL )
{
return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
}
-#ifdef FIX_989_TD_REND_ROM
+
FOR( i = 0; i < model->elevDim3; i++ )
{
if ( ( model->azimKSeq_fx[i] = (Word32 *) malloc( ( model->azimDim3[i] + 1 ) * sizeof( Word32 * ) ) ) == NULL )
@@ -578,41 +500,10 @@ static ivas_error DefaultBSplineModel_fx(
move32();
}
}
-#else
- IF( ( model->azimKSeq_fx[0] = (Word32 *) malloc( 2 * sizeof( Word32 * ) ) ) == NULL )
- {
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
- }
- IF( ( model->azimKSeq_fx[model->elevDim3 - 1] = (Word32 *) malloc( 2 * sizeof( Word32 * ) ) ) == NULL )
- {
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Binaural TD renderer\n" ) );
- }
- model->azimKSeq_fx[0][0] = 0;
- model->azimKSeq_fx[model->elevDim3 - 1][0] = 0;
- model->azimKSeq_fx[0][1] = 360 << Q22; // Q22
- model->azimKSeq_fx[model->elevDim3 - 1][1] = 360 << Q22; // Q22
- move32();
- move32();
- move32();
- move32();
- FOR( i = 1; i < sub( model->elevDim3, 1 ); i++ )
- {
- IF( ( model->azimKSeq_fx[i] = (Word32 *) malloc( model->azimDim2[i] * sizeof( Word32 * ) ) ) == 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_fx[i][j] = L_shl_r( L_mult0( defaultHRIR_rom_azimSegSamples[0], j ), Q22 ); // Q22
- move32();
- }
- }
-#endif
SWITCH( output_Fs )
{
case 48000:
-#ifdef USE_TDREND_16BIT_ROM
model->AlphaL_dyn_fx = (Word32 *) malloc( 60160 * sizeof( Word32 ) );
if ( model->AlphaL_dyn_fx == NULL )
{
@@ -622,12 +513,7 @@ static ivas_error DefaultBSplineModel_fx(
Copy_Scale_sig_16_32_r( &defaultHRIR_rom_AlphaL48_fx[30080], &model->AlphaL_dyn_fx[30080], 30080, Q30 - defaultHRIR_rom_Alpha48_Q_fx ); // Q30
model->AlphaL_fx = model->AlphaL_dyn_fx;
model->AlphaL_e = Q15 - defaultHRIR_rom_Alpha48_Q_fx;
-#else
- model->AlphaL_fx = (const Word32 *) defaultHRIR_rom_AlphaL48_fx; // Q30
- model->AlphaL_e = 1;
-#endif
move16();
-#ifdef USE_TDREND_16BIT_ROM
model->AlphaR_dyn_fx = (Word32 *) malloc( 60160 * sizeof( Word32 ) );
if ( model->AlphaR_dyn_fx == NULL )
{
@@ -637,30 +523,14 @@ static ivas_error DefaultBSplineModel_fx(
Copy_Scale_sig_16_32_r( &defaultHRIR_rom_AlphaR48_fx[30080], &model->AlphaR_dyn_fx[30080], 30080, Q30 - defaultHRIR_rom_Alpha48_Q_fx ); // Q22
model->AlphaR_fx = model->AlphaR_dyn_fx;
model->AlphaR_e = Q15 - defaultHRIR_rom_Alpha48_Q_fx;
-#else
- model->AlphaR_fx = (const Word32 *) defaultHRIR_rom_AlphaR48_fx; // Q30
- model->AlphaR_e = 1;
-#endif
move16();
model->EL_fx = (const Word32 *) defaultHRIR_rom_EL48_fx; // Q28
-#ifdef USE_TDREND_16BIT_ROM
model->EL_e = Q31 - defaultHRIR_rom_E48_Q_fx;
-#else
- model->EL_e = 3;
-#endif
move16();
model->ER_fx = (const Word32 *) defaultHRIR_rom_ER48_fx; // Q28
-#ifdef USE_TDREND_16BIT_ROM
model->ER_e = Q31 - defaultHRIR_rom_E48_Q_fx;
-#else
- model->ER_e = 3;
-#endif
move16();
-#ifdef FIX_989_TD_REND_ROM
model->K = defaultHRIR_rom_model_configuration[5]; // Q0
-#else
- model->K = 128; // Q0
-#endif
move16();
IF( HrFiltSet_p->ModelParams.UseItdModel )
{
@@ -669,7 +539,6 @@ static ivas_error DefaultBSplineModel_fx(
}
BREAK;
case 32000:
-#ifdef USE_TDREND_16BIT_ROM
model->AlphaL_dyn_fx = (Word32 *) malloc( 40420 * sizeof( Word32 ) );
if ( model->AlphaL_dyn_fx == NULL )
{
@@ -679,12 +548,7 @@ static ivas_error DefaultBSplineModel_fx(
Copy_Scale_sig_16_32_r( &defaultHRIR_rom_AlphaL32_fx[20210], &model->AlphaL_dyn_fx[20210], 20210, Q30 - defaultHRIR_rom_Alpha32_Q_fx ); // Q22
model->AlphaL_fx = model->AlphaL_dyn_fx;
model->AlphaL_e = Q15 - defaultHRIR_rom_Alpha32_Q_fx;
-#else
- model->AlphaL_fx = (const Word32 *) defaultHRIR_rom_AlphaL32_fx; // Q30
- model->AlphaL_e = 1;
-#endif
move16();
-#ifdef USE_TDREND_16BIT_ROM
model->AlphaR_dyn_fx = (Word32 *) malloc( 40420 * sizeof( Word32 ) );
if ( model->AlphaR_dyn_fx == NULL )
{
@@ -694,30 +558,14 @@ static ivas_error DefaultBSplineModel_fx(
Copy_Scale_sig_16_32_r( &defaultHRIR_rom_AlphaR32_fx[20210], &model->AlphaR_dyn_fx[20210], 20210, Q30 - defaultHRIR_rom_Alpha32_Q_fx ); // Q22
model->AlphaR_fx = model->AlphaR_dyn_fx;
model->AlphaR_e = Q15 - defaultHRIR_rom_Alpha32_Q_fx;
-#else
- model->AlphaR_fx = (const Word32 *) defaultHRIR_rom_AlphaR32_fx; // Q30
- model->AlphaR_e = 1;
-#endif
move16();
model->EL_fx = (const Word32 *) defaultHRIR_rom_EL32_fx; // Q28
-#ifdef USE_TDREND_16BIT_ROM
model->EL_e = Q31 - defaultHRIR_rom_E32_Q_fx;
-#else
- model->EL_e = 3;
-#endif
move16();
model->ER_fx = (const Word32 *) defaultHRIR_rom_ER32_fx; // Q28
-#ifdef USE_TDREND_16BIT_ROM
model->ER_e = Q31 - defaultHRIR_rom_E32_Q_fx;
-#else
- model->ER_e = 3;
-#endif
move16();
-#ifdef FIX_989_TD_REND_ROM
model->K = ( RESAMPLE_FACTOR_32_48_FX * defaultHRIR_rom_model_configuration[5] + ( 1 << 14 ) - 1 ) >> 14; // Q0
-#else
- model->K = 86; // Q0
-#endif
move16();
IF( HrFiltSet_p->ModelParams.UseItdModel )
{
@@ -726,7 +574,6 @@ static ivas_error DefaultBSplineModel_fx(
}
BREAK;
case 16000:
-#ifdef USE_TDREND_16BIT_ROM
model->AlphaL_dyn_fx = (Word32 *) malloc( 20210 * sizeof( Word32 ) );
if ( model->AlphaL_dyn_fx == NULL )
{
@@ -735,12 +582,7 @@ static ivas_error DefaultBSplineModel_fx(
Copy_Scale_sig_16_32_r( defaultHRIR_rom_AlphaL16_fx, model->AlphaL_dyn_fx, 20210, Q30 - defaultHRIR_rom_Alpha16_Q_fx ); // Q22
model->AlphaL_fx = model->AlphaL_dyn_fx;
model->AlphaL_e = Q15 - defaultHRIR_rom_Alpha16_Q_fx;
-#else
- model->AlphaL_fx = (const Word32 *) defaultHRIR_rom_AlphaL16_fx; // Q30
- model->AlphaL_e = 1;
-#endif
move16();
-#ifdef USE_TDREND_16BIT_ROM
model->AlphaR_dyn_fx = (Word32 *) malloc( 20210 * sizeof( Word32 ) );
if ( model->AlphaR_dyn_fx == NULL )
{
@@ -749,32 +591,14 @@ static ivas_error DefaultBSplineModel_fx(
Copy_Scale_sig_16_32_r( defaultHRIR_rom_AlphaR16_fx, model->AlphaR_dyn_fx, 20210, Q30 - defaultHRIR_rom_Alpha16_Q_fx ); // Q22
model->AlphaR_fx = model->AlphaR_dyn_fx;
model->AlphaR_e = Q15 - defaultHRIR_rom_Alpha16_Q_fx;
-#else
- model->AlphaR_fx = (const Word32 *) defaultHRIR_rom_AlphaR16_fx; // Q30
- model->AlphaR_e = 1;
-#endif
move16();
model->EL_fx = (const Word32 *) defaultHRIR_rom_EL16_fx; // Q28
-#ifdef USE_TDREND_16BIT_ROM
model->EL_e = Q31 - defaultHRIR_rom_E16_Q_fx;
- // model->EL_e = 3;
-#else
- model->EL_e = 3;
-#endif
move16();
model->ER_fx = (const Word32 *) defaultHRIR_rom_ER16_fx; // Q28
-#ifdef USE_TDREND_16BIT_ROM
model->ER_e = Q31 - defaultHRIR_rom_E16_Q_fx;
- // model->ER_e = 3;
-#else
- model->ER_e = 3;
-#endif
move16();
-#ifdef FIX_989_TD_REND_ROM
model->K = ( RESAMPLE_FACTOR_16_48_FX * defaultHRIR_rom_model_configuration[5] + ( 1 << 14 ) - 1 ) >> 14; // Q0
-#else
- model->K = 43; // Q0
-#endif
move16();
IF( HrFiltSet_p->ModelParams.UseItdModel )
{
@@ -786,7 +610,6 @@ static ivas_error DefaultBSplineModel_fx(
BREAK;
}
-#ifdef FIX_989_TD_REND_ROM
modelITD->elevDim3 = defaultHRIR_rom_ITD_model_configuration[0];
move16();
modelITD->azimDim3 = defaultHRIR_rom_ITD_model_configuration[1];
@@ -797,131 +620,56 @@ static ivas_error DefaultBSplineModel_fx(
move16();
modelITD->elevBsLen = defaultHRIR_rom_ITD_elevBsLen;
modelITD->elevBsStart = defaultHRIR_rom_ITD_elevBsStart;
-#else
- modelITD->N = 4; // Q0
- move16();
- modelITD->elevDim2 = 20; // Q0
- move16();
- modelITD->elevDim3 = 18; // Q0
- move16();
- modelITD->azimDim2 = 41; // Q0
- move16();
- modelITD->azimDim3 = 41; // Q0
- move16();
- modelITD->elevSegSamples = 3; // Q0
- move16();
- modelITD->elevBsLen[0] = 4; // Q0
- move16();
- modelITD->elevBsLen[1] = 7; // Q0
- move16();
- modelITD->elevBsLen[2] = 10; // Q0
- move16();
- modelITD->elevBsLen[3] = 7; // Q0
- move16();
- modelITD->elevBsStart[0] = 0; // Q0
- move16();
- modelITD->elevBsStart[1] = 4; // Q0
- move16();
- modelITD->elevBsStart[2] = 11; // Q0
- move16();
- modelITD->elevBsStart[3] = 21; // Q0
- move16();
-#endif
-#ifdef USE_TDREND_16BIT_ROM
modelITD->elevKSeq_dyn_fx = (Word32 *) malloc( sizeof( defaultHRIR_rom_ITD_elevKSeq_fx ) * sizeof( Word32 ) / sizeof( Word16 ) );
- if ( modelITD->elevKSeq_dyn_fx == NULL )
+ IF( modelITD->elevKSeq_dyn_fx == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
Copy_Scale_sig_16_32_r( defaultHRIR_rom_ITD_elevKSeq_fx, modelITD->elevKSeq_dyn_fx, sizeof( defaultHRIR_rom_ITD_elevKSeq_fx ) / sizeof( Word16 ), Q22 - defaultHRIR_rom_ITD_elevKSeq_Q_fx ); // Q22
modelITD->elevKSeq_fx = modelITD->elevKSeq_dyn_fx;
-#else
- modelITD->elevKSeq_fx = defaultHRIR_rom_ITD_elevKSeq_fx; // Q22
-#endif
-#ifdef FIX_989_TD_REND_ROM
modelITD->azimBsLen = defaultHRIR_rom_ITD_azimBsLen;
modelITD->azimBsStart = defaultHRIR_rom_ITD_azimBsStart;
-#else
- modelITD->azimBsLen[0] = 11; // Q0
- move16();
- modelITD->azimBsLen[1] = 21; // Q0
- move16();
- modelITD->azimBsLen[2] = 31; // Q0
- move16();
- modelITD->azimBsLen[3] = 21; // Q0
- move16();
- modelITD->azimBsStart[0] = 0; // Q0
- move16();
- modelITD->azimBsStart[1] = 11; // Q0
- move16();
- modelITD->azimBsStart[2] = 32; // Q0
- move16();
- modelITD->azimBsStart[3] = 63; // Q0
- move16();
-
- modelITD->azimSegSamples = 10; // Q0
- move16();
-#endif
-#ifdef USE_TDREND_16BIT_ROM
modelITD->azimKSeq_dyn_fx = (Word32 *) malloc( ( ( modelITD->azimDim3 + 1 ) / 2 - 2 ) * sizeof( Word32 ) ); /* basis functions are flipped around 180 deg, number of basis functions above/below is (N+1)/2 */
- if ( modelITD->azimKSeq_dyn_fx == NULL )
+ IF( modelITD->azimKSeq_dyn_fx == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
Copy_Scale_sig_16_32_r( defaultHRIR_rom_ITD_azimKSeq_fx, modelITD->azimKSeq_dyn_fx, ( ( modelITD->azimDim3 + 1 ) / 2 - 2 ), Q22 - defaultHRIR_rom_ITD_azimKSeq_Q_fx ); // Q22
modelITD->azimKSeq_fx = modelITD->azimKSeq_dyn_fx;
-#else
- modelITD->azimKSeq_fx = defaultHRIR_rom_ITD_azimKSeq_fx; // Q22
-#endif
-#ifdef USE_TDREND_16BIT_ROM
modelITD->W_dyn_fx = (Word32 *) malloc( sizeof( defaultHRIR_rom_ITD_W_fx ) * sizeof( Word32 ) / sizeof( Word16 ) ); /* basis functions are flipped around 180 deg, number of basis functions above/below is (N+1)/2 */
- if ( modelITD->W_dyn_fx == NULL )
+ IF( modelITD->W_dyn_fx == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
Copy_Scale_sig_16_32_r( defaultHRIR_rom_ITD_W_fx, modelITD->W_dyn_fx, sizeof( defaultHRIR_rom_ITD_W_fx ) / sizeof( Word16 ), Q25 - defaultHRIR_rom_ITD_W_Q_fx ); // Q22
modelITD->W_fx = modelITD->W_dyn_fx;
modelITD->W_e = Q15 - defaultHRIR_rom_ITD_W_Q_fx;
-#else
- modelITD->W_fx = (const Word32 *) defaultHRIR_rom_ITD_W_fx; // Q25
- modelITD->W_e = 6;
-#endif
move16();
-#ifdef USE_TDREND_16BIT_ROM
modelITD->azimBsShape_dyn_fx = (Word32 *) malloc( sizeof( defaultHRIR_rom_ITD_azimBsShape_fx ) * sizeof( Word32 ) / sizeof( Word16 ) ); /* basis functions are flipped around 180 deg, number of basis functions above/below is (N+1)/2 */
- if ( modelITD->azimBsShape_dyn_fx == NULL )
+ IF( modelITD->azimBsShape_dyn_fx == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
Copy_Scale_sig_16_32_r( defaultHRIR_rom_ITD_azimBsShape_fx, modelITD->azimBsShape_dyn_fx, sizeof( defaultHRIR_rom_ITD_azimBsShape_fx ) / sizeof( Word16 ), Q30 - defaultHRIR_rom_ITD_azimBsShape_Q_fx ); // Q22
modelITD->azimBsShape_fx = modelITD->azimBsShape_dyn_fx;
-#else
- modelITD->azimBsShape_fx = defaultHRIR_rom_ITD_azimBsShape_fx; // Q30
-#endif
-#ifdef USE_TDREND_16BIT_ROM
modelITD->elevBsShape_dyn_fx = (Word32 *) malloc( sizeof( defaultHRIR_rom_ITD_elevBsShape_fx ) * sizeof( Word32 ) / sizeof( Word16 ) );
- if ( modelITD->elevBsShape_dyn_fx == NULL )
+ IF( modelITD->elevBsShape_dyn_fx == NULL )
{
return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for hrtf data" );
}
Copy_Scale_sig_16_32_r( defaultHRIR_rom_ITD_elevBsShape_fx, modelITD->elevBsShape_dyn_fx, sizeof( defaultHRIR_rom_ITD_elevBsShape_fx ) / sizeof( Word16 ), Q30 - defaultHRIR_rom_ITD_elevBsShape_Q_fx ); // Q22
modelITD->elevBsShape_fx = modelITD->elevBsShape_dyn_fx;
-#else
- modelITD->elevBsShape_fx = defaultHRIR_rom_ITD_elevBsShape_fx; // Q30
-#endif
HRTF_model_precalc( model );
HrFiltSet_p->latency_s_fx = defaultHRIR_rom_latency_s_fx; // Q31
move32();
-#ifdef USE_TDREND_16BIT_ROM
HrFiltSet_p->latency_s_Q_fx = sub( Q31, defaultHRIR_rom_latency_s_Q_fx ); // Q31
-#endif
- HrFiltSet_p->SampleRate = output_Fs; // Q0
+ HrFiltSet_p->SampleRate = output_Fs; // Q0
move32();
HrFiltSet_p->FiltLength = HrFiltSet_p->ModelParams.K; // Q0
move16();
diff --git a/lib_rend/ivas_objectRenderer_sfx_fx.c b/lib_rend/ivas_objectRenderer_sfx_fx.c
index d5abdadba7ddf7b1248f88dac7aa2f7e9a666725..361cc403d19ccad22d98321d5b7c5da190877b9d 100644
--- a/lib_rend/ivas_objectRenderer_sfx_fx.c
+++ b/lib_rend/ivas_objectRenderer_sfx_fx.c
@@ -252,9 +252,6 @@ static void sincResample_fx(
p_backward_fx--; // Qx
}
-#ifndef NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS
- tmp64_fx = W_mac_32_32( tmp64_fx, *p_forward_fx, *p_sinc_forward_fx ); /* Integer index always rounded down --> 4 steps backward, 5 steps forward */ // Qx + 32
-#endif
output_fx[i] = W_extract_h( tmp64_fx ); // Qx
move32();
diff --git a/lib_rend/ivas_objectRenderer_sources_fx.c b/lib_rend/ivas_objectRenderer_sources_fx.c
index 90ac586ee23437e9861127afa0d90b014bedf041..33c519c8eb5f931bcb7f01f69f2e5ff463239ff1 100644
--- a/lib_rend/ivas_objectRenderer_sources_fx.c
+++ b/lib_rend/ivas_objectRenderer_sources_fx.c
@@ -49,6 +49,7 @@ static Word16 TDREND_SRC_SPATIAL_GetDirGain_fx( const TDREND_DirAtten_t *DirAtte
static Word16 TDREND_SRC_SPATIAL_GetDistGain_fx( const TDREND_DistAtten_t *DistAtten_p, const Word32 Dist_fx, const Word16 Dist_e );
static void TDREND_SRC_SPATIAL_SetDirAtten_fx( TDREND_SRC_SPATIAL_t *SrcSpatial_p, const TDREND_DirAtten_t *DirAtten_p );
static void TDREND_SRC_SPATIAL_SetDistAtten( TDREND_SRC_SPATIAL_t *SrcSpatial_p, const TDREND_DistAtten_t *DistAtten_p );
+static void TDREND_SRC_SPATIAL_SetGain( const TDREND_SRC_t *Src_p, const Word32 Gain );
static ivas_error TDREND_SRC_REND_Alloc( TDREND_SRC_REND_t **SrcRend_pp );
static void TDREND_SRC_SPATIAL_Dealloc( TDREND_SRC_SPATIAL_t *SrcSpatial_p );
@@ -130,11 +131,30 @@ ivas_error TDREND_MIX_SRC_SetDir_fx(
}
+/*-------------------------------------------------------------------*
+ * TDREND_MIX_SRC_SetGain()
+ *
+ * Set source gain
+ --------------------------------------------------------------------*/
+
+ivas_error TDREND_MIX_SRC_SetGain(
+ BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
+ const Word16 SrcInd, /* i : Source index */
+ const Word32 Gain /* i : Gain */
+)
+{
+ TDREND_SRC_SPATIAL_SetGain( hBinRendererTd->Sources[SrcInd], Gain );
+
+ return IVAS_ERR_OK;
+}
+
+
/*-------------------------------------------------------------------*
* TDREND_MIX_SRC_SetDirAtten()
*
* Set directional attenuation for the mixer.
--------------------------------------------------------------------*/
+
ivas_error TDREND_MIX_SRC_SetDirAtten_fx(
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
const Word16 SrcInd, /* i : Source index Q0 */
@@ -168,6 +188,7 @@ ivas_error TDREND_MIX_SRC_SetDistAtten(
)
{
TDREND_SRC_SPATIAL_t *SrcSpatial_p;
+
IF( GT_16( SrcInd, hBinRendererTd->MaxSrcInd ) )
{
return ( IVAS_ERROR( IVAS_ERR_INVALID_INDEX, "Index exceeds max index\n" ) );
@@ -254,11 +275,7 @@ static void TDREND_SRC_REND_Init_fx(
move16();
SrcRend_p->SrcGain_p_fx[nC] = ONE_IN_Q14; // Q14
move16();
-#ifdef OBJ_EDITING_API
SrcRend_p->SrcGainMax_p_fx[nC] = 32767; // TODO: make it 2, this is one in Q15, i thinki, need to change Q for that
-#else
- SrcRend_p->SrcGainMax_p_fx[nC] = 32767; /* Q15 */
-#endif
move16();
}
SrcRend_p->SrcGainUpdated = FALSE;
@@ -274,6 +291,7 @@ static void TDREND_SRC_REND_Init_fx(
return;
}
+
/*-------------------------------------------------------------------*
* TDREND_SRC_REND_UpdateFiltersFromSpatialParams()
*
@@ -284,31 +302,19 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx(
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
TDREND_SRC_REND_t *SrcRend_p, /* i/o: Source object */
TDREND_SRC_SPATIAL_t *SrcSpatial_p, /* i : Spatial aspects of source */
- Word32 *hrf_left_prev,
- /* i/o: Left filter */ // exp(hrf_left_prev_e)
- Word16 *hrf_left_prev_e,
- /* i/o: Left filter exponent */ // Q0
- Word32 *hrf_right_prev,
- /* i/o: Right filter */ // exp(hrf_right_prev_e)
- Word16 *hrf_right_prev_e,
- /* i/o: Right filter exponent */ // Q0
- Word32 *hrf_left_delta,
- /* o : Left filter interpolation delta */ // exp(hrf_left_delta_e)
- Word16 *hrf_left_delta_e,
- /* o : Left filter interpolation delta exponent */ // Q0
- Word32 *hrf_right_delta,
- /* o : Right filter interpolation delta */ // exp(hrf_right_delta_e)
- Word16 *hrf_right_delta_e,
- /* o : Right filter interpolation delta exponent */ // Q0
- Word16 *intp_count,
- /* o : Interpolation count */ // Q0
- Word16 *filterlength,
- /* o : Length of filters */ // Q0
- Word16 *itd,
- /* o : ITD value */ // Q0
- Word32 *Gain,
- /* o : Gain value */ // Q30
- TDREND_SRC_t *Src_p /* i/o: Source pointer */
+ Word32 *hrf_left_prev, /* i/o: Left filter exp(hrf_left_prev_e) */
+ Word16 *hrf_left_prev_e, /* i/o: Left filter exponent Q0 */
+ Word32 *hrf_right_prev, /* i/o: Right filter exp(hrf_right_prev_e) */
+ Word16 *hrf_right_prev_e, /* i/o: Right filter exponent Q0 */
+ Word32 *hrf_left_delta, /* o : Left filter interpolation delta exp(hrf_left_delta_e) */
+ Word16 *hrf_left_delta_e, /* o : Left filter interpolation delta exponent Q0 */
+ Word32 *hrf_right_delta, /* o : Right filter interpolation delta exp(hrf_right_delta_e) */
+ Word16 *hrf_right_delta_e, /* o : Right filter interpolation delta exponent Q0 */
+ Word16 *intp_count, /* o : Interpolation count Q0 */
+ Word16 *filterlength, /* o : Length of filters Q0 */
+ Word16 *itd, /* o : ITD value Q0 */
+ Word32 *Gain, /* o : Gain value Q30 */
+ TDREND_SRC_t *Src_p /* i/o: Source pointer */
)
{
TDREND_MIX_Listener_t *Listener_p;
@@ -397,11 +403,11 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx(
move32();
}
-
/* Update total gains */
*Gain = L_shl( Mpy_32_32( L_shl( L_mult( *SrcRend_p->SrcGain_p_fx, *SrcRend_p->DirGain_p_fx ), 1 ), L_shl( L_mult( *SrcRend_p->DistGain_p_fx, hBinRendererTd->Gain_fx ), 1 ) ), 1 ); // Q30
move32();
- /* Delta for interpolation, in case the angular step exceeds MAX_ANGULAR_STEP */
+
+ /* Delta for interpolation, in case the angular step exceeds MAX_ANGULAR_STEP=0.01f */
Word32 ele_tmp = Src_p->elev_prev_fx; // Q22
move32();
IF( GT_32( ele_tmp, DEG_180_IN_Q22 ) )
@@ -468,8 +474,6 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx(
move16();
}
- test();
-
IF( ( *intp_count > 0 ) )
{
/* Set deltas for interpolation */
@@ -490,8 +494,8 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx(
*hrf_left_delta_e = tmp_e;
move16();
- Word32 fac = L_deposit_h( div_s( 1, *intp_count ) ); // Q15
- v_multc_fixed( hrf_left_delta, fac, hrf_left_delta, *filterlength ); // exp(hrf_left_delta_e)
+ Word32 fac = L_deposit_h( div_s( 1, *intp_count ) ); // Q15
+ v_multc_fx( hrf_left_delta, fac, hrf_left_delta, *filterlength ); // exp(hrf_left_delta_e)
tmp_e = s_max( *hrf_right_prev_e, hrf_right_e );
FOR( Word16 i = 0; i < *filterlength; i++ )
@@ -509,7 +513,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx(
*hrf_right_delta_e = tmp_e;
move16();
- v_multc_fixed( hrf_right_delta, fac, hrf_right_delta, *filterlength ); // exp(hrf_right_delta_e)
+ v_multc_fx( hrf_right_delta, fac, hrf_right_delta, *filterlength ); // exp(hrf_right_delta_e)
}
ELSE
{
@@ -531,6 +535,7 @@ void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx(
return;
}
+
/*-------------------------------------------------------------------*
* TDREND_SRC_SPATIAL_Alloc()
*
@@ -656,6 +661,7 @@ static void TDREND_SRC_SPATIAL_SetDirAtten_fx(
return;
}
+
/*-------------------------------------------------------------------*
* TDREND_SRC_SPATIAL_SetDistAtten()
*
@@ -680,6 +686,22 @@ static void TDREND_SRC_SPATIAL_SetDistAtten(
return;
}
+/*-------------------------------------------------------------------*
+ * TDREND_SRC_SPATIAL_SetGain()
+ *
+ * Set the object gain
+ --------------------------------------------------------------------*/
+
+static void TDREND_SRC_SPATIAL_SetGain(
+ const TDREND_SRC_t *Src_p, /* i : Directional attenuation specification */
+ const Word32 Gain /* i : Front-pointing vector */
+)
+{
+ Src_p->SrcRend_p->SrcGain_p_fx[0] = shl_sat( extract_h( Gain ), Q1 ); // TODO: Check incoming Q-value and fix this
+
+ return;
+}
+
/*-------------------------------------------------------------------*
* TDREND_SRC_SPATIAL_GetDirGain()
*
@@ -687,11 +709,11 @@ static void TDREND_SRC_SPATIAL_SetDistAtten(
--------------------------------------------------------------------*/
/*! r: Gain value */
-static Word16 TDREND_SRC_SPATIAL_GetDirGain_fx( /* o : Directional Gain Output Q14 */
- const TDREND_DirAtten_t *DirAtten_p, /* i : Directional attenuation specification */
- const Word32 *Front_p_fx, /* i : Front-pointing vector Q30 */
- const Word32 *RelPos_p_fx, /* i : Relative position */
- const Word16 RelPos_p_e /* i : Relative position exp RelPos_p_e */
+static Word16 TDREND_SRC_SPATIAL_GetDirGain_fx(
+ const TDREND_DirAtten_t *DirAtten_p, /* i : Directional attenuation specification */
+ const Word32 *Front_p_fx, /* i : Front-pointing vector Q30 */
+ const Word32 *RelPos_p_fx, /* i : Relative position */
+ const Word16 RelPos_p_e /* i : Relative position exp RelPos_p_e */
)
{
Word16 DirGain_fx; // Q14
@@ -712,7 +734,7 @@ static Word16 TDREND_SRC_SPATIAL_GetDirGain_fx(
Vec_fx[i] = L_negate( RelPos_p_fx[i] ); // exp(RelPos_p_e)
move32();
}
- ProjCoef_fx = dotp_fixed( Vec_fx, Front_p_fx, 3 ); // exp: RelPos_p_e + 1
+ ProjCoef_fx = dotp_fx32( Vec_fx, Front_p_fx, 3 ); // exp: RelPos_p_e + 1
ProjCoef_e = add( RelPos_p_e, 1 );
NormRelPos_fx = TDREND_SPATIAL_VecNorm_fx( RelPos_p_fx, RelPos_p_e, &NormRelPos_e ); // exp(NormRelPos_e)
@@ -772,10 +794,10 @@ static Word16 TDREND_SRC_SPATIAL_GetDirGain_fx(
--------------------------------------------------------------------*/
/*! r: Gain value */
-static Word16 TDREND_SRC_SPATIAL_GetDistGain_fx( /* o : Distance gain Q14 */
- const TDREND_DistAtten_t *DistAtten_p, /* i : Distance attenuation parameters */
- const Word32 Dist_fx, /* i : Distance value Dist_e */
- const Word16 Dist_e /* i : Distance value exp */
+static Word16 TDREND_SRC_SPATIAL_GetDistGain_fx(
+ const TDREND_DistAtten_t *DistAtten_p, /* i : Distance attenuation parameters */
+ const Word32 Dist_fx, /* i : Distance value Dist_e */
+ const Word16 Dist_e /* i : Distance value exp */
)
{
Word16 DistGain_fx; // Q14
@@ -845,11 +867,13 @@ static Word16 TDREND_SRC_SPATIAL_GetDistGain_fx(
return DistGain_fx;
}
+
/*-------------------------------------------------------------------*
* TDREND_SRC_Alloc()
*
* Allocate a source.
--------------------------------------------------------------------*/
+
ivas_error TDREND_SRC_Alloc(
TDREND_SRC_t **Src_pp /* i/o: Source */
)
@@ -882,6 +906,7 @@ ivas_error TDREND_SRC_Alloc(
return IVAS_ERR_OK;
}
+
/*-------------------------------------------------------------------*
* TDREND_SRC_Dealloc()
*
@@ -903,13 +928,17 @@ void TDREND_SRC_Dealloc(
/* Free the Src_p variable */
free( Src_p );
Src_p = NULL;
+
return;
}
+
+
/*-------------------------------------------------------------------*
* TDREND_SRC_Init()
*
* Initializes a source.
--------------------------------------------------------------------*/
+
void TDREND_SRC_Init_fx(
TDREND_SRC_t *Src_p, /* i/o: Source to initialize */
const TDREND_PosType_t PosType /* i : Position type specifier */
@@ -953,5 +982,6 @@ void TDREND_SRC_Init_fx(
move32();
Src_p->prevGain_fx = ONE_IN_Q30; // Q30
move32();
+
return;
}
diff --git a/lib_rend/ivas_objectRenderer_vec_fx.c b/lib_rend/ivas_objectRenderer_vec_fx.c
index 0d8c11aabc2d1f7bbbca125f01563c194a940636..140861539307a16b008dcd1fc0a29922d844c8b6 100644
--- a/lib_rend/ivas_objectRenderer_vec_fx.c
+++ b/lib_rend/ivas_objectRenderer_vec_fx.c
@@ -141,12 +141,13 @@ void TDREND_SPATIAL_VecMapToNewCoordSystem_fx(
v_sub_32( 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_fixed( LisRelPosAbs, DirVec_p, 3 ); // Q: Qy + Qy - Q31
+ MappedVec_p[0] = dotp_fx32( LisRelPosAbs, DirVec_p, 3 ); // Q: Qy + Qy - Q31
move32();
- MappedVec_p[1] = dotp_fixed( LisRelPosAbs, RightVec_p, 3 ); // Q: Qy + Qy - Q31
+ MappedVec_p[1] = dotp_fx32( LisRelPosAbs, RightVec_p, 3 ); // Q: Qy + Qy - Q31
move32();
- MappedVec_p[2] = dotp_fixed( LisRelPosAbs, UpVec_p, 3 ); // Q: Qy + Qy - Q31
+ MappedVec_p[2] = dotp_fx32( LisRelPosAbs, UpVec_p, 3 ); // Q: Qy + Qy - Q31
move32();
+
return;
}
@@ -157,7 +158,6 @@ void TDREND_SPATIAL_VecMapToNewCoordSystem_fx(
*-------------------------------------------------------------------*/
/*! r: Flag if the orientation has been updated */
-
Word16 TDREND_SPATIAL_EvalOrthonormOrient_fx(
Word32 *FrontVecON_p_fx, /* i/o: Normalized front vector Q30 */
Word32 *UpVecON_p_fx, /* i/o: Normalized up vector Q30 */
diff --git a/lib_rend/ivas_omasa_ana_fx.c b/lib_rend/ivas_omasa_ana_fx.c
index 67e72e84c0578a544a54372d4f469ae923a0bb2f..e441b3596d14dbe4d6108c0d815216e68fc8dfbe 100644
--- a/lib_rend/ivas_omasa_ana_fx.c
+++ b/lib_rend/ivas_omasa_ana_fx.c
@@ -490,14 +490,14 @@ static void ivas_omasa_param_est_ana_fx(
FOR( i = 1; i < nchan_ism; i++ )
{
- v_add_fixed_no_hdrm( Chnl_RealBuffer_fx[i], Foa_RealBuffer_fx[0], Foa_RealBuffer_fx[0], num_freq_bins ); // Q: Chnl_RealBuffer_q
- v_add_fixed_no_hdrm( Chnl_ImagBuffer_fx[i], Foa_ImagBuffer_fx[0], Foa_ImagBuffer_fx[0], num_freq_bins ); // Q: Chnl_ImagBuffer_q
+ v_add_fx_no_hdrm( Chnl_RealBuffer_fx[i], Foa_RealBuffer_fx[0], Foa_RealBuffer_fx[0], num_freq_bins ); // Q: Chnl_RealBuffer_q
+ v_add_fx_no_hdrm( Chnl_ImagBuffer_fx[i], Foa_ImagBuffer_fx[0], Foa_ImagBuffer_fx[0], num_freq_bins ); // Q: Chnl_ImagBuffer_q
}
/* Y */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[1][0], Foa_RealBuffer_fx[1], num_freq_bins ); // Q: Chnl_RealBuffer_q
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[1][0], Foa_ImagBuffer_fx[1], num_freq_bins ); // Q: Chnl_ImagBuffer_q
+ v_multc_fx( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[1][0], Foa_RealBuffer_fx[1], num_freq_bins ); // Q: Chnl_RealBuffer_q
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[1][0], Foa_ImagBuffer_fx[1], num_freq_bins ); // Q: Chnl_ImagBuffer_q
FOR( i = 1; i < nchan_ism; i++ )
{
@@ -507,8 +507,8 @@ static void ivas_omasa_param_est_ana_fx(
/* Z */
- v_multc_fixed( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[2][0], Foa_RealBuffer_fx[2], num_freq_bins ); // Q: Chnl_RealBuffer_q
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[2][0], Foa_ImagBuffer_fx[2], num_freq_bins ); // Q: Chnl_ImagBuffer_q
+ v_multc_fx( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[2][0], Foa_RealBuffer_fx[2], num_freq_bins ); // Q: Chnl_RealBuffer_q
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[2][0], Foa_ImagBuffer_fx[2], num_freq_bins ); // Q: Chnl_ImagBuffer_q
FOR( i = 1; i < nchan_ism; i++ )
{
@@ -516,8 +516,8 @@ static void ivas_omasa_param_est_ana_fx(
v_multc_acc_32_32( Chnl_ImagBuffer_fx[i], hOMasa->chnlToFoaMtx_fx[2][i], Foa_ImagBuffer_fx[2], num_freq_bins ); // Q: Chnl_ImagBuffer_q
}
- v_multc_fixed( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[3][0], Foa_RealBuffer_fx[3], num_freq_bins ); // Q: Chnl_RealBuffer_q
- v_multc_fixed( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[3][0], Foa_ImagBuffer_fx[3], num_freq_bins ); // Q: Chnl_ImagBuffer_q
+ v_multc_fx( Chnl_RealBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[3][0], Foa_RealBuffer_fx[3], num_freq_bins ); // Q: Chnl_RealBuffer_q
+ v_multc_fx( Chnl_ImagBuffer_fx[0], hOMasa->chnlToFoaMtx_fx[3][0], Foa_ImagBuffer_fx[3], num_freq_bins ); // Q: Chnl_ImagBuffer_q
FOR( i = 1; i < nchan_ism; i++ )
{
@@ -526,9 +526,9 @@ static void ivas_omasa_param_est_ana_fx(
}
computeIntensityVector_ana_fx( hOMasa->band_grouping, Foa_RealBuffer_fx, Foa_ImagBuffer_fx, num_freq_bands, intensity_real_fx, intensity_real_q, inp_q );
- computeDirectionVectors_fixed( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], 0, intensity_real_q ); /* Q direction_vector_fx = Q30*/
- /* Power estimation for diffuseness */
+ computeDirectionVectors_fx2( intensity_real_fx[0], intensity_real_fx[1], intensity_real_fx[2], 0, num_freq_bands, direction_vector_fx[0], direction_vector_fx[1], direction_vector_fx[2], 0, intensity_real_q ); /* Q direction_vector_fx = Q30*/
+ /* Power estimation for diffuseness */
computeReferencePower_ana_fx( hOMasa->band_grouping, Foa_RealBuffer_fx, Foa_ImagBuffer_fx, reference_power_fx[ts], num_freq_bands, inp_q, &reference_power_q );
/* Aligning intensity_real to a common Q-factor */
@@ -563,7 +563,7 @@ static void ivas_omasa_param_est_ana_fx(
hOMasa->buffer_energy_q[index - 1] = reference_power_q;
move16();
- computeDiffuseness_fixed( hOMasa->buffer_intensity_real_fx, hOMasa->buffer_energy_fx, num_freq_bands, diffuseness_vector_fx, hOMasa->buffer_intensity_real_q, hOMasa->buffer_energy_q, &diffuseness_q ); // diffuseness_q=Q30
+ computeDiffuseness_fx( hOMasa->buffer_intensity_real_fx, hOMasa->buffer_energy_fx, num_freq_bands, diffuseness_vector_fx, hOMasa->buffer_intensity_real_q, hOMasa->buffer_energy_q, &diffuseness_q ); // diffuseness_q=Q30
FOR( band_m_idx = 0; band_m_idx < hOMasa->nbands; band_m_idx++ )
{
@@ -654,7 +654,6 @@ static void ivas_omasa_dmx_fx(
const Word16 interpolator_fx[L_FRAME48k] )
{
Word16 i, j, k, l, tmp1, tmp2;
-
Word16 azimuth_fx, elevation_fx;
Word16 gains_fx[MASA_MAX_TRANSPORT_CHANNELS];
Word16 g1_fx, g2_fx, scale;
@@ -686,7 +685,6 @@ static void ivas_omasa_dmx_fx(
{
FOR( k = 0; k < input_frame; k++ )
{
-
g1_fx = interpolator_fx[k]; // Q15
move16();
scale = BASOP_Util_Add_MantExp( 16384, 1, negate( g1_fx ), 0, &g2_fx );
@@ -761,8 +759,6 @@ static void ivas_omasa_dmx_fx(
return;
}
-/* Compute downmix */
-
/*--------------------------------------------------------------------------*
* computeIntensityVector_ana()
@@ -850,11 +846,6 @@ void computeIntensityVector_ana_fx(
return;
}
-/*--------------------------------------------------------------------------*
- * computeIntensityVector_ana()
- *
- *
- *--------------------------------------------------------------------------*/
/*--------------------------------------------------------------------------*
diff --git a/lib_rend/ivas_output_init_fx.c b/lib_rend/ivas_output_init_fx.c
index 170581b2391c5b786729aaf3836c9f9abdfe1477..0e2b264a83e9e1f4ded222a90137b981a9f83295 100644
--- a/lib_rend/ivas_output_init_fx.c
+++ b/lib_rend/ivas_output_init_fx.c
@@ -318,7 +318,11 @@ Word16 ivas_get_nchan_buffers_dec_fx(
output_config = st_ivas->hDecoderConfig->output_config;
move16();
+#ifdef FIX_NCHAN_BUFFERS
+ nchan_out_buff = st_ivas->nchan_transport;
+#else
nchan_out_buff = MAX_OUTPUT_CHANNELS;
+#endif
move16();
IF( EQ_32( st_ivas->ivas_format, MONO_FORMAT ) )
@@ -332,6 +336,15 @@ Word16 ivas_get_nchan_buffers_dec_fx(
}
ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )
{
+#ifdef FIX_NCHAN_BUFFERS
+ nchan_out_buff = s_max( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_ism );
+
+ test();
+ IF( EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )
+ {
+ nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( st_ivas->intern_config ) );
+ }
+#else
nchan_out_buff = st_ivas->nchan_ism;
move16();
@@ -344,9 +357,16 @@ Word16 ivas_get_nchan_buffers_dec_fx(
nchan_out_buff = s_max( audioCfg2channels( st_ivas->transport_config ), audioCfg2channels( st_ivas->intern_config ) );
nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( output_config ) );
}
+#endif
}
ELSE IF( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) )
{
+#ifdef FIX_NCHAN_BUFFERS
+ Word16 nchan_internal;
+ nchan_internal = ivas_sba_get_nchan_metadata_fx( sba_analysis_order, ivas_total_brate );
+
+ nchan_out_buff = s_max( nchan_internal, st_ivas->hDecoderConfig->nchan_out );
+#else
Word16 nchan_internal;
nchan_internal = ivas_sba_get_nchan_metadata_fx( sba_analysis_order, ivas_total_brate );
nchan_out_buff = st_ivas->hDecoderConfig->nchan_out;
@@ -362,9 +382,20 @@ Word16 ivas_get_nchan_buffers_dec_fx(
nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( output_config ) );
}
nchan_out_buff = s_max( nchan_out_buff, nchan_internal );
+#endif
}
ELSE IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )
{
+#ifdef FIX_NCHAN_BUFFERS
+ nchan_out_buff = s_max( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_transport );
+
+ test();
+ IF( st_ivas->hDiracDecBin[0] != NULL && st_ivas->hDiracDecBin[0]->useTdDecorr )
+ {
+ nchan_out_buff = 2 * BINAURAL_CHANNELS;
+ move16();
+ }
+#else
nchan_out_buff = CPE_CHANNELS;
move16();
@@ -393,9 +424,13 @@ Word16 ivas_get_nchan_buffers_dec_fx(
{
nchan_out_buff = add( st_ivas->nchan_ism, CPE_CHANNELS );
}
+#endif
}
ELSE IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) )
{
+#ifdef FIX_NCHAN_BUFFERS
+ nchan_out_buff = s_max( st_ivas->hDecoderConfig->nchan_out, add( st_ivas->nchan_transport, st_ivas->nchan_ism ) );
+#else
nchan_out_buff = add( st_ivas->nchan_ism, CPE_CHANNELS );
test();
@@ -413,9 +448,32 @@ Word16 ivas_get_nchan_buffers_dec_fx(
nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( st_ivas->intern_config ) );
nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( output_config ) );
}
+#endif
}
ELSE IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
{
+#ifdef FIX_NCHAN_BUFFERS
+ Word16 nchan_internal;
+
+ nchan_internal = ivas_sba_get_nchan_metadata_fx( sba_analysis_order, ivas_total_brate );
+
+ if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )
+ {
+ nchan_internal = add( nchan_internal, st_ivas->nchan_ism );
+ }
+
+ if ( st_ivas->hMCT != NULL )
+ {
+ nchan_internal = shl( shr( add( nchan_internal, 1 ), 1 ), 1 ); /* ensure odd number of channels in MCT */
+ }
+
+ nchan_out_buff = s_max( nchan_internal, st_ivas->hDecoderConfig->nchan_out );
+
+ if ( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )
+ {
+ nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( st_ivas->intern_config ) );
+ }
+#else
Word16 nchan_internal;
nchan_internal = ivas_sba_get_nchan_metadata_fx( sba_analysis_order, ivas_total_brate );
nchan_out_buff = add( st_ivas->nchan_ism, st_ivas->nchan_transport );
@@ -455,9 +513,28 @@ Word16 ivas_get_nchan_buffers_dec_fx(
nchan_out_buff = s_max( nchan_out_buff, add( nchan_internal, st_ivas->nchan_ism ) );
}
nchan_out_buff = s_min( nchan_out_buff, MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS );
+#endif
}
ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) )
{
+#ifdef FIX_NCHAN_BUFFERS
+ nchan_out_buff = max( st_ivas->hDecoderConfig->nchan_out, st_ivas->nchan_transport );
+
+ IF( st_ivas->hOutSetup.separateChannelEnabled )
+ {
+ nchan_out_buff = s_max( nchan_out_buff, add( st_ivas->nchan_transport, 1 ) );
+ }
+
+ IF( st_ivas->hDiracDecBin[0] != NULL && st_ivas->hDiracDecBin[0]->useTdDecorr )
+ {
+ nchan_out_buff = 2 * BINAURAL_CHANNELS;
+ move16();
+ }
+ ELSE
+ {
+ nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( st_ivas->intern_config ) );
+ }
+#else
nchan_out_buff = st_ivas->hDecoderConfig->nchan_out;
IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_LS_CUSTOM ) )
@@ -469,8 +546,10 @@ Word16 ivas_get_nchan_buffers_dec_fx(
nchan_out_buff = s_max( audioCfg2channels( st_ivas->transport_config ), audioCfg2channels( st_ivas->intern_config ) );
nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( output_config ) );
}
+#endif
}
+ test();
IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
{
nchan_out_buff = max( nchan_out_buff, st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses * BINAURAL_CHANNELS );
@@ -487,7 +566,7 @@ Word16 ivas_get_nchan_buffers_dec_fx(
*-------------------------------------------------------------------*/
ivas_error ivas_output_buff_dec_fx(
- Word32 *p_output_f[], /* i/o: output audio buffers */
+ Word32 *p_output_fx[], /* i/o: output audio buffers */
const Word16 nchan_out_buff_old, /* i : previous frame number of output channels */
const Word16 nchan_out_buff /* i : number of output channels */
)
@@ -498,10 +577,18 @@ ivas_error ivas_output_buff_dec_fx(
{
FOR( ch = nchan_out_buff_old; ch < nchan_out_buff; ch++ )
{
+#ifdef FIX_NCHAN_BUFFERS
+#ifdef DEBUGGING
+ if ( p_output_fx[ch] != NULL )
+ {
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Memory for floating-point output audio buffer is already allocated!\n" ) );
+ }
+#endif
+#endif
/* note: these are intra-frame heap memories */
- IF( ( p_output_f[ch] = (Word32 *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( Word32 ) ) ) == NULL ) /* note: 32000 == max internal sampling rate */
+ IF( ( p_output_fx[ch] = (Word32 *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( Word32 ) ) ) == NULL )
{
- return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point output audio buffer!\n" ) );
+ return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for output audio buffer!\n" ) );
}
}
}
@@ -509,8 +596,8 @@ ivas_error ivas_output_buff_dec_fx(
{
FOR( ch = nchan_out_buff; ch < nchan_out_buff_old; ch++ )
{
- free( p_output_f[ch] );
- p_output_f[ch] = NULL;
+ free( p_output_fx[ch] );
+ p_output_fx[ch] = NULL;
}
}
diff --git a/lib_rend/ivas_prot_rend_fx.h b/lib_rend/ivas_prot_rend_fx.h
index 68c312ff047c2cd4bbef38ab61bfedeaaf54c7ba..250fea7515e5222ce88904254b9b70510c34341d 100644
--- a/lib_rend/ivas_prot_rend_fx.h
+++ b/lib_rend/ivas_prot_rend_fx.h
@@ -49,11 +49,13 @@
IVAS_REND_AudioConfigType getAudioConfigType(
const AUDIO_CONFIG config
);
+
ivas_error getAudioConfigNumChannels(
const AUDIO_CONFIG config,
Word16 *numChannels
);
+
/*----------------------------------------------------------------------------------*
* output setup prototypes
*----------------------------------------------------------------------------------*/
@@ -87,45 +89,28 @@ ivas_error get_channel_config(
);
-/*----------------------------------------------------------------------------------*
- * Limiter prototypes
- *----------------------------------------------------------------------------------*/
-
-void ivas_limiter_dec_fx(
- IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */
- Word32 *output[MAX_OUTPUT_CHANNELS], /* i/o: input/output buffer */
- const Word16 num_channels, /* i : number of channels to be processed */
- const Word16 output_frame, /* i : number of samples per channel in the buffer */
- const Word16 BER_detect, /* i : BER detect flag */
- Word16 q_factor /* i : Q factor of the output samples */
-);
-
-void limiter_process_fx(
- IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */
- const Word16 output_frame, /* i : number of samples to be processed per channel in the I/O buffer */
- const Word32 threshold, /* i : signal amplitude above which limiting starts to be applied */
- const Word16 BER_detect, /* i : BER detect flag */
- Word16 *strong_saturation_cnt, /* i/o: counter of strong saturations (can be NULL) */
- Word16 q_factor /* i : Q factor of output samples */
-);
/*----------------------------------------------------------------------------------*
* TD decorr. function prototypes
*----------------------------------------------------------------------------------*/
+
ivas_error ivas_td_decorr_dec_open_fx(
ivas_td_decorr_state_t **hTdDecorr, /* i/o: TD decorrelator handle */
const Word32 output_Fs, /* i : output sampling rate */
const Word16 nchan_internal, /* i : number of internal channels */
const Word16 ducking_flag /* i : ducking flag */
);
+
void ivas_td_decorr_dec_close(
ivas_td_decorr_state_t **hTdDecorr /* i/o: TD decorrelator handle */
);
+
void ivas_td_decorr_process_fx(
ivas_td_decorr_state_t *hTdDecorr, /* i/o: TD decoderrelator handle */
Word32 *pcm_in[], /* i : input audio channels */
Word32 **ppOut_pcm, /* o : output audio channels */
const Word16 output_frame /* i : output frame length */
);
+
ivas_error ivas_td_decorr_reconfig_dec(
const IVAS_FORMAT ivas_format, /* i : IVAS format */
const Word32 ivas_total_brate, /* i : total IVAS bitrate */
@@ -141,6 +126,8 @@ void ivas_td_decorr_APD_iir_filter_fx(
const Word16 num_APD_sections, /* i : numbef of APD sections */
const Word16 output_frame /* i : output frame length */
);
+
+
/*----------------------------------------------------------------------------------*
* Amplitude Panning EFAP prototypes
*----------------------------------------------------------------------------------*/
@@ -153,6 +140,10 @@ ivas_error efap_init_data_fx(
const Word16 efap_mode /* i : indicates whether EFAP or EFIP is used */
);
+void efap_free_data_fx(
+ EFAP_HANDLE *hEFAPdata /* i/o: EFAP handle to be freed */
+);
+
void efap_determine_gains_fx(
EFAP_HANDLE hEFAPdata, /* i : EFAP structure */
Word32 *gains, /* o : gain vector for speaker nodes for given direction Q30 */
@@ -217,13 +208,13 @@ void ivas_dirac_dec_binaural_render_fx(
UWord16 *nSamplesRendered, /* o : number of CLDFB slots rendered */
UWord16 *nSamplesAvailable, /* o : number of CLDFB slots still to render */
const Word16 nchan_transport, /* i : number of transport channels */
- Word32 *output_f[] /* o : rendered time signal, Q11 */
+ Word32 *output_fx[] /* o : rendered time signal, Q11 */
);
void ivas_masa_ext_rend_parambin_render_fx(
MASA_EXT_REND_HANDLE hMasaExtRend, /* i/o: MASA ext rend structure */
COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, /* i : combined orientation handle */
- Word32 *output_f[], /* i/o: synthesized core-coder transport channels/DirAC output Q11*/
+ Word32 *output_fx[], /* i/o: synthesized core-coder transport channels/DirAC output Q11*/
const Word16 num_subframes, /* i : number of subframes to render */
const SPLIT_REND_WRAPPER *hSplitRendWrapper, /* i : split rendering orientation data */
Word32 Cldfb_Out_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* o : rendered orientations for split rend. real part of cldfb */
@@ -240,7 +231,7 @@ void ivas_dirac_dec_close_binaural_data_fx(
);
ivas_error ivas_dirac_dec_binaural_copy_hrtfs_fx(
- HRTFS_PARAMBIN_HANDLE *hHrtfParambin /* i/o: HRTF structure for rendering */
+ HRTFS_PARAMBIN_HANDLE *hHrtfParambin /* i/o: HRTF structure for rendering */
);
ivas_error ivas_dirac_alloc_mem_fx(
@@ -472,17 +463,17 @@ void ivas_dirac_dec_output_synthesis_process_slot_fx(
Word16 q_diffuseness,
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i/o: common spatial renderer data handle */
DIRAC_REND_HANDLE hDirACRend, /* i/o: DirAC renderer handle */
- const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */
- const IVAS_OUTPUT_SETUP hOutSetup, /* i : output setup structure */
- const Word16 nchan_transport, /* i : number of transport channels*/
+ const VBAP_HANDLE hVBAPdata, /* i : VBAP structure */
+ const IVAS_OUTPUT_SETUP hOutSetup, /* i : output setup structure */
+ const Word16 nchan_transport, /* i : number of transport channels */
const Word16 md_idx,
- const Word16 hodirac_flag, /* i : flag to indicate HO-DirAC mode */
+ const Word16 hodirac_flag, /* i : flag to indicate HO-DirAC mode */
const Word16 dec_param_estim
);
void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
- Word32 RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */
- Word32 ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */
+ Word32 RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */
+ Word32 ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i/o: common spatial renderer data handle */
DIRAC_REND_HANDLE hDirACRend, /* i/o: DirAC renderer handle */
const Word16 nchan_transport, /* i : number of transport channels */
@@ -496,8 +487,8 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd_fx(
);
void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls_fx(
- Word32 RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */
- Word32 ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */
+ Word32 RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */
+ Word32 ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals */
SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom, /* i/o: common spatial renderer data handle */
DIRAC_REND_HANDLE hDirACRend, /* i/o: DirAC renderer handle */
const Word16 nbslots, /* i : number of slots to process */
@@ -578,9 +569,9 @@ void ivas_dirac_deallocate_parameters_fx(
);
void ivas_masa_ext_dirac_render_fx(
- MASA_EXT_REND_HANDLE hMasaExtRend, /* i/o: MASA renderer structure */
- Word32 *output_f[], /* i/o: input/output signals in time domain q11*/
- const Word16 num_subframes /* i : number of subframes to render */
+ MASA_EXT_REND_HANDLE hMasaExtRend, /* i/o: MASA renderer structure */
+ Word32 *output_fx[], /* i/o: input/output signals in time domain q11 */
+ const Word16 num_subframes /* i : number of subframes to render */
);
@@ -612,7 +603,6 @@ void ivas_HRTF_parambin_binary_close_fx(
HRTFS_PARAMBIN **hHrtfParambin /* i/o: Parametric binauralizer HRTF structure */
);
-#ifdef FIX_CREND_SIMPLIFY_CODE
ivas_error ivas_HRTF_CRend_binary_open_fx(
HRTFS_CREND_DATA **hHrtfCrend /* i/o: Crend HRTF handle */
);
@@ -630,25 +620,6 @@ ivas_error ivas_HRTF_statistics_init_fx(
HRTFS_STATISTICS_HANDLE *hHrtfStatistics, /* i/o: HRTF statistics structure */
const int32_t sampleRate /* i : Sample rate */
);
-#else
-
-ivas_error ivas_HRTF_CRend_binary_open_fx(
- HRTFS_CREND **hSetOfHRTF /* i/o: Set of HRTF handle */
-);
-
-void ivas_HRTF_CRend_binary_close_fx(
- HRTFS_CREND **hSetOfHRTF /* i/o: Set of HRTF handle */
-);
-
-ivas_error ivas_HRTF_statistics_init_fx(
- HRTFS_STATISTICS_HANDLE *hHrtfStatistics, /* i/o: HRTF statistics structure */
-#ifdef FIX_CREND_SIMPLIFY_CODE
- const Word32 sampleRate /* i : Sample rate */
-#else
- Word32 sampleRate
-#endif
-);
-#endif
void ivas_HRTF_statistics_close_fx(
HRTFS_STATISTICS **hHrtfStatistics /* i/o: HRTF statistics structure */
@@ -658,23 +629,24 @@ ivas_error ivas_HRTF_statistics_binary_open_fx(
HRTFS_STATISTICS **hHrtfStatistics /* i/o: HRTF statistics structure */
);
+
/*----------------------------------------------------------------------------------*
* TD object renderer
*----------------------------------------------------------------------------------*/
ivas_error ivas_td_binaural_renderer_unwrap_fx(
- 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 Word16 num_src, /* i : number of sources to render */
- const Word16 lfe_idx, /* i : LFE channel index */
- const IVAS_FORMAT ivas_format, /* i : IVAS format */
- ISM_METADATA_HANDLE *hIsmMetaData, /* i : ISM metadata handle */
- COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, /* i/o: combined orientaton data handle */
+ 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 Word16 num_src, /* i : number of sources to render */
+ const Word16 lfe_idx, /* i : LFE channel index */
+ const IVAS_FORMAT ivas_format, /* i : IVAS format */
+ ISM_METADATA_HANDLE *hIsmMetaData, /* i : ISM metadata handle */
+ COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, /* i/o: combined orientaton data handle */
const Word16 ism_md_subframe_update, /* i : Number of subframes to delay ism metadata to sync with audio */
Word32 *output_fx[], /* i/o: SCE channels / Binaural synthesis Q11 */
- const Word16 output_frame, /* i : output frame length */
- const Word16 num_subframes /* i : number of subframes to render */
+ const Word16 output_frame, /* i : output frame length */
+ const Word16 num_subframes /* i : number of subframes to render */
);
ivas_error ivas_td_binaural_renderer_ext_fx(
@@ -687,7 +659,7 @@ ivas_error ivas_td_binaural_renderer_ext_fx(
const Word16 ism_md_subframe_update_ext, /* i : Metadata Delay in subframes to sync with audio delay */
const Word32 output_Fs, /* i : output sampling rate */
const Word16 output_frame, /* i : output frame length */
- Word32 output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis Q11 */
+ Word32 output[][L_FRAME48k], /* i/o: SCE channels / Binaural synthesis Q11 */
Word16 *exp
);
@@ -723,10 +695,10 @@ void ivas_td_binaural_close_fx(
);
ivas_error TDREND_GetMix_fx(
- BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
- Word32 *output[], /* i/o: ISM object synth / rendered output in 0,1 */
- const Word16 subframe_length, /* i/o: subframe length Q11 */
-const Word16 subframe_idx /* i : Subframe index to 5 ms subframe */
+ BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
+ Word32 *output[], /* i/o: ISM object synth/rendered output in 0,1 */
+ const Word16 subframe_length, /* i/o: subframe length Q11 */
+ const Word16 subframe_idx /* i : Subframe index to 5 ms subframe */
);
void BSplineModelEvalDealloc_fx(
@@ -737,15 +709,15 @@ void BSplineModelEvalDealloc_fx(
/* ----- Object renderer - hrfilt ----- */
void GetFilterFromAngle_fx(
- TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* i/o: HR filter set structure */
- const Word32 Elev_fx, /* i : Elevation, degrees Q22 */
- Word32 Azim_fx, /* i : Azimuth, degrees Q22 */
- const Word16 filterlength, /* i : Filter length */
- Word32 *hrf_left_fx, /* o : Left HR filter */
- Word16 *hrf_left_e, /* o : Left HR filter exponent */
- Word32 *hrf_right_fx, /* o : Right HR filter */
- Word16 *hrf_right_e, /* o : Right HR filter exponent */
- Word16 *itd /* o : ITD value Q0 */
+ TDREND_HRFILT_FiltSet_t *HrFiltSet_p, /* i/o: HR filter set structure */
+ const Word32 Elev_fx, /* i : Elevation, degrees Q22 */
+ Word32 Azim_fx, /* i : Azimuth, degrees Q22 */
+ const Word16 filterlength, /* i : Filter length */
+ Word32 *hrf_left_fx, /* o : Left HR filter */
+ Word16 *hrf_left_e, /* o : Left HR filter exponent */
+ Word32 *hrf_right_fx, /* o : Right HR filter */
+ Word16 *hrf_right_e, /* o : Right HR filter exponent */
+ Word16 *itd /* o : ITD value Q0 */
);
void HRTF_model_precalc(
@@ -753,14 +725,14 @@ void HRTF_model_precalc(
);
ivas_error TDREND_REND_RenderSourceHRFilt_fx(
- TDREND_SRC_t *Src_p, /* i/o: The source to be rendered */
- Word32 *hrf_left_delta_fx, /* i/o: Left filter interpolation delta */
- Word16 *hrf_left_delta_e, /* i/o: Left filter interpolation delta exp */
- Word32 *hrf_right_delta_fx, /* i/o: Right filter interpolation delta */
- Word16 *hrf_right_delta_e, /* i/o: Right filter interpolation delta exp */
- const Word16 intp_count, /* i : Interpolation count */
+ TDREND_SRC_t *Src_p, /* i/o: The source to be rendered */
+ Word32 *hrf_left_delta_fx, /* i/o: Left filter interpolation delta */
+ Word16 *hrf_left_delta_e, /* i/o: Left filter interpolation delta exp */
+ Word32 *hrf_right_delta_fx, /* i/o: Right filter interpolation delta */
+ Word16 *hrf_right_delta_e, /* i/o: Right filter interpolation delta exp */
+ const Word16 intp_count, /* i : Interpolation count */
Word32 output_buf_fx[][L_SPATIAL_SUBFR_48k], /* o : Output buffer same Q as Src_p->InputFrame_p_fx Q11 */
- const Word16 subframe_length /* i : Subframe length in use */
+ const Word16 subframe_length /* i : Subframe length in use */
);
/* ----- Object renderer - sources ----- */
@@ -778,6 +750,12 @@ ivas_error TDREND_MIX_SRC_SetDir_fx(
const Word16 Vec_p_q /* i : Direction vector q */
);
+ivas_error TDREND_MIX_SRC_SetGain(
+ BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
+ const Word16 SrcInd,
+ const Word32 Gain /* i : Gain */
+);
+
ivas_error TDREND_MIX_SRC_SetDirAtten_fx(
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
const Word16 SrcInd, /* i : Source index */
@@ -796,23 +774,28 @@ ivas_error TDREND_MIX_SRC_SetPlayState(
const TDREND_PlayStatus_t PlayStatus /* i : Play state */
);
+// ivas_error TDREND_SRC_SPATIAL_SetGain(
+// BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
+// const Word32 SrcGain_p /* i : Source gain */
+// );
+
void TDREND_SRC_REND_UpdateFiltersFromSpatialParams_fx(
- BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
- TDREND_SRC_REND_t *SrcRend_p, /* i/o: Source object */
- TDREND_SRC_SPATIAL_t *SrcSpatial_p, /* i : Spatial aspects of source */
- Word32 *hrf_left_prev, /* i/o: Left filter */
- Word16 *hrf_left_prev_e, /* i/o: Left filter exponent */
- Word32 *hrf_right_prev, /* i/o: Right filter */
- Word16 *hrf_right_prev_e, /* i/o: Right filter exponent */
- Word32 *hrf_left_delta, /* o : Left filter interpolation delta */
- Word16 *hrf_left_delta_e, /* o : Left filter interpolation delta exponent */
- Word32 *hrf_right_delta, /* o : Right filter interpolation delta */
- Word16 *hrf_right_delta_e, /* o : Right filter interpolation delta exponent */
- Word16 *intp_count, /* o : Interpolation count */
- Word16 *filterlength, /* o : Length of filters */
- Word16 *itd, /* o : ITD value */
- Word32 *Gain, /* o : Gain value Q30 */
- TDREND_SRC_t *Src_p /* i/o: Source pointer */
+ BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
+ TDREND_SRC_REND_t *SrcRend_p, /* i/o: Source object */
+ TDREND_SRC_SPATIAL_t *SrcSpatial_p, /* i : Spatial aspects of source */
+ Word32 *hrf_left_prev, /* i/o: Left filter */
+ Word16 *hrf_left_prev_e, /* i/o: Left filter exponent */
+ Word32 *hrf_right_prev, /* i/o: Right filter */
+ Word16 *hrf_right_prev_e, /* i/o: Right filter exponent */
+ Word32 *hrf_left_delta, /* o : Left filter interpolation delta */
+ Word16 *hrf_left_delta_e, /* o : Left filter interpolation delta exponent */
+ Word32 *hrf_right_delta, /* o : Right filter interpolation delta */
+ Word16 *hrf_right_delta_e, /* o : Right filter interpolation delta exponent */
+ Word16 *intp_count, /* o : Interpolation count */
+ Word16 *filterlength, /* o : Length of filters */
+ Word16 *itd, /* o : ITD value */
+ Word32 *Gain, /* o : Gain value Q30 */
+ TDREND_SRC_t *Src_p /* i/o: Source pointer */
);
ivas_error TDREND_SRC_Alloc(
@@ -828,36 +811,31 @@ void TDREND_SRC_Init_fx(
const TDREND_PosType_t PosType /* i : Position type specifier */
);
-/* ----- Object renderer - vec ----- */
void TDREND_SPATIAL_VecInit_fx(
- Word32 *Pos_p, /* o : Output vector */
- const Word32 PosX, /* i : X value */
- const Word32 PosY, /* i : Y value */
- const Word32 PosZ /* i : Z value */
+ Word32 *Pos_p, /* o : Output vector */
+ const Word32 PosX, /* i : X value */
+ const Word32 PosY, /* i : Y value */
+ const Word32 PosZ /* i : Z value */
);
-/*! r: Euclidian norm value */
-
void TDREND_SPATIAL_VecNormalize_fx(
- const Word32 *Vec_p_fx, /* i : Input vector Qx */
- Word16 q, /* i : Input vector Q-factor */
- Word32 *VecNorm_p_fx /* o : Normalised output vector Q30 */
+ const Word32 *Vec_p_fx, /* i : Input vector Qx */
+ Word16 q, /* i : Input vector Q-factor */
+ Word32 *VecNorm_p_fx /* o : Normalised output vector Q30 */
);
Word16 TDREND_SPATIAL_EvalOrthonormOrient_fx(
- Word32 *FrontVecON_p_fx, /* i/o: Normalized front vector Q30 */
- Word32 *UpVecON_p_fx, /* i/o: Normalized up vector Q30 */
- Word32 *RightVecON_p_fx, /* i/o: Normalized right vector Q30 */
- const Word32 *FrontVec_p_fx, /* i : Input front vector Qx */
- const Word32 *UpVec_p_fx, /* i : Input up vector orient_q */
- const Word16 orient_q /* i : Input up Q-factor */
+ Word32 *FrontVecON_p_fx, /* i/o: Normalized front vector Q30 */
+ Word32 *UpVecON_p_fx, /* i/o: Normalized up vector Q30 */
+ Word32 *RightVecON_p_fx, /* i/o: Normalized right vector Q30 */
+ const Word32 *FrontVec_p_fx, /* i : Input front vector Qx */
+ const Word32 *UpVec_p_fx, /* i : Input up vector orient_q */
+ const Word16 orient_q /* i : Input up Q-factor */
);
-/* ----- Object renderer - mix ----- */
-
ivas_error TDREND_MIX_AddSrc_fx(
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
- Word16 *SrcInd, /* o : Source index */
+ Word16 *SrcInd, /* o : Source index */
const TDREND_PosType_t PosType /* i : Position type (absolute/relative) */
);
@@ -874,32 +852,30 @@ ivas_error TDREND_MIX_Init_fx(
BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle */
TDREND_HRFILT_FiltSet_t **hHrtfTD, /* i/o: HRTF data (initialized in case of NULL) */
const TDREND_MixSpatSpec_t *MixSpatSpec_p, /* i : Mixer spatial specification */
- const Word32 output_Fs /* i : Output sampling rate */
+ const Word32 output_Fs /* i : Output sampling rate */
);
- /* ----- Object renderer - sfx ----- */
-
void TDREND_Apply_ITD_fx(
- Word32 *input_fx, /* i : Input subframe to be time adjusted Qx */
- Word32 *out_left_fx, /* o : Output left channel with ITD applied Qx */
- Word32 *out_right_fx, /* o : Output right channel with ITD applied Qx */
- Word16 *previtd, /* i/o: Previous ITD value */
- const Word16 itd, /* i : Current subframe ITD value */
- Word32 *mem_itd_fx, /* i/o: ITD buffer memory Qx */
- const Word16 length /* i : Subframe length */
+ Word32 *input_fx, /* i : Input subframe to be time adjusted Qx */
+ Word32 *out_left_fx, /* o : Output left channel with ITD applied Qx */
+ Word32 *out_right_fx, /* o : Output right channel with ITD applied Qx */
+ Word16 *previtd, /* i/o: Previous ITD value */
+ const Word16 itd, /* i : Current subframe ITD value */
+ Word32 *mem_itd_fx, /* i/o: ITD buffer memory Qx */
+ const Word16 length /* i : Subframe length */
);
void TDREND_firfilt_fx(
- Word32 *signal_fx, /* i/o: Input signal / Filtered signal Qx */
- Word32 *filter_fx, /* i/o: FIR filter Qy */
- const Word16 filter_e, /* i : FIR filter exp */
- const Word32 *filter_delta_fx, /* i : FIR filter delta Qy */
- const Word16 intp_count, /* i : interpolation count */
- Word32 *mem_fx, /* i/o: filter memory Qx */
- const Word16 subframe_length, /* i : Length of signal */
- const Word16 filterlength, /* i : Filter length */
- const Word32 Gain_fx, /* i : Gain Q30 */
- const Word32 prevGain_fx /* i : Previous gain Q30 */
+ Word32 *signal_fx, /* i/o: Input signal / Filtered signal Qx */
+ Word32 *filter_fx, /* i/o: FIR filter Qy */
+ const Word16 filter_e, /* i : FIR filter exp */
+ const Word32 *filter_delta_fx, /* i : FIR filter delta Qy */
+ const Word16 intp_count, /* i : interpolation count */
+ Word32 *mem_fx, /* i/o: filter memory Qx */
+ const Word16 subframe_length, /* i : Length of signal */
+ const Word16 filterlength, /* i : Filter length */
+ const Word32 Gain_fx, /* i : Gain Q30 */
+ const Word32 prevGain_fx /* i : Previous gain Q30 */
);
@@ -912,39 +888,20 @@ ivas_error ivas_rend_openCrend_fx(
const AUDIO_CONFIG inConfig,
const AUDIO_CONFIG outConfig,
RENDER_CONFIG_DATA *hRendCfg,
-#ifdef FIX_CREND_SIMPLIFY_CODE
HRTFS_CREND_HANDLE hHrtfCrend,
-#else
- HRTFS_CREND_HANDLE hSetOfHRTF,
-#endif
HRTFS_STATISTICS_HANDLE hHrtfStatistics,
const Word32 output_Fs,
-#ifdef FIX_CREND_SIMPLIFY_CODE
const int16_t ext_rend_flag,
-#endif
const Word16 num_poses
);
-#ifdef FIX_CREND_SIMPLIFY_CODE
void ivas_rend_closeCrend_fx(
CREND_WRAPPER_HANDLE *pCrend
);
-#else
-void ivas_rend_closeCrend_fx(
- CREND_WRAPPER_HANDLE *pCrend,
- const Word16 num_poses
-);
-#endif
-#ifdef FIX_CREND_SIMPLIFY_CODE
ivas_error ivas_Crend_hrtf_init_fx(
HRTFS_CREND_DATA *hHrtf /* i/o: Crend HRTF handle */
);
-#else
-ivas_error ivas_hrtf_init(
- HRTFS_DATA *hHrtf /* i/o: HRTF handle */
-);
-#endif
ivas_error ivas_rend_initCrendWrapper_fx(
CREND_WRAPPER_HANDLE *pCrend,
@@ -1006,7 +963,7 @@ ivas_error ivas_reverb_open_fx(
);
void ivas_reverb_close_fx(
- REVERB_HANDLE *hReverb /* i/o: Reverberator handle */
+ REVERB_HANDLE *hReverb /* i/o: Reverberator handle */
);
ivas_error ivas_reverb_process_fx(
@@ -1036,15 +993,15 @@ void ivas_rev_delay_line_feed_sample_fx(
);
void ivas_rev_delay_line_get_sample_blk_fx(
- ivas_rev_delay_line_t *pDelay, /* i : the delay line */
- const UWord16 blk_size, /* i : number of samples in the data block */
+ ivas_rev_delay_line_t *pDelay, /* i : the delay line */
+ const UWord16 blk_size, /* i : number of samples in the data block */
Word32 *output /* i/o: amples gotten out of delay line, and amplified by set gainin */
);
void ivas_rev_delay_line_feed_sample_blk_fx(
- ivas_rev_delay_line_t *pDelay, /* i/o: the delay line */
- const UWord16 blk_size, /* i : number of samples in the input data block */
- Word32 *input /* i : the samples to feed Q11 */
+ ivas_rev_delay_line_t *pDelay, /* i/o: the delay line */
+ const UWord16 blk_size, /* i : number of samples in the input data block */
+ Word32 *input /* i : the samples to feed Q11 */
);
void ivas_reverb_iir_filt_init(
@@ -1063,7 +1020,7 @@ void ivas_reverb_iir_filt_2taps_feed_blk_fx(
ivas_rev_iir_filter_t *iirFilter, /* i/o: IIR filter */
const UWord16 blk_size, /* i : size */
const Word32 *input, /* i : input buffer */
- Word32 *output /* i : output buffer */
+ Word32 *output /* o : output buffer */
);
UWord16 int_log2(
@@ -1124,6 +1081,7 @@ void ivas_reverb_define_window_fft_fx(
const Word16 transitionLength,
const Word16 spectrumLength
);
+
Word16 ivas_reverb_calc_color_filters_fx(
const Word32 *pTargetL,
const Word32 *pTargetR,
@@ -1191,7 +1149,6 @@ void ivas_shoebox_init(
shoebox_config_t *cal
);
-
void ivas_shoebox_set_scene (
shoebox_obj_t *obj,
shoebox_output_t *ER_PARAMS,
@@ -1221,7 +1178,8 @@ ivas_error ivas_er_compute_reflections(
ivas_error ivas_er_encoder_init(
er_struct_t *reflections
-);
+);
+
ivas_error ivas_er_process(
er_struct_t *reflections,
const Word16 frame_size,
@@ -1230,6 +1188,7 @@ ivas_error ivas_er_process(
const AUDIO_CONFIG inConfig
);
+
/*---------------------------------------------------------------------------------*
* Rotation Prototypes
*-----------------------------------------------------------------------------------*/
@@ -1276,7 +1235,7 @@ void rotateAziEle_fx_frac_az_el(
const Word16 isPlanar /* i : is roation planar and elevation meaningless? */
);
-void rotateAziEle_fixed(
+void rotateAziEle_fx32(
Word16 azi_in, /* i : output elevation */
Word16 ele_in, /* i : input elevation */
Word32 *azi, /* o : rotated azimuth */
@@ -1322,7 +1281,7 @@ void ivas_combined_orientation_set_to_start_index(
COMBINED_ORIENTATION_HANDLE hCombinedOrientationData /* i/o: combined orientation handle */
);
-void rotateFrame_shd_cldfb(
+void rotateFrame_shd_cldfb_fx(
Word32 Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain real part */
Word32 Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain imag part */
Word32 Rmat[3][3], /* i : real-space rotation matrix */
@@ -1331,7 +1290,7 @@ void rotateFrame_shd_cldfb(
const Word16 shd_rot_max_order /* i : split-order rotation method */
);
-void rotateFrame_sd_cldfb_fixed(
+void rotateFrame_sd_cldfb_fx(
Word32 Rmat[3][3], /* i : real-space rotation matrix */
Word32 Cldfb_RealBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain real part */
Word32 Cldfb_ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* i/o: unrotated HOA3 signal buffer in cldfb domain imag part */
@@ -1341,7 +1300,7 @@ void rotateFrame_sd_cldfb_fixed(
const Word16 nb_band /* i : number of CLDFB bands to process */
);
-ivas_error ivas_external_orientation_open(
+ivas_error ivas_external_orientation_open_fx(
EXTERNAL_ORIENTATION_HANDLE *hExtOrientationData, /* o : external orientation handle */
const Word16 num_subframes /* i : number of subframes */
);
@@ -1349,10 +1308,10 @@ ivas_error ivas_external_orientation_open(
void ivas_external_orientation_close_fx(
EXTERNAL_ORIENTATION_HANDLE *hExtOrientationData /* i/o: external orientation handle */
);
-ivas_error ivas_combined_orientation_open(
- COMBINED_ORIENTATION_HANDLE *hCombinedOrientationData, /* o : combined orientation handle */
- const Word32 fs, /* i : sampling rate */
- const Word16 num_subframes /* i : number of subframes */
+ivas_error ivas_combined_orientation_open_fx(
+ COMBINED_ORIENTATION_HANDLE *hCombinedOrientationData, /* o : combined orientation handle */
+ const Word32 fs, /* i : sampling rate */
+ const Word16 num_subframes /* i : number of subframes */
);
void ivas_combined_orientation_close_fx(
@@ -1447,10 +1406,10 @@ ivas_error ivas_orient_trk_GetTrackedRotation_fx(
);
ivas_error ivas_orient_trk_Process_fx(
- ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
- IVAS_QUATERNION absRot, /* i : absolute head rotation */
- Word32 updateRate_fx, /* i : rotation update rate [Hz] */
- IVAS_QUATERNION *pTrkRot /* o : tracked rotation */
+ ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle */
+ IVAS_QUATERNION absRot, /* i : absolute head rotation */
+ Word32 updateRate_fx, /* i : rotation update rate [Hz] */
+ IVAS_QUATERNION *pTrkRot /* o : tracked rotation */
);
@@ -1461,16 +1420,16 @@ ivas_error ivas_orient_trk_Process_fx(
ivas_error ivas_mcmasa_ana_open(
MCMASA_ANA_HANDLE *hMcMasaPtr, /* i/o: McMASA data handle pointer */
const AUDIO_CONFIG inConfig, /* i : Input config */
- Word32 input_Fs /* i : Sampling frequency */
+ Word32 input_Fs /* i : Sampling frequency */
);
void ivas_mcmasa_ana_fx(
- MCMASA_ANA_HANDLE hMcMasa, /* i/o: McMASA encoder handle */
- Word32 data[][L_FRAME48k], /* i/o: Input / transport audio signals */
+ MCMASA_ANA_HANDLE hMcMasa, /* i/o: McMASA encoder handle */
+ Word32 data[][L_FRAME48k], /* i/o: Input / transport audio signals */
Word16 q_data,
- const Word16 input_frame, /* i : Input frame size */
- const Word16 nchan_transport, /* i : Number of transport channels */
- const Word16 nchan_inp /* i : Number of input channels */
+ const Word16 input_frame, /* i : Input frame size */
+ const Word16 nchan_transport, /* i : Number of transport channels */
+ const Word16 nchan_inp /* i : Number of input channels */
);
void ivas_mcmasa_ana_close(
@@ -1479,30 +1438,32 @@ void ivas_mcmasa_ana_close(
ivas_error ivas_omasa_ana_open(
OMASA_ANA_HANDLE *hOMasaPtr, /* i/o: OMASA data handle pointer */
- Word32 input_Fs, /* i : Sampling frequency */
- UWord16 total_num_objects /* i : Number of objects */
+ Word32 input_Fs, /* i : Sampling frequency */
+ UWord16 total_num_objects /* i : Number of objects */
);
void ivas_omasa_ana_fx(
OMASA_ANA_HANDLE hOMasa, /* i/o: OMASA analysis handle */
- Word32 data_in_f_fx[][L_FRAME48k], /* i/o: Input / transport audio signals */
+ Word32 data_in_f_fx[][L_FRAME48k], /* i/o: Input / transport audio signals */
Word16 *q,
- const Word16 input_frame, /* i : Input frame size */
- const Word16 nchan_transport, /* i : Number of transport channels */
- const Word16 nchan_ism /* i : Number of objects for parameter analysis*/
+ const Word16 input_frame, /* i : Input frame size */
+ const Word16 nchan_transport, /* i : Number of transport channels */
+ const Word16 nchan_ism /* i : Number of objects for parameter analysis*/
);
void ivas_omasa_ana_close(
OMASA_ANA_HANDLE *hOMasa /* i/o: analysis OMASA handle */
);
+
void computeIntensityVector_ana_fx(
- const Word16 *band_grouping, /* i : Band grouping for estimation */
- Word32 Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i : Real part of input signal Qx */
- Word32 Cldfb_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i : Imag part of input sig Qx */
- const Word16 num_frequency_bands, /* i : Number of frequency bands */
- Word32 intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS], /* o : Intensity */
+ const Word16 *band_grouping, /* i : Band grouping for estimation */
+ Word32 Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i : Real part of input signal Qx */
+ Word32 Cldfb_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i : Imag part of input sig Qx */
+ const Word16 num_frequency_bands, /* i : Number of frequency bands */
+ Word32 intensity_real[DIRAC_NUM_DIMS][MASA_FREQUENCY_BANDS], /* o : Intensity */
Word16 q_intensity_real[MASA_FREQUENCY_BANDS],
- Word16 inp_q );
+ Word16 inp_q
+);
void computeReferencePower_ana_fx(
const Word16 *band_grouping, /* i : Band grouping for estimation */
@@ -1526,7 +1487,7 @@ void ivas_create_masa_out_meta_fx(
Word16 energyRatio_q,
Word16 spreadCoherence_q,
Word16 surroundingCoherence_q
- );
+);
ivas_error ivas_dirac_ana_open_fx(
DIRAC_ANA_HANDLE *hDirACPtr, /* i/o: DIRAC data handle pointer */
@@ -1534,11 +1495,11 @@ ivas_error ivas_dirac_ana_open_fx(
);
void ivas_dirac_ana_fx(
- DIRAC_ANA_HANDLE hDirAC, /* i/o: DIRAC analysis handle */
- Word32 data_in_fx[][L_FRAME48k], /* i/o: Input / transport audio signals */
- const Word16 input_frame, /* i : Input frame size */
+ DIRAC_ANA_HANDLE hDirAC, /* i/o: DIRAC analysis handle */
+ Word32 data_in_fx[][L_FRAME48k], /* i/o: Input / transport audio signals */
+ const Word16 input_frame, /* i : Input frame size */
const Word16 nchan_transport, /* i : Number of transport channels */
- const Word16 data_q /*i : Q of data_in_fx*/
+ const Word16 data_q /* i : Q of data_in_fx */
);
void ivas_dirac_ana_close_fx(
@@ -1559,14 +1520,15 @@ void ivas_prerend_merge_masa_metadata_fx(
ivas_error masaPrerendOpen_fx(
MASA_PREREND_HANDLE *hMasaPrerendPtr, /* o : handle to the opened prerenderer */
- Word16 numTransports, /* i : number of transport channels */
- Word32 input_Fs /* i : signal sampling rate */
+ Word16 numTransports, /* i : number of transport channels */
+ Word32 input_Fs /* i : signal sampling rate */
);
void masaPrerendClose_fx(
MASA_PREREND_HANDLE *hMasaPrerendPtr /* i/o: prerenderer handle to be closed */
);
+
/*----------------------------------------------------------------------------------*
* Split rendering
*----------------------------------------------------------------------------------*/
diff --git a/lib_rend/ivas_render_config_fx.c b/lib_rend/ivas_render_config_fx.c
index 00bd26301881a84c612aca8ab5f7c1b3bdfb1087..3c43b59e1fa44312f199d2cd4af6d26c10e6229a 100644
--- a/lib_rend/ivas_render_config_fx.c
+++ b/lib_rend/ivas_render_config_fx.c
@@ -42,10 +42,8 @@
* Local constants
*-----------------------------------------------------------------------*/
-#define IVAS_REVERB_DEFAULT_PRE_DELAY 0.016f
-#define IVAS_REVERB_DEFAULT_PRE_DELAY_FX 2147484
-#define IVAS_REVERB_DEFAULT_INPUT_DELAY 0.1f
-#define IVAS_REVERB_DEFAULT_INPUT_DELAY_FX 13421773
+#define IVAS_REVERB_DEFAULT_PRE_DELAY_FX 2147484 // 0.016
+#define IVAS_REVERB_DEFAULT_INPUT_DELAY_FX 13421773 // 0.1
#define IVAS_REVERB_DEFAULT_USE_ER 0
@@ -156,11 +154,7 @@ ivas_error ivas_render_config_init_from_rom_fx(
move32();
( *hRenderConfig )->split_rend_config.poseCorrectionMode = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB;
move32();
-#ifdef FIX_HRTF_LOAD
( *hRenderConfig )->split_rend_config.rendererSelection = IVAS_BIN_RENDERER_TYPE_DEFAULT;
-#else
- ( *hRenderConfig )->split_rend_config.rendererSelection = ISAR_SPLIT_REND_RENDERER_SELECTION_DEFAULT;
-#endif
move32();
( *hRenderConfig )->split_rend_config.lc3plus_highres = 0;
move16();
diff --git a/lib_rend/ivas_reverb_fx.c b/lib_rend/ivas_reverb_fx.c
index b0c2210f387ef1fe22f3ae8b7276d56b81e5c8da..6ab0c7a6355243b49f77be91ab4511707aec6c93 100644
--- a/lib_rend/ivas_reverb_fx.c
+++ b/lib_rend/ivas_reverb_fx.c
@@ -78,10 +78,8 @@
#define MAX_NR_OUTPUTS ( 2 )
-#ifdef FIX_1942_ASSERTION_LOWSHELF
#define M60Q9 ( -30720 ) //-60 in Q9
#define M120Q8 ( -30720 ) //-120 in Q8
-#endif
static const Word16 init_loop_delay[IVAS_REV_MAX_NR_BRANCHES] = { 37, 31, 29, 23, 19, 17, 13, 11 };
static const Word16 default_loop_delay_48k[IVAS_REV_MAX_NR_BRANCHES] = { 2309, 1861, 1523, 1259, 1069, 919, 809, 719 };
@@ -132,12 +130,12 @@ static ivas_error calc_jot_t60_coeffs_fx( Word16 *pH_dB_fx, Word16 pH_dB_exp, co
/*-------------------------------------------------------------------------
- * wrap_rad_fixed()
+ * wrap_rad_fx()
*
*
*------------------------------------------------------------------------*/
-static Word16 wrap_rad_fixed(
+static Word16 wrap_rad_fx(
Word32 angle /* Q13 */ )
{
Word32 L_tmp = angle;
@@ -192,9 +190,9 @@ static void ivas_binaural_reverb_setPreDelay_fx(
return;
}
- IF( GT_16( delaySamples, REVERB_PREDELAY_MAX ) )
+ IF( GT_16( delaySamples, IVAS_REVERB_PREDELAY_MAX ) )
{
- hReverb->preDelayBufferLength = REVERB_PREDELAY_MAX;
+ hReverb->preDelayBufferLength = IVAS_REVERB_PREDELAY_MAX;
move16();
return;
@@ -260,7 +258,7 @@ static void ivas_binaural_reverb_setReverbTimes_fx(
tmp = add( mult( EVS_PI_FX, tmp ), EPSILLON_FX ); // to avoid divide by 0 issue
tmp_exp = sub( add( binCenterFreq_exp, 2 ), norm );
- sine_inp = wrap_rad_fixed( L_shl( tmp, sub( tmp_exp, 2 ) ) ); // Q13
+ sine_inp = wrap_rad_fx( L_shl( tmp, sub( tmp_exp, 2 ) ) ); // Q13
sine = getSinWord16( sine_inp ); // Q15
div1 = BASOP_Util_Divide1616_Scale( sine, tmp, &scale );
@@ -659,19 +657,12 @@ static ivas_error compute_t60_coeffs_fx(
{
Word16 bin_idx, loop_idx, tf_T60_len, len;
ivas_error error;
-#ifdef FIX_1942_ASSERTION_LOWSHELF
Word16 loop_delay_sec_fx, tmp, tmp_e;
-#else
- Word16 loop_delay_sec_fx, tmp;
-#endif
Word32 freq_Nyquist_fx = L_shr( output_Fs, 1 );
Word16 target_gains_db_fx[RV_LENGTH_NR_FC]; // Q8
Word16 norm_f_fx[RV_LENGTH_NR_FC];
Word16 *pCoeffs_a_fx, *pCoeffs_b_fx;
Word16 e;
-#ifndef FIX_1942_ASSERTION_LOWSHELF
- const Word16 min120q8 = -30720; // -120 in Q8
-#endif
error = IVAS_ERR_OK;
move32();
tf_T60_len = nr_fc_fft_filter;
@@ -697,17 +688,12 @@ static ivas_error compute_t60_coeffs_fx(
IF( EQ_32( pParams->pRt60_fx[bin_idx], 0 ) )
{
// If RT60 is 0, target gain is -120dB
-#ifdef FIX_1942_ASSERTION_LOWSHELF
target_gains_db_fx[bin_idx] = M120Q8;
move16();
-#else
- target_gains_db_fx[bin_idx] = min120q8;
-#endif
}
ELSE
{
tmp = BASOP_Util_Divide3232_Scale( L_deposit_h( loop_delay_sec_fx ), pParams->pRt60_fx[bin_idx], &e );
-#ifdef FIX_1942_ASSERTION_LOWSHELF
tmp_e = add( e, sub( 0, 5 ) ); // L_deposit_h( loop_delay_sec_fx ):Q0.31, pParams->pRt60_fx[bin_idx]:Q5.26
tmp_e = add( tmp_e, 6 ); // + Q6.9(M60Q9)
@@ -737,24 +723,6 @@ static ivas_error compute_t60_coeffs_fx(
}
}
}
-#else
- IF( LT_16( e, -1 ) )
- {
- target_gains_db_fx[bin_idx] = min120q8;
- }
- ELSE
- {
- tmp = shr( tmp, sub( 5, e ) ); // scaling tmp to Q15
- target_gains_db_fx[bin_idx] = mult( shr( min120q8, 1 ), tmp ); // Q8
- }
- }
- // gain < - 120 ? -120: gain
- IF( LT_16( target_gains_db_fx[bin_idx], -30720 ) )
- {
- target_gains_db_fx[bin_idx] = -30720;
- move16();
- }
-#endif
}
pCoeffs_a_fx = &pParams->pT60_filter_coeff_fx[add( shl( i_mult( len, loop_idx ), 1 ), len )]; // Q14
@@ -1038,13 +1006,11 @@ static ivas_error calc_jot_t60_coeffs_fx(
L_tmp = BASOP_util_Pow2( L_deposit_h( tmp_fx ), exph, &e );
lin_gain_hf_fx = extract_l( L_shr( L_tmp, sub( 16, e ) ) );
-#ifdef FIX_1942_ASSERTION_LOWSHELF
IF( EQ_16( lin_gain_hf_fx, 0 ) )
{
lin_gain_hf_fx = 1;
move16();
}
-#endif
/* call low-pass iir shelf */
calc_low_shelf_first_order_filter_fx( pCoeffB_fx, pCoeffA_fx, f0_fx, lin_gain_lf_fx, lin_gain_hf_fx );
@@ -2196,8 +2162,8 @@ void ivas_binaural_reverb_processSubframe_fx(
/* Add the data from the end of the loop to the beginning, with an attenuation factor
* according to RT60. This procedure generates an IIR decaying response. The response
* is decorrelated later on. */
- v_multc_fixed( hReverb->loopBufReal_fx[bin] + hReverb->loopBufLength[bin], hReverb->loopAttenuationFactor_fx[bin], hReverb->loopBufReal_fx[bin], numSlots );
- v_multc_fixed( hReverb->loopBufImag_fx[bin] + hReverb->loopBufLength[bin], hReverb->loopAttenuationFactor_fx[bin], hReverb->loopBufImag_fx[bin], numSlots );
+ v_multc_fx( hReverb->loopBufReal_fx[bin] + hReverb->loopBufLength[bin], hReverb->loopAttenuationFactor_fx[bin], hReverb->loopBufReal_fx[bin], numSlots );
+ v_multc_fx( hReverb->loopBufImag_fx[bin] + hReverb->loopBufLength[bin], hReverb->loopAttenuationFactor_fx[bin], hReverb->loopBufImag_fx[bin], numSlots );
}
/* 2) Apply the determined pre-delay to the input audio, and add the delayed audio to the loop. */
@@ -2228,13 +2194,13 @@ void ivas_binaural_reverb_processSubframe_fx(
{
IF( s_and( ch, 1 ) )
{
- v_add_fixed_no_hdrm( hReverb->preDelayBufferReal_fx[idx], inReal[ch][sample], hReverb->preDelayBufferReal_fx[idx], hReverb->numBins );
- v_add_fixed_no_hdrm( hReverb->preDelayBufferImag_fx[idx], inImag[ch][sample], hReverb->preDelayBufferImag_fx[idx], hReverb->numBins );
+ v_add_fx_no_hdrm( hReverb->preDelayBufferReal_fx[idx], inReal[ch][sample], hReverb->preDelayBufferReal_fx[idx], hReverb->numBins );
+ v_add_fx_no_hdrm( hReverb->preDelayBufferImag_fx[idx], inImag[ch][sample], hReverb->preDelayBufferImag_fx[idx], hReverb->numBins );
}
ELSE
{
- v_sub_fixed_no_hdrm( hReverb->preDelayBufferReal_fx[idx], inImag[ch][sample], hReverb->preDelayBufferReal_fx[idx], hReverb->numBins );
- v_add_fixed_no_hdrm( hReverb->preDelayBufferImag_fx[idx], inReal[ch][sample], hReverb->preDelayBufferImag_fx[idx], hReverb->numBins );
+ v_sub_fx_no_hdrm( hReverb->preDelayBufferReal_fx[idx], inImag[ch][sample], hReverb->preDelayBufferReal_fx[idx], hReverb->numBins );
+ v_add_fx_no_hdrm( hReverb->preDelayBufferImag_fx[idx], inReal[ch][sample], hReverb->preDelayBufferImag_fx[idx], hReverb->numBins );
}
}
idx = add( idx, 1 ) % hReverb->preDelayBufferLength;
@@ -2264,20 +2230,20 @@ void ivas_binaural_reverb_processSubframe_fx(
SWITCH( phaseShiftTypePr[tapIdx] )
{
case 0: /* 0 degrees phase */
- v_add_fixed_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
- v_add_fixed_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
+ v_add_fx_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
+ v_add_fx_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
BREAK;
case 1: /* 90 degrees phase */
- v_sub_fixed_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
- v_add_fixed_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
+ v_sub_fx_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
+ v_add_fx_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
BREAK;
case 2: /* 180 degrees phase */
- v_sub_fixed_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
- v_sub_fixed_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
+ v_sub_fx_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
+ v_sub_fx_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
BREAK;
default: /* 270 degrees phase */
- v_add_fixed_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
- v_sub_fixed_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
+ v_add_fx_no_hdrm( hReverb->outputBufferReal_fx[bin][ch], tapImagPr_fx[tapIdx], hReverb->outputBufferReal_fx[bin][ch], numSlots );
+ v_sub_fx_no_hdrm( hReverb->outputBufferImag_fx[bin][ch], tapRealPr_fx[tapIdx], hReverb->outputBufferImag_fx[bin][ch], numSlots );
BREAK;
}
}
@@ -2382,7 +2348,7 @@ static ivas_error ivas_binaural_reverb_open_fx(
hReverb->blockSize = numCldfbSlotsPerFrame;
move16();
- FOR( k = 0; k < REVERB_PREDELAY_MAX + 1; k++ )
+ FOR( k = 0; k < IVAS_REVERB_PREDELAY_MAX + 1; k++ )
{
set32_fx( hReverb->preDelayBufferReal_fx[k], 0, hReverb->numBins );
set32_fx( hReverb->preDelayBufferImag_fx[k], 0, hReverb->numBins );
@@ -2504,11 +2470,7 @@ ivas_error ivas_binaural_reverb_init_fx(
}
ELSE
{
-#ifdef FIX_1995_REVERB_INIT
FOR( bin = 0; bin < numBins; bin++ )
-#else
- FOR( bin = 0; bin < CLDFB_NO_CHANNELS_MAX; bin++ )
-#endif
{
revTimes[bin] = defaultTimes[bin];
move32();
@@ -2518,11 +2480,7 @@ ivas_error ivas_binaural_reverb_init_fx(
preDelay = 10;
}
-#ifdef FIX_1995_REVERB_INIT
FOR( bin = 0; bin < numBins; bin++ )
-#else
- FOR( bin = 0; bin < CLDFB_NO_CHANNELS_MAX; bin++ )
-#endif
{
/* Adjust the room effect parameters when the reverberation time is less than a threshold value, to avoid
spectral artefacts with the synthetic reverberator. */
diff --git a/lib_rend/ivas_reverb_iir_filter_fx.c b/lib_rend/ivas_reverb_iir_filter_fx.c
index e09ec70055ccf358879a06134430ec4765136b78..981a40466474a3b428557c4682243db0234cb885 100644
--- a/lib_rend/ivas_reverb_iir_filter_fx.c
+++ b/lib_rend/ivas_reverb_iir_filter_fx.c
@@ -116,6 +116,8 @@ void ivas_reverb_iir_filt_set(
return;
}
+
+
/*-----------------------------------------------------------------------------------------*
* Function ivas_reverb_iir_filt_2taps_feed_blk()
*
@@ -126,7 +128,7 @@ void ivas_reverb_iir_filt_2taps_feed_blk_fx(
ivas_rev_iir_filter_t *iirFilter, /* i/o: IIR filter */
const UWord16 blk_size, /* i : size */
const Word32 *input, /* i : input buffer Q30 */
- Word32 *output /* i/o : output buffer Q30 */
+ Word32 *output /* i/o: output buffer Q30 */
)
{
UWord16 i;
diff --git a/lib_rend/ivas_reverb_utils_fx.c b/lib_rend/ivas_reverb_utils_fx.c
index d527bb66385ba5a41e7d0aa03a4fd40c519a827b..6433da8195e7deba7874d9b3b325bf6cc9b350f2 100644
--- a/lib_rend/ivas_reverb_utils_fx.c
+++ b/lib_rend/ivas_reverb_utils_fx.c
@@ -153,10 +153,10 @@ static void ivas_reverb_set_energies(
{
Word16 freq_idx;
Word32 input_fc_fx[FFT_SPECTRUM_SIZE];
- Word32 output_fc_fx[CLDFB_NO_CHANNELS_MAX];
- Word32 avg_pwr_left_fx[CLDFB_NO_CHANNELS_MAX]; // Q28
- Word32 avg_pwr_right_fx[CLDFB_NO_CHANNELS_MAX]; // Q28
- const Word32 cldfb_band_width = 26214400; // 400 in Q16
+ Word32 output_fc_fx[IVAS_CLDFB_NO_CHANNELS_MAX];
+ Word32 avg_pwr_left_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; // Q28
+ Word32 avg_pwr_right_fx[IVAS_CLDFB_NO_CHANNELS_MAX]; // Q28
+ const Word32 cldfb_band_width = 26214400; // 400 in Q16
Word16 s;
Word16 temp;
@@ -168,17 +168,17 @@ static void ivas_reverb_set_energies(
input_fc_fx[freq_idx] = L_shl( L_mult( temp, freq_idx ), add( 15, s ) );
}
- FOR( freq_idx = 0; freq_idx < CLDFB_NO_CHANNELS_MAX; freq_idx++ )
+ FOR( freq_idx = 0; freq_idx < IVAS_CLDFB_NO_CHANNELS_MAX; freq_idx++ )
{
output_fc_fx[freq_idx] = L_add( L_shr( cldfb_band_width, 1 ), L_shl( Mult_32_16( cldfb_band_width, freq_idx ), 15 ) );
}
// Avg Energy Left
- ivas_reverb_interp_on_freq_grid_fx( avg_pwr_len, input_fc_fx, avg_pwr_l, CLDFB_NO_CHANNELS_MAX, output_fc_fx, avg_pwr_left_fx );
+ ivas_reverb_interp_on_freq_grid_fx( avg_pwr_len, input_fc_fx, avg_pwr_l, IVAS_CLDFB_NO_CHANNELS_MAX, output_fc_fx, avg_pwr_left_fx );
// Avg Energy Right
- ivas_reverb_interp_on_freq_grid_fx( avg_pwr_len, input_fc_fx, avg_pwr_r, CLDFB_NO_CHANNELS_MAX, output_fc_fx, avg_pwr_right_fx );
+ ivas_reverb_interp_on_freq_grid_fx( avg_pwr_len, input_fc_fx, avg_pwr_r, IVAS_CLDFB_NO_CHANNELS_MAX, output_fc_fx, avg_pwr_right_fx );
- FOR( freq_idx = 0; freq_idx < CLDFB_NO_CHANNELS_MAX; freq_idx++ )
+ FOR( freq_idx = 0; freq_idx <