Commit 6cd71d7e authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 538-mac-version-of-network-simulator-does-not-work-at-512-kbps-bitrate

parents a58496ad 876d4e56

scripts/config/ci_linux.json

+10 −20
Original line number Diff line number Diff line
@@ -8,10 +8,8 @@ 
        "HOA2": "/usr/local/testv/stv2OA48c.wav",

        "HOA3": "/usr/local/testv/stv3OA48c.wav",

        "SBA": "/usr/local/testv/stv3OA48c.wav",

        "MASA1TC1DIR": "/usr/local/testv/stv1MASA1TC48c.wav",

        "MASA1TC2DIR": "/usr/local/testv/stv2MASA1TC48c.wav",

        "MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48c.wav",

        "MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav",

        "MASA1TC": "/usr/local/testv/stv1MASA1TC48c.wav",

        "MASA2TC": "/usr/local/testv/stv1MASA2TC48c.wav",

        "5_1": "/usr/local/testv/stv51MC48c.wav",

        "5_1_2": "/usr/local/testv/stv512MC48c.wav",

        "5_1_4": "/usr/local/testv/stv514MC48c.wav",
@@ -21,22 +19,14 @@ 
        "ISM2": "/usr/local/testv/stv2ISM48s.wav",

        "ISM3": "/usr/local/testv/stv3ISM48s.wav",

        "ISM4": "/usr/local/testv/stv4ISM48s.wav",

        "OMASA_ISM1_1TC1DIR": "/usr/local/testv/stvOMASA_1ISM_1MASA1TC48c.wav",

        "OMASA_ISM1_1TC2DIR": "/usr/local/testv/stvOMASA_1ISM_2MASA1TC48c.wav",

        "OMASA_ISM1_2TC1DIR": "/usr/local/testv/stvOMASA_1ISM_1MASA2TC48c.wav",

        "OMASA_ISM1_2TC2DIR": "/usr/local/testv/stvOMASA_1ISM_2MASA2TC48c.wav",

        "OMASA_ISM2_1TC1DIR": "/usr/local/testv/stvOMASA_2ISM_1MASA1TC48c.wav",

        "OMASA_ISM2_1TC2DIR": "/usr/local/testv/stvOMASA_2ISM_2MASA1TC48c.wav",

        "OMASA_ISM2_2TC1DIR": "/usr/local/testv/stvOMASA_2ISM_1MASA2TC48c.wav",

        "OMASA_ISM2_2TC2DIR": "/usr/local/testv/stvOMASA_2ISM_2MASA2TC48c.wav",

        "OMASA_ISM3_1TC1DIR": "/usr/local/testv/stvOMASA_3ISM_1MASA1TC48c.wav",

        "OMASA_ISM3_1TC2DIR": "/usr/local/testv/stvOMASA_3ISM_2MASA1TC48c.wav",

        "OMASA_ISM3_2TC1DIR": "/usr/local/testv/stvOMASA_3ISM_1MASA2TC48c.wav",

        "OMASA_ISM3_2TC2DIR": "/usr/local/testv/stvOMASA_3ISM_2MASA2TC48c.wav",

        "OMASA_ISM4_1TC1DIR": "/usr/local/testv/stvOMASA_4ISM_1MASA1TC48c.wav",

        "OMASA_ISM4_1TC2DIR": "/usr/local/testv/stvOMASA_4ISM_2MASA1TC48c.wav",

        "OMASA_ISM4_2TC1DIR": "/usr/local/testv/stvOMASA_4ISM_1MASA2TC48c.wav",

        "OMASA_ISM4_2TC2DIR": "/usr/local/testv/stvOMASA_4ISM_2MASA2TC48c.wav",

        "OMASA_ISM1_1TC": "/usr/local/testv/stvOMASA_1ISM_1MASA1TC48c.wav",

        "OMASA_ISM1_2TC": "/usr/local/testv/stvOMASA_1ISM_1MASA2TC48c.wav",

        "OMASA_ISM2_1TC": "/usr/local/testv/stvOMASA_2ISM_1MASA1TC48c.wav",

        "OMASA_ISM2_2TC": "/usr/local/testv/stvOMASA_2ISM_1MASA2TC48c.wav",

        "OMASA_ISM3_1TC": "/usr/local/testv/stvOMASA_3ISM_1MASA1TC48c.wav",

        "OMASA_ISM3_2TC": "/usr/local/testv/stvOMASA_3ISM_1MASA2TC48c.wav",

        "OMASA_ISM4_1TC": "/usr/local/testv/stvOMASA_4ISM_1MASA1TC48c.wav",

        "OMASA_ISM4_2TC": "/usr/local/testv/stvOMASA_4ISM_1MASA2TC48c.wav",

        "OSBA_ISM1_FOA":      "/usr/local/testv/stvOSBA_1ISM_FOA48c.wav",

        "OSBA_ISM1_HOA2":     "/usr/local/testv/stvOSBA_1ISM_2OA48c.wav",

        "OSBA_ISM1_HOA3":     "/usr/local/testv/stvOSBA_1ISM_3OA48c.wav",

scripts/config/ci_linux_ltv.json

+23 −5
Original line number Diff line number Diff line
@@ -8,10 +8,8 @@ 
        "HOA2": "/usr/local/ltv/ltv48_HOA2.wav",

        "HOA3": "/usr/local/ltv/ltv48_HOA3.wav",

        "SBA": "/usr/local/ltv/ltv48_HOA3.wav",

        "MASA1TC1DIR": "/usr/local/testv/stv1MASA1TC48c.wav",

        "MASA1TC2DIR": "/usr/local/testv/stv2MASA1TC48c.wav",

        "MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48c.wav",

        "MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav",

        "MASA1TC": "/usr/local/ltv/ltv48_MASA1TC.wav",

        "MASA2TC": "/usr/local/ltv/ltv48_MASA2TC.wav",

        "5_1": "/usr/local/ltv/ltv48_MC51.wav",

        "5_1_2": "/usr/local/ltv/ltv48_MC512.wav",

        "5_1_4": "/usr/local/ltv/ltv48_MC514.wav",
@@ -20,6 +18,26 @@ 
        "ISM1": "/usr/local/ltv/ltv48_1ISM.wav",

        "ISM2": "/usr/local/ltv/ltv48_2ISM.wav",

        "ISM3": "/usr/local/ltv/ltv48_3ISM.wav",

        "ISM4": "/usr/local/ltv/ltv48_4ISM.wav"

        "ISM4": "/usr/local/ltv/ltv48_4ISM.wav",

        "OMASA_ISM1_1TC": "/usr/local/ltv/ltv48_OMASA_1ISM_1TC48c.wav",

        "OMASA_ISM1_2TC": "/usr/local/ltv/ltv48_OMASA_1ISM_2TC48c.wav",

        "OMASA_ISM2_1TC": "/usr/local/ltv/ltv48_OMASA_2ISM_1TC48c.wav",

        "OMASA_ISM2_2TC": "/usr/local/ltv/ltv48_OMASA_2ISM_2TC48c.wav",

        "OMASA_ISM3_1TC": "/usr/local/ltv/ltv48_OMASA_3ISM_1TC48c.wav",

        "OMASA_ISM3_2TC": "/usr/local/ltv/ltv48_OMASA_3ISM_2TC48c.wav",

        "OMASA_ISM4_1TC": "/usr/local/ltv/ltv48_OMASA_4ISM_1TC48c.wav",

        "OMASA_ISM4_2TC": "/usr/local/ltv/ltv48_OMASA_4ISM_2TC48c.wav",

        "OSBA_ISM1_FOA":      "/usr/local/ltv/ltv48_OSBA_1ISM_FOA48c.wav",

        "OSBA_ISM1_HOA2":     "/usr/local/ltv/ltv48_OSBA_1ISM_2OA48c.wav",

        "OSBA_ISM1_HOA3":     "/usr/local/ltv/ltv48_OSBA_1ISM_3OA48c.wav",

        "OSBA_ISM2_FOA":      "/usr/local/ltv/ltv48_OSBA_2ISM_FOA48c.wav",

        "OSBA_ISM2_HOA2":     "/usr/local/ltv/ltv48_OSBA_2ISM_2OA48c.wav",

        "OSBA_ISM2_HOA3":     "/usr/local/ltv/ltv48_OSBA_2ISM_3OA48c.wav",

        "OSBA_ISM3_FOA":      "/usr/local/ltv/ltv48_OSBA_3ISM_FOA48c.wav",

        "OSBA_ISM3_HOA2":     "/usr/local/ltv/ltv48_OSBA_3ISM_2OA48c.wav",

        "OSBA_ISM3_HOA3":     "/usr/local/ltv/ltv48_OSBA_3ISM_3OA48c.wav",

        "OSBA_ISM4_FOA":      "/usr/local/ltv/ltv48_OSBA_4ISM_FOA48c.wav",

        "OSBA_ISM4_HOA2":     "/usr/local/ltv/ltv48_OSBA_4ISM_2OA48c.wav",

        "OSBA_ISM4_HOA3":     "/usr/local/ltv/ltv48_OSBA_4ISM_3OA48c.wav"

    }

}

scripts/config/ci_linux_sidstart_test.json

+2 −4
Original line number Diff line number Diff line
@@ -8,10 +8,8 @@ 
        "HOA2": "/usr/local/ltv/ltv48_HOA2.wav",

        "HOA3": "/usr/local/ltv/ltv48_HOA3.wav",

        "SBA": "/usr/local/ltv/ltv48_HOA3.wav",

        "MASA1TC1DIR": "/usr/local/ltv/ltv48_MASA1TC.wav",

        "MASA1TC2DIR": "/usr/local/ltv/ltv48_MASA1TC.wav",

        "MASA2TC1DIR": "/usr/local/ltv/ltv48_MASA2TC.wav",

        "MASA2TC2DIR": "/usr/local/ltv/ltv48_MASA2TC.wav",

        "MASA1TC": "/usr/local/ltv/ltv48_MASA1TC.wav",

        "MASA2TC": "/usr/local/ltv/ltv48_MASA2TC.wav",

        "5_1": "/usr/local/testv/stv51MC48c.wav",

        "5_1_2": "/usr/local/testv/stv512MC48c.wav",

        "5_1_4": "/usr/local/testv/stv514MC48c.wav",

scripts/config/ivas_modes.json

+55 −559

File changed.

Preview size limit exceeded, changes collapsed.