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

Merge remote-tracking branch 'origin' into... 

Merge remote-tracking branch 'origin' into 1010-complexity-high-complexity-overhead-for-parammc-decoding
parents dc90a03f 4ac8a3fd

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ build-codec-linux-make: 
  rules:

    - if: $CI_PIPELINE_SOURCE == 'web'

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # trigger build job for all MRs

    - if: $CI_PIPELINE_SOURCE == 'schedule'

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

lib_com/cldfb_evs.c

+4 −0
Original line number Diff line number Diff line
@@ -1405,7 +1405,11 @@ void GetEnergyCldfb( Word32 *energyLookahead, /*!< o: Q(*sf_energyLookahead) 
        {

            FOR( j = 20; j < numberBandsM; j++ )

            {

#ifdef BASOP_NOGLOB

                nrg = L_add_o( nrg, L_shr_o( energyValues[k][j], s, &Overflow ), &Overflow );

#else

                nrg = L_add( nrg, L_shr( energyValues[k][j], s ) );

#endif

            }

        }

lib_com/cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -698,6 +698,7 @@ enum 
#define AUTO_REGRESSIVE                     2



#define INT_FS_12k8                         12800                                                                                                            /* internal sampling frequency                */

#define ONE_BY_INT_FS_12k8_Q42                        343597384                                                                                                            /* internal sampling frequency                */

#define M                                   16                                                                                                               /* order of the LP filter @ 12.8kHz           */

#define L_FRAME                             256                                                                                                              /* frame size at 12.8kHz                      */

#define NB_SUBFR                            4                                                                                                                /* number of subframes per frame              */

lib_com/core_com_config.c

+4 −0
Original line number Diff line number Diff line
@@ -1416,7 +1416,11 @@ void init_tcx_cfg( 
    hTcxCfg->tcxRateLoopOpt = ( element_mode == IVAS_CPE_MDCT ) ? 3 : hTcxCfg->tcxRateLoopOpt;



    /* TCX bandwidth */

#ifndef IVAS_FLOAT_FIXED

    hTcxCfg->bandwidth_flt = getTcxBandwidth_flt( bwidth );

#else

    hTcxCfg->bandwidth = getTcxBandwidth( bwidth );

#endif



    /* set number of coded lines */

    hTcxCfg->tcx_coded_lines = getNumTcxCodedLines( bwidth );

lib_com/deemph.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void deemph_fx_32( 
    Word16 shift,    /*scaled output*/

    Word32 *signal,  /* i/o: signal            Qx*/

    const Word16 mu, /* i  : deemphasis factor Q15*/

    const int16_t L, /* i  : vector size         */

    const Word16 L,  /* i  : vector size         */

    Word32 *mem      /* i/o: memory (y[-1])    Qx+shift*/

)

{