Commit ff540871 authored by Remco Stoutjesdijk's avatar Remco Stoutjesdijk
Browse files

Merge remote-tracking branch 'origin/main' into 196-refactor-renderer-output-configuration

parents 468d3b1c a24d3b7e

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static const CmdLnParser_Option cliOptions[] = { 
        .id = CmdLnOptionId_sampleRate,

        .match = "sample_rate",

        .matchShort = "fs",

        .description = "Input sampling rate in kHz (16, 32, 48) - required only with raw PCM inputs", /* TODO(sgi): Add sampling rate to scene description files */

        .description = "Input sampling rate in kHz (16, 32, 48) - required only with raw PCM inputs",

    },

    {

        .id = CmdLnOptionId_trajFile,

lib_com/core_com_config.c

+0 −1
Original line number Diff line number Diff line
@@ -742,7 +742,6 @@ void init_tcx_window_cfg( 
    hTcxCfg->tcx_mdct_window_min_length = (int16_t) ( sr_core * INV_CLDFB_BANDWIDTH );

    hTcxCfg->tcx_mdct_window_min_lengthFB = (int16_t) ( input_Fs * INV_CLDFB_BANDWIDTH );

    /* save complexity by copying the small windows if they have the same length */

    /* TODO: is this always the case ? */

    if ( hTcxCfg->tcx_mdct_window_min_length == hTcxCfg->tcx_mdct_window_trans_length )

    {

        mvr2r( hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_min_length );

lib_com/ivas_error.h

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ typedef enum 
    IVAS_ERR_INVALID_SAMPLING_RATE,

    IVAS_ERR_NOT_CONFIGURED,

    IVAS_ERR_INVALID_STEREO_MODE,

    IVAS_ERR_INVALID_CICP_INDEX, /* ToDo: rename, CICP not used in IVAS anymore */

    IVAS_ERR_INVALID_MC_LAYOUT,

    IVAS_ERR_INVALID_BITRATE,

    IVAS_ERR_INVALID_MASA_CONFIG,

    IVAS_ERR_TOO_MANY_INPUTS,
@@ -193,7 +193,7 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Handle has not been configured";

        case IVAS_ERR_INVALID_STEREO_MODE:

            return "Invalid stereo mode";

        case IVAS_ERR_INVALID_CICP_INDEX:

        case IVAS_ERR_INVALID_MC_LAYOUT:

            return "Invalid speaker layout";

        case IVAS_ERR_INVALID_BITRATE:

            return "Invalid bitrate";

lib_com/ivas_mc_param_com.c

+4 −0
Original line number Diff line number Diff line
@@ -406,7 +406,11 @@ static int16_t ivas_param_mc_get_num_param_bands( 
            switch ( ivas_total_brate )

            {

                case IVAS_128k:

#ifdef FIX_122_MC_DECODER_COMPLEXITY

                    num_parameter_bands = 14;

#else

                    num_parameter_bands = 20;

#endif

                    break;

                case IVAS_160k:

                    num_parameter_bands = 20;

lib_com/options.h

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
#define FIX_570_TCX_LPC_WRITE                           /* FhG: fix issue 570: LPC bitstream writer in TCX */

#define FIX_506                                         /* FhG: Compiler warnings */

#define FIX_511_OPTIMIZE_PARAMBIN_GAIN_FETCH            /* Nokia: Issue 511, significant optimization of parametric binauralizer gain fetching. */

#define FIX_122_MC_DECODER_COMPLEXITY                   /* FhG: Issue 122, significant decrease of worst case MC decoder complexity */

#define FIX_531_BWS_ISM_BFI                             /* VA: issue 531: fix MemorySanitizer: use-of-uninitialized-value in ISM2 rate switching with frame errors */

#define FIX_395_CNG_BW                                  /* Eri: Issue 395 - CNG bandwidth issue for unified stereo */