Commit da18d5bc authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into 1330-jbm-audio-channels-memory-reduction

parents 25323eae f4c2831a

ci/basop-pages/basop_index.html

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 
<body>

  <h1>Ivas BASOP code Development</h1>



  <h2>Regression tracking</h2>



  <li><a href="long_term_regression.html">Long term regression</a></li>



  <h2>Daily long testvector tests</h2>



  <ul>

ci/setup_pages.py

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ JOBS_BASOP_REPO = { 
    "complexity-stereo-in-stereo-out": "Stereo in, Stereo out",

    # "timeless" jobs (not complexity)

    "coverage-test-on-main-scheduled": "Coverage",

    "ivas-long-term-job-logs-overview": "Long term logs",

}



JOBS_FOR_PROJECT_ID = {

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1348_OVERFLOW                               /* FhG: fix BASOP overflow in hq_lr_dec(), brings floating-point code inline with FX */

#define FIX_1369_HQ_LR_OVERFLOW                         /* FhG: fix BASOP overflow in hq_lr_enc(), brings floating-point code inline with FX */

#define FIX_1330_JBM_MEMORY                             /* VA: issue 1330: memory savings in the JBM decoder */

lib_enc/hq_lr_enc.c

+9 −1
Original line number Diff line number Diff line
@@ -336,7 +336,15 @@ void hq_lr_enc( 
        frac1 = L_Extract_lc( L_tmp, &exp ); /* Extract exponent of L_tmp */

        L_tmp = Pow2( 30, frac1 );

        exp = sub( exp, 30 );

#ifdef FIX_1369_HQ_LR_OVERFLOW

#ifdef BASOP_NOGLOB

        Ep_fx[i] = L_shl_o( L_tmp, s_max( sub( exp, 6 ), -31 ), &Overflow ); /* Q -6 */

#else

        Ep_fx[i] = L_shl( L_tmp, s_max( sub( exp, 6 ), -31 ) ); /* Q -6 */

#endif

#else

        Ep_fx[i] = L_shl( L_tmp, sub( exp, 6 ) );                        /* Q -6 */

#endif

        Ep[i] = (float) ( Ep_fx[i] / pow( 2.0, -6 ) );

    }