Commit 7000c160 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into 1019-socket-interface-for-pose-and-audio

parents 96d8fc63 6941acb1

lib_com/options.h

+12 −0
Original line number Diff line number Diff line
@@ -165,8 +165,18 @@ 
#endif



#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define FIX_1466_EXTREND                                /* FhG: issue 1466: enable rendering of mono/stereo to other formats in the external renderer */

#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_CLANG18_MSAN_IN_DEC_INIT_BY_MOVING_COMMON_INITS_TOGETHER /* FhG: fix CLANG18 MSAN error in decoder init */

#define FIX_1481_CLANG18_MSAN_INIT_LAST_ELEM_BRATE      /* FhG: initialize last_element_brate to avoid CLANG18 MSAN complaint */

#define FIX_1484_CLANG18_MSAN_INIT_ST_ELEM_BRATE        /* FhG: initialize st->element_brate per default */

#define FIX_1464_UBSAN_RC_CONTEXT_MAP                   /* FhG: BE UBSAN fix for float issue 1464 in the TCX range coder */

#define FIX_2272_OOB_INDEXING_IN_LTP_PIT_SEARCH         /* FhG: fix OOB index USAN error in TCX LTP pitch search */

#define FIX_2274_OOB_INDEXING_IN_CORRMATRIX             /* FhG: fix OOB indexing complaint */

#define FIX_2278_OOB_INDEXING_IN_CLOSED_LOOP_PIT_SEARCH /* FhG: fix oob indexing USAN complaint */

#define FIX_2287_MCT_MDCT_STEREO_DATA_MALLOC_SIZE       /* FhG: correct allocation size for STEREO_MDCT_DEC_DATA struct */

#define FIX_2271_OOB_INDEXING_IN_PIT_OL2                /* VA: Fix for issue 2271, to silence clang18 */

#define FIX_2273_OOB_INDEXING_IN_PIT_FR4                /* VA: Fix to silence clang on ptr init */



/* #################### End BE switches ################################## */
@@ -177,6 +187,8 @@ 
#define FIX_1454_FIX_STEREO_TO_FOA_JBM                  /* VA: issue 1454: fix buggy stereo to FOA in JBM */

#define FIX_1461_CNG_BW_SWITCHING                       /* Eri: issue 1461: Stereo parameters are not updated when SID/NODATA forces BW to stay the same */

#define FIX_2252_LP_CNG_STARTS_SID                      /* VA: issues 2251 and 2252: fix LP CNG uninitialized value in bitstream that starts with an SID */

#define FIX_1381_BWD                                    /* VA: issue 1381: apply no hysteresis in BWD at higher bitrates also in mono MASA and OMASA */

#define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */



/* ##################### End NON-BE switches ########################### */

lib_dec/ACcontextMapping_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -662,6 +662,9 @@ int16_t RCcontextMapping_decode2_no_mem_s17_LCS( 
                c = 12 + esc_nb;

            }



#ifdef FIX_1464_UBSAN_RC_CONTEXT_MAP

            s = s & 0x0F;

#endif

            s = s << 4; /*Shift old 4 bits*/

            s = s + c;  /*replace last 4 bits*/

            t = s & 0xFF;

lib_dec/init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ ivas_error init_decoder( 
    }

    else

    {

#if 0 // keep deactivated for the moment to keep BE

#ifdef FIX_2285_CODE_DECODER_INIT_BW

        st->bwidth = WB;

        st->last_bwidth = WB;

#else

lib_dec/ivas_output_config.c

+15 −0
Original line number Diff line number Diff line
@@ -228,9 +228,17 @@ void ivas_renderer_select( 
     * Non-binaural rendering configurations

     *-----------------------------------------------------------------*/



#ifdef FIX_1435_MOVE_STEREO_PANNING

    else if ( st_ivas->ivas_format == MONO_FORMAT || st_ivas->ivas_format == STEREO_FORMAT )

#else

    else if ( st_ivas->ivas_format == MONO_FORMAT )

#endif

    {

#ifdef FIX_1435_MOVE_STEREO_PANNING

        if ( st_ivas->ivas_format == MONO_FORMAT && output_config == IVAS_AUDIO_CONFIG_STEREO )

#else

        if ( output_config == IVAS_AUDIO_CONFIG_STEREO )

#endif

        {

            *renderer_type = RENDERER_NON_DIEGETIC_DOWNMIX;

        }
@@ -238,6 +246,13 @@ void ivas_renderer_select( 
        {

            *renderer_type = RENDERER_MC;

        }

#ifdef FIX_1435_MOVE_STEREO_PANNING

        else if ( st_ivas->ivas_format == STEREO_FORMAT &&

                  ( output_config == IVAS_AUDIO_CONFIG_FOA || output_config == IVAS_AUDIO_CONFIG_HOA2 || output_config == IVAS_AUDIO_CONFIG_HOA3 ) )

        {

            *renderer_type = RENDERER_SBA_LINEAR_ENC;

        }

#endif

    }

    else if ( st_ivas->ivas_format == ISM_FORMAT )

    {

lib_dec/ivas_sce_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -353,6 +353,9 @@ ivas_error create_sce_dec( 


    hSCE->sce_id = sce_id;

    hSCE->element_brate = element_brate;

#ifdef FIX_1481_CLANG18_MSAN_INIT_LAST_ELEM_BRATE

    hSCE->last_element_brate = hSCE->element_brate;

#endif



    set_f( hSCE->prev_hb_synth, 0.0f, NS2SA( st_ivas->hDecoderConfig->output_Fs, IVAS_DEC_DELAY_NS - DELAY_BWE_TOTAL_NS ) );
@@ -368,6 +371,9 @@ ivas_error create_sce_dec( 
    copy_decoder_config( st_ivas, st );



    st->total_brate = hSCE->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */

#ifdef FIX_1484_CLANG18_MSAN_INIT_ST_ELEM_BRATE

    st->element_brate = -1;

#endif

    st->mct_chan_mode = MCT_CHAN_MODE_REGULAR;

    st->is_ism_format = 0;

    if ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT )