Commit a66f31fb authored by multrus's avatar multrus
Browse files

merge from main

parents 79e06d75 3971ebf7

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
#define FIX_BASOP_2333_MCMASA_ANA_MEMORY_LEAK           /* Nokia: basop issue 2333: Add missing free for direction_vector_e to ivas_mcmasa_ana_fx.c */

#define HARM_COREDECODER_FUNCTIONS                      /* VA: basop issue 2347: Remove various duplicated code in core-decoder  */

#define FIX_BASOP_2351_EXTREND_SCALE                    /* FhG: basop issue 2351: Only scale initialized samples in renderer, related to 2326 */

#define FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE           /* FhG: Fix issue 2331: Uninitialized variable */



/* #################### End BE switches ################################## */

lib_com/swb_tbe_com_fx.c

+12 −10
Original line number Diff line number Diff line
@@ -6073,6 +6073,7 @@ void create_random_vector_fx( 
    Word16 i, j, k;

    Word16 scale1, scale2;

    Word32 L_tmp;



    /*

      Note: the constant 2144047674 is 0.0078f in Q38 from the float reference.

      It should read 0.0078125f, which is 1/128.Since 0.0078f is nor exactly
@@ -6083,34 +6084,34 @@ void create_random_vector_fx( 
#ifdef FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT

    if ( element_mode != EVS_MONO )

    {

        L_tmp = L_abs( Mpy_32_16_r( 2144047674, Random( &seed[0] ) ) ); /*Q23 */

        j = shr( abs_s( Random( &seed[0] ) ), 7 ); /* Random( &seed[0] * 0.0078125f ) */

    }

    else

    {

        L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[0] ) ) ); /*Q23 */

        j = extract_l( L_shr( L_tmp, 23 ) );

    }

#else

    L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[0] ) ) );                                           /*Q23 */

#endif



    j = extract_l( L_shr( L_tmp, 23 ) );

#endif

    j = s_and( j, 0xff );



#ifdef FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT

    if ( element_mode != EVS_MONO )

    {

        L_tmp = L_abs( Mpy_32_16_r( 2144047674, Random( &seed[1] ) ) ); /*Q23 */

        k = shr( abs_s( Random( &seed[1] ) ), 7 ); /* Random( &seed[0] * 0.0078125f ) */

    }

    else

    {

        L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[1] ) ) ); /*Q23 */

        k = extract_l( L_shr( L_tmp, 23 ) );

    }



#else

    L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[1] ) ) ); /*Q23 */

    k = extract_l( L_shr( L_tmp, 23 ) );

#endif



    k = extract_l( L_shr( L_tmp, 23 ) );

    k = s_and( k, 0xff );



    WHILE( EQ_16( k, j ) )
@@ -6118,17 +6119,18 @@ void create_random_vector_fx( 
#ifdef FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT

        if ( element_mode != EVS_MONO )

        {

            L_tmp = L_abs( Mpy_32_16_r( 2144047674, Random( &seed[1] ) ) ); /*Q23 */

            k = shr( abs_s( Random( &seed[1] ) ), 7 );

        }

        else

        {

            L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[1] ) ) ); /*Q23 */

            k = extract_l( L_shr( L_tmp, 23 ) );

        }

#else

        L_tmp = L_abs( Mult_32_16( 2144047674, Random( &seed[1] ) ) ); /*Q23 */

        k = extract_l( L_shr( L_tmp, 23 ) );

#endif



        k = extract_l( L_shr( L_tmp, 23 ) );

        k = s_and( k, 0xff );

    }

lib_dec/lib_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -5332,7 +5332,7 @@ static ivas_error printConfigInfo_dec( 
    const bool quietModeEnabled )

{

    ivas_error error;

    Word8 config_str[50];

    Word8 config_str[200];

    AUDIO_CONFIG output_config;



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

lib_rend/lib_rend_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -6960,6 +6960,10 @@ static ivas_error renderIsmToSba( 
    error = IVAS_ERR_OK;

    move32();



#ifdef FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE

    set32_fx( currentPanGains_fx, 0, MAX_OUTPUT_CHANNELS );

#endif



    ismInput->currentPos.azimuth_fx = L_shl( L_shr( L_add( ismInput->currentPos.azimuth_fx, ONE_IN_Q21 ), Q22 ), Q22 );

    ismInput->currentPos.elevation_fx = L_shl( L_shr( L_add( ismInput->currentPos.elevation_fx, ONE_IN_Q21 ), Q22 ), Q22 );

    ismInput->previousPos.azimuth_fx = L_shl( L_shr( L_add( ismInput->previousPos.azimuth_fx, ONE_IN_Q21 ), Q22 ), Q22 );