Commit d7041f80 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 96-longer-test-files-for-longer-ci-jobs-are-missing

parents 43835d42 9063e751

.gitlab-ci.yml

+22 −7
Original line number Diff line number Diff line
@@ -83,9 +83,6 @@ stages: 
  - mv IVAS_cod_test IVAS_cod

  - mv IVAS_dec_test IVAS_dec



  ### re-checkout the commit from the source branch to have up-to-date self_test.py and scripts/testv (and actually everything)

  - git checkout $source_branch_commit_sha



.merge-request-comparison-check: &merge-request-comparison-check

    - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi

    - if [ $exit_code -eq 1 ] && [ $non_be_flag == 0 ]; then echo "Non-bitexact cases without non-BE tag encountered!"; exit $EXIT_CODE_FAIL; fi
@@ -340,6 +337,10 @@ ivas-pytest-on-merge-request: 


    # some helper variables - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[non[ -]*be\]") || true

    - ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true



    ### If ref_using_main is not set, checkoug the source branch to use scripts and input from there

    - if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi



    ### prepare pytest

    # create short test vectors
@@ -348,6 +349,9 @@ ivas-pytest-on-merge-request: 
    - python3 -m pytest tests -v --update_ref 1 -m create_ref

    - python3 -m pytest tests -v --update_ref 1 -m create_ref_part2



    ### Run test using branch scripts and input

    - if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi



    ### run pytest

    - exit_code=0

    - python3 -m pytest tests -v --junit-xml=report-junit.xml || exit_code=$?
@@ -381,11 +385,18 @@ evs-pytest-on-merge-request: 
    

    # some helper variables - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[evs[ -]*non[ -]*be\]") || true

    - ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true



    ### If ref_using_main is not set, checkoug the source branch to use scripts and input from there

    - if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi



    ### prepare pytest

    # create references

    - python3 -m pytest tests/test_param_file.py -v --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm



    ### Run test using branch scripts and input

    - if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi



    ### run pytest for EVS cases

    - exit_code=0

    - python3 -m pytest tests/test_param_file.py -v --param_file scripts/config/self_test_evs.prm --junit-xml=report-junit-evs.xml || exit_code=$?
@@ -478,11 +489,12 @@ codec-comparison-on-main-push: 
    - mv IVAS_dec ../IVAS_dec_ref

    - cd ..



    ### re-checkout the latest commit in the main branch

    - git checkout $latest_commit



    # helper variable - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_COMMIT_MESSAGE | grep -c --ignore-case "\[non[ -]*be\]") || true

    - ref_using_main=$(echo $CI_COMMIT_MESSAGE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true



    ### re-checkout the latest commit in the main branch, if ref_using_main is not set

    - if [ $ref_using_main == 0 ]; then git checkout $latest_commit;fi



    ### prepare pytest

    # create short test vectors
@@ -494,6 +506,9 @@ codec-comparison-on-main-push: 
    - python3 -m pytest tests -v --update_ref 1 -m create_ref

    - python3 -m pytest tests -v --update_ref 1 -m create_ref_part2



    ### re-checkout the latest commit here, if ref_using_main is set

    - if [ $ref_using_main -eq 1 ]; then git checkout $latest_commit;fi



    ### run pytest

    - exit_code=0

    - python3 -m pytest tests -v --junit-xml=report-junit.xml || exit_code=$?

apps/encoder.c

+28 −6
Original line number Diff line number Diff line
@@ -120,11 +120,13 @@ typedef struct 
    const char *ca_config_file;

    bool mimeOutput;



#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

#ifdef AGC_ENABLE_FOR_LBR

    IVAS_ENC_AGC agc;

#else

    bool agc;

#endif

#endif /* AGC_ENABLE_FOR_LBR */

#endif /* DEBUG_AGC_ENCODER_CMD_OPTION */

    bool pca;

#ifdef DEBUG_FOA_AGC

    FILE *agcBitstream; /* temporary */
@@ -444,11 +446,25 @@ int main( 
            }

            break;

        case IVAS_ENC_INPUT_SBA:

            if ( ( error =

                       IVAS_ENC_ConfigureForAmbisonics(

                           hIvasEnc,

                           arg.inputFs,

                           totalBitrate,

                           arg.max_bwidth_user,

                           bandwidth,

                           arg.dtxConfig,

                           arg.inputFormatConfig.sba.order,

                           arg.inputFormatConfig.sba.isPlanar,

#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

                           arg.agc,

#endif

                           arg.pca

#ifdef DEBUG_SBA_AUDIO_DUMP

            if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar, arg.agc, arg.pca, &numTransportChannels ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar, arg.agc, arg.pca ) ) != IVAS_ERR_OK )

                           ,

                           &numTransportChannels

#endif

                           ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_ENC_ConfigureForAmbisonics failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

                goto cleanup;
@@ -874,11 +890,13 @@ static void initArgStruct( EncArguments *arg ) 
    arg->ca_config_file = NULL;

    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

#endif /* AGC_ENABLE_FOR_LBR */

#endif /* DEBUG_AGC_ENCODER_CMD_OPTION */

    arg->pca = false;

#ifdef DEBUG_FOA_AGC

    arg->agcBitstream = NULL;
@@ -1384,6 +1402,7 @@ static bool parseCmdlIVAS_enc( 
            arg->inputFormatConfig.stereoToMonoDownmix = true;

            i++;

        }

#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

        else if ( strcmp( argv_to_upper, "-AGC" ) == 0 )

        {

            i++;
@@ -1409,6 +1428,7 @@ static bool parseCmdlIVAS_enc( 
                return false;

            }

        }

#endif

        else if ( strcmp( argv_to_upper, "-BYPASS" ) == 0 ) // VE: should be renamed to "-pca"

        {

            i++;
@@ -1648,13 +1668,15 @@ static void usage_enc( void ) 
#ifdef DEBUG_SBA

    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

#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" );

#ifdef DEBUGGING

lib_com/cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ enum{ 


#define MAX_V_MULT_MAT                  100             /* maximum array length for the function v_mult_mat() */



#define SBA_AGC_FORCE_ENABLE            1

#define SBA_AGC_FORCE_DISABLE           0

#define SBA_AGC_DEFAULT                 -1



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

 * Layers

lib_com/fill_spectrum.c

+0 −8
Original line number Diff line number Diff line
@@ -90,18 +90,10 @@ void fill_spectrum( 
    const int16_t element_mode         /* i  : element mode                                          */

)

{

#ifdef FIX_I178_HQ_BUFFER_OVERRUN

    float CodeBook[L_SPEC48k_EXT];

#else

    float CodeBook[FREQ_LENGTH];

#endif

    int16_t cb_size = 0;

    int16_t last_sfm;

#ifdef FIX_I178_HQ_BUFFER_OVERRUN

    float CodeBook_mod[L_SPEC48k_EXT];

#else

    float CodeBook_mod[FREQ_LENGTH];

#endif

    float norm_adj[NB_SFM];

    int16_t high_sfm = 23;

    int16_t flag_32K_env_hangover;

lib_com/ivas_cnst.h

+3 −4
Original line number Diff line number Diff line
@@ -836,6 +836,9 @@ 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 

{
@@ -1319,11 +1322,7 @@ typedef enum 
#define PANNING_ELE_RESOLUTION                  5



#define EFAP_MAX_CHAN_NUM                       5                           /* Maximum number of channels that constitute a polygon, 4 or 5 */

#ifdef ALLRAD_OPTIM

#define EFAP_MAX_POLY_SET                       50                          /* Upper bound on number of polygons; with a Speaker setup of 16.0, we obtain 44 polygons/triangles in the matlab implementation. */

#else

#define EFAP_MAX_POLY_SET                       70                          /* Upper bound on number of polygons; with a Speaker setup of 26.0, we obtain 54 polygons/triangles in the matlab implementation. */

#endif



#define EFAP_MODE_EFAP                          0                           /* EFAP Panning */

#define EFAP_MODE_EFIP                          1                           /* EFIP Panning */