Commit d746a861 authored by norvell's avatar norvell
Browse files

Merge branch 'main' into basop-ci/add-project-id-as-argument-for-get_id_of_last_job_occurence

parents f120f5d4 1b499ada

ci/remove_unsupported_testcases.py

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import argparse 
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, combined render config, directivity configuration with identifiers",

    "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",
@@ -43,8 +43,8 @@ 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",

    "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 combined renderer configuration with selected acoustic environment",

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

    "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",

scripts/check-format.sh

+12 −0
Original line number Diff line number Diff line
@@ -69,6 +69,16 @@ cl-format-apply() { 
    ${CLANG_FORMAT} -i $1

}



ensure-one-newline()

{

    # first command adds a newline at the end of the file if there might be none

    # -> clang-format-13 does not add them and warnings e.g. on MacOS are triggered by them

    sed -i -e '$a\' $1

    # second command removes multiple newlines at the end of a file so that there is only one left

    # -> clang-format-13 does not do that, but complains about it

    sed -i -e :a -e '/^\n*$/{$d;N;ba' -e '}' $1

}



cl-format-check() {

    local I=$1

    local COLOR=$2
@@ -197,6 +207,7 @@ if [[ $NUMPROCS -lt 2 ]]; then 
        RET=$?

        ((NUMFAILS+=RET))

        if [ $FORMAT ]; then

            ensure-one-newline $i

            cl-format-apply $i

        fi

    done
@@ -218,6 +229,7 @@ else 
        fi

        ((NUMFAILS+=RET))

        if [ $FORMAT ]; then

            ensure-one-newline $i

            cl-format-apply $i

        fi ) &

        while [[ $(jobs -r -p | wc -l) -ge $NUMPROCS ]];do

tests/codec_be_on_mr_nonselection/__init__.py

+0 −2
Original line number Diff line number Diff line 
MLD_PATTERN = r"MLD: ([\d\.]*)"

MAX_DIFF_PATTERN = r"MAXIMUM ABS DIFF: (\d*)"

tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import pytest 
from tests.cmp_pcm import cmp_pcm

from tests.conftest import DecoderFrontend, EncoderFrontend



from . import MLD_PATTERN, MAX_DIFF_PATTERN

from ..constants import MLD_PATTERN, MAX_DIFF_PATTERN



# params

# output_mode_list = ['MONO', 'STEREO', '5_1', '7_1', '5_1_2', '5_1_4', '7_1_4', 'FOA', 'HOA2', 'HOA3', 'BINAURAL', 'BINAURAL_ROOM', 'EXT']

tests/codec_be_on_mr_nonselection/test_param_file.py

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import pytest 
from tests.cmp_pcm import cmp_pcm

from tests.conftest import DecoderFrontend, EncoderFrontend

from tests.testconfig import PARAM_FILE

from . import MLD_PATTERN, MAX_DIFF_PATTERN

from ..constants import MLD_PATTERN, MAX_DIFF_PATTERN



VALID_DEC_OUTPUT_CONF = [

    "MONO",