Commit db9055a6 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge branch '689-usan-in-ivas_qspherical_enc' into 'main' 

Fix usan in ivas_qspherical_enc

See merge request !941
parents 20476f31 00a4fb3f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ 
#define FIX_634_MASA_JBM_UNUSED_PARAMETER               /* Nokia: Fix issue 634 by removing the unnecessary argument. */

#define FIX_675_WB_OMASA                                /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */

#define FIX_683_JBM_CLEANUP                             /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */

#define FIX_689_USAN_QSPHERICAL                         /* Nokia: Fix usan error from issue 689 */



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

lib_enc/ivas_qspherical_enc.c

+8 −1
Original line number Diff line number Diff line
@@ -64,7 +64,11 @@ void quantize_direction_frame( 
)

{

    int16_t i, j;

#ifdef FIX_689_USAN_QSPHERICAL

    uint16_t idx;

#else

    int16_t idx;

#endif



    /* Quantize directions */

    q_direction->not_in_2D = 0;
@@ -169,8 +173,11 @@ void quantize_direction_frame2D( 
    float elevation_orig[MASA_MAXIMUM_CODING_SUBBANDS][MAX_PARAM_SPATIAL_SUBFRAMES] )

{

    int16_t i, j;

#ifdef FIX_689_USAN_QSPHERICAL

    uint16_t idx;

#else

    int16_t idx;



#endif

    /* Quantize directions */

    q_direction->not_in_2D = 0;

    for ( i = q_direction->cfg.start_band; i < q_direction->cfg.nbands; i++ )