Commit 0642b9c0 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 1052-sba-decoder-confused-with-ext-output

parents 9f59944e 492192b1

.gitlab-ci.yml

+29 −7
Original line number Diff line number Diff line
@@ -513,7 +513,6 @@ build-codec-windows-msbuild: 
  script:

    - *print-common-info-windows

    - *activate-WX-windows

    - python .\scripts\strip_split_rendering.py

    - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug



# ---------------------------------------------------------------
@@ -1380,7 +1379,6 @@ ivas-conformance: 
      - 123

  script:

    - *print-common-info-windows    

    - python .\scripts\strip_split_rendering.py

    - MSBuild.exe -maxcpucount .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug    

    - cp -force IVAS_cod.exe IVAS_cod_ref.exe

    - cp -force IVAS_dec.exe IVAS_dec_ref.exe
@@ -1389,11 +1387,12 @@ 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 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

    - $TEST_SET = "tests/codec_be_on_mr_nonselection", "tests/renderer/test_renderer.py", "tests/split_rendering/test_split_rendering.py"

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

    - python -m pytest $TEST_SET -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

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

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

    

    # Copy input data and output ref data
@@ -1402,10 +1401,13 @@ ivas-conformance: 
    - if (Test-Path TMP_ENC) {rm -r -force TMP_ENC}    

    - if (Test-Path TMP_JBM) {rm -r -force TMP_JBM}

    - if (Test-Path TMP_REND) {rm -r -force TMP_REND}

    - if (Test-Path TMP_ISAR_POST_REND) {rm -r -force TMP_ISAR_POST_REND}    

    - if (Test-Path TMP_DEC_ISAR) {rm -r -force TMP_DEC_ISAR}    

    - mkdir testvec

    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/split_rendering        

    - mkdir testvec/bin    

    - cp    -force -ErrorAction Ignore scripts/testv/* testvec/testv

    - cp -r -force -ErrorAction Ignore scripts/ls_layouts testvec
@@ -1415,6 +1417,9 @@ 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

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

    - cp -r -force -ErrorAction Ignore tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs 

    - cp -r -force -ErrorAction Ignore tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns 

    

    # Remove redundant files 

    - python scripts/cleanup_26252.py
@@ -1425,9 +1430,12 @@ ivas-conformance: 
    - cp Readme_IVAS_enc.txt testvec 

    - cp Readme_IVAS_rend.txt testvec

    - cp Readme_IVAS_JBM_dec.txt testvec

    - cp Readme_IVAS_ISAR_dec.txt testvec 

    - cp Readme_IVAS_ISAR_post_rend.txt testvec   

    - cp IVAS_cod.exe testvec/bin

    - cp IVAS_dec.exe testvec/bin

    - cp IVAS_rend.exe testvec/bin

    - cp ISAR_post_rend.exe testvec/bin    

    

    

    # Test run generated scripts in testvec
@@ -1447,6 +1455,8 @@ ivas-conformance: 
      - Readme_IVAS_enc.txt  

      - Readme_IVAS_rend.txt

      - Readme_IVAS_JBM_dec.txt

      - Readme_IVAS_ISAR_dec.txt 

      - Readme_IVAS_ISAR_post_rend.txt    

    expose_as: "Draft IVAS conformance"

    reports:

      junit: report-junit.xml
@@ -1471,7 +1481,7 @@ ivas-conformance-linux: 
    # Reference creation

    - python3 tests/create_short_testvectors.py

    - python3 scripts/prepare_combined_format_inputs.py

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

    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.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
@@ -1485,6 +1495,7 @@ ivas-conformance-linux: 
    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/split_rendering    

    - mkdir testvec/bin    

    - cp -r scripts/testv/* testvec/testv

    - cp -r scripts/ls_layouts testvec
@@ -1494,6 +1505,9 @@ 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

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

    - cp -r tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs 

    - cp -r tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns    

    

    # Remove redundant files 

    - python3 scripts/cleanup_26252.py
@@ -1504,6 +1518,8 @@ ivas-conformance-linux: 
    - cp Readme_IVAS_enc.txt testvec 

    - cp Readme_IVAS_rend.txt testvec

    - cp Readme_IVAS_JBM_dec.txt testvec

    - cp Readme_IVAS_ISAR_dec.txt testvec 

    - cp Readme_IVAS_ISAR_post_rend.txt testvec    

    

    # Create GCOV execs for coverage analysis

    - make clean
@@ -1512,6 +1528,7 @@ ivas-conformance-linux: 
    - cp IVAS_cod testvec/bin

    - cp IVAS_dec testvec/bin

    - cp IVAS_rend testvec/bin

    - cp ISAR_post_rend testvec/bin    

        

    # Test run generated scripts in testvec

    - cd testvec
@@ -1528,6 +1545,9 @@ ivas-conformance-linux: 
    - commit_sha=$(git rev-parse HEAD)

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



    # Check for failures

    - if [ $exit_code -eq 1 ]; then echo "Test failures encountered"; exit $EXIT_CODE_FAIL; fi

    

  artifacts:

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

    expire_in: 1 week
@@ -1540,6 +1560,8 @@ ivas-conformance-linux: 
      - Readme_IVAS_enc.txt  

      - Readme_IVAS_rend.txt

      - Readme_IVAS_JBM_dec.txt

      - Readme_IVAS_ISAR_dec.txt 

      - Readme_IVAS_ISAR_post_rend.txt    

      - coverage.info

      - coverage

    expose_as: "Draft IVAS conformance -- Linux"

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -1718,14 +1718,12 @@ static bool parseCmdlIVAS_dec( 
            return false;

        }



#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK

        if ( arg->outputMdFilename != NULL && arg->outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {

            fprintf( stderr, "Error: Output split rendering metadata file is supported for BINAURAL_SPLIT_PCM output config. only\n\n" );

            usage_dec();

            return false;

        }

#endif

    }

    else

    {
@@ -2040,13 +2038,11 @@ static ivas_error initOnFirstGoodFrame( 
        }

        else

        {

#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK

            if ( arg.outputMdFilename == NULL )

            {

                fprintf( stderr, "\nOutput split rendering metadata file not specified\n" );

                return IVAS_ERR_INVALID_SPLIT_REND_CONFIG;

            }

#endif



            if ( ( error = split_rend_writer_open( splitRendWriter,

                                                   arg.outputMdFilename,

lib_com/ivas_dirac_com.c

+0 −4
Original line number Diff line number Diff line
@@ -345,11 +345,7 @@ void ivas_get_dirac_sba_max_md_bits( 
        /* OSBA needs an additional 5-bits safety margin to avoid acelp crashes */

        if ( ivas_format == SBA_ISM_FORMAT )

        {

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

            ( *metadata_max_bits ) -= 7;

#else

            ( *metadata_max_bits ) -= 3;

#endif

        }

    }

    else if ( sba_total_brate <= IVAS_32k )

lib_com/options.h

+6 −6
Original line number Diff line number Diff line
@@ -155,18 +155,18 @@ 


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

#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS

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

#endif



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





#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/

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



/* #################### Start NON-BE switches ############################ */
@@ -174,12 +174,12 @@ 
/* all switches in this category should start with "NONBE_" */



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

#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */



#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR            /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */

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



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

lib_dec/core_dec_init.c

+0 −4
Original line number Diff line number Diff line
@@ -150,11 +150,7 @@ void open_decoder_LPD( 
    {

        st->gamma = GAMMA16k;

    }

#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP

    else if ( st->element_mode > EVS_MONO && st->sr_core > INT_FS_16k )

#else

    else if ( st->sr_core > INT_FS_16k && st->element_mode == IVAS_CPE_MDCT )

#endif

    {

        st->gamma = GAMMA16k;

    }