Commit 8597e17b authored by vaclav's avatar vaclav
Browse files

fix merge conflicts

parents 3cb53f09 f739854c

.gitlab-ci.yml

+155 −84

File changed.

Preview size limit exceeded, changes collapsed.

apps/decoder.c

+7 −5
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 )

        {
@@ -1712,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

    {
@@ -2018,13 +2022,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



#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

            if ( ( error = split_rend_writer_open( splitRendWriter, arg.outputMdFilename, delayNumSamples_temp[0], delayTimeScale_temp, splitRendCodec, poseCorrection, splitRendCodecFrameSizeMs, splitRendIsarFrameSizeMs, arg.output_Fs, lc3plusHighRes ) ) != IVAS_ERR_OK )

ci/remove_unsupported_testcases.py

0 → 100644
+88 −0
Original line number Diff line number Diff line 
__copyright__ = """

(C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

contributors to this repository. All Rights Reserved.



This software is protected by copyright law and by international treaties.

The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,

Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

contributors to this repository retain full ownership rights in their respective contributions in

the software. This notice grants no license of any kind, including but not limited to patent

license, nor is any license granted by implication, estoppel or otherwise.



Contributors are required to enter into the IVAS codec Public Collaboration agreement before making

contributions.



This software is provided "AS IS", without any express or implied warranties. The software is in the

development stage. It is intended exclusively for experts who have experience with such software and

solely for the purpose of inspection. All implied warranties of non-infringement, merchantability

and fitness for a particular purpose are hereby disclaimed and excluded.



Any dispute, controversy or claim arising under or in relation to providing this software shall be

submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in

accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and

the United Nations Convention on Contracts on the International Sales of Goods.

"""



from pathlib import Path

import argparse



# Enter tag of testcases to remove here WITHOUT the leading //

TESTCASES = [

    "OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out",

    "OSBA planar FOA 2ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL out",

    "4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, rendconf dir w id",

    "OSBA planar FOA 1ISM at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out",

    "Multi-channel 5_1 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 10%, bandwidth switching",

    "OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 5%, bandwidth switching",

    "OSBA FOA 2ISM at 64 kbps, 48kHz in, 48kHz out, HOA3 out, bandwidth switching",

    "OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out",

    "OSBA planar FOA 2ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL out",

    "OSBA planar FOA 1ISM at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out",

    "SBA 3OA at 128 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB rendconf sel acoustic env",

    "OSBA FOA 4ISM at br sw 13.2 to 512 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file), FER at 5%, bandwidth switching",

    "stereo bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, EXT out",

    "SBA FOA bitrate switching from 13.2 kbps to 192 kbps, 32kHz in, 32kHz out, DTX on, EXT out",

    "SBA 2OA bitrate switching from 13.2 kbps to 128 kbps, 32kHz in, 32kHz out, DTX on, EXT out",

    "SBA 3OA bitrate switching from 13.2 kbps to 128 kbps, 48kHz in, 48kHz out, DTX on, random FER at 5%, EXT out",

    "Multi-channel 5_1 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out",

    "Multi-channel 5_1_2 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, EXT out",

    "Multi-channel 5_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 32kHz out, EXT out",

    "Multi-channel 7_1 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 16kHz out, EXT out",

    "Multi-channel 7_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, EXT out",

]





def remove_testcases(cfg: Path, testcases: list):

    """

    Go through file line by line and copy all testcases except the given ones

    """

    with open(cfg, "r") as f:

        content_in = f.readlines()



    content_out = list()

    copy_flag = True

    for line in content_in:

        if any([tc in line for tc in testcases]):

            copy_flag = False



        if copy_flag:

            content_out.append(line)

        elif line == "\n":

            copy_flag = True



    with open(cfg, "w") as f:

        f.write("".join(content_out))





if __name__ == "__main__":

    parser = argparse.ArgumentParser()

    parser.add_argument("cfg_files", nargs="+", type=Path)

    args = parser.parse_args()



    for f in args.cfg_files:

        remove_testcases(f, TESTCASES)

ci/run_scheduled_sanitizer_test.py

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ N_FRAMES_DLY_PROFILE = 7500 
GENPATT_CMD = f"gen-patt -tailstat -fer -g192 -gamma 0 -rate 0.15 -tol 0.001 -reset -n {N_FRAMES_DLY_PROFILE} {EP_FILE}"

MC_MODES = ["5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"]

AMBISONICS_MODES = ["HOA3", "HOA2", "FOA", "PlanarHOA3", "PlanarHOA2", "PlanarFOA"]

# timeout of 15 minutes per en/decoding to safeguard against endless loops

TIMEOUT = 60 * 20

# timeout of 25 minutes per en/decoding to safeguard against endless loops

TIMEOUT = 60 * 25

HEAD_TRAJ_FILE = str(pathlib.Path("./head_rot_traj.csv").resolve())

EXOF_TRAJ_FILE = str(pathlib.Path("./exof_traj.csv").resolve())

ci/smoke_test.sh

+9 −17
Original line number Diff line number Diff line
@@ -52,12 +52,11 @@ fi 




cfg=./scripts/config/ci_linux.json

dly_profile=./scripts/dly_error_profiles/dly_error_profile_10.dat

dly_profile=./scripts/dly_error_profiles/dly_error_profile_10_smoke_test.dat

ism_md_cmd="--ism_metadata_files /usr/local/ltv/ltvISM1.csv /usr/local/ltv/ltvISM2.csv /usr/local/ltv/ltvISM3.csv /usr/local/ltv/ltvISM4.csv"

duration_arg="-U 1:2"

verbosity_cmd="-z console"

timeout_cmd="--timeout 20"

ep_file="ci/complexity_measurements/ep_10pct_fer.g192"



if [ $BUILD -eq 1 ];then

	# Enable memory macros to find unbalanced memory allocations/deallocations
@@ -88,33 +87,26 @@ echo "\n======================= 1. non-ism modes no FEC =======================\ 
./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $timeout_cmd | tee smoke_test_output.txt

echo "\n======================= 2. ism modes no FEC =======================\n\n"

./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $ism_md_cmd $timeout_cmd | tee smoke_test_output.txt

# run the decoding again, but with 15% frame loss

echo "\n======================= 3. all modes with FEC =======================\n\n"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -f="$ep_file" --decoder_only $timeout_cmd | tee smoke_test_output_plc.txt



# run JBM modes - EXT is excluded as not supported yet

formats_with_no_ext_out=$(./scripts/runIvasCodec.py -L | grep -v MASA | grep -v ISM | grep -v OSBA)

formats_with_ext_out=$(./scripts/runIvasCodec.py -L | grep 'MASA\|ISM\|OSBA')

echo "\n======================= 4. JBM, modes with no EXT =======================\n\n"

./scripts/runIvasCodec.py $verbosity_cmd -C $formats_with_no_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile $timeout_cmd | tee smoke_test_output_jbm_noEXT.txt

echo "\n======================= 5. JBM, modes with EXT =======================\n\n"

./scripts/runIvasCodec.py  $verbosity_cmd -C $formats_with_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM_IR mono stereo FOA HOA3 5_1 7_1_4 $timeout_cmd | tee -a smoke_test_output_jbm_noEXT.txt



# all modes with simulated network delay - this includes JBM TSM and lost frames

echo "\n======================= 3. JBM =======================\n\n"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile $timeout_cmd | tee smoke_test_output_jbm.txt



# run all modes with binaural output using external files

formats_with_bin_out=$(./scripts/runIvasCodec.py -L | grep -v "mono\|tereo")

bin_out_modes="BINAURAL BINAURAL_ROOM_IR"

bin_out_modes="BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"



echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n"

echo "\n======================= 4. binaural out with HRTF files - WB =======================\n\n"

wb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out | grep _wb_)

hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes $timeout_cmd | tee -a smoke_test_output_hrtf.txt



echo "\n======================= 7. binaural out with HRTF files - SWB =======================\n\n"

echo "\n======================= 5. binaural out with HRTF files - SWB =======================\n\n"

swb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out | grep _swb_)

hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes $timeout_cmd | tee -a smoke_test_output_hrtf.txt



echo "\n======================= 8. binaural out with HRTF files - FB =======================\n\n"

echo "\n======================= 6. binaural out with HRTF files - FB =======================\n\n"

fb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out | grep _fb_)

hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes $timeout_cmd | tee -a smoke_test_output_hrtf.txt