Commit 68271752 authored by Huo, Jiaquan's avatar Huo, Jiaquan
Browse files

Merge remote-tracking branch 'origin/main' into sba-ext

parents 047f66a2 6ebdfb6f

.gitlab-ci.yml

+51 −13
Original line number Diff line number Diff line
@@ -167,6 +167,12 @@ stages: 
  - git pull

  - cd -



.update-ltv-repo-win: &update-ltv-repo-win

  - Push-Location

  - cd $LTV_DIR_WIN

  - git pull

  - Pop-Location



.enable-split-rendering: &enable-split-rendering

# automatically enable #define SPLIT_REND_WITH_HEAD_ROT in options.h, handling both /**/-comment and //-comment

  - sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*SPLIT_REND_WITH_HEAD_ROT\)[[:space:]]*\*\//\1/g" ./lib_com/options.h
@@ -189,6 +195,11 @@ stages: 
    - cp "$LTV_DIR"/*.met scripts/testv/

    - cp "$LTV_DIR"/*.csv scripts/testv/



.copy-ltv-files-to-testv-dir-win: &copy-ltv-files-to-testv-dir-win

    - cp $LTV_DIR_WIN\*.wav scripts\testv

    - cp $LTV_DIR_WIN\*.met scripts\testv

    - cp $LTV_DIR_WIN\*.csv scripts\testv



.activate-Werror-linux: &activate-Werror-linux

  - sed -i.bak "s/^# \(CFLAGS += -Werror\)/\1/" Makefile

  - sed -i.bak "s/# \(set(CMAKE_C_FLAGS \"\${CMAKE_C_FLAGS} -Werror\")\)/\1/" CMakeLists.txt
@@ -1360,7 +1371,7 @@ ivas-conformance: 
  tags:

    - ivas-windows

  stage: test

  timeout: "60 minutes"

  timeout: "90 minutes"

  rules:

    - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -1378,9 +1389,8 @@ ivas-conformance: 
    # Reference creation

    - python tests/create_short_testvectors.py

    - python scripts/prepare_combined_format_inputs.py

    - python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --keep_files

    - python -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref_part2 --keep_files

    - python -m pytest tests/renderer/test_renderer.py --create_ref --keep_files

    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files

    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --update_ref 1 -m create_ref_part2 --keep_files



    # Output creation

    - python -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html
@@ -1405,6 +1415,11 @@ ivas-conformance: 
    - cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref

    - cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref

    - cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref

    

    # Remove redundant files 

    - python scripts/cleanup_26252.py



    # Copy test script files

    - cp -r -force -ErrorAction Ignore tests/conformance-test testvec/

    - cp Readme_IVAS_dec.txt testvec

    - cp Readme_IVAS_enc.txt testvec
@@ -1414,6 +1429,7 @@ ivas-conformance: 
    - cp IVAS_dec.exe testvec/bin

    - cp IVAS_rend.exe testvec/bin

    

    

    # Test run generated scripts in testvec

    - cd testvec    

    - python -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html
@@ -1439,7 +1455,7 @@ ivas-conformance-linux: 
  tags:

    - ivas-linux

  stage: test

  timeout: "60 minutes"

  timeout: "90 minutes"

  rules:

    - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance-linux'

  allow_failure:
@@ -1455,12 +1471,12 @@ ivas-conformance-linux: 
    # Reference creation

    - python3 tests/create_short_testvectors.py

    - python3 scripts/prepare_combined_format_inputs.py

    - python3 -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref --keep_files

    - python3 -m pytest tests/codec_be_on_mr_nonselection -v -n auto --update_ref 1 -m create_ref_part2 --keep_files

    - python3 -m pytest tests/renderer/test_renderer.py --create_ref --keep_files

    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py"

    - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref --create_ref --keep_files

    - python3 -m pytest $TEST_SET -v -n auto --update_ref 1 -m create_ref_part2 --keep_files



    # Output creation

    - python3 -m pytest tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html

    - python3 -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html

    - python3 scripts/parse_commands.py report_cmd.html Readme_IVAS.txt

    

    # Copy input data and output ref data
@@ -1478,32 +1494,54 @@ ivas-conformance-linux: 
    - cp -r tests/ref testvec/testv/ref

    - cp -r tests/dut/* testvec/testv/ref

    - cp -r tests/renderer/cut testvec/testv/renderer/ref

    

    # Remove redundant files 

    - python3 scripts/cleanup_26252.py

    

    # Copy test script files

    - cp -r tests/conformance-test testvec/

    - cp Readme_IVAS_dec.txt testvec

    - cp Readme_IVAS_enc.txt testvec 

    - cp Readme_IVAS_rend.txt testvec

    - cp Readme_IVAS_JBM_dec.txt testvec

    

    # Create GCOV execs for coverage analysis

    - make clean

    - make GCOV=1 -j

    

    - cp IVAS_cod testvec/bin

    - cp IVAS_dec testvec/bin

    - cp IVAS_rend testvec/bin

        

    # Test run generated scripts in testvec

    - cd testvec   

    - python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html

    - exit_code=0    

    - python3 -m pytest conformance-test/test_26252.py --junit-xml=report-junit.xml --html=report.html --self-contained-html || exit_code=$?

    - mv report.html ..

    - mv report-junit.xml ..



    # Collect coverage

    - cd -

    - lcov -c -d obj -o coverage.info

    - lcov -r coverage.info "*apps*" -o coverage.info

    - lcov -r coverage.info "*lib_util*" -o coverage.info

    - commit_sha=$(git rev-parse HEAD)

    - genhtml coverage.info -o coverage -t "Coverage on main @ $commit_sha"



  artifacts:

    name: "ivas-conformance-linux-$CI_COMMIT_SHORT_SHA"

    expire_in: 1 week

    when: always

    paths:

      - report_cmd.html

      - report-junit.xml

      - report.html

      - Readme_IVAS_dec.txt  

      - Readme_IVAS_enc.txt  

      - Readme_IVAS_rend.txt

      - Readme_IVAS_JBM_dec.txt

      - coverage.info

      - coverage

    expose_as: "Draft IVAS conformance -- Linux"

    reports:

      junit: report-junit.xml

apps/decoder.c

+7 −1
Original line number Diff line number Diff line
@@ -660,7 +660,13 @@ int main( 
            fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );

            goto cleanup;

        }



#ifdef CONF_DISTATT

        if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to get Distance Attenuation \n\n" );

            goto cleanup;

        }

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ||

               arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

lib_com/common_api_types.h

+3 −0
Original line number Diff line number Diff line
@@ -335,6 +335,9 @@ typedef struct _IVAS_RENDER_CONFIG 
    ISAR_SPLIT_REND_CONFIG_DATA split_rend_config;

#endif

    float directivity[IVAS_MAX_NUM_OBJECTS * 3];

#ifdef CONF_DISTATT

    float distAtt[3];

#endif



} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;

lib_com/options.h

+4 −6
Original line number Diff line number Diff line
@@ -159,13 +159,13 @@ 
#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS



#define FIX_NUM_SUBFRAME_UPDATE



#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */



#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */



#define FIX_1077_MEMORY_TEST_MISSING                    /* orange: issue 1077 : add missing memory test*/

#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */

#define FIX_1052_EXT_OUTPUT                             /* VA: issue 1052: define EXT decoder output configuration for stereo and MC formats */ 





/* #################### End BE switches ################################## */
@@ -175,11 +175,9 @@ 


#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */



#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ 

#define NONBE_FIX_MC_LFE_LPF                            /* Dlb: Adding the LFE LPF filter back for MC content. */





#define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */



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

lib_dec/ivas_binRenderer_internal.c

+2 −2
Original line number Diff line number Diff line
@@ -1148,9 +1148,9 @@ ivas_error ivas_binRenderer_open( 
    if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG

        hBinRenderer->numPoses = st_ivas->hSplitBinRend.splitrend.multiBinPoseData.num_poses + 1;

        hBinRenderer->numPoses = st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses + 1;

#else

        hBinRenderer->numPoses = st_ivas->hSplitBinRend.splitrend.multiBinPoseData.num_poses;

        hBinRenderer->numPoses = st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses;

#endif

    }

    else