Commit 2eb0fcc7 authored by norvell's avatar norvell
Browse files

Fixes for MSAN error

parent c23f7811

lib_rend/ivas_render_config_fx.c

+10 −0
Original line number Diff line number Diff line
@@ -133,7 +133,17 @@ ivas_error ivas_render_config_init_from_rom_fx( 
        move16();

        ( *hRenderConfig )->directivity_fx[add( i_mult( i, 3 ), 2 )] = 32767 /*1.0f in Q15*/; /* Back attenuation */

        move16();

#if 1

        ( *hRenderConfig )->directivity[i_mult( i, 3 )] = 360.0f;

        ( *hRenderConfig )->directivity[add( i_mult( i, 3 ), 1 )] = 360.0f;

        ( *hRenderConfig )->directivity[add( i_mult( i, 3 ), 2 )] = 1.0f;

#endif

    }

#if 1

    ( *hRenderConfig )->distAtt[0] = 15.75f;

    ( *hRenderConfig )->distAtt[1] = 1.0f;

    ( *hRenderConfig )->distAtt[2] = 1.0f;

#endif

    ( *hRenderConfig )->distAtt_fx[0] = 2113929216; /* Maximum radius (2^ISM_RADIUS_NBITS-1)*0.25 */ /*15.75 in Q27*/ /* Default max dist */

    move32();

    ( *hRenderConfig )->distAtt_fx[1] = ONE_IN_Q30; // Q30   /* Default ref dist */

lib_util/render_config_reader.c

+12 −0
Original line number Diff line number Diff line
@@ -1281,16 +1281,28 @@ ivas_error RenderConfigReader_checkValues( 
        }

        /* Verify range of distance attenuation parameters: 0.1 <= distAtt[0] <= distAtt[1] */

        /*                                                  0.0 <= distAtt[2] <= 10.0       */

#if 1

        hRenderConfig->distAtt_fx[0] = L_max( 13421773, hRenderConfig->distAtt_fx[0] );

        hRenderConfig->distAtt_fx[1] = L_max( hRenderConfig->distAtt_fx[0], hRenderConfig->distAtt_fx[1] );

        hRenderConfig->distAtt_fx[2] = L_max( 0, L_min( 1073741824, hRenderConfig->distAtt_fx[2] ) ); /* This is wrongm  */

#else

        hRenderConfig->distAtt[0] = max( 0.1f, hRenderConfig->distAtt[0] );

        hRenderConfig->distAtt[1] = max( hRenderConfig->distAtt[0], hRenderConfig->distAtt[1] );

        hRenderConfig->distAtt[2] = max( 0.0f, min( 10.0f, hRenderConfig->distAtt[2] ) );

#endif



        /* Verify range of directivity patterns */

        for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; i++ )

        {

#if 1

            hRenderConfig->directivity_fx[i * 3] = s_max( 0, s_min( 23040, hRenderConfig->directivity[i * 3] ) );

            hRenderConfig->directivity_fx[i * 3 + 1] = s_max( 0, s_min( 23040, hRenderConfig->directivity[i * 3 + 1] ) );

            hRenderConfig->directivity_fx[i * 3 + 2] = s_max( 0, s_min( 32767, hRenderConfig->directivity[i * 3 + 2] ) );

#else

            hRenderConfig->directivity[i * 3] = max( 0.0f, min( 360.0f, hRenderConfig->directivity[i * 3] ) );

            hRenderConfig->directivity[i * 3 + 1] = max( 0.0f, min( 360.0f, hRenderConfig->directivity[i * 3 + 1] ) );

            hRenderConfig->directivity[i * 3 + 2] = max( 0.0f, min( 1.0f, hRenderConfig->directivity[i * 3 + 2] ) );

#endif

        }

    }