Commit bdcc9199 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

USAN fixes for Encoder - 1

parent fea01257

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 
#define FIX_ISSUE_1291                          /* Ittiam: Wrong use of imult1616() in ACELP rescaling */

#define FIX_920_IGF_INIT_ERROR                  /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

#define FIX_MINOR_SVD_WMOPS_MR1010X             /* FhG: Minor WMOPS tuning, bit-exact to previous version, saves about 8.2 WMOPS for MR1010 */

#define FIX_USAN_ISSUES                         /* Ittiam: Fix issues reported by USAN */

#define SVD_WMOPS_OPT                           /* Ittiam : SVD related optimizations */

#define NONBE_FIX_1087_OOB_SBA_DTX_RS           /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */

#define FIX_ISSUE_1279                          /* VA: correction of wrong scaling update */

lib_enc/ivas_mct_core_enc.c

+13 −0
Original line number Diff line number Diff line
@@ -337,8 +337,21 @@ void ivas_mct_core_enc_fx( 


        IF( switch_bw )

        {

#ifdef FIX_USAN_ISSUES

            IF( sts[ch_core]->hIGFEnc == NULL )

            {

                initMdctStereoEncData_fx( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth,

                                          sts[ch_core]->igf, NULL, 0 );

            }

            ELSE

            {

                initMdctStereoEncData_fx( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth,

                                          sts[ch_core]->igf, sts[ch_core]->hIGFEnc->igfData.igfInfo.grid, 0 );

            }

#else

            initMdctStereoEncData_fx( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth,

                                      sts[ch_core]->igf, sts[ch_core]->hIGFEnc->igfData.igfInfo.grid, 0 );

#endif

        }



        IF( sts[ch_core]->igf )

lib_enc/ivas_qmetadata_enc.c

+17 −0
Original line number Diff line number Diff line
@@ -2503,7 +2503,11 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx( 
            }

            ELSE

            {

#ifdef FIX_USAN_ISSUES

                avg_elevation_index = (UWord16) L_add( avg_elevation_index_initial, ivas_qmetadata_dereorder_generic_fx( avg_elevation_offset ) );

#else

                avg_elevation_index = u_extract_l( UL_addNsD( avg_elevation_index_initial, ivas_qmetadata_dereorder_generic_fx( avg_elevation_offset ) ) );

#endif

            }

            // avg_elevation_index = (uint16_t) ( ( avg_elevation_index + avg_elevation_alphabet ) % avg_elevation_alphabet );

            avg_elevation_index = u_extract_l( UL_addNsD( avg_elevation_index, avg_elevation_alphabet ) % avg_elevation_alphabet );
@@ -2638,8 +2642,13 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx( 
    FOR( avg_azimuth_offset = 0; avg_azimuth_offset < q_direction->cfg.search_effort; avg_azimuth_offset++ )

    {

        set_zero_fx( avg_direction_vector, 3 );

#ifdef FIX_USAN_ISSUES

        avg_azimuth_index = (UWord16) L_add( avg_azimuth_index_initial, ivas_qmetadata_dereorder_generic_fx( avg_azimuth_offset ) );

        avg_azimuth_index = (UWord16) ( L_add( avg_azimuth_index, avg_azimuth_alphabet ) % avg_azimuth_alphabet );

#else

        avg_azimuth_index = (UWord16) add( avg_azimuth_index_initial, ivas_qmetadata_dereorder_generic_fx( avg_azimuth_offset ) );

        avg_azimuth_index = (UWord16) ( add( avg_azimuth_index, avg_azimuth_alphabet ) % avg_azimuth_alphabet );

#endif

        all_zero_dist_azimuth_indexes = 1;

        move16();

        azimuth_bits_ec = ivas_qmetadata_encode_quasi_uniform_length_fx( ivas_qmetadata_reorder_generic_fx( sub( avg_azimuth_index, shr( avg_azimuth_alphabet, 1 ) ) ), avg_azimuth_alphabet );
@@ -5445,7 +5454,11 @@ static Word16 encode_surround_coherence_hr_fx( 
                    }

                    ELSE

                    {

#ifdef FIX_USAN_ISSUES

                        no_idx16 = add( shr( nbits_fr, 4 ), 1 );

#else

                        no_idx16 = shr_r( nbits_fr, 4 );

#endif

                    }



                    /* write combined index */
@@ -5467,7 +5480,11 @@ static Word16 encode_surround_coherence_hr_fx( 
                        }

                        ELSE

                        {

#ifdef FIX_USAN_ISSUES

                            no_idx16 = add( shr( nbits_fr1, 4 ), 1 );

#else

                            no_idx16 = shr_r( nbits_fr1, 4 );

#endif

                        }



                        assert( no_idx16 <= 4 );

lib_enc/ivas_stereo_ica_enc.c

+9 −5
Original line number Diff line number Diff line
@@ -1096,7 +1096,11 @@ static void corrStatsEst_fx( 


        hStereoTCA->delay_0_mem_fx[MAX_DELAYREGLEN - 1] = BASOP_Util_Add_Mant32Exp( Mpy_32_32( hStereoTCA->delay_0_mem_fx[MAX_DELAYREGLEN - 1], 429496730 /* 0.2 in Q31*/ ), hStereoTCA->delay_0_mem_exp, L_mult0( 26214 /* 0.8 in Q15*/, corrLagStats[0] ), Q16, &temp ); /* Q31-temp */

        move32();

#ifdef FIX_USAN_ISSUES

        Word32 inpp = L_abs( BASOP_Util_Add_Mant32Exp( reg_prv_corr_fx, reg_prv_corr_exp, L_negate( hStereoTCA->delay_0_mem_fx[0] ), hStereoTCA->delay_0_mem_exp, &exp ) ); /* Q31-exp */

#else

        Word32 inpp = L_abs( BASOP_Util_Add_Mant32Exp( reg_prv_corr_fx, reg_prv_corr_exp, -hStereoTCA->delay_0_mem_fx[0], hStereoTCA->delay_0_mem_exp, &exp ) ); /* Q31-exp */

#endif

        inpp = L_shl_sat( inpp, sub( exp, 5 ) ); /* Q26 */

        IF( GT_32( inpp, 1677721600 ) )          // 25 in Q26

        {

lib_enc/ivas_tcx_core_enc.c

+9 −0
Original line number Diff line number Diff line
@@ -1061,7 +1061,12 @@ Word16 ivas_acelp_tcx20_switching_fx( 


    IF( LE_32( offset, 0xAA153 ) ) /* 0xAA153 -> 32.f * log2(10)/10 */

    {

#ifdef FIX_USAN_ISSUES

        offset = (Word32) 0xFFD57AB5; /* 0xFFD57AB5 -> -128.f * log2(10)/10; */

        move32();

#else

        offset = L_add( 0xFFD57AB5, 0 ); /* 0xFFD57AB5 -> -128.f * log2(10)/10; */

#endif

    }

    offset_tcx = offset;

    move32();
@@ -1164,7 +1169,11 @@ Word16 ivas_acelp_tcx20_switching_fx( 
        {

            *pt_ener_sfr = -668739840; /* 0xFFEC1185 -> log2(1e-6) in 6Q25 */

            move32();

#ifdef FIX_USAN_ISSUES

            tmp32 = (Word32) 0xFFEC1185; /* 0xFFEC1185 -> log2(1e-6) in 15Q16 */

#else

            tmp32 = 0xFFEC1185; /* 0xFFEC1185 -> log2(1e-6) in 15Q16 */

#endif

            move32();

        }

        ELSE