Commit 5eae1d25 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into... 

- Merge remote-tracking branch 'remotes/origin/main' into 913-crash-in-omasa-encoder-dft-stereo-bit-budget-violated
parents e38cc485 8b7e5309

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ 
#define NONBE_FIX_904_JBM_SBA_RS_FOA                          /* FhG: issue #904: fix JBM SBA RS to FOA decoding */

#define NONBE_FIX_898_ISM_BRATE_CRASH                         /* VA: issue 898: fix decoder crash in ISM bitrate switching with DTX and binaural output */

#define NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC                /* DLB: issue 862 : UBSAN: out-of-bound error in SPAR for OSBA bitrate switching with PLC*/

#define NONBE_FIX_DISCRETE_ISM_NOISE_SEED_HANDLING            /* FhG: fix handling of common and differing noise seeds in SCEs for ISM DTX */

#define NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION               /* VA/Nok: issue 913: Resolve "Crash in OMASA encoder - DFT-Stereo bit-budget violated" */

lib_dec/fd_cng_dec.c

+12 −0
Original line number Diff line number Diff line
@@ -1104,10 +1104,17 @@ void generate_comfort_noise_dec( 
    c2 = (float) sqrt( 1 - hFdCngCom->coherence );



    seed2 = &( hFdCngCom->seed2 );

#ifdef NONBE_FIX_DISCRETE_ISM_NOISE_SEED_HANDLING

    if ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 )

    {

        seed2 = &( hFdCngCom->seed3 );

    }

#else

    if ( ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )

    {

        seed2 = &( hFdCngCom->seed3 );

    }

#endif



    /* Generate Gaussian random noise in real and imaginary parts of the FFT bins

      Amplitudes are adjusted to the estimated noise level cngNoiseLevel in each bin */
@@ -1354,11 +1361,16 @@ void generate_comfort_noise_dec_hf( 
    float scale = CLDFB_SCALING / hFdCngCom->scalingFactor;



    int16_t *seed2 = &( hFdCngCom->seed );



    float tmp1, tmp2, c1 = 0.f, c2 = 0.f;



    if ( cng_coh_flag )

    {

#ifdef NONBE_FIX_DISCRETE_ISM_NOISE_SEED_HANDLING

        seed2 = &( hFdCngCom->seed2 );

#else

        seed2 = &( hFdCngCom->seed3 );

#endif



        c1 = (float) sqrt( hFdCngCom->coherence );

        c2 = (float) sqrt( 1 - hFdCngCom->coherence );

lib_dec/ivas_init_dec.c

+14 −7
Original line number Diff line number Diff line
@@ -937,13 +937,6 @@ int16_t getNumChanSynthesis( 
    if ( st_ivas->sba_dirac_stereo_flag )

    {

        n = CPE_CHANNELS;

#if 0 

        /* TODO wkr: this is actually a correct bugfix for OSBA, it is disabled for now to pass the pipelines in the OSBA JBM branch */

        if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {

            n += st_ivas->nchan_ism;

        }

#endif

    }

    else if ( ( st_ivas->hMCT != NULL || st_ivas->ivas_format == SBA_FORMAT ) && st_ivas->ivas_format != SBA_ISM_FORMAT )

    {
@@ -1368,10 +1361,24 @@ ivas_error ivas_init_decoder( 


        st_ivas->hISMDTX.sce_id_dtx = 0;



#ifdef NONBE_FIX_DISCRETE_ISM_NOISE_SEED_HANDLING

        if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed2 = st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed3;

        }

        else if ( st_ivas->ism_mode == ISM_MODE_DISC )

        {

            for ( sce_id = 0; sce_id < st_ivas->nSCE; ++sce_id )

            {

                st_ivas->hSCE[sce_id]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed2 = 2 + sce_id;

            }

        }

#else

        if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            st_ivas->hSCE[1]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed3 = st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed2;

        }

#endif

    }

    else if ( st_ivas->ivas_format == SBA_FORMAT )

    {

lib_dec/ivas_ism_dtx_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -154,6 +154,17 @@ ivas_error ivas_ism_dtx_dec( 
        }

    }



#ifdef NONBE_FIX_DISCRETE_ISM_NOISE_SEED_HANDLING

    /* synch common seed between SCEs */

    if ( st_ivas->ism_mode == ISM_MODE_DISC )

    {

        for ( ch = 0; ch < nchan_ism; ++ch )

        {

            st_ivas->hSCE[ch]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed = st_ivas->hSCE[st_ivas->hISMDTX.sce_id_dtx]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed;

        }

    }

#endif



    update_last_metadata( nchan_ism, st_ivas->hIsmMetaData, md_diff_flag );



    st_ivas->hISMDTX.ism_dtx_hangover_cnt = 0;