Commit 7e73513a authored by Manuel Jander's avatar Manuel Jander
Browse files

Merge remote-tracking branch 'origin' into 3gpp_issue_1348_fix

parents a0344f22 687cd90d

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -1930,6 +1930,8 @@ pages: 
  rules:

    - if: $UPDATE_PAGES

  script:

    - !reference [ .job-linux, before_script ]



    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh

    - python3 ci/setup_pages.py

lib_com/swb_tbe_com_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -1645,7 +1645,12 @@ void GenShapedWBExcitation_ivas_fx( 
        }

    }



    Syn_filt_s( 0, lpc_shb, LPC_SHB_ORDER_WB, exc4kWhtnd, excSHB, L_FRAME16k / 4, state_lpc_syn, 1 );

    Scale_sig( state_lpc_syn, LPC_SHB_ORDER, -Q2 ); /* Q(Q_bwe_exc) -> Q(Q_bwe_exc - 2) */



    Syn_filt_s( Q2, lpc_shb, LPC_SHB_ORDER_WB, exc4kWhtnd, excSHB, L_FRAME16k / 4, state_lpc_syn, 1 );



    Scale_sig( state_lpc_syn, LPC_SHB_ORDER, Q2 ); /* Q(Q_bwe_exc - 2) -> Q(Q_bwe_exc) */

    Scale_sig( excSHB, L_FRAME16k / 4, Q2 );       /* Q(Q_bwe_exc - 2) -> Q(Q_bwe_exc) */



    return;

}

lib_rend/ivas_dirac_rend_fx.c

+13 −3
Original line number Diff line number Diff line
@@ -5007,10 +5007,20 @@ static void ivas_masa_ext_dirac_render_sf_fx( 
            ELSE

            {

                /* open CLDFB buffer up to CLDFB_NO_CHANNELS_MAX bands for 48kHz */

                /* cldfb_state_fx should be in 1 less q-factor compared to cld buffers for cldfbSynthesis_ivas_fx function */

                Word16 q_out = sub( q_cldfb, 1 );

                Word16 max_shift = L_norm_arr( hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_fx, hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_length );

                IF( GT_16( max_shift, sub( q_out, hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state ) ) )

                {

                    scale_sig32( hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_fx, hMasaExtRend->cldfbSynRend[idx_in]->cldfb_state_length, sub( q_out, hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state ) ); // q_out

                    hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state = q_out;

                    move16();

                }

                ELSE

                {

                    scale_sig32( Cldfb_RealBuffer_fx[idx_in][i], hSpatParamRendCom->num_freq_bands, sub( hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state, q_out ) );

                    scale_sig32( Cldfb_ImagBuffer_fx[idx_in][i], hSpatParamRendCom->num_freq_bands, sub( hMasaExtRend->cldfbSynRend[idx_in]->Q_cldfb_state, q_out ) );

                }

                FOR( i = 0; i < hSpatParamRendCom->subframe_nbslots[subframe_idx]; i++ )

                {

                    RealBuffer_fx[i] = Cldfb_RealBuffer_fx[idx_in][i]; // q_cldfb