Commit e76d8c7b authored by PLAINSI's avatar PLAINSI
Browse files

Merge branch 'main' into 471-integrate-the-multichannel-parametric-upmix-into-the-jbm-path

parents 86c53e8a e6b45e18

.gitignore

+3 −4
Original line number Diff line number Diff line
@@ -42,10 +42,9 @@ scripts/out/ 
scripts/self_test_summary.txt

scripts/cppp/

binary/

tests/renderer/cut

tests/renderer/ref

tests/dut

tests/ref

tests/**/[c|d]ut

tests/**/ref

tests/*/testv

scripts/testv/*_cut*.pcm

# default reference binary name

IVAS_cod_ref

.gitlab-ci.yml

+19 −16
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ variables: 
  EXIT_CODE_NON_BE: 123

  EXIT_CODE_FAIL: 1

  PROCESSING_SCRIPTS_BIN_DIR: "/test-bin"

  TESTS_DIR_CODEC_BE_ON_MR: "tests/codec_be_on_mr_nonselection"



default:

  interruptible: true # Make all jobs by default interruptible
@@ -498,7 +499,7 @@ renderer-pytest-on-merge-request: 
      - 123

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 2 week

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml
@@ -531,15 +532,15 @@ ivas-pytest-on-merge-request: 
    # create short test vectors

    - python3 tests/create_short_testvectors.py

    # create references

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

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

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 -m create_ref

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -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 --html=report.html --self-contained-html --junit-xml=report-junit.xml || exit_code=$?

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml || exit_code=$?

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



    - *merge-request-comparison-check
@@ -549,7 +550,7 @@ ivas-pytest-on-merge-request: 
      - 123

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 2 week

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml
@@ -579,14 +580,14 @@ evs-pytest-on-merge-request: 


    ### 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

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/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 --html=report.html --self-contained-html --junit-xml=report-junit-evs.xml || exit_code=$?

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v --param_file scripts/config/self_test_evs.prm --html=report.html --self-contained-html --junit-xml=report-junit-evs.xml || exit_code=$?

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



    - *merge-request-comparison-check
@@ -596,7 +597,7 @@ evs-pytest-on-merge-request: 
      - 123

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 2 week

    expire_in: 1 week

    when: always

    paths:

      - report-junit-evs.xml
@@ -655,7 +656,7 @@ clang-format-check: 


    - exit $format_problems

  artifacts:

    expire_in: 2 days

    expire_in: 1 day

    paths:

      - tmp-formatting-fix/

    when: on_failure
@@ -840,15 +841,15 @@ codec-comparison-on-main-push: 
    - mv IVAS_cod_test IVAS_cod

    - mv IVAS_dec_test IVAS_dec

    # create references

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

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

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 -m create_ref

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -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 --html=report.html --self-contained-html --junit-xml=report-junit.xml || exit_code=$?

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml || exit_code=$?

    - if [ $exit_code -eq 1 ] && [ $non_be_flag == 0 ]; then echo "pytest run had failures and non-BE flag not present"; exit $EXIT_CODE_FAIL; fi

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

    - if [ $exit_code -eq 1 ] && [ $zero_errors == 1 ]; then echo "pytest run had failures, but no errors and non-BE flag present"; exit $EXIT_CODE_NON_BE; fi
@@ -858,7 +859,7 @@ codec-comparison-on-main-push: 
      - 123

  artifacts:

    name: "main-push--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    expire_in: 2 week

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml
@@ -1120,14 +1121,15 @@ coverage-test-on-main-scheduled: 
  rules:

    # only run in scheduled pipeline that passes this env vars

    - if: $COVERAGE_TEST

  timeout: 2 hours

  script:

    - *print-common-info

    - make GCOV=1 -j

    - cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script  

    - python3 tests/create_short_testvectors.py

    - python3 -m pytest tests -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest tests -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest tests/test_param_file.py -v -n 0 --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR/test_param_file.py -v -n 0 --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - bash ci/smoke_test.sh coverage

    - python3 -m pytest -q -n auto tests/renderer/test_renderer_be_comparison.py

    - bash ci/ivas_voip_be_test.sh coverage
@@ -1320,6 +1322,7 @@ pages: 
  artifacts:

    paths:

      - public

    expire_in: 1 day



# Pull state of a branch on 3GPP repo, push to a mirror repo.

pull-from-3gpp-forge:

Workspace_msvc/lib_util.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 
    <ClCompile Include="..\lib_util\cmdl_tools.c" />

    <ClCompile Include="..\lib_util\evs_rtp_payload.c" />

    <ClCompile Include="..\lib_util\g192.c" />

    <ClCompile Include="..\lib_util\head_rotation_file_reader.c" />

    <ClCompile Include="..\lib_util\vector3_pair_file_reader.c" />

    <ClCompile Include="..\lib_util\hrtf_file_reader.c" />

    <ClCompile Include="..\lib_util\ism_file_reader.c" />
@@ -171,7 +170,6 @@ 
    <ClInclude Include="..\lib_util\evs_rtp_payload.h" />

    <ClInclude Include="..\lib_util\g192.h" />

    <ClInclude Include="..\lib_util\vector3_pair_file_reader.h" />

    <ClInclude Include="..\lib_util\head_rotation_file_reader.h" />

    <ClInclude Include="..\lib_util\hrtf_file_reader.h" />

    <ClInclude Include="..\lib_util\ism_file_reader.h" />

    <ClInclude Include="..\lib_util\ism_file_writer.h" />

lib_com/ivas_prot.h

+17 −3
Original line number Diff line number Diff line
@@ -4248,6 +4248,10 @@ void ivas_sba_mix_matrix_determiner( 
    const int16_t bfi,                                          /* i  : BFI flag                                */

    const int16_t nchan_remapped,                               /* i  : num channels after remapping of TCs     */

    const int16_t output_frame                                  /* i  : output frame length                     */

#ifdef VLBR_20MS_MD

    ,

    const int16_t num_md_sub_frames                             /* i : number of subframes in mixing matrix  */

#endif

);



/* AGC */
@@ -4546,9 +4550,19 @@ void ivas_get_spar_md_from_dirac( 
/*! r: number of MD subframes */

int16_t ivas_get_spar_dec_md_num_subframes(

    const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                   */

    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                      */

);

    const int32_t ivas_total_brate );

#ifdef VLBR_20MS_MD



ivas_error ivas_spar_md_dec_matrix_open(

    ivas_spar_md_dec_state_t *hMdDec, /* i/o: SPAR MD decoder handle       */

    const int16_t num_channels,       /* i  : number of internal channels  */

    const int16_t num_md_sub_frames );



void ivas_spar_md_dec_matrix_close(

    ivas_spar_md_dec_state_t *hMdDecoder, /* i/o: SPAR MD decoder handle      */

    const int16_t num_channels );            /* i  : number of internal channels */

    

#endif

ivas_error ivas_spar_md_dec_open(

    ivas_spar_md_dec_state_t **hMdDec_out,                      /* i/o: SPAR MD decoder handle                  */

    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */

lib_com/options.h

+17 −3
Original line number Diff line number Diff line
@@ -134,12 +134,16 @@ 


/* #################### End DEBUGGING switches ############################ */



/* ################# Start DEVELOPMENT switches ######################## */



/* keep as part of options.h */

#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */





/* ################# Start BE DEVELOPMENT switches ######################## */

/* only BE switches wrt operation points tested in selection */



/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define VLBR_20MS_MD                                    /* Dlb: SBA VLBR 20ms Optimization*/

#define FIX_563_PARAMMC_LIMITER                         /* FhG: issue 563: fix ILD limiter when coming from silence w/o transient set             */

#define FIX_560_VAD_FLAG                                /* Eri: Issue 560 - VAD flag issue for unified stereo */

#define FIX_549_DMX_GAIN                                /* FhG: issue 549: ParamISM output too quiet */
@@ -160,10 +164,20 @@ 
#define FIX_575_LOW_OVERLAP_PLC_RECOVERY                /* FhG: Issue 575 fix for PLC and transistion to TCX5*/

#define ISM_FB_16k4                                     /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */

#define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */

#define FIX_593_STL_INCLUDE                             /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */

#define FIX_583_CLANG_TRANS_DET                         /* FhG: Issue 583: clang left shift on ramp_up_flag in transient detector */



/* ################## End BE DEVELOPMENT switches ######################### */





/* #################### Start NON-BE CR switches ########################## */

/* any switch which is non-be wrt operation points tested in selection */

/* all switches in this category should start with "CR_" */

#define JBM_PARAMUPMIX





/* ################## End DEVELOPMENT switches ######################### */

/* ##################### End NON-BE CR switches ########################### */



/* clang-format on */



#endif