Commit 237c93f4 authored by Jan Kiene's avatar Jan Kiene
Browse files

remove redundant 1DIR/2DIR distinction from MASA

parent 7185c06f
Loading
Loading
Loading
Loading
+8 −16
Original line number Diff line number Diff line
@@ -191,10 +191,8 @@ TESTVECTOR_FOR_INPUT_FORMAT = {
    "ISM2": "ltv{fs}_2ISM.wav",
    "ISM3": "ltv{fs}_3ISM.wav",
    "ISM4": "ltv{fs}_4ISM.wav",
    "MASA_1TC_1DIR": "ltv{fs}_MASA_1TC_1DIR.wav",
    "MASA_2TC_1DIR": "ltv{fs}_MASA_2TC_1DIR.wav",
    "MASA_1TC_2DIR": "ltv{fs}_MASA_1TC_2DIR.wav",
    "MASA_2TC_2DIR": "ltv{fs}_MASA_2TC_2DIR.wav",
    "MASA_1TC": "ltv{fs}_MASA_1TC_1DIR.wav",
    "MASA_2TC": "ltv{fs}_MASA_2TC_1DIR.wav",
    "OMASA_ISM1_MASA_1TC_1DIR": "ltv{fs}_OMASA_1ISM_MASA_1TC_1DIR.wav",
    "OMASA_ISM1_MASA_1TC_2DIR": "ltv{fs}_OMASA_1ISM_MASA_1TC_2DIR.wav",
    "OMASA_ISM1_MASA_2TC_1DIR": "ltv{fs}_OMASA_1ISM_MASA_2TC_1DIR.wav",
@@ -229,10 +227,8 @@ METADATA_FOR_INPUT_FORMAT = {
    "ISM2": ["ltvISM1.csv", "ltvISM2.csv"],
    "ISM3": ["ltvISM1.csv", "ltvISM2.csv", "ltvISM3.csv"],
    "ISM4": ["ltvISM1.csv", "ltvISM2.csv", "ltvISM3.csv", "ltvISM4.csv"],
    "MASA_1TC_1DIR": ["ltv_MASA_1TC_1DIR.met"],
    "MASA_2TC_1DIR": ["ltv_MASA_2TC_1DIR.met"],
    "MASA_1TC_2DIR": ["ltv_MASA_1TC_2DIR.met"],
    "MASA_2TC_2DIR": ["ltv_MASA_2TC_2DIR.met"],
    "MASA_1TC": ["ltv_MASA_1TC_1DIR.met"],
    "MASA_2TC": ["ltv_MASA_2TC_1DIR.met"],
}
CMDL_OPTIONS_FOR_INPUT_FORMAT = {
    "STEREO": ["-stereo"],
@@ -251,10 +247,8 @@ CMDL_OPTIONS_FOR_INPUT_FORMAT = {
    "ISM2": ["-ism", "2"],
    "ISM3": ["-ism", "3"],
    "ISM4": ["-ism", "4"],
    "MASA_1TC_1DIR": ["-masa", "1"],
    "MASA_2TC_1DIR": ["-masa", "2"],
    "MASA_1TC_2DIR": ["-masa", "1"],
    "MASA_2TC_2DIR": ["-masa", "2"],
    "MASA_1TC": ["-masa", "1"],
    "MASA_2TC": ["-masa", "2"],
    "OMASA": ["-ism_masa"],
    "OSBA": ["-ism_sba"],
    "STEREO_DMX_EVS": ["-stereo_dmx_evs"],
@@ -277,10 +271,8 @@ INPUT_FORMATS_SCENE_BASED = [
]
INPUT_FORMATS_OBJECT_BASED = ["ISM1", "ISM2", "ISM3", "ISM4"]
INPUT_FORMATS_MASA = [
    "MASA_1TC_1DIR",
    "MASA_2TC_1DIR",
    "MASA_1TC_2DIR",
    "MASA_2TC_2DIR",
    "MASA_1TC",
    "MASA_2TC",
]

BITRATES_ALL = [