Commit 0353fa7b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1824

parent 816d0a4f

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ 
#define FIX_1917_DIRAC_RENDER_PTR_INCR                       /* FhG: fix wrong pointer increment in ivas_dirac_dec_render_sf_fx() for object rendering */

#define FIX_CDLFB_BUFFER_SCALING                             /* FhG: fix wrong buffer scaling in ivas_dirac_dec_render_sf_fx() for object rendering */



#define FIX_1824

#define FIX_1822



#define FIX_ISSUE_1764                       /* NTT: update renorm and use abs */

lib_dec/jbm_pcmdsp_similarityestimation_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -113,15 +113,9 @@ Word16 normalized_cross_correlation_self_fx( const Word16 *signal, 
    sumXX = L_shl( sumXX, normX );

    normY = norm_l( sumYY );

    sumYY = L_shl( sumYY, normY );

#ifdef FIX_1824

    product = L_shr( L_mult0( extract_h( sumXX ), extract_h( sumYY ) ), 1 );

    normXY = add( normX, normY );

    normXY = sub( normXY, 32 + 1 );

#else

    product = L_mult0( extract_h( sumXX ), extract_h( sumYY ) );

    normXY = add( normX, normY );

    normXY = sub( normXY, 32 );

#endif



    /* change norm to factor of 2 */

    IF( s_and( normXY, 0x1 ) != 0 )