Commit 54bf1672 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_689_USAN_QSPHERICAL

parent 0ba49334

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ 






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

#define FIX_680_ACELP_TABLE_OMASA                       /* Nokia: Fix for issue 680 preventing overindexing of PulseConfTable */

#define FIX_685_BER_IN_HVQ                              /* Eri: Fix for issue 685. Invalid configuration in EVS now happening in IVAS with variable rate core. Remove BER warning for IVAS. */

lib_enc/ivas_qspherical_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -64,11 +64,7 @@ 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;
@@ -173,11 +169,7 @@ 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++ )