Commit 09cf4909 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into 744_step3_code_changes

parents e285301b ccfb71e3

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ VPATH = $(SRC_DIRS) 
# Split rendering files

SRCS_SPLIT_REND = ivas_CQMFDecoder.c ivas_CQMFEncoder.c ivas_PerceptualModel.c ivas_PredDecoder.c \

                  ivas_PredEncoder.c ivas_RMSEnvGrouping.c ivas_MSPred.c ivas_NoiseGen.c \

                  ivas_cldfb_codec_bitstream.c ivas_splitRend_lcld_dec.c ivas_splitRend_lcld_enc.c \

                  ivas_splitRend_lcld_dec.c ivas_splitRend_lcld_enc.c \

                  ivas_splitRendererPLC.c ivas_splitRendererPost.c ivas_splitRendererPre.c \

                  ivas_splitRenderer_utils.c split_rend_bfi_file_reader.c split_render_file_read_write.c \

                  ivas_lcld_tables.c

lib_com/options.h

+5 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ 
/* keep as part of options.h */

#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */



/* ################## Start DEVELOPMENT switches ######################### */



/* ################### Start BE switches ################################# */

/* only BE switches wrt selection floating point code */
@@ -179,6 +180,10 @@ 
#define NONBE_FIX_878_RS_FEC_STEREO_CNG                       /* Eri: Frame loss and Unified Stereo CNG may cause false BER detection which results in corrupt bitstream decoding */

#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" */





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

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_corecoder_dec_reconfig.c

+15 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ ivas_error ivas_corecoder_dec_reconfig( 
    MC_MODE last_mc_mode;

    DECODER_CONFIG_HANDLE hDecoderConfig;

    ivas_error error;

#ifdef NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC

    int16_t prev_bfi;

    Decoder_State *st0;

#endif



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

     * Initialization
@@ -141,6 +145,10 @@ ivas_error ivas_corecoder_dec_reconfig( 
    }

    else

    {

#ifdef NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC

        st0 = ( nSCE_old > 0 ) ? st_ivas->hSCE[0]->hCoreCoder[0] : st_ivas->hCPE[0]->hCoreCoder[0];

        prev_bfi = st0->prev_bfi;

#endif

        nSCE_existing = min( nSCE_old, st_ivas->nSCE );

        nCPE_existing = min( nCPE_old, st_ivas->nCPE );
@@ -213,6 +221,9 @@ ivas_error ivas_corecoder_dec_reconfig( 
            {

                return error;

            }

#ifdef NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC

            st_ivas->hSCE[sce_id]->hCoreCoder[0]->prev_bfi = prev_bfi;

#endif

        }

        if ( st_ivas->sba_dirac_stereo_flag && sba_dirac_stereo_flag_old && st_ivas->nchan_transport == 1 && nSCE_old == 0 )

        {
@@ -241,6 +252,10 @@ ivas_error ivas_corecoder_dec_reconfig( 
            {

                return error;

            }

#ifdef NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC

            st_ivas->hCPE[cpe_id]->hCoreCoder[0]->prev_bfi = prev_bfi;

            st_ivas->hCPE[cpe_id]->hCoreCoder[1]->prev_bfi = prev_bfi;

#endif

        }



        if ( st_ivas->nCPE > 1 && nCPE_old <= 1 )

lib_dec/ivas_cpe_dec.c

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

            else

            {

#ifdef NONBE_FIX_913_OMASA_BITBUDGET_VIOLATION

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

                {

                    nb_bits -= nb_bits_metadata;

                    if ( hCPE->brate_surplus < 0 )

                    {

                        nb_bits += (int16_t) ( hCPE->brate_surplus / FRAMES_PER_SEC );

                    }

                }



#endif

                stereo_dft_dec_read_BS( ivas_total_brate, hCPE->element_brate, &sts[0]->total_brate, sts[1], hCPE->hStereoDft, sts[0]->bwidth, output_frame, res_buf, &nb_bits, hCPE->hStereoCng->coh, st_ivas->ivas_format );

            }