Commit c60545c4 authored by Manuel Jander's avatar Manuel Jander
Browse files

Merge remote-tracking branch 'origin' into basop-2493-usage-of-extract_l-with-values-out-of-range

parents 396f5869 8e8b913a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 
#define HARMONIZE_2604_decoder_tcx_post                 /* FhG: Harmonize decoder_tcx_post with its ivas derivate */

#define HARMONIZE_2598_tcx_arith_decode_envelope        /* FhG: harmonize tcx_arith_decode_envelope between EVS and IVAS versions */

#define HARMONIZE_2598_tcx_arith_encode_envelope        /* FhG: harmonize tcx_arith_encode_envelope between EVS and IVAS versions */

#define FIX_ISSUE_2594_FALSE_COMMENT                    /* FhG: basop issue 2594: fixing false comments about Q value*/



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

lib_dec/ivas_stereo_ica_dec_fx.c

+9 −0
Original line number Diff line number Diff line
@@ -436,11 +436,20 @@ void stereo_tca_scale_R_channel_fx( 
            move32();

            BREAK;

        case 32000:

#ifndef FIX_ISSUE_2594_FALSE_COMMENT

            winSlope_fx = 13421773; // 0.00625 in Q30

#else

            winSlope_fx = 13421773; // 0.00625 in Q31

#endif // !FIX_ISSUE_2594_FALSE_COMMENT

            move32();

            BREAK;

        case 48000:

#ifndef FIX_ISSUE_2594_FALSE_COMMENT

            winSlope_fx = 8947849; // 0.00416 in Q30

#else

            winSlope_fx = 8947849; // 0.00416 in Q31

#endif // !FIX_ISSUE_2594_FALSE_COMMENT



            move32();

            BREAK;

    }