Commit 56366922 authored by emerit's avatar emerit
Browse files

fix output_frame != 5, 10 or 20 ms due to jbm

parent 78ac5f21

lib_com/ivas_limiter_fx.c

+18 −2
Original line number Diff line number Diff line
@@ -379,12 +379,28 @@ void limiter_process_fx( 
    }

    ELSE

    {

        // todo compute release constantes for others output_frame

        //        assert( 0 && "Unreachable: unsupported frame size" );

#ifdef FIX_2089_NONBE_LIMITER_CONSTS_WITH_DIV

        // computing output_frame/hLimiter->sampling_rate in Q30

        i = norm_s( output_frame );

        c = norm_l( hLimiter->sampling_rate );

        scale = extract_h( L_shl( hLimiter->sampling_rate, c ) );

        idx = shl( output_frame, i );

        IF( GT_16( idx, scale ) )

        {

            idx = shr( idx, 1 );

            i = sub( i, 1 );

        }

        scale = div_s( idx, scale );

        i = sub( sub( c, i ), 1 ); // Q30

        releaseHeuristic_cnst_2 = L_shl( scale, i );

        releaseHeuristic_cnst = L_shl( releaseHeuristic_cnst_2, 2 );

#else

        /* or same default values as previous code version */

        releaseHeuristic_cnst = RELEASE_CNST_5MS;

        move32();

        releaseHeuristic_cnst_2 = RELEASE_CNST_2_5MS;

        move32();

#endif

    }



#else

lib_com/options.h

+4 −1
Original line number Diff line number Diff line
@@ -76,7 +76,10 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD                    /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK            /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/

#define OPT_IGF_GET_WHITE_SPEC_DATA                          /* FhG: optimized version of IGF_getWhiteSpectralData_ivas() */

#define FIX_2089_NONBE_LIMITER_CONSTS                        /* Orange : fix issuer 2089 : Limiter attack and release constants differ from float version */

#define FIX_2089_NONBE_LIMITER_CONSTS                        /* Orange : fix issue 2089 : Limiter attack and release constants differ from float version */

#ifdef FIX_2089_NONBE_LIMITER_CONSTS

#define FIX_2089_NONBE_LIMITER_CONSTS_WITH_DIV               /* Orange : compute release const for other output frame generate by jbm */  

#endif

#define FIX_1785_ASSERT_IN_IVAS_JBM_DEC_RENDER_FX            /* Orange: 10ms Rendering: Assert in ivas_jbm_dec_render_fx() -> scale_sig32 */

#define FIX_2081_REVISE_H1_SCALING                           /* VA: accommodate for H1 overshoot that was causing assert in set_impule. Not BE with MASA on LTV with bitrate switching for only 2 instances */

#define TEMP_FIX_2088_MSAN_INIT_ERROR                        /* Eri: Temporary fix for Issue 2088 - MSAN error. Will come with later port of JBM+Split rendering update */