Commit 3dc57ea7 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_245_RANGE_CODER_VOIP_MSAN

parent d495e421

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
#endif

#define FIX_I59_DELAY_ROUNDING                          /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */

#define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */

#define FIX_245_RANGE_CODER_VOIP_MSAN                   /* Issue 245: fix use-of-uninitialized-value in range coder in VoIP mode */

#define REND_CFG_LFE                                    /* Issue 110: Configurable LFE handling for external renderer */

#define FIX_235                                         /* Issue 235: Deallocation of HR filter memory separately for lib_rend (ROM) and lib_util (from file) */

#define ENV_STAB_FIX                                    /* Contribution 23: HQ envelope stability memory fix */

lib_dec/lib_dec.c

+0 −6
Original line number Diff line number Diff line
@@ -517,11 +517,7 @@ ivas_error IVAS_DEC_EnableVoIP( 


#define WMC_TOOL_SKIP

    /* Bitstream conversion is not counted towards complexity and memory usage */

#ifdef FIX_245_RANGE_CODER_VOIP_MSAN

    hIvasDec->hVoIP->bs_conversion_buf = malloc( sizeof( uint16_t ) * ( MAX_BITS_PER_FRAME + 4 * 8 ) );

#else

    hIvasDec->hVoIP->bs_conversion_buf = malloc( sizeof( uint16_t ) * MAX_BITS_PER_FRAME + 4 * 8 );

#endif

#undef WMC_TOOL_SKIP



    if ( hIvasDec->hVoIP->bs_conversion_buf == NULL )
@@ -1225,13 +1221,11 @@ static void bsCompactToSerial( const uint8_t *compact, uint16_t *serial, uint16_ 
        byte <<= 1;

    }



#ifdef FIX_245_RANGE_CODER_VOIP_MSAN

    /* Add 4 padding bytes required by core coder */

    for ( i = 0; i < 4 * 8; ++i )

    {

        serial[num_bits + i] = 0;

    }

#endif

#undef WMC_TOOL_SKIP

}