Commit 2f2abe00 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch 'ivas-float-update' into 1680_ref_port_object_editing_implementation

parents 32879bc5 d182b52a

lib_com/ivas_cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -229,6 +229,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 */

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -191,6 +191,9 @@ 
#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_1303_REND_GRANULARITY                     /* VA: issue 1303: Renderer granularity revision */

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



// object-editing feature porting

#define OBJ_EDITING_API                                 /* object editing changes related to the API */

lib_dec/ivas_init_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -1161,6 +1161,9 @@ ivas_error ivas_init_decoder_front( 
    st_ivas->ism_mode = ISM_MODE_NONE;

    st_ivas->mc_mode = MC_MODE_NONE;



#ifdef FIX_1384_MSAN_ivas_spar_dec_open

    st_ivas->sid_format = SID_FORMAT_NONE;

#endif

    st_ivas->sba_dirac_stereo_flag = 0;



    /* HRTF binauralization latency in ns */

lib_dec/lib_dec.c

+14 −0
Original line number Diff line number Diff line
@@ -843,12 +843,24 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
{

    ivas_error error;



#ifdef FIX_1388_MSAN_ivas_init_decoder

    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 ( hIvasDec->mode == IVAS_DEC_MODE_EVS )

        {

#ifdef FIX_1388_MSAN_ivas_init_decoder

            hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = ACELP_8k00;



#endif

            if ( ( error = ivas_init_decoder( hIvasDec->st_ivas ) ) != IVAS_ERR_OK )

            {

                return error;
@@ -861,10 +873,12 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
                st->prev_use_partial_copy = 0;

                hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = hIvasDec->hVoIP->hCurrentDataUnit->dataSize * FRAMES_PER_SEC;

            }

#ifndef FIX_1388_MSAN_ivas_init_decoder

            else

            {

                hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = ACELP_8k00;

            }

#endif

            hIvasDec->isInitialized = true;

        }

    }

lib_lc3plus/ari_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ void ac_shift_fl(Encoder_State_fl* st) 
        st->carry_count = st->carry_count + 1;

    }



    st->low = st->low << 8;

    st->low = (LC3_INT)((LC3_UINT32)st->low << 8);

    st->low = (st->low) & (16777215); /* 2^24 - 1 */

}