Commit 0c047ccd authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge from main

parents 01101917 d9695bf5

.gitlab-ci.yml

+43 −0
Original line number Diff line number Diff line
@@ -417,6 +417,49 @@ evs-pytest-on-merge-request: 
      junit:

        - report-junit-evs.xml



clang-format-check:

  extends:

    - .test-job-linux

    - .rules-merge-request

  variables:

    ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix"

  stage: validate

  needs: []

  timeout: "5 minutes"

  script:

    # Set up variables. This can't be done in the "variables" section because variables are not expanded properly there

    - PATCH_FILE_NAME="$ARTIFACT_BASE_NAME".patch

    - >

      INSTRUCTIONS_GITLAB="To fix formatting issues:\n

      - download the diff patch available as artifact of this job\n

      - unzip the artifact and place the patch file in the root directory of your local IVAS repo\n

      - run: git apply $PATCH_FILE_NAME\n

      - commit new changes"

    - >

      INSTRUCTIONS_README="To fix formatting issues:\n

      - place the patch file in the root directory of your local IVAS repo\n

      - run: git apply $PATCH_FILE_NAME\n

      - commit new changes"

    

    - scripts/check-format.sh -af -p 8 || format_problems=$?

    - if [ $format_problems == 0 ] ; then exit 0; fi



    - mkdir tmp-formatting-fix

    - git diff > "tmp-formatting-fix/$PATCH_FILE_NAME"



    # Print instructions to job output

    - echo -e "$INSTRUCTIONS_GITLAB"



    # Include readme in the artifact, in case someone misses the job printout (e.g. getting the artifact via MR interface)

    - echo -e "$INSTRUCTIONS_README" > "tmp-formatting-fix/readme.txt"



    - exit $format_problems

  artifacts:

    paths:

      - tmp-formatting-fix/

    when: on_failure

    name: "$ARTIFACT_BASE_NAME"

    expose_as: 'formatting patch'



# ---------------------------------------------------------------

# Test jobs for main branch

apps/encoder.c

+0 −16
Original line number Diff line number Diff line
@@ -121,11 +121,7 @@ typedef struct 
    bool mimeOutput;



#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

#ifdef AGC_ENABLE_FOR_LBR

    IVAS_ENC_AGC agc;

#else

    bool agc;

#endif /* AGC_ENABLE_FOR_LBR */

#endif /* DEBUG_AGC_ENCODER_CMD_OPTION */

    bool pca;

#ifdef DEBUG_FOA_AGC
@@ -891,11 +887,7 @@ static void initArgStruct( EncArguments *arg ) 
    arg->mimeOutput = false;



#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

#ifdef AGC_ENABLE_FOR_LBR

    arg->agc = IVAS_ENC_AGC_UNDEFINED;

#else

    arg->agc = IVAS_DEFAULT_AGC;

#endif /* AGC_ENABLE_FOR_LBR */

#endif /* DEBUG_AGC_ENCODER_CMD_OPTION */

    arg->pca = false;

#ifdef DEBUG_FOA_AGC
@@ -1408,11 +1400,7 @@ static bool parseCmdlIVAS_enc( 
            i++;

            if ( i < argc - 4 )

            {

#ifdef AGC_ENABLE_FOR_LBR

                arg->agc = ( atoi( argv[i] ) ) ? IVAS_ENC_AGC_ENABLED : IVAS_ENC_AGC_DISABLED;

#else

                arg->agc = (int16_t) atoi( argv[i] );

#endif

                if ( argv[i] == NULL || atoi( argv[i] ) < 0 || atoi( argv[i] ) > 1 )

                {

                    fprintf( stderr, "Error: wrong adaptive gain control option specified (%d), expected 0 or 1\n\n", (int32_t) atoi( argv[i] ) );
@@ -1669,13 +1657,9 @@ static void usage_enc( void ) 
    fprintf( stdout, "-tag                : Tag name for intermediate debug files\n" );

#endif

#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

#ifdef AGC_ENABLE_FOR_LBR

    fprintf( stdout, "-agc op             : SBA Adaptive gain control, op = (0, 1).  \n" );

    fprintf( stdout, "                      By default op is 1 (activated) for bitrates between 24400 and 32000,\n" );

    fprintf( stdout, "                      otherwise it is 0 (deactivated) for all other bitrates\n" );

#else

    fprintf( stdout, "-agc op             : SBA Adaptive gain control, op = (0, 1), by default op is 0 or deactivated\n" );

#endif /* AGC_ENABLE_FOR_LBR */

#endif /* DEBUG_AGC_ENCODER_CMD_OPTION */



    fprintf( stdout, "-bypass mode        : SBA PCA by-pass, mode = (1, 2), 1 = PCA off, 2 = signal adaptive, default is 1\n" );

ci/run_scheduled_sanitizer_test.py

+2 −2
Original line number Diff line number Diff line
@@ -42,12 +42,12 @@ def get_modes(in_format: str) -> list: 
    list_process = subprocess.run(cmd, capture_output=True)



    output = list_process.stdout.decode("utf8")

    mode_list = output.splitlines()



    # correction for multichannel modes to avoid selecting some mono modes...

    if in_format in MC_MODES:

        in_format = "MC_" + in_format + "_b"



    mode_list = [m for m in output.splitlines() if in_format in m]

        mode_list = [m for m in mode_list if in_format in m]



    return mode_list

lib_com/ivas_agc_com.c

+2 −24
Original line number Diff line number Diff line
@@ -40,9 +40,7 @@ 
#endif

#include <math.h>

#include "wmops.h"

#ifdef AGC_TUNING_IMPROVEMENT

#include "prot.h"

#endif



/*------------------------------------------------------------------------------------------*

 * Local constants
@@ -50,11 +48,9 @@ 


#define SQRKMAX      ( 1.5f )

#define NBITS_DIFFG  ( 2 )

#ifdef AGC_TUNING_IMPROVEMENT

#define DBSTEP       ( -6.f ) /* desired dB step value in dB*/

#define ABS_EMIN_MAX ( 3 )

#define MAXATTEXP    ( 1 ) /* the desired maximum attenuation exponent range per frame*/

#endif



/*-----------------------------------------------------------------------------------------*

 * Function ivas_agc_initWindowFunc()
@@ -68,22 +64,14 @@ void ivas_agc_initWindowFunc( 
{

    int16_t i;

    float N;

#ifdef AGC_TUNING_IMPROVEMENT

    float a;

#endif



    N = (float) ( length - 1 );

#ifdef AGC_TUNING_IMPROVEMENT

    a = 0.5f * ( 1.f - powf( 10.f, DBSTEP / 20.f ) );

#endif



    for ( i = 0; i < length; i++ )

    {

#ifdef AGC_TUNING_IMPROVEMENT

        pWinFunc[i] = 1.f + a * ( cosf( EVS_PI * i / N ) - 1.f );

#else

        pWinFunc[i] = 0.75f + 0.25f * cosf( EVS_PI * i / N );

#endif

    }



    return;
@@ -107,11 +95,7 @@ void ivas_agc_calcGainParams( 


    nbits = NBITS_DIFFG;



#ifdef AGC_TUNING_IMPROVEMENT

    *absEmin = max( ABS_EMIN_MAX, (uint16_t) ceilf( logf( ceilf( SQRKMAX * numCoeffs ) ) * INV_LOG_2 ) );

#else

    *absEmin = (uint16_t) ceilf( logf( ceilf( SQRKMAX * numCoeffs ) ) * INV_LOG_2 );

#endif



    totExp = *absEmin + AGC_EMAX + 1;

    *betaE = (uint16_t) ceilf( logf( totExp ) * INV_LOG_2 );
@@ -120,17 +104,11 @@ void ivas_agc_calcGainParams( 


    if ( nbits > 0 )

    {

#ifdef AGC_TUNING_IMPROVEMENT

        Bm = min( AGC_BITS_PER_CH - 1, NBITS_DIFFG );

#else

        Bm = NBITS_DIFFG;

#endif

    }



    *maxAttExp = ( (uint16_t) powf( 2, Bm ) ) - 2;

#ifdef AGC_TUNING_IMPROVEMENT

    *maxAttExp = min( MAXATTEXP, *maxAttExp );

#endif



    return;

}

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -841,9 +841,7 @@ typedef enum { 
#define SBA_MIN_BRATE_HOA                       IVAS_256k

#define SBA_NHARM_HOA3                          16

#define SBA_T_DESIGN_11_SIZE                    70

#ifdef FIX_SBA_DTX_DECODE_ERROR

#define SBA_DTX_BITRATE_THRESHOLD               IVAS_80k

#endif



typedef enum 

{