Commit 82712435 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into basop-ci/add-encoder-logging

parents 75e373df 8ab9642b

.gitlab-ci.yml

+52 −1
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ variables: 
      - 'test-long-self-test'

      - 'ivas-conformance'

      - 'ivas-conformance-linux'

      - 'check-float-reference'

  GIT_CLEAN_FLAGS: -ffdxq

  TESTCASE_TIMEOUT_STV_SANITIZERS: 180

  TESTCASE_TIMEOUT_LTV_SANITIZERS: 1200

  BASOP_REFERENCE_BRANCH: "ivas-float-update"





default:
@@ -63,6 +65,10 @@ workflow: 
    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux'

      variables:

        IVAS_PIPELINE_NAME: 'Draft IVAS Conformance test -- Linux: $CI_COMMIT_BRANCH'        

    - if: $CI_PIPELINE_SOURCE == 'trigger'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'check-float-reference'

      variables:

        IVAS_PIPELINE_NAME: 'check-float-reference: $CI_COMMIT_BRANCH'

    



stages:
@@ -257,6 +263,8 @@ stages: 
      when: never      

    - if: $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux'

      when: never      

    - if: $MANUAL_PIPELINE_TYPE == 'check-float-reference'

      when: never

    - when: on_success



.rules-merge-request:
@@ -396,7 +404,6 @@ check-self-test-names-pre: 
  script:

    - python3 ci/check_self_test_names.py scripts/config/self_test.prm 135





branch-is-up-to-date-with-main-post:

  extends:

    - .rules-merge-request
@@ -408,6 +415,50 @@ branch-is-up-to-date-with-main-post: 
    - echo $commits_behind_count

    - if [ $commits_behind_count -eq 0 ]; then exit 0; else echo "Your branch is behind main, possibly main changed during your pipeline run, run 'git merge origin/main' to update." exit 1; fi;



# for merges to basop-ci-branch, run the long test suite in reference generation mode to catch problems already here and not only in the BASOP repo

check-compatibility-with-basop-reference-branch:

  extends:

    - .test-job-linux

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "basop-ci-branch"

      changes:

        - tests/**/*

        - scripts/**/*

        - ci/**/*

    - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'check-float-reference'

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

  tags:

    - ivas-linux-fast

  script:

    - git clone -b $BASOP_REFERENCE_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch

    - make -j -C ivas-basop

    - cp ivas-basop/IVAS_cod ./IVAS_cod_ref

    - cp ivas-basop/IVAS_dec ./IVAS_dec_ref

    - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm

    - python3 tests/create_short_testvectors.py

    - exit_code1=0

    - exit_code2=0

    - python3 -m pytest tests/codec_be_on_mr_nonselection -v --update_ref 1 -m create_ref --html=report1.html --self-contained-html --junit-xml=report-junit1.xml || exit_code1=$?

    - python3 -m pytest tests/codec_be_on_mr_nonselection -v --update_ref 1 -m create_ref_part2 --html=report2.html --self-contained-html --junit-xml=report-junit2.xml || exit_code2=$?

    - zero_errors=$(cat report-junit1.xml report-junit2.xml | grep -c 'errors="0"') || true

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

    - exit 0

  artifacts:

    name: "check-float-reference--sha-$CI_COMMIT_SHORT_SHA--results"

    when: always

    expire_in: 1 month

    paths:

      - report-junit1.xml

      - report-junit2.xml

      - report1.html

      - report2.html

    expose_as: "check-float-reference results"

    reports:

      junit:

        - report-junit1.xml

        - report-junit2.xml



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

# Build jobs

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

apps/renderer.c

+26 −0
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ typedef struct 
    char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    int8_t orientation_tracking;

#ifdef FIX_1135_EXT_RENDERER_HANDLES

    int16_t Opt_Headrotation;

    int16_t Opt_ExternalOrientation;

#endif

    int16_t nonDiegeticPan;

    float nonDiegeticPanGain;

    IVAS_REND_COMPLEXITY_LEVEL complexityLevel;
@@ -882,7 +886,11 @@ int main( 


    const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );



#ifdef FIX_1135_EXT_RENDERER_HANDLES

    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, args.nonDiegeticPanGain, args.Opt_Headrotation, args.Opt_ExternalOrientation, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )

#endif

    {

        fprintf( stderr, "Error opening renderer handle: %s\n", ivas_error_to_string( error ) );

        exit( -1 );
@@ -2510,7 +2518,12 @@ static CmdlnArgs defaultArgs( 
    clearString( args.renderConfigFilePath );

    clearString( args.externalOrientationFilePath );



#ifdef FIX_1135_EXT_RENDERER_HANDLES

    args.Opt_Headrotation = 0;

    args.Opt_ExternalOrientation = 0;

#endif

    args.orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;



    args.nonDiegeticPan = 0;

    args.nonDiegeticPanGain = 0.f;
@@ -2598,6 +2611,9 @@ static void parseOption( 
            break;

        case CmdLnOptionId_trajFile:

            assert( numOptionValues == 1 );

#ifdef FIX_1135_EXT_RENDERER_HANDLES

            args->Opt_Headrotation = 1;

#endif

            strncpy( args->headRotationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            break;

        case CmdLnOptionId_outputMetadata:
@@ -2618,6 +2634,9 @@ static void parseOption( 
            break;

        case CmdLnOptionId_exteriorOrientationFile:

            assert( numOptionValues == 1 );

#ifdef FIX_1135_EXT_RENDERER_HANDLES

            args->Opt_ExternalOrientation = 1;

#endif

            strncpy( args->externalOrientationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            break;

        case CmdLnOptionId_customHrtfFile:
@@ -2742,6 +2761,13 @@ static CmdlnArgs parseCmdlnArgs( 
        exit( -1 ); /* Error printout handled by failing function */

    }



#ifdef FIX_1135_EXT_RENDERER_HANDLES

    if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

        args.Opt_Headrotation = 1;

    }

#endif



    return args;

}

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ 
#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define FIX_1152_UNINIT_VAL_IN_ITD_VAD_COMPUTATION      /* FhG: fix uninitialized value being used in ITD VAD mid signal computation that does not affect synthesis, but crashes BASOPs */

#define FIX_1157_OBSOLETE_DMX_TABLE                     /* FhG: remove obsolte ParamMC DMX table ivas_param_mc_dmx_fac_CICP19_4tc[] */

#define FIX_1135_EXT_RENDERER_HANDLES                   /* VA: issue 1135: Memory usage reduction in external renderer: Allocate only handles that are really needed. */



/* #################### End BE switches ################################## */
@@ -182,6 +183,7 @@ 


#define NONBE_FIX_1141_OSBA_ROOM_RENDERING                    /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */

#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#define NONBE_FIX_1143_MASA_BRSW                              /* Nok: Fix for issue 1143: MSAN use of uninitialized value in masa decoding to binaural with dtx bitrate switching and 5 % FER */





#define NONE_BE_FIX_816_LFE_PLC_FLOAT                   /* DLB: issue 816: reduce required precision to float for LFE-PLC*/

lib_dec/ivas_masa_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -1393,11 +1393,16 @@ ivas_error ivas_masa_dec_reconfigure( 
        sts = st_ivas->hCPE[cpe_id]->hCoreCoder;

        sts[0]->bit_stream = bit_stream + num_bits;

        num_bits += (int16_t) ( st_ivas->hCPE[cpe_id]->element_brate / FRAMES_PER_SEC );

#ifdef NONBE_FIX_1143_MASA_BRSW

        if ( ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate >= MASA_STEREO_MIN_BITRATE ) ||

             ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == FRAME_NO_DATA ) ||

             ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == IVAS_SID_5k2 ) )

#else

        if ( ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate >= MASA_STEREO_MIN_BITRATE ) ||

             ( ivas_total_brate < MASA_STEREO_MIN_BITRATE && last_ivas_total_brate == FRAME_NO_DATA ) )

#endif

        {

            st_ivas->hCPE[cpe_id]->nchan_out = 1;



            if ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirACRend != NULL ) || ( ( st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) && st_ivas->hDiracDecBin[0] != NULL ) )

            {

                if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE ) ) != IVAS_ERR_OK )

lib_dec/ivas_stat_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -993,7 +993,7 @@ typedef struct decoder_config_structure 
    int16_t Opt_non_diegetic_pan;                /* indicates diegetic or not */

    float non_diegetic_pan_gain;                 /* non diegetic panning gain*/

    int16_t Opt_AMR_WB;                          /* flag indicating AMR-WB IO mode */

    int16_t Opt_ExternalOrientation;             /* indiates whether external orientations are used */

    int16_t Opt_ExternalOrientation;             /* indicates whether external orientations are used */

    int16_t Opt_dpid_on;                         /* indicates whether Directivity pattern option is used */

    int16_t Opt_aeid_on;                         /* indicates whether Acoustic environment option is used */

#ifdef DEBUGGING